From 8cecc80917af37c4890fa7ce950c4c376b9b8dde Mon Sep 17 00:00:00 2001 From: Aidar Negimatzhanov Date: Wed, 29 Jan 2025 16:29:42 +0100 Subject: [PATCH 1/2] Added signed headers to /checklogin request. Updated docker-compose --- signify-ts-test/docker-compose.yaml | 11 ++++------- signify-ts-test/test/reg-pilot-api.test.ts | 9 ++++++++- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/signify-ts-test/docker-compose.yaml b/signify-ts-test/docker-compose.yaml index d49ddb2..c6f04b0 100644 --- a/signify-ts-test/docker-compose.yaml +++ b/signify-ts-test/docker-compose.yaml @@ -75,17 +75,14 @@ services: - 5644:5644 reg-pilot-api: - image: gleif/reg-pilot-api:dev + image: gleif/reg-pilot-api:latest ports: - 8000:8000 environment: - ENABLE_CORS=true - - VERIFIER_AUTHORIZATIONS=http://vlei-verifier:7676/authorizations/ - - VERIFIER_PRESENTATIONS=http://vlei-verifier:7676/presentations/ + - VLEI_VERIFIER=http://vlei-verifier:7676 - FILER_REPORTS=http://reg-pilot-filer:7878/reports/ - FILER_ADMIN_UPLOAD_STATUSES=http://reg-pilot-filer:7878/admin/upload_statuses/ - - VERIFIER_REQUESTS=http://vlei-verifier:7676/request/verify/ - - VERIFIER_ADD_ROT=http://vlei-verifier:7676/root_of_trust/ healthcheck: test: ["CMD", "wget", "--spider", "http://reg-pilot-api:8000/ping"] interval: 2s @@ -94,7 +91,7 @@ services: start_period: 2s vlei-verifier: - image: gleif/vlei-verifier:dev + image: gleif/vlei-verifier:latest container_name: vlei-verifier hostname: vlei-verifier environment: @@ -112,7 +109,7 @@ services: start_period: 2s reg-pilot-filer: - image: gleif/reg-pilot-filer:dev + image: gleif/reg-pilot-filer:latest container_name: reg-pilot-filer hostname: reg-pilot-filer ports: diff --git a/signify-ts-test/test/reg-pilot-api.test.ts b/signify-ts-test/test/reg-pilot-api.test.ts index ced9e74..7b7c1fb 100644 --- a/signify-ts-test/test/reg-pilot-api.test.ts +++ b/signify-ts-test/test/reg-pilot-api.test.ts @@ -890,9 +890,16 @@ async function checkLogin( ) { let heads = new Headers(); heads.set("Content-Type", "application/json"); + const client: SignifyClient = user.roleClient; let creq = { headers: heads, method: "GET", body: null }; let cpath = `/checklogin/${user.ecrAid.prefix}`; - const cresp = await fetch(env.apiBaseUrl + cpath, creq); + const url = env.apiBaseUrl + cpath; + let sreq = await client.createSignedRequest( + user.idAlias, + url, + creq, + ); + const cresp = await fetch(url, sreq); let cbody = await cresp.json(); if (isEbaDataSubmitter(cred, user.ecrAid.prefix)) { if (credRevoked) { From 46dadc966d05868a1e975db2604a6fd6c40d392d Mon Sep 17 00:00:00 2001 From: Aidar Negimatzhanov Date: Wed, 29 Jan 2025 16:31:11 +0100 Subject: [PATCH 2/2] Prettier! --- signify-ts-test/test/reg-pilot-api.test.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/signify-ts-test/test/reg-pilot-api.test.ts b/signify-ts-test/test/reg-pilot-api.test.ts index 7b7c1fb..7d4bb42 100644 --- a/signify-ts-test/test/reg-pilot-api.test.ts +++ b/signify-ts-test/test/reg-pilot-api.test.ts @@ -894,11 +894,7 @@ async function checkLogin( let creq = { headers: heads, method: "GET", body: null }; let cpath = `/checklogin/${user.ecrAid.prefix}`; const url = env.apiBaseUrl + cpath; - let sreq = await client.createSignedRequest( - user.idAlias, - url, - creq, - ); + let sreq = await client.createSignedRequest(user.idAlias, url, creq); const cresp = await fetch(url, sreq); let cbody = await cresp.json(); if (isEbaDataSubmitter(cred, user.ecrAid.prefix)) {