Role rework #638
Open
Role rework #638
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
that check privileges
Untested so far
dynamically obtained from the serr
got user creation/editing to use configured roles
diagnostic logs
added a method to auth.service to allow checking a set of privileges (any that match yields a true response)
privs) are invisible
iaromoskviak
requested changes
Jan 27, 2026
src/app/core/admin/user-management/user-edit-dialog/user-edit-dialog.component.ts
Outdated
Show resolved
Hide resolved
src/app/core/admin/user-management/user-edit-dialog/user-edit-dialog.component.ts
Outdated
Show resolved
Hide resolved
| console.log(' has priv to configure system'); | ||
| return true; | ||
| } else { | ||
| this.router.parseUrl('/home'); |
Collaborator
There was a problem hiding this comment.
Suggested change
| this.router.parseUrl('/home'); | |
| return this.router.parseUrl('/home'); |
| console.log('user CAN'); | ||
| return true; | ||
| } else { | ||
| this.router.parseUrl('/home'); |
Collaborator
There was a problem hiding this comment.
Suggested change
| this.router.parseUrl('/home'); | |
| return this.router.parseUrl('/home'); |
| <a class = "mat-icon-button" aria-label = "edit substance" mat-icon-button [routerLink]="['/substances', substance.uuid, 'edit']" *ngIf="isAdmin" | ||
| matTooltip='edit record'> | ||
| <a class = "mat-icon-button" aria-label = "edit substance" mat-icon-button [routerLink]="['/substances', substance.uuid, 'edit']" | ||
| *ngIf="canImportData" matTooltip='edit record'> |
Collaborator
There was a problem hiding this comment.
Suggested change
| *ngIf="canImportData" matTooltip='edit record'> | |
| *ngIf="canUserImportData" matTooltip='edit record'> |
| console.log(`in admin.component ngOnInit`); | ||
| await this.checkPrivileges(); | ||
|
|
||
| this.activatedRoute.params.subscribe(routeParams => { |
Collaborator
There was a problem hiding this comment.
Should we unsubscribe here?
src/app/core/auth/auth.service.ts
Outdated
| const privs = await firstValueFrom(this.fetchPrivs()); | ||
| return privs.some(p => p.privilege === 'Edit'); | ||
| } | ||
| return this._privileges != null && this._privileges.some(p=>p.privilege=="Edit"); |
Collaborator
There was a problem hiding this comment.
Suggested change
| return this._privileges != null && this._privileges.some(p=>p.privilege=="Edit"); | |
| return this._privileges != null && this._privileges.some(p=>p.privilege=="Edit"); | |
| const auth = this.authService.getAuth(); | ||
| if (auth) { | ||
| console.log(` got auth `); | ||
| const canImporNow = await this.authService.hasSpecificPrivilege("Import Data"); |
Collaborator
There was a problem hiding this comment.
Suggested change
| const canImporNow = await this.authService.hasSpecificPrivilege("Import Data"); | |
| const canImportNow = await this.authService.hasSpecificPrivilege("Import Data"); |
| response: any; | ||
| isError: boolean = false; | ||
| availableRoleNames: string[]; | ||
| assignableRoles: any[]; |
Collaborator
There was a problem hiding this comment.
type safety imporvement e.g.
interface AssignableRole {
roleName: string;
assigned: boolean;
}
assignableRoles: AssignableRole[];
Also, removed a duplicate from config.json
iaromoskviak
requested changes
Jan 28, 2026
|
|
||
| default: this.activeTab = 0; break; | ||
| } | ||
| this.subscriptions.push(routeSub); |
Collaborator
There was a problem hiding this comment.
You're pushing subscription inside subscribe callback.That's wrong
| if( this.activeTab <= -1) { | ||
| this.router.navigate(['/home' ] ); | ||
| } | ||
| }); |
Collaborator
There was a problem hiding this comment.
it should be after callback here.
this.subscriptions.push(routeSub);
When you fix that you can simplify ngOnDestroy back to:
ngOnDestroy() {
this.subscriptions.forEach(sub => sub?.unsubscribe());
}
And test it.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ready to merge now