fix: allow to issuer identity to cancel pending JoinToIdentity auths

PolymeshAssociation · Nov 19, 2020 · 5ca310e · 5ca310e
1 parent 4357d54
commit 5ca310e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/api/procedures/__tests__/consumeJoinIdentityAuthorization.ts b/src/api/procedures/__tests__/consumeJoinIdentityAuthorization.ts
@@ -169,6 +169,12 @@ describe('consumeJoinIdentityAuthorization procedure', () => {
 
       result = await boundFunc(args);
       expect(result).toBe(false);
+
+      args.accept = false;
+      args.authRequest.issuer = await mockContext.getCurrentIdentity();
+
+      result = await boundFunc(args);
+      expect(result).toBe(true);
     });
   });
 });
diff --git a/src/api/procedures/consumeJoinIdentityAuthorization.ts b/src/api/procedures/consumeJoinIdentityAuthorization.ts
@@ -59,21 +59,28 @@ export async function prepareConsumeJoinIdentityAuthorization(
  */
 export async function isAuthorized(
   this: Procedure<ConsumeJoinIdentityAuthorizationParams>,
-  { authRequest }: ConsumeJoinIdentityAuthorizationParams
+  { authRequest, accept }: ConsumeJoinIdentityAuthorizationParams
 ): Promise<boolean> {
-  const { target } = authRequest;
+  const { target, issuer } = authRequest;
   const { context } = this;
 
   let condition;
+  let did: string;
+  const fetchDid = async (): Promise<string> => did || (await context.getCurrentIdentity()).did;
 
   if (target instanceof Account) {
     const { address } = context.getCurrentAccount();
     condition = address === target.address;
   } else {
-    const { did } = await context.getCurrentIdentity();
+    did = await fetchDid();
     condition = did === target.did;
   }
 
+  if (!accept) {
+    did = await fetchDid();
+    condition = condition || did === issuer.did;
+  }
+
   return condition && !authRequest.isExpired();
 }