[ECOMMONS-1645] Hopefully repair the shibb login buttons

cul-it · Jan 12, 2024 · edebdb5 · edebdb5
1 parent e72b08c
commit edebdb5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/src/app/login-page/login-page.component.html b/src/app/login-page/login-page.component.html
@@ -3,8 +3,8 @@
     <div>
       <img class="mb-4 login-logo" src="assets/images/dspace-logo.png" alt="{{'repository.image.logo' | translate}}">
       <h1 class="h3 mb-0 font-weight-normal">Use the button below to log in to eCommons with your Cornell NetID.</h1>
-      <ds-log-in
-      [isStandalonePage]="true"></ds-log-in>
+      <ds-themed-log-in
+              [isStandalonePage]="true"></ds-themed-log-in>
     </div>
   </div>
 </div>
diff --git a/src/app/login-page/login-page.component.ts b/src/app/login-page/login-page.component.ts
@@ -48,8 +48,8 @@ export class LoginPageComponent implements OnDestroy, OnInit {
     const queryParamsObs = this.route.queryParams;
     const authenticated = this.store.select(isAuthenticated);
     this.sub = observableCombineLatest(queryParamsObs, authenticated).pipe(
-      filter(([params, auth]) => isNotEmpty(params.token) || isNotEmpty(params.expired)),
-      take(1)
+        filter(([params, auth]) => isNotEmpty(params.token) || isNotEmpty(params.expired)),
+        take(1)
     ).subscribe(([params, auth]) => {
       const token = params.token;
       let authToken: AuthTokenInfo;
@@ -79,4 +79,4 @@ export class LoginPageComponent implements OnDestroy, OnInit {
     // Clear all authentication messages when leaving login page
     this.store.dispatch(new ResetAuthenticationMessagesAction());
   }
-}
+}
diff --git a/src/app/shared/log-in/log-in.component.html b/src/app/shared/log-in/log-in.component.html
@@ -1,8 +1,7 @@
 <ds-themed-loading *ngIf="(loading | async) || (isAuthenticated | async)" class="m-5"></ds-themed-loading>
 <div *ngIf="!(loading | async) && !(isAuthenticated | async)" class="px-4 py-3 mx-auto login-container">
-  <ng-container *ngFor="let authMethod of (authMethods); let i = index">
-    <div *ngIf="i === 1" class="text-center mt-2">
-    </div>
+  <ng-container *ngFor="let authMethod of (authMethods | async); let last = last">
     <ds-log-in-container [authMethod]="authMethod" [isStandalonePage]="isStandalonePage"></ds-log-in-container>
+    <div *ngIf="!last" class="dropdown-divider my-2"></div>
   </ng-container>
-</div>
+</div>