fix(account): improve authorization checks when leaving identity

PolymeshAssociation · Aug 16, 2021 · 306797d · 306797d
1 parent 95892e0
commit 306797d
Show file tree

Hide file tree

Showing 5 changed files with 95 additions and 10 deletions.
diff --git a/src/api/procedures/__tests__/leaveIdentity.ts b/src/api/procedures/__tests__/leaveIdentity.ts
@@ -103,7 +103,21 @@ describe('modifyCaCheckpoint procedure', () => {
       const proc = procedureMockUtils.getInstance<LeaveIdentityParams, void>(mockContext);
       const boundFunc = getAuthorization.bind(proc);
 
-      expect(boundFunc()).toEqual({
+      let account = entityMockUtils.getAccountInstance({ isEqual: false });
+
+      expect(boundFunc({ account })).toEqual({
+        roles: false,
+        permissions: {
+          tokens: [],
+          transactions: [TxTags.identity.LeaveIdentityAsKey],
+          portfolios: [],
+        },
+      });
+
+      account = entityMockUtils.getAccountInstance({ isEqual: true });
+
+      expect(boundFunc({ account })).toEqual({
+        roles: true,
         permissions: {
           tokens: [],
           transactions: [TxTags.identity.LeaveIdentityAsKey],

diff --git a/src/api/procedures/__tests__/setCustodian.ts b/src/api/procedures/__tests__/setCustodian.ts
@@ -130,7 +130,7 @@ describe('setCustodian procedure', () => {
       PortfolioCustody: dsMockUtils.createMockPortfolioId({ did: rawDid, kind: rawPortfolioKind }),
     });
     const rawExpiry = dsMockUtils.createMockMoment(expiry.getTime());
-    const fakePortfolio = entityMockUtils.getNumberedPortfolioInstance({ uuid: 'otherUuid' });
+    const fakePortfolio = entityMockUtils.getNumberedPortfolioInstance({ isEqual: false });
     const receivedAuthorizations: AuthorizationRequest[] = [
       entityMockUtils.getAuthorizationRequestInstance({
         target,
@@ -147,6 +147,12 @@ describe('setCustodian procedure', () => {
           getReceived: receivedAuthorizations,
         },
       },
+      defaultPortfolioOptions: {
+        isEqual: false,
+      },
+      numberedPortfolioOptions: {
+        isEqual: false,
+      },
     });
 
     signerToStringStub.withArgs(signer).returns(signer.address);

diff --git a/src/api/procedures/setCustodian.ts b/src/api/procedures/setCustodian.ts
@@ -58,10 +58,10 @@ export async function prepareSetCustodian(
     context.getCurrentIdentity(),
   ]);
 
-  const hasPendingAuth = authorizationRequests.find(authorizationRequest => {
+  const hasPendingAuth = !!authorizationRequests.find(authorizationRequest => {
     const { issuer, data } = authorizationRequest;
     const authorizationData = data as { value: NumberedPortfolio | DefaultPortfolio };
-    return currentIdentity.did === issuer.did && authorizationData.value.uuid === portfolio.uuid;
+    return currentIdentity.isEqual(issuer) && authorizationData.value.isEqual(portfolio);
   });
 
   if (hasPendingAuth) {

diff --git a/src/testUtils/mocks/dataSources.ts b/src/testUtils/mocks/dataSources.ts
@@ -292,6 +292,7 @@ interface ContextOptions {
   isFrozen?: boolean;
   addPair?: Pair;
   getAccounts?: Account[];
+  currentIdentityIsEqual?: boolean;
 }
 
 interface KeyringOptions {
@@ -559,6 +560,7 @@ const defaultContextOptions: ContextOptions = {
     publicKey: 'someKey',
   },
   getAccounts: [],
+  currentIdentityIsEqual: true,
 };
 let contextOptions: ContextOptions = defaultContextOptions;
 const defaultKeyringOptions: KeyringOptions = {
@@ -610,6 +612,7 @@ function configureContext(opts: ContextOptions): void {
       getSent: sinon.stub().resolves(opts.sentAuthorizations),
     },
     areSecondaryKeysFrozen: sinon.stub().resolves(opts.areScondaryKeysFrozen),
+    isEqual: sinon.stub().returns(opts.currentIdentityIsEqual),
   };
   opts.withSeed
     ? getCurrentIdentity.resolves(identity)