[CST-15074][DSpace#3355] PR review

Author: vins01-4science

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

@@ -8,28 +8,21 @@ import {
   tap,
 } from 'rxjs/operators';
 
-import {
-  isNotEmpty,
-  isNotEmptyOperator,
-} from '../../shared/empty.util';
+import { isNotEmpty } from '../../shared/empty.util';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RemoteData } from '../data/remote-data';
 import {
-  DeleteRequest,
   GetRequest,
   PostRequest,
 } from '../data/request.models';
 import { RequestService } from '../data/request.service';
 import { RestRequest } from '../data/rest-request.model';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { NoContent } from '../shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../shared/operators';
-import { sendRequest } from '../shared/request.operators';
 import { URLCombiner } from '../url-combiner/url-combiner';
 import { AuthStatus } from './models/auth-status.model';
-import { MachineToken } from './models/machine-token.model';
 import { ShortLivedToken } from './models/short-lived-token.model';
 
 /**
@@ -38,7 +31,6 @@ import { ShortLivedToken } from './models/short-lived-token.model';
 export abstract class AuthRequestService {
   protected linkName = 'authn';
   protected shortlivedtokensEndpoint = 'shortlivedtokens';
-  protected machinetokenEndpoint = 'machinetokens';
 
   constructor(protected halService: HALEndpointService,
               protected requestService: RequestService,
@@ -148,31 +140,4 @@ export abstract class AuthRequestService {
     );
   }
 
-  /**
-   * Send a post request to create a machine token
-   */
-  public postToMachineTokenEndpoint(): Observable<RemoteData<MachineToken>> {
-    return this.halService.getEndpoint(this.linkName).pipe(
-      isNotEmptyOperator(),
-      distinctUntilChanged(),
-      map((href: string) => new URLCombiner(href, this.machinetokenEndpoint).toString()),
-      map((endpointURL: string) => new PostRequest(this.requestService.generateRequestId(), endpointURL)),
-      tap((request: RestRequest) => this.requestService.send(request)),
-      switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID<MachineToken>(request.uuid)),
-    );
-  }
-
-  /**
-   * Send a delete request to destroy a machine token
-   */
-  public deleteToMachineTokenEndpoint(): Observable<RemoteData<NoContent>> {
-    return this.halService.getEndpoint(this.linkName).pipe(
-      isNotEmptyOperator(),
-      distinctUntilChanged(),
-      map((href: string) => new URLCombiner(href, this.machinetokenEndpoint).toString()),
-      map((endpointURL: string) => new DeleteRequest(this.requestService.generateRequestId(), endpointURL)),
-      sendRequest(this.requestService),
-      switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID<MachineToken>(request.uuid)),
-    );
-  }
 }

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

@@ -57,7 +57,6 @@ import {
   NativeWindowRef,
   NativeWindowService,
 } from '../services/window.service';
-import { NoContent } from '../shared/NoContent.model';
 import {
   getAllSucceededRemoteDataPayload,
   getFirstCompletedRemoteData,
@@ -80,7 +79,6 @@ import {
   AuthTokenInfo,
   TOKENITEM,
 } from './models/auth-token-info.model';
-import { MachineToken } from './models/machine-token.model';
 import {
   getAuthenticatedUserId,
   getAuthenticationToken,
@@ -692,18 +690,4 @@ export class AuthService {
     }
   }
 
-  /**
-   * Create a new machine token for the current user
-   */
-  public createMachineToken(): Observable<RemoteData<MachineToken>> {
-    return this.authRequestService.postToMachineTokenEndpoint();
-  }
-
-  /**
-   * Delete the machine token for the current user
-   */
-  public deleteMachineToken(): Observable<RemoteData<NoContent>> {
-    return this.authRequestService.deleteToMachineTokenEndpoint();
-  }
-
 }

src/app/core/auth/models/machine-token.model.ts

@@ -10,6 +10,7 @@ <h4 class="mb-3">
       formControlName="email"
       placeholder="profile.email@example.com"
       class="form-control form-control-lg position-relative"
+      [attr.aria-label]="'external-login.confirmation.email-label' | translate"
     />
     <div
       *ngIf="

src/app/core/auth/models/machine-token.resource-type.ts

@@ -9,6 +9,7 @@ <h4 class="mb-3">
       id="email"
       formControlName="email"
       class="form-control form-control-lg position-relative"
+      [attr.aria-label]="'external-login.confirmation.email' | translate"
     />
 
     <div

src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.html

@@ -18,7 +18,7 @@ <h4>{{ 'external-login.confirmation.header' | translate}}</h4>
     </ng-template>
   </div>
   <div class="col-1 align-items-center d-flex justify-content-center">
-    <h4 class="mt-2">or</h4>
+    <h4 class="mt-2">{{ 'external-login.component.or' | translate }}</h4>
   </div>
   <div class="col-4 align-items-center d-flex justify-content-start">
     <button class="btn block btn-lg btn-primary" (click)="openLoginModal(loginModal)">

