Finalizing revoke ok invite

Author: perki

src/appTemplates/Collector.js

@@ -1,6 +1,7 @@
 const { HDSLibError } = require('../errors');
 const { waitUntilFalse } = require('../utils');
 const CollectorInvite = require('./CollectorInvite');
+const logger = require('../logger');
 
 const COLLECTOR_STREAMID_SUFFIXES = {
   archive: 'archive',
@@ -328,6 +329,15 @@ class Collector {
    * @returns {CollectorInvite}
    */
   async revokeInvite (invite) {
+    // Invalidate Invite APIEndpoint(s)
+    if (invite.status === 'active') { // invalidate eventual authorization granted
+      const accessInfo = await invite.checkAndGetAccessInfo(true);
+      const deletionResult = await invite.connection.apiOne('accesses.delete', { id: accessInfo.id });
+      if (deletionResult?.accessDeletion?.id == null) {
+        logger.warn(`Failed revoking invite access for ${accessInfo.name}`);
+      }
+    }
+
     // invalidate this access
     const updateInvite = {
       id: invite.eventData.id,
@@ -336,7 +346,6 @@ class Collector {
         streamIds: [this.streamIdFor(Collector.STREAMID_SUFFIXES.error)]
       }
     };
-    // TODO revoke updateInvite.apiEndPoint
 
     updateInvite.update.content.errorType = 'revoked';
     const eventData = await this.appManaging.connection.apiOne('events.update', updateInvite, 'event');

src/appTemplates/CollectorInvite.js

@@ -69,13 +69,20 @@ class CollectorInvite {
     } catch (e) {
       this.#accessInfo = null;
       if (e.response?.body?.error?.id === 'invalid-access-token') {
-        await this.collector.revokeInvite(this);
+        await this.revoke();
         return null;
       }
       throw e;
     }
   }
 
+  /**
+   * revoke the invite
+   */
+  async revoke () {
+    return this.collector.revokeInvite(this);
+  }
+
   get displayName () {
     return this.eventData.content.name;
   }

tests/apptemplates.test.js

@@ -294,7 +294,7 @@ describe('[APTX] appTemplates', function () {
       assert.equal(invitesFromInbox[0].errorType, 'refused');
     });
 
-    it('[APCR] Collector invite revoke', async () => {
+    it('[APCR] Collector Client invite revoke', async () => {
       const { collector, collectorClient, invite } = await helperNewInvite(appManaging, appClient, 'APCR');
       await collectorClient.accept();
 
@@ -314,6 +314,29 @@ describe('[APTX] appTemplates', function () {
       assert.equal(invite.status, 'error');
       assert.equal(invite.errorType, 'revoked');
     });
+
+    it('[APCM] Collector (manager) invite revoke after accept', async () => {
+      const { collector, collectorClient, invite } = await helperNewInvite(appManaging, appClient, 'APCM');
+      await collectorClient.accept();
+
+      // check collector
+      const invitesFromInbox1 = await collector.checkInbox();
+      assert.equal(invitesFromInbox1[0], invite);
+      assert.equal(invite.status, 'active');
+
+      // revoke invitation
+      await invite.revoke();
+      assert.equal(invite.status, 'error');
+      assert.equal(invite.errorType, 'revoked');
+
+      // check if authorization is revoked
+      try {
+        await invite.connection.accessInfo();
+        throw new Error('Should be forbidden');
+      } catch (e) {
+        assert(e.message === 'Forbidden');
+      }
+    });
   });
 
   describe('[APEX] Errors ', () => {

types/appTemplates/Collector.d.ts

@@ -76,7 +76,7 @@ declare class Collector {
      * @param {CollectorInvite} invite
      * @returns {CollectorInvite}
      */
-    private revokeInvite;
+    private revokeInvite(): Promise<CollectorInvite>;
     /**
      * check if required streams are present, if not create them
      */

types/appTemplates/CollectorInvite.d.ts

@@ -41,5 +41,9 @@ declare class CollectorInvite {
         apiEndpoint: string;
         eventId: string;
     }>;
+    /**
+     * revoke the invite
+     */
+    revoke(): Promise<void>;
     #private;
 }