Merge pull request #154 from dadosfera/fix/oauth

FIX: Public oauth route

src/modules/auth/auth.controller.ts

@@ -27,6 +27,7 @@ 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 { Metadata } from '@grpc/grpc-js';
 
 @ApiTags('Auth')
 @UseFilters(new GrpcToHttpExceptionFilter())
@@ -59,20 +60,27 @@ export class AuthController {
 
   @Post('sign-in')
   @HttpCode(HttpStatus.OK)
-  async signIn(@Body() { username, password, totp }: AuthSignInRequest) {
+  async signIn(
+    @Body() { username, password, totp }: AuthSignInRequest,
+    @Headers('Dadosfera-Lang') language: string,
+  ) {
     this.logger.info('/auth - SignIn');
-
-    return this.authClient.signIn({ username, password, totp });
+    const metadata = new Metadata();
+    metadata.add('language', language || 'pt-br');
+    return this.authClient.signIn({ username, password, totp }, metadata);
   }
 
   @Post('refresh-access-token')
   @HttpCode(HttpStatus.OK)
   async refreshAccessToken(
     @Body() { refreshToken }: AuthRefreshAccessTokenRequest,
+    @Headers('Dadosfera-Lang') language: string,
   ) {
     this.logger.info('/auth - RefreshAccessToken');
+    const metadata = new Metadata();
+    metadata.add('language', language || 'pt-br');
 
-    return this.authClient.refreshAccessToken({ refreshToken });
+    return this.authClient.refreshAccessToken({ refreshToken }, metadata);
   }
 
   @Post('change-password')

src/modules/auth/auth.service.ts

@@ -19,6 +19,7 @@ import {
   AuthConfirmResetPasswordRequest,
 } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/messages';
 import { DucClient } from '../duc/client.config';
+import { Metadata } from '@grpc/grpc-js';
 
 @Injectable()
 export class AuthClientService implements OnModuleInit {
@@ -51,19 +52,25 @@ export class AuthClientService implements OnModuleInit {
     return lastValueFrom(this.authService.AuthSnowflakeSignIn(input));
   }
 
-  async signIn({ username, password, totp }: AuthSignInRequest) {
+  async signIn(
+    { username, password, totp }: AuthSignInRequest,
+    metadata: Metadata,
+  ) {
     this.logger.info('SignIn');
 
     return lastValueFrom(
-      this.authService.AuthSignIn({ username, password, totp }),
+      this.authService.AuthSignIn({ username, password, totp }, metadata),
     );
   }
 
-  async refreshAccessToken({ refreshToken }: AuthRefreshAccessTokenRequest) {
+  async refreshAccessToken(
+    { refreshToken }: AuthRefreshAccessTokenRequest,
+    metadata: Metadata,
+  ) {
     this.logger.info('RefreshAccessToken');
 
     return lastValueFrom(
-      this.authService.AuthRefreshAccessToken({ refreshToken }),
+      this.authService.AuthRefreshAccessToken({ refreshToken }, metadata),
     );
   }
 

src/modules/oauth/oauth.controller.ts

@@ -7,7 +7,6 @@ import DadosferaLogger from '@dadosfera/dadosfera-logs/dist';
 import { PackTheMetadata } from 'src/utils/ PackTheMetadata';
 import { Authenticated } from 'src/authentication/authentication.decorator';
 @ApiTags('oauth')
-@Authenticated()
 @Controller('oauth')
 export class OauthController {
   redirectUrl: string;

src/modules/termsOfUse/termsOfUse.controller.ts

@@ -17,6 +17,7 @@ import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
 
 import { GrpcToHttpExceptionFilter } from '../../error/grpc-to-http-exception.filter';
 import { RequestUser, User } from '../../authentication/user.decorator';
+import { Metadata } from '@grpc/grpc-js';
 
 @ApiTags('TermsOfUse')
 @UseFilters(new GrpcToHttpExceptionFilter())
@@ -33,10 +34,15 @@ export class TermsOfUseController {
   }
 
   @Get('token')
-  async getToken(@User({ required: true }) user: RequestUser) {
+  async getToken(
+    @User({ required: true }) user: RequestUser,
+    @Headers('Dadosfera-Lang') language: string,
+  ) {
     this.logger.info('/terms-of-use - get token');
+    const metadata = new Metadata();
+    metadata.add('language', language || 'pt-br');
 
-    return this.termsOfUseClient.getToken({ userId: user.user_id });
+    return this.termsOfUseClient.getToken({ userId: user.user_id }, metadata);
   }
 
   @Post('accept')

src/modules/termsOfUse/termsOfUse.service.ts

@@ -10,6 +10,7 @@ import {
   TermsOfUseAcceptRequest,
 } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/messages';
 import { DucClient } from '../duc/client.config';
+import { Metadata } from '@grpc/grpc-js';
 
 @Injectable()
 export class TermsOfUseClientService implements OnModuleInit {
@@ -31,8 +32,10 @@ export class TermsOfUseClientService implements OnModuleInit {
       );
   }
 
-  async getToken(data: TermsOfUseGetTokenRequest) {
-    return lastValueFrom(this.termsOfUseService.TermsOfUseGetToken(data));
+  async getToken(data: TermsOfUseGetTokenRequest, metadata: Metadata) {
+    return lastValueFrom(
+      this.termsOfUseService.TermsOfUseGetToken(data, metadata),
+    );
   }
 
   async accept(data: TermsOfUseAcceptRequest) {

src/modules/users/users.controller.ts

@@ -49,6 +49,8 @@ import {
 } from './dtos/entities';
 import { UsersService } from './users.service';
 import { Metadata } from '@grpc/grpc-js';
+import ErrorBuilder from 'src/utils/ErrorBuilder';
+import ErrorCodes from 'src/utils/errorCodes';
 
 // TODO GET de hierarquias e do PATCH em usuário
 @ApiTags('Users')
@@ -123,7 +125,6 @@ export class UsersController {
   }
 
   @Get(':id')
-  @RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
   @ApiOkResponse({
     type: UserByCustomer,
   })
@@ -134,6 +135,14 @@ export class UsersController {
   ) {
     this.logger.info('findOneById', { user });
     this.userService.setLanguage(language);
+    if (
+      id !== user.user_id &&
+      !user.permissions.includes(
+        PERMISSIONS_GROUPS.USERS.permissions.ADMIN.seqid,
+      )
+    ) {
+      throw new ErrorBuilder(ErrorCodes.AUTH.FORBIDDEN);
+    }
     return await this.userService.findOneById(id);
   }