fix: unify naming

Sphereon-Opensource · Apr 15, 2023 · 94165cd · 94165cd
1 parent 975801e
commit 94165cd
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 17 deletions.
diff --git a/packages/siopv2-oid4vp-common/package.json b/packages/siopv2-oid4vp-common/package.json
@@ -12,6 +12,7 @@
     "access": "public"
   },
   "dependencies": {
+    "uint8arrays": "3.1.1",
     "@sphereon/did-auth-siop": "^0.3.0-unstable.33"
   },
   "scripts": {

diff --git a/packages/siopv2-oid4vp-rp-rest-api/src/SIOPv2RPRestAPI.ts b/packages/siopv2-oid4vp-rp-rest-api/src/SIOPv2RPRestAPI.ts
@@ -53,7 +53,7 @@ export class SIOPv2RPRestAPI {
     // Webapp endpoints
     this.createAuthRequestWebappEndpoint()
     this.authStatusWebappEndpoint()
-    this.deleteAuthRequestStateWebappEndpoint()
+    this.removeAuthRequestStateWebappEndpoint()
 
     // SIOPv2 endpoints
     this.getAuthRequestSIOPv2Endpoint()
@@ -93,7 +93,7 @@ export class SIOPv2RPRestAPI {
     response.status(statusCode).send(message)
   }
 
-  private deleteAuthRequestStateWebappEndpoint() {
+  private removeAuthRequestStateWebappEndpoint() {
     this.express.delete(
       this._opts?.webappDeleteAuthRequestPath ?? '/webapp/definitions/:definitionId/auth-requests/:correlationId',
       async (request, response) => {

diff --git a/packages/siopv2-oid4vp-rp-rest-client/__tests__/integration.test.ts b/packages/siopv2-oid4vp-rp-rest-client/__tests__/integration.test.ts
@@ -12,8 +12,8 @@ const agent = createAgent<IResolver & ISIOPv2OID4VPRPRestClient>({
 describe('@sphereon/siopv2-oid4vp-rp-rest-client', () => {
   // disabled because the delete call hangs. Since endpoints will be updated anyway, skiping this for now
   xit('should call the endpoint for siopClientRemoveAuthRequestSession', async () => {
-    const authRequest: GenerateAuthRequestURIResponse = await agent.siopClientGenerateAuthRequest({})
-    agent.siopClientRemoveAuthRequestSession({
+    const authRequest: GenerateAuthRequestURIResponse = await agent.siopClientCreateAuthRequest({})
+    agent.siopClientRemoveAuthRequestState({
       correlationId: authRequest.correlationId,
     })
 
@@ -25,12 +25,12 @@ describe('@sphereon/siopv2-oid4vp-rp-rest-client', () => {
   })
 
   it('should call the endpoint for siopClientGenerateAuthRequest', async () => {
-    const result = await agent.siopClientGenerateAuthRequest({})
+    const result = await agent.siopClientCreateAuthRequest({})
     expect(result.definitionId).toEqual(definitionId)
   })
 
   it('should call the endpoint for siopClientGetAuthStatus', async () => {
-    const authRequest = await agent.siopClientGenerateAuthRequest({})
+    const authRequest = await agent.siopClientCreateAuthRequest({})
     const result = await agent.siopClientGetAuthStatus({
       correlationId: authRequest.correlationId,
     })

diff --git a/packages/siopv2-oid4vp-rp-rest-client/__tests__/mockedEndpoints.test.ts b/packages/siopv2-oid4vp-rp-rest-client/__tests__/mockedEndpoints.test.ts
@@ -18,15 +18,15 @@ describe('@sphereon/siopv2-oid4vp-rp-rest-client', () => {
     const correlationId = 'test-correlation-id'
     nock(`${baseUrl}/webapp/definitions/${definitionId}/auth-requests`).delete(`/${correlationId}`).times(5).reply(200, {})
     await expect(
-      agent.siopClientRemoveAuthRequestSession({
+      agent.siopClientRemoveAuthRequestState({
         correlationId: 'test-correlation-id',
       })
     ).resolves.toBeUndefined()
   })
 
   it('should call the mock endpoint for siopClientGenerateAuthRequest', async () => {
     nock(`${baseUrl}/webapp/definitions/${definitionId}`).get(`/auth-request-uri`).times(5).reply(200, {})
-    await expect(agent.siopClientGenerateAuthRequest({})).resolves.toBeDefined()
+    await expect(agent.siopClientCreateAuthRequest({})).resolves.toBeDefined()
   })
 
   it('should call the mock endpoint for siopClientGetAuthStatus', async () => {

diff --git a/packages/siopv2-oid4vp-rp-rest-client/api-extractor.json b/packages/siopv2-oid4vp-rp-rest-client/api-extractor.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../include/api-extractor-base.json"
+}
diff --git a/packages/siopv2-oid4vp-rp-rest-client/package.json b/packages/siopv2-oid4vp-rp-rest-client/package.json
@@ -2,18 +2,26 @@
   "name": "@sphereon/ssi-sdk-siopv2-oid4vp-rp-rest-client",
   "description": "contains the client side to call REST endpoints of relying party",
   "version": "0.9.0",
+  "source": "src/index.ts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "veramo": {
+    "pluginInterfaces": {
+      "ISIOPv2OID4VPRPRestClient": "./src/types/ISIOPv2OID4VPRPRestClient.ts"
+    }
+  },
   "scripts": {
     "build": "tsc --build",
-    "build:clean": "tsc --build --clean && tsc --build"
+    "build:clean": "tsc --build --clean && tsc --build",
+    "generate-plugin-schema": "node --loader ts-node/esm ../../node_modules/@veramo/cli/bin/veramo.js dev generate-plugin-schema"
   },
   "dependencies": {
     "@sphereon/ssi-sdk-siopv2-oid4vp-common": "^0.9.0",
     "@veramo/core": "4.2.0",
     "cross-fetch": "^3.1.5"
   },
   "devDependencies": {
+    "@veramo/cli": "4.2.0",
     "did-resolver": "^4.1.0",
     "nock": "^13.3.0"
   },

diff --git a/packages/siopv2-oid4vp-rp-rest-client/src/agent/SIOPv2OID4VPRPRestClient.ts b/packages/siopv2-oid4vp-rp-rest-client/src/agent/SIOPv2OID4VPRPRestClient.ts
@@ -14,8 +14,8 @@ const debug = Debug('ssi-sdk-siopv2-oid4vp-rp-rest-client:SiopV2OID4VpRpRestClie
 
 export class SIOPv2OID4VPRPRestClient implements IAgentPlugin {
   readonly methods: ISIOPv2OID4VPRPRestClient = {
-    siopClientRemoveAuthRequestSession: this.siopClientRemoveAuthRequestSession.bind(this),
-    siopClientGenerateAuthRequest: this.siopClientGenerateAuthRequest.bind(this),
+    siopClientRemoveAuthRequestState: this.siopClientRemoveAuthRequestState.bind(this),
+    siopClientCreateAuthRequest: this.siopClientCreateAuthRequest.bind(this),
     siopClientGetAuthStatus: this.siopClientGetAuthStatus.bind(this),
   }
 
@@ -31,7 +31,7 @@ export class SIOPv2OID4VPRPRestClient implements IAgentPlugin {
     }
   }
 
-  private async siopClientRemoveAuthRequestSession(args: ISiopClientRemoveAuthRequestSessionArgs, context: IRequiredContext): Promise<void> {
+  private async siopClientRemoveAuthRequestState(args: ISiopClientRemoveAuthRequestSessionArgs, context: IRequiredContext): Promise<void> {
     const baseUrl = this.checkBaseUrlParameter(args.baseUrl)
     const definitionId = this.checkDefinitionIdParameter(args.definitionId)
     await fetch(this.uriWithBase(`/webapp/definitions/${definitionId}/auth-requests/${args.correlationId}`, baseUrl), {
@@ -61,14 +61,20 @@ export class SIOPv2OID4VPRPRestClient implements IAgentPlugin {
     }
   }
 
-  private async siopClientGenerateAuthRequest(
+  private async siopClientCreateAuthRequest(
     args: ISiopClientGenerateAuthRequestArgs,
     context: IRequiredContext
   ): Promise<GenerateAuthRequestURIResponse> {
     const baseUrl = this.checkBaseUrlParameter(args.baseUrl)
     const definitionId = this.checkDefinitionIdParameter(args.definitionId)
-    const url = this.uriWithBase(`/webapp/definitions/${definitionId}/auth-request-uri`, baseUrl)
-    const origResponse = await fetch(url)
+    const url = this.uriWithBase(`/webapp/definitions/${definitionId}/auth-requests`, baseUrl)
+    const origResponse = await fetch(url,{
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({})
+    })
     return await origResponse.json()
   }
 

diff --git a/packages/siopv2-oid4vp-rp-rest-client/src/types/ISIOPv2OID4VPRPRestClient.ts b/packages/siopv2-oid4vp-rp-rest-client/src/types/ISIOPv2OID4VPRPRestClient.ts
@@ -3,9 +3,9 @@ import { IAgentContext, IPluginMethodMap, IResolver } from '@veramo/core'
 import { AuthStatusResponse, GenerateAuthRequestURIResponse } from '@sphereon/ssi-sdk-siopv2-oid4vp-common'
 
 export interface ISIOPv2OID4VPRPRestClient extends IPluginMethodMap {
-  siopClientRemoveAuthRequestSession(args: ISiopClientRemoveAuthRequestSessionArgs, context: IRequiredContext): Promise<void>
+  siopClientRemoveAuthRequestState(args: ISiopClientRemoveAuthRequestSessionArgs, context: IRequiredContext): Promise<void>
 
-  siopClientGenerateAuthRequest(args: ISiopClientGenerateAuthRequestArgs, context: IRequiredContext): Promise<GenerateAuthRequestURIResponse>
+  siopClientCreateAuthRequest(args: ISiopClientGenerateAuthRequestArgs, context: IRequiredContext): Promise<GenerateAuthRequestURIResponse>
 
   siopClientGetAuthStatus(args: ISiopClientGetAuthStatusArgs, context: IRequiredContext): Promise<AuthStatusResponse>
 }

diff --git a/packages/siopv2-oid4vp-rp-rest-client/tsconfig.json b/packages/siopv2-oid4vp-rp-rest-client/tsconfig.json
@@ -1,6 +1,7 @@
 {
   "extends": "../tsconfig-base.json",
   "compilerOptions": {
+    "esModuleInterop": true,
     "rootDir": "src",
     "outDir": "dist"
   },