feat! : Added alternative object storage

.env.sample

@@ -9,7 +9,7 @@ API_GATEWAY_HOST='0.0.0.0'
 API_GATEWAY_PORT=5000
 API_GATEWAY_PROTOCOL_SECURE=http
 
-##
+## Platform Configurations
 PLATFORM_NAME= // Please specify your paltform name 
 PLATFORM_LOGO= // Please specify your paltform logo url
 PUBLIC_PLATFORM_SUPPORT_EMAIL= // Please specify your support email 
@@ -25,34 +25,15 @@ PUBLIC_QA_API_URL= // Please specify your your QA environment api URL
 PUBLIC_PRODUCTION_API_URL= // Please specify your PRODUCTION environment api URL
 PUBLIC_SANDBOX_API_URL= // Please specify your sandbox environment URL
 
-SHORTENED_URL_DOMAIN= // Please specify the domain for your bucket responsible for storing shortened url objects e.g. 'https://bucket-name.s3.ap-east-1.amazonaws.com'
 DEEPLINK_DOMAIN= // Please specify your doamin/subdomain responsible for deeplinking with 'url' as a query param e.g. 'https://your-deeplink-domain?url='
 
 [email protected]   // Please specify your agent host VM and IP address
-AWS_ACCOUNT_ID=xxxxx  // Please provide your AWS account Id
-S3_BUCKET_ARN=arn:aws:s3:::xxxxx  // Please provide your AWS bucket arn
 
 API_ENDPOINT=localhost:5000  #Use your local machine IP Address & PORT
 API_ENDPOINT_PORT=5000
 
 SOCKET_HOST=http://localhost:5000
 
-AWS_PUBLIC_ACCESS_KEY= // Please provide your aws bucket access key
-AWS_PUBLIC_SECRET_KEY= // Please provide your aws secret key
-AWS_PUBLIC_REGION= // Please provide your aws region
-AWS_PUBLIC_BUCKET_NAME= // Please provide your aws bucket name
-
-AWS_ORG_LOGO_BUCKET_NAME= // Please provide your aws org bucket name
-
-AWS_S3_STOREOBJECT_ACCESS_KEY= // Please provide your aws bucket access key
-AWS_S3_STOREOBJECT_SECRET_KEY= // Please provide your aws bucket secret key
-AWS_S3_STOREOBJECT_REGION= // Please provide your aws region
-AWS_S3_STOREOBJECT_BUCKET= // Please provide your aws bucket
-AWS_ACCESS_KEY= // Please provide your access key
-AWS_SECRET_KEY= // Please provide your secret key
-AWS_REGION= // Please provide your aws region
-AWS_BUCKET= // Please provide your aws bucket
-
 PLATFORM_ADMIN_EMAIL= // Please provide admin email Id
 
 NATS_HOST='0.0.0.0'
@@ -206,4 +187,25 @@ AGENT_API_KEY='supersecret-that-too-16chars'
 # VERIFIER_CLIENT_ALIAS=VERIFIER
 # VERIFIER_DOMAIN=https://VERIFIER-domain.com
 # VERIFIER_KEYCLOAK_MANAGEMENT_CLIENT_ID=encryptedKeyCloakClientId
-# VERIFIER_KEYCLOAK_MANAGEMENT_CLIENT_SECRET=encryptedKeyCloakClientSecret
+# VERIFIER_KEYCLOAK_MANAGEMENT_CLIENT_SECRET=encryptedKeyCloakClientSecret
+
+# FILE_STORAGE_PROVIDER can be 'aws' or 'minio'
+FILE_STORAGE_PROVIDER=minio
+
+# AWS Configurations
+AWS_ACCOUNT_ID=xxxxx  // Please provide your AWS account Id
+S3_BUCKET_ARN=arn:aws:s3:::xxxxx  // Please provide your AWS bucket arn
+AWS_ACCESS_KEY= // Please provide your access key
+AWS_SECRET_KEY= // Please provide your secret key
+AWS_REGION= // Please provide your aws region
+
+# MinIO Config : Use the same buckets as below three mentioned with AWS S3 config
+MINIO_ENDPOINT= // Please provide your minio endpoint
+MINIO_PORT= // Please provide your minio port
+MINIO_USE_SSL= // Please provide your minio ssl true/false
+MINIO_ACCESS_KEY= // Please provide your minio access key
+MINIO_SECRET_KEY= // Please provide your minio secret key
+
+STORE_OBJECT_BUCKET= // Please provide your aws bucket
+FILE_BUCKET= // Please provide your aws bucket for file sharing
+ORG_LOGO_BUCKET= // Please provide your aws bucket for org logo

apps/api-gateway/src/authz/guards/user-role.guard.ts

