diff --git a/plugins/auth-backend-module-vmware-cloud-provider/config.d.ts b/plugins/auth-backend-module-vmware-cloud-provider/config.d.ts index 10b3566899..0026a7d2d0 100644 --- a/plugins/auth-backend-module-vmware-cloud-provider/config.d.ts +++ b/plugins/auth-backend-module-vmware-cloud-provider/config.d.ts @@ -18,7 +18,7 @@ export interface Config { auth?: { providers?: { /** @visibility frontend */ - vmwareCloudServices?: { + vmwareCloud?: { [authEnv: string]: { clientId: string; organizationId: string; diff --git a/plugins/auth-backend-module-vmware-cloud-provider/src/module.test.ts b/plugins/auth-backend-module-vmware-cloud-provider/src/module.test.ts index 3461ef79a5..939e9a9a41 100644 --- a/plugins/auth-backend-module-vmware-cloud-provider/src/module.test.ts +++ b/plugins/auth-backend-module-vmware-cloud-provider/src/module.test.ts @@ -102,11 +102,11 @@ async function createBackendWithSession( const app = express(); const middleware = MiddlewareFactory.create({ config, logger }); - const secret = 'secret'; + const testSecret = 'secret'; app.use( session({ - secret, + secret: testSecret, resave: false, saveUninitialized: false, }), @@ -186,7 +186,7 @@ describe('authModuleVmwareCloudProvider', () => { }, auth: { providers: { - vmwareCloudServices: { + vmwareCloud: { development: { clientId: 'placeholderClientId', organizationId: 'orgId', @@ -203,15 +203,13 @@ describe('authModuleVmwareCloudProvider', () => { const agent = request.agent(server); - const res = await agent.get( - '/api/auth/vmwareCloudServices/start?env=development', - ); + const res = await agent.get('/api/auth/vmwareCloud/start?env=development'); expect(res.status).toEqual(302); - const nonceCookie = agent.jar.getCookie('vmwareCloudServices-nonce', { + const nonceCookie = agent.jar.getCookie('vmwareCloud-nonce', { domain: 'localhost', - path: '/api/auth/vmwareCloudServices/handler', + path: '/api/auth/vmwareCloud/handler', script: false, secure: false, }); @@ -223,7 +221,7 @@ describe('authModuleVmwareCloudProvider', () => { expect(Object.fromEntries(startUrl.searchParams)).toEqual({ response_type: 'code', client_id: 'placeholderClientId', - redirect_uri: `http://localhost:${server.port()}/api/auth/vmwareCloudServices/handler/frame`, + redirect_uri: `http://localhost:${server.port()}/api/auth/vmwareCloud/handler/frame`, code_challenge: expect.any(String), state: expect.any(String), scope: 'openid offline_access', diff --git a/plugins/auth-backend-module-vmware-cloud-provider/src/module.ts b/plugins/auth-backend-module-vmware-cloud-provider/src/module.ts index fd53e01dce..d5312e6d73 100644 --- a/plugins/auth-backend-module-vmware-cloud-provider/src/module.ts +++ b/plugins/auth-backend-module-vmware-cloud-provider/src/module.ts @@ -31,7 +31,7 @@ export const authModuleVmwareCloudProvider = createBackendModule({ deps: { providers: authProvidersExtensionPoint }, async init({ providers }) { providers.registerProvider({ - providerId: 'vmwareCloudServices', + providerId: 'vmwareCloud', factory: createOAuthProviderFactory({ authenticator: vmwareCloudAuthenticator, signInResolverFactories: {