[DURACOM-204][#2622] Makes forgot-password link removable

DSpace · Nov 10, 2023 · 91b4d3d · 91b4d3d
1 parent 684846a
commit 91b4d3d
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 12 deletions.
diff --git a/src/app/core/data/feature-authorization/feature-id.ts b/src/app/core/data/feature-authorization/feature-id.ts
@@ -34,4 +34,5 @@ export enum FeatureID {
   CanEditItem = 'canEditItem',
   CanRegisterDOI = 'canRegisterDOI',
   CanSubscribe = 'canSubscribeDso',
+  EPersonForgotPassword = 'epersonForgotPassword',
 }
diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.html b/src/app/shared/log-in/methods/password/log-in-password.component.html
@@ -29,11 +29,11 @@
           [disabled]="!form.valid"><i class="fas fa-sign-in-alt"></i> {{"login.form.submit" | translate}}</button>
 </form>
 
-<div class="mt-2">
-  <a class="dropdown-item" *ngIf="canRegister$ | async" [routerLink]="[getRegisterRoute()]" [attr.data-test]="'register' | dsBrowserOnly">
-    {{ 'login.form.new-user' | translate }}
-  </a>
-  <a class="dropdown-item" [routerLink]="[getForgotRoute()]" [attr.data-test]="'forgot' | dsBrowserOnly">
-    {{ 'login.form.forgot-password' | translate }}
-  </a>
-</div>
+<ng-container *ngIf="canShowDivider$ | async">
+  <div class="mt-2">
+    <a class="dropdown-item" *ngIf="canRegister$ | async" [routerLink]="[getRegisterRoute()]"
+       [attr.data-test]="'register' | dsBrowserOnly">{{"login.form.new-user" | translate}}</a>
+    <a class="dropdown-item" *ngIf="canForgot$ | async" [routerLink]="[getForgotRoute()]"
+       [attr.data-test]="'forgot' | dsBrowserOnly">{{"login.form.forgot-password" | translate}}</a>
+  </div>
+</ng-container>
diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.ts b/src/app/shared/log-in/methods/password/log-in-password.component.ts
@@ -1,9 +1,9 @@
-import { map } from 'rxjs/operators';
+import { combineLatest, Observable, shareReplay } from 'rxjs';
+import { filter, map } from 'rxjs/operators';
 import { Component, Inject, OnInit } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
 
 import { select, Store } from '@ngrx/store';
-import { Observable } from 'rxjs';
 import { AuthenticateAction, ResetAuthenticationMessagesAction } from '../../../../core/auth/auth.actions';
 
 import { getAuthenticationError, getAuthenticationInfo, } from '../../../../core/auth/selectors';
@@ -73,6 +73,17 @@ export class LogInPasswordComponent implements OnInit {
    */
   public canRegister$: Observable<boolean>;
 
+  /**
+   * Whether or not the current user (or anonymous) is authorized to register an account
+   */
+  canForgot$: Observable<boolean>;
+
+  /**
+   * Shows the divider only if contains at least one link to show
+   */
+  canShowDivider$: Observable<boolean>;
+
+
   constructor(
     @Inject('authMethodProvider') public injectedAuthMethodModel: AuthMethod,
     @Inject('isStandalonePage') public isStandalonePage: boolean,
@@ -114,8 +125,15 @@ export class LogInPasswordComponent implements OnInit {
         return message;
       })
     );
-
-    this.canRegister$ = this.authorizationService.isAuthorized(FeatureID.EPersonRegistration);
+
+    this.canRegister$ = this.authorizationService.isAuthorized(FeatureID.EPersonRegistration).pipe(shareReplay(1));
+    this.canForgot$ = this.authorizationService.isAuthorized(FeatureID.EPersonForgotPassword).pipe(shareReplay(1));
+    this.canShowDivider$ =
+        combineLatest([this.canRegister$, this.canForgot$])
+            .pipe(
+                map(([canRegister, canForgot]) => canRegister || canForgot),
+                filter(Boolean)
+            );
   }
 
   getRegisterRoute() {