Merge remote-tracking branch 'origin/main' into feature/nar-1698-hard…

…en-npm-dependencies

apps/armory/src/armory.constant.ts

@@ -58,7 +58,7 @@ export const REQUEST_HEADER_API_KEY = 'x-api-key'
 //
 
 export const ADMIN_SECURITY = adminApiKeySecurity(REQUEST_HEADER_API_KEY)
-export const CLIENT_ID_SECURITY = clientIdSecurity(REQUEST_HEADER_CLIENT_SECRET)
+export const CLIENT_ID_SECURITY = clientIdSecurity(REQUEST_HEADER_CLIENT_ID)
 export const CLIENT_SECRET_SECURITY = clientSecretSecurity(REQUEST_HEADER_CLIENT_SECRET)
 
 //

apps/armory/src/client/http/rest/controller/client.controller.ts

@@ -1,6 +1,6 @@
 import { Body, Controller, HttpStatus, Post } from '@nestjs/common'
 import { ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger'
-import { AdminGuard } from '../../../../shared/decorator/admin-guard.decorator'
+import { ApiAdminGuard } from '../../../../shared/decorator/api-admin-guard.decorator'
 import { ClientService } from '../../../core/service/client.service'
 import { CreateClientRequestDto, CreateClientResponseDto } from '../dto/create-client.dto'
 
@@ -10,7 +10,7 @@ export class ClientController {
   constructor(private clientService: ClientService) {}
 
   @Post()
-  @AdminGuard()
+  @ApiAdminGuard()
   @ApiOperation({
     summary: 'Creates a new client'
   })

apps/armory/src/managed-data-store/http/rest/controller/data-store.controller.ts

@@ -2,8 +2,8 @@ import { Criterion, EntityUtil, Then, UserRole } from '@narval/policy-engine-sha
 import { Body, Controller, Get, HttpCode, HttpStatus, Post, Query, UseGuards } from '@nestjs/common'
 import { ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger'
 import { ClusterService } from '../../../../policy-engine/core/service/cluster.service'
+import { ApiClientSecretGuard } from '../../../../shared/decorator/api-client-secret-guard.decorator'
 import { ClientId } from '../../../../shared/decorator/client-id.decorator'
-import { ClientSecretGuard } from '../../../../shared/guard/client-secret.guard'
 import { EntityDataStoreService } from '../../../core/service/entity-data-store.service'
 import { PolicyDataStoreService } from '../../../core/service/policy-data-store.service'
 import { DataStoreGuard } from '../../../shared/guard/data-store.guard'
@@ -23,14 +23,14 @@ export class DataStoreController {
   ) {}
 
   @Get('/entities')
+  @UseGuards(DataStoreGuard)
   @ApiOperation({
     summary: 'Gets the client entities'
   })
   @ApiResponse({
     status: HttpStatus.OK,
     type: EntityDataStoreDto
   })
-  @UseGuards(DataStoreGuard)
   async getEntities(@Query('clientId') clientId: string): Promise<EntityDataStoreDto> {
     const entity = await this.entityDataStoreService.getEntities(clientId)
 
@@ -47,14 +47,14 @@ export class DataStoreController {
   }
 
   @Get('/policies')
+  @UseGuards(DataStoreGuard)
   @ApiOperation({
     summary: 'Gets the client policies'
   })
   @ApiResponse({
     status: HttpStatus.OK,
     type: PolicyDataStoreDto
   })
-  @UseGuards(DataStoreGuard)
   async getPolicies(@Query('clientId') clientId: string): Promise<PolicyDataStoreDto> {
     const policy = await this.policyDataStoreService.getPolicies(clientId)
 
@@ -110,8 +110,8 @@ export class DataStoreController {
   }
 
   @Post('/sync')
+  @ApiClientSecretGuard()
   @HttpCode(HttpStatus.OK)
-  @UseGuards(ClientSecretGuard)
   @ApiOperation({
     summary: 'Sync the client data store with the engine cluster'
   })

apps/armory/src/orchestration/http/rest/controller/authorization-request.controller.ts

@@ -1,6 +1,6 @@
 import { Body, Controller, Get, HttpStatus, NotFoundException, Param, Post } from '@nestjs/common'
-import { ApiHeader, ApiOperation, ApiResponse, ApiSecurity, ApiTags } from '@nestjs/swagger'
-import { REQUEST_HEADER_CLIENT_ID } from '../../../../../src/armory.constant'
+import { ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger'
+import { ApiClientIdGuard } from '../../../../shared/decorator/api-client-id-guard.decorator'
 import { ClientId } from '../../../../shared/decorator/client-id.decorator'
 import { ErrorResponseDto } from '../../../../shared/dto/error-response.dto'
 import { AuthorizationRequestService } from '../../../core/service/authorization-request.service'
@@ -14,14 +14,10 @@ export class AuthorizationRequestController {
   constructor(private authorizationRequestService: AuthorizationRequestService) {}
 
   @Post('/')
-  @ApiSecurity('CLIENT_ID')
+  @ApiClientIdGuard()
   @ApiOperation({
     summary: 'Submits a new authorization request for evaluation by the policy engine'
   })
-  @ApiHeader({
-    name: REQUEST_HEADER_CLIENT_ID,
-    required: true
-  })
   @ApiResponse({
     description: 'The authorization request has been successfully submitted for evaluation',
     status: HttpStatus.CREATED,
@@ -37,6 +33,7 @@ export class AuthorizationRequestController {
   }
 
   @Get('/:id')
+  @ApiClientIdGuard()
   @ApiOperation({
     summary: 'Gets an authorization request by ID'
   })
@@ -61,6 +58,7 @@ export class AuthorizationRequestController {
   }
 
   @Post('/:id/approvals')
+  @ApiClientIdGuard()
   @ApiOperation({
     summary: 'Approves an authorization request'
   })

apps/armory/src/orchestration/orchestration.module.ts

@@ -6,9 +6,12 @@ import { BullModule } from '@nestjs/bull'
 import { Module } from '@nestjs/common'
 import { load } from '../armory.config'
 import { AUTHORIZATION_REQUEST_PROCESSING_QUEUE, DEFAULT_HTTP_MODULE_PROVIDERS } from '../armory.constant'
+import { ClientModule } from '../client/client.module'
 import { DataFeedModule } from '../data-feed/data-feed.module'
 import { PolicyEngineModule } from '../policy-engine/policy-engine.module'
 import { PriceModule } from '../price/price.module'
+import { ClientIdGuard } from '../shared/guard/client-id.guard'
+import { ClientSecretGuard } from '../shared/guard/client-secret.guard'
 import { PersistenceModule } from '../shared/module/persistence/persistence.module'
 import { TransferTrackingModule } from '../transfer-tracking/transfer-tracking.module'
 import { AuthorizationRequestService } from './core/service/authorization-request.service'
@@ -34,13 +37,15 @@ const INFRASTRUCTURE_MODULES = [
   })
 ]
 
-const DOMAIN_MODULES = [TransferTrackingModule, PriceModule, DataFeedModule, PolicyEngineModule]
+const DOMAIN_MODULES = [ClientModule, TransferTrackingModule, PriceModule, DataFeedModule, PolicyEngineModule]
 
 @Module({
   imports: [...INFRASTRUCTURE_MODULES, ...DOMAIN_MODULES],
   controllers: [AuthorizationRequestController],
   providers: [
     ...DEFAULT_HTTP_MODULE_PROVIDERS,
+    ClientIdGuard,
+    ClientSecretGuard,
     AuthorizationRequestService,
     AuthorizationRequestRepository,
     AuthorizationRequestProcessingConsumer,

apps/armory/src/shared/decorator/admin-guard.decorator.ts → apps/armory/src/shared/decorator/api-admin-guard.decorator.ts

@@ -3,7 +3,7 @@ import { ApiHeader, ApiSecurity } from '@nestjs/swagger'
 import { ADMIN_SECURITY, REQUEST_HEADER_API_KEY } from '../../armory.constant'
 import { AdminApiKeyGuard } from '../guard/admin-api-key.guard'
 
-export function AdminGuard() {
+export function ApiAdminGuard() {
   return applyDecorators(
     UseGuards(AdminApiKeyGuard),
     ApiSecurity(ADMIN_SECURITY.name),

apps/armory/src/shared/decorator/api-client-id-guard.decorator.ts

@@ -0,0 +1,15 @@
+import { UseGuards, applyDecorators } from '@nestjs/common'
+import { ApiHeader, ApiSecurity } from '@nestjs/swagger'
+import { CLIENT_ID_SECURITY, REQUEST_HEADER_CLIENT_ID } from '../../armory.constant'
+import { ClientIdGuard } from '../guard/client-id.guard'
+
+export function ApiClientIdGuard() {
+  return applyDecorators(
+    UseGuards(ClientIdGuard),
+    ApiSecurity(CLIENT_ID_SECURITY.name),
+    ApiHeader({
+      name: REQUEST_HEADER_CLIENT_ID,
+      required: true
+    })
+  )
+}

apps/armory/src/shared/decorator/client-guard.decorator.ts → apps/armory/src/shared/decorator/api-client-secret-guard.decorator.ts

@@ -2,12 +2,10 @@ import { UseGuards, applyDecorators } from '@nestjs/common'
 import { ApiHeader, ApiSecurity } from '@nestjs/swagger'
 import { CLIENT_SECRET_SECURITY, REQUEST_HEADER_CLIENT_SECRET } from '../../armory.constant'
 import { ClientSecretGuard } from '../guard/client-secret.guard'
-import { ApiClientId } from './api-client-id.decorator'
 
-export function ClientGuard() {
+export function ApiClientSecretGuard() {
   return applyDecorators(
     UseGuards(ClientSecretGuard),
-    ApiClientId(),
     ApiSecurity(CLIENT_SECRET_SECURITY.name),
     ApiHeader({
       required: true,

apps/armory/src/shared/guard/client-id.guard.ts

@@ -0,0 +1,33 @@
+import { CanActivate, ExecutionContext, HttpStatus, Injectable } from '@nestjs/common'
+import { REQUEST_HEADER_CLIENT_ID } from '../../armory.constant'
+import { ClientService } from '../../client/core/service/client.service'
+import { ApplicationException } from '../exception/application.exception'
+
+@Injectable()
+export class ClientIdGuard implements CanActivate {
+  constructor(private clientService: ClientService) {}
+
+  async canActivate(context: ExecutionContext): Promise<boolean> {
+    const req = context.switchToHttp().getRequest()
+
+    const clientId = req.headers[REQUEST_HEADER_CLIENT_ID]
+
+    if (!clientId) {
+      throw new ApplicationException({
+        message: `Missing or invalid ${REQUEST_HEADER_CLIENT_ID} header`,
+        suggestedHttpStatusCode: HttpStatus.UNAUTHORIZED
+      })
+    }
+
+    const client = await this.clientService.findById(clientId)
+
+    if (!client) {
+      throw new ApplicationException({
+        message: `Client not found for ${REQUEST_HEADER_CLIENT_ID} header`,
+        suggestedHttpStatusCode: HttpStatus.NOT_FOUND
+      })
+    }
+
+    return true
+  }
+}

apps/vault/src/vault/http/rest/controller/account.controller.ts

@@ -31,6 +31,7 @@ export class AccountController {
   @ApiOperation({
     summary: 'Lists the client accounts'
   })
+  @PermissionGuard(Permission.WALLET_READ)
   @ApiResponse({
     status: HttpStatus.CREATED,
     type: AccountsDto

packages/armory-sdk/src/lib/auth/client.ts

@@ -133,7 +133,7 @@ export class AuthClient {
    * @returns A Promise that resolves to the retrieved AuthorizationResponseDto.
    */
   async getAuthorizationById(id: string): Promise<AuthorizationResponseDto> {
-    const { data } = await this.authorizationHttp.getById(id)
+    const { data } = await this.authorizationHttp.getById(this.config.clientId, id)
 
     return data
   }

packages/armory-sdk/src/lib/auth/type.ts

@@ -54,7 +54,7 @@ export type AuthorizationHttp = {
    * @param {*} [options] Override http request option.
    * @throws {RequiredError}
    */
-  getById(id: string, options?: RawAxiosRequestConfig): AxiosPromise<AuthorizationResponseDto>
+  getById(id: string, clientId: string, options?: RawAxiosRequestConfig): AxiosPromise<AuthorizationResponseDto>
 }
 
 export type AuthClientHttp = {

packages/armory-sdk/src/lib/data-store/client.ts

@@ -116,7 +116,7 @@ export class EntityStoreClient {
   async sync(): Promise<boolean> {
     assert(this.config.clientSecret !== undefined, 'Missing clientSecret')
 
-    const { data } = await this.dataStoreHttp.sync({
+    const { data } = await this.dataStoreHttp.sync(this.config.clientSecret, {
       headers: {
         [REQUEST_HEADER_CLIENT_ID]: this.config.clientId,
         [REQUEST_HEADER_CLIENT_SECRET]: this.config.clientSecret
@@ -205,7 +205,7 @@ export class PolicyStoreClient {
   async sync(): Promise<boolean> {
     assert(this.config.clientSecret !== undefined, 'Missing clientSecret')
 
-    const { data } = await this.dataStoreHttp.sync({
+    const { data } = await this.dataStoreHttp.sync(this.config.clientSecret, {
       headers: {
         [REQUEST_HEADER_CLIENT_ID]: this.config.clientId,
         [REQUEST_HEADER_CLIENT_SECRET]: this.config.clientSecret

packages/armory-sdk/src/lib/data-store/type.ts

@@ -84,5 +84,5 @@ export type DataStoreHttp = {
    * @param {*} [options] Override http request option.
    * @throws {RequiredError}
    */
-  sync(options?: RawAxiosRequestConfig): AxiosPromise<SyncResponse>
+  sync(clientSecret: string, options?: RawAxiosRequestConfig): AxiosPromise<SyncResponse>
 }

packages/armory-sdk/src/lib/http/client/README.md

@@ -14,6 +14,10 @@ servers.
 The generate targets uses `openapi-generator-cli` that depends on a running
 server hosting the Swagger documentation.
 
+It requires JAVA to be installed so make sure it's installed by running `java -version` in your terminal.
+
+You can install it by running `brew install java` or by downloading it directly from [this website](https://www.oracle.com/java/technologies/downloads/#jdk22-mac).
+
 ```bash
 # Start the server
 make armory/start/dev