From d2dcdce7638e28b87b8f5e8d1a9ab2236565a0ca Mon Sep 17 00:00:00 2001
From: Jesse Wierzbinski <contact@cpluspatch.com>
Date: Fri, 11 Oct 2024 17:09:51 +0200
Subject: [PATCH] fix(api): :bug: Fix incorrect order of function parameters

---
 plugins/openid/routes/oauth/sso.ts | 2 +-
 plugins/openid/routes/sso/index.ts | 2 +-
 utils/constants.ts                 | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/plugins/openid/routes/oauth/sso.ts b/plugins/openid/routes/oauth/sso.ts
index 1368f742..c2abe9b0 100644
--- a/plugins/openid/routes/oauth/sso.ts
+++ b/plugins/openid/routes/oauth/sso.ts
@@ -119,8 +119,8 @@ export default (plugin: PluginType) => {
                         {
                             client_id: issuer.client_id,
                             redirect_uri: `${oauthRedirectUri(
-                                issuerId,
                                 context.get("config").http.base_url,
+                                issuerId,
                             )}?flow=${newFlow.id}`,
                             response_type: "code",
                             scope: "openid profile email",
diff --git a/plugins/openid/routes/sso/index.ts b/plugins/openid/routes/sso/index.ts
index feaa6711..1e6c95ea 100644
--- a/plugins/openid/routes/sso/index.ts
+++ b/plugins/openid/routes/sso/index.ts
@@ -164,8 +164,8 @@ export default (plugin: PluginType) => {
                 const codeVerifier = generateRandomCodeVerifier();
 
                 const redirectUri = oauthRedirectUri(
-                    issuerId,
                     context.get("config").http.base_url,
+                    issuerId,
                 );
 
                 const application = (
diff --git a/utils/constants.ts b/utils/constants.ts
index 3e1c1d3e..3e93f767 100644
--- a/utils/constants.ts
+++ b/utils/constants.ts
@@ -1,7 +1,4 @@
 import { config } from "~/packages/config-manager/index.ts";
 
-export const oauthRedirectUri = (issuer: string) =>
-    new URL(`/oauth/sso/${issuer}/callback`, config.http.base_url).toString();
-
 export const localObjectUri = (id: string) =>
     new URL(`/objects/${id}`, config.http.base_url).toString();