@sphereon/ssi-sdk.siopv2-oid4vp-rp-rest-client 0.34.1-feature.SSISDK.65.redirect.fix.258 → 0.34.1-feature.SSISDK.72.RP.site.275

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.cjs CHANGED
@@ -87,7 +87,8 @@ var SIOPv2OID4VPRPRestClient = class {
87
87
  });
88
88
  logger.debug(`auth status response: ${statusResponse}`);
89
89
  try {
90
- return await statusResponse.json();
90
+ const payloadResponse = await statusResponse.json();
91
+ return (0, import_ssi_sdk.authStatusResponseFromPayload)(payloadResponse);
91
92
  } catch (err) {
92
93
  throw Error(`Status has returned ${statusResponse.status}`);
93
94
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/index.ts","../src/agent/SIOPv2OID4VPRPRestClient.ts"],"sourcesContent":["export { SIOPv2OID4VPRPRestClient } from './agent/SIOPv2OID4VPRPRestClient'\nexport * from './types/ISIOPv2OID4VPRPRestClient'\n","import {\n type AuthStatusResponse,\n type CreateAuthorizationRequest,\n createAuthorizationRequestToPayload,\n type CreateAuthorizationResponse,\n createAuthorizationResponseFromPayload,\n} from '@sphereon/ssi-sdk.siopv2-oid4vp-common'\nimport { Loggers } from '@sphereon/ssi-types'\nimport { IAgentPlugin } from '@veramo/core'\nimport fetch from 'cross-fetch'\nimport {\n ISiopClientGenerateAuthRequestArgs,\n ISiopClientGetAuthStatusArgs,\n ISiopClientRemoveAuthRequestSessionArgs,\n ISIOPv2OID4VPRPRestClient,\n Siopv2RestClientAuthenticationOpts,\n Siopv2RestClientOpts,\n} from '../types/ISIOPv2OID4VPRPRestClient'\n\nconst logger = Loggers.DEFAULT.get('sphereon:ssi-sdk-siopv2-oid4vp-rp-rest-client')\n\n/**\n * @beta\n */\nexport class SIOPv2OID4VPRPRestClient implements IAgentPlugin {\n readonly methods: ISIOPv2OID4VPRPRestClient = {\n siopClientRemoveAuthRequestState: this.siopClientRemoveAuthRequestState.bind(this),\n siopClientCreateAuthRequest: this.siopClientCreateAuthRequest.bind(this),\n siopClientGetAuthStatus: this.siopClientGetAuthStatus.bind(this),\n }\n\n private readonly baseUrl?: string\n private readonly authOpts?: Siopv2RestClientAuthenticationOpts\n\n constructor(args?: Siopv2RestClientOpts) {\n this.baseUrl = args?.baseUrl\n this.authOpts = args?.authentication\n }\n\n private async createHeaders(existing?: Record<string, any>): Promise<HeadersInit> {\n const headers: HeadersInit = {\n ...existing,\n Accept: 'application/json',\n }\n if (this.authOpts?.enabled === true) {\n if (!this.authOpts.bearerToken) {\n throw Error(`Cannot have authentication enabled, whilst not enabling static bearer tokens at this point`)\n }\n headers.Authorization = `Bearer ${\n typeof this.authOpts.bearerToken === 'string' ? this.authOpts.bearerToken : await this.authOpts.bearerToken()\n }`\n }\n return headers\n }\n\n private async siopClientRemoveAuthRequestState(args: ISiopClientRemoveAuthRequestSessionArgs): Promise<boolean> {\n const baseUrl = this.checkBaseUrlParameter(args.baseUrl)\n await fetch(this.uriWithBase(`/backend/auth/requests/${args.correlationId}`, baseUrl), {\n headers: await this.createHeaders(),\n method: 'DELETE',\n })\n return true\n }\n\n private async siopClientGetAuthStatus(args: ISiopClientGetAuthStatusArgs): Promise<AuthStatusResponse> {\n const baseUrl = this.checkBaseUrlParameter(args.baseUrl)\n const url = this.uriWithBase(`/backend/auth/status/${args.correlationId}`, baseUrl)\n const statusResponse = await fetch(url, {\n method: 'GET',\n headers: await this.createHeaders({ 'Content-Type': 'application/json' }),\n })\n logger.debug(`auth status response: ${statusResponse}`)\n try {\n return await statusResponse.json()\n } catch (err) {\n throw Error(`Status has returned ${statusResponse.status}`)\n }\n }\n\n private async siopClientCreateAuthRequest(args: ISiopClientGenerateAuthRequestArgs): Promise<CreateAuthorizationResponse> {\n const baseUrl = this.checkBaseUrlParameter(args.baseUrl)\n const url = this.uriWithBase(`/backend/auth/requests`, baseUrl)\n\n const origResponse = await fetch(url, {\n method: 'POST',\n headers: await this.createHeaders({ 'Content-Type': 'application/json' }),\n body: JSON.stringify(createAuthorizationRequestToPayload({ ...args, requestUriMethod: 'get' } satisfies CreateAuthorizationRequest)),\n })\n return createAuthorizationResponseFromPayload(await origResponse.json())\n }\n\n private uriWithBase(path: string, baseUrl?: string): string {\n if (!this.baseUrl && !baseUrl) {\n throw new Error('You have to provide baseUrl')\n }\n return baseUrl ? `${baseUrl}${path.startsWith('/') ? path : '/' + path}` : `${this.baseUrl}${path.startsWith('/') ? path : '/' + path}`\n }\n\n private checkBaseUrlParameter(baseUrl?: string): string {\n if (!baseUrl && !this.baseUrl) {\n throw new Error('No base url has been provided')\n }\n return baseUrl ? baseUrl : (this.baseUrl as string)\n }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;ACAA,qBAMO;AACP,uBAAwB;AAExB,yBAAkB;AAUlB,IAAMA,SAASC,yBAAQC,QAAQC,IAAI,+CAAA;AAK5B,IAAMC,2BAAN,MAAMA;EAxBb,OAwBaA;;;EACFC,UAAqC;IAC5CC,kCAAkC,KAAKA,iCAAiCC,KAAK,IAAI;IACjFC,6BAA6B,KAAKA,4BAA4BD,KAAK,IAAI;IACvEE,yBAAyB,KAAKA,wBAAwBF,KAAK,IAAI;EACjE;EAEiBG;EACAC;EAEjB,YAAYC,MAA6B;AACvC,SAAKF,UAAUE,MAAMF;AACrB,SAAKC,WAAWC,MAAMC;EACxB;EAEA,MAAcC,cAAcC,UAAsD;AAChF,UAAMC,UAAuB;MAC3B,GAAGD;MACHE,QAAQ;IACV;AACA,QAAI,KAAKN,UAAUO,YAAY,MAAM;AACnC,UAAI,CAAC,KAAKP,SAASQ,aAAa;AAC9B,cAAMC,MAAM,4FAA4F;MAC1G;AACAJ,cAAQK,gBAAgB,UACtB,OAAO,KAAKV,SAASQ,gBAAgB,WAAW,KAAKR,SAASQ,cAAc,MAAM,KAAKR,SAASQ,YAAW,CAAA;IAE/G;AACA,WAAOH;EACT;EAEA,MAAcV,iCAAiCM,MAAiE;AAC9G,UAAMF,UAAU,KAAKY,sBAAsBV,KAAKF,OAAO;AACvD,cAAMa,mBAAAA,SAAM,KAAKC,YAAY,0BAA0BZ,KAAKa,aAAa,IAAIf,OAAAA,GAAU;MACrFM,SAAS,MAAM,KAAKF,cAAa;MACjCY,QAAQ;IACV,CAAA;AACA,WAAO;EACT;EAEA,MAAcjB,wBAAwBG,MAAiE;AACrG,UAAMF,UAAU,KAAKY,sBAAsBV,KAAKF,OAAO;AACvD,UAAMiB,MAAM,KAAKH,YAAY,wBAAwBZ,KAAKa,aAAa,IAAIf,OAAAA;AAC3E,UAAMkB,iBAAiB,UAAML,mBAAAA,SAAMI,KAAK;MACtCD,QAAQ;MACRV,SAAS,MAAM,KAAKF,cAAc;QAAE,gBAAgB;MAAmB,CAAA;IACzE,CAAA;AACAd,WAAO6B,MAAM,yBAAyBD,cAAAA,EAAgB;AACtD,QAAI;AACF,aAAO,MAAMA,eAAeE,KAAI;IAClC,SAASC,KAAK;AACZ,YAAMX,MAAM,uBAAuBQ,eAAeI,MAAM,EAAE;IAC5D;EACF;EAEA,MAAcxB,4BAA4BI,MAAgF;AACxH,UAAMF,UAAU,KAAKY,sBAAsBV,KAAKF,OAAO;AACvD,UAAMiB,MAAM,KAAKH,YAAY,0BAA0Bd,OAAAA;AAEvD,UAAMuB,eAAe,UAAMV,mBAAAA,SAAMI,KAAK;MACpCD,QAAQ;MACRV,SAAS,MAAM,KAAKF,cAAc;QAAE,gBAAgB;MAAmB,CAAA;MACvEoB,MAAMC,KAAKC,cAAUC,oDAAoC;QAAE,GAAGzB;QAAM0B,kBAAkB;MAAM,CAAA,CAAA;IAC9F,CAAA;AACA,eAAOC,uDAAuC,MAAMN,aAAaH,KAAI,CAAA;EACvE;EAEQN,YAAYgB,MAAc9B,SAA0B;AAC1D,QAAI,CAAC,KAAKA,WAAW,CAACA,SAAS;AAC7B,YAAM,IAAIU,MAAM,6BAAA;IAClB;AACA,WAAOV,UAAU,GAAGA,OAAAA,GAAU8B,KAAKC,WAAW,GAAA,IAAOD,OAAO,MAAMA,IAAAA,KAAS,GAAG,KAAK9B,OAAO,GAAG8B,KAAKC,WAAW,GAAA,IAAOD,OAAO,MAAMA,IAAAA;EACnI;EAEQlB,sBAAsBZ,SAA0B;AACtD,QAAI,CAACA,WAAW,CAAC,KAAKA,SAAS;AAC7B,YAAM,IAAIU,MAAM,+BAAA;IAClB;AACA,WAAOV,UAAUA,UAAW,KAAKA;EACnC;AACF;","names":["logger","Loggers","DEFAULT","get","SIOPv2OID4VPRPRestClient","methods","siopClientRemoveAuthRequestState","bind","siopClientCreateAuthRequest","siopClientGetAuthStatus","baseUrl","authOpts","args","authentication","createHeaders","existing","headers","Accept","enabled","bearerToken","Error","Authorization","checkBaseUrlParameter","fetch","uriWithBase","correlationId","method","url","statusResponse","debug","json","err","status","origResponse","body","JSON","stringify","createAuthorizationRequestToPayload","requestUriMethod","createAuthorizationResponseFromPayload","path","startsWith"]}
1
+ {"version":3,"sources":["../src/index.ts","../src/agent/SIOPv2OID4VPRPRestClient.ts"],"sourcesContent":["export { SIOPv2OID4VPRPRestClient } from './agent/SIOPv2OID4VPRPRestClient'\nexport * from './types/ISIOPv2OID4VPRPRestClient'\n","import {\n type AuthStatusResponse,\n authStatusResponseFromPayload,\n type CreateAuthorizationRequest,\n createAuthorizationRequestToPayload,\n type CreateAuthorizationResponse,\n createAuthorizationResponseFromPayload,\n} from '@sphereon/ssi-sdk.siopv2-oid4vp-common'\nimport { Loggers } from '@sphereon/ssi-types'\nimport { IAgentPlugin } from '@veramo/core'\nimport fetch from 'cross-fetch'\nimport {\n ISiopClientGenerateAuthRequestArgs,\n ISiopClientGetAuthStatusArgs,\n ISiopClientRemoveAuthRequestSessionArgs,\n ISIOPv2OID4VPRPRestClient,\n Siopv2RestClientAuthenticationOpts,\n Siopv2RestClientOpts,\n} from '../types/ISIOPv2OID4VPRPRestClient'\n\nconst logger = Loggers.DEFAULT.get('sphereon:ssi-sdk-siopv2-oid4vp-rp-rest-client')\n\n/**\n * @beta\n */\nexport class SIOPv2OID4VPRPRestClient implements IAgentPlugin {\n readonly methods: ISIOPv2OID4VPRPRestClient = {\n siopClientRemoveAuthRequestState: this.siopClientRemoveAuthRequestState.bind(this),\n siopClientCreateAuthRequest: this.siopClientCreateAuthRequest.bind(this),\n siopClientGetAuthStatus: this.siopClientGetAuthStatus.bind(this),\n }\n\n private readonly baseUrl?: string\n private readonly authOpts?: Siopv2RestClientAuthenticationOpts\n\n constructor(args?: Siopv2RestClientOpts) {\n this.baseUrl = args?.baseUrl\n this.authOpts = args?.authentication\n }\n\n private async createHeaders(existing?: Record<string, any>): Promise<HeadersInit> {\n const headers: HeadersInit = {\n ...existing,\n Accept: 'application/json',\n }\n if (this.authOpts?.enabled === true) {\n if (!this.authOpts.bearerToken) {\n throw Error(`Cannot have authentication enabled, whilst not enabling static bearer tokens at this point`)\n }\n headers.Authorization = `Bearer ${\n typeof this.authOpts.bearerToken === 'string' ? this.authOpts.bearerToken : await this.authOpts.bearerToken()\n }`\n }\n return headers\n }\n\n private async siopClientRemoveAuthRequestState(args: ISiopClientRemoveAuthRequestSessionArgs): Promise<boolean> {\n const baseUrl = this.checkBaseUrlParameter(args.baseUrl)\n await fetch(this.uriWithBase(`/backend/auth/requests/${args.correlationId}`, baseUrl), {\n headers: await this.createHeaders(),\n method: 'DELETE',\n })\n return true\n }\n\n private async siopClientGetAuthStatus(args: ISiopClientGetAuthStatusArgs): Promise<AuthStatusResponse> {\n const baseUrl = this.checkBaseUrlParameter(args.baseUrl)\n const url = this.uriWithBase(`/backend/auth/status/${args.correlationId}`, baseUrl)\n const statusResponse = await fetch(url, {\n method: 'GET',\n headers: await this.createHeaders({ 'Content-Type': 'application/json' }),\n })\n logger.debug(`auth status response: ${statusResponse}`)\n try {\n const payloadResponse = await statusResponse.json()\n return authStatusResponseFromPayload(payloadResponse)\n } catch (err) {\n throw Error(`Status has returned ${statusResponse.status}`)\n }\n }\n\n private async siopClientCreateAuthRequest(args: ISiopClientGenerateAuthRequestArgs): Promise<CreateAuthorizationResponse> {\n const baseUrl = this.checkBaseUrlParameter(args.baseUrl)\n const url = this.uriWithBase(`/backend/auth/requests`, baseUrl)\n\n const origResponse = await fetch(url, {\n method: 'POST',\n headers: await this.createHeaders({ 'Content-Type': 'application/json' }),\n body: JSON.stringify(createAuthorizationRequestToPayload({ ...args, requestUriMethod: 'get' } satisfies CreateAuthorizationRequest)),\n })\n return createAuthorizationResponseFromPayload(await origResponse.json())\n }\n\n private uriWithBase(path: string, baseUrl?: string): string {\n if (!this.baseUrl && !baseUrl) {\n throw new Error('You have to provide baseUrl')\n }\n return baseUrl ? `${baseUrl}${path.startsWith('/') ? path : '/' + path}` : `${this.baseUrl}${path.startsWith('/') ? path : '/' + path}`\n }\n\n private checkBaseUrlParameter(baseUrl?: string): string {\n if (!baseUrl && !this.baseUrl) {\n throw new Error('No base url has been provided')\n }\n return baseUrl ? baseUrl : (this.baseUrl as string)\n }\n}\n"],"mappings":"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","names":["logger","Loggers","DEFAULT","get","SIOPv2OID4VPRPRestClient","methods","siopClientRemoveAuthRequestState","bind","siopClientCreateAuthRequest","siopClientGetAuthStatus","baseUrl","authOpts","args","authentication","createHeaders","existing","headers","Accept","enabled","bearerToken","Error","Authorization","checkBaseUrlParameter","fetch","uriWithBase","correlationId","method","url","statusResponse","debug","payloadResponse","json","authStatusResponseFromPayload","err","status","origResponse","body","JSON","stringify","createAuthorizationRequestToPayload","requestUriMethod","createAuthorizationResponseFromPayload","path","startsWith"]}
package/dist/index.js CHANGED
@@ -2,7 +2,7 @@ var __defProp = Object.defineProperty;
2
2
  var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
3
3
 
4
4
  // src/agent/SIOPv2OID4VPRPRestClient.ts
5
- import { createAuthorizationRequestToPayload, createAuthorizationResponseFromPayload } from "@sphereon/ssi-sdk.siopv2-oid4vp-common";
5
+ import { authStatusResponseFromPayload, createAuthorizationRequestToPayload, createAuthorizationResponseFromPayload } from "@sphereon/ssi-sdk.siopv2-oid4vp-common";
6
6
  import { Loggers } from "@sphereon/ssi-types";
7
7
  import fetch from "cross-fetch";
8
8
  var logger = Loggers.DEFAULT.get("sphereon:ssi-sdk-siopv2-oid4vp-rp-rest-client");
@@ -53,7 +53,8 @@ var SIOPv2OID4VPRPRestClient = class {
53
53
  });
54
54
  logger.debug(`auth status response: ${statusResponse}`);
55
55
  try {
56
- return await statusResponse.json();
56
+ const payloadResponse = await statusResponse.json();
57
+ return authStatusResponseFromPayload(payloadResponse);
57
58
  } catch (err) {
58
59
  throw Error(`Status has returned ${statusResponse.status}`);
59
60
  }
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/agent/SIOPv2OID4VPRPRestClient.ts"],"sourcesContent":["import {\n type AuthStatusResponse,\n type CreateAuthorizationRequest,\n createAuthorizationRequestToPayload,\n type CreateAuthorizationResponse,\n createAuthorizationResponseFromPayload,\n} from '@sphereon/ssi-sdk.siopv2-oid4vp-common'\nimport { Loggers } from '@sphereon/ssi-types'\nimport { IAgentPlugin } from '@veramo/core'\nimport fetch from 'cross-fetch'\nimport {\n ISiopClientGenerateAuthRequestArgs,\n ISiopClientGetAuthStatusArgs,\n ISiopClientRemoveAuthRequestSessionArgs,\n ISIOPv2OID4VPRPRestClient,\n Siopv2RestClientAuthenticationOpts,\n Siopv2RestClientOpts,\n} from '../types/ISIOPv2OID4VPRPRestClient'\n\nconst logger = Loggers.DEFAULT.get('sphereon:ssi-sdk-siopv2-oid4vp-rp-rest-client')\n\n/**\n * @beta\n */\nexport class SIOPv2OID4VPRPRestClient implements IAgentPlugin {\n readonly methods: ISIOPv2OID4VPRPRestClient = {\n siopClientRemoveAuthRequestState: this.siopClientRemoveAuthRequestState.bind(this),\n siopClientCreateAuthRequest: this.siopClientCreateAuthRequest.bind(this),\n siopClientGetAuthStatus: this.siopClientGetAuthStatus.bind(this),\n }\n\n private readonly baseUrl?: string\n private readonly authOpts?: Siopv2RestClientAuthenticationOpts\n\n constructor(args?: Siopv2RestClientOpts) {\n this.baseUrl = args?.baseUrl\n this.authOpts = args?.authentication\n }\n\n private async createHeaders(existing?: Record<string, any>): Promise<HeadersInit> {\n const headers: HeadersInit = {\n ...existing,\n Accept: 'application/json',\n }\n if (this.authOpts?.enabled === true) {\n if (!this.authOpts.bearerToken) {\n throw Error(`Cannot have authentication enabled, whilst not enabling static bearer tokens at this point`)\n }\n headers.Authorization = `Bearer ${\n typeof this.authOpts.bearerToken === 'string' ? this.authOpts.bearerToken : await this.authOpts.bearerToken()\n }`\n }\n return headers\n }\n\n private async siopClientRemoveAuthRequestState(args: ISiopClientRemoveAuthRequestSessionArgs): Promise<boolean> {\n const baseUrl = this.checkBaseUrlParameter(args.baseUrl)\n await fetch(this.uriWithBase(`/backend/auth/requests/${args.correlationId}`, baseUrl), {\n headers: await this.createHeaders(),\n method: 'DELETE',\n })\n return true\n }\n\n private async siopClientGetAuthStatus(args: ISiopClientGetAuthStatusArgs): Promise<AuthStatusResponse> {\n const baseUrl = this.checkBaseUrlParameter(args.baseUrl)\n const url = this.uriWithBase(`/backend/auth/status/${args.correlationId}`, baseUrl)\n const statusResponse = await fetch(url, {\n method: 'GET',\n headers: await this.createHeaders({ 'Content-Type': 'application/json' }),\n })\n logger.debug(`auth status response: ${statusResponse}`)\n try {\n return await statusResponse.json()\n } catch (err) {\n throw Error(`Status has returned ${statusResponse.status}`)\n }\n }\n\n private async siopClientCreateAuthRequest(args: ISiopClientGenerateAuthRequestArgs): Promise<CreateAuthorizationResponse> {\n const baseUrl = this.checkBaseUrlParameter(args.baseUrl)\n const url = this.uriWithBase(`/backend/auth/requests`, baseUrl)\n\n const origResponse = await fetch(url, {\n method: 'POST',\n headers: await this.createHeaders({ 'Content-Type': 'application/json' }),\n body: JSON.stringify(createAuthorizationRequestToPayload({ ...args, requestUriMethod: 'get' } satisfies CreateAuthorizationRequest)),\n })\n return createAuthorizationResponseFromPayload(await origResponse.json())\n }\n\n private uriWithBase(path: string, baseUrl?: string): string {\n if (!this.baseUrl && !baseUrl) {\n throw new Error('You have to provide baseUrl')\n }\n return baseUrl ? `${baseUrl}${path.startsWith('/') ? path : '/' + path}` : `${this.baseUrl}${path.startsWith('/') ? path : '/' + path}`\n }\n\n private checkBaseUrlParameter(baseUrl?: string): string {\n if (!baseUrl && !this.baseUrl) {\n throw new Error('No base url has been provided')\n }\n return baseUrl ? baseUrl : (this.baseUrl as string)\n }\n}\n"],"mappings":";;;;AAAA,SAGEA,qCAEAC,8CACK;AACP,SAASC,eAAe;AAExB,OAAOC,WAAW;AAUlB,IAAMC,SAASC,QAAQC,QAAQC,IAAI,+CAAA;AAK5B,IAAMC,2BAAN,MAAMA;EAxBb,OAwBaA;;;EACFC,UAAqC;IAC5CC,kCAAkC,KAAKA,iCAAiCC,KAAK,IAAI;IACjFC,6BAA6B,KAAKA,4BAA4BD,KAAK,IAAI;IACvEE,yBAAyB,KAAKA,wBAAwBF,KAAK,IAAI;EACjE;EAEiBG;EACAC;EAEjB,YAAYC,MAA6B;AACvC,SAAKF,UAAUE,MAAMF;AACrB,SAAKC,WAAWC,MAAMC;EACxB;EAEA,MAAcC,cAAcC,UAAsD;AAChF,UAAMC,UAAuB;MAC3B,GAAGD;MACHE,QAAQ;IACV;AACA,QAAI,KAAKN,UAAUO,YAAY,MAAM;AACnC,UAAI,CAAC,KAAKP,SAASQ,aAAa;AAC9B,cAAMC,MAAM,4FAA4F;MAC1G;AACAJ,cAAQK,gBAAgB,UACtB,OAAO,KAAKV,SAASQ,gBAAgB,WAAW,KAAKR,SAASQ,cAAc,MAAM,KAAKR,SAASQ,YAAW,CAAA;IAE/G;AACA,WAAOH;EACT;EAEA,MAAcV,iCAAiCM,MAAiE;AAC9G,UAAMF,UAAU,KAAKY,sBAAsBV,KAAKF,OAAO;AACvD,UAAMa,MAAM,KAAKC,YAAY,0BAA0BZ,KAAKa,aAAa,IAAIf,OAAAA,GAAU;MACrFM,SAAS,MAAM,KAAKF,cAAa;MACjCY,QAAQ;IACV,CAAA;AACA,WAAO;EACT;EAEA,MAAcjB,wBAAwBG,MAAiE;AACrG,UAAMF,UAAU,KAAKY,sBAAsBV,KAAKF,OAAO;AACvD,UAAMiB,MAAM,KAAKH,YAAY,wBAAwBZ,KAAKa,aAAa,IAAIf,OAAAA;AAC3E,UAAMkB,iBAAiB,MAAML,MAAMI,KAAK;MACtCD,QAAQ;MACRV,SAAS,MAAM,KAAKF,cAAc;QAAE,gBAAgB;MAAmB,CAAA;IACzE,CAAA;AACAd,WAAO6B,MAAM,yBAAyBD,cAAAA,EAAgB;AACtD,QAAI;AACF,aAAO,MAAMA,eAAeE,KAAI;IAClC,SAASC,KAAK;AACZ,YAAMX,MAAM,uBAAuBQ,eAAeI,MAAM,EAAE;IAC5D;EACF;EAEA,MAAcxB,4BAA4BI,MAAgF;AACxH,UAAMF,UAAU,KAAKY,sBAAsBV,KAAKF,OAAO;AACvD,UAAMiB,MAAM,KAAKH,YAAY,0BAA0Bd,OAAAA;AAEvD,UAAMuB,eAAe,MAAMV,MAAMI,KAAK;MACpCD,QAAQ;MACRV,SAAS,MAAM,KAAKF,cAAc;QAAE,gBAAgB;MAAmB,CAAA;MACvEoB,MAAMC,KAAKC,UAAUC,oCAAoC;QAAE,GAAGzB;QAAM0B,kBAAkB;MAAM,CAAA,CAAA;IAC9F,CAAA;AACA,WAAOC,uCAAuC,MAAMN,aAAaH,KAAI,CAAA;EACvE;EAEQN,YAAYgB,MAAc9B,SAA0B;AAC1D,QAAI,CAAC,KAAKA,WAAW,CAACA,SAAS;AAC7B,YAAM,IAAIU,MAAM,6BAAA;IAClB;AACA,WAAOV,UAAU,GAAGA,OAAAA,GAAU8B,KAAKC,WAAW,GAAA,IAAOD,OAAO,MAAMA,IAAAA,KAAS,GAAG,KAAK9B,OAAO,GAAG8B,KAAKC,WAAW,GAAA,IAAOD,OAAO,MAAMA,IAAAA;EACnI;EAEQlB,sBAAsBZ,SAA0B;AACtD,QAAI,CAACA,WAAW,CAAC,KAAKA,SAAS;AAC7B,YAAM,IAAIU,MAAM,+BAAA;IAClB;AACA,WAAOV,UAAUA,UAAW,KAAKA;EACnC;AACF;","names":["createAuthorizationRequestToPayload","createAuthorizationResponseFromPayload","Loggers","fetch","logger","Loggers","DEFAULT","get","SIOPv2OID4VPRPRestClient","methods","siopClientRemoveAuthRequestState","bind","siopClientCreateAuthRequest","siopClientGetAuthStatus","baseUrl","authOpts","args","authentication","createHeaders","existing","headers","Accept","enabled","bearerToken","Error","Authorization","checkBaseUrlParameter","fetch","uriWithBase","correlationId","method","url","statusResponse","debug","json","err","status","origResponse","body","JSON","stringify","createAuthorizationRequestToPayload","requestUriMethod","createAuthorizationResponseFromPayload","path","startsWith"]}
1
+ {"version":3,"sources":["../src/agent/SIOPv2OID4VPRPRestClient.ts"],"sourcesContent":["import {\n type AuthStatusResponse,\n authStatusResponseFromPayload,\n type CreateAuthorizationRequest,\n createAuthorizationRequestToPayload,\n type CreateAuthorizationResponse,\n createAuthorizationResponseFromPayload,\n} from '@sphereon/ssi-sdk.siopv2-oid4vp-common'\nimport { Loggers } from '@sphereon/ssi-types'\nimport { IAgentPlugin } from '@veramo/core'\nimport fetch from 'cross-fetch'\nimport {\n ISiopClientGenerateAuthRequestArgs,\n ISiopClientGetAuthStatusArgs,\n ISiopClientRemoveAuthRequestSessionArgs,\n ISIOPv2OID4VPRPRestClient,\n Siopv2RestClientAuthenticationOpts,\n Siopv2RestClientOpts,\n} from '../types/ISIOPv2OID4VPRPRestClient'\n\nconst logger = Loggers.DEFAULT.get('sphereon:ssi-sdk-siopv2-oid4vp-rp-rest-client')\n\n/**\n * @beta\n */\nexport class SIOPv2OID4VPRPRestClient implements IAgentPlugin {\n readonly methods: ISIOPv2OID4VPRPRestClient = {\n siopClientRemoveAuthRequestState: this.siopClientRemoveAuthRequestState.bind(this),\n siopClientCreateAuthRequest: this.siopClientCreateAuthRequest.bind(this),\n siopClientGetAuthStatus: this.siopClientGetAuthStatus.bind(this),\n }\n\n private readonly baseUrl?: string\n private readonly authOpts?: Siopv2RestClientAuthenticationOpts\n\n constructor(args?: Siopv2RestClientOpts) {\n this.baseUrl = args?.baseUrl\n this.authOpts = args?.authentication\n }\n\n private async createHeaders(existing?: Record<string, any>): Promise<HeadersInit> {\n const headers: HeadersInit = {\n ...existing,\n Accept: 'application/json',\n }\n if (this.authOpts?.enabled === true) {\n if (!this.authOpts.bearerToken) {\n throw Error(`Cannot have authentication enabled, whilst not enabling static bearer tokens at this point`)\n }\n headers.Authorization = `Bearer ${\n typeof this.authOpts.bearerToken === 'string' ? this.authOpts.bearerToken : await this.authOpts.bearerToken()\n }`\n }\n return headers\n }\n\n private async siopClientRemoveAuthRequestState(args: ISiopClientRemoveAuthRequestSessionArgs): Promise<boolean> {\n const baseUrl = this.checkBaseUrlParameter(args.baseUrl)\n await fetch(this.uriWithBase(`/backend/auth/requests/${args.correlationId}`, baseUrl), {\n headers: await this.createHeaders(),\n method: 'DELETE',\n })\n return true\n }\n\n private async siopClientGetAuthStatus(args: ISiopClientGetAuthStatusArgs): Promise<AuthStatusResponse> {\n const baseUrl = this.checkBaseUrlParameter(args.baseUrl)\n const url = this.uriWithBase(`/backend/auth/status/${args.correlationId}`, baseUrl)\n const statusResponse = await fetch(url, {\n method: 'GET',\n headers: await this.createHeaders({ 'Content-Type': 'application/json' }),\n })\n logger.debug(`auth status response: ${statusResponse}`)\n try {\n const payloadResponse = await statusResponse.json()\n return authStatusResponseFromPayload(payloadResponse)\n } catch (err) {\n throw Error(`Status has returned ${statusResponse.status}`)\n }\n }\n\n private async siopClientCreateAuthRequest(args: ISiopClientGenerateAuthRequestArgs): Promise<CreateAuthorizationResponse> {\n const baseUrl = this.checkBaseUrlParameter(args.baseUrl)\n const url = this.uriWithBase(`/backend/auth/requests`, baseUrl)\n\n const origResponse = await fetch(url, {\n method: 'POST',\n headers: await this.createHeaders({ 'Content-Type': 'application/json' }),\n body: JSON.stringify(createAuthorizationRequestToPayload({ ...args, requestUriMethod: 'get' } satisfies CreateAuthorizationRequest)),\n })\n return createAuthorizationResponseFromPayload(await origResponse.json())\n }\n\n private uriWithBase(path: string, baseUrl?: string): string {\n if (!this.baseUrl && !baseUrl) {\n throw new Error('You have to provide baseUrl')\n }\n return baseUrl ? `${baseUrl}${path.startsWith('/') ? path : '/' + path}` : `${this.baseUrl}${path.startsWith('/') ? path : '/' + path}`\n }\n\n private checkBaseUrlParameter(baseUrl?: string): string {\n if (!baseUrl && !this.baseUrl) {\n throw new Error('No base url has been provided')\n }\n return baseUrl ? baseUrl : (this.baseUrl as string)\n }\n}\n"],"mappings":";;;;AAAA,SAEEA,+BAEAC,qCAEAC,8CACK;AACP,SAASC,eAAe;AAExB,OAAOC,WAAW;AAUlB,IAAMC,SAASC,QAAQC,QAAQC,IAAI,+CAAA;AAK5B,IAAMC,2BAAN,MAAMA;EAzBb,OAyBaA;;;EACFC,UAAqC;IAC5CC,kCAAkC,KAAKA,iCAAiCC,KAAK,IAAI;IACjFC,6BAA6B,KAAKA,4BAA4BD,KAAK,IAAI;IACvEE,yBAAyB,KAAKA,wBAAwBF,KAAK,IAAI;EACjE;EAEiBG;EACAC;EAEjB,YAAYC,MAA6B;AACvC,SAAKF,UAAUE,MAAMF;AACrB,SAAKC,WAAWC,MAAMC;EACxB;EAEA,MAAcC,cAAcC,UAAsD;AAChF,UAAMC,UAAuB;MAC3B,GAAGD;MACHE,QAAQ;IACV;AACA,QAAI,KAAKN,UAAUO,YAAY,MAAM;AACnC,UAAI,CAAC,KAAKP,SAASQ,aAAa;AAC9B,cAAMC,MAAM,4FAA4F;MAC1G;AACAJ,cAAQK,gBAAgB,UACtB,OAAO,KAAKV,SAASQ,gBAAgB,WAAW,KAAKR,SAASQ,cAAc,MAAM,KAAKR,SAASQ,YAAW,CAAA;IAE/G;AACA,WAAOH;EACT;EAEA,MAAcV,iCAAiCM,MAAiE;AAC9G,UAAMF,UAAU,KAAKY,sBAAsBV,KAAKF,OAAO;AACvD,UAAMa,MAAM,KAAKC,YAAY,0BAA0BZ,KAAKa,aAAa,IAAIf,OAAAA,GAAU;MACrFM,SAAS,MAAM,KAAKF,cAAa;MACjCY,QAAQ;IACV,CAAA;AACA,WAAO;EACT;EAEA,MAAcjB,wBAAwBG,MAAiE;AACrG,UAAMF,UAAU,KAAKY,sBAAsBV,KAAKF,OAAO;AACvD,UAAMiB,MAAM,KAAKH,YAAY,wBAAwBZ,KAAKa,aAAa,IAAIf,OAAAA;AAC3E,UAAMkB,iBAAiB,MAAML,MAAMI,KAAK;MACtCD,QAAQ;MACRV,SAAS,MAAM,KAAKF,cAAc;QAAE,gBAAgB;MAAmB,CAAA;IACzE,CAAA;AACAd,WAAO6B,MAAM,yBAAyBD,cAAAA,EAAgB;AACtD,QAAI;AACF,YAAME,kBAAkB,MAAMF,eAAeG,KAAI;AACjD,aAAOC,8BAA8BF,eAAAA;IACvC,SAASG,KAAK;AACZ,YAAMb,MAAM,uBAAuBQ,eAAeM,MAAM,EAAE;IAC5D;EACF;EAEA,MAAc1B,4BAA4BI,MAAgF;AACxH,UAAMF,UAAU,KAAKY,sBAAsBV,KAAKF,OAAO;AACvD,UAAMiB,MAAM,KAAKH,YAAY,0BAA0Bd,OAAAA;AAEvD,UAAMyB,eAAe,MAAMZ,MAAMI,KAAK;MACpCD,QAAQ;MACRV,SAAS,MAAM,KAAKF,cAAc;QAAE,gBAAgB;MAAmB,CAAA;MACvEsB,MAAMC,KAAKC,UAAUC,oCAAoC;QAAE,GAAG3B;QAAM4B,kBAAkB;MAAM,CAAA,CAAA;IAC9F,CAAA;AACA,WAAOC,uCAAuC,MAAMN,aAAaJ,KAAI,CAAA;EACvE;EAEQP,YAAYkB,MAAchC,SAA0B;AAC1D,QAAI,CAAC,KAAKA,WAAW,CAACA,SAAS;AAC7B,YAAM,IAAIU,MAAM,6BAAA;IAClB;AACA,WAAOV,UAAU,GAAGA,OAAAA,GAAUgC,KAAKC,WAAW,GAAA,IAAOD,OAAO,MAAMA,IAAAA,KAAS,GAAG,KAAKhC,OAAO,GAAGgC,KAAKC,WAAW,GAAA,IAAOD,OAAO,MAAMA,IAAAA;EACnI;EAEQpB,sBAAsBZ,SAA0B;AACtD,QAAI,CAACA,WAAW,CAAC,KAAKA,SAAS;AAC7B,YAAM,IAAIU,MAAM,+BAAA;IAClB;AACA,WAAOV,UAAUA,UAAW,KAAKA;EACnC;AACF;","names":["authStatusResponseFromPayload","createAuthorizationRequestToPayload","createAuthorizationResponseFromPayload","Loggers","fetch","logger","Loggers","DEFAULT","get","SIOPv2OID4VPRPRestClient","methods","siopClientRemoveAuthRequestState","bind","siopClientCreateAuthRequest","siopClientGetAuthStatus","baseUrl","authOpts","args","authentication","createHeaders","existing","headers","Accept","enabled","bearerToken","Error","Authorization","checkBaseUrlParameter","fetch","uriWithBase","correlationId","method","url","statusResponse","debug","payloadResponse","json","authStatusResponseFromPayload","err","status","origResponse","body","JSON","stringify","createAuthorizationRequestToPayload","requestUriMethod","createAuthorizationResponseFromPayload","path","startsWith"]}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@sphereon/ssi-sdk.siopv2-oid4vp-rp-rest-client",
3
3
  "description": "contains the client side to call REST endpoints of relying party",
4
- "version": "0.34.1-feature.SSISDK.65.redirect.fix.258+cc63c4e4",
4
+ "version": "0.34.1-feature.SSISDK.72.RP.site.275+bbc027e3",
5
5
  "source": "src/index.ts",
6
6
  "type": "module",
7
7
  "main": "./dist/index.cjs",
@@ -27,8 +27,8 @@
27
27
  "build": "tsup --config ../../tsup.config.ts --tsconfig ../../tsconfig.tsup.json"
28
28
  },
