From b41b3b3ad0e2a6d018e6dbf9b26a4de164b62387 Mon Sep 17 00:00:00 2001
From: Manuel Abascal <mjabascal10@gmail.com>
Date: Wed, 24 Jan 2024 18:38:37 +0200
Subject: [PATCH 1/3] Fixed User management module allows an action that causes
 UTMStack hanging when login. (#360)

---
 .../user-management-update.component.html          |  6 +++++-
 .../components/auth/login/login.component.html     |  3 ++-
 .../components/auth/login/login.component.ts       | 14 +++++++++++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/frontend/src/app/admin/user/user-update/user-management-update.component.html b/frontend/src/app/admin/user/user-update/user-management-update.component.html
index da2a77e4e..940c3cdd3 100644
--- a/frontend/src/app/admin/user/user-update/user-management-update.component.html
+++ b/frontend/src/app/admin/user/user-update/user-management-update.component.html
@@ -77,9 +77,13 @@
     </div>
     <div class="form-group">
       <label for="profile">Rol</label>
-      <select [(ngModel)]="user.authorities" class="form-control" id="profile" multiple name="authority">
+      <select [(ngModel)]="user.authorities" required class="form-control" id="profile" multiple name="authority">
         <option *ngFor="let authority of authorities" [value]="authority">{{authority}}</option>
       </select>
+      <small *ngIf="user.authorities && user.authorities.length === 0"
+             class="form-text text-danger">
+        This field is required. You must select a role.
+      </small>
     </div>
 
   </form>
diff --git a/frontend/src/app/shared/components/auth/login/login.component.html b/frontend/src/app/shared/components/auth/login/login.component.html
index dee7a5b42..495eaf75c 100644
--- a/frontend/src/app/shared/components/auth/login/login.component.html
+++ b/frontend/src/app/shared/components/auth/login/login.component.html
@@ -31,6 +31,7 @@
             <i class="icon-lock2 text-muted"></i>
           </div>
           <input [placeholder]="'login.password' | translate" class="form-control"
+                 [minlength]="'4'"
                  formControlName="password"
                  type="password">
         </div>
@@ -67,7 +68,7 @@
 </div>
 
 <!-- /content area -->
-<div *ngIf="logged" class="content d-flex justify-content-center align-items-center h-100 w-100">
+<div *appHasAnyAuthority="roles" class="content d-flex justify-content-center align-items-center h-100 w-100">
   <app-utm-spinner [height]="'35px'" [label]="'Loading modules...'" [loading]="true"
                    [width]="'35px'"></app-utm-spinner>
 </div>
diff --git a/frontend/src/app/shared/components/auth/login/login.component.ts b/frontend/src/app/shared/components/auth/login/login.component.ts
index de2829975..ecce7d487 100644
--- a/frontend/src/app/shared/components/auth/login/login.component.ts
+++ b/frontend/src/app/shared/components/auth/login/login.component.ts
@@ -10,7 +10,7 @@ import {LoginService} from '../../../../core/login/login.service';
 import {UtmToastService} from '../../../alert/utm-toast.service';
 import {MenuBehavior} from '../../../behaviors/menu.behavior';
 import {ThemeChangeBehavior} from '../../../behaviors/theme-change.behavior';
-import {ADMIN_DEFAULT_EMAIL, ADMIN_ROLE, DEMO_URL} from '../../../constants/global.constant';
+import {ADMIN_DEFAULT_EMAIL, ADMIN_ROLE, DEMO_URL, USER_ROLE} from '../../../constants/global.constant';
 import {stringParamToQueryParams} from '../../../util/query-params-to-filter.util';
 import {PasswordResetInitComponent} from '../password-reset/init/password-reset-init.component';
 
@@ -27,6 +27,7 @@ export class LoginComponent implements OnInit, AfterViewInit {
   credentials: any;
   formLogin: FormGroup;
   logged = false;
+  roles = [ADMIN_ROLE, USER_ROLE];
   startLogin = false;
   isInDemo: boolean;
   loadingAuth = true;
@@ -63,6 +64,10 @@ export class LoginComponent implements OnInit, AfterViewInit {
             this.loginService.loginWithToken(params.token, true).then(() => {
               this.checkLogin(params.url);
             });
+          } else if (params.key) {
+            this.loginService.loginWithKey(params.key, true).then(() => {
+              this.startInternalNavigation();
+            });
           } else {
             this.loadingAuth = false;
           }
@@ -167,8 +172,15 @@ export class LoginComponent implements OnInit, AfterViewInit {
           ? '/getting-started' : '/dashboard/overview';
         this.router.navigate([redirectTo])
           .then(() => this.spinner.hide());
+      } else {
+        this.logged = false;
+        this.utmToast.showError('Login error', 'User without privileges.');
       }
     });
   }
 
+  startInternalNavigation() {
+    this.router.navigate(['/dashboard/overview']);
+  }
+
 }

From 6ff404b2994a3a4569d996e23b1391fa4f306ab9 Mon Sep 17 00:00:00 2001
From: Manuel Abascal <mjabascal10@gmail.com>
Date: Fri, 26 Jan 2024 17:37:55 +0200
Subject: [PATCH 2/3] Fixed Unhandled-login-error (#359)

---
 .../src/app/shared/components/auth/login/login.component.ts   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/frontend/src/app/shared/components/auth/login/login.component.ts b/frontend/src/app/shared/components/auth/login/login.component.ts
index ecce7d487..c3da79e82 100644
--- a/frontend/src/app/shared/components/auth/login/login.component.ts
+++ b/frontend/src/app/shared/components/auth/login/login.component.ts
@@ -64,10 +64,6 @@ export class LoginComponent implements OnInit, AfterViewInit {
             this.loginService.loginWithToken(params.token, true).then(() => {
               this.checkLogin(params.url);
             });
-          } else if (params.key) {
-            this.loginService.loginWithKey(params.key, true).then(() => {
-              this.startInternalNavigation();
-            });
           } else {
             this.loadingAuth = false;
           }

From 66e9e34949d60b884ff3c58ad3c5bfb006b555e2 Mon Sep 17 00:00:00 2001
From: Manuel Abascal <mjabascal10@gmail.com>
Date: Fri, 26 Jan 2024 17:46:45 +0200
Subject: [PATCH 3/3] Fixed Unhandled-login-error (#359)

---
 .../src/app/shared/components/auth/login/login.component.ts  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/frontend/src/app/shared/components/auth/login/login.component.ts b/frontend/src/app/shared/components/auth/login/login.component.ts
index c3da79e82..754b90543 100644
--- a/frontend/src/app/shared/components/auth/login/login.component.ts
+++ b/frontend/src/app/shared/components/auth/login/login.component.ts
@@ -174,9 +174,4 @@ export class LoginComponent implements OnInit, AfterViewInit {
       }
     });
   }
-
-  startInternalNavigation() {
-    this.router.navigate(['/dashboard/overview']);
-  }
-
 }