Merge pull request #4466 from alkem-io/develop

v0.89.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "alkemio-server",
-  "version": "0.88.2",
+  "version": "0.89.0",
   "description": "Alkemio server, responsible for managing the shared Alkemio platform",
   "author": "Alkemio Foundation",
   "private": false,
@@ -42,6 +42,7 @@
     "migration:revert": "npm run typeorm-no-entities migration:revert",
     "migration:show": "npm run typeorm migration:show",
     "migration:validate": "./.scripts/migrations/run_validate_migration.sh",
+    "circular-dependencies": "madge --circular dist",
     "db:recreate": "ts-node .scripts/tests/recreate-db.ts",
     "db:reset": "npm run db:recreate && npm run migration:run"
   },
@@ -86,7 +87,6 @@
     "cookie-parser": "^1.4.6",
     "cross-env": "^7.0.3",
     "dataloader": "^2.2.2",
-    "file-type": "^19.1.1",
     "graphql": "^16.9.0",
     "graphql-amqp-subscriptions": "^2.0.0",
     "graphql-subscriptions": "^2.0.0",

src/app.module.ts

@@ -50,7 +50,7 @@ import { PlatformModule } from '@platform/platfrom/platform.module';
 import { ContributionReporterModule } from '@services/external/elasticsearch/contribution-reporter';
 import { DataLoaderInterceptor } from '@core/dataloader/interceptors';
 import { InnovationHubInterceptor } from '@common/interceptors';
-import { InnovationHubModule } from '@domain/innovation-hub';
+import { InnovationHubModule } from '@domain/innovation-hub/innovation.hub.module';
 import { SsiCredentialFlowController } from '@services/api-rest/ssi-credential-flow/ssi.credential.flow.controller';
 import { SsiCredentialFlowModule } from '@services/api-rest/ssi-credential-flow/ssi.credential.flow.module';
 import { StorageAccessModule } from '@services/api-rest/storage-access/storage.access.module';
@@ -79,6 +79,8 @@ import { FileIntegrationModule } from '@services/file-integration';
 import { AdminLicensingModule } from '@platform/admin/licensing/admin.licensing.module';
 import { PlatformRoleModule } from '@platform/platfrom.role/platform.role.module';
 import { LookupByNameModule } from '@services/api/lookup-by-name';
+import { PlatformHubModule } from '@platform/platfrom.hub/platform.hub.module';
+import { AdminContributorsModule } from '@platform/admin/avatars/admin.avatar.module';
 
 @Module({
   imports: [
@@ -238,6 +240,7 @@ import { LookupByNameModule } from '@services/api/lookup-by-name';
     ActivityLogModule,
     RolesModule,
     KonfigModule,
+    AdminContributorsModule,
     AdminCommunicationModule,
     AdminSearchIngestModule,
     AdminLicensingModule,
@@ -250,6 +253,7 @@ import { LookupByNameModule } from '@services/api/lookup-by-name';
     LibraryModule,
     PlatformModule,
     PlatformRoleModule,
+    PlatformHubModule,
     ContributionMoveModule,
     GeoLocationModule,
     ContributionReporterModule,

src/common/constants/authorization/credential.rule.types.constants.ts

@@ -2,6 +2,8 @@ export const CREDENTIAL_RULE_TYPES_ACCOUNT_AUTHORIZATION_RESET =
   'credentialRuleTypes-accountAuthorizationReset';
 export const CREDENTIAL_RULE_TYPES_ACCOUNT_MANAGE =
   'credentialRuleTypes-accountManage';
+export const CREDENTIAL_RULE_TYPES_ACCOUNT_RESOURCES_MANAGE =
+  'credentialRuleTypes-accountResourcesManage';
 export const CREDENTIAL_RULE_TYPES_ACCOUNT_CHILD_ENTITIES =
   'credentialRuleTypes-accountChildEntities';
 export const CREDENTIAL_RULE_TYPES_SPACE_GLOBAL_COMMUNITY_READ =

src/common/enums/authorization.credential.ts

@@ -11,8 +11,6 @@ export enum AuthorizationCredential {
 
   USER_SELF_MANAGEMENT = 'user-self', // able to update a user
 
-  ACCOUNT_HOST = 'account-host',
-
   SPACE_ADMIN = 'space-admin',
   SPACE_MEMBER = 'space-member',
   SPACE_LEAD = 'space-lead',

src/common/enums/authorization.policy.type.ts

@@ -48,8 +48,8 @@ export enum AuthorizationPolicyType {
   CALENDAR = 'calendar',
   CALENDAR_EVENT = 'calendar-event',
   TIMELINE = 'timeline',
-
   IN_MEMORY = 'in-memory',
+  LICENSING = 'licensing',
   UNKNOWN = 'unknown',
   AI_PERSONA_SERVICE = 'ai-persona-service',
 }

src/common/enums/authorization.privilege.ts

@@ -22,6 +22,8 @@ export enum AuthorizationPrivilege {
   CREATE_SUBSPACE = 'create-subspace',
   CREATE_ORGANIZATION = 'create-organization',
   CREATE_VIRTUAL_CONTRIBUTOR = 'create-virtual-contributor',
+  CREATE_INNOVATION_PACK = 'create-innovation-pack',
+  CREATE_INNOVATION_HUB = 'create-innovation-hub',
   FILE_UPLOAD = 'file-upload',
   FILE_DELETE = 'file-delete',
   UPDATE_WHITEBOARD = 'update-whiteboard',
@@ -43,6 +45,7 @@ export enum AuthorizationPrivilege {
   ACCESS_DASHBOARD_REFRESH = 'access-dashboard-refresh',
   UPDATE_CONTENT = 'update-content',
   SAVE_AS_TEMPLATE = 'save-as-template',
+  TRANSFER_RESOURCE = 'transfer-resource',
 }
 
 registerEnumType(AuthorizationPrivilege, {

src/common/interceptors/innovation.hub.interceptor.ts

@@ -10,7 +10,7 @@ import { GqlExecutionContext } from '@nestjs/graphql';
 import { INNOVATION_HUB_INJECT_TOKEN } from '@common/constants';
 import { WINSTON_MODULE_NEST_PROVIDER } from 'nest-winston';
 import { LogContext } from '@common/enums';
-import { InnovationHubService } from '@domain/innovation-hub';
+import { InnovationHubService } from '@domain/innovation-hub/innovation.hub.service';
 import { DOMAIN_PATTERN, SUBDOMAIN_PATTERN } from '@core/validation';
 import { AlkemioConfig } from '@src/types';
 

src/core/authorization/authorization.service.ts

@@ -33,7 +33,7 @@ export class AuthorizationService {
 
     if (this.isAccessGranted(agentInfo, auth, privilegeRequired)) return true;
 
-    const errorMsg = `Authorization: unable to grant '${privilegeRequired}' privilege: ${msg} user: ${agentInfo.userID}`;
+    const errorMsg = `Authorization: unable to grant '${privilegeRequired}' privilege: ${msg} user: ${agentInfo.userID} on authorization of type '${auth.type}'`;
     this.logCredentialCheckFailDetails(errorMsg, agentInfo, auth);
     // If you get to here then no match was found
     throw new ForbiddenAuthorizationPolicyException(