diff --git a/backend/package-lock.json b/backend/package-lock.json index b593a6e6..64bcdcf6 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -11,6 +11,7 @@ "dependencies": { "@grpc/grpc-js": "^1.9.13", "@grpc/proto-loader": "^0.7.10", + "@nestjs/axios": "^3.0.2", "@nestjs/cache-manager": "^2.2.0", "@nestjs/common": "^10.0.0", "@nestjs/config": "^3.1.1", @@ -20,6 +21,7 @@ "@nestjs/platform-socket.io": "^10.3.0", "@nestjs/serve-static": "^4.0.0", "@nestjs/websockets": "^10.3.0", + "axios": "^1.7.2", "cache-manager": "^5.3.2", "cache-manager-redis-yet": "^4.1.2", "ioredis": "^5.3.2", @@ -1718,6 +1720,16 @@ "node": ">=8" } }, + "node_modules/@nestjs/axios": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@nestjs/axios/-/axios-3.0.2.tgz", + "integrity": "sha512-Z6GuOUdNQjP7FX+OuV2Ybyamse+/e0BFdTWBX5JxpBDKA+YkdLynDgG6HTF04zy6e9zPa19UX0WA2VDoehwhXQ==", + "peerDependencies": { + "@nestjs/common": "^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0", + "axios": "^1.3.1", + "rxjs": "^6.0.0 || ^7.0.0" + } + }, "node_modules/@nestjs/cache-manager": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/@nestjs/cache-manager/-/cache-manager-2.2.0.tgz", @@ -3148,8 +3160,17 @@ "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, + "node_modules/axios": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz", + "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==", + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } }, "node_modules/babel-jest": { "version": "29.7.0", @@ -3808,7 +3829,6 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, "dependencies": { "delayed-stream": "~1.0.0" }, @@ -4077,7 +4097,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true, "engines": { "node": ">=0.4.0" } @@ -5005,6 +5024,25 @@ "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", "dev": true }, + "node_modules/follow-redirects": { + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, "node_modules/foreground-child": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", @@ -5075,7 +5113,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dev": true, "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -7501,6 +7538,11 @@ "node": ">= 0.10" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", @@ -10683,6 +10725,12 @@ "resolved": "https://registry.npmjs.org/@lukeed/csprng/-/csprng-1.1.0.tgz", "integrity": "sha512-Z7C/xXCiGWsg0KuKsHTKJxbWhpI3Vs5GwLfOean7MGyVFGqdRgBbAjOCh6u4bbjPc/8MJ2pZmK/0DLdCbivLDA==" }, + "@nestjs/axios": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@nestjs/axios/-/axios-3.0.2.tgz", + "integrity": "sha512-Z6GuOUdNQjP7FX+OuV2Ybyamse+/e0BFdTWBX5JxpBDKA+YkdLynDgG6HTF04zy6e9zPa19UX0WA2VDoehwhXQ==", + "requires": {} + }, "@nestjs/cache-manager": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/@nestjs/cache-manager/-/cache-manager-2.2.0.tgz", @@ -11743,8 +11791,17 @@ "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, + "axios": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz", + "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==", + "requires": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } }, "babel-jest": { "version": "29.7.0", @@ -12207,7 +12264,6 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, "requires": { "delayed-stream": "~1.0.0" } @@ -12401,8 +12457,7 @@ "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==" }, "denque": { "version": "2.1.0", @@ -13114,6 +13169,11 @@ "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", "dev": true }, + "follow-redirects": { + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==" + }, "foreground-child": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", @@ -13169,7 +13229,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dev": true, "requires": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -14960,6 +15019,11 @@ "ipaddr.js": "1.9.1" } }, + "proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", diff --git a/backend/package.json b/backend/package.json index cf710fee..d7cbace8 100644 --- a/backend/package.json +++ b/backend/package.json @@ -23,6 +23,7 @@ "dependencies": { "@grpc/grpc-js": "^1.9.13", "@grpc/proto-loader": "^0.7.10", + "@nestjs/axios": "^3.0.2", "@nestjs/cache-manager": "^2.2.0", "@nestjs/common": "^10.0.0", "@nestjs/config": "^3.1.1", @@ -32,6 +33,7 @@ "@nestjs/platform-socket.io": "^10.3.0", "@nestjs/serve-static": "^4.0.0", "@nestjs/websockets": "^10.3.0", + "axios": "^1.7.2", "cache-manager": "^5.3.2", "cache-manager-redis-yet": "^4.1.2", "ioredis": "^5.3.2", diff --git a/backend/src/oid4vc/oid4vc-impierce.service.ts b/backend/src/oid4vc/oid4vc-impierce.service.ts new file mode 100644 index 00000000..4be01dd8 --- /dev/null +++ b/backend/src/oid4vc/oid4vc-impierce.service.ts @@ -0,0 +1,35 @@ +import { HttpService } from '@nestjs/axios'; +import { Injectable, Logger } from '@nestjs/common'; +import { AxiosError } from 'axios'; +import { catchError, firstValueFrom } from 'rxjs'; +import { SIOPV2RequestConfig } from './siopv2'; + +@Injectable() +export class OID4VCImpierceService { + private readonly logger = new Logger(OID4VCImpierceService.name); + + constructor(private readonly httpService: HttpService) {} + + async createSIOPInvite(request: SIOPV2RequestConfig): Promise { + const response = await firstValueFrom( + this.httpService + .post( + 'http://oid4vc-impierce:3033/v1/authorization_requests', + { + nonce: 'test', // TODO: remove or replace with proper nonce + state: request.state, + }, + { + responseType: 'formdata', + }, + ) + .pipe( + catchError((error: AxiosError) => { + this.logger.error(error.response.data); + throw 'An error happened!'; + }), + ), + ); + return response.data; + } +} diff --git a/backend/src/oid4vc/oid4vc.module.ts b/backend/src/oid4vc/oid4vc.module.ts index dfa58fa0..21b19550 100644 --- a/backend/src/oid4vc/oid4vc.module.ts +++ b/backend/src/oid4vc/oid4vc.module.ts @@ -7,9 +7,11 @@ import { OID4VCIService, OID4VPService, SIOPV2Service } from './oid4vc.service'; import { OID4VC_PACKAGE_NAME } from './siopv2'; import { ConfigModule, ConfigService } from '@nestjs/config'; import configuration from './configuration'; +import { OID4VCImpierceService } from './oid4vc-impierce.service'; +import { HttpModule } from '@nestjs/axios'; @Module({ - imports: [ConfigModule.forFeature(configuration)], //TODO: figure out https://docs.nestjs.com/fundamentals/dynamic-modules#config-module-example + imports: [ConfigModule.forFeature(configuration), HttpModule], //TODO: figure out https://docs.nestjs.com/fundamentals/dynamic-modules#config-module-example controllers: [], providers: [ SIOPV2Service, @@ -41,6 +43,7 @@ import configuration from './configuration'; }), inject: [ConfigService], }, + OID4VCImpierceService, ], exports: [SIOPV2Service, OID4VPService, OID4VCIService], }) diff --git a/backend/src/oid4vc/oid4vc.service.ts b/backend/src/oid4vc/oid4vc.service.ts index 7d1ff149..79fe96e8 100644 --- a/backend/src/oid4vc/oid4vc.service.ts +++ b/backend/src/oid4vc/oid4vc.service.ts @@ -22,6 +22,7 @@ import { OfferConfig, } from './oid4vci'; import { Providers } from '../../../shared/types/Providers'; +import { OID4VCImpierceService } from './oid4vc-impierce.service'; // // SIOP @@ -35,6 +36,7 @@ export class SIOPV2Service implements OnModuleInit { constructor( @Inject(OID4VC_PACKAGE_NAME) private client: ClientGrpc, private configService: ConfigService, + private readonly impierceService: OID4VCImpierceService, ) {} onModuleInit() { @@ -45,7 +47,7 @@ export class SIOPV2Service implements OnModuleInit { async createSIOPV2Request( request: SIOPV2RequestConfig & { provider: Providers }, - ): Promise { + ): Promise { this.logger.debug('Received createSIOPV2Request request', request); switch (request.provider) { @@ -61,12 +63,13 @@ export class SIOPV2Service implements OnModuleInit { ), ); this.logger.debug('build request', buildRequest); - return buildRequest; + return buildRequest.uri; } catch (error) { this.logger.error(error); throw error; } case Providers.Impierce: + return await this.impierceService.createSIOPInvite(request); } } } diff --git a/backend/src/webapp/webapp.service.ts b/backend/src/webapp/webapp.service.ts index 899317e3..d04476b8 100644 --- a/backend/src/webapp/webapp.service.ts +++ b/backend/src/webapp/webapp.service.ts @@ -54,7 +54,7 @@ export class WebAppService { provider, }); - return siopResponse.uri; + return siopResponse; } async requestPresentation( diff --git a/tooling/API/Backend/GRPC.http b/tooling/API/Backend/GRPC.http index 54784e2c..ccfb0177 100644 --- a/tooling/API/Backend/GRPC.http +++ b/tooling/API/Backend/GRPC.http @@ -10,7 +10,7 @@ proto < ../../../shared/proto/user/user.proto GRPC /UsersService/ConnectUser { "did": "did:key:z6MkfDvsiwx8ddaUitBuwxn8fCfyMZkK7ipQanMVS1FqvchE", - "code": "a4e4aadf-90c7-4112-b00d-edb09496fc6e" + "code": "3c9323c8-8691-4fb4-b406-43113592010d" } ### {{ @@ -81,7 +81,7 @@ GRPC /UsersService/RequestCredential { "user": { "did": "did:key:z6MkfDvsiwx8ddaUitBuwxn8fCfyMZkK7ipQanMVS1FqvchE", - "code": "063bf112-5e45-4529-a085-fd91c79d8837" + "code": "ae794ad5-7c88-4397-abb9-e5e0771aa97a" }, "credentialDefinition": { "type": [ "VerifiableCredential", "CitizenCredential" ] diff --git a/tooling/API/OID4VC/Impierce/HTTP.http b/tooling/API/OID4VC/Impierce/HTTP.http index 10deba51..468a222c 100644 --- a/tooling/API/OID4VC/Impierce/HTTP.http +++ b/tooling/API/OID4VC/Impierce/HTTP.http @@ -1,4 +1,4 @@ -@host=http://insurance.selv.iota.org +@host=http://insurance.selv.local:81 ### POST /v1/credentials ### @@ -17,4 +17,4 @@ GET /v1/authorization_requests/06adfc99a128b078726c9cca383df3883db1e8dbd0270518b POST /redirect Content-Type: application/x-www-form-urlencoded -id_token=eyJ0eXAiOiJKV1QiLCJhbGciOiJFZERTQSIsImtpZCI6ImRpZDppb3RhOnJtczoweGY4MGM1MTM0OGNmMzIzOGRmMTEzMzE1NmM3ODk2NWQxZDVmOWFiYTJiZjA3MGMyM2ZiYmI5NmVkYjMzNmUxNTQjbVpYbTltSndqN2Q2WHJtejIxS3VvRDA3ZXhvM0lTOVlWWXFwTlk1RjhYSSJ9 \ No newline at end of file +id_token=eyJ0eXAiOiJKV1QiLCJhbGciOiJFZERTQSIsImtpZCI6ImRpZDppb3RhOnJtczoweDI5YTY2YWE0MjkwMmQzYmE4YTlmNDc0NmFlZTNhMzA1NDlmZWY3MmNjZjY5Y2NjNjBiNWIzNjUyNWRlYjNhYjQjOHlCS2w1dmdQcVlKVlN0aEVJdVktdUNUV2JoTnMzcmR4bFBQeFhZQW9pbyJ9.eyJjbGllbnRfaWQiOiJkaWQ6aW90YTpybXM6MHgyOWE2NmFhNDI5MDJkM2JhOGE5ZjQ3NDZhZWUzYTMwNTQ5ZmVmNzJjY2Y2OWNjYzYwYjViMzY1MjVkZWIzYWI0IiwicmVkaXJlY3RfdXJpIjoiaHR0cDovL2luc3VyYW5jZS5zZWx2LmxvY2FsOjgxL3JlZGlyZWN0Iiwic3RhdGUiOiJhYmM2Y2YxYy1kYzgzLTRjNjAtYTA3MC0yZGVlYTkxN2MzZWMiLCJyZXNwb25zZV90eXBlIjoiaWRfdG9rZW4iLCJzY29wZSI6Im9wZW5pZCIsInJlc3BvbnNlX21vZGUiOiJkaXJlY3RfcG9zdCIsIm5vbmNlIjoidGVzdCIsImNsaWVudF9tZXRhZGF0YSI6eyJzdWJqZWN0X3N5bnRheF90eXBlc19zdXBwb3J0ZWQiOlsiZGlkOmlvdGE6cm1zIl19fQ.21VgOxEATtpuQMaEB8Ct2k-oy3LcKCq7FhrjgaIfiQywETJaF_zc1BneRbYhyC4dTkfiYORBOwYrNLWYvDG3Bw \ No newline at end of file