@sphereon/ssi-sdk.siopv2-oid4vp-rp-rest-client 0.34.1-next.91 → 0.36.1-feat.SSISDK.83.11

package/dist/index.cjs

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
@@ -16,6 +18,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
@@ -26,8 +36,9 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/agent/SIOPv2OID4VPRPRestClient.ts
-var import_cross_fetch = require("cross-fetch");
+var import_ssi_sdk = require("@sphereon/ssi-sdk.siopv2-oid4vp-common");
 var import_ssi_types = require("@sphereon/ssi-types");
+var import_cross_fetch = __toESM(require("cross-fetch"), 1);
 var logger = import_ssi_types.Loggers.DEFAULT.get("sphereon:ssi-sdk-siopv2-oid4vp-rp-rest-client");
 var SIOPv2OID4VPRPRestClient = class {
   static {
@@ -39,11 +50,9 @@ var SIOPv2OID4VPRPRestClient = class {
     siopClientGetAuthStatus: this.siopClientGetAuthStatus.bind(this)
   };
   baseUrl;
-  definitionId;
   authOpts;
   constructor(args) {
     this.baseUrl = args?.baseUrl;
-    this.definitionId = args?.definitionId;
     this.authOpts = args?.authentication;
   }
   async createHeaders(existing) {
@@ -61,8 +70,7 @@ var SIOPv2OID4VPRPRestClient = class {
   }
   async siopClientRemoveAuthRequestState(args) {
     const baseUrl = this.checkBaseUrlParameter(args.baseUrl);
-    const definitionId = this.checkDefinitionIdParameter(args.definitionId);
-    await (0, import_cross_fetch.fetch)(this.uriWithBase(`/webapp/definitions/${definitionId}/auth-requests/${args.correlationId}`, baseUrl), {
+    await (0, import_cross_fetch.default)(this.uriWithBase(`/backend/auth/requests/${args.correlationId}`, baseUrl), {
       headers: await this.createHeaders(),
       method: "DELETE"
     });
@@ -70,16 +78,11 @@ var SIOPv2OID4VPRPRestClient = class {
   }
   async siopClientGetAuthStatus(args) {
     const baseUrl = this.checkBaseUrlParameter(args.baseUrl);
-    const url = this.uriWithBase("/webapp/auth-status", baseUrl);
-    const definitionId = this.checkDefinitionIdParameter(args.definitionId);
-    const statusResponse = await (0, import_cross_fetch.fetch)(url, {
-      method: "POST",
+    const url = this.uriWithBase(`/backend/auth/status/${args.correlationId}`, baseUrl);
+    const statusResponse = await (0, import_cross_fetch.default)(url, {
+      method: "GET",
       headers: await this.createHeaders({
         "Content-Type": "application/json"
-      }),
-      body: JSON.stringify({
-        correlationId: args.correlationId,
-        definitionId
       })
     });
     logger.debug(`auth status response: ${statusResponse}`);
@@ -91,20 +94,18 @@ var SIOPv2OID4VPRPRestClient = class {
   }
   async siopClientCreateAuthRequest(args) {
     const baseUrl = this.checkBaseUrlParameter(args.baseUrl);
-    const definitionId = this.checkDefinitionIdParameter(args.definitionId);
-    const url = this.uriWithBase(`/webapp/definitions/${definitionId}/auth-requests`, baseUrl);
-    const origResponse = await (0, import_cross_fetch.fetch)(url, {
+    const url = this.uriWithBase(`/backend/auth/requests`, baseUrl);
+    const origResponse = await (0, import_cross_fetch.default)(url, {
       method: "POST",
       headers: await this.createHeaders({
         "Content-Type": "application/json"
       }),
-      body: JSON.stringify({
-        ...args.responseRedirectURI && {
-          response_redirect_uri: args.responseRedirectURI
-        }
-      })
+      body: JSON.stringify((0, import_ssi_sdk.createAuthorizationRequestToPayload)({
+        ...args,
+        requestUriMethod: "get"
+      }))
     });
-    return await origResponse.json();
+    return (0, import_ssi_sdk.createAuthorizationResponseFromPayload)(await origResponse.json());
   }
   uriWithBase(path, baseUrl) {
     if (!this.baseUrl && !baseUrl) {
@@ -118,11 +119,5 @@ var SIOPv2OID4VPRPRestClient = class {
     }
     return baseUrl ? baseUrl : this.baseUrl;
   }
-  checkDefinitionIdParameter(definitionId) {
-    if (!definitionId && !this.definitionId) {
-      throw new Error("No definition id has been provided");
-    }
-    return definitionId ? definitionId : this.definitionId;
-  }
 };
 //# sourceMappingURL=index.cjs.map

package/dist/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts","../src/agent/SIOPv2OID4VPRPRestClient.ts"],"sourcesContent":["export { SIOPv2OID4VPRPRestClient } from './agent/SIOPv2OID4VPRPRestClient'\nexport * from './types/ISIOPv2OID4VPRPRestClient'\n","import { fetch } from 'cross-fetch'\nimport {\n  ISiopClientGenerateAuthRequestArgs,\n  ISiopClientGetAuthStatusArgs,\n  ISiopClientRemoveAuthRequestSessionArgs,\n  ISIOPv2OID4VPRPRestClient,\n  Siopv2RestClientAuthenticationOpts,\n  Siopv2RestClientOpts,\n} from '../types/ISIOPv2OID4VPRPRestClient'\nimport { IAgentPlugin } from '@veramo/core'\nimport { AuthStatusResponse, GenerateAuthRequestURIResponse } from '@sphereon/ssi-sdk.siopv2-oid4vp-common'\nimport { Loggers } from '@sphereon/ssi-types'\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 definitionId?: string\n  private readonly authOpts?: Siopv2RestClientAuthenticationOpts\n\n  constructor(args?: Siopv2RestClientOpts) {\n    this.baseUrl = args?.baseUrl\n    this.definitionId = args?.definitionId\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    const definitionId = this.checkDefinitionIdParameter(args.definitionId)\n    await fetch(this.uriWithBase(`/webapp/definitions/${definitionId}/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('/webapp/auth-status', baseUrl)\n    const definitionId = this.checkDefinitionIdParameter(args.definitionId)\n    const statusResponse = await fetch(url, {\n      method: 'POST',\n      headers: await this.createHeaders({ 'Content-Type': 'application/json' }),\n      body: JSON.stringify({\n        correlationId: args.correlationId,\n        definitionId,\n      }),\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<GenerateAuthRequestURIResponse> {\n    const baseUrl = this.checkBaseUrlParameter(args.baseUrl)\n    const definitionId = this.checkDefinitionIdParameter(args.definitionId)\n    const url = this.uriWithBase(`/webapp/definitions/${definitionId}/auth-requests`, baseUrl)\n    const origResponse = await fetch(url, {\n      method: 'POST',\n      headers: await this.createHeaders({ 'Content-Type': 'application/json' }),\n      body: JSON.stringify({\n        ...(args.responseRedirectURI && { response_redirect_uri: args.responseRedirectURI }),\n      }),\n    })\n    return 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  private checkDefinitionIdParameter(definitionId?: string): string {\n    if (!definitionId && !this.definitionId) {\n      throw new Error('No definition id has been provided')\n    }\n    return definitionId ? definitionId : (this.definitionId as string)\n  }\n}\n"],"mappings":"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","names":["logger","Loggers","DEFAULT","get","SIOPv2OID4VPRPRestClient","methods","siopClientRemoveAuthRequestState","bind","siopClientCreateAuthRequest","siopClientGetAuthStatus","baseUrl","definitionId","authOpts","args","authentication","createHeaders","existing","headers","Accept","enabled","bearerToken","Error","Authorization","checkBaseUrlParameter","checkDefinitionIdParameter","fetch","uriWithBase","correlationId","method","url","statusResponse","body","JSON","stringify","debug","json","err","status","origResponse","responseRedirectURI","response_redirect_uri","path","startsWith"]}
+{"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"]}

package/dist/index.d.cts

@@ -1,26 +1,23 @@
-import { BearerTokenArg } from '@sphereon/ssi-types';
 import { IPluginMethodMap, IAgentContext, IAgentPlugin } from '@veramo/core';
-import { GenerateAuthRequestURIResponse, AuthStatusResponse } from '@sphereon/ssi-sdk.siopv2-oid4vp-common';
+import { CreateAuthorizationRequest, CreateAuthorizationResponse, AuthStatusResponse } from '@sphereon/ssi-sdk.siopv2-oid4vp-common';
+import { BearerTokenArg } from '@sphereon/ssi-types';
 
 interface ISIOPv2OID4VPRPRestClient extends IPluginMethodMap {
     siopClientRemoveAuthRequestState(args: ISiopClientRemoveAuthRequestSessionArgs, context: IRequiredContext): Promise<boolean>;
-    siopClientCreateAuthRequest(args: ISiopClientGenerateAuthRequestArgs, context: IRequiredContext): Promise<GenerateAuthRequestURIResponse>;
+    siopClientCreateAuthRequest(args: ISiopClientGenerateAuthRequestArgs, context: IRequiredContext): Promise<CreateAuthorizationResponse>;
     siopClientGetAuthStatus(args: ISiopClientGetAuthStatusArgs, context: IRequiredContext): Promise<AuthStatusResponse>;
 }
-interface ISiopClientGenerateAuthRequestArgs {
-    definitionId?: string;
+type ISiopClientGenerateAuthRequestArgs = Omit<CreateAuthorizationRequest, 'requestUriMethod'> & {
     baseUrl?: string;
-    responseRedirectURI?: string;
-}
+};
 interface ISiopClientRemoveAuthRequestSessionArgs {
     correlationId: string;
     baseUrl?: string;
-    definitionId?: string;
+    queryId?: string;
 }
 interface ISiopClientGetAuthStatusArgs {
     correlationId: string;
     baseUrl?: string;
-    definitionId?: string;
 }
 interface Siopv2RestClientAuthenticationOpts {
     enabled?: boolean;
@@ -28,7 +25,6 @@ interface Siopv2RestClientAuthenticationOpts {
 }
 interface Siopv2RestClientOpts {
     baseUrl?: string;
-    definitionId?: string;
     authentication?: Siopv2RestClientAuthenticationOpts;
 }
 type IRequiredContext = IAgentContext<any>;
@@ -39,7 +35,6 @@ type IRequiredContext = IAgentContext<any>;
 declare class SIOPv2OID4VPRPRestClient implements IAgentPlugin {
     readonly methods: ISIOPv2OID4VPRPRestClient;
     private readonly baseUrl?;
-    private readonly definitionId?;
     private readonly authOpts?;
     constructor(args?: Siopv2RestClientOpts);
     private createHeaders;
@@ -48,7 +43,6 @@ declare class SIOPv2OID4VPRPRestClient implements IAgentPlugin {
     private siopClientCreateAuthRequest;
     private uriWithBase;
     private checkBaseUrlParameter;
-    private checkDefinitionIdParameter;
 }
 
 export { type IRequiredContext, type ISIOPv2OID4VPRPRestClient, type ISiopClientGenerateAuthRequestArgs, type ISiopClientGetAuthStatusArgs, type ISiopClientRemoveAuthRequestSessionArgs, SIOPv2OID4VPRPRestClient, type Siopv2RestClientAuthenticationOpts, type Siopv2RestClientOpts };

package/dist/index.d.ts

@@ -1,26 +1,23 @@
-import { BearerTokenArg } from '@sphereon/ssi-types';
 import { IPluginMethodMap, IAgentContext, IAgentPlugin } from '@veramo/core';
-import { GenerateAuthRequestURIResponse, AuthStatusResponse } from '@sphereon/ssi-sdk.siopv2-oid4vp-common';
+import { CreateAuthorizationRequest, CreateAuthorizationResponse, AuthStatusResponse } from '@sphereon/ssi-sdk.siopv2-oid4vp-common';
+import { BearerTokenArg } from '@sphereon/ssi-types';
 
 interface ISIOPv2OID4VPRPRestClient extends IPluginMethodMap {
     siopClientRemoveAuthRequestState(args: ISiopClientRemoveAuthRequestSessionArgs, context: IRequiredContext): Promise<boolean>;
-    siopClientCreateAuthRequest(args: ISiopClientGenerateAuthRequestArgs, context: IRequiredContext): Promise<GenerateAuthRequestURIResponse>;
+    siopClientCreateAuthRequest(args: ISiopClientGenerateAuthRequestArgs, context: IRequiredContext): Promise<CreateAuthorizationResponse>;
     siopClientGetAuthStatus(args: ISiopClientGetAuthStatusArgs, context: IRequiredContext): Promise<AuthStatusResponse>;
 }
-interface ISiopClientGenerateAuthRequestArgs {
-    definitionId?: string;
+type ISiopClientGenerateAuthRequestArgs = Omit<CreateAuthorizationRequest, 'requestUriMethod'> & {
     baseUrl?: string;
-    responseRedirectURI?: string;
-}
+};
 interface ISiopClientRemoveAuthRequestSessionArgs {
     correlationId: string;
     baseUrl?: string;
-    definitionId?: string;
+    queryId?: string;
 }
 interface ISiopClientGetAuthStatusArgs {
     correlationId: string;
     baseUrl?: string;
-    definitionId?: string;
 }
 interface Siopv2RestClientAuthenticationOpts {
     enabled?: boolean;
@@ -28,7 +25,6 @@ interface Siopv2RestClientAuthenticationOpts {
 }
 interface Siopv2RestClientOpts {
     baseUrl?: string;
-    definitionId?: string;
     authentication?: Siopv2RestClientAuthenticationOpts;
 }
 type IRequiredContext = IAgentContext<any>;
@@ -39,7 +35,6 @@ type IRequiredContext = IAgentContext<any>;
 declare class SIOPv2OID4VPRPRestClient implements IAgentPlugin {
     readonly methods: ISIOPv2OID4VPRPRestClient;
     private readonly baseUrl?;
-    private readonly definitionId?;
     private readonly authOpts?;
     constructor(args?: Siopv2RestClientOpts);
     private createHeaders;
@@ -48,7 +43,6 @@ declare class SIOPv2OID4VPRPRestClient implements IAgentPlugin {
     private siopClientCreateAuthRequest;
     private uriWithBase;
     private checkBaseUrlParameter;
-    private checkDefinitionIdParameter;
 }
 
 export { type IRequiredContext, type ISIOPv2OID4VPRPRestClient, type ISiopClientGenerateAuthRequestArgs, type ISiopClientGetAuthStatusArgs, type ISiopClientRemoveAuthRequestSessionArgs, SIOPv2OID4VPRPRestClient, type Siopv2RestClientAuthenticationOpts, type Siopv2RestClientOpts };

package/dist/index.js

@@ -2,8 +2,9 @@ var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 
 // src/agent/SIOPv2OID4VPRPRestClient.ts
-import { fetch } from "cross-fetch";
+import { createAuthorizationRequestToPayload, createAuthorizationResponseFromPayload } from "@sphereon/ssi-sdk.siopv2-oid4vp-common";
 import { Loggers } from "@sphereon/ssi-types";
+import fetch from "cross-fetch";
 var logger = Loggers.DEFAULT.get("sphereon:ssi-sdk-siopv2-oid4vp-rp-rest-client");
 var SIOPv2OID4VPRPRestClient = class {
   static {
@@ -15,11 +16,9 @@ var SIOPv2OID4VPRPRestClient = class {
     siopClientGetAuthStatus: this.siopClientGetAuthStatus.bind(this)
   };
   baseUrl;
-  definitionId;
   authOpts;
   constructor(args) {
     this.baseUrl = args?.baseUrl;
-    this.definitionId = args?.definitionId;
     this.authOpts = args?.authentication;
   }
   async createHeaders(existing) {
@@ -37,8 +36,7 @@ var SIOPv2OID4VPRPRestClient = class {
   }
   async siopClientRemoveAuthRequestState(args) {
     const baseUrl = this.checkBaseUrlParameter(args.baseUrl);
-    const definitionId = this.checkDefinitionIdParameter(args.definitionId);
-    await fetch(this.uriWithBase(`/webapp/definitions/${definitionId}/auth-requests/${args.correlationId}`, baseUrl), {
+    await fetch(this.uriWithBase(`/backend/auth/requests/${args.correlationId}`, baseUrl), {
       headers: await this.createHeaders(),
       method: "DELETE"
     });
@@ -46,16 +44,11 @@ var SIOPv2OID4VPRPRestClient = class {
   }
   async siopClientGetAuthStatus(args) {
     const baseUrl = this.checkBaseUrlParameter(args.baseUrl);
-    const url = this.uriWithBase("/webapp/auth-status", baseUrl);
-    const definitionId = this.checkDefinitionIdParameter(args.definitionId);
+    const url = this.uriWithBase(`/backend/auth/status/${args.correlationId}`, baseUrl);
     const statusResponse = await fetch(url, {
-      method: "POST",
+      method: "GET",
       headers: await this.createHeaders({
         "Content-Type": "application/json"
-      }),
-      body: JSON.stringify({
-        correlationId: args.correlationId,
-        definitionId
       })
     });
     logger.debug(`auth status response: ${statusResponse}`);
@@ -67,20 +60,18 @@ var SIOPv2OID4VPRPRestClient = class {
   }
   async siopClientCreateAuthRequest(args) {
     const baseUrl = this.checkBaseUrlParameter(args.baseUrl);
-    const definitionId = this.checkDefinitionIdParameter(args.definitionId);
-    const url = this.uriWithBase(`/webapp/definitions/${definitionId}/auth-requests`, baseUrl);
+    const url = this.uriWithBase(`/backend/auth/requests`, baseUrl);
     const origResponse = await fetch(url, {
       method: "POST",
       headers: await this.createHeaders({
         "Content-Type": "application/json"
       }),
-      body: JSON.stringify({
-        ...args.responseRedirectURI && {
-          response_redirect_uri: args.responseRedirectURI
-        }
-      })
+      body: JSON.stringify(createAuthorizationRequestToPayload({
+        ...args,
+        requestUriMethod: "get"
+      }))
     });
-    return await origResponse.json();
+    return createAuthorizationResponseFromPayload(await origResponse.json());
   }
   uriWithBase(path, baseUrl) {
     if (!this.baseUrl && !baseUrl) {
@@ -94,12 +85,6 @@ var SIOPv2OID4VPRPRestClient = class {
     }
     return baseUrl ? baseUrl : this.baseUrl;
   }
-  checkDefinitionIdParameter(definitionId) {
-    if (!definitionId && !this.definitionId) {
-      throw new Error("No definition id has been provided");
-    }
-    return definitionId ? definitionId : this.definitionId;
-  }
 };
 export {
   SIOPv2OID4VPRPRestClient

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/agent/SIOPv2OID4VPRPRestClient.ts"],"sourcesContent":["import { fetch } from 'cross-fetch'\nimport {\n  ISiopClientGenerateAuthRequestArgs,\n  ISiopClientGetAuthStatusArgs,\n  ISiopClientRemoveAuthRequestSessionArgs,\n  ISIOPv2OID4VPRPRestClient,\n  Siopv2RestClientAuthenticationOpts,\n  Siopv2RestClientOpts,\n} from '../types/ISIOPv2OID4VPRPRestClient'\nimport { IAgentPlugin } from '@veramo/core'\nimport { AuthStatusResponse, GenerateAuthRequestURIResponse } from '@sphereon/ssi-sdk.siopv2-oid4vp-common'\nimport { Loggers } from '@sphereon/ssi-types'\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 definitionId?: string\n  private readonly authOpts?: Siopv2RestClientAuthenticationOpts\n\n  constructor(args?: Siopv2RestClientOpts) {\n    this.baseUrl = args?.baseUrl\n    this.definitionId = args?.definitionId\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    const definitionId = this.checkDefinitionIdParameter(args.definitionId)\n    await fetch(this.uriWithBase(`/webapp/definitions/${definitionId}/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('/webapp/auth-status', baseUrl)\n    const definitionId = this.checkDefinitionIdParameter(args.definitionId)\n    const statusResponse = await fetch(url, {\n      method: 'POST',\n      headers: await this.createHeaders({ 'Content-Type': 'application/json' }),\n      body: JSON.stringify({\n        correlationId: args.correlationId,\n        definitionId,\n      }),\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<GenerateAuthRequestURIResponse> {\n    const baseUrl = this.checkBaseUrlParameter(args.baseUrl)\n    const definitionId = this.checkDefinitionIdParameter(args.definitionId)\n    const url = this.uriWithBase(`/webapp/definitions/${definitionId}/auth-requests`, baseUrl)\n    const origResponse = await fetch(url, {\n      method: 'POST',\n      headers: await this.createHeaders({ 'Content-Type': 'application/json' }),\n      body: JSON.stringify({\n        ...(args.responseRedirectURI && { response_redirect_uri: args.responseRedirectURI }),\n      }),\n    })\n    return 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  private checkDefinitionIdParameter(definitionId?: string): string {\n    if (!definitionId && !this.definitionId) {\n      throw new Error('No definition id has been provided')\n    }\n    return definitionId ? definitionId : (this.definitionId as string)\n  }\n}\n"],"mappings":"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","names":["fetch","Loggers","logger","Loggers","DEFAULT","get","SIOPv2OID4VPRPRestClient","methods","siopClientRemoveAuthRequestState","bind","siopClientCreateAuthRequest","siopClientGetAuthStatus","baseUrl","definitionId","authOpts","args","authentication","createHeaders","existing","headers","Accept","enabled","bearerToken","Error","Authorization","checkBaseUrlParameter","checkDefinitionIdParameter","fetch","uriWithBase","correlationId","method","url","statusResponse","body","JSON","stringify","debug","json","err","status","origResponse","responseRedirectURI","response_redirect_uri","path","startsWith"]}
+{"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"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sphereon/ssi-sdk.siopv2-oid4vp-rp-rest-client",
   "description": "contains the client side to call REST endpoints of relying party",
-  "version": "0.34.1-next.91+3c949810",
+  "version": "0.36.1-feat.SSISDK.83.11+15665c90",
   "source": "src/index.ts",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -27,8 +27,8 @@
     "build": "tsup --config ../../tsup.config.ts --tsconfig ../../tsconfig.tsup.json"
   },
   "dependencies": {
-    "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.34.1-next.91+3c949810",
-    "@sphereon/ssi-types": "0.34.1-next.91+3c949810",
+    "@sphereon/ssi-sdk.siopv2-oid4vp-common": "0.36.1-feat.SSISDK.83.11+15665c90",
+    "@sphereon/ssi-types": "0.36.1-feat.SSISDK.83.11+15665c90",
     "@veramo/core": "4.2.0",
     "cross-fetch": "^4.1.0"
   },
@@ -53,5 +53,5 @@
   "author": "Sphereon <dev@sphereon.com>",
   "license": "Apache-2.0",
   "keywords": [],
-  "gitHead": "3c9498100ca07dfc2ba7979e7347fb9b19c47d18"
+  "gitHead": "15665c90d27b72a0c3b7267375f60512d2cd4085"
 }

package/src/agent/SIOPv2OID4VPRPRestClient.ts

@@ -1,4 +1,13 @@
-import { fetch } from 'cross-fetch'
+import {
+  type AuthStatusResponse,
+  type CreateAuthorizationRequest,
+  createAuthorizationRequestToPayload,
+  type CreateAuthorizationResponse,
+  createAuthorizationResponseFromPayload,
+} from '@sphereon/ssi-sdk.siopv2-oid4vp-common'
+import { Loggers } from '@sphereon/ssi-types'
+import { IAgentPlugin } from '@veramo/core'
+import fetch from 'cross-fetch'
 import {
   ISiopClientGenerateAuthRequestArgs,
   ISiopClientGetAuthStatusArgs,
@@ -7,9 +16,6 @@ import {
   Siopv2RestClientAuthenticationOpts,
   Siopv2RestClientOpts,
 } from '../types/ISIOPv2OID4VPRPRestClient'
-import { IAgentPlugin } from '@veramo/core'
-import { AuthStatusResponse, GenerateAuthRequestURIResponse } from '@sphereon/ssi-sdk.siopv2-oid4vp-common'
-import { Loggers } from '@sphereon/ssi-types'
 
 const logger = Loggers.DEFAULT.get('sphereon:ssi-sdk-siopv2-oid4vp-rp-rest-client')
 
@@ -24,12 +30,10 @@ export class SIOPv2OID4VPRPRestClient implements IAgentPlugin {
   }
 
   private readonly baseUrl?: string
-  private readonly definitionId?: string
   private readonly authOpts?: Siopv2RestClientAuthenticationOpts
 
   constructor(args?: Siopv2RestClientOpts) {
     this.baseUrl = args?.baseUrl
-    this.definitionId = args?.definitionId
     this.authOpts = args?.authentication
   }
 
@@ -51,8 +55,7 @@ export class SIOPv2OID4VPRPRestClient implements IAgentPlugin {
 
   private async siopClientRemoveAuthRequestState(args: ISiopClientRemoveAuthRequestSessionArgs): Promise<boolean> {
     const baseUrl = this.checkBaseUrlParameter(args.baseUrl)
-    const definitionId = this.checkDefinitionIdParameter(args.definitionId)
-    await fetch(this.uriWithBase(`/webapp/definitions/${definitionId}/auth-requests/${args.correlationId}`, baseUrl), {
+    await fetch(this.uriWithBase(`/backend/auth/requests/${args.correlationId}`, baseUrl), {
       headers: await this.createHeaders(),
       method: 'DELETE',
     })
@@ -61,15 +64,10 @@ export class SIOPv2OID4VPRPRestClient implements IAgentPlugin {
 
   private async siopClientGetAuthStatus(args: ISiopClientGetAuthStatusArgs): Promise<AuthStatusResponse> {
     const baseUrl = this.checkBaseUrlParameter(args.baseUrl)
-    const url = this.uriWithBase('/webapp/auth-status', baseUrl)
-    const definitionId = this.checkDefinitionIdParameter(args.definitionId)
+    const url = this.uriWithBase(`/backend/auth/status/${args.correlationId}`, baseUrl)
     const statusResponse = await fetch(url, {
-      method: 'POST',
+      method: 'GET',
       headers: await this.createHeaders({ 'Content-Type': 'application/json' }),
-      body: JSON.stringify({
-        correlationId: args.correlationId,
-        definitionId,
-      }),
     })
     logger.debug(`auth status response: ${statusResponse}`)
     try {
@@ -79,18 +77,16 @@ export class SIOPv2OID4VPRPRestClient implements IAgentPlugin {
     }
   }
 
-  private async siopClientCreateAuthRequest(args: ISiopClientGenerateAuthRequestArgs): Promise<GenerateAuthRequestURIResponse> {
+  private async siopClientCreateAuthRequest(args: ISiopClientGenerateAuthRequestArgs): Promise<CreateAuthorizationResponse> {
     const baseUrl = this.checkBaseUrlParameter(args.baseUrl)
-    const definitionId = this.checkDefinitionIdParameter(args.definitionId)
-    const url = this.uriWithBase(`/webapp/definitions/${definitionId}/auth-requests`, baseUrl)
+    const url = this.uriWithBase(`/backend/auth/requests`, baseUrl)
+
     const origResponse = await fetch(url, {
       method: 'POST',
       headers: await this.createHeaders({ 'Content-Type': 'application/json' }),
-      body: JSON.stringify({
-        ...(args.responseRedirectURI && { response_redirect_uri: args.responseRedirectURI }),
-      }),
+      body: JSON.stringify(createAuthorizationRequestToPayload({ ...args, requestUriMethod: 'get' } satisfies CreateAuthorizationRequest)),
     })
-    return await origResponse.json()
+    return createAuthorizationResponseFromPayload(await origResponse.json())
   }
 
   private uriWithBase(path: string, baseUrl?: string): string {
@@ -106,11 +102,4 @@ export class SIOPv2OID4VPRPRestClient implements IAgentPlugin {
     }
     return baseUrl ? baseUrl : (this.baseUrl as string)
   }
-
-  private checkDefinitionIdParameter(definitionId?: string): string {
-    if (!definitionId && !this.definitionId) {
-      throw new Error('No definition id has been provided')
-    }
-    return definitionId ? definitionId : (this.definitionId as string)
-  }
 }

package/src/types/ISIOPv2OID4VPRPRestClient.ts

@@ -1,32 +1,28 @@
+import { AuthStatusResponse, type CreateAuthorizationRequest, type CreateAuthorizationResponse } from '@sphereon/ssi-sdk.siopv2-oid4vp-common'
 import { BearerTokenArg } from '@sphereon/ssi-types'
 import { IAgentContext, IPluginMethodMap } from '@veramo/core'
 
-import { AuthStatusResponse, GenerateAuthRequestURIResponse } from '@sphereon/ssi-sdk.siopv2-oid4vp-common'
-
 export interface ISIOPv2OID4VPRPRestClient extends IPluginMethodMap {
   siopClientRemoveAuthRequestState(args: ISiopClientRemoveAuthRequestSessionArgs, context: IRequiredContext): Promise<boolean>
 
-  siopClientCreateAuthRequest(args: ISiopClientGenerateAuthRequestArgs, context: IRequiredContext): Promise<GenerateAuthRequestURIResponse>
+  siopClientCreateAuthRequest(args: ISiopClientGenerateAuthRequestArgs, context: IRequiredContext): Promise<CreateAuthorizationResponse>
 
   siopClientGetAuthStatus(args: ISiopClientGetAuthStatusArgs, context: IRequiredContext): Promise<AuthStatusResponse>
 }
 
-export interface ISiopClientGenerateAuthRequestArgs {
-  definitionId?: string
+export type ISiopClientGenerateAuthRequestArgs = Omit<CreateAuthorizationRequest, 'requestUriMethod'> & {
   baseUrl?: string
-  responseRedirectURI?: string
 }
 
 export interface ISiopClientRemoveAuthRequestSessionArgs {
   correlationId: string
   baseUrl?: string
-  definitionId?: string
+  queryId?: string
 }
 
 export interface ISiopClientGetAuthStatusArgs {
   correlationId: string
   baseUrl?: string
-  definitionId?: string
 }
 
 export interface Siopv2RestClientAuthenticationOpts {
@@ -36,7 +32,6 @@ export interface Siopv2RestClientAuthenticationOpts {
 
 export interface Siopv2RestClientOpts {
   baseUrl?: string
-  definitionId?: string
   authentication?: Siopv2RestClientAuthenticationOpts
 }