Skip to content

made hasRoles work again #655

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
ChemMitch merged 1 commit into from
Feb 19, 2026
Merged

made hasRoles work again #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion src/app/core/auth/auth.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,6 @@ export interface Privilege {
privilege: string;
}

export type Role = 'Updater'|'Admin'|'Query'|'SuperUpdate'|'DataEntry'|'SuperDataEntry'|'Approver';
export type Role ={
role: string;
}
22 changes: 11 additions & 11 deletions src/app/core/auth/auth.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,14 +156,14 @@ get auth(): Auth {
}
}

hasRoles(...roles: Array<Role | string>): boolean {
hasRoles(...roles: Array<string>): boolean {
const rolesList = [...roles];

const checkableRoles = this._auth.roles.map((x: Role) => x.role.toUpperCase());

if (this._auth && this._auth.roles && rolesList && rolesList.length) {
for (const r of rolesList) {
let role = r.charAt(0).toLowerCase() + r.slice(1);
role = role.charAt(0).toUpperCase() + role.slice(1);
if (this._auth.roles.indexOf(role as Role) === -1) {
let role = r.toUpperCase();
if (checkableRoles.indexOf(role) === -1) {
return false;
}
}
Expand Down Expand Up @@ -193,7 +193,7 @@ get auth(): Auth {
return true;
}

hasRolesAsync(...roles: Array<Role | string>): Observable<boolean> {
hasRolesAsync(...roles: Array< string>): Observable<boolean> {
return new Observable(observer => {
if (this.auth != null) {
observer.next(this.hasRoles(...roles));
Expand All @@ -207,13 +207,13 @@ get auth(): Auth {
});
}

hasAnyRoles(...roles: Array<Role | string>): boolean {
hasAnyRoles(...roles: Array<string>): boolean {
const rolesList = [...roles];
const checkableRoles = this._auth.roles.map((x: Role) => x.role.toUpperCase());
if (this._auth && this._auth.roles && rolesList && rolesList.length) {
for (const r of rolesList) {
let role = r.charAt(0).toLowerCase() + r.slice(1);
role = role.charAt(0).toUpperCase() + role.slice(1);
if (this._auth.roles.indexOf(role as Role) > -1) {
let role = r.toUpperCase();
if (checkableRoles.indexOf(role) === -1) {
return true;
}
}
Expand Down Expand Up @@ -248,7 +248,7 @@ get auth(): Auth {
return this._privileges != null && this._privileges.some(p=>p.privilege==requestedPrivilege);
}

hasAnyRolesAsync(...roles: Array<Role | string>): Observable<boolean> {
hasAnyRolesAsync(...roles: Array<string>): Observable<boolean> {
return new Observable(observer => {
if (this.auth != null) {
observer.next(this.hasAnyRoles(...roles));
Expand Down
Loading