29
29
  "dependencies": {
30
- "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.34.1-feature.SSISDK.65.redirect.fix.258+cc63c4e4",
31
- "@sphereon/ssi-types": "0.34.1-feature.SSISDK.65.redirect.fix.258+cc63c4e4",
30
+ "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.34.1-feature.SSISDK.72.RP.site.275+bbc027e3",
31
+ "@sphereon/ssi-types": "0.34.1-feature.SSISDK.72.RP.site.275+bbc027e3",
32
32
  "@veramo/core": "4.2.0",
33
33
  "cross-fetch": "^4.1.0"
34
34
  },
@@ -53,5 +53,5 @@
53
53
  "author": "Sphereon <dev@sphereon.com>",
54
54
  "license": "Apache-2.0",
55
55
  "keywords": [],
56
- "gitHead": "cc63c4e453edd30253fe825fe18a8a319f7e2c84"
56
+ "gitHead": "bbc027e332605d0ec4e18ce529a618de76399e65"
57
57
  }
@@ -1,5 +1,6 @@
1
1
  import {
2
2
  type AuthStatusResponse,
3
+ authStatusResponseFromPayload,
3
4
  type CreateAuthorizationRequest,
4
5
  createAuthorizationRequestToPayload,
5
6
  type CreateAuthorizationResponse,
@@ -71,7 +72,8 @@ export class SIOPv2OID4VPRPRestClient implements IAgentPlugin {
71
72
  })
72
73
  logger.debug(`auth status response: ${statusResponse}`)
73
74
  try {
74
- return await statusResponse.json()
75
+ const payloadResponse = await statusResponse.json()
76
+ return authStatusResponseFromPayload(payloadResponse)
75
77
  } catch (err) {
76
78
  throw Error(`Status has returned ${statusResponse.status}`)
77
79
  }