@lenne.tech/nest-server 10.8.9 → 10.8.11

package/src/core/modules/health-check/core-health-check-result.model.ts

@@ -8,8 +8,8 @@ import { JSON } from '../../common/scalars/json.scalar';
 /**
  * User model
  */
-@Restricted(RoleEnum.S_EVERYONE)
 @ObjectType({ description: 'Health check result' })
+@Restricted(RoleEnum.S_EVERYONE)
 export abstract class CoreHealthCheckResult extends CoreModel {
   // ===================================================================================================================
   // Properties
@@ -18,37 +18,37 @@ export abstract class CoreHealthCheckResult extends CoreModel {
   /**
    * The overall status of the Health Check
    */
-  @Restricted(RoleEnum.S_EVERYONE)
   @Field({ description: 'The overall status of the Health Check', nullable: false })
+  @Restricted(RoleEnum.S_EVERYONE)
   status: 'error' | 'ok' | 'shutting_down' = undefined;
 
   /**
    * The info object contains information of each health indicator which is of status “up”
    */
-  @Restricted(RoleEnum.S_EVERYONE)
-  @Field(type => JSON, {
+  @Field(() => JSON, {
     description: 'The info object contains information of each health indicator which is of status “up”',
     nullable: true,
   })
+  @Restricted(RoleEnum.S_EVERYONE)
   info: JSON = undefined;
 
   /**
    * The error object contains information of each health indicator which is of status “down”
    */
-  @Restricted(RoleEnum.S_EVERYONE)
-  @Field(type => JSON, {
+  @Field(() => JSON, {
     description: 'The error object contains information of each health indicator which is of status “down”',
     nullable: true,
   })
+  @Restricted(RoleEnum.S_EVERYONE)
   error: JSON = undefined;
 
   /**
    * The details object contains information of every health indicator
    */
-  @Restricted(RoleEnum.S_EVERYONE)
-  @Field(type => JSON, {
+  @Field(() => JSON, {
     description: 'The details object contains information of every health indicator',
     nullable: false,
   })
+  @Restricted(RoleEnum.S_EVERYONE)
   details: JSON = undefined;
 }

package/src/core/modules/health-check/core-health-check.controller.ts

@@ -8,8 +8,8 @@ import { CoreHealthCheckService } from './core-health-check.service';
  * The HealthController class checks the health of various components including the database, memory, and disk.
  * Inspired by https://mobileappcircular.com/marketplace-backend-creating-a-health-check-endpoint-in-nestjs-app-using-terminus-25727e96c7d2
  */
-@Roles(RoleEnum.ADMIN)
 @Controller()
+@Roles(RoleEnum.ADMIN)
 export class CoreHealthCheckController {
   constructor(protected readonly healthCheckService: CoreHealthCheckService) {}
 
@@ -21,8 +21,8 @@ export class CoreHealthCheckController {
    * storage. The `healthCheck()` method will return a Promise that resolves with an array of objects
    * representing the results of each check
    */
-  @Roles(RoleEnum.S_EVERYONE)
   @Get('health-check')
+  @Roles(RoleEnum.S_EVERYONE)
   async healthCheck() {
     return this.healthCheckService.healthCheck();
   }

package/src/core/modules/health-check/core-health-check.resolver.ts

@@ -2,8 +2,8 @@ import { Query, Resolver } from '@nestjs/graphql';
 
 import { Roles } from '../../common/decorators/roles.decorator';
 import { RoleEnum } from '../../common/enums/role.enum';
-import { CoreHealthCheckService } from './core-health-check.service';
 import { CoreHealthCheckResult } from './core-health-check-result.model';
+import { CoreHealthCheckService } from './core-health-check.service';
 
 /**
  * Resolver to process with user data
@@ -23,8 +23,8 @@ export class CoreHealthCheckResolver {
   /**
    * Get heath check result
    */
-  @Roles(RoleEnum.S_EVERYONE)
   @Query(() => CoreHealthCheckResult, { description: 'Get health check result' })
+  @Roles(RoleEnum.S_EVERYONE)
   async healthCheck() {
     return this.healthCheckService.healthCheck();
   }

package/src/core/modules/user/core-user.model.ts

@@ -14,10 +14,10 @@ export type CoreUserModelDocument = CoreUserModel & Document;
 /**
  * User model
  */
-@Restricted(RoleEnum.S_EVERYONE)
-@ObjectType({ description: 'User', isAbstract: true })
-@MongooseSchema({ timestamps: true })
 @ApiExtraModels(CorePersistenceModel)
+@MongooseSchema({ timestamps: true })
+@ObjectType({ description: 'User', isAbstract: true })
+@Restricted(RoleEnum.S_EVERYONE)
 export abstract class CoreUserModel extends CorePersistenceModel {
   // ===================================================================================================================
   // Properties
@@ -64,7 +64,7 @@ export abstract class CoreUserModel extends CorePersistenceModel {
    * Roles of the user
    */
   @ApiProperty()
-  @Field(type => [String], { description: 'Roles of the user', nullable: true })
+  @Field(() => [String], { description: 'Roles of the user', nullable: true })
   @IsOptional()
   @Prop([String])
   @Restricted(RoleEnum.S_EVERYONE)
@@ -95,9 +95,6 @@ export abstract class CoreUserModel extends CorePersistenceModel {
    * value: TokenData
    */
   @ApiProperty({ isArray: true })
-  @IsOptional()
-  @Prop(raw({}))
-  @Restricted(RoleEnum.S_NO_ONE)
   @ApiProperty({
       additionalProperties: {
       properties: {
@@ -122,6 +119,9 @@ export abstract class CoreUserModel extends CorePersistenceModel {
       },
     type: 'object',
   })
+  @IsOptional()
+  @Prop(raw({}))
+  @Restricted(RoleEnum.S_NO_ONE)
   refreshTokens: Record<string, CoreTokenData> = undefined;
 
   /**
@@ -129,9 +129,6 @@ export abstract class CoreUserModel extends CorePersistenceModel {
    * See sameTokenIdPeriod in configuration
    */
   @ApiProperty()
-  @IsOptional()
-  @Prop(raw({}))
-  @Restricted(RoleEnum.S_NO_ONE)
   @ApiProperty({
       additionalProperties: {
       properties: {
@@ -156,6 +153,9 @@ export abstract class CoreUserModel extends CorePersistenceModel {
       },
     type: 'object',
   })
+  @IsOptional()
+  @Prop(raw({}))
+  @Restricted(RoleEnum.S_NO_ONE)
   tempTokens: Record<string, { createdAt: number; deviceId: string; tokenId: string }> = undefined;
 
   /**
@@ -171,7 +171,7 @@ export abstract class CoreUserModel extends CorePersistenceModel {
    * Verification of the user
    */
   @ApiProperty()
-  @Field(type => Boolean, { description: 'Verification state of the user', nullable: true })
+  @Field(() => Boolean, { description: 'Verification state of the user', nullable: true })
   @Prop({ type: Boolean })
   @Restricted(RoleEnum.S_EVERYONE)
   verified: boolean = undefined;

package/src/core/modules/user/core-user.service.ts

@@ -9,8 +9,8 @@ import { CrudService } from '../../common/services/crud.service';
 import { EmailService } from '../../common/services/email.service';
 import { CoreModelConstructor } from '../../common/types/core-model-constructor.type';
 import { CoreUserModel } from './core-user.model';
-import { CoreUserInput } from './inputs/core-user.input';
 import { CoreUserCreateInput } from './inputs/core-user-create.input';
+import { CoreUserInput } from './inputs/core-user.input';
 
 import bcrypt = require('bcrypt');
 import crypto = require('crypto');
@@ -98,7 +98,7 @@ export abstract class CoreUserService<
   /**
    * Verify user with token
    */
-  async verify(token: string, serviceOptions?: ServiceOptions): Promise<TUser | string> {
+  async verify(token: string, serviceOptions?: ServiceOptions): Promise<string | TUser> {
     // Get user
     const dbObject = await this.mainDbModel.findOne({ verificationToken: token }).exec();
     if (!dbObject) {

package/src/core/modules/user/inputs/core-user-create.input.ts

@@ -12,11 +12,11 @@ import { CoreUserInput } from './core-user.input';
  * otherwise the property will not be recognized via Object.keys (this is necessary for mapping) or will be initialized
  * with a default value that may overwrite an existing value in the DB.
  */
-@Restricted(RoleEnum.S_EVERYONE)
 @InputType({ description: 'User input to create a new user', isAbstract: true })
+@Restricted(RoleEnum.S_EVERYONE)
 export abstract class CoreUserCreateInput extends CoreUserInput {
-  @Restricted(RoleEnum.S_EVERYONE)
   @Field({ description: 'Email of the user', nullable: false })
   @IsEmail()
+  @Restricted(RoleEnum.S_EVERYONE)
   override email: string = undefined;
 }

package/src/core/modules/user/inputs/core-user.input.ts

@@ -13,55 +13,55 @@ import { CoreInput } from '../../../common/inputs/core-input.input';
  * otherwise the property will not be recognized via Object.keys (this is necessary for mapping) or will be initialized
  * with a default value that may overwrite an existing value in the DB.
  */
-@Restricted(RoleEnum.S_EVERYONE)
 @InputType({ description: 'User input', isAbstract: true })
+@Restricted(RoleEnum.S_EVERYONE)
 export abstract class CoreUserInput extends CoreInput {
   /**
    * Email of the user
    */
-  @Restricted(RoleEnum.S_EVERYONE)
   @Field({ description: 'Email of the user', nullable: true })
-  @IsOptional()
   @IsEmail()
+  @IsOptional()
+  @Restricted(RoleEnum.S_EVERYONE)
   email?: string = undefined;
 
   /**
    * First name of the user
    */
-  @Restricted(RoleEnum.S_EVERYONE)
   @Field({ description: 'First name of the user', nullable: true })
   @IsOptional()
+  @Restricted(RoleEnum.S_EVERYONE)
   firstName?: string = undefined;
 
   /**
    * Last name of the user
    */
-  @Restricted(RoleEnum.S_EVERYONE)
   @Field({ description: 'Last name of the user', nullable: true })
   @IsOptional()
+  @Restricted(RoleEnum.S_EVERYONE)
   lastName?: string = undefined;
 
   /**
    * Roles of the user
    */
-  @Restricted({ processType: ProcessType.INPUT, roles: RoleEnum.ADMIN })
-  @Field(type => [String], { description: 'Roles of the user', nullable: true })
+  @Field(() => [String], { description: 'Roles of the user', nullable: true })
   @IsOptional()
+  @Restricted({ processType: ProcessType.INPUT, roles: RoleEnum.ADMIN })
   roles?: string[] = undefined;
 
   /**
    * Username / alias of the user
    */
-  @Restricted(RoleEnum.S_EVERYONE)
   @Field({ description: 'Username / alias of the user', nullable: true })
   @IsOptional()
+  @Restricted(RoleEnum.S_EVERYONE)
   username?: string = undefined;
 
   /**
    * Password of the user
    */
-  @Restricted(RoleEnum.S_EVERYONE)
   @Field({ description: 'Password of the user', nullable: true })
   @IsOptional()
+  @Restricted(RoleEnum.S_EVERYONE)
   password?: string = undefined;
 }

package/src/index.ts

@@ -43,9 +43,9 @@ export * from './core/common/inputs/sort.input';
 export * from './core/common/interceptors/check-response.interceptor';
 export * from './core/common/interceptors/check-security.interceptor';
 export * from './core/common/interfaces/core-persistence-model.interface';
-export * from './core/common/interfaces/cron-job-config.interface';
 export * from './core/common/interfaces/cron-job-config-with-time-zone.interface';
 export * from './core/common/interfaces/cron-job-config-with-utc-offset.interface';
+export * from './core/common/interfaces/cron-job-config.interface';
 export * from './core/common/interfaces/mailjet-options.interface';
 export * from './core/common/interfaces/prepare-input-options.interface';
 export * from './core/common/interfaces/prepare-output-options.interface';
@@ -60,8 +60,8 @@ export * from './core/common/pipes/map-and-validate.pipe';
 export * from './core/common/plugins/complexity.plugin';
 export * from './core/common/plugins/mongoose-id.plugin';
 export * from './core/common/scalars/any.scalar';
-export * from './core/common/scalars/date.scalar';
 export * from './core/common/scalars/date-timestamp.scalar';
+export * from './core/common/scalars/date.scalar';
 export * from './core/common/scalars/json.scalar';
 export * from './core/common/services/brevo.service';
 export * from './core/common/services/config.service';
@@ -81,8 +81,8 @@ export * from './core/common/types/ids.type';
 export * from './core/common/types/is-one-of.type';
 export * from './core/common/types/maybe-promise.type';
 export * from './core/common/types/plain-input.type';
-export * from './core/common/types/plain-object.type';
 export * from './core/common/types/plain-object-deep.type';
+export * from './core/common/types/plain-object.type';
 export * from './core/common/types/populate-config.type';
 export * from './core/common/types/remove-methods.type';
 export * from './core/common/types/require-only-one.type';
@@ -109,20 +109,20 @@ export * from './core/modules/auth/inputs/core-auth-sign-up.input';
 export * from './core/modules/auth/interfaces/core-auth-user.interface';
 export * from './core/modules/auth/interfaces/core-token-data.interface';
 export * from './core/modules/auth/interfaces/jwt-payload.interface';
-export * from './core/modules/auth/services/core-auth.service';
 export * from './core/modules/auth/services/core-auth-user.service';
-export * from './core/modules/auth/strategies/jwt.strategy';
+export * from './core/modules/auth/services/core-auth.service';
 export * from './core/modules/auth/strategies/jwt-refresh.strategy';
+export * from './core/modules/auth/strategies/jwt.strategy';
 export * from './core/modules/auth/tokens.decorator';
 
 // =====================================================================================================================
 // Core - Modules - File
 // =====================================================================================================================
 
+export * from './core/modules/file/core-file-info.model';
 export * from './core/modules/file/core-file.controller';
 export * from './core/modules/file/core-file.resolver';
 export * from './core/modules/file/core-file.service';
-export * from './core/modules/file/core-file-info.model';
 export * from './core/modules/file/interfaces/file-service-options.interface';
 export * from './core/modules/file/interfaces/file-upload.interface';
 
@@ -130,20 +130,20 @@ export * from './core/modules/file/interfaces/file-upload.interface';
 // Core - Modules - User
 // =====================================================================================================================
 
+export * from './core/modules/health-check/core-health-check-result.model';
 export * from './core/modules/health-check/core-health-check.controller';
 export * from './core/modules/health-check/core-health-check.module';
 export * from './core/modules/health-check/core-health-check.resolver';
-export * from './core/modules/health-check/core-health-check.service';
 
 // =====================================================================================================================
 // Core - Modules - HealthCheck
 // =====================================================================================================================
 
-export * from './core/modules/health-check/core-health-check-result.model';
+export * from './core/modules/health-check/core-health-check.service';
 export * from './core/modules/user/core-user.model';
 export * from './core/modules/user/core-user.service';
-export * from './core/modules/user/inputs/core-user.input';
 export * from './core/modules/user/inputs/core-user-create.input';
+export * from './core/modules/user/inputs/core-user.input';
 
 // =====================================================================================================================
 // Tests

package/src/server/common/models/persistence.model.ts

@@ -15,12 +15,12 @@ import mongoose = require('mongoose');
  *
  * The models are a combination of MikroORM Entities and TypeGraphQL Types
  */
-@Restricted(RoleEnum.ADMIN)
+@ApiExtraModels(CorePersistenceModel)
 @ObjectType({
   description: 'Persistence model which will be saved in DB',
   isAbstract: true,
 })
-@ApiExtraModels(CorePersistenceModel)
+@Restricted(RoleEnum.ADMIN)
 export abstract class PersistenceModel extends CorePersistenceModel {
   // ===================================================================================================================
   // Properties
@@ -31,28 +31,28 @@ export abstract class PersistenceModel extends CorePersistenceModel {
    *
    * Not set when created by system
    */
-  @Restricted(RoleEnum.ADMIN)
+  @ApiProperty({ type: String })
   @Field(() => User, {
     description: 'ID of the user who created the object',
     nullable: true,
   })
   @Prop({ ref: 'User', type: mongoose.Schema.Types.ObjectId })
-  @ApiProperty({ type: String })
-  createdBy?: Types.ObjectId | string = undefined;
+  @Restricted(RoleEnum.ADMIN)
+  createdBy?: string | Types.ObjectId = undefined;
 
   /**
    * ID of the user who updated the object
    *
    * Not set when updated by system
    */
-  @Restricted(RoleEnum.ADMIN)
+  @ApiProperty({ type: User })
   @Field(() => User, {
     description: 'ID of the user who updated the object',
     nullable: true,
   })
   @Prop({ ref: 'User', type: mongoose.Schema.Types.ObjectId })
-  @ApiProperty({ type: User })
-  updatedBy?: Types.ObjectId | string = undefined;
+  @Restricted(RoleEnum.ADMIN)
+  updatedBy?: string | Types.ObjectId = undefined;
 
   // ===================================================================================================================
   // Methods

package/src/server/modules/auth/auth.controller.ts

@@ -6,8 +6,8 @@ import { ConfigService } from '../../../core/common/services/config.service';
 import { CoreAuthController } from '../../../core/modules/auth/core-auth.controller';
 import { AuthService } from './auth.service';
 
-@Roles(RoleEnum.ADMIN)
 @Controller('auth')
+@Roles(RoleEnum.ADMIN)
 export class AuthController extends CoreAuthController {
   /**
    * Import project services

package/src/server/modules/auth/auth.model.ts

@@ -9,8 +9,8 @@ import { User } from '../user/user.model';
 /**
  * Authentication data
  */
-@Restricted(RoleEnum.ADMIN)
 @ObjectType({ description: 'Authentication data' })
+@Restricted(RoleEnum.ADMIN)
 export class Auth extends CoreAuthModel {
   // ===================================================================================================================
   // Properties
@@ -19,8 +19,8 @@ export class Auth extends CoreAuthModel {
   /**
    * Signed-in user
    */
-  @Restricted(RoleEnum.S_EVERYONE)
   @Field(() => User, { description: 'User who signed in' })
+  @Restricted(RoleEnum.S_EVERYONE)
   override user: User = undefined;
 
   // ===================================================================================================================

package/src/server/modules/auth/auth.resolver.ts

@@ -15,8 +15,8 @@ import { AuthSignUpInput } from './inputs/auth-sign-up.input';
 /**
  * Authentication resolver for the sign in
  */
-@Roles(RoleEnum.ADMIN)
 @Resolver(() => Auth)
+@Roles(RoleEnum.ADMIN)
 export class AuthResolver extends CoreAuthResolver {
   /**
    * Integrate services
@@ -31,8 +31,8 @@ export class AuthResolver extends CoreAuthResolver {
   /**
    * SignIn for User
    */
-  @Roles(RoleEnum.S_EVERYONE)
   @Mutation(() => Auth, { description: 'Sign in and get JWT token' })
+  @Roles(RoleEnum.S_EVERYONE)
   override async signIn(
     @GraphQLServiceOptions({ gqlPath: 'signIn.user' }) serviceOptions: ServiceOptions,
     @Context() ctx: { res: ResponseType },
@@ -48,10 +48,10 @@ export class AuthResolver extends CoreAuthResolver {
   /**
    * Sign up for user
    */
-  @Roles(RoleEnum.S_EVERYONE)
   @Mutation(() => Auth, {
     description: 'Sign up user and get JWT token',
   })
+  @Roles(RoleEnum.S_EVERYONE)
   override async signUp(
     @GraphQLServiceOptions({ gqlPath: 'signUp.user' }) serviceOptions: ServiceOptions,
     @Context() ctx: { res: ResponseType },

package/src/server/modules/auth/inputs/auth-sign-in.input.ts

@@ -7,8 +7,8 @@ import { CoreAuthSignInInput } from '../../../../core/modules/auth/inputs/core-a
 /**
  * SignIn input
  */
-@Restricted(RoleEnum.ADMIN)
 @InputType({ description: 'Sign-in input' })
+@Restricted(RoleEnum.ADMIN)
 export class AuthSignInInput extends CoreAuthSignInInput {
   // Extend UserInput here
 }

package/src/server/modules/auth/inputs/auth-sign-up.input.ts

@@ -7,18 +7,18 @@ import { CoreAuthSignUpInput } from '../../../../core/modules/auth/inputs/core-a
 /**
  * SignUp input
  */
-@Restricted(RoleEnum.ADMIN)
 @InputType({ description: 'Sign-up input' })
+@Restricted(RoleEnum.ADMIN)
 export class AuthSignUpInput extends CoreAuthSignUpInput {
   // ===================================================================================================================
   // Properties
   // ===================================================================================================================
 
-  @Restricted(RoleEnum.S_EVERYONE)
   @Field({ description: 'firstName', nullable: true })
+  @Restricted(RoleEnum.S_EVERYONE)
   firstName: string = undefined;
 
-  @Restricted(RoleEnum.S_EVERYONE)
   @Field({ description: 'lastName', nullable: true })
+  @Restricted(RoleEnum.S_EVERYONE)
   lastName: string = undefined;
 }

package/src/server/modules/file/file-info.model.ts

@@ -8,9 +8,9 @@ import { CoreFileInfo } from '../../../core/modules/file/core-file-info.model';
 /**
  * File info model
  */
-@Restricted(RoleEnum.ADMIN)
-@ObjectType({ description: 'Information about file' })
 @MongooseSchema({ collection: 'fs.files' })
+@ObjectType({ description: 'Information about file' })
+@Restricted(RoleEnum.ADMIN)
 export class FileInfo extends CoreFileInfo {}
 
 /**

package/src/server/modules/file/file.controller.ts

@@ -19,8 +19,8 @@ import { FileService } from './file.service';
 /**
  * File controller for
  */
-@Roles(RoleEnum.ADMIN)
 @Controller('files')
+@Roles(RoleEnum.ADMIN)
 export class FileController {
   /**
    * Import services
@@ -30,8 +30,8 @@ export class FileController {
   /**
    * Upload file
    */
-  @Roles(RoleEnum.ADMIN)
   @Post('upload')
+  @Roles(RoleEnum.ADMIN)
   @UseInterceptors(FileInterceptor('file'))
   uploadFile(@UploadedFile() file: Express.Multer.File): any {
     return file;
@@ -40,8 +40,8 @@ export class FileController {
   /**
    * Download file
    */
-  @Roles(RoleEnum.ADMIN)
   @Get(':id')
+  @Roles(RoleEnum.ADMIN)
   async getFile(@Param('id') id: string, @Res() res) {
     if (!id) {
       throw new BadRequestException('Missing ID');
@@ -67,8 +67,8 @@ export class FileController {
   /**
    * Get file information
    */
-  @Roles(RoleEnum.ADMIN)
   @Get('info/:id')
+  @Roles(RoleEnum.ADMIN)
   async getFileInfo(@Param('id') id: string) {
     return await this.fileService.getFileInfo(id);
   }
@@ -76,8 +76,8 @@ export class FileController {
   /**
    * Delete file
    */
-  @Roles(RoleEnum.ADMIN)
   @Delete(':id')
+  @Roles(RoleEnum.ADMIN)
   async deleteFile(@Param('id') id: string) {
     if (!id) {
       throw new BadRequestException('Missing ID');

package/src/server/modules/file/file.module.ts

@@ -1,4 +1,4 @@
-import { Module, forwardRef } from '@nestjs/common';
+import { forwardRef, Module } from '@nestjs/common';
 import { MulterModule } from '@nestjs/platform-express';
 
 import { UserModule } from '../user/user.module';

package/src/server/modules/file/file.resolver.ts

@@ -4,8 +4,8 @@ import { createWriteStream } from 'fs';
 import { Roles } from '../../../core/common/decorators/roles.decorator';
 import { RoleEnum } from '../../../core/common/enums/role.enum';
 import { FileUpload } from '../../../core/modules/file/interfaces/file-upload.interface';
-import { FileService } from './file.service';
 import { FileInfo } from './file-info.model';
+import { FileService } from './file.service';
 
 import fs = require('fs');
 import GraphQLUpload = require('graphql-upload/GraphQLUpload.js');
@@ -28,8 +28,8 @@ export class FileResolver {
   /**
    * Get file info
    */
-  @Roles(RoleEnum.ADMIN)
   @Query(() => FileInfo, { nullable: true })
+  @Roles(RoleEnum.ADMIN)
   async getFileInfo(@Args({ name: 'filename', type: () => String }) filename: string) {
     return await this.fileService.getFileInfoByName(filename);
   }
@@ -41,8 +41,8 @@ export class FileResolver {
   /**
    * Delete file
    */
-  @Roles(RoleEnum.ADMIN)
   @Mutation(() => FileInfo)
+  @Roles(RoleEnum.ADMIN)
   async deleteFile(@Args({ name: 'filename', type: () => String }) filename: string) {
     return await this.fileService.deleteFileByName(filename);
   }
@@ -50,8 +50,8 @@ export class FileResolver {
   /**
    * Upload file
    */
-  @Roles(RoleEnum.ADMIN)
   @Mutation(() => FileInfo)
+  @Roles(RoleEnum.ADMIN)
   async uploadFile(@Args({ name: 'file', type: () => GraphQLUpload }) file: FileUpload) {
     return await this.fileService.createFile(file);
   }
@@ -59,8 +59,8 @@ export class FileResolver {
   /**
    * Upload files
    */
-  @Roles(RoleEnum.ADMIN)
   @Mutation(() => Boolean)
+  @Roles(RoleEnum.ADMIN)
   async uploadFiles(@Args({ name: 'files', type: () => [GraphQLUpload] }) files: FileUpload[]) {
     // Save files in filesystem
     const promises: Promise<any>[] = [];

package/src/server/modules/user/avatar.controller.ts

@@ -13,8 +13,8 @@ import { UserService } from './user.service';
 /**
  * Controller for avatar
  */
-@Roles(RoleEnum.ADMIN)
 @Controller('avatar')
+@Roles(RoleEnum.ADMIN)
 export class AvatarController {
   /**
    * Import services
@@ -24,8 +24,8 @@ export class AvatarController {
   /**
    * Upload files
    */
-  @Roles(RoleEnum.S_USER)
   @Post('upload')
+  @Roles(RoleEnum.S_USER)
   @UseInterceptors(
     FileInterceptor(
       'file',

package/src/server/modules/user/inputs/user-create.input.ts

@@ -7,8 +7,8 @@ import { CoreUserCreateInput } from '../../../../core/modules/user/inputs/core-u
 /**
  * User input to create a new user
  */
-@Restricted(RoleEnum.ADMIN)
 @InputType({ description: 'User input to create a new user' })
+@Restricted(RoleEnum.ADMIN)
 export class UserCreateInput extends CoreUserCreateInput {
   // Extend UserCreateInput here
 }

package/src/server/modules/user/inputs/user.input.ts

@@ -7,8 +7,8 @@ import { CoreUserInput } from '../../../../core/modules/user/inputs/core-user.in
 /**
  * User input to update a user
  */
-@Restricted(RoleEnum.ADMIN)
 @InputType({ description: 'User input' })
+@Restricted(RoleEnum.ADMIN)
 export class UserInput extends CoreUserInput {
   // Extend UserInput here
 }