Url shortening

apps/api-gateway/src/issuance/dtos/issuance.dto.ts

@@ -1,14 +1,15 @@
 /* eslint-disable @typescript-eslint/array-type */
 
-import { IsArray, IsNotEmpty, IsOptional, IsString, IsEmail, ArrayMaxSize, ValidateNested, ArrayMinSize, IsBoolean, IsDefined, MaxLength, IsEnum, IsObject} from 'class-validator';
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
+import { ArrayMaxSize, ArrayMinSize, IsArray, IsBoolean, IsDefined, IsEmail, IsEnum, IsNotEmpty, IsObject, IsOptional, IsString, MaxLength, ValidateNested } from 'class-validator';
+import { IsCredentialJsonLdContext, SingleOrArray } from '../utils/helper';
+import { IssueCredentialType, JsonLdCredentialDetailCredentialStatusOptions, JsonLdCredentialDetailOptionsOptions, JsonObject } from '../interfaces';
 import { Transform, Type } from 'class-transformer';
-import { trim } from '@credebl/common/cast.helper';
-import { SortValue } from '../../enum';
-import { SortFields } from 'apps/connection/src/enum/connection.enum';
+
 import { AutoAccept } from '@credebl/enum/enum';
-import { IssueCredentialType, JsonLdCredentialDetailCredentialStatusOptions, JsonLdCredentialDetailOptionsOptions, JsonObject } from '../interfaces';
-import { IsCredentialJsonLdContext, SingleOrArray } from '../utils/helper';
+import { SortFields } from 'apps/connection/src/enum/connection.enum';
+import { SortValue } from '../../enum';
+import { trim } from '@credebl/common/cast.helper';
 
 class Issuer {
   @ApiProperty()
@@ -209,6 +210,14 @@ export class OOBIssueCredentialDto extends CredentialsIssuanceDto {
   @IsNotEmpty({ message: 'Please provide valid attributes' })
   @Type(() => Attribute)
   attributes?: Attribute[];
+
+  @ApiProperty({
+    example: false
+  })
+  @IsOptional()
+  @IsNotEmpty()
+  @IsBoolean({message: 'isShortenUrl must be boolean'})
+  isShortenUrl?: boolean;
 
 
   @ApiProperty()

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

@@ -31,12 +31,12 @@ export class IssuanceService extends BaseService {
     }> {
         let payload;
         if (IssueCredentialType.INDY === issueCredentialDto.credentialType) {
-             payload = { attributes: issueCredentialDto.attributes, comment: issueCredentialDto.comment, credentialDefinitionId: issueCredentialDto.credentialDefinitionId, orgId: issueCredentialDto.orgId, protocolVersion: issueCredentialDto.protocolVersion, goalCode: issueCredentialDto.goalCode, parentThreadId: issueCredentialDto.parentThreadId, willConfirm: issueCredentialDto.willConfirm, label: issueCredentialDto.label, autoAcceptCredential: issueCredentialDto.autoAcceptCredential, credentialType: issueCredentialDto.credentialType };
-      }
-      if (IssueCredentialType.JSONLD === issueCredentialDto.credentialType) {
-            payload = { credential: issueCredentialDto.credential, options:issueCredentialDto.options,  comment: issueCredentialDto.comment, orgId: issueCredentialDto.orgId, protocolVersion: issueCredentialDto.protocolVersion, goalCode: issueCredentialDto.goalCode, parentThreadId: issueCredentialDto.parentThreadId, willConfirm: issueCredentialDto.willConfirm, label: issueCredentialDto.label, autoAcceptCredential: issueCredentialDto.autoAcceptCredential, credentialType: issueCredentialDto.credentialType };
-      }
-        
+            payload = { attributes: issueCredentialDto.attributes, comment: issueCredentialDto.comment, credentialDefinitionId: issueCredentialDto.credentialDefinitionId, orgId: issueCredentialDto.orgId, protocolVersion: issueCredentialDto.protocolVersion, goalCode: issueCredentialDto.goalCode, parentThreadId: issueCredentialDto.parentThreadId, willConfirm: issueCredentialDto.willConfirm, label: issueCredentialDto.label, autoAcceptCredential: issueCredentialDto.autoAcceptCredential, credentialType: issueCredentialDto.credentialType, isShortenUrl: issueCredentialDto.isShortenUrl };
+        }
+        if (IssueCredentialType.JSONLD === issueCredentialDto.credentialType) {
+            payload = { credential: issueCredentialDto.credential, options: issueCredentialDto.options, comment: issueCredentialDto.comment, orgId: issueCredentialDto.orgId, protocolVersion: issueCredentialDto.protocolVersion, goalCode: issueCredentialDto.goalCode, parentThreadId: issueCredentialDto.parentThreadId, willConfirm: issueCredentialDto.willConfirm, label: issueCredentialDto.label, autoAcceptCredential: issueCredentialDto.autoAcceptCredential, credentialType: issueCredentialDto.credentialType, isShortenUrl: issueCredentialDto.isShortenUrl };
+        }
+
         return this.sendNats(this.issuanceProxy, 'send-credential-create-offer-oob', payload);
     }
 

apps/api-gateway/src/utilities/dtos/shortening-url.dto.ts

@@ -39,3 +39,9 @@ interface Attribute {
     name: string;
     value: string;
   }
+
+  export class GenericDto {
+  @ApiProperty()
+  @IsNotEmpty()
+  data: string | object;
+}

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

@@ -1,13 +1,13 @@
 import { ApiForbiddenResponse, ApiOperation, ApiResponse, ApiTags, ApiUnauthorizedResponse } from '@nestjs/swagger';
-import { Controller, UseFilters, Post, Body, Res, HttpStatus } from '@nestjs/common';
+import { Controller, UseFilters, Post, Body, Res, HttpStatus, Param } from '@nestjs/common';
 import  IResponse from '@credebl/common/interfaces/response.interface';
 import { Response } from 'express';
 import { ApiResponseDto } from '../dtos/apiResponse.dto';
 import { UnauthorizedErrorDto } from '../dtos/unauthorized-error.dto';
 import { ForbiddenErrorDto } from '../dtos/forbidden-error.dto';
 import { ResponseMessages } from '@credebl/common/response-messages';
 import { CustomExceptionFilter } from 'apps/api-gateway/common/exception-handler';
-import { UtilitiesDto } from './dtos/shortening-url.dto';
+import { GenericDto, UtilitiesDto } from './dtos/shortening-url.dto';
 import { UtilitiesService } from './utilities.service';
 
 @UseFilters(CustomExceptionFilter)
@@ -20,7 +20,7 @@ export class UtilitiesController {
   constructor(
     private readonly utilitiesService: UtilitiesService
   ) { }
-
+  
 
   @Post('/')
   @ApiOperation({ summary: 'Create a shorteningurl', description: 'Create a shortening url' })
@@ -35,5 +35,18 @@ export class UtilitiesController {
     return res.status(HttpStatus.CREATED).json(finalResponse);
   }
 
+  @Post('/store-object/:persist')
+  @ApiOperation({ summary: 'Store an object and return a short url to it', description: 'Create a short url representing the object' })
+  @ApiResponse({ status: HttpStatus.CREATED, description: 'Created', type: ApiResponseDto })
+  async storeObject(@Body() storeObjectDto: GenericDto, @Param('persist') persist: boolean, @Res() res: Response): Promise<Response> {
+    const shorteningUrl = await this.utilitiesService.storeObject(persist.valueOf(), storeObjectDto);
+    const finalResponse: IResponse = {
+      statusCode: HttpStatus.CREATED,
+      message: ResponseMessages.storeObject.success.storeObject,
+      data: shorteningUrl
+    };
+    return res.status(HttpStatus.CREATED).json(finalResponse);
+  }
+
 }
 

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

@@ -12,4 +12,9 @@ export class UtilitiesService extends BaseService {
   async createShorteningUrl(shorteningUrlDto: UtilitiesDto): Promise<string> {
     return this.sendNatsMessage(this.serviceProxy, 'create-shortening-url', shorteningUrlDto);
   }
+
+  async storeObject(persistent: boolean, storeObj: unknown): Promise<string> {
+    const payload = {persistent, storeObj};
+    return this.sendNatsMessage(this.serviceProxy, 'store-object-return-url', payload);
+  }
 }

apps/api-gateway/src/verification/dto/request-proof.dto.ts

@@ -1,11 +1,11 @@
-import { ArrayNotEmpty, IsArray, IsBoolean, IsEmail, IsEnum, IsNotEmpty, IsNumberString, IsObject, IsOptional, IsString, ValidateIf, ValidateNested, IsUUID } from 'class-validator';
-import { toLowerCase, trim } from '@credebl/common/cast.helper';
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
+import { ArrayNotEmpty, IsArray, IsBoolean, IsEmail, IsEnum, IsNotEmpty, IsNumberString, IsObject, IsOptional, IsString, IsUUID, ValidateIf, ValidateNested } from 'class-validator';
 import { Transform, Type } from 'class-transformer';
+import { toLowerCase, trim } from '@credebl/common/cast.helper';
+
 import { AutoAccept } from '@credebl/enum/enum';
 import { IProofFormats } from '../interfaces/verification.interface';
 
-
 export class ProofRequestAttribute {
 
     @ValidateIf((obj) => obj.attributeNames === undefined)
@@ -16,7 +16,7 @@ export class ProofRequestAttribute {
     @ValidateIf((obj) => obj.attributeName === undefined)
     @IsArray({ message: 'attributeNames must be an array.' })
     @ArrayNotEmpty({ message: 'array can not be empty' })
-    @IsString({ each: true})
+    @IsString({ each: true })
     @IsNotEmpty({ each: true, message: 'each element cannot be empty' })
     attributeNames?: string[];
 
@@ -127,7 +127,7 @@ export class OutOfBandRequestProof extends ProofPayload {
         type: () => [ProofRequestAttribute]
     })
     @IsArray({ message: 'attributes must be in array' })
-    @ValidateNested({each: true})
+    @ValidateNested({ each: true })
     @IsObject({ each: true })
     @IsNotEmpty({ message: 'please provide valid attributes' })
     @Type(() => ProofRequestAttribute)
@@ -254,11 +254,11 @@ export class SendProofRequestPayload {
                     requested_attributes: {
                         verifynameAddress: {
                             names: ['name', 'address'],
-                            restrictions: [{'schema_id': 'KU583UbI4yAKfaBTSz1rqG:2:National ID:1.0.0'}]
+                            restrictions: [{ 'schema_id': 'KU583UbI4yAKfaBTSz1rqG:2:National ID:1.0.0' }]
                         },
                         verifyBirthPlace: {
                             name: 'Place',
-                            restrictions: [{'schema_id': 'KU583UbI4yAKfaBTSz1rqG:2:Birth Certificate:1.0.0'}]
+                            restrictions: [{ 'schema_id': 'KU583UbI4yAKfaBTSz1rqG:2:Birth Certificate:1.0.0' }]
                         }
                     },
                     // eslint-disable-next-line camelcase
@@ -325,6 +325,12 @@ export class SendProofRequestPayload {
     @IsOptional()
     @IsUUID()
     @IsNotEmpty({ message: 'please provide valid parentThreadId' })
-    parentThreadId: string;  
+    parentThreadId: string;
+
+    @ApiProperty({ example: true })
+    @IsBoolean()
+    @IsOptional()
+    @IsNotEmpty({message:'Please provide the flag for shorten url.'})
+    isShortenUrl?: boolean;
 }
 

apps/connection/src/connection.service.ts

@@ -64,8 +64,8 @@ export class ConnectionService {
 
       this.logger.log(`logoUrl:::, ${organisation.logoUrl}`);
       const connectionPayload = {
-        multiUseInvitation: multiUseInvitation || true,
-        autoAcceptConnection: autoAcceptConnection || true,
+        multiUseInvitation: multiUseInvitation ?? true,
+        autoAcceptConnection: autoAcceptConnection ?? true,
         alias: alias || undefined,
         imageUrl: organisation.logoUrl || imageUrl || undefined,
         label: organisation.name,
@@ -83,13 +83,11 @@ export class ConnectionService {
         apiKey = await this._getOrgAgentApiKey(orgId);
       }
       const createConnectionInvitation = await this._createConnectionInvitation(connectionPayload, url, apiKey);
-      const invitationObject = createConnectionInvitation?.message?.invitation['@id'];
-      let shortenedUrl;
-      if (agentDetails?.tenantId) {
-        shortenedUrl = `${agentEndPoint}/multi-tenancy/url/${agentDetails?.tenantId}/${invitationObject}`;
-      } else {
-        shortenedUrl = `${agentEndPoint}/url/${invitationObject}`;
-      }
+      const connectionInvitaionUrl: string = createConnectionInvitation?.message?.invitationUrl;
+      const shortenedUrl: string = await this.storeConnectionObjectAndReturnUrl(
+        connectionInvitaionUrl,
+        connectionPayload.multiUseInvitation
+      );
 
       const saveConnectionDetails = await this.connectionRepository.saveAgentConnectionInvitations(
         shortenedUrl,
@@ -457,6 +455,7 @@ export class ConnectionService {
       });
   }
 
+
   /**
    * Description: Fetch agent url
    * @param referenceId
@@ -752,4 +751,43 @@ export class ConnectionService {
       }
     }
   }
+
+  async storeConnectionObjectAndReturnUrl(connectionInvitationUrl: string, persistent: boolean): Promise<string> {
+    const storeObj = connectionInvitationUrl;
+    //nats call in agent-service to create an invitation url
+    const pattern = { cmd: 'store-object-return-url' };
+    const payload = { persistent, storeObj };
+
+    try {
+      const message = await this.connectionServiceProxy
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        .send<any>(pattern, payload)
+        .toPromise()
+        .catch((error) => {
+          this.logger.error(
+            `[storeConnectionObjectAndReturnUrl] [NATS call]- error in storing object and returning url : ${JSON.stringify(
+              error
+            )}`
+          );
+          throw new HttpException(
+            {
+              status: error.statusCode,
+              error: error.error?.message?.error ? error.error?.message?.error : error.error,
+              message: error.message
+            },
+            error.error
+          );
+        });
+      return message;
+    } catch (error) {
+      this.logger.error(`catch: ${JSON.stringify(error)}`);
+      throw new HttpException(
+        {
+          status: error.status,
+          error: error.message
+        },
+        error.status
+      );
+    }
+  }
 }

apps/connection/src/interfaces/connection.interfaces.ts

@@ -103,8 +103,9 @@ export interface IConnectionInvitation {
 }
 interface IInvitation {
   invitation: string;
-
+  invitationUrl: string;
 }
+
 export interface OrgAgent {
   organisation: organisation;
   id: string;