@@ -8,11 +8,11 @@ export class UserRoleGuard implements CanActivate {
 
     const { user } = request;
 
-    if (!user?.userRole) {
+    if (!user?.realm_access.roles) {
       throw new ForbiddenException('This role is not a holder.');
     }
-    
-    if (!user?.userRole.includes('holder')) {
+
+    if (!user?.realm_access.roles.includes('holder')) {
       throw new ForbiddenException('This role is not a holder.');
     }
 

apps/api-gateway/src/issuance/issuance.controller.ts

@@ -69,7 +69,7 @@ import {
   IssueCredentialType,
   UploadedFileDetails
 } from './interfaces';
-import { AwsService } from '@credebl/aws';
+import { StorageService } from '@credebl/storage';
 import { FileInterceptor } from '@nestjs/platform-express';
 import { v4 as uuidv4 } from 'uuid';
 import { RpcException } from '@nestjs/microservices';
@@ -89,7 +89,7 @@ import { NotFoundErrorDto } from '../dtos/not-found-error.dto';
 export class IssuanceController {
   constructor(
     private readonly issueCredentialService: IssuanceService,
-    private readonly awsService: AwsService
+    private readonly storageService: StorageService
   ) {}
   private readonly logger = new Logger('IssuanceController');
 
@@ -372,7 +372,7 @@ export class IssuanceController {
     if (file) {
       const fileKey: string = uuidv4();
       try {
-        await this.awsService.uploadCsvFile(fileKey, file?.buffer);
+        await this.storageService.uploadCsvFile(fileKey, file?.buffer);
       } catch (error) {
         throw new RpcException(error.response ? error.response : error);
       }
@@ -525,7 +525,7 @@ export class IssuanceController {
     if (file && clientDetails?.isSelectiveIssuance) {
       const fileKey: string = uuidv4();
       try {
-        await this.awsService.uploadCsvFile(fileKey, file.buffer);
+        await this.storageService.uploadCsvFile(fileKey, file.buffer);
       } catch (error) {
         throw new RpcException(error.response ? error.response : error);
       }

apps/api-gateway/src/issuance/issuance.module.ts

@@ -5,9 +5,9 @@ import { IssuanceService } from './issuance.service';
 import { CommonService } from '@credebl/common';
 import { HttpModule } from '@nestjs/axios';
 import { getNatsOptions } from '@credebl/common/nats.config';
-import { AwsService } from '@credebl/aws';
 import { CommonConstants } from '@credebl/common/common.constant';
 import { NATSClient } from '@credebl/common/NATSClient';
+import { StorageService } from '@credebl/storage';
 
 @Module({
   imports: [
@@ -21,6 +21,6 @@ import { NATSClient } from '@credebl/common/NATSClient';
     ])
   ],
   controllers: [IssuanceController],
-  providers: [IssuanceService, CommonService, AwsService, NATSClient]
+  providers: [IssuanceService, CommonService, NATSClient, StorageService]
 })
 export class IssuanceModule {}

apps/api-gateway/src/organization/organization.module.ts

@@ -7,7 +7,7 @@ import { Module } from '@nestjs/common';
 import { OrganizationController } from './organization.controller';
 import { OrganizationService } from './organization.service';
 import { getNatsOptions } from '@credebl/common/nats.config';
-import { AwsService } from '@credebl/aws';
+import { StorageService } from '@credebl/storage';
 import { CommonConstants } from '@credebl/common/common.constant';
 import { NATSClient } from '@credebl/common/NATSClient';
 @Module({
@@ -24,6 +24,6 @@ import { NATSClient } from '@credebl/common/NATSClient';
     ])
   ],
   controllers: [OrganizationController],
-  providers: [OrganizationService, CommonService, AwsService, NATSClient]
+  providers: [OrganizationService, CommonService, StorageService, NATSClient]
 })
 export class OrganizationModule {}

apps/api-gateway/src/organization/organization.service.ts

@@ -25,6 +25,7 @@ import { PrimaryDid } from './dtos/set-primary-did.dto';
 import { NATSClient } from '@credebl/common/NATSClient';
 import { ClientProxy } from '@nestjs/microservices';
 import { ClientTokenDto } from './dtos/client-token.dto';
+import { CommonConstants } from '@credebl/common/common.constant';
 
 @Injectable()
 export class OrganizationService extends BaseService {
@@ -236,7 +237,7 @@ export class OrganizationService extends BaseService {
 
   getBase64Image(base64Image: string): Buffer {
     const base64Data = base64Image.replace(/^data:image\/\w+;base64,/, '');
-    const imageBuffer = Buffer.from(base64Data, 'base64');
+    const imageBuffer = Buffer.from(base64Data, CommonConstants.ENCODING);
     return imageBuffer;
   }
   async generateClientApiToken(clientTokenDto: ClientTokenDto): Promise<{ token: string }> {

apps/api-gateway/src/user/user.controller.ts

@@ -47,7 +47,7 @@ import { UpdatePlatformSettingsDto } from './dto/update-platform-settings.dto';
 import { Roles } from '../authz/decorators/roles.decorator';
 import { OrgRolesGuard } from '../authz/guards/org-roles.guard';
 import { OrgRoles } from 'libs/org-roles/enums';
-import { AwsService } from '@credebl/aws/aws.service';
+import { StorageService } from '@credebl/storage';
 import { PaginationDto } from '@credebl/common/dtos/pagination.dto';
 import { UserAccessGuard } from '../authz/guards/user-access-guard';
 import { TrimStringParamPipe } from '@credebl/common/cast.helper';
@@ -61,7 +61,7 @@ export class UserController {
   constructor(
     private readonly userService: UserService,
     private readonly commonService: CommonService,
-    private readonly awsService: AwsService
+    private readonly storageService: StorageService
   ) {}
 
   /**

apps/api-gateway/src/user/user.module.ts

@@ -6,7 +6,7 @@ import { Module } from '@nestjs/common';
 import { UserController } from './user.controller';
 import { UserService } from './user.service';
 import { getNatsOptions } from '@credebl/common/nats.config';
-import { AwsService } from '@credebl/aws';
+import { StorageService } from '@credebl/storage';
 import { CommonConstants } from '@credebl/common/common.constant';
 import { NATSClient } from '@credebl/common/NATSClient';
 
@@ -19,11 +19,10 @@ import { NATSClient } from '@credebl/common/NATSClient';
         name: 'NATS_CLIENT',
         transport: Transport.NATS,
         options: getNatsOptions(CommonConstants.USER_SERVICE, process.env.API_GATEWAY_NKEY_SEED)
-
       }
     ])
   ],
   controllers: [UserController],
-  providers: [UserService, CommonService, AwsService, NATSClient]
+  providers: [UserService, CommonService, StorageService, NATSClient]
 })
 export class UserModule {}

apps/api-gateway/src/webhook/webhook.module.ts

@@ -5,7 +5,7 @@ import { WebhookService } from './webhook.service';
 import { CommonService } from '@credebl/common';
 import { HttpModule } from '@nestjs/axios';
 import { getNatsOptions } from '@credebl/common/nats.config';
-import { AwsService } from '@credebl/aws';
+import { StorageService } from '@credebl/storage';
 import { CommonConstants } from '@credebl/common/common.constant';
 import { NATSClient } from '@credebl/common/NATSClient';
 
@@ -21,6 +21,6 @@ import { NATSClient } from '@credebl/common/NATSClient';
     ])
   ],
   controllers: [WebhookController],
-  providers: [WebhookService, CommonService, AwsService, NATSClient]
+  providers: [WebhookService, CommonService, StorageService, NATSClient]
 })
-export class WebhookModule { }
+export class WebhookModule {}

apps/cloud-wallet/src/cloud-wallet.service.ts

@@ -176,8 +176,9 @@ export class CloudWalletService {
 
       const [baseWalletDetails, decryptedApiKey] = await this._commonCloudWalletInfo(userId);
       const { agentEndpoint } = baseWalletDetails;
-      const threadParam = threadId ? `?threadId=${threadId}` : '';
-      const url = `${agentEndpoint}${CommonConstants.CLOUD_WALLET_GET_PROOF_REQUEST}/${threadParam}}`;
+      const url = `${agentEndpoint}${CommonConstants.CLOUD_WALLET_GET_PROOF_REQUEST}/${
+        threadId ? `?threadId=${threadId}` : ''
+      }`;
       const getProofById = await this.commonService.httpGet(url, { headers: { authorization: decryptedApiKey } });
       return getProofById;
     } catch (error) {

apps/issuance/src/issuance.module.ts

@@ -12,7 +12,7 @@ import { EmailDto } from '@credebl/common/dtos/email.dto';
 import { BullModule } from '@nestjs/bull';
 import { CacheModule } from '@nestjs/cache-manager';
 import { BulkIssuanceProcessor } from './issuance.processor';
-import { AwsService } from '@credebl/aws';
+import { StorageService } from '@credebl/storage';
 import { UserActivityRepository } from 'libs/user-activity/repositories';
 import { CommonConstants, MICRO_SERVICE_NAME } from '@credebl/common/common.constant';
 import { LoggerModule } from '@credebl/logger/logger.module';
@@ -57,7 +57,7 @@ import { NATSClient } from '@credebl/common/NATSClient';
     OutOfBandIssuance,
     EmailDto,
     BulkIssuanceProcessor,
-    AwsService,
+    StorageService,
     NATSClient,
     {
       provide: MICRO_SERVICE_NAME,

apps/issuance/src/issuance.service.ts

@@ -66,7 +66,7 @@ import { convertUrlToDeepLinkUrl, getAgentUrl, paginator } from '@credebl/common
 import { InjectQueue } from '@nestjs/bull';
 import { Queue } from 'bull';
 import { FileUploadStatus, FileUploadType } from 'apps/api-gateway/src/enum';
-import { AwsService } from '@credebl/aws';
+import { StorageService } from '@credebl/storage';
 import { io } from 'socket.io-client';
 import { IIssuedCredentialSearchParams, IssueCredentialType } from 'apps/api-gateway/src/issuance/interfaces';
 import {
@@ -89,7 +89,6 @@ import * as pLimit from 'p-limit';
 import { UserActivityRepository } from 'libs/user-activity/repositories';
 import { validateW3CSchemaAttributes } from '../libs/helpers/attributes.validator';
 import { ISchemaDetail } from '@credebl/common/interfaces/schema.interface';
-import ContextStorageService, { ContextStorageServiceKey } from '@credebl/context/contextStorageService.interface';
 import { NATSClient } from '@credebl/common/NATSClient';
 import { extractAttributeNames, unflattenCsvRow } from '../libs/helpers/attributes.extractor';
 import { redisStore } from 'cache-manager-ioredis-yet';
@@ -107,12 +106,10 @@ export class IssuanceService {
     @Inject(CACHE_MANAGER) private readonly cacheManager: Cache,
     private readonly outOfBandIssuance: OutOfBandIssuance,
     private readonly emailData: EmailDto,
-    private readonly awsService: AwsService,
+    private readonly storageService: StorageService,
     @InjectQueue('bulk-issuance') private readonly bulkIssuanceQueue: Queue,
     // TODO: Remove duplicate, unused variable
-    @Inject(CACHE_MANAGER) private readonly cacheService: Cache,
     @Inject(ContextStorageServiceKey)
-    private readonly contextStorageService: ContextStorageService,
     private readonly natsClient: NATSClient
   ) {}
 
@@ -1290,8 +1287,8 @@ export class IssuanceService {
         credentialPayload.schemaName = credentialDetails.schemaName;
       }
 
-      const getFileDetails = await this.awsService.getFile(importFileDetails.fileKey);
-      const csvData: string = getFileDetails.Body.toString();
+      const getFileDetails = await this.storageService.getFile(importFileDetails.fileKey);
+      const csvData: string = getFileDetails.toString();
 
       const parsedData = paParse(csvData, {
         header: true,

apps/organization/src/organization.module.ts

@@ -17,8 +17,7 @@ import { CacheModule } from '@nestjs/cache-manager';
 import { getNatsOptions } from '@credebl/common/nats.config';
 import { ClientRegistrationService } from '@credebl/client-registration';
 import { KeycloakUrlService } from '@credebl/keycloak-url';
-
-import { AwsService } from '@credebl/aws';
+import { StorageService } from '@credebl/storage';
 import { CommonConstants } from '@credebl/common/common.constant';
 import { GlobalConfigModule } from '@credebl/config/global-config.module';
 import { ConfigModule as PlatformConfig } from '@credebl/config/config.module';
@@ -36,19 +35,29 @@ import { NATSClient } from '@credebl/common/NATSClient';
     ]),
     CommonModule,
     GlobalConfigModule,
-    LoggerModule, PlatformConfig, ContextInterceptorModule,
+    LoggerModule,
+    PlatformConfig,
+    ContextInterceptorModule,
     CacheModule.register()
   ],
   controllers: [OrganizationController],
   providers: [
-    OrganizationService, OrganizationRepository, PrismaService,
-     Logger, OrgRolesService, UserOrgRolesService, OrgRolesRepository, UserActivityRepository,
-     UserActivityRepository, UserOrgRolesRepository, UserRepository, UserActivityService,
-      ClientRegistrationService,
-      KeycloakUrlService,
-      AwsService,
-      NATSClient
-    ]
-
+    OrganizationService,
+    OrganizationRepository,
+    PrismaService,
+    Logger,
+    OrgRolesService,
+    UserOrgRolesService,
+    OrgRolesRepository,
+    UserActivityRepository,
+    UserActivityRepository,
+    UserOrgRolesRepository,
+    UserRepository,
+    UserActivityService,
+    ClientRegistrationService,
+    KeycloakUrlService,
+    StorageService,
+    NATSClient
+  ]
 })
 export class OrganizationModule {}