Skip to content

Commit

Permalink
merge: DEV to QA (26/07/2024) (#877)
Browse files Browse the repository at this point in the history
* fix: create organisation changes and added geo-location attribute in response

Signed-off-by: Ganesh Nawle <[email protected]>

* fix: send email verification issue

Signed-off-by: bhavanakarwade <[email protected]>

* fix: send email verification issue (#823)

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: bulk issuance template list response changes (#824)

* refactor: updated schema response for get API

Signed-off-by: tipusinghaw <[email protected]>

* fix: schema already exist logic

Signed-off-by: tipusinghaw <[email protected]>

* fix: schema attribute while w3c schema creation

Signed-off-by: tipusinghaw <[email protected]>

---------

Signed-off-by: tipusinghaw <[email protected]>

* feat: batch bulk issunace (#826)

* feat: batch bulk issuance

Signed-off-by: tipusinghaw <[email protected]>

* stoped queue to remove issuance data

Signed-off-by: tipusinghaw <[email protected]>

* feat: added delay for 1 min

Signed-off-by: tipusinghaw <[email protected]>

* refactor: changed batch config

Signed-off-by: tipusinghaw <[email protected]>

* feat: changed delay time for batch

Signed-off-by: tipusinghaw <[email protected]>

* feat: added batch for retry

Signed-off-by: tipusinghaw <[email protected]>

* refactor: added common constant in libs

Signed-off-by: tipusinghaw <[email protected]>

* refactor: removed duplicate value from schema DTO

Signed-off-by: tipusinghaw <[email protected]>

---------

Signed-off-by: tipusinghaw <[email protected]>

* fix: constant issue for bulk issunace (#827)

* feat: batch bulk issuance

Signed-off-by: tipusinghaw <[email protected]>

* stoped queue to remove issuance data

Signed-off-by: tipusinghaw <[email protected]>

* feat: added delay for 1 min

Signed-off-by: tipusinghaw <[email protected]>

* refactor: changed batch config

Signed-off-by: tipusinghaw <[email protected]>

* feat: changed delay time for batch

Signed-off-by: tipusinghaw <[email protected]>

* feat: added batch for retry

Signed-off-by: tipusinghaw <[email protected]>

* refactor: added common constant in libs

Signed-off-by: tipusinghaw <[email protected]>

* refactor: removed duplicate value from schema DTO

Signed-off-by: tipusinghaw <[email protected]>

* fix: constent issue

Signed-off-by: tipusinghaw <[email protected]>

---------

Signed-off-by: tipusinghaw <[email protected]>

* refcator: schema endorsement flow

Signed-off-by: bhavanakarwade <[email protected]>

* fix: resolved sonar lint issues

Signed-off-by: bhavanakarwade <[email protected]>

* fix: worked on sonarcloud issues

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: schema endorsement flow (#828)

* fix: send email verification issue

Signed-off-by: bhavanakarwade <[email protected]>

* refcator: schema endorsement flow

Signed-off-by: bhavanakarwade <[email protected]>

* fix: resolved sonar lint issues

Signed-off-by: bhavanakarwade <[email protected]>

* fix: worked on sonarcloud issues

Signed-off-by: bhavanakarwade <[email protected]>

---------

Signed-off-by: bhavanakarwade <[email protected]>

* fix: delete organization bugs

Signed-off-by: bhavanakarwade <[email protected]>

* fix: delete organization bugs (#829)

* fix: send email verification issue

Signed-off-by: bhavanakarwade <[email protected]>

* refcator: schema endorsement flow

Signed-off-by: bhavanakarwade <[email protected]>

* fix: resolved sonar lint issues

Signed-off-by: bhavanakarwade <[email protected]>

* fix: worked on sonarcloud issues

Signed-off-by: bhavanakarwade <[email protected]>

* fix: delete organization bugs

Signed-off-by: bhavanakarwade <[email protected]>

---------

Signed-off-by: bhavanakarwade <[email protected]>

* fix: cred def id space fixes

Signed-off-by: bhavanakarwade <[email protected]>

* feature:added schema details in file_upload data and fix minor changes

Signed-off-by: Ganesh Nawle <[email protected]>

* feature:added schema details in file_upload data,fix minor exception changes and resovle PR conflict

Signed-off-by: Ganesh Nawle <[email protected]>

* feat: added schema details in  table

Signed-off-by: Ganesh Nawle <[email protected]>

* refactor: endorsement flow for key and web method (#831)

* refactor: endorsement flow for key and web method

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: send email for issuance

Signed-off-by: bhavanakarwade <[email protected]>

---------

Signed-off-by: bhavanakarwade <[email protected]>

* fix: prisma model issue and refactored file_upload model

Signed-off-by: Ganesh Nawle <[email protected]>

* fix: prisma migration issue

Signed-off-by: Ganesh Nawle <[email protected]>

* fix: prisma migration issue (#835)

Signed-off-by: Ganesh Nawle <[email protected]>

* fix: prisma migration issue

Signed-off-by: Ganesh Nawle <[email protected]>

* fix: create organization bug

Signed-off-by: bhavanakarwade <[email protected]>

* fix: parameter and response related bugs (#837)

* fix: send email verification issue

Signed-off-by: bhavanakarwade <[email protected]>

* refcator: schema endorsement flow

Signed-off-by: bhavanakarwade <[email protected]>

* fix: resolved sonar lint issues

Signed-off-by: bhavanakarwade <[email protected]>

* fix: worked on sonarcloud issues

Signed-off-by: bhavanakarwade <[email protected]>

* fix: delete organization bugs

Signed-off-by: bhavanakarwade <[email protected]>

* fix: cred def id space fixes

Signed-off-by: bhavanakarwade <[email protected]>

* fix: create organization bug

Signed-off-by: bhavanakarwade <[email protected]>

---------

Signed-off-by: bhavanakarwade <[email protected]>

* fix:rollback statistics changes

Signed-off-by: Ganesh Nawle <[email protected]>

* fix: pagination issue for preview file

Signed-off-by: bhavanakarwade <[email protected]>

* fix: pagination issue

Signed-off-by: bhavanakarwade <[email protected]>

* Fix/bugs (#839)

* fix: send email verification issue

Signed-off-by: bhavanakarwade <[email protected]>

* refcator: schema endorsement flow

Signed-off-by: bhavanakarwade <[email protected]>

* fix: resolved sonar lint issues

Signed-off-by: bhavanakarwade <[email protected]>

* fix: worked on sonarcloud issues

Signed-off-by: bhavanakarwade <[email protected]>

* fix: delete organization bugs

Signed-off-by: bhavanakarwade <[email protected]>

* fix: cred def id space fixes

Signed-off-by: bhavanakarwade <[email protected]>

* fix: create organization bug

Signed-off-by: bhavanakarwade <[email protected]>

* fix: pagination issue for preview file

Signed-off-by: bhavanakarwade <[email protected]>

* fix: pagination issue

Signed-off-by: bhavanakarwade <[email protected]>

---------

Signed-off-by: bhavanakarwade <[email protected]>

* fix: imageurl issue in verification

Signed-off-by: bhavanakarwade <[email protected]>

* fix: imageurl issue for verification process (#840)

* fix: send email verification issue

Signed-off-by: bhavanakarwade <[email protected]>

* refcator: schema endorsement flow

Signed-off-by: bhavanakarwade <[email protected]>

* fix: resolved sonar lint issues

Signed-off-by: bhavanakarwade <[email protected]>

* fix: worked on sonarcloud issues

Signed-off-by: bhavanakarwade <[email protected]>

* fix: delete organization bugs

Signed-off-by: bhavanakarwade <[email protected]>

* fix: cred def id space fixes

Signed-off-by: bhavanakarwade <[email protected]>

* fix: create organization bug

Signed-off-by: bhavanakarwade <[email protected]>

* fix: pagination issue for preview file

Signed-off-by: bhavanakarwade <[email protected]>

* fix: pagination issue

Signed-off-by: bhavanakarwade <[email protected]>

* fix: imageurl issue in verification

Signed-off-by: bhavanakarwade <[email protected]>

---------

Signed-off-by: bhavanakarwade <[email protected]>

* fix: made request if parameter optional

Signed-off-by: bhavanakarwade <[email protected]>

* fix: made reuqest Id parameter optional (#841)

* fix: send email verification issue

Signed-off-by: bhavanakarwade <[email protected]>

* refcator: schema endorsement flow

Signed-off-by: bhavanakarwade <[email protected]>

* fix: resolved sonar lint issues

Signed-off-by: bhavanakarwade <[email protected]>

* fix: worked on sonarcloud issues

Signed-off-by: bhavanakarwade <[email protected]>

* fix: delete organization bugs

Signed-off-by: bhavanakarwade <[email protected]>

* fix: cred def id space fixes

Signed-off-by: bhavanakarwade <[email protected]>

* fix: create organization bug

Signed-off-by: bhavanakarwade <[email protected]>

* fix: pagination issue for preview file

Signed-off-by: bhavanakarwade <[email protected]>

* fix: pagination issue

Signed-off-by: bhavanakarwade <[email protected]>

* fix: imageurl issue in verification

Signed-off-by: bhavanakarwade <[email protected]>

* fix: made request if parameter optional

Signed-off-by: bhavanakarwade <[email protected]>

---------

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: added templateId mapping in file upload functionality

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: interface types

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: added temaplateId column in file_upload table (#842)

* fix: send email verification issue

Signed-off-by: bhavanakarwade <[email protected]>

* refcator: schema endorsement flow

Signed-off-by: bhavanakarwade <[email protected]>

* fix: resolved sonar lint issues

Signed-off-by: bhavanakarwade <[email protected]>

* fix: worked on sonarcloud issues

Signed-off-by: bhavanakarwade <[email protected]>

* fix: delete organization bugs

Signed-off-by: bhavanakarwade <[email protected]>

* fix: cred def id space fixes

Signed-off-by: bhavanakarwade <[email protected]>

* fix: create organization bug

Signed-off-by: bhavanakarwade <[email protected]>

* fix: pagination issue for preview file

Signed-off-by: bhavanakarwade <[email protected]>

* fix: pagination issue

Signed-off-by: bhavanakarwade <[email protected]>

* fix: imageurl issue in verification

Signed-off-by: bhavanakarwade <[email protected]>

* fix: made request if parameter optional

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: added templateId mapping in file upload functionality

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: interface types

Signed-off-by: bhavanakarwade <[email protected]>

---------

Signed-off-by: bhavanakarwade <[email protected]>

* feat: changed issuance email template for EDUCRED

Signed-off-by: Ganesh Nawle <[email protected]>

* fix:refactored preview uploaded file api changed query Param to path param

Signed-off-by: Ganesh Nawle <[email protected]>

* added-logger statement

Signed-off-by: Ganesh Nawle <[email protected]>

* fix:Minor fixes

Signed-off-by: Ganesh Nawle <[email protected]>

* fix:removed all console logs

Signed-off-by: Ganesh Nawle <[email protected]>

* feat:refactored  api to add dynamic support to email template

Signed-off-by: Ganesh Nawle <[email protected]>

* feat: added holder guard

Signed-off-by: KulkarniShashank <[email protected]>

* feat: error message changes in user dto

Signed-off-by: KulkarniShashank <[email protected]>

* feat: create cloud wallet (#852)

* feat: creat cloud wallet

Signed-off-by: tipusinghaw <[email protected]>

* fix: added error handling logic in common file

Signed-off-by: tipusinghaw <[email protected]>

* fix: changed nkey veriable

Signed-off-by: tipusinghaw <[email protected]>

---------

Signed-off-by: tipusinghaw <[email protected]>

* fix: add validation in the user role guard (#854)

* fix: add validation in the user role guard

Signed-off-by: KulkarniShashank <[email protected]>

* fix: modify validation in the user role guard

Signed-off-by: KulkarniShashank <[email protected]>

* fix: modify validation and error message changes in the user role guard

Signed-off-by: KulkarniShashank <[email protected]>

---------

Signed-off-by: KulkarniShashank <[email protected]>

* refactor: store holder role in user role mapping table

Signed-off-by: KulkarniShashank <[email protected]>

* feat: configure cloud base wallet

Signed-off-by: KulkarniShashank <[email protected]>

* fix: remove holder guard for base wallet configure API

Signed-off-by: KulkarniShashank <[email protected]>

* feat: implement proof presentation for holder (#860)

* feat: accept proof request by holder API

Signed-off-by: KulkarniShashank <[email protected]>

* feat: holder get proof presentation and get proof presentation by id

Signed-off-by: KulkarniShashank <[email protected]>

* refactor: changes in accept proof request and get proof request

Signed-off-by: KulkarniShashank <[email protected]>

---------

Signed-off-by: KulkarniShashank <[email protected]>

* feat: Added DID creation method for cloud wallet (#861)

* feat: creat cloud wallet

Signed-off-by: tipusinghaw <[email protected]>

* fix: added error handling logic in common file

Signed-off-by: tipusinghaw <[email protected]>

* fix: changed nkey veriable

Signed-off-by: tipusinghaw <[email protected]>

* feat: creat DID for wallet

Signed-off-by: tipusinghaw <[email protected]>

* resolve conflicts

Signed-off-by: tipusinghaw <[email protected]>

* Resolve sonar cloud issue

Signed-off-by: tipusinghaw <[email protected]>

---------

Signed-off-by: tipusinghaw <[email protected]>

* feat: create connection for holder (#863)

* feat: connection invitaion creation

Signed-off-by: KulkarniShashank <[email protected]>

* Merge branch 'develop' of https://github.com/credebl/platform into feat/connection-holder

Signed-off-by: KulkarniShashank <[email protected]>

---------

Signed-off-by: KulkarniShashank <[email protected]>

* added cloud-wallet Dockerfile

Signed-off-by: [email protected] <[email protected]>

* feat: implement credential APIs for cloud wallet (#865)

* feat: creat cloud wallet

Signed-off-by: tipusinghaw <[email protected]>

* fix: added error handling logic in common file

Signed-off-by: tipusinghaw <[email protected]>

* fix: changed nkey veriable

Signed-off-by: tipusinghaw <[email protected]>

* feat: creat DID for wallet

Signed-off-by: tipusinghaw <[email protected]>

* resolve conflicts

Signed-off-by: tipusinghaw <[email protected]>

* feat: credential APIs for cloud-wallet

Signed-off-by: tipusinghaw <[email protected]>

* fix: changed create DID route

Signed-off-by: tipusinghaw <[email protected]>

* fix: changed create DID route

Signed-off-by: tipusinghaw <[email protected]>

---------

Signed-off-by: tipusinghaw <[email protected]>

* feat: implemented prettyvc while bulk issuance

Signed-off-by: bhavanakarwade <[email protected]>

* fix: issuance process

Signed-off-by: bhavanakarwade <[email protected]>

* feat: Added basic message on cloud wallet (#868)

* feat: creat cloud wallet

Signed-off-by: tipusinghaw <[email protected]>

* fix: added error handling logic in common file

Signed-off-by: tipusinghaw <[email protected]>

* fix: changed nkey veriable

Signed-off-by: tipusinghaw <[email protected]>

* feat: creat DID for wallet

Signed-off-by: tipusinghaw <[email protected]>

* resolve conflicts

Signed-off-by: tipusinghaw <[email protected]>

* feat: credential APIs for cloud-wallet

Signed-off-by: tipusinghaw <[email protected]>

* fix: changed create DID route

Signed-off-by: tipusinghaw <[email protected]>

* fix: changed create DID route

Signed-off-by: tipusinghaw <[email protected]>

* feat: added baisc message implementation in cloud wallet

Signed-off-by: tipusinghaw <[email protected]>

---------

Signed-off-by: tipusinghaw <[email protected]>

* wip: pretty for bulk issuance

Signed-off-by: bhavanakarwade <[email protected]>

* wip: made autoacceptcredential flag always

Signed-off-by: bhavanakarwade <[email protected]>

* fix: client id and client secret encrypt and decrypt

Signed-off-by: KulkarniShashank <[email protected]>

* fix: datatype issue

Signed-off-by: bhavanakarwade <[email protected]>

* fix: dcrypted the clientId and client secret

Signed-off-by: KulkarniShashank <[email protected]>

* feat: implement prettyVc in bulk issuance porcess (#869)

* fix: send email verification issue

Signed-off-by: bhavanakarwade <[email protected]>

* refcator: schema endorsement flow

Signed-off-by: bhavanakarwade <[email protected]>

* fix: resolved sonar lint issues

Signed-off-by: bhavanakarwade <[email protected]>

* fix: worked on sonarcloud issues

Signed-off-by: bhavanakarwade <[email protected]>

* fix: delete organization bugs

Signed-off-by: bhavanakarwade <[email protected]>

* fix: cred def id space fixes

Signed-off-by: bhavanakarwade <[email protected]>

* fix: create organization bug

Signed-off-by: bhavanakarwade <[email protected]>

* fix: pagination issue for preview file

Signed-off-by: bhavanakarwade <[email protected]>

* fix: pagination issue

Signed-off-by: bhavanakarwade <[email protected]>

* fix: imageurl issue in verification

Signed-off-by: bhavanakarwade <[email protected]>

* fix: made request if parameter optional

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: added templateId mapping in file upload functionality

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: interface types

Signed-off-by: bhavanakarwade <[email protected]>

* feat: implemented prettyvc while bulk issuance

Signed-off-by: bhavanakarwade <[email protected]>

* fix: issuance process

Signed-off-by: bhavanakarwade <[email protected]>

* wip: pretty for bulk issuance

Signed-off-by: bhavanakarwade <[email protected]>

* wip: made autoacceptcredential flag always

Signed-off-by: bhavanakarwade <[email protected]>

* fix: datatype issue

Signed-off-by: bhavanakarwade <[email protected]>

---------

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: added agent url

Signed-off-by: bhavanakarwade <[email protected]>

* Fix/bugs (#874)

* fix: send email verification issue

Signed-off-by: bhavanakarwade <[email protected]>

* refcator: schema endorsement flow

Signed-off-by: bhavanakarwade <[email protected]>

* fix: resolved sonar lint issues

Signed-off-by: bhavanakarwade <[email protected]>

* fix: worked on sonarcloud issues

Signed-off-by: bhavanakarwade <[email protected]>

* fix: delete organization bugs

Signed-off-by: bhavanakarwade <[email protected]>

* fix: cred def id space fixes

Signed-off-by: bhavanakarwade <[email protected]>

* fix: create organization bug

Signed-off-by: bhavanakarwade <[email protected]>

* fix: pagination issue for preview file

Signed-off-by: bhavanakarwade <[email protected]>

* fix: pagination issue

Signed-off-by: bhavanakarwade <[email protected]>

* fix: imageurl issue in verification

Signed-off-by: bhavanakarwade <[email protected]>

* fix: made request if parameter optional

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: added templateId mapping in file upload functionality

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: interface types

Signed-off-by: bhavanakarwade <[email protected]>

* feat: implemented prettyvc while bulk issuance

Signed-off-by: bhavanakarwade <[email protected]>

* fix: issuance process

Signed-off-by: bhavanakarwade <[email protected]>

* wip: pretty for bulk issuance

Signed-off-by: bhavanakarwade <[email protected]>

* wip: made autoacceptcredential flag always

Signed-off-by: bhavanakarwade <[email protected]>

* fix: datatype issue

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: added agent url

Signed-off-by: bhavanakarwade <[email protected]>

---------

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: added logs to test bulk issuance payload

Signed-off-by: bhavanakarwade <[email protected]>

* Fix/bugs (#875)

* fix: send email verification issue

Signed-off-by: bhavanakarwade <[email protected]>

* refcator: schema endorsement flow

Signed-off-by: bhavanakarwade <[email protected]>

* fix: resolved sonar lint issues

Signed-off-by: bhavanakarwade <[email protected]>

* fix: worked on sonarcloud issues

Signed-off-by: bhavanakarwade <[email protected]>

* fix: delete organization bugs

Signed-off-by: bhavanakarwade <[email protected]>

* fix: cred def id space fixes

Signed-off-by: bhavanakarwade <[email protected]>

* fix: create organization bug

Signed-off-by: bhavanakarwade <[email protected]>

* fix: pagination issue for preview file

Signed-off-by: bhavanakarwade <[email protected]>

* fix: pagination issue

Signed-off-by: bhavanakarwade <[email protected]>

* fix: imageurl issue in verification

Signed-off-by: bhavanakarwade <[email protected]>

* fix: made request if parameter optional

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: added templateId mapping in file upload functionality

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: interface types

Signed-off-by: bhavanakarwade <[email protected]>

* feat: implemented prettyvc while bulk issuance

Signed-off-by: bhavanakarwade <[email protected]>

* fix: issuance process

Signed-off-by: bhavanakarwade <[email protected]>

* wip: pretty for bulk issuance

Signed-off-by: bhavanakarwade <[email protected]>

* wip: made autoacceptcredential flag always

Signed-off-by: bhavanakarwade <[email protected]>

* fix: datatype issue

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: added agent url

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: added logs to test bulk issuance payload

Signed-off-by: bhavanakarwade <[email protected]>

---------

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: remove unnecessary code

Signed-off-by: bhavanakarwade <[email protected]>

* fix: remove unnecessary logs

Signed-off-by: bhavanakarwade <[email protected]>

---------

Signed-off-by: Ganesh Nawle <[email protected]>
Signed-off-by: bhavanakarwade <[email protected]>
Signed-off-by: tipusinghaw <[email protected]>
Signed-off-by: KulkarniShashank <[email protected]>
Signed-off-by: [email protected] <[email protected]>
Co-authored-by: Ganesh Nawle <[email protected]>
Co-authored-by: ganesh_nawle <[email protected]>
Co-authored-by: tipusinghaw <[email protected]>
Co-authored-by: shitrerohit <[email protected]>
Co-authored-by: KulkarniShashank <[email protected]>
Co-authored-by: Shashank Kulkarni <[email protected]>
Co-authored-by: [email protected] <[email protected]>
Co-authored-by: KambleSahil3 <[email protected]>
Co-authored-by: pallavighule <[email protected]>
Signed-off-by: KulkarniShashank <[email protected]>
  • Loading branch information
10 people committed Sep 11, 2024
1 parent 52f23f3 commit d44b914
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 27 deletions.
39 changes: 31 additions & 8 deletions apps/api-gateway/src/issuance/dtos/issuance.dto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,26 @@ class Issuer {
@Type(() => String)
id: string | { id?: string };
}

class PrettyVc {
@ApiPropertyOptional()
@IsOptional()
@Transform(({ value }) => trim(value))
@IsString({ message: 'Certificate must be in string format.' })
certificate: string;

@ApiPropertyOptional({example: 'a4'})
@IsOptional()
@Transform(({ value }) => trim(value))
@IsString({ message: 'Size must be in string format.' })
size: string;

@ApiPropertyOptional({example: 'landscape'})
@IsOptional()
@Transform(({ value }) => trim(value))
@IsString({ message: 'orientation must be in string format.' })
orientation: string;
}
export class Credential {
@ApiProperty()
@IsNotEmpty({ message: 'context is required' })
Expand All @@ -32,8 +52,7 @@ export class Credential {
@Type(() => String)
@IsOptional()
id?:string;



@ApiProperty()
@ValidateNested({ each: true })
@Type(() => Issuer)
Expand All @@ -45,17 +64,22 @@ export class Credential {
@Type(() => String)
issuanceDate:string;

@ApiPropertyOptional()
@IsOptional()
@Type(() => PrettyVc)
prettyVc?: PrettyVc;

@ApiProperty()
@IsString({ message: 'expiration date should be string' })
@IsNotEmpty({ message: 'expiration date is required' })
@Type(() => String)
@IsOptional()
expirationDate?:string;

@ApiProperty()
@IsNotEmpty({ message: ' credential subject required' })
credentialSubject: SingleOrArray<JsonObject>;
[key: string]: unknown
@ApiProperty()
@IsNotEmpty({ message: ' credential subject required' })
credentialSubject: SingleOrArray<JsonObject>;
[key: string]: unknown

}

Expand Down Expand Up @@ -573,8 +597,7 @@ export class ClientDetails {

userId?: string;

@ApiPropertyOptional({ example: 'https://example.com/logo.png' })
@Transform(({ value }) => trim(value))
@ApiProperty({ required: false, example: 'issue-data.csv' })
@IsOptional()
@IsUrl(
{
Expand Down
10 changes: 0 additions & 10 deletions apps/issuance/interfaces/issuance.interfaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,15 +141,6 @@ export interface ICredential{
'@context':[];
type: string[];
prettyVc?: IPrettyVc;
issuer?: {
id: string;
};
issuanceDate?: string;
credentialSubject?: ICredentialSubject;
}

interface ICredentialSubject {
[key: string]: string;
}

export interface IOptions{
Expand Down Expand Up @@ -343,7 +334,6 @@ export interface IQueuePayload{
certificate?: string;
size?: string;
orientation?: string;
isReuseConnection?: boolean;
}

interface FileDetails {
Expand Down
5 changes: 2 additions & 3 deletions apps/issuance/src/issuance.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1566,8 +1566,8 @@ return newCacheKey;
schemaLedgerId,
credentialData: jobDetails.credential_data,
orgDid,
orgId,
isReuseConnection: true
orgId

};

prettyVc = {
Expand All @@ -1578,7 +1578,6 @@ return newCacheKey;

oobIssuancepayload = await createOobJsonldIssuancePayload(JsonldCredentialDetails, prettyVc);
}

const oobCredentials = await this.outOfBandCredentialOffer(
oobIssuancepayload, jobDetails?.platformName, jobDetails?.organizationLogoUrl, prettyVc);
if (oobCredentials) {
Expand Down
8 changes: 3 additions & 5 deletions libs/common/src/cast.helper.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DidMethod, JSONSchemaType, ledgerLessDIDType, ProofType, schemaRequestType, TemplateIdentifier } from '@credebl/enum/enum';
import { JSONSchemaType, ledgerLessDIDType, schemaRequestType, TemplateIdentifier } from '@credebl/enum/enum';
import { ISchemaFields } from './interfaces/schema.interface';
import { BadRequestException, PipeTransform } from '@nestjs/common';
import { plainToClass } from 'class-transformer';
Expand All @@ -12,7 +12,7 @@ import {
registerDecorator
} from 'class-validator';
import { ResponseMessages } from './response-messages';
import { ICredentialData, IJsonldCredential, IPrettyVc } from './interfaces/issuance.interface';
import { IJsonldCredential, IPrettyVc } from './interfaces/issuance.interface';

interface ToNumberOptions {
default?: number;
Expand Down Expand Up @@ -181,11 +181,9 @@ export const validateEmail = (email: string): boolean => {

// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/explicit-function-return-type
export const createOobJsonldIssuancePayload = (JsonldCredentialDetails: IJsonldCredential, prettyVc: IPrettyVc) => {
const {credentialData, orgDid, orgId, schemaLedgerId, schemaName, isReuseConnection} = JsonldCredentialDetails;
const {credentialData, orgDid, orgId, schemaLedgerId, schemaName} = JsonldCredentialDetails;
const credentialSubject = { };

const proofType = (orgDid?.includes(DidMethod.POLYGON)) ? ProofType.POLYGON_PROOFTYPE : ProofType.NO_LEDGER_PROOFTYPE;

for (const key in credentialData) {
if (credentialData.hasOwnProperty(key) && TemplateIdentifier.EMAIL_COLUMN !== key) {
credentialSubject[key] = credentialData[key];
Expand Down
2 changes: 1 addition & 1 deletion libs/prisma-service/prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ model file_upload {
organisation organisation? @relation(fields: [orgId], references: [id])
orgId String? @db.Uuid
credential_type String?
templateId String? @db.VarChar
templateId String? @db.VarChar
}

model file_data {
Expand Down

0 comments on commit d44b914

Please sign in to comment.