src/controllers/UserGroupController.ts

@@ -8,7 +8,6 @@ import { UpdateUserGroup } from '../models/actions/update/UpdateUserGroup';
 import { UserGroup } from '../models/entities/UserGroup';
 import { ResponseEmpty } from '../models/responses/ResponseEmpty';
 import { ResponseUserGroup } from '../models/responses/ResponseUserGroup';
-import { ResponseUserGroupPermissions } from '../models/responses/ResponseUserGroupPermissions';
 import { PermissionController } from './PermissionController';
 
 
@@ -26,37 +25,20 @@ export class UserGroupController {
 
 	@Get()
 	@Authorized("USERGROUP:GET")
-	@ResponseSchema(ResponseUserGroup, { isArray: true })
+	@ResponseSchema(UserGroup, { isArray: true })
 	@OpenAPI({ description: 'Lists all groups. <br> The information provided might change while the project continues to evolve.' })
-	async getAll() {
+	getAll() {
-		let responseGroups: ResponseUserGroup[] = new Array<ResponseUserGroup>();
+		return this.userGroupsRepository.find({ relations: ["permissions"] });
-		const groups = await this.userGroupsRepository.find({ relations: ['permissions'] });
-		groups.forEach(group => {
-			responseGroups.push(group.toResponse());
-		});
-		return responseGroups;
 	}
 
 	@Get('/:id')
 	@Authorized("USERGROUP:GET")
-	@ResponseSchema(ResponseUserGroup)
+	@ResponseSchema(UserGroup)
 	@ResponseSchema(UserGroupNotFoundError, { statusCode: 404 })
 	@OnUndefined(UserGroupNotFoundError)
 	@OpenAPI({ description: 'Lists all information about the group whose id got provided. <br> The information provided might change while the project continues to evolve.' })
-	async getOne(@Param('id') id: number) {
+	getOne(@Param('id') id: number) {
-		return await (await (this.userGroupsRepository.findOne({ id: id }, { relations: ["permissions"] }))).toResponse();
+		return this.userGroupsRepository.findOne({ id: id }, { relations: ["permissions"] });
-	}
-
-	@Get('/:id/permissions')
-	@Authorized("USERGROUP:GET")
-	@ResponseSchema(ResponseUserGroupPermissions)
-	@ResponseSchema(UserGroupNotFoundError, { statusCode: 404 })
-	@OnUndefined(UserGroupNotFoundError)
-	@OpenAPI({ description: 'Lists all permissions granted to the group as permission response objects.' })
-	async getPermissions(@Param('id') id: number) {
-		let group = await this.userGroupsRepository.findOne({ id: id }, { relations: ['permissions', 'permissions.principal'] })
-		if (!group) { throw new UserGroupNotFoundError(); }
-		return new ResponseUserGroupPermissions(group);
 	}
 
 	@Post()
@@ -72,8 +54,7 @@ export class UserGroupController {
 			throw error;
 		}
 
-		userGroup = await this.userGroupsRepository.save(userGroup);
+		return this.userGroupsRepository.save(userGroup);
-		return (await (this.userGroupsRepository.findOne({ id: userGroup.id }, { relations: ["permissions"] }))).toResponse();
 	}
 
 	@Put('/:id')

src/models/responses/ResponseUserGroup.ts

@@ -2,6 +2,7 @@ import { IsArray, IsNotEmpty, IsOptional, IsString } from "class-validator";
 import { UserGroup } from '../entities/UserGroup';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
+import { ResponsePermission } from './ResponsePermission';
 import { ResponsePrincipal } from './ResponsePrincipal';
 
 /**
@@ -33,7 +34,7 @@ export class ResponseUserGroup extends ResponsePrincipal implements IResponse {
      */
     @IsArray()
     @IsOptional()
-    permissions: string[] = new Array<string>();
+    permissions: ResponsePermission[];
 
     /**
      * Creates a ResponseUserGroup object from a userGroup.
@@ -45,7 +46,7 @@ export class ResponseUserGroup extends ResponsePrincipal implements IResponse {
         this.description = group.description;
         if (group.permissions) {
             for (let permission of group.permissions) {
-                this.permissions.push(permission.toString());
+                this.permissions.push(permission.toResponse());
             }
         }
     }

src/models/responses/ResponseUserGroupPermissions.ts

@@ -1,43 +0,0 @@
-import {
-    IsArray,
-    IsOptional
-} from "class-validator";
-import { UserGroup } from '../entities/UserGroup';
-import { ResponseObjectType } from '../enums/ResponseObjectType';
-import { IResponse } from './IResponse';
-import { ResponsePermission } from './ResponsePermission';
-
-/**
- * Defines the group permission response (get /api/groups/:id/permissions).
-*/
-export class ResponseUserGroupPermissions implements IResponse {
-    /**
-    * The responseType.
-    * This contains the type of class/entity this response contains.
-    */
-    responseType: ResponseObjectType = ResponseObjectType.USERPERMISSIONS;
-
-    /**
-     * The permissions directly granted to the group.
-     */
-    @IsArray()
-    @IsOptional()
-    directlyGranted: ResponsePermission[] = new Array<ResponsePermission>();
-
-    /**
-     * Is just here for compatability.
-     */
-    @IsArray()
-    @IsOptional()
-    inherited: ResponsePermission[] = new Array<ResponsePermission>();
-
-    /**
-     * Creates a ResponseUserPermissions object from a group.
-     * @param group The group the response shall be build for.
-     */
-    public constructor(group: UserGroup) {
-        for (let permission of group.permissions) {
-            this.directlyGranted.push(permission.toResponse());
-        }
-    }
-}