From df08a3b62bc224d9313a83e0f98b258313ba7e9f Mon Sep 17 00:00:00 2001 From: Eric Sizer Date: Fri, 31 May 2024 13:59:40 -0400 Subject: [PATCH 1/4] bump mock auth image --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2d4328b8332..fc28530b97f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -83,7 +83,7 @@ services: # mock-auth: # See: https://github.com/navikt/mock-oauth2-server#standalone-server - image: ghcr.io/navikt/mock-oauth2-server:2.1.1 + image: ghcr.io/navikt/mock-oauth2-server:2.1.5 volumes: - ./infrastructure/conf:/app/conf # Container shuts down with exit code 143 instead of the standard "0", so From 98c65ac30402a0d8e9eb51adf638281373624284 Mon Sep 17 00:00:00 2001 From: Eric Sizer Date: Fri, 31 May 2024 13:59:52 -0400 Subject: [PATCH 2/4] add rotate refresh token config --- infrastructure/conf/mock-oauth2-server.json | 1 + 1 file changed, 1 insertion(+) diff --git a/infrastructure/conf/mock-oauth2-server.json b/infrastructure/conf/mock-oauth2-server.json index c31405a37e2..54df56db51b 100644 --- a/infrastructure/conf/mock-oauth2-server.json +++ b/infrastructure/conf/mock-oauth2-server.json @@ -1,5 +1,6 @@ { "interactiveLogin": true, + "rotateRefreshToken": true, "tokenCallbacks": [ { "issuerId": "oxauth", From d347e58e2e0ee53f47c641e25022855e960752ec Mon Sep 17 00:00:00 2001 From: Eric Sizer Date: Fri, 31 May 2024 15:46:22 -0400 Subject: [PATCH 3/4] stabilize process permissions test --- .../tests/admin/process-permissions.spec.ts | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/apps/playwright/tests/admin/process-permissions.spec.ts b/apps/playwright/tests/admin/process-permissions.spec.ts index 610d6e35c47..8aa2a5f8ea3 100644 --- a/apps/playwright/tests/admin/process-permissions.spec.ts +++ b/apps/playwright/tests/admin/process-permissions.spec.ts @@ -8,16 +8,18 @@ import { getClassifications } from "~/utils/classification"; import { loginBySub } from "~/utils/auth"; test.describe("Process permissions", () => { - const uniqueTestId = Date.now().valueOf(); - const unassociatedSub = `playwright.sub.unassociated.${uniqueTestId}`; - const unassociatedPoolManagerEmail = `${unassociatedSub}@example.org`; - const associatedSub = `playwright.sub.associated.${uniqueTestId}`; - const associatedPoolManagerEmail = `${associatedSub}@example.org`; - const poolName = `pool auth test ${uniqueTestId}`; - let pool: Pool; + let poolName: string; + let associatedSub: string; + let unassociatedSub: string; test.beforeAll(async ({ adminPage }) => { + const uniqueTestId = Date.now().valueOf(); + unassociatedSub = `playwright.sub.unassociated.${uniqueTestId}`; + const unassociatedPoolManagerEmail = `${unassociatedSub}@example.org`; + associatedSub = `playwright.sub.associated.${uniqueTestId}`; + const associatedPoolManagerEmail = `${associatedSub}@example.org`; + poolName = `pool auth test ${uniqueTestId}`; const poolPage = new PoolPage(adminPage.page); const teamPage = new TeamPage(adminPage.page); From b897e3f7550f4a564de91675337d851c62ae88cc Mon Sep 17 00:00:00 2001 From: Eric Sizer Date: Tue, 3 Dec 2024 15:55:21 -0500 Subject: [PATCH 4/4] add types back in --- apps/playwright/tests/admin/process-permissions.spec.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/playwright/tests/admin/process-permissions.spec.ts b/apps/playwright/tests/admin/process-permissions.spec.ts index 2f5ac771375..bc685ec767a 100644 --- a/apps/playwright/tests/admin/process-permissions.spec.ts +++ b/apps/playwright/tests/admin/process-permissions.spec.ts @@ -8,9 +8,9 @@ import { createUserWithRoles } from "~/utils/user"; import { createPool, updatePool } from "~/utils/pools"; test.describe("Process permissions", () => { - let associatedSub; - let unassociatedSub; - let poolName; + let associatedSub: string; + let unassociatedSub: string; + let poolName: string; let pool: Pool; test.beforeAll(async () => {