[storage] temporary fix for issue #11505 (#11737)

* temporary fix for issue #11505 * format
Azure · Oct 9, 2020 · 981933b · 981933b
1 parent 91763cf
commit 981933b
Show file tree

Hide file tree

Showing 3 changed files with 132 additions and 8 deletions.
diff --git a/..._nodejs_only/recording_setaccesspolicy_and_getaccesspolicy_with_empty_signedidentifier.js b/..._nodejs_only/recording_setaccesspolicy_and_getaccesspolicy_with_empty_signedidentifier.js
diff --git a/sdk/storage/storage-file-share/src/Clients.ts b/sdk/storage/storage-file-share/src/Clients.ts
@@ -1132,12 +1132,23 @@ export class ShareClient extends StorageClient {
       };
 
       for (const identifier of response) {
+        let accessPolicy: any = undefined;
+        if (identifier.accessPolicy) {
+          accessPolicy = {
+            permissions: identifier.accessPolicy.permissions
+          };
+
+          if (identifier.accessPolicy.expiresOn) {
+            accessPolicy.expiresOn = new Date(identifier.accessPolicy.expiresOn);
+          }
+
+          if (identifier.accessPolicy.startsOn) {
+            accessPolicy.startsOn = new Date(identifier.accessPolicy.startsOn);
+          }
+        }
+
         res.signedIdentifiers.push({
-          accessPolicy: {
-            expiresOn: new Date(identifier.accessPolicy!.expiresOn!),
-            permissions: identifier.accessPolicy!.permissions!,
-            startsOn: new Date(identifier.accessPolicy!.startsOn!)
-          },
+          accessPolicy,
           id: identifier.id
         });
       }
@@ -1182,9 +1193,13 @@ export class ShareClient extends StorageClient {
       for (const identifier of shareAcl || []) {
         acl.push({
           accessPolicy: {
-            expiresOn: truncatedISO8061Date(identifier.accessPolicy.expiresOn),
-            permissions: identifier.accessPolicy.permissions,
-            startsOn: truncatedISO8061Date(identifier.accessPolicy.startsOn)
+            expiresOn: identifier.accessPolicy?.expiresOn
+              ? truncatedISO8061Date(identifier.accessPolicy.expiresOn)
+              : undefined,
+            permissions: identifier.accessPolicy?.permissions,
+            startsOn: identifier.accessPolicy?.startsOn
+              ? truncatedISO8061Date(identifier.accessPolicy.startsOn)
+              : undefined
           },
           id: identifier.id
         });

diff --git a/sdk/storage/storage-file-share/test/node/shareclient.spec.ts b/sdk/storage/storage-file-share/test/node/shareclient.spec.ts
@@ -62,6 +62,20 @@ describe("ShareClient Node.js only", () => {
     done();
   });
 
+  it("setAccessPolicy and getAccessPolicy with empty SignedIdentifier", async () => {
+    const identifiers: any = [
+      {
+        id: "MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI="
+      }
+    ];
+
+    await shareClient.setAccessPolicy(identifiers);
+    const getAccessPolicyResponse = await shareClient.getAccessPolicy();
+
+    assert.equal(getAccessPolicyResponse.signedIdentifiers[0].id, identifiers[0].id);
+    assert.deepStrictEqual(getAccessPolicyResponse.signedIdentifiers[0].accessPolicy, undefined);
+  });
+
   it("can be created with a url and a credential", async () => {
     const factories = (shareClient as any).pipeline.factories;
     const credential = factories[factories.length - 1] as StorageSharedKeyCredential;