diff --git a/e2e/token-vault-app/project.json b/e2e/token-vault-app/project.json index f398326ca..08e8d5302 100644 --- a/e2e/token-vault-app/project.json +++ b/e2e/token-vault-app/project.json @@ -7,6 +7,7 @@ "targets": { "build": { "executor": "@nx/vite:build", + "dependsOn": ["token-vault-app:build-interceptor"], "outputs": ["{options.outputPath}"], "defaultConfiguration": "production", "options": { @@ -22,6 +23,15 @@ } } }, + "build-interceptor": { + "executor": "@nx/vite:build", + "outputs": ["{options.outputPath}"], + "options": { + "configFile": "e2e/token-vault-app/vite.interceptor.config.ts", + "emptyOutDir": false, + "outputPath": "e2e/token-vault-app/public/" + } + }, "serve": { "executor": "@nx/vite:dev-server", "dependsOn": ["token-vault-app:build"], diff --git a/e2e/token-vault-app/vite.config.ts b/e2e/token-vault-app/vite.config.ts index 37bb10039..f5f0133c5 100644 --- a/e2e/token-vault-app/vite.config.ts +++ b/e2e/token-vault-app/vite.config.ts @@ -4,14 +4,13 @@ import viteTsConfigPaths from 'vite-tsconfig-paths'; export default defineConfig({ build: { + minify: false, rollupOptions: { input: { - interceptor: 'e2e/token-vault-app/src/interceptor.ts', - main: 'e2e/token-vault-app/src/main.ts', + main: './e2e/token-vault-app/src/main.ts', }, output: { - // dir: 'e2e/token-vault-app/public', - entryFileNames: '[name].js', + entryFileNames: 'main.js', }, }, }, @@ -23,19 +22,9 @@ export default defineConfig({ }, strictPort: true, }, - plugins: [ viteTsConfigPaths({ root: '../../', }), ], - - worker: { - plugins: [ - viteTsConfigPaths({ - root: '../../', - }), - ], - format: 'es', - }, }); diff --git a/e2e/token-vault-app/vite.interceptor.config.ts b/e2e/token-vault-app/vite.interceptor.config.ts new file mode 100644 index 000000000..222535129 --- /dev/null +++ b/e2e/token-vault-app/vite.interceptor.config.ts @@ -0,0 +1,22 @@ +import { defineConfig } from 'vite'; +import viteTsConfigPaths from 'vite-tsconfig-paths'; + +export default defineConfig({ + plugins: [ + viteTsConfigPaths({ + root: '../../', + }), + ], + build: { + minify: false, + emptyOutDir: false, + rollupOptions: { + input: 'e2e/token-vault-app/src/interceptor.ts', + output: { + entryFileNames: 'interceptor.js', + format: 'iife', + esModule: false, + }, + }, + }, +}); diff --git a/nx.json b/nx.json index 4cbcb044d..80452a790 100644 --- a/nx.json +++ b/nx.json @@ -75,6 +75,7 @@ "options": { "cacheableOperations": [ "build", + "build-interceptor", "build-types", "bundle-types", "test", diff --git a/package.json b/package.json index b0433c13f..b0c981337 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "start:angular-todo": "nx run angular-todo:config && nx run-many --target=serve --projects=angular-todo,todo-api", "start:server": "nx run mock-api:serve", "start:server:live": "NODE_ENV=LIVE nx run mock-api:serve:live", + "start:token-vault": "nx run-many --target=serve --projects=token-vault-app,token-vault-proxy,mock-api", "test": "npm run test:unit && npm run test:integration && npm run test:e2e", "test:e2e": "nx affected:e2e --parallel 1 --max-parallel 1", "test:e2e:live": "nx run autoscript-suites:e2e --configuration=live", diff --git a/shared/workers/src/lib/worker.utilities.test.ts b/shared/workers/src/lib/worker.utilities.test.ts index 4b84ae9f9..ab810fdab 100644 --- a/shared/workers/src/lib/worker.utilities.test.ts +++ b/shared/workers/src/lib/worker.utilities.test.ts @@ -21,7 +21,6 @@ test('generateUrlsToIntercept returns the expected array of URLs', () => { 'https://openam.forgerock.com/am/oauth2/realms/root/connect/endSession?', 'https://openam.forgerock.com/am/oauth2/realms/root/token/revoke', 'https://openam.forgerock.com/am/oauth2/realms/root/userinfo', - 'https://openam.forgerock.com/am/json/realms/root/sessions', ]; expect(generateUrlsToIntercept(config)).toEqual(expectedUrls); @@ -48,7 +47,6 @@ test('generateUrlsToIntercept returns the expected array of URLs with /alpha as 'https://openam.forgerock.com/am/oauth2/realms/root/realms/alpha/connect/endSession?', 'https://openam.forgerock.com/am/oauth2/realms/root/realms/alpha/token/revoke', 'https://openam.forgerock.com/am/oauth2/realms/root/realms/alpha/userinfo', - 'https://openam.forgerock.com/am/json/realms/root/realms/alpha/sessions', ]; expect(generateUrlsToIntercept(config)).toEqual(expectedUrls); diff --git a/shared/workers/src/lib/worker.utilities.ts b/shared/workers/src/lib/worker.utilities.ts index 96e4d0e7c..000b8e0a6 100644 --- a/shared/workers/src/lib/worker.utilities.ts +++ b/shared/workers/src/lib/worker.utilities.ts @@ -21,7 +21,6 @@ export function generateUrlsToIntercept(config: InterceptorConfig) { `${resolveUrl(forgerockBaseUrl, getEndpointPath('endSession', realmPath))}?`, `${resolveUrl(forgerockBaseUrl, getEndpointPath('revoke', realmPath))}`, `${resolveUrl(forgerockBaseUrl, getEndpointPath('userInfo', realmPath))}`, - `${resolveUrl(forgerockBaseUrl, getEndpointPath('sessions', realmPath))}`, ]; return urls; }