Skip to content

Bugfix/10.2/359 unhandled login error #364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 25, 2024
Merged

Bugfix/10.2/359 unhandled login error #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43f5a1f
Fixed Unhandled login error (#359)
mjabascal10 Jan 23, 2024
d4ad0f7
Fixed User management module allows an action that causes UTMStack ha…
mjabascal10 Jan 24, 2024
eed542a
Merge branch 'main' of https://github.com/utmstack/UTMStack into bugf…
mjabascal10 Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion frontend/src/app/admin/user/user-update/user-management-update.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/app/shared/components/auth/login/login.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
8 changes: 6 additions & 2 deletions frontend/src/app/shared/components/auth/login/login.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -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;
Expand Down Expand Up @@ -171,11 +172,14 @@ 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(){
startInternalNavigation() {
this.router.navigate(['/dashboard/overview']);
}

Expand Down