FIX: moved decorators to a separate folder

src/authentication/authentication.guard.spec.ts

@@ -11,7 +11,7 @@ import {
   Authenticated,
   RequireAllPermissions,
   RequireSomePermission,
-} from './authentication.decorator';
+} from '../decorators/authentication.decorator';
 import { AuthenticationGuard } from './authentication.guard';
 import { PERMISSIONS_GROUPS } from './permissions.enum';
 import { AuthClientService } from '../modules/auth/auth.service';

src/authentication/authentication.guard.ts

@@ -13,8 +13,8 @@ import { AuthClientService } from '../modules/auth/auth.service';
 import {
   AuthenticationFunction,
   AUTH_FUNCTION_KEY,
-} from './authentication.decorator';
-import { RequestUser } from './user.decorator';
+} from '../decorators/authentication.decorator';
+import { RequestUser } from '../decorators/user.decorator';
 import ErrorBuilder from '../utils/ErrorBuilder';
 import ErrorCodes from '../utils/errorCodes';
 

src/decorators/authentication.decorator.ts

@@ -1,44 +1,14 @@
-import { Request } from 'express';
-import { applyDecorators, CustomDecorator } from '@nestjs/common';
-import { PermissionsObjectPermission } from './permissions.enum';
-import { RequestUser } from './user.decorator';
+import { applyDecorators } from '@nestjs/common';
 import { ApiSecurity } from '@nestjs/swagger';
+import { type Request } from 'express';
+import { type PermissionsObjectPermission } from '../authentication/permissions.enum';
+import { type RequestUser } from './user.decorator';
+import { SetMultipleMetadata } from './shared';
 
 export const AUTH_FUNCTION_KEY = '__AUTH_FUNCTION__';
 
 export type AuthenticationFunction = (req: Request, user: any) => boolean;
 
