From 917783e34b29f725e13ab7eef3e154d2f8c61e6d Mon Sep 17 00:00:00 2001
From: Julius Gruber <julius.gruber@tuwien.ac.at>
Date: Thu, 5 Sep 2019 08:00:54 +0200
Subject: [PATCH] Branch change commit

---
 src/app/core/auth/auth.effects.ts                          | 2 ++
 src/app/core/auth/auth.service.ts                          | 4 ++--
 .../methods/shibboleth/dynamic-shibboleth.component.html   | 7 +++++--
 .../methods/shibboleth/dynamic-shibboleth.component.ts     | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts
index 0bb173edfb..8665ef2e08 100644
--- a/src/app/core/auth/auth.effects.ts
+++ b/src/app/core/auth/auth.effects.ts
@@ -62,6 +62,7 @@ export class AuthEffects {
    * Authenticate user.
    * @method authenticate
    */
+/*
   @Effect()
   public shibbolethAuthenticate$: Observable<Action> = this.actions$.pipe(
     ofType(AuthActionTypes.START_SHIBBOLETH_AUTHENTICATION),
@@ -73,6 +74,7 @@ export class AuthEffects {
       );
     })
   );
+*/
 
   /**
    * Shib Login.
diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts
index 1dc32f25ac..6c725e3a05 100644
--- a/src/app/core/auth/auth.service.ts
+++ b/src/app/core/auth/auth.service.ts
@@ -118,14 +118,14 @@ export class AuthService {
   shibbolethAuthenticate(location: string) {
     // implement a call to the backend here
     console.log('location: ', location);
-    return this.authRequestService.postToEndpoint('login').pipe(
+    /*return this.authRequestService.postToEndpoint('login').pipe(
       map((status: AuthStatus) => {
         if (status.authenticated) {
           return status;
         } else {
           throw(new Error('Shibboleth login failed'));
         }
-      }))
+      }))*/
   }
 
   public startShibbAuth():  Observable<AuthStatus> {
diff --git a/src/app/shared/log-in/methods/shibboleth/dynamic-shibboleth.component.html b/src/app/shared/log-in/methods/shibboleth/dynamic-shibboleth.component.html
index da1aa1f2b4..5010291891 100644
--- a/src/app/shared/log-in/methods/shibboleth/dynamic-shibboleth.component.html
+++ b/src/app/shared/log-in/methods/shibboleth/dynamic-shibboleth.component.html
@@ -1,7 +1,10 @@
-<form *ngIf="!(loading | async) && !(isAuthenticated | async)"class="form-login px-4 py-3" (ngSubmit)="submit()"
+<form *ngIf="!(loading | async) && !(isAuthenticated | async)" class="form-login px-4 py-3" (ngSubmit)="submit()"
       [formGroup]="shibbForm" novalidate>
   <button class="btn btn-lg btn-primary btn-block mt-3" type="submit"
-          [disabled]="!shibbForm.valid">{{"login.shibbForm.submit" | translate}}</button>
+          [disabled]="!shibbForm.valid"
+  >{{"login.shibbForm.submit" | translate}}</button>
+
+
 </form>
 
 
diff --git a/src/app/shared/log-in/methods/shibboleth/dynamic-shibboleth.component.ts b/src/app/shared/log-in/methods/shibboleth/dynamic-shibboleth.component.ts
index 491bb8b1b2..143d5a9729 100644
--- a/src/app/shared/log-in/methods/shibboleth/dynamic-shibboleth.component.ts
+++ b/src/app/shared/log-in/methods/shibboleth/dynamic-shibboleth.component.ts
@@ -8,6 +8,7 @@ import { CoreState } from '../../../../core/core.reducers';
 import { StartShibbolethAuthenticationAction } from '../../../../core/auth/auth.actions';
 import { Observable } from 'rxjs';
 import { isAuthenticated, isAuthenticationLoading } from '../../../../core/auth/selectors';
+import { HttpClient } from '@angular/common/http';
 
 @Component({
   selector: 'ds-dynamic-shibboleth',
@@ -30,7 +31,7 @@ export class DynamicShibbolethComponent implements OnInit {
    * Whether user is authenticated.
    * @type {Observable<string>}
    */
-  public isAuthenticated: Observable<boolean> ;
+  public isAuthenticated: Observable<boolean>;
 
   /**
    * The authentication form.
@@ -45,7 +46,6 @@ export class DynamicShibbolethComponent implements OnInit {
               private formBuilder: FormBuilder,
               private store: Store<CoreState>) {
     this.authMethodModel = injectedAuthMethodModel;
-    // this.buttonHref = ('https://fis.tiss.tuwien.ac.at' + this.authMethodModel.location + '/shibboleth')
   }
 
   ngOnInit(): void {