[SALAD-23183] WebApp - Redirect to Demand Alerts Page on successful l…

…ogin (#1240)
SaladTechnologies · Dec 9, 2024 · 99e741e · 99e741e
1 parent 0ea9695
commit 99e741e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/web-app/src/modules/auth/AuthStore.tsx b/packages/web-app/src/modules/auth/AuthStore.tsx
@@ -36,12 +36,12 @@ export class AuthStore {
   }
 
   @action
-  public login = async (): Promise<void> => {
+  public login = async (redirectUri?: string): Promise<void> => {
     // Don't do anything if we are already logged in
     try {
       await this.axios.get('/api/v1/profile').then(() => runInAction(() => (this.isAuthenticated = true)))
     } catch {
-      const routeWithoutTrailingSlash = this.store.routing.location.pathname.slice(1)
+      const routeWithoutTrailingSlash = redirectUri ?? this.store.routing.location.pathname.slice(1)
 
       window.location.assign(`${config.loginUrl}?redirect_uri=${routeWithoutTrailingSlash}`)
     }

diff --git a/...web-app/src/modules/demand-monitor-views/DemandMonitorPage/DemandMonitorPageContainer.tsx b/...web-app/src/modules/demand-monitor-views/DemandMonitorPage/DemandMonitorPageContainer.tsx
@@ -19,7 +19,7 @@ export const _DemandMonitorPageContainer: FC<DemandMonitorPageProps> = ({ isAuth
 const mapStoreToProps = (store: RootStore): any => ({
   onLoginClick: () => {
     store.analytics.trackButtonClicked('login_button', 'Log In Button', 'enabled')
-    store.auth.login()
+    store.auth.login('/account/alerts')
   },
   fetchDemandedHardwarePerformanceList: store.demandMonitor.fetchDemandedHardwarePerformanceList,
   navigateToDemandAlerts: () => store.routing.push('/account/alerts'),