Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Remove unneeded oidcProxy #16596

Merged
merged 1 commit into from
Jan 23, 2024
Merged

refactor: Remove unneeded oidcProxy #16596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions server/Server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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());
}
Expand Down Expand Up @@ -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();
Expand Down
59 changes: 0 additions & 59 deletions server/routes/E2EIProxy/common.ts
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions server/routes/E2EIProxy/index.ts
View file
Open in desktop

This file was deleted.

83 changes: 0 additions & 83 deletions server/routes/E2EIProxy/proxy.ts
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions server/routes/E2EIProxy/route.ts
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions src/script/E2EIdentity/OIDCService/OIDCService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Loading