From 320de18be7116cccafe1036e485df9b25a24439a Mon Sep 17 00:00:00 2001
From: Steven Masley <Emyrk@users.noreply.github.com>
Date: Fri, 11 Aug 2023 09:25:05 -0500
Subject: [PATCH] fix: correct github oauth2 callback url (#9052)

* fix: correct github oauth2 callback url
---
 .../SecurityPage/SecurityPage.test.tsx                |  1 +
 .../SecurityPage/SingleSignOnSection.tsx              | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/site/src/pages/UserSettingsPage/SecurityPage/SecurityPage.test.tsx b/site/src/pages/UserSettingsPage/SecurityPage/SecurityPage.test.tsx
index d5ef50fad2..5b5fdd49ba 100644
--- a/site/src/pages/UserSettingsPage/SecurityPage/SecurityPage.test.tsx
+++ b/site/src/pages/UserSettingsPage/SecurityPage/SecurityPage.test.tsx
@@ -136,6 +136,7 @@ test("change login type to OIDC", async () => {
 
   jest.spyOn(SSO, "redirectToOIDCAuth").mockImplementation(() => {
     // Does a noop
+    return ""
   })
 
   const ssoSection = screen.getByTestId("sso-section")
diff --git a/site/src/pages/UserSettingsPage/SecurityPage/SingleSignOnSection.tsx b/site/src/pages/UserSettingsPage/SecurityPage/SingleSignOnSection.tsx
index 6d793d2e25..66830b793e 100644
--- a/site/src/pages/UserSettingsPage/SecurityPage/SingleSignOnSection.tsx
+++ b/site/src/pages/UserSettingsPage/SecurityPage/SingleSignOnSection.tsx
@@ -30,7 +30,16 @@ export const redirectToOIDCAuth = (
   stateString: string,
   redirectTo: string,
 ) => {
-  window.location.href = `/api/v2/users/${toType}/callback?oidc_merge_state=${stateString}&redirect=${redirectTo}`
+  switch (toType) {
+    case "github":
+      window.location.href = `/api/v2/users/oauth2/github/callback?oidc_merge_state=${stateString}&redirect=${redirectTo}`
+      break
+    case "oidc":
+      window.location.href = `/api/v2/users/oidc/callback?oidc_merge_state=${stateString}&redirect=${redirectTo}`
+      break
+    default:
+      throw new Error(`Unknown login type ${toType}`)
+  }
 }
 
 export const useSingleSignOnSection = () => {