Changed auth-interceptor: location used to makeAuthStatusObject()

src/app/core/auth/auth.actions.ts

@@ -311,6 +311,7 @@ export class ResetAuthenticationMessagesAction implements Action {
   public type: string = AuthActionTypes.RESET_MESSAGES;
 }
 
+// Next three Actions are used by shibboleth login
 /**
  * Check if token is already present upon initial load.
  * @class CheckAuthenticationTokenAction

src/app/core/auth/auth.effects.ts

@@ -26,7 +26,7 @@ import {
   RefreshTokenSuccessAction,
   RegistrationAction,
   RegistrationErrorAction,
-  RegistrationSuccessAction
+  RegistrationSuccessAction, RetrieveAuthMethodsErrorAction, RetrieveAuthMethodsSuccessAction
 } from './auth.actions';
 import { EPerson } from '../eperson/models/eperson.model';
 import { AuthStatus } from './models/auth-status.model';
@@ -169,6 +169,19 @@ export class AuthEffects {
       tap(() => this.authService.redirectToLoginWhenTokenExpired())
     );
 
+  @Effect()
+  public retrieveMethods$: Observable<Action> = this.actions$
+    .pipe(
+      ofType(AuthActionTypes.RETRIEVE_AUTH_METHODS),
+      switchMap(() => {
+      return this.authService.retrieveAuthMethods()
+        .pipe(
+          map((location: any) => new RetrieveAuthMethodsSuccessAction(location)),
+          catchError((error) => observableOf(new RetrieveAuthMethodsErrorAction()))
+        )
+    })
+    )
+
   /**
    * @constructor
    * @param {Actions} actions$

src/app/core/auth/auth.interceptor.ts

@@ -56,10 +56,11 @@ export class AuthInterceptor implements HttpInterceptor {
     return http.url && http.url.endsWith('/authn/logout');
   }
 
-  private makeAuthStatusObject(authenticated:boolean, accessToken?: string, error?: string): AuthStatus {
+  private makeAuthStatusObject(authenticated:boolean, accessToken?: string, error?: string, location?): AuthStatus {
     const authStatus = new AuthStatus();
     authStatus.id = null;
     authStatus.okay = true;
+    authStatus.ssoLoginUrl = location; // this line added while developing shibboleth dev
     if (authenticated) {
       authStatus.authenticated = true;
       authStatus.token = new AuthTokenInfo(accessToken);
@@ -133,9 +134,10 @@ export class AuthInterceptor implements HttpInterceptor {
           if (this.isAuthRequest(error)) {
             // clean eventually refresh Requests list
             this.refreshTokenRequestUrls = [];
+            const location = error.headers.get('Location');// this  line added while shibboleth dev
             // Create a new HttpResponse and return it, so it can be handle properly by AuthService.
             const authResponse = new HttpResponse({
-              body: this.makeAuthStatusObject(false, null, error.error),
+              body: this.makeAuthStatusObject(false, null, error.error, location),
               headers: error.headers,
               status: error.status,
               statusText: error.statusText,

src/app/core/auth/auth.service.ts

@@ -22,6 +22,8 @@ import { ResetAuthenticationMessagesAction, SetRedirectUrlAction } from './auth.
 import {NativeWindowRef, NativeWindowService} from '../../shared/services/window.service';
 import {Base64EncodeUrl} from '../../shared/utils/encode-decode.util';
 import {RemoteDataBuildService} from '../cache/builders/remote-data-build.service';
+import {GlobalConfig} from '../../../config/global-config.interface';
+import {GLOBAL_CONFIG} from '../../../config';
 
 export const LOGIN_ROUTE = '/login';
 export const LOGOUT_ROUTE = '/logout';
@@ -40,7 +42,9 @@ export class AuthService {
    */
   protected _authenticated: boolean;
 
-  constructor(@Inject(REQUEST) protected req: any,
+  constructor(
+    @Inject(GLOBAL_CONFIG) public config: GlobalConfig,
+    @Inject(REQUEST) protected req: any,
     @Inject(NativeWindowService) protected _window: NativeWindowRef,
     protected authRequestService: AuthRequestService,
     @Optional() @Inject(RESPONSE) private response: any,
@@ -193,6 +197,36 @@ export class AuthService {
     this.store.dispatch(new ResetAuthenticationMessagesAction());
   }
 
+  /**
+   * Retrieve authentication methods available
+   * @returns {User}
+   */
+  public retrieveAuthMethods(): Observable<string> {
+    return this.authRequestService.getRequest('login').pipe(
+      map((status: AuthStatus) => {
+        let url = '';
+        if (isNotEmpty(status.ssoLoginUrl)) {
+          url = this.parseSSOLocation(status.ssoLoginUrl);
+        }
+        return url;
+      })
+    )
+  }
+
+  private parseSSOLocation(url: string): string {
+    const parseUrl = decodeURIComponent(url);
+    // const urlTree: UrlTree = this.router.parseUrl(url);
+    // this.router.parseUrl(url);
+    // if (url.endsWith('/')) {
+    //   url += 'login';
+    // } else {
+    //   url = url.replace('/?target=http(.+)/g', 'https://hasselt-dspace.dev01.4science.it/dspace-spring-rest/shib.html');
+    // }
+    // console.log(url);
+    const target = `?target=${this.config.auth.target.host}${this.config.auth.target.page}`;
+    return parseUrl.replace(/\?target=http.+/g, target);
+  }
+
   /**
    * Create a new user
    * @returns {User}

src/config/global-config.interface.ts

@@ -9,12 +9,14 @@ import {LangConfig} from './lang-config.interface';
 import { BrowseByConfig } from './browse-by-config.interface';
 import { ItemPageConfig } from './item-page-config.interface';
 import { Theme } from './theme.inferface';
+import {AuthConfig} from './auth-config.interfaces';
 
 export interface GlobalConfig extends Config {
   ui: ServerConfig;
   rest: ServerConfig;
   production: boolean;
   cache: CacheConfig;
+  auth: AuthConfig;
   form: FormConfig;
   notifications: INotificationBoardOptions;
   submission: SubmissionConfig;