Merged in task/dspace-cris-2024_02_x/DSC-2485 (pull request DSpace#3509)

DSC-2485 Fixed issue with login not working as expected (backdoor and external login broken)

Approved-by: Francesco Molinaro

Author: Mattia Vianelli

src/app/app-routes.ts

@@ -187,15 +187,14 @@ export const APP_ROUTES: Route[] = [
         data: {
           isBackDoor: true,
         },
-        canMatch: [() => environment.auth.disableStandardLogin],
+        canMatch: [() => !environment.auth.disableStandardLogin],
       },
       {
         path: 'login',
         loadChildren: () => import('./login-page/login-page-routes').then((m) => m.ROUTES),
         data: {
           isBackDoor: false,
         },
-        canMatch: [() => !environment.auth.disableStandardLogin],
       },
       {
         path: 'logout',

src/app/shared/log-in/log-in.component.spec.ts

@@ -138,7 +138,7 @@ describe('LogInComponent', () => {
 
     it('should render a log-in container component for each auth method available', () => {
       const loginContainers = fixture.debugElement.queryAll(By.css('ds-log-in-container'));
-      expect(loginContainers.length).toBe(2);
+      expect(loginContainers.length).toBe(1);
 
     });
 
@@ -154,14 +154,15 @@ describe('LogInComponent', () => {
       expect(result).toEqual([{ authMethodType: AuthMethodType.Password, position: 1 }]);
     });
 
-    it('excludes password method when standard login is disabled', () => {
+    it('does not exclude password method when standard login is disabled', () => {
       const authMethods = [
         { authMethodType: AuthMethodType.Password, position: 1 },
         { authMethodType: AuthMethodType.Shibboleth, position: 2 },
       ];
       component.excludedAuthMethod = undefined;
       const result = component.filterAndSortAuthMethods(authMethods, false, true);
       expect(result).toEqual([
+        { authMethodType: AuthMethodType.Password, position: 1 },
         { authMethodType: AuthMethodType.Shibboleth, position: 2 },
       ]);
     });
@@ -176,7 +177,6 @@ describe('LogInComponent', () => {
       component.excludedAuthMethod = AuthMethodType.Ip;
       const result = component.filterAndSortAuthMethods(authMethods, isBackdoor);
       expect(result).toEqual([
-        { authMethodType: AuthMethodType.Password, position: 1 },
         { authMethodType: AuthMethodType.Shibboleth, position: 3 },
       ]);
     });
@@ -191,7 +191,6 @@ describe('LogInComponent', () => {
       const result = component.filterAndSortAuthMethods(authMethods, isBackdoor);
       expect(result).toEqual([
         { authMethodType: AuthMethodType.Shibboleth, position: 1 },
-        { authMethodType: AuthMethodType.Password, position: 2 },
       ]);
     });
   });

src/app/shared/log-in/log-in.component.ts

@@ -167,7 +167,7 @@ export class LogInComponent implements OnInit, OnDestroy {
         if (isBackdoor) {
           return authM.authMethodType === AuthMethodType.Password;
         }
-        if (isStandardLoginDisabled) {
+        if (!isStandardLoginDisabled) {
           return authM.authMethodType !== AuthMethodType.Password;
         }
         return true;

src/config/default-app-config.ts

@@ -147,7 +147,7 @@ export class DefaultAppConfig implements AppConfig {
       // This is independent from the idle warning.
       timeLeftBeforeTokenRefresh: 2 * 60 * 1000, // 2 minutes
     },
-    disableStandardLogin: false, // Enable the standard login form
+    disableStandardLogin: true, // Enable the standard login form
   };
 
   // Form settings