Marmelator/common-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RED-7874 - Integrate "user has no roles" message in sign-in page

Browse Source
This commit is contained in:
Valentin Mihai 2024-02-20 14:54:23 +02:00
parent 124ecee0bf
commit a37287f13c
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/tenants/tenant-select/tenant-select.component.html
View File

@ -8,8 +8,8 @@
<iqser-spacer [height]="100"></iqser-spacer> <iqser-spacer [height]="100"></iqser-spacer>
<ng-container *ngIf="isLoggedOut"> <ng-container *ngIf="isLoggedOut || noRoleLogOut">
<div class="heading-xl" translate="tenant-resolve.header.youre-logged-out"></div> <div class="heading-xl" [translate]="isLoggedOut ? translations.IS_LOGGED_OUT : translations.NO_ROLE_LOG_OUT"></div>
<iqser-spacer [height]="75"></iqser-spacer> <iqser-spacer [height]="75"></iqser-spacer>
</ng-container> </ng-container>

3
src/lib/tenants/tenant-select/tenant-select.component.ts
View File

@ -9,6 +9,7 @@ import { getKeycloakOptions } from '../keycloak-initializer';
import { IStoredTenantId, TenantsService } from '../services'; import { IStoredTenantId, TenantsService } from '../services';
import { KeycloakStatusService } from '../services/keycloak-status.service'; import { KeycloakStatusService } from '../services/keycloak-status.service';
import { UI_ROOT } from '../../utils'; import { UI_ROOT } from '../../utils';
import { selectTenantTranslations } from '../../../../../../apps/red-ui/src/app/translations/select-tenant-translations';
@Component({ @Component({
templateUrl: './tenant-select.component.html', templateUrl: './tenant-select.component.html',
@ -17,6 +18,7 @@ import { UI_ROOT } from '../../utils';
}) })
export class TenantSelectComponent { export class TenantSelectComponent {
@Input() isLoggedOut = false; @Input() isLoggedOut = false;
@Input() noRoleLogOut = false;
protected readonly logger = inject(NGXLogger); protected readonly logger = inject(NGXLogger);
protected readonly tenantsService = inject(TenantsService); protected readonly tenantsService = inject(TenantsService);
protected storedTenants: IStoredTenantId[] = []; protected storedTenants: IStoredTenantId[] = [];
@ -29,6 +31,7 @@ export class TenantSelectComponent {
// eslint-disable-next-line @typescript-eslint/unbound-method // eslint-disable-next-line @typescript-eslint/unbound-method
tenantId: ['', Validators.required], tenantId: ['', Validators.required],
}); });
protected readonly translations = selectTenantTranslations;
readonly #uiRoot = inject(UI_ROOT); readonly #uiRoot = inject(UI_ROOT);
constructor() { constructor() {

6
src/lib/users/guards/roles.guard.ts
View File

@ -17,11 +17,11 @@ export function doesNotHaveAnyRole(): AsyncGuard {
export function hasAnyRole(): AsyncGuard { export function hasAnyRole(): AsyncGuard {
return async () => { return async () => {
const router = inject(Router); const userService = inject(IqserUserService);
const user = await inject(IqserUserService).loadCurrentUser(); const user = await userService.loadCurrentUser();
if (!user?.hasAnyRole) { if (!user?.hasAnyRole) {
await router.navigate(['auth-error']); await userService.logout(true);
return false; return false;
} }
return true; return true;

5
src/lib/users/services/iqser-user.service.ts
View File

@ -58,11 +58,12 @@ export abstract class IqserUserService<
await firstValueFrom(this.loadAll()); await firstValueFrom(this.loadAll());
} }
async logout() { async logout(noRoleLogOut = false) {
try { try {
await this._keycloakService.loadUserProfile(true); await this._keycloakService.loadUserProfile(true);
await this._cacheApiService.wipeCaches(); await this._cacheApiService.wipeCaches();
const redirectUri = window.location.origin + this.#uiRoot + '/?isLoggedOut=true'; const logoutParam = noRoleLogOut ? 'noRoleLogOut' : 'isLoggedOut';
const redirectUri = window.location.origin + this.#uiRoot + `/?${logoutParam}=true`;
await this._keycloakService.logout(redirectUri); await this._keycloakService.logout(redirectUri);
} catch (e) { } catch (e) {
console.log('Logout failed: ', e); console.log('Logout failed: ', e);