port: [#6861]TeamsSSOTokenExchangeMiddleware.DeduplicatedTokenExchangeIdAsync fails on BlobStorage ETag validation

libraries/botbuilder-azure-blobs/src/blobsStorage.ts

@@ -158,18 +158,25 @@ export class BlobsStorage implements Storage {
 
         await pmap(
             Object.entries(changes),
-            ([key, { eTag = '', ...change }]) => {
-                const blob = this._containerClient.getBlockBlobClient(sanitizeBlobKey(key));
-                const serialized = JSON.stringify(change);
-
-                return blob.upload(serialized, serialized.length, {
-                    conditions: typeof eTag === 'string' && eTag !== '*' ? { ifMatch: eTag } : {},
-                    blobHTTPHeaders: { blobContentType: 'application/json' },
-                });
+            async ([key, { eTag = '', ...change }]) => {
+                try {
+                    const blob = this._containerClient.getBlockBlobClient(sanitizeBlobKey(key));
+                    const serialized = JSON.stringify(change);
+                    return await blob.upload(serialized, serialized.length, {
+                        conditions: typeof eTag === 'string' && eTag !== '*' ? { ifMatch: eTag } : {},
+                        blobHTTPHeaders: { blobContentType: 'application/json' },
+                    });
+                } catch (err: any) {
+                    if (err.statusCode === 412) {
+                        throw new Error(`Storage: error writing "${key}" due to eTag conflict.`);
+                    } else {
+                        throw err;
+                    }
+                }
             },
             {
                 concurrency: this._concurrency,
-            }
+            },
         );
     }
 

libraries/botbuilder-azure-blobs/tests/blobsStorage.test.js

@@ -53,6 +53,21 @@ describe('BlobsStorage', function () {
         maybeIt('should write a set of values', async () => {
             await client.write({ foo, bar });
         });
+
+        maybeIt('should fail with eTag conflict error', async () => {
+            const changes = {
+                item1: {
+                    key1: 'value1',
+                    eTag: 'etag1',
+                },
+                item2: {
+                    key2: 'value2',
+                    eTag: 'etag1',
+                },
+            };
+
+            await assert.rejects(() => client.write(changes), 'Storage: error writing "item2" due to eTag conflict.');
+        });
     });
 
     describe('delete()', function () {