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

Task/dspace cris 2023 02 x/DSC-2485

Approved-by: Francesco Molinaro

Author: Mattia Vianelli

src/app/app-routing.module.ts

@@ -184,15 +184,14 @@ import {
             data: {
               isBackDoor: true,
             },
-            canMatch: [() => environment.auth.disableStandardLogin],
+            canMatch: [() => !environment.auth.disableStandardLogin],
           },
           {
             path: 'login',
             loadChildren: () => import('./login-page/login-page.module').then((m) => m.LoginPageModule),
             data: {
               isBackDoor: false,
             },
-            canMatch: [() => !environment.auth.disableStandardLogin],
           },
           {
             path: 'external-login/:token',

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

@@ -127,7 +127,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);
 
     });
 
@@ -143,14 +143,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 },
       ]);
     });
@@ -165,8 +166,7 @@ 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 },
+        { authMethodType: AuthMethodType.Shibboleth, position: 3 }
       ]);
     });
 
@@ -179,8 +179,7 @@ describe('LogInComponent', () => {
       component.excludedAuthMethod = undefined;
       const result = component.filterAndSortAuthMethods(authMethods, isBackdoor);
       expect(result).toEqual([
-        { authMethodType: AuthMethodType.Shibboleth, position: 1 },
-        { authMethodType: AuthMethodType.Password, position: 2 },
+        { authMethodType: AuthMethodType.Shibboleth, position: 1 }
       ]);
     });
   });

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

@@ -132,7 +132,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

@@ -136,7 +136,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