src/app/external-log-in/email-confirmation/provide-email/provide-email.component.html

@@ -18,7 +18,11 @@ import { EpersonRegistrationService } from '../../core/data/eperson-registration
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { Registration } from '../../core/shared/registration.model';
 import { RouterMock } from '../../shared/mocks/router.mock';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import {
+  createFailedRemoteDataObject$,
+  createNoContentRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
 import { registrationTokenGuard } from './registration-token-guard';
 
 describe('RegistrationTokenGuard',
@@ -98,4 +102,32 @@ describe('RegistrationTokenGuard',
         expect(output).toBeFalse();
       }));
     });
+
+    describe('when invalid token provided', () => {
+      it('can activate must navigate through 404 when no content received', fakeAsync(() => {
+        epersonRegistrationService.searchByTokenAndHandleError.and.returnValue(createNoContentRemoteDataObject$());
+        let activatedRoute = TestBed.inject(ActivatedRoute);
+        activatedRoute.snapshot.params.token = 'invalid-token';
+
+        const result$ = TestBed.runInInjectionContext(() => {
+          return registrationTokenGuard(activatedRoute.snapshot, {} as RouterStateSnapshot) as Observable<boolean>;
+        });
+
+        result$.subscribe((_) => { });
+        expect(route.navigate).toHaveBeenCalledWith(['/404']);
+      }));
+      it('can activate must navigate through 404 when no failed response received', fakeAsync(() => {
+        epersonRegistrationService.searchByTokenAndHandleError.and.returnValue(createFailedRemoteDataObject$('invalid token', 404));
+        let activatedRoute = TestBed.inject(ActivatedRoute);
+        activatedRoute.snapshot.params.token = 'error-invalid-token';
+
+        const result$ = TestBed.runInInjectionContext(() => {
+          return registrationTokenGuard(activatedRoute.snapshot, {} as RouterStateSnapshot) as Observable<boolean>;
+        });
+
+        result$.subscribe((_) => { });
+        expect(route.navigate).toHaveBeenCalledWith(['/404']);
+      }));
+    });
+
   });

src/app/external-log-in/external-log-in/external-log-in.component.html

@@ -1,31 +1,31 @@
 <form class="form-login"
       [formGroup]="form" novalidate>
   <label class="font-weight-bold mb-0 text-uppercase">{{ registrationData.registrationType }}</label>
-  <input [attr.aria-label]="'netId' | translate"
+  <input [attr.aria-label]="'external-login-page.orcid-confirmation.netid.label' | translate"
          autocomplete="off"
          autofocus
          class="form-control form-control-lg position-relative mb-2"
          formControlName="netId"
-         placeholder="xxxx-xxxx-xxxx-xxxx"
+         [placeholder]="'external-login-page.orcid-confirmation.netid.placeholder' | translate"
          type="text"
          [attr.data-test]="'netId' | dsBrowserOnly">
-  <label class="font-weight-bold mb-0">{{"Last name" | translate}}</label>
-  <input [attr.aria-label]="'Last name' | translate"
+  <label class="font-weight-bold mb-0">{{"external-login-page.orcid-confirmation.lastname" | translate}}</label>
+  <input [attr.aria-label]="'external-login-page.orcid-confirmation.lastname.label' | translate"
          autocomplete="off"
          class="form-control form-control-lg position-relative mb-2"
          formControlName="lastname"
          type="text"
          [attr.data-test]="'lastname' | dsBrowserOnly">
-  <label class="font-weight-bold mb-0">{{"First name" | translate}}</label>
-  <input [attr.aria-label]="'First name' | translate"
+  <label class="font-weight-bold mb-0">{{"external-login-page.orcid-confirmation.firstname" | translate}}</label>
+  <input [attr.aria-label]="'external-login-page.orcid-confirmation.firstname.label' | translate"
         autocomplete="off"
         class="form-control form-control-lg position-relative mb-2"
         formControlName="firstname"
         type="text"
         [attr.data-test]="'firstname' | dsBrowserOnly">
   <ng-container *ngIf="registrationData?.email">
-    <label class="font-weight-bold mb-0">{{"Email" | translate}}</label>
-    <input [attr.aria-label]="'Email' | translate"
+    <label class="font-weight-bold mb-0">{{"external-login-page.orcid-confirmation.email" | translate}}</label>
+    <input [attr.aria-label]="'external-login-page.orcid-confirmation.email.label' | translate"
           autocomplete="off"
           class="form-control form-control-lg position-relative"
           formControlName="email"

src/app/external-log-in/guards/registration-token.guard.spec.ts

@@ -23,7 +23,7 @@ <h2> {{'external-login-validation.review-account-info.header' | translate}}</h2>
         <td>{{ registrationData.netId }}</td>
         <td>
           <span>
-            {{ notApplicableText }}
+            {{ 'external-login-validation.review-account-info.table.row.not-applicable' }}
           </span>
         </td>
         <td></td>