From 71b049ef3c7ba2d9a90cc2eac8f58972ef4400b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Mon, 15 Apr 2024 15:37:00 +0200 Subject: [PATCH] review fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fredrik Adelöw --- docs/auth/service-to-service-auth.md | 8 ++++---- .../backend-common/src/tokens/ServerTokenManager.test.ts | 2 +- packages/backend-common/src/tokens/ServerTokenManager.ts | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/auth/service-to-service-auth.md b/docs/auth/service-to-service-auth.md index 15c2567d47..c1d6643769 100644 --- a/docs/auth/service-to-service-auth.md +++ b/docs/auth/service-to-service-auth.md @@ -53,11 +53,11 @@ backend: auth: externalAccess: - type: static - config: + options: token: ${CICD_TOKEN} subject: cicd-system-completion-events - type: static - config: + options: token: ${ADMIN_CURL_TOKEN} subject: admin-curl-access ``` @@ -99,11 +99,11 @@ backend: auth: externalAccess: - type: legacy - config: + options: secret: my-secret-key-catalog subject: legacy-catalog - type: legacy - config: + options: secret: my-secret-key-scaffolder subject: legacy-scaffolder ``` diff --git a/packages/backend-common/src/tokens/ServerTokenManager.test.ts b/packages/backend-common/src/tokens/ServerTokenManager.test.ts index b9b6a372d1..7b9cf5965f 100644 --- a/packages/backend-common/src/tokens/ServerTokenManager.test.ts +++ b/packages/backend-common/src/tokens/ServerTokenManager.test.ts @@ -244,7 +244,7 @@ describe('ServerTokenManager', () => { auth: { keys: [{ secret: oldSecret }], externalAccess: [ - { type: 'legacy', config: { secret: newSecret } }, + { type: 'legacy', options: { secret: newSecret } }, ], }, }, diff --git a/packages/backend-common/src/tokens/ServerTokenManager.ts b/packages/backend-common/src/tokens/ServerTokenManager.ts index 3e4311f05e..453bfd7228 100644 --- a/packages/backend-common/src/tokens/ServerTokenManager.ts +++ b/packages/backend-common/src/tokens/ServerTokenManager.ts @@ -80,7 +80,7 @@ export class ServerTokenManager implements TokenManager { const newSecrets = config .getOptionalConfigArray('backend.auth.externalAccess') ?.filter(c => c.getString('type') === 'legacy') - .map(c => c.getString('config.secret')); + .map(c => c.getString('options.secret')); const secrets = [...(oldSecrets ?? []), ...(newSecrets ?? [])]; if (secrets.length) {