-// implementation copied from SetMetadata, but tweaked to get existing values
-// of the metadataKey and accumulate it with the new metadataValue
-function SetMultipleMetadata(metadataKey, metadataValue): CustomDecorator {
-  const decoratorFactory: CustomDecorator = (target, key?, descriptor?) => {
-    // .start: tweak
-    // descriptor?.value = function decorator; target = class decorator
-    const accumulatedVal =
-      Reflect.getMetadata(metadataKey, descriptor?.value ?? target) ?? [];
-    accumulatedVal.push(metadataValue);
-    // .end: tweak
-
-    if (descriptor) {
-      Reflect.defineMetadata(metadataKey, accumulatedVal, descriptor.value);
-      return descriptor;
-    }
-
-    Reflect.defineMetadata(metadataKey, accumulatedVal, target);
-    return target;
-  };
-
-  decoratorFactory.KEY = metadataKey;
-  return decoratorFactory;
-}
-
-function createAuthenticatedDecorator(metadataValue: AuthenticationFunction) {
-  return applyDecorators(
-    ApiSecurity('access-token'),
-    SetMultipleMetadata(AUTH_FUNCTION_KEY, metadataValue),
-  );
-}
-
 export function RequireAllPermissions(
   ...permissions: PermissionsObjectPermission[]
 ) {
@@ -62,3 +32,10 @@ export function AuthenticateCondition(func: AuthenticationFunction) {
 export function Authenticated() {
   return createAuthenticatedDecorator(() => true);
 }
+
+function createAuthenticatedDecorator(metadataValue: AuthenticationFunction) {
+  return applyDecorators(
+    ApiSecurity('access-token'),
+    SetMultipleMetadata(AUTH_FUNCTION_KEY, metadataValue),
+  );
+}

src/decorators/shared.ts

@@ -0,0 +1,28 @@
+import { type CustomDecorator } from '@nestjs/common';
+
+// implementation copied from SetMetadata, but tweaked to get existing values
+// of the metadataKey and accumulate it with the new metadataValue
+export function SetMultipleMetadata(
+  metadataKey,
+  metadataValue,
+): CustomDecorator {
+  const decoratorFactory: CustomDecorator = (target, key?, descriptor?) => {
+    // .start: tweak
+    // descriptor?.value = function decorator; target = class decorator
+    const accumulatedVal =
+      Reflect.getMetadata(metadataKey, descriptor?.value ?? target) ?? [];
+    accumulatedVal.push(metadataValue);
+    // .end: tweak
+
+    if (descriptor) {
+      Reflect.defineMetadata(metadataKey, accumulatedVal, descriptor.value);
+      return descriptor;
+    }
+
+    Reflect.defineMetadata(metadataKey, accumulatedVal, target);
+    return target;
+  };
+
+  decoratorFactory.KEY = metadataKey;
+  return decoratorFactory;
+}

src/decorators/user.decorator.spec.ts

@@ -1,17 +1,14 @@
-import request from 'supertest';
-import { Test } from '@nestjs/testing';
-import { HttpStatus, INestApplication } from '@nestjs/common';
-import { APP_GUARD } from '@nestjs/core';
-import jwt from 'jsonwebtoken';
-
-import { Controller, Get } from '@nestjs/common';
 import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
-import { AuthenticationGuard } from './authentication.guard';
+import { Controller, Get, HttpStatus, INestApplication } from '@nestjs/common';
+import { APP_GUARD } from '@nestjs/core';
+import { Test } from '@nestjs/testing';
+import jwt from 'jsonwebtoken';
+import request from 'supertest';
+import { AuthenticationGuard } from '../authentication/authentication.guard';
+import { PERMISSIONS_GROUPS } from '../authentication/permissions.enum';
 import { AuthClientService } from '../modules/auth/auth.service';
-
 import ErrorCodes from '../utils/errorCodes';
 import { User } from './user.decorator';
-import { PERMISSIONS_GROUPS } from './permissions.enum';
 
 const logger = {
   info: (...args) => args,

src/decorators/user.decorator.ts

@@ -1,4 +1,4 @@
-import { createParamDecorator, ExecutionContext } from '@nestjs/common';
+import { createParamDecorator, type ExecutionContext } from '@nestjs/common';
 
 import ErrorBuilder from '../utils/ErrorBuilder';
 import ErrorCodes from '../utils/errorCodes';

src/modules/auth/auth.controller.ts

@@ -24,11 +24,11 @@ import { PERMISSIONS_GROUPS } from 'src/authentication/permissions.enum';
 import {
   Authenticated,
   RequireAllPermissions,
-} from 'src/authentication/authentication.decorator';
+} from 'src/decorators/authentication.decorator';
 import { AuthClientService } from './auth.service';
 import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
 import { GrpcToHttpExceptionFilter } from '../../error/grpc-to-http-exception.filter';
-import { RequestUser, User } from 'src/authentication/user.decorator';
+import { RequestUser, User } from 'src/decorators/user.decorator';
 import {
   AuthRefreshAccessTokenReq,
   AuthSignInReq,

src/modules/catalog/catalog.controller.ts

@@ -18,12 +18,12 @@ import { ApiTags } from '@nestjs/swagger';
 import {
   Authenticated,
   RequireSomePermission,
-} from '../../authentication/authentication.decorator';
+} from '../../decorators/authentication.decorator';
 import { PERMISSIONS_GROUPS } from '../../authentication/permissions.enum';
 import { CatalogService } from './catalog.service';
 import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
 import { PackTheMetadata } from 'src/utils/ PackTheMetadata';
-import { RequestUser, User } from 'src/authentication/user.decorator';
+import { RequestUser, User } from 'src/decorators/user.decorator';
 import {
   ICatalogAllResponse,
   IColumnsMetadataResponse,

src/modules/connection-test/connection-test.controller.ts

@@ -9,7 +9,7 @@ import {
   ValidationPipe,
 } from '@nestjs/common';
 import { ApiOkResponse, ApiTags } from '@nestjs/swagger';
-import { User, RequestUser } from 'src/authentication/user.decorator';
+import { User, RequestUser } from 'src/decorators/user.decorator';
 import { ConnectionTestService } from './connection-test.service';
 import {
   ConnectionTestPingRes,
@@ -24,7 +24,7 @@ import {
   GetTableMetadataReq,
 } from './dto/connection-test';
 import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
-import { Authenticated } from 'src/authentication/authentication.decorator';
+import { Authenticated } from 'src/decorators/authentication.decorator';
 import { GrpcToHttpExceptionFilter } from 'src/error/grpc-to-http-exception.filter';
 
 @ApiTags('Connection Test')

src/modules/connection-test/connection-test.service.ts

@@ -19,7 +19,7 @@ import {
   CreateConnectionDto,
   DatabaseConnectionPropertiesDto,
 } from '../connection/dtos/connection';
-import { RequestUser } from 'src/authentication/user.decorator';
+import { RequestUser } from 'src/decorators/user.decorator';
 import { PackTheMetadata } from 'src/utils/ PackTheMetadata';
 
 @Injectable()

src/modules/connection/connection.controller.ts

@@ -17,9 +17,9 @@ import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
 import {
   Authenticated,
   RequireAllPermissions,
-} from 'src/authentication/authentication.decorator';
+} from 'src/decorators/authentication.decorator';
 import { PERMISSIONS_GROUPS } from 'src/authentication/permissions.enum';
-import { RequestUser, User } from 'src/authentication/user.decorator';
+import { RequestUser, User } from 'src/decorators/user.decorator';
 import { ValidationPipe } from '../../pipes/object-validation.pipe';
 import {
   ConnectionDetailsRes,

src/modules/connector/connector.controller.ts

@@ -27,7 +27,7 @@ import {
   Authenticated,
   RequireAllPermissions,
   RequireSomePermission,
-} from 'src/authentication/authentication.decorator';
+} from 'src/decorators/authentication.decorator';
 import { PERMISSIONS_GROUPS } from 'src/authentication/permissions.enum';
 
 @ApiTags('connectors')

src/modules/inputs/inputs.controller.ts

@@ -12,7 +12,7 @@ import {
 import { InputsService } from './inputs.service';
 import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
 import { PERMISSIONS_GROUPS } from '../../authentication/permissions.enum';
-import { AuthenticateCondition } from 'src/authentication/authentication.decorator';
+import { AuthenticateCondition } from 'src/decorators/authentication.decorator';
 import { ApiOkResponse, ApiTags } from '@nestjs/swagger';
 import {
   CreateInputReq,
@@ -21,7 +21,7 @@ import {
   Input,
 } from './dtos/input.model';
 import { UpdateInputRequest } from './dtos/old_interfaces';
-import { RequestUser, User } from 'src/authentication/user.decorator';
+import { RequestUser, User } from 'src/decorators/user.decorator';
 import { Info } from '@dadosfera/protospack-v2/dist/lib/Input/interfaces/entities';
 import { GrpcToHttpExceptionFilter } from 'src/error/grpc-to-http-exception.filter';
 

src/modules/mixpanel/mixpanel.controller.ts

@@ -1,7 +1,7 @@
 import { Body, Controller, Inject, Param, Post } from '@nestjs/common';
 import { init } from 'mixpanel';
-import { Authenticated } from 'src/authentication/authentication.decorator';
-import { RequestUser, User } from 'src/authentication/user.decorator';
+import { Authenticated } from 'src/decorators/authentication.decorator';
+import { RequestUser, User } from 'src/decorators/user.decorator';
 
 @Authenticated()
 @Controller('trackEvent')

src/modules/network-config/network-config.controller.ts

@@ -15,7 +15,7 @@ import {
 import { NetworkConfigService } from './network-config.service';
 import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
 import { ApiConsumes, ApiOkResponse, ApiTags } from '@nestjs/swagger';
-import { RequestUser, User } from 'src/authentication/user.decorator';
+import { RequestUser, User } from 'src/decorators/user.decorator';
 import {
   CreateNetworkConfigReq,
   CreateNetworkConfigRes,
@@ -26,7 +26,7 @@ import { PERMISSIONS_GROUPS } from 'src/authentication/permissions.enum';
 import {
   Authenticated,
   RequireAllPermissions,
-} from 'src/authentication/authentication.decorator';
+} from 'src/decorators/authentication.decorator';
 
 const networkConfigPermissions = PERMISSIONS_GROUPS.NETWORK_CONFIG.permissions;
 @ApiTags('Network Config')

src/modules/permissions/permissions.controller.ts

@@ -1,9 +1,9 @@
 import { Controller, Get, Headers, Inject } from '@nestjs/common';
 import { ApiHeader, ApiOkResponse, ApiTags } from '@nestjs/swagger';
 import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
-import { Authenticated } from 'src/authentication/authentication.decorator';
+import { Authenticated } from 'src/decorators/authentication.decorator';
 import { PermissionUsages } from 'src/authentication/permissions.enum';
-import { RequestUser, User } from 'src/authentication/user.decorator';
+import { RequestUser, User } from 'src/decorators/user.decorator';
 import { LanguageEnum } from 'src/utils/languages.enum';
 import { GetPublicPermissionsRes } from './dto/entities';
 import { PermissionsService } from './permissions.service';

src/modules/pipelines/pipelines.controller.ts

@@ -3,7 +3,7 @@ import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import {
   AuthenticateCondition,
   Authenticated,
-} from 'src/authentication/authentication.decorator';
+} from 'src/decorators/authentication.decorator';
 import { PERMISSIONS_GROUPS } from '../../authentication/permissions.enum';
 import { PipelinesService } from './pipelines.service';
 import { DadosferaLogger } from '@dadosfera/dadosfera-logs';

src/modules/pipelinesV2/pipelines.controller.ts

@@ -25,12 +25,12 @@ import {
 import {
   AuthenticateCondition,
   RequireAllPermissions,
-} from 'src/authentication/authentication.decorator';
+} from 'src/decorators/authentication.decorator';
 import { PERMISSIONS_GROUPS } from '../../authentication/permissions.enum';
 import { PipelinesService } from './pipelines.service';
 import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
 import { Messages } from '@dadosfera/protospack-v2/dist/lib/PipelineV2';
-import { RequestUser, User } from 'src/authentication/user.decorator';
+import { RequestUser, User } from 'src/decorators/user.decorator';
 import { PackTheMetadata } from 'src/utils/ PackTheMetadata';
 
 import { PipelinesService as OldPipelineService } from 'src/modules/pipelines/pipelines.service';

src/modules/pipelinesV2/pipelines.service.ts

@@ -21,7 +21,7 @@ import { PipelineV2CreateRequest } from '@dadosfera/protospack-v2/dist/lib/Pipel
 import { Metadata } from '@grpc/grpc-js';
 import { ConnectorClientService } from '../connector/client.service';
 import { InputsService } from '../inputs/inputs.service';
-import { RequestUser } from 'src/authentication/user.decorator';
+import { RequestUser } from 'src/decorators/user.decorator';
 import { TransformationsService } from '../transformations/transformations.service';
 import { getObjValueFromPath } from 'src/utils/ObjValueFromPath';
 import ErrorCodes from 'src/utils/errorCodes';

src/modules/productboard/productboard.controller.ts

@@ -1,8 +1,8 @@
 import { Body, Controller, HttpException, Post } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 import axios from 'axios';
-import { Authenticated } from 'src/authentication/authentication.decorator';
-import { User, RequestUser } from 'src/authentication/user.decorator';
+import { Authenticated } from 'src/decorators/authentication.decorator';
+import { User, RequestUser } from 'src/decorators/user.decorator';
 import { getSecretFromSecretsManager } from 'src/utils/SecretManager';
 import { INote } from './dtos';
 

src/modules/roles/roles.controller.ts

@@ -18,7 +18,7 @@ import {
   ApiOkResponse,
   ApiTags,
 } from '@nestjs/swagger';
-import { RequestUser, User } from 'src/authentication/user.decorator';
+import { RequestUser, User } from 'src/decorators/user.decorator';
 import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
 import { RolesService } from './roles.service';
 import {
@@ -43,7 +43,7 @@ import { PERMISSIONS_GROUPS } from 'src/authentication/permissions.enum';
 import {
   Authenticated,
   RequireAllPermissions,
-} from 'src/authentication/authentication.decorator';
+} from 'src/decorators/authentication.decorator';
 import { LanguageEnum } from 'src/utils/languages.enum';
 
 @ApiTags('Roles')

src/modules/roles/roles.service.ts

@@ -18,7 +18,7 @@ import { Permission } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/ent
 import { lastValueFrom } from 'rxjs';
 import { PermissionsService } from '../permissions/permissions.service';
 import { LanguageEnum } from 'src/utils/languages.enum';
-import { RequestUser } from 'src/authentication/user.decorator';
+import { RequestUser } from 'src/decorators/user.decorator';
 import { DucClient } from '../duc/client.config';
 
 interface GetRolesPermissionsName {

src/modules/termsOfUse/termsOfUse.controller.ts

@@ -16,7 +16,7 @@ import { TermsOfUseClientService } from './termsOfUse.service';
 import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
 
 import { GrpcToHttpExceptionFilter } from '../../error/grpc-to-http-exception.filter';
-import { RequestUser, User } from '../../authentication/user.decorator';
+import { RequestUser, User } from '../../decorators/user.decorator';
 import { Metadata } from '@grpc/grpc-js';
 
 @ApiTags('TermsOfUse')

src/modules/transformations/transformations.controller.ts

@@ -12,14 +12,13 @@ import { ApiTags } from '@nestjs/swagger';
 import { TransformationsClientService } from './client.service';
 import { IIdRequest } from './interfaces';
 import {
-  AuthenticateCondition,
   Authenticated,
   RequireSomePermission,
-} from 'src/authentication/authentication.decorator';
+} from 'src/decorators/authentication.decorator';
 import { PERMISSIONS_GROUPS } from '../../authentication/permissions.enum';
 import { TransformationsService } from './transformations.service';
 import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
-import { RequestUser, User } from 'src/authentication/user.decorator';
+import { RequestUser, User } from 'src/decorators/user.decorator';
 const pipelinePermissions = PERMISSIONS_GROUPS.PIPELINE.permissions;
 @ApiTags('Transformations')
 @Controller('transformations')

src/modules/users/users.controller.ts

@@ -1,3 +1,4 @@
+import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
 import {
   Body,
   Controller,
@@ -20,14 +21,16 @@ import {
   ApiOkResponse,
   ApiTags,
 } from '@nestjs/swagger';
-import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
+import { PERMISSIONS_GROUPS } from 'src/authentication/permissions.enum';
 import {
   Authenticated,
   RequireAllPermissions,
-} from 'src/authentication/authentication.decorator';
-import { PERMISSIONS_GROUPS } from 'src/authentication/permissions.enum';
-import { RequestUser, User } from 'src/authentication/user.decorator';
+} from 'src/decorators/authentication.decorator';
+import { RequestUser, User } from 'src/decorators/user.decorator';
 import { GrpcToHttpExceptionFilter } from 'src/error/grpc-to-http-exception.filter';
+import { PackTheMetadata } from 'src/utils/ PackTheMetadata';
+import ErrorBuilder from 'src/utils/ErrorBuilder';
+import ErrorCodes from 'src/utils/errorCodes';
 import { LanguageEnum } from 'src/utils/languages.enum';
 import {
   AssignRoleToUserReq,
@@ -40,17 +43,14 @@ import {
   GetAllHierarchiesRes,
   GetAllJobTitlesRes,
   GetAllUsersByCustomerIdRes,
+  IUserByCustomer,
   SetUserRolesReq,
   SetUserRolesRes,
   UnassignRoleToUserReq,
   UpdateUserReq,
   UpdateUserRes,
-  IUserByCustomer,
 } from './dtos/entities';
 import { UsersService } from './users.service';
-import ErrorBuilder from 'src/utils/ErrorBuilder';
-import ErrorCodes from 'src/utils/errorCodes';
-import { PackTheMetadata } from 'src/utils/ PackTheMetadata';
 
 @ApiTags('Users')
 @Controller('users')