Manage SystemManagers

api/src/model/entitites/sso.user.entity.ts

@@ -6,7 +6,7 @@ export class SSOUser {
   @PrimaryColumn({ type: 'uuid', unique: true })
   externalId: string;
 
-  @OneToOne(() => User, (user) => user.external)
+  @OneToOne(() => User, (user) => user.external, { onDelete: 'CASCADE'})
   @JoinColumn()
   user: User;
 

api/src/model/entitites/user.entity.ts

@@ -2,6 +2,7 @@ import { Exclude, Transform } from 'class-transformer';
 import {
   Column,
   CreateDateColumn,
+  DeleteDateColumn,
   Entity,
   JoinColumn,
   ManyToMany,
@@ -21,7 +22,7 @@ export class User implements IUser {
   id: string;
 
   @IsEmail()
-  @Column({ unique: true })
+  @Column({ unique: false })
   username: string;
 
   @Column({ name: 'first_name', default: '' })
@@ -37,13 +38,13 @@ export class User implements IUser {
   lastLogin: Date;
 
   @Exclude()
-  @OneToOne(() => SSOUser, (sso) => sso.user, { eager: true, cascade: true })
+  @OneToOne(() => SSOUser, (sso) => sso.user, { eager: true, cascade: true, onDelete: 'CASCADE' })
   external: SSOUser;
 
   @Column({ default: true })
   isActive: boolean;
 
-  @ManyToOne(() => Role, (role) => role.user, { cascade: true, eager: true })
+  @ManyToOne(() => Role, (role) => role.user, { eager: true, onDelete: 'NO ACTION' })
   @JoinColumn()
   @Transform(({ value }) => value.name)
   role: Role;
@@ -51,6 +52,9 @@ export class User implements IUser {
   @ManyToMany(() => KeySystem, (system) => system.managers)
   systems: KeySystem[];
 
+  @DeleteDateColumn()
+  deletedAt: Date;
+
   accessToken?: string;
   refreshToken?: string;
 }

api/src/model/interface/user.interface.ts

@@ -10,5 +10,7 @@ export interface IUser {
   accessToken?: string;
   refreshToken?: string;
 
+  deletedAt?: Date;
+
   role?: string | Role;
 }

api/src/model/repositories/user.repository.ts

@@ -61,4 +61,16 @@ export class UserRepository extends Repository<User> {
     const sso = await this.ssoRepo.findByExternalId(externalId);
     return user == null && sso == null;
   }
+
+  async deleteUserById(id: string) {
+    const user = await this.findOne({ 
+      where: { id },
+      relations: ['external']
+     });
+
+    if (user.external) {
+      await this.ssoRepo.remove(user.external);
+    }
+    return this.softRemove(user)
+  }
 }

api/src/modules/system/system.controller.ts

@@ -52,4 +52,9 @@ export class SystemController {
   remove(@Param('id') id: string) {
     return this.systemService.remove(id);
   }
+
+  @Post(':id/manager')
+  manaManager(@Param('id') id: string, @Body() body: any){
+    return this.systemService.manageManagers(id, body);
+  }
 }

api/src/modules/system/system.service.ts

@@ -1,12 +1,12 @@
 import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
 import { CreateSystemDto } from './dto/create-system.dto';
 import { UpdateSystemDto } from './dto/update-system.dto';
-import { KeySystemRepository } from 'src/model/repositories';
+import { KeySystemRepository, UserRepository } from 'src/model/repositories';
 import { User } from 'src/model/entitites';
 
 @Injectable()
 export class SystemService {
-  constructor(private systemRepo: KeySystemRepository) {}
+  constructor(private systemRepo: KeySystemRepository, private userRepo: UserRepository) {}
 
   async create(user: User, createSystemDto: CreateSystemDto) {
     const sys = this.systemRepo.create(createSystemDto);
@@ -52,4 +52,36 @@ export class SystemService {
 
     return system.managers;
   }
+
+  async manageManagers(systemID: string, manageObject: { email: string, action: 'add' | 'remove'}) {
+    const sys = await this.systemRepo.findOne({
+      where: { id: systemID },
+      relations: ['managers']
+    });
+
+    if (!sys) {
+      throw new HttpException('Das System wurde nicht im System gefunden', HttpStatus.NOT_FOUND);
+    }
+
+    if (manageObject.action == 'remove') {
+      sys.managers = sys.managers.filter( m => m.username != manageObject.email);
+
+      await this.systemRepo.save(sys);
+      return sys.managers;
+    }
+
+    if (sys.managers.some(m => m.username == manageObject.email)) {
+      return sys.managers;
+    }
+
+    const user = await this.userRepo.findOneBy({ username: manageObject.email.trim() });
+    if (!user) {
+      throw new HttpException('Es wurde kein User mit dieser Emailadresse gefunden. Bitte prüfe die Emailadresse und versuche es erneut.', HttpStatus.NOT_FOUND);
+    }
+
+    sys.managers.push(user);
+    await this.systemRepo.save(sys);
+    return sys.managers;
+
+  }
 }

api/src/modules/user/user.controller.ts

@@ -1,8 +1,11 @@
-import { Body, Controller, Get, Post, UseGuards } from '@nestjs/common';
+import { Body, Controller, Delete, Get, HttpException, HttpStatus, Param, Post, Req, UseGuards } from '@nestjs/common';
 import { AuthGuard } from 'src/core/guards/auth.guard';
 import { UserService } from './user.service';
 import { User } from 'src/model/entitites';
 import { IUser } from 'src/model/interface';
+import { AuthenticatedRequest } from 'src/model/interface/authenticated-request.interface';
+import { HttpErrorByCode } from '@nestjs/common/utils/http-error-by-code.util';
+import { HttpStatusCode } from 'axios';
 
 @UseGuards(AuthGuard)
 @Controller('user')
@@ -18,4 +21,12 @@ export class UserController {
   saveUser(@Body() user: IUser) {
     return this.userService.saveUser(user);
   }
+
+  @Delete(':id')
+  deleteUserWithId(@Req() req: AuthenticatedRequest, @Param('id') id: string) {
+    if (req.user.role.name != "admin") {
+      throw new HttpException('no admin', HttpStatus.UNAUTHORIZED);
+    }
+    return this.userService.deleteUserById(id);
+  }
 }

api/src/modules/user/user.service.ts

@@ -23,4 +23,9 @@ export class UserService {
     }
     return this.userRepo.save(user as any);
   }
+
+  async deleteUserById(id: string) {
+    return this.userRepo.deleteUserById(id);
+  }
+
 }