Merge branch 'subsetter_front_clean' into develop_v2

CUAHSI · Nov 21, 2023 · 8987695 · 8987695
2 parents 93ec2f3 + 754181f
commit 8987695
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/app/frontend/src/auth.js b/app/frontend/src/auth.js
@@ -1,4 +1,4 @@
-import { ENDPOINTS, APP_URL, OAUTH2_REDIRECT_URL } from '@/constants'
+import { ENDPOINTS, APP_URL } from '@/constants'
 import { useAuthStore } from '@/stores/auth'
 // import { fetchWrapper } from '@/_helpers/fetch-wrapper';
 // function openLogInDialog(redirectTo) {
@@ -11,7 +11,7 @@ export async function logIn(callback) {
 
   // alter redirect uri
   const authUrl = new URL(json.authorization_url)
-  authUrl.searchParams.set('redirect_uri', OAUTH2_REDIRECT_URL)
+  authUrl.searchParams.set('redirect_uri', `${APP_URL}/#/auth-redirect`)
   window.open(
     authUrl.toString(),
     '_blank',

diff --git a/app/frontend/src/constants.js b/app/frontend/src/constants.js
@@ -1,7 +1,6 @@
 export const APP_NAME = import.meta.env.VITE_APP_NAME || "";
 export const APP_URL = import.meta.env.VITE_APP_URL || "";
 export const APP_BASE = import.meta.env.VITE_APP_BASE || "";
-export const OAUTH2_REDIRECT_URL = import.meta.env.VITE_OAUTH2_REDIRECT_URL || "";
 
 export const API_BASE = import.meta.env.VITE_APP_API_URL || "";
 export const ENDPOINTS = {