From 0d5f11dfc118e51e8a2c23b4a2c2b053a3a7ef3d Mon Sep 17 00:00:00 2001 From: Lebeau Elise Date: Wed, 19 Jan 2022 14:16:38 +0000 Subject: [PATCH] user details, Add/remove permissions --- src/app/app-routing.module.ts | 28 ++++++--- src/app/app.module.ts | 6 +- .../group-details.component.html | 4 +- .../permission-editor.component.html | 14 ----- .../permission-editor.component.ts | 55 +++++----------- .../role-permissions.component.html | 16 +++++ .../role-permissions.component.scss | 0 .../role-permissions.component.spec.ts | 25 ++++++++ .../role-permissions.component.ts | 56 +++++++++++++++++ .../user-detail/user-detail.component.html | 50 +++++++++++---- .../user-detail/user-detail.component.scss | 9 --- .../user-detail/user-detail.component.ts | 19 +++--- .../user-permissions.component.html | 16 +++++ .../user-permissions.component.scss | 0 .../user-permissions.component.spec.ts | 25 ++++++++ .../user-permissions.component.ts | 62 +++++++++++++++++++ .../resolvers/user-detail.resolver.spec.ts | 16 +++++ src/app/resolvers/user-detail.resolver.ts | 36 +++++++++++ .../resolvers/user-groups.resolver.spec.ts | 16 +++++ src/app/resolvers/user-groups.resolver.ts | 36 +++++++++++ .../user-permissions.resolver.spec.ts | 16 +++++ .../resolvers/user-permissions.resolver.ts | 36 +++++++++++ src/app/services/user.service.ts | 14 ++++- 23 files changed, 458 insertions(+), 97 deletions(-) create mode 100644 src/app/components/role-management/role-detail/role-permissions/role-permissions.component.html create mode 100644 src/app/components/role-management/role-detail/role-permissions/role-permissions.component.scss create mode 100644 src/app/components/role-management/role-detail/role-permissions/role-permissions.component.spec.ts create mode 100644 src/app/components/role-management/role-detail/role-permissions/role-permissions.component.ts create mode 100644 src/app/components/user-management/user-detail/user-permissions/user-permissions.component.html create mode 100644 src/app/components/user-management/user-detail/user-permissions/user-permissions.component.scss create mode 100644 src/app/components/user-management/user-detail/user-permissions/user-permissions.component.spec.ts create mode 100644 src/app/components/user-management/user-detail/user-permissions/user-permissions.component.ts create mode 100644 src/app/resolvers/user-detail.resolver.spec.ts create mode 100644 src/app/resolvers/user-detail.resolver.ts create mode 100644 src/app/resolvers/user-groups.resolver.spec.ts create mode 100644 src/app/resolvers/user-groups.resolver.ts create mode 100644 src/app/resolvers/user-permissions.resolver.spec.ts create mode 100644 src/app/resolvers/user-permissions.resolver.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index b852cc6b..6ea67ee9 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -64,11 +64,15 @@ import {ManagementComponent} from "@components/management/management.component"; import {RoleManagementComponent} from "@components/role-management/role-management.component"; import {RoleDetailComponent} from "@components/role-management/role-detail/role-detail.component"; import {RoleDetailResolver} from "@resolvers/role-detail.resolver"; -import {PermissionEditorComponent} from "@components/role-management/role-detail/permission-editor/permission-editor.component"; import {PermissionResolver} from "@resolvers/permission.resolver"; -import {PermissionsManagementComponent} from "@components/permissions-management/permissions-management.component"; import {GroupResolver} from "@resolvers/group.resolver"; import {GroupRoleResolver} from "@resolvers/group-role.resolver"; +import {PermissionsManagementComponent} from "@components/permissions-management/permissions-management.component"; +import {UserDetailResolver} from "@resolvers/user-detail.resolver"; +import {UserGroupsResolver} from "@resolvers/user-groups.resolver"; +import {UserPermissionsResolver} from "@resolvers/user-permissions.resolver"; +import {RolePermissionsComponent} from "@components/role-management/role-detail/role-permissions/role-permissions.component"; +import {UserPermissionsComponent} from "@components/user-management/user-detail/user-permissions/user-permissions.component"; const routes: Routes = [ { @@ -93,7 +97,11 @@ const routes: Routes = [ path: 'server/:server_id/management/users/:user_id', component: UserDetailComponent, canActivate: [LoginGuard], - resolve: {server: ServerResolve}, + resolve: { + user: UserDetailResolver, + groups: UserGroupsResolver, + permissions: UserPermissionsResolver, + server: ServerResolve}, }, {path: 'installed-software', component: InstalledSoftwareComponent}, {path: 'server/:server_id/systemstatus', component: SystemStatusComponent, canActivate: [LoginGuard]}, @@ -266,7 +274,7 @@ const routes: Routes = [ }, { path: 'server/:server_id/management/roles/:role_id/permissions', - component: PermissionEditorComponent, + component: RolePermissionsComponent, resolve: { role: RoleDetailResolver, server: ServerResolve, @@ -274,10 +282,14 @@ const routes: Routes = [ } }, { - path: 'server/:server_id/permission_management', - component: PermissionsManagementComponent, - canActivate: [LoginGuard], - resolve: { server: ServerResolve }, + path: 'server/:server_id/management/users/:user_id/permissions', + component: UserPermissionsComponent, + resolve: { + user: UserDetailResolver, + userPermissions: UserPermissionsResolver, + server: ServerResolve, + permissions: PermissionResolver + } } ], }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 4a8a6c31..6c4f19b9 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -300,6 +300,8 @@ import { PermissionEditorValidateDialogComponent } from './components/role-manag import { PermissionsManagementComponent } from './components/permissions-management/permissions-management.component'; import { PermissionEditLineComponent } from '@components/permissions-management/permission-edit-line/permission-edit-line.component'; import {MatSlideToggleModule} from '@angular/material/slide-toggle'; +import { RolePermissionsComponent } from './components/role-management/role-detail/role-permissions/role-permissions.component'; +import { UserPermissionsComponent } from './components/user-management/user-detail/user-permissions/user-permissions.component'; import {MatAutocompleteModule} from "@angular/material/autocomplete"; import {PathAutoCompleteComponent} from './components/permissions-management/add-permission-line/path-auto-complete/path-auto-complete.component'; import {FilterCompletePipe} from './components/permissions-management/add-permission-line/path-auto-complete/filter-complete.pipe'; @@ -528,7 +530,9 @@ import {MatFormFieldModule} from "@angular/material/form-field"; ActionButtonComponent, DeletePermissionDialogComponent, PathAutoCompleteComponent, - FilterCompletePipe + FilterCompletePipe, + RolePermissionsComponent, + UserPermissionsComponent ], imports: [ BrowserModule, diff --git a/src/app/components/group-details/group-details.component.html b/src/app/components/group-details/group-details.component.html index 472d92e6..c8dfd913 100644 --- a/src/app/components/group-details/group-details.component.html +++ b/src/app/components/group-details/group-details.component.html @@ -3,10 +3,10 @@
- keyboard_arrow_left + keyboard_arrow_left

Groups {{group.name}} details

diff --git a/src/app/components/role-management/role-detail/permission-editor/permission-editor.component.html b/src/app/components/role-management/role-detail/permission-editor/permission-editor.component.html index ecda97df..74499215 100644 --- a/src/app/components/role-management/role-detail/permission-editor/permission-editor.component.html +++ b/src/app/components/role-management/role-detail/permission-editor/permission-editor.component.html @@ -1,18 +1,4 @@
-
-
- - keyboard_arrow_left - -
-
- Edit {{role.name}} role permissions -
-
Allow: diff --git a/src/app/components/role-management/role-detail/permission-editor/permission-editor.component.ts b/src/app/components/role-management/role-detail/permission-editor/permission-editor.component.ts index f5f0b45a..e4fcdfd9 100644 --- a/src/app/components/role-management/role-detail/permission-editor/permission-editor.component.ts +++ b/src/app/components/role-management/role-detail/permission-editor/permission-editor.component.ts @@ -10,16 +10,13 @@ * * Author: Sylvain MATHIEU, Elise LEBEAU */ -import {Component, OnInit} from '@angular/core'; -import {ActivatedRoute, Router} from "@angular/router"; +import {Component, Inject, Input, OnInit, Output} from '@angular/core'; import {Role} from "@models/api/role"; import {Server} from "@models/server"; import {Permission} from "@models/api/permission"; import {MatDialog} from "@angular/material/dialog"; import {PermissionEditorValidateDialogComponent} from "@components/role-management/role-detail/permission-editor/permission-editor-validate-dialog/permission-editor-validate-dialog.component"; -import {forkJoin, Observable} from "rxjs"; -import {RoleService} from "@services/role.service"; -import {ToasterService} from "@services/toaster.service"; +import { EventEmitter } from '@angular/core'; @Component({ selector: 'app-permission-editor', @@ -28,25 +25,18 @@ import {ToasterService} from "@services/toaster.service"; }) export class PermissionEditorComponent implements OnInit { server: Server; - role: Role; - private permissions: Permission[]; owned: Set; available: Set; - constructor(private route: ActivatedRoute, - private dialog: MatDialog, - private toastService: ToasterService, - private router: Router, - private roleService: RoleService) { - this.route.data.subscribe((data: { server: Server, role: Role, permissions: Permission[] }) => { - this.server = data.server; - this.role = data.role; - this.permissions = data.permissions; - this.reset(); - }); - } + @Input() ownedPermissions: Permission[]; + @Input() availablePermissions: Permission[]; + @Output() updatedPermissions: EventEmitter = new EventEmitter(); + + + constructor(private dialog: MatDialog) {} ngOnInit(): void { + this.reset(); } add(permission: Permission) { @@ -60,9 +50,9 @@ export class PermissionEditorComponent implements OnInit { } reset() { - const ownedPermissionId = this.role.permissions.map(p => p.permission_id); - this.owned = new Set(this.role.permissions); - this.available = new Set(this.permissions.filter(p => !ownedPermissionId.includes(p.permission_id))); + const ownedPermissionId = this.ownedPermissions.map(p => p.permission_id); + this.owned = new Set(this.ownedPermissions); + this.available = new Set(this.availablePermissions.filter(p => !ownedPermissionId.includes(p.permission_id))); } update() { @@ -73,22 +63,7 @@ export class PermissionEditorComponent implements OnInit { .afterClosed() .subscribe((confirmed: boolean) => { if (confirmed) { - const obs: Observable[] = []; - add.forEach((permission: Permission) => { - obs.push(this.roleService.addPermission(this.server, this.role, permission)); - }); - remove.forEach((permission: Permission) => { - obs.push(this.roleService.removePermission(this.server, this.role, permission)); - }); - - forkJoin(obs) - .subscribe(() => { - this.toastService.success(`permissions updated`); - this.router.navigate(['/server', this.server.id, 'management', 'roles', this.role.role_id]); - }, - (error) => { - this.toastService.error(error); - }); + this.updatedPermissions.emit({add, remove}); } }); @@ -97,7 +72,7 @@ export class PermissionEditorComponent implements OnInit { private diff() { const add: Permission[] = []; - const currentRolePermissionId = this.role.permissions.map(p => p.permission_id); + const currentRolePermissionId = this.ownedPermissions.map(p => p.permission_id); this.owned.forEach((permission: Permission) => { if (!currentRolePermissionId.includes(permission.permission_id)) { add.push(permission); @@ -105,7 +80,7 @@ export class PermissionEditorComponent implements OnInit { }); const remove: Permission[] = []; - this.role.permissions.forEach((permission: Permission) => { + this.ownedPermissions.forEach((permission: Permission) => { if (!this.owned.has(permission)) { remove.push(permission); } diff --git a/src/app/components/role-management/role-detail/role-permissions/role-permissions.component.html b/src/app/components/role-management/role-detail/role-permissions/role-permissions.component.html new file mode 100644 index 00000000..2305135e --- /dev/null +++ b/src/app/components/role-management/role-detail/role-permissions/role-permissions.component.html @@ -0,0 +1,16 @@ +
+ +
+ Edit {{role.name}} role permissions +
+
+ diff --git a/src/app/components/role-management/role-detail/role-permissions/role-permissions.component.scss b/src/app/components/role-management/role-detail/role-permissions/role-permissions.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/app/components/role-management/role-detail/role-permissions/role-permissions.component.spec.ts b/src/app/components/role-management/role-detail/role-permissions/role-permissions.component.spec.ts new file mode 100644 index 00000000..13048bd7 --- /dev/null +++ b/src/app/components/role-management/role-detail/role-permissions/role-permissions.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { RolePermissionsComponent } from './role-permissions.component'; + +describe('RolePermissionsComponent', () => { + let component: RolePermissionsComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ RolePermissionsComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(RolePermissionsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/components/role-management/role-detail/role-permissions/role-permissions.component.ts b/src/app/components/role-management/role-detail/role-permissions/role-permissions.component.ts new file mode 100644 index 00000000..0f335e3e --- /dev/null +++ b/src/app/components/role-management/role-detail/role-permissions/role-permissions.component.ts @@ -0,0 +1,56 @@ +import { Component, OnInit } from '@angular/core'; +import {ActivatedRoute, Router} from "@angular/router"; +import {MatDialog} from "@angular/material/dialog"; +import {ToasterService} from "@services/toaster.service"; +import {RoleService} from "@services/role.service"; +import {Server} from "@models/server"; +import {Role} from "@models/api/role"; +import {Permission} from "@models/api/permission"; +import {Observable} from "rxjs/Rx"; +import {forkJoin} from "rxjs"; + +@Component({ + selector: 'app-role-permissions', + templateUrl: './role-permissions.component.html', + styleUrls: ['./role-permissions.component.scss'] +}) +export class RolePermissionsComponent implements OnInit { + server: Server; + role: Role; + permissions: Permission[]; + + constructor(private route: ActivatedRoute, + private dialog: MatDialog, + private toastService: ToasterService, + private router: Router, + private roleService: RoleService) { + this.route.data.subscribe((data: { server: Server, role: Role, permissions: Permission[] }) => { + this.server = data.server; + this.role = data.role; + this.permissions = data.permissions; + }); + } + + ngOnInit(): void { + } + + updatePermissions(toUpdate) { + const {add, remove} = toUpdate; + const obs: Observable[] = []; + add.forEach((permission: Permission) => { + obs.push(this.roleService.addPermission(this.server, this.role, permission)); + }); + remove.forEach((permission: Permission) => { + obs.push(this.roleService.removePermission(this.server, this.role, permission)); + }); + + forkJoin(obs) + .subscribe(() => { + this.toastService.success(`permissions updated`); + this.router.navigate(['/server', this.server.id, 'management', 'roles', this.role.role_id]); + }, + (error) => { + this.toastService.error(error); + }); + } +} diff --git a/src/app/components/user-management/user-detail/user-detail.component.html b/src/app/components/user-management/user-detail/user-detail.component.html index 742c8836..51c89b97 100644 --- a/src/app/components/user-management/user-detail/user-detail.component.html +++ b/src/app/components/user-management/user-detail/user-detail.component.html @@ -12,9 +12,9 @@
-
-

Update user

-
+ + +
@@ -54,6 +54,9 @@ Is active +
+ Is Superadmin +
+
+
Creation date: {{user.created_at}}
+
Last update Date: {{user.updated_at}}
+
Last login: {{user.last_login}}
+
UUID: {{user.user_id}}
+
-
+ + +
+ +
+ + +
+ +
+ + + + -
-
Groups
- -
diff --git a/src/app/components/user-management/user-detail/user-detail.component.scss b/src/app/components/user-management/user-detail/user-detail.component.scss index a1d07ca9..a64b61ba 100644 --- a/src/app/components/user-management/user-detail/user-detail.component.scss +++ b/src/app/components/user-management/user-detail/user-detail.component.scss @@ -5,12 +5,3 @@ .button-div { float: right; } - -.user-edit , -.user-groups { - flex: 1; -} - -.default-content { - display: flex; -} diff --git a/src/app/components/user-management/user-detail/user-detail.component.ts b/src/app/components/user-management/user-detail/user-detail.component.ts index 9e206946..7f85b041 100644 --- a/src/app/components/user-management/user-detail/user-detail.component.ts +++ b/src/app/components/user-management/user-detail/user-detail.component.ts @@ -8,6 +8,8 @@ import {Server} from "@models/server"; import {userNameAsyncValidator} from "@components/user-management/add-user-dialog/userNameAsyncValidator"; import {userEmailAsyncValidator} from "@components/user-management/add-user-dialog/userEmailAsyncValidator"; import {ActivatedRoute, Router} from "@angular/router"; +import {Permission} from "@models/api/permission"; +import {Role} from "@models/api/role"; @Component({ selector: 'app-user-detail', @@ -21,6 +23,7 @@ export class UserDetailComponent implements OnInit { user: User; server: Server; user_id: string; + permissions: Permission[]; constructor(public userService: UserService, private toasterService: ToasterService, @@ -33,16 +36,14 @@ export class UserDetailComponent implements OnInit { this.server = this.route.snapshot.data['server']; if (!this.server) this.router.navigate(['/servers']); - this.user_id = this.route.snapshot.paramMap.get('user_id'); - this.userService.get(this.server, this.user_id).subscribe((user: User) => { - console.log(user) - this.user = user; - this.userService.getGroupsByUserId(this.server, this.user.user_id).subscribe( - (groups: Group[]) => { - this.groups = groups; - }); + this.route.data.subscribe((d: { server: Server; user: User, groups: Group[], permissions: Permission[]}) => { + this.user = d.user; + this.user_id = this.user.user_id; + this.groups = d.groups; + this.permissions = d.permissions; this.initForm(); - }) + }); + } initForm() { diff --git a/src/app/components/user-management/user-detail/user-permissions/user-permissions.component.html b/src/app/components/user-management/user-detail/user-permissions/user-permissions.component.html new file mode 100644 index 00000000..70cc860a --- /dev/null +++ b/src/app/components/user-management/user-detail/user-permissions/user-permissions.component.html @@ -0,0 +1,16 @@ +
+
+ + keyboard_arrow_left + +
+
+ Edit {{user.username}} role permissions +
+
+ diff --git a/src/app/components/user-management/user-detail/user-permissions/user-permissions.component.scss b/src/app/components/user-management/user-detail/user-permissions/user-permissions.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/app/components/user-management/user-detail/user-permissions/user-permissions.component.spec.ts b/src/app/components/user-management/user-detail/user-permissions/user-permissions.component.spec.ts new file mode 100644 index 00000000..09a078d8 --- /dev/null +++ b/src/app/components/user-management/user-detail/user-permissions/user-permissions.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { UserPermissionsComponent } from './user-permissions.component'; + +describe('UserPermissionsComponent', () => { + let component: UserPermissionsComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ UserPermissionsComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(UserPermissionsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/components/user-management/user-detail/user-permissions/user-permissions.component.ts b/src/app/components/user-management/user-detail/user-permissions/user-permissions.component.ts new file mode 100644 index 00000000..f717bd6a --- /dev/null +++ b/src/app/components/user-management/user-detail/user-permissions/user-permissions.component.ts @@ -0,0 +1,62 @@ +import { Component, OnInit } from '@angular/core'; +import {Server} from "@models/server"; +import {Role} from "@models/api/role"; +import {Permission} from "@models/api/permission"; +import {ActivatedRoute, Router} from "@angular/router"; +import {MatDialog} from "@angular/material/dialog"; +import {ToasterService} from "@services/toaster.service"; +import {RoleService} from "@services/role.service"; +import {forkJoin} from "rxjs"; +import {Observable} from "rxjs/Rx"; +import {UserService} from "@services/user.service"; +import {User} from "@models/users/user"; + +@Component({ + selector: 'app-user-permissions', + templateUrl: './user-permissions.component.html', + styleUrls: ['./user-permissions.component.scss'] +}) +export class UserPermissionsComponent implements OnInit { + + server: Server; + user: User; + userPermissions: Permission[]; + permissions: Permission[]; + + constructor(private route: ActivatedRoute, + private dialog: MatDialog, + private toastService: ToasterService, + private router: Router, + private userService: UserService) { + this.route.data.subscribe((data: { server: Server, user: User, userPermissions: Permission[], permissions: Permission[] }) => { + this.server = data.server; + this.user = data.user; + this.userPermissions = data.userPermissions; + this.permissions = data.permissions; + }); + } + + ngOnInit(): void { + } + + updatePermissions(toUpdate) { + const {add, remove} = toUpdate; + const obs: Observable[] = []; + add.forEach((permission: Permission) => { + obs.push(this.userService.addPermission(this.server, this.user.user_id, permission)); + }); + remove.forEach((permission: Permission) => { + obs.push(this.userService.removePermission(this.server, this.user.user_id, permission)); + }); + + forkJoin(obs) + .subscribe(() => { + this.toastService.success(`permissions updated`); + this.router.navigate(['/server', this.server.id, 'management', 'users', this.user.user_id]); + }, + (error) => { + this.toastService.error(error); + }); + } + +} diff --git a/src/app/resolvers/user-detail.resolver.spec.ts b/src/app/resolvers/user-detail.resolver.spec.ts new file mode 100644 index 00000000..752c4c05 --- /dev/null +++ b/src/app/resolvers/user-detail.resolver.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { UserDetailResolver } from './user-detail.resolver'; + +describe('UserDetailResolver', () => { + let resolver: UserDetailResolver; + + beforeEach(() => { + TestBed.configureTestingModule({}); + resolver = TestBed.inject(UserDetailResolver); + }); + + it('should be created', () => { + expect(resolver).toBeTruthy(); + }); +}); diff --git a/src/app/resolvers/user-detail.resolver.ts b/src/app/resolvers/user-detail.resolver.ts new file mode 100644 index 00000000..e464c28b --- /dev/null +++ b/src/app/resolvers/user-detail.resolver.ts @@ -0,0 +1,36 @@ +import { Injectable } from '@angular/core'; +import { + Router, Resolve, + RouterStateSnapshot, + ActivatedRouteSnapshot +} from '@angular/router'; +import {Observable, of, Subscriber} from 'rxjs'; +import {ServerService} from "@services/server.service"; +import {UserService} from "@services/user.service"; +import {User} from "@models/users/user"; +import {Server} from "@models/server"; + +@Injectable({ + providedIn: 'root' +}) +export class UserDetailResolver implements Resolve { + + constructor(private serverService: ServerService, + private userService: UserService) { + } + + resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { + return new Observable((subscriber: Subscriber) => { + + const serverId = route.paramMap.get('server_id'); + const userId = route.paramMap.get('user_id'); + + this.serverService.get(+serverId).then((server: Server) => { + this.userService.get(server, userId).subscribe((user: User) => { + subscriber.next(user); + subscriber.complete(); + }); + }); + }); + } +} diff --git a/src/app/resolvers/user-groups.resolver.spec.ts b/src/app/resolvers/user-groups.resolver.spec.ts new file mode 100644 index 00000000..0a3d7140 --- /dev/null +++ b/src/app/resolvers/user-groups.resolver.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { UserGroupsResolver } from './user-groups.resolver'; + +describe('UserGroupsResolver', () => { + let resolver: UserGroupsResolver; + + beforeEach(() => { + TestBed.configureTestingModule({}); + resolver = TestBed.inject(UserGroupsResolver); + }); + + it('should be created', () => { + expect(resolver).toBeTruthy(); + }); +}); diff --git a/src/app/resolvers/user-groups.resolver.ts b/src/app/resolvers/user-groups.resolver.ts new file mode 100644 index 00000000..2aa66dcb --- /dev/null +++ b/src/app/resolvers/user-groups.resolver.ts @@ -0,0 +1,36 @@ +import { Injectable } from '@angular/core'; +import { + Router, Resolve, + RouterStateSnapshot, + ActivatedRouteSnapshot +} from '@angular/router'; +import {Observable, of, Subscriber} from 'rxjs'; +import {Group} from "../models/groups/group"; +import {User} from "../models/users/user"; +import {Server} from "../models/server"; +import {ServerService} from "../services/server.service"; +import {UserService} from "../services/user.service"; + +@Injectable({ + providedIn: 'root' +}) +export class UserGroupsResolver implements Resolve { + constructor(private serverService: ServerService, + private userService: UserService) { + } + + resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { + return new Observable((subscriber: Subscriber) => { + + const serverId = route.paramMap.get('server_id'); + const userId = route.paramMap.get('user_id'); + + this.serverService.get(+serverId).then((server: Server) => { + this.userService.getGroupsByUserId(server, userId).subscribe((groups: Group[]) => { + subscriber.next(groups); + subscriber.complete(); + }); + }); + }); + } +} diff --git a/src/app/resolvers/user-permissions.resolver.spec.ts b/src/app/resolvers/user-permissions.resolver.spec.ts new file mode 100644 index 00000000..41856573 --- /dev/null +++ b/src/app/resolvers/user-permissions.resolver.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { UserPermissionsResolver } from './user-permissions.resolver'; + +describe('UserPermissionsResolver', () => { + let resolver: UserPermissionsResolver; + + beforeEach(() => { + TestBed.configureTestingModule({}); + resolver = TestBed.inject(UserPermissionsResolver); + }); + + it('should be created', () => { + expect(resolver).toBeTruthy(); + }); +}); diff --git a/src/app/resolvers/user-permissions.resolver.ts b/src/app/resolvers/user-permissions.resolver.ts new file mode 100644 index 00000000..4626af4b --- /dev/null +++ b/src/app/resolvers/user-permissions.resolver.ts @@ -0,0 +1,36 @@ +import { Injectable } from '@angular/core'; +import { + Router, Resolve, + RouterStateSnapshot, + ActivatedRouteSnapshot +} from '@angular/router'; +import {Observable, of, Subscriber} from 'rxjs'; +import {ServerService} from "../services/server.service"; +import {UserService} from "../services/user.service"; +import {Server} from "../models/server"; +import {Permission} from "../models/api/permission"; + +@Injectable({ + providedIn: 'root' +}) +export class UserPermissionsResolver implements Resolve { + + constructor(private serverService: ServerService, + private userService: UserService) { + } + + resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { + return new Observable((subscriber: Subscriber) => { + + const serverId = route.paramMap.get('server_id'); + const userId = route.paramMap.get('user_id'); + + this.serverService.get(+serverId).then((server: Server) => { + this.userService.getPermissionsByUserId(server, userId).subscribe((permissions: Permission[]) => { + subscriber.next(permissions); + subscriber.complete(); + }); + }); + }); + } +} diff --git a/src/app/services/user.service.ts b/src/app/services/user.service.ts index e0540d59..f367f238 100644 --- a/src/app/services/user.service.ts +++ b/src/app/services/user.service.ts @@ -3,8 +3,8 @@ import {Observable, Subject} from 'rxjs'; import { Server } from '../models/server'; import { HttpServer } from './http-server.service'; import { User } from '../models/users/user'; -import {Project} from "@models/project"; import {Group} from "@models/groups/group"; +import {Permission} from "@models/api/permission"; @Injectable() export class UserService { @@ -39,4 +39,16 @@ export class UserService { getGroupsByUserId(server: Server, user_id: string) { return this.httpServer.get(server, `/users/${user_id}/groups`); } + + getPermissionsByUserId(server: Server, user_id: string) { + return this.httpServer.get(server, `/users/${user_id}/permissions`); + } + + addPermission(server: Server, user_id: string, permission: Permission) { + return this.httpServer.put(server, `/users/${user_id}/permissions/${permission.permission_id}`, {}); + } + + removePermission(server: Server, user_id: string, permission: Permission) { + return this.httpServer.delete(server, `/users/${ user_id}/permissions/${permission.permission_id}`); + } }