Update authentication callback and login URL to include redirect URI based on frontend origin (#2856)

Author: CollinBeczak

src/api/user/auth.ts

@@ -7,8 +7,12 @@ import { apiRequest } from '../'
 export const userAuth = {
   signOut: async () => await apiRequest.get('auth/signout').json<void>(),
 
-  callback: async (code: string) =>
-    await apiRequest.get(`auth/callback?code=${code}`).json<OAuthCallbackResponse>(),
+  callback: async (code: string) => {
+    const frontendOrigin = window.env.VITE_APP_URL || window.location.origin
+    return await apiRequest
+      .get(`auth/callback?code=${code}&redirect_uri=${encodeURIComponent(frontendOrigin)}`)
+      .json<OAuthCallbackResponse>()
+  },
 
   whoAmI: (isLoggedOut: boolean) =>
     useQuery(

src/contexts/AuthContext.tsx

@@ -175,8 +175,9 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
     const currentUrl = location.pathname + location.searchStr
     setStoredRedirectUrl(currentUrl)
 
+    const frontendOrigin = window.env.VITE_APP_URL || window.location.origin
     const oauthBaseUrl = window.env.VITE_SERVER_OAUTH_URL
-    const loginUrl = `?redirect=${encodeURIComponent(currentUrl)}`
+    const loginUrl = `?redirect=${encodeURIComponent(currentUrl)}&redirect_uri=${encodeURIComponent(frontendOrigin)}`
 
     try {
       const oauthApi = createApiWithBaseUrl(oauthBaseUrl)