fix secrets mismatch and remove b64

Author: MagnusHAa

.github/workflows/test-use-cases.yml

@@ -38,9 +38,9 @@ jobs:
         uses: grafana/k6-action@e4714b734f2b0afaabeb7b4a69142745548ab9ec # v0.3.1
         env:
           base_url: ${{ secrets.BROKER_BASE_URL }}
-          mp_client_id: ${{ secrets.USE_CASE_MASKINPORTEN_CLIENT_ID }}
-          mp_kid: ${{ secrets.USE_CASE_MASKINPORTEN_KID }}
-          mp_client_pem: ${{ secrets.USE_CASE_MASKINPORTEN_PEM }}
+          mp_client_id: ${{ secrets.USECASE_MASKINPORTEN_CLIENT_ID }}
+          mp_kid: ${{ secrets.USECASE_MASKINPORTEN_KID }}
+          mp_client_pem: ${{ secrets.USECASE_MASKINPORTEN_PEM }}
         with:
           filename: tests/Altinn.Broker.UseCaseTests/case_initialize.js
 

tests/Altinn.Broker.UseCaseTests/helpers/altinnTokenService.js

@@ -1,5 +1,4 @@
 import http from 'k6/http';
-import encoding from 'k6/encoding';
 import { retrieveMaskinportenToken } from './maskinportenTokenService.js';
 
 const authorizationBaseUrl = (__ENV.base_url.toLowerCase().includes('platform.altinn.no'))
@@ -21,28 +20,22 @@ async function retrieveAltinnToken({ baseUrl, clientId, kid, pem, scope, isSende
 }
 
 export async function getSenderAltinnToken() {
-    const pem = __ENV.mp_client_pem_b64
-        ? encoding.b64decode(__ENV.mp_client_pem_b64, 'std', 's').toString()
-        : __ENV.mp_client_pem;
     return await retrieveAltinnToken({
         baseUrl: authorizationBaseUrl,
         clientId: __ENV.mp_client_id,
         kid: __ENV.mp_kid,
-        pem,
+        pem: __ENV.mp_client_pem,
         scope: 'altinn:broker.write',
         isSender: true
     });
 }
 
 export async function getRecipientAltinnToken() {
-    const pem = __ENV.mp_client_pem_b64
-        ? encoding.b64decode(__ENV.mp_client_pem_b64, 'std', 's').toString()
-        : __ENV.mp_client_pem;
     return await retrieveAltinnToken({
         baseUrl: authorizationBaseUrl,
         clientId: __ENV.mp_client_id,
         kid: __ENV.mp_kid,
-        pem,
+        pem: __ENV.mp_client_pem,
         scope: 'altinn:broker.read altinn:serviceowner',
         isSender: false
     });

tests/Altinn.Broker.UseCaseTests/helpers/maskinportenTokenService.js

@@ -1,5 +1,4 @@
 import http from 'k6/http';
-import encoding from 'k6/encoding';
 import { buildMaskinportenJwt } from './maskinportenJwtBuilder.js';
 
 const maskinportenUrl = (__ENV.base_url.toLowerCase().includes('platform.altinn.no'))
@@ -20,13 +19,10 @@ export async function retrieveMaskinportenToken({ clientId, kid, pem, scope, isS
 }
 
 export async function getMaintenanceMaskinportenToken() {
-    const pem = __ENV.mp_client_pem_b64
-        ? encoding.b64decode(__ENV.mp_client_pem_b64, 'std', 's').toString()
-        : __ENV.mp_client_pem;
     return await retrieveMaskinportenToken({
         clientId: __ENV.mp_client_id,
         kid: __ENV.mp_kid,
-        pem,
+        pem: __ENV.mp_client_pem,
         scope: 'altinn:broker.maintenance',
     });
 }