lfk/backend
2
0
Fork 0
Code Issues 1 Pull Requests Actions Projects Releases 40 Activity

User deletion now also delete's the users permissons

Browse Source 
ref #6
This commit is contained in:
Nicolai Ort 2020-12-18 15:49:42 +01:00
parent d4293c164d
commit ff3a5b4545
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/controllers/UserController.ts
View File

@ -8,6 +8,7 @@ import { CreateUser } from '../models/actions/CreateUser';
import { User } from '../models/entities/User'; import { User } from '../models/entities/User';
import { ResponseEmpty } from '../models/responses/ResponseEmpty'; import { ResponseEmpty } from '../models/responses/ResponseEmpty';
import { ResponseUser } from '../models/responses/ResponseUser'; import { ResponseUser } from '../models/responses/ResponseUser';
import { PermissionController } from './PermissionController';
@JsonController('/users') @JsonController('/users')
@ -86,15 +87,16 @@ export class UserController {
@OnUndefined(204) @OnUndefined(204)
@OpenAPI({ description: 'Delete a specified runner (if it exists).' }) @OpenAPI({ description: 'Delete a specified runner (if it exists).' })
async remove(@Param("id") id: number, @QueryParam("force") force: boolean) { async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
let runner = await this.userRepository.findOne({ id: id }); let user = await this.userRepository.findOne({ id: id });
if (!runner) { return null; } if (!user) { return null; }
const responseUser = await this.userRepository.findOne(runner, { relations: ['permissions', 'groups'] }); const responseUser = await this.userRepository.findOne({ id: id }, { relations: ['permissions', 'groups'] });;
if (!runner) { const permissionControler = new PermissionController();
throw new UserNotFoundError(); for (let permission of responseUser.permissions) {
await permissionControler.remove(permission.id, true);
} }
await this.userRepository.delete(runner); await this.userRepository.delete(user);
return new ResponseUser(responseUser); return new ResponseUser(responseUser);
} }
} }

5
src/models/entities/Principal.ts
View File

@ -1,4 +1,4 @@
import { IsInt, IsOptional } from 'class-validator'; import { IsInt } from 'class-validator';
import { Entity, OneToMany, PrimaryGeneratedColumn, TableInheritance } from 'typeorm'; import { Entity, OneToMany, PrimaryGeneratedColumn, TableInheritance } from 'typeorm';
import { ResponsePrincipal } from '../responses/ResponsePrincipal'; import { ResponsePrincipal } from '../responses/ResponsePrincipal';
import { Permission } from './Permission'; import { Permission } from './Permission';
@ -19,9 +19,8 @@ export abstract class Principal {
/** /**
* permissions * permissions
*/ */
@IsOptional()
@OneToMany(() => Permission, permission => permission.principal, { nullable: true }) @OneToMany(() => Permission, permission => permission.principal, { nullable: true })
permissions?: Permission[]; permissions: Permission[];
public abstract toResponse(): ResponsePrincipal; public abstract toResponse(): ResponsePrincipal;
} }