Merge pull request #1380 from ORCID/loginIssues

Login issues

Author: bobcaprice

docker-compose.yml

@@ -37,7 +37,7 @@ services:
       - APPLICATION_INTERNAL_ASSERTION_SERVICE_ID=assertion-service-internal
       - APPLICATION_INTERNAL_ASSERTION_SERVICE_CLIENT_SECRET=${ASSERTION_SERVICE_INTERNAL_CLIENT_SECRET}
       - APPLICATION_SECURITY_ISSUER_URL=${ISSUER_URL}
-      - UI_REDIRECT_URI=${UI_BASE_URL}/auth/callback
+      - UI_REDIRECT_URI=${UI_BASE_URL}/en/auth/callback
       - UI_POST_LOGOUT_REDIRECT_URI=${UI_BASE_URL}/en/login
     volumes:
       - ${LOG_VOLUME:-/var/tmp/}:/logs

ui-2/src/app/account/auth.guard.ts

@@ -6,6 +6,7 @@ import { map, switchMap, take, filter } from 'rxjs/operators' // <--- Import fil
 
 import { StateStorageService } from './service/state-storage.service'
 import { AccountService } from './service/account.service'
+import { log } from 'console'
 
 export const AuthGuard = (route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | boolean => {
   const authorities = route.data['authorities']
@@ -23,6 +24,7 @@ export const AuthGuard = (route: ActivatedRouteSnapshot, state: RouterStateSnaps
         if (state.url === '/login') {
           return of(true)
         }
+        console.log('storing state url for redirect after login:', state.url)
         stateStorageService.storeUrl(state.url)
         router.navigate(['/login'])
         return of(false)

ui-2/src/app/account/login/login.component.ts

@@ -106,10 +106,9 @@ export class LoginComponent implements AfterViewInit, OnDestroy {
 
     this.eventService.broadcast(new Event(EventType.LOG_IN_SUCCESS))
 
-    // previousState was set in the authExpiredInterceptor before being redirected to login modal.
-    // since login is successful, go to stored previousState and clear previousState
     const redirect = this.stateStorageService.getUrl()
     if (redirect) {
+      console.log('Redirecting to stored url after login:', redirect)
       this.stateStorageService.storeUrl(null)
       this.router.navigateByUrl(redirect)
     }

ui-2/src/app/app-routing.module.ts

@@ -6,6 +6,10 @@ import { AppComponent } from './app.component'
 import { LoginComponent } from './account'
 
 const routes: Routes = [
+  {
+    path: 'auth/callback',
+    children: [],
+  },
   {
     path: '',
     loadChildren: () => import('./account/account.module').then((m) => m.AccountModule),

ui-2/src/app/app.component.ts

@@ -32,8 +32,10 @@ export class AppComponent implements OnInit {
           const redirect = this.stateStorageService.getUrl()
           if (redirect) {
             this.stateStorageService.storeUrl(null)
+            console.log('Redirecting to stored url after login:', redirect)
             this.router.navigateByUrl(redirect)
-          } else if (this.router.url.includes('login/callback')) {
+          } else if (this.router.url.includes('auth/callback')) {
+            console.log('Oauth callback, navigating to home page after login')
             this.router.navigate(['/'])
           }
         })

ui-2/src/environments/environment.prod.ts

@@ -1,6 +1,6 @@
 export const environment = {
   production: true,
   issuerUrl: (window as any).__env?.issuerUrl || 'http://localhost:9000',
-  redirectUri: window.location.origin + '/auth/callback',
+  redirectUri: window.location.origin + '/en/auth/callback',
   postLogoutRedirectUri: window.location.origin + '/en/login',
 }