72699: Hard redirect after log in - loading fixes

src/app/shared/log-in/methods/password/log-in-password.component.spec.ts

@@ -15,6 +15,7 @@ import { AuthServiceStub } from '../../../testing/auth-service.stub';
 import { AppState } from '../../../../app.reducer';
 import { AuthMethod } from '../../../../core/auth/models/auth.method';
 import { AuthMethodType } from '../../../../core/auth/models/auth.method-type';
+import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
 
 describe('LogInPasswordComponent', () => {
 
@@ -29,8 +30,14 @@ describe('LogInPasswordComponent', () => {
     loading: false,
   };
 
+  let hardRedirectService: HardRedirectService;
+
   beforeEach(() => {
     user = EPersonMock;
+
+    hardRedirectService = jasmine.createSpyObj('hardRedirectService', {
+      getCurrentRoute: {}
+    });
   });
 
   beforeEach(async(() => {
@@ -47,7 +54,8 @@ describe('LogInPasswordComponent', () => {
       ],
       providers: [
         { provide: AuthService, useClass: AuthServiceStub },
-        { provide: 'authMethodProvider', useValue: new AuthMethod(AuthMethodType.Password) }
+        { provide: 'authMethodProvider', useValue: new AuthMethod(AuthMethodType.Password) },
+        { provide: HardRedirectService, useValue: hardRedirectService },
       ],
       schemas: [
         CUSTOM_ELEMENTS_SCHEMA

src/app/shared/log-in/methods/password/log-in-password.component.ts

@@ -13,6 +13,8 @@ import { fadeOut } from '../../../animations/fade';
 import { AuthMethodType } from '../../../../core/auth/models/auth.method-type';
 import { renderAuthMethodFor } from '../log-in.methods-decorator';
 import { AuthMethod } from '../../../../core/auth/models/auth.method';
+import { AuthService } from '../../../../core/auth/auth.service';
+import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
 
 /**
  * /users/sign-in
@@ -66,11 +68,15 @@ export class LogInPasswordComponent implements OnInit {
   /**
    * @constructor
    * @param {AuthMethod} injectedAuthMethodModel
+   * @param {AuthService} authService
+   * @param {HardRedirectService} hardRedirectService
    * @param {FormBuilder} formBuilder
    * @param {Store<State>} store
    */
   constructor(
     @Inject('authMethodProvider') public injectedAuthMethodModel: AuthMethod,
+    private authService: AuthService,
+    private hardRedirectService: HardRedirectService,
     private formBuilder: FormBuilder,
     private store: Store<CoreState>
   ) {
@@ -134,6 +140,8 @@ export class LogInPasswordComponent implements OnInit {
     email.trim();
     password.trim();
 
+    this.authService.setRedirectUrlIfNotSet(this.hardRedirectService.getCurrentRoute());
+
     // dispatch AuthenticationAction
     this.store.dispatch(new AuthenticateAction(email, password));
 

src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.spec.ts

@@ -17,6 +17,7 @@ import { NativeWindowService } from '../../../../core/services/window.service';
 import { RouterStub } from '../../../testing/router.stub';
 import { ActivatedRouteStub } from '../../../testing/active-router.stub';
 import { NativeWindowMockFactory } from '../../../mocks/mock-native-window-ref';
+import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
 
 describe('LogInShibbolethComponent', () => {
 
@@ -30,6 +31,7 @@ describe('LogInShibbolethComponent', () => {
   let location;
 
   let authState;
+  let hardRedirectService: HardRedirectService;
 
   beforeEach(() => {
     user = EPersonMock;
@@ -41,6 +43,10 @@ describe('LogInShibbolethComponent', () => {
       loaded: false,
       loading: false,
     };
+
+    hardRedirectService = jasmine.createSpyObj('hardRedirectService', {
+      getCurrentRoute: {}
+    });
   });
 
   beforeEach(async(() => {
@@ -59,6 +65,7 @@ describe('LogInShibbolethComponent', () => {
         { provide: NativeWindowService, useFactory: NativeWindowMockFactory },
         { provide: Router, useValue: new RouterStub() },
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
+        { provide: HardRedirectService, useValue: hardRedirectService },
       ],
       schemas: [
         CUSTOM_ELEMENTS_SCHEMA

src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.ts

@@ -12,6 +12,8 @@ import { isAuthenticated, isAuthenticationLoading } from '../../../../core/auth/
 import { RouteService } from '../../../../core/services/route.service';
 import { NativeWindowRef, NativeWindowService } from '../../../../core/services/window.service';
 import { isNotNull } from '../../../empty.util';
+import { AuthService } from '../../../../core/auth/auth.service';
+import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
 
 @Component({
   selector: 'ds-log-in-shibboleth',
@@ -51,12 +53,16 @@ export class LogInShibbolethComponent implements OnInit {
    * @param {AuthMethod} injectedAuthMethodModel
    * @param {NativeWindowRef} _window
    * @param {RouteService} route
+   * @param {AuthService} authService
+   * @param {HardRedirectService} hardRedirectService
    * @param {Store<State>} store
    */
   constructor(
     @Inject('authMethodProvider') public injectedAuthMethodModel: AuthMethod,
     @Inject(NativeWindowService) protected _window: NativeWindowRef,
     private route: RouteService,
+    private authService: AuthService,
+    private hardRedirectService: HardRedirectService,
     private store: Store<CoreState>
   ) {
     this.authMethod = injectedAuthMethodModel;
@@ -75,6 +81,7 @@ export class LogInShibbolethComponent implements OnInit {
   }
 
   redirectToShibboleth() {
+    this.authService.setRedirectUrlIfNotSet(this.hardRedirectService.getCurrentRoute())
     let newLocationUrl = this.location;
     const currentUrl = this._window.nativeWindow.location.href;
     const myRegexp = /\?redirectUrl=(.*)/g;