refactor: Remove oidcproxy (#16596)

wireapp · Jan 23, 2024 · 75cb794 · 75cb794
1 parent 31068bc
commit 75cb794
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 210 deletions.
diff --git a/server/Server.ts b/server/Server.ts
@@ -33,7 +33,6 @@ import type {ClientConfig, ServerConfig} from './config';
 import {HealthCheckRoute} from './routes/_health/HealthRoute';
 import {AppleAssociationRoute} from './routes/appleassociation/AppleAssociationRoute';
 import {ConfigRoute} from './routes/config/ConfigRoute';
-import {OIDCProxyRoute, OIDCProxyRoutePath} from './routes/E2EIProxy';
 import {InternalErrorRoute, NotFoundRoute} from './routes/error/ErrorRoutes';
 import {GoogleWebmasterRoute} from './routes/googlewebmaster/GoogleWebmasterRoute';
 import {RedirectRoutes} from './routes/RedirectRoutes';
@@ -74,7 +73,6 @@ class Server {
     this.app.use(ConfigRoute(this.config, this.clientConfig));
     this.app.use(GoogleWebmasterRoute(this.config));
     this.app.use(AppleAssociationRoute());
-    this.app.use(OIDCProxyRoute());
     this.app.use(NotFoundRoute());
     this.app.use(InternalErrorRoute());
   }
@@ -190,8 +188,7 @@ class Server {
         req.path.startsWith('/join') ||
         req.path.startsWith('/auth') ||
         req.path.startsWith('/google') ||
-        req.path.startsWith('/apple-app-site-association') ||
-        req.path.startsWith(OIDCProxyRoutePath);
+        req.path.startsWith('/apple-app-site-association');
 
       if (ignoredPath) {
         return next();

diff --git a/server/routes/E2EIProxy/common.ts b/server/routes/E2EIProxy/common.ts
diff --git a/server/routes/E2EIProxy/index.ts b/server/routes/E2EIProxy/index.ts
diff --git a/server/routes/E2EIProxy/proxy.ts b/server/routes/E2EIProxy/proxy.ts
diff --git a/server/routes/E2EIProxy/route.ts b/server/routes/E2EIProxy/route.ts
diff --git a/src/script/E2EIdentity/OIDCService/OIDCService.ts b/src/script/E2EIdentity/OIDCService/OIDCService.ts
@@ -51,11 +51,10 @@ export class OIDCService {
     // Build the proxy url and redirect uri
     const currentOrigin = location.origin;
     const authorityUrl = idpUrl.origin + idpUrl.pathname;
-    const proxyUrl = `${currentOrigin}/oidcProxy?targetUrl=${authorityUrl}`;
     const redirectUri = `${currentOrigin}/oidc`;
 
     const dexioConfig: UserManagerSettings = {
-      authority: proxyUrl,
+      authority: authorityUrl,
       client_id: idpClientId,
       redirect_uri: redirectUri,
       response_type: 'code',