Merge pull request #4179 from alkem-io/server-4178

fix deletion + auth propagation for storage aggregator on account
alkem-io · Jun 29, 2024 · 4fdb2d0 · 4fdb2d0
2 parents cd5c2f5 + a29ef81
commit 4fdb2d0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/domain/space/account/account.service.authorization.ts b/src/domain/space/account/account.service.authorization.ts
@@ -30,6 +30,7 @@ import { IVirtualContributor } from '@domain/community/virtual-contributor';
 import { VirtualContributorAuthorizationService } from '@domain/community/virtual-contributor/virtual.contributor.service.authorization';
 import { ICredentialDefinition } from '@domain/agent/credential/credential.definition.interface';
 import { AccountHostService } from '../account.host/account.host.service';
+import { StorageAggregatorAuthorizationService } from '@domain/storage/storage-aggregator/storage.aggregator.service.authorization';
 
 @Injectable()
 export class AccountAuthorizationService {
@@ -41,6 +42,7 @@ export class AccountAuthorizationService {
     private platformAuthorizationService: PlatformAuthorizationPolicyService,
     private spaceAuthorizationService: SpaceAuthorizationService,
     private virtualContributorAuthorizationService: VirtualContributorAuthorizationService,
+    private storageAggregatorAuthorizationService: StorageAggregatorAuthorizationService,
     private accountService: AccountService,
     private accountHostService: AccountHostService
   ) {}
@@ -56,6 +58,7 @@ export class AccountAuthorizationService {
           library: true,
           defaults: true,
           virtualContributors: true,
+          storageAggregator: true,
         },
       }
     );
@@ -65,7 +68,8 @@ export class AccountAuthorizationService {
       !account.library ||
       !account.license ||
       !account.defaults ||
-      !account.virtualContributors
+      !account.virtualContributors ||
+      !account.storageAggregator
     ) {
       throw new RelationshipNotFoundException(
         `Unable to load Account with entities at start of auth reset: ${account.id} `,
@@ -109,6 +113,12 @@ export class AccountAuthorizationService {
         account.authorization
       );
 
+    account.storageAggregator =
+      await this.storageAggregatorAuthorizationService.applyAuthorizationPolicy(
+        account.storageAggregator,
+        account.authorization
+      );
+
     account.defaults.authorization =
       this.authorizationPolicyService.inheritParentAuthorization(
         account.defaults.authorization,

diff --git a/src/domain/space/account/account.service.ts b/src/domain/space/account/account.service.ts
@@ -248,6 +248,7 @@ export class AccountService {
         license: true,
         defaults: true,
         virtualContributors: true,
+        storageAggregator: true,
       },
     });
 
@@ -257,7 +258,8 @@ export class AccountService {
       !account.license ||
       !account.defaults ||
       !account.library ||
-      !account.virtualContributors
+      !account.virtualContributors ||
+      !account.storageAggregator
     ) {
       throw new RelationshipNotFoundException(
         `Unable to load all entities for deletion of account ${account.id} `,
@@ -276,6 +278,7 @@ export class AccountService {
 
     await this.licenseService.delete(account.license.id);
     await this.spaceDefaultsService.deleteSpaceDefaults(account.defaults.id);
+    await this.storageAggregatorService.delete(account.storageAggregator.id);
 
     // Remove the account host credential
     host.agent = await this.agentService.revokeCredential({