From bd3dadac72d1b10a14dd8c4a005916bbf7d5a4df Mon Sep 17 00:00:00 2001 From: Michael Avoyan <64565419+michaelavoyan@users.noreply.github.com> Date: Sun, 6 Oct 2024 14:46:57 +0300 Subject: [PATCH] VL-8414 - align to ios structure sdk v0.10.0 --- packages/sample-server/src/utils/Converter.ts | 4 ++-- packages/sdk/package.json | 2 +- packages/sdk/src/api/entities/VCLOrganization.ts | 10 +++++----- packages/sdk/src/api/entities/VCLService.ts | 2 ++ .../entities/VCLServiceCredentialAgentIssuer.ts | 11 ----------- packages/sdk/src/index.ts | 2 -- ...CLCredentialManifestDescriptorByService.test.ts | 14 +++++++------- 7 files changed, 17 insertions(+), 28 deletions(-) delete mode 100644 packages/sdk/src/api/entities/VCLServiceCredentialAgentIssuer.ts diff --git a/packages/sample-server/src/utils/Converter.ts b/packages/sample-server/src/utils/Converter.ts index cd6cd03..47ebe5c 100644 --- a/packages/sample-server/src/utils/Converter.ts +++ b/packages/sample-server/src/utils/Converter.ts @@ -30,7 +30,7 @@ import { VCLPresentationRequestDescriptor, VCLPresentationSubmission, VCLPublicJwk, - VCLServiceCredentialAgentIssuer, + VCLService, VCLSubmissionResult, VCLToken, VCLVerifiableCredential, @@ -115,7 +115,7 @@ const credentialManifestDescriptorByDeepLinkFrom = (json: Dictionary): VCLC const credentialManifestDescriptorByServiceFrom = (json: Dictionary): VCLCredentialManifestDescriptorByService => { return new VCLCredentialManifestDescriptorByService( - new VCLServiceCredentialAgentIssuer(json.service), + new VCLService(json.service), issuingTypeFromString(json.issuingType), json.credentialTypes, null, diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 07a4660..409e17c 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@velocitycareerlabs/vnf-nodejs-wallet-sdk", - "version": "0.9.22", + "version": "0.10.0", "description": "VNF Wallet SDK Nodejs", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/sdk/src/api/entities/VCLOrganization.ts b/packages/sdk/src/api/entities/VCLOrganization.ts index fb8d865..a4fb9ef 100644 --- a/packages/sdk/src/api/entities/VCLOrganization.ts +++ b/packages/sdk/src/api/entities/VCLOrganization.ts @@ -1,16 +1,16 @@ import { Dictionary } from "../VCLTypes"; -import VCLServiceCredentialAgentIssuer from "./VCLServiceCredentialAgentIssuer"; +import VCLService from "./VCLService"; export default class VCLOrganization { TAG = VCLOrganization.name; - get serviceCredentialAgentIssuers(): VCLServiceCredentialAgentIssuer[] { + get serviceCredentialAgentIssuers(): VCLService[] { return this.parseServiceCredentialAgentIssuers(); } constructor(public readonly payload: Dictionary) {} - private parseServiceCredentialAgentIssuers(): VCLServiceCredentialAgentIssuer[] { - const result: VCLServiceCredentialAgentIssuer[] = []; + private parseServiceCredentialAgentIssuers(): VCLService[] { + const result: VCLService[] = []; try { const serviceJsonArr = (this.payload[VCLOrganization.KeyService] ?? @@ -19,7 +19,7 @@ export default class VCLOrganization { for (const i in serviceJsonArr) { const it = serviceJsonArr[i]; if (it) { - result.push(new VCLServiceCredentialAgentIssuer(it)); + result.push(new VCLService(it)); } } } diff --git a/packages/sdk/src/api/entities/VCLService.ts b/packages/sdk/src/api/entities/VCLService.ts index e31ac1a..394b53a 100644 --- a/packages/sdk/src/api/entities/VCLService.ts +++ b/packages/sdk/src/api/entities/VCLService.ts @@ -4,10 +4,12 @@ export default class VCLService { id: string; type: string; serviceEndpoint: string; + credentialTypes: string; constructor(public payload: Dictionary) { this.id = payload[VCLService.KeyId]; this.type = payload[VCLService.KeyType]; this.serviceEndpoint = payload[VCLService.KeyServiceEndpoint]; + this.credentialTypes = payload[VCLService.KeyCredentialTypes]; } static readonly KeyId = "id"; diff --git a/packages/sdk/src/api/entities/VCLServiceCredentialAgentIssuer.ts b/packages/sdk/src/api/entities/VCLServiceCredentialAgentIssuer.ts deleted file mode 100644 index 008b9c4..0000000 --- a/packages/sdk/src/api/entities/VCLServiceCredentialAgentIssuer.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Dictionary, Nullish } from "../VCLTypes"; -import VCLService from "./VCLService"; - -export default class VCLServiceCredentialAgentIssuer extends VCLService { - credentialTypes: Nullish; - constructor(public readonly payload: Dictionary) { - super(payload); - - this.credentialTypes = payload[VCLService.KeyCredentialTypes]; - } -} diff --git a/packages/sdk/src/index.ts b/packages/sdk/src/index.ts index 4299085..0fdda78 100644 --- a/packages/sdk/src/index.ts +++ b/packages/sdk/src/index.ts @@ -40,7 +40,6 @@ import VCLPresentationSubmission from "./api/entities/VCLPresentationSubmission" import VCLPublicJwk from "./api/entities/VCLPublicJwk"; import VCLPushDelegate from "./api/entities/VCLPushDelegate"; import VCLService from "./api/entities/VCLService"; -import VCLServiceCredentialAgentIssuer from "./api/entities/VCLServiceCredentialAgentIssuer"; import VCLServiceType from "./api/entities/VCLServiceType"; import VCLServiceTypes from "./api/entities/VCLServiceTypes"; import { VCLIssuingType, issuingTypeFromString } from "./api/entities/VCLIssuingType"; @@ -115,7 +114,6 @@ export { VCLPublicJwk, VCLPushDelegate, VCLService, - VCLServiceCredentialAgentIssuer, VCLSubmissionResult, VCLToken, VCLVerifiableCredential, diff --git a/packages/sdk/test/entities/VCLCredentialManifestDescriptorByService.test.ts b/packages/sdk/test/entities/VCLCredentialManifestDescriptorByService.test.ts index 47e9bbb..96da735 100644 --- a/packages/sdk/test/entities/VCLCredentialManifestDescriptorByService.test.ts +++ b/packages/sdk/test/entities/VCLCredentialManifestDescriptorByService.test.ts @@ -1,6 +1,6 @@ import VCLCredentialManifestDescriptorByService from "../../src/api/entities/VCLCredentialManifestDescriptorByService"; import { VCLIssuingType } from "../../src"; -import VCLServiceCredentialAgentIssuer from "../../src/api/entities/VCLServiceCredentialAgentIssuer"; +import VCLService from "../../src/api/entities/VCLService"; import { CredentialManifestDescriptorMocks } from "../infrastructure/resources/valid/CredentialManifestDescriptorMocks"; import { DidJwkMocks } from "../infrastructure/resources/valid/DidJwkMocks"; @@ -8,7 +8,7 @@ describe("VCLCredentialManifestDescriptorByService Tests", () => { let subject: VCLCredentialManifestDescriptorByService; test("testCredentialManifestDescriptorByServiceWithFullInput1Success", () => { - const service = new VCLServiceCredentialAgentIssuer( + const service = new VCLService( JSON.parse(CredentialManifestDescriptorMocks.IssuingServiceJsonStr) ); subject = new VCLCredentialManifestDescriptorByService( @@ -39,7 +39,7 @@ describe("VCLCredentialManifestDescriptorByService Tests", () => { }); test("testCredentialManifestDescriptorByServiceWithFullInput2Success", () => { - const service = new VCLServiceCredentialAgentIssuer( + const service = new VCLService( JSON.parse(CredentialManifestDescriptorMocks.IssuingServiceJsonStr) ); subject = new VCLCredentialManifestDescriptorByService( @@ -70,7 +70,7 @@ describe("VCLCredentialManifestDescriptorByService Tests", () => { }); test("testCredentialManifestDescriptorByServiceWithPartialInput3Success", () => { - const service = new VCLServiceCredentialAgentIssuer( + const service = new VCLService( JSON.parse(CredentialManifestDescriptorMocks.IssuingServiceJsonStr) ); subject = new VCLCredentialManifestDescriptorByService( @@ -97,7 +97,7 @@ describe("VCLCredentialManifestDescriptorByService Tests", () => { }); test("testCredentialManifestDescriptorByServiceWithPartialInput4Success", () => { - const service = new VCLServiceCredentialAgentIssuer( + const service = new VCLService( JSON.parse( CredentialManifestDescriptorMocks.IssuingServiceWithParamJsonStr ) @@ -118,7 +118,7 @@ describe("VCLCredentialManifestDescriptorByService Tests", () => { }); test("testCredentialManifestDescriptorByServiceWithPartialInput5Success", () => { - const service = new VCLServiceCredentialAgentIssuer( + const service = new VCLService( JSON.parse( CredentialManifestDescriptorMocks.IssuingServiceWithParamJsonStr ) @@ -139,7 +139,7 @@ describe("VCLCredentialManifestDescriptorByService Tests", () => { }); test("testCredentialManifestDescriptorByServiceWithPartialInput6Success", () => { - const service = new VCLServiceCredentialAgentIssuer( + const service = new VCLService( JSON.parse(CredentialManifestDescriptorMocks.IssuingServiceJsonStr) ); subject = new VCLCredentialManifestDescriptorByService(