Merge pull request #94 from dadosfera/beta

Beta

.github/workflows/deploy.yml

@@ -38,7 +38,6 @@ jobs:
         with:
           semantic_version: 16
           extra_plugins: |
-            @saithodev/semantic-release-backmerge
             conventional-changelog-eslint
           branches: |
             [

.releaserc.json

@@ -26,18 +26,6 @@
         "preset": "eslint"
       }
     ],
-    [
-      "@saithodev/semantic-release-backmerge",
-      {
-        "branches": [
-          { "from": "main", "to": "alpha" },
-          { "from": "main", "to": "beta" }
-        ],
-        "backmergeStrategy": "merge",
-        "clearWorkspace": true,
-        "restoreWorkspace": true
-      }
-    ],
     "@semantic-release/npm",
     "@semantic-release/github"
   ]

package.json

@@ -29,8 +29,9 @@
     "@nestjs/mapped-types": "*",
     "@nestjs/microservices": "^8.4.3",
     "@nestjs/platform-express": "^8.4.3",
+    "@nestjs/schedule": "^1.1.0",
     "@nestjs/swagger": "^5.2.1",
-    "@victorradael/protospack": "^1.6.5",
+    "@victorradael/protospack": "1.7.4",
     "axios": "^0.25.0",
     "dotenv": "^14.2.0",
     "helmet": "^5.0.2",

src/clients/auth/client.service.ts

@@ -2,11 +2,16 @@ import { OnModuleInit, Inject } from '@nestjs/common';
 import { ClientGrpc } from '@nestjs/microservices';
 
 import {
+  AuthConfirmationRequest,
+  AuthDisableTotpMfaRequest,
+  AuthEnableTotpMfaRequest,
+  AuthResendConfirmationCodeRequest,
   AuthServiceInterface,
+  AuthVerifyTotpMfaRequest,
   DucServicesNames,
 } from '@victorradael/protospack';
 
-import { ILogin } from './interfaces';
+import { ISignIn, IRefreshAccessToken } from './interfaces';
 
 export class AuthClientService implements OnModuleInit {
   private authService: AuthServiceInterface;
@@ -20,7 +25,7 @@ export class AuthClientService implements OnModuleInit {
     );
   }
 
-  async signIn({ username, password, totp }: ILogin): Promise<any> {
+  async signIn({ username, password, totp }: ISignIn): Promise<any> {
     console.log('AuthClientService', 'SignIn');
 
     const tokens = await new Promise((resolve, reject) => {
@@ -43,4 +48,171 @@ export class AuthClientService implements OnModuleInit {
       });
     return tokens;
   }
+
+  async enableTotpMFA({
+    username,
+    password,
+  }: AuthEnableTotpMfaRequest): Promise<any> {
+    console.log('AuthClientService', 'enableTotpMFA');
+
+    const tokens = await new Promise((resolve, reject) => {
+      this.authService.enableTotpMfa({ username, password }).subscribe({
+        next(x) {
+          resolve(x);
+        },
+        error(err) {
+          console.log('Observable Error');
+          reject(err);
+        },
+        complete() {
+          console.log('done');
+        },
+      });
+    })
+      .then((res) => res)
+      .catch((err) => {
+        throw new Error(err);
+      });
+    return tokens;
+  }
+
+  async disableTotpMFA({
+    username,
+    password,
+    totp,
+  }: AuthDisableTotpMfaRequest): Promise<any> {
+    console.log('AuthClientService', 'disableTotpMFA');
+
+    const tokens = await new Promise((resolve, reject) => {
+      this.authService.disableTotpMfa({ username, password, totp }).subscribe({
+        next(x) {
+          resolve(x);
+        },
+        error(err) {
+          console.log('Observable Error');
+          reject(err);
+        },
+        complete() {
+          console.log('done');
+        },
+      });
+    })
+      .then((res) => res)
+      .catch((err) => {
+        throw new Error(err);
+      });
+    return tokens;
+  }
+
+  async verifyTotp({
+    username,
+    accessToken,
+    totp,
+  }: AuthVerifyTotpMfaRequest): Promise<any> {
+    console.log('AuthClientService', 'disableTotpMFA');
+
+    const tokens = await new Promise((resolve, reject) => {
+      this.authService.verifyTotp({ username, accessToken, totp }).subscribe({
+        next(x) {
+          resolve(x);
+        },
+        error(err) {
+          console.log('Observable Error');
+          reject(err);
+        },
+        complete() {
+          console.log('done');
+        },
+      });
+    })
+      .then((res) => res)
+      .catch((err) => {
+        throw new Error(err);
+      });
+    return tokens;
+  }
+
+  async confirmRegister({
+    username,
+    code,
+  }: AuthConfirmationRequest): Promise<any> {
+    console.log('AuthClientService', 'confirmRegister');
+
+    const tokens = await new Promise((resolve, reject) => {
+      this.authService.confirmRegister({ username, code }).subscribe({
+        next(x) {
+          resolve(x);
+        },
+        error(err) {
+          console.log('Observable Error');
+          reject(err);
+        },
+        complete() {
+          console.log('done');
+        },
+      });
+    })
+      .then((res) => res)
+      .catch((err) => {
+        throw new Error(err);
+      });
+    return tokens;
+  }
+
+  async resendeConfirmationCode({
+    username,
+  }: AuthResendConfirmationCodeRequest): Promise<any> {
+    console.log('AuthClientService', 'resendeConfirmationCode');
+
+    const authResendConfirmationCodeRequestReturn = await new Promise(
+      (resolve, reject) => {
+        this.authService.resendeConfirmationCode({ username }).subscribe({
+          next(x) {
+            resolve(x);
+          },
+          error(err) {
+            console.log('Observable Error');
+            reject(err);
+          },
+          complete() {
+            console.log('done');
+          },
+        });
+      },
+    )
+      .then((res) => res)
+      .catch((err) => {
+        throw new Error(err);
+      });
+    return authResendConfirmationCodeRequestReturn;
+  }
+
+  async refreshAccessToken({
+    username,
+    refreshToken,
+  }: IRefreshAccessToken): Promise<any> {
+    console.log('AuthClientService', 'RefreshAccessToken');
+
+    const tokens = await new Promise((resolve, reject) => {
+      this.authService
+        .refreshAccessToken({ username, refreshToken })
+        .subscribe({
+          next(x) {
+            resolve(x);
+          },
+          error(err) {
+            console.log('Observable Error');
+            reject(err);
+          },
+          complete() {
+            console.log('done');
+          },
+        });
+    })
+      .then((res) => res)
+      .catch((err) => {
+        throw new Error(err);
+      });
+    return tokens;
+  }
 }

src/clients/auth/interfaces.d.ts

@@ -1,5 +1,10 @@
-export interface ILogin {
+export interface ISignIn {
   username: string;
   password: string;
   totp: string;
 }
+
+export interface IRefreshAccessToken {
+  username: string;
+  refreshToken: string;
+}

src/clients/transformations/client.config.ts

@@ -10,7 +10,7 @@ export class TransformationsClientConfiguration {
     return {
       transport: Transport.GRPC,
       options: {
-        url: process.env.TRFACTORY_URL,
+        url: process.env.INFACTORY_URL,
         package: TransformationPackages,
         credentials: credentials.createSsl(),
         protoPath: TransformationProtoFilePath,

src/middlewares/authentication.ts

@@ -17,9 +17,11 @@ export class LoggerMiddleware implements NestMiddleware {
     const idToken = request.get('Dadosfera-User');
     const accessToken = request.get('Authorization');
     const privateKey = process.env.JWT_PRIVATE_KEY;
-
+    let requiredRoute = '';
     const requiredMethod = request.method.trim();
-    const requiredRoute = request.route.path.split('/')[1].trim();
+    if (request.route.path.split('/').length >= 2) {
+      requiredRoute = request.route.path.split('/')[1].trim();
+    }
 
     verify(idToken, privateKey, (err) => {
       if (err) {

src/modules/auth/auth.controller.ts

@@ -1,18 +1,38 @@
-import { Body, Controller, Post, UnauthorizedException } from '@nestjs/common';
+import {
+  Body,
+  Controller,
+  Headers,
+  Post,
+  UnauthorizedException,
+} from '@nestjs/common';
+import {
+  AuthEnableTotpMfaRequest,
+  AuthVerifyTotpMfaRequest,
+} from '@victorradael/protospack';
 
 import { AuthClientService } from 'src/clients/auth/client.service';
-
-interface ISignIn {
-  username: string;
-  password: string;
-  totp: string;
-}
+import { ISignIn, IRefreshAccessToken } from 'src/clients/auth/interfaces';
 
 @Controller('auth')
 export class AuthController {
   constructor(private authClient: AuthClientService) {}
 
+  // DEPRECADO!
   @Post()
+  async signIn_old(@Body() body: ISignIn) {
+    console.log(`/auth`, 'SignIn_old');
+
+    return this.signIn(body);
+  }
+
+  @Post('login')
+  async signIn_login(@Body() body: ISignIn) {
+    console.log(`/auth`, 'SignIn_login');
+
+    return this.signIn(body);
+  }
+
+  @Post('sign-in')
   async signIn(@Body() { username, password, totp }: ISignIn) {
     console.log(`/auth`, 'SignIn');
 
@@ -25,4 +45,56 @@ export class AuthController {
 
     return tokens;
   }
+
+  @Post('refresh-access-token')
+  async refreshAccessToken(
+    @Body() { username, refreshToken }: IRefreshAccessToken,
+  ) {
+    console.log(`/auth`, 'RefreshAccessToken');
+
+    const accessToken = await this.authClient
+      .refreshAccessToken({ username, refreshToken })
+      .then((result) => result)
+      .catch((err) => {
+        throw new UnauthorizedException(err.message);
+      });
+
+    return accessToken;
+  }
+
+  @Post('enable-totp')
+  async enableTotpMFA(
+    @Body() { username, password }: AuthEnableTotpMfaRequest,
+  ) {
+    console.log(`/auth`, 'enable-totp');
+
+    const enableTotpResponse = await this.authClient
+      .enableTotpMFA({ username, password })
+      .then((result) => result)
+      .catch((err) => {
+        throw new UnauthorizedException(err.message);
+      });
+
+    return enableTotpResponse;
+  }
+
+  @Post('verify-totp')
+  async verifyTotp(
+    @Body() body: AuthVerifyTotpMfaRequest,
+    @Headers() headers,
+  ): Promise<any> {
+    console.log(`/auth`, 'enable-totp');
+
+    const { username, totp } = body;
+    const { Authorization } = headers;
+
+    const enableTotpResponse = await this.authClient
+      .verifyTotp({ username, totp, accessToken: Authorization })
+      .then((result) => result)
+      .catch((err) => {
+        throw new UnauthorizedException(err.message);
+      });
+
+    return enableTotpResponse;
+  }
 }

src/modules/catalog/catalog.controller.ts

@@ -218,15 +218,18 @@ export class CatalogController {
   }
 
   @Get('summary-rating/:id')
-  async getSummaryRating(@Param() params, @Body() body) {
+  async getSummaryRating() {
     console.log(`/catalog`, 'ON GET SUMMARY RATING ROUTE');
-    const { id } = params;
+    //const { id } = params;
 
-    const catalogService = new CatalogService();
+    //const catalogService = new CatalogService();
 
-    const res = await catalogService.getSummaryRating(id, body);
+    //const res = await catalogService.getSummaryRating(id, body);
 
-    return res;
+    return {
+      avg_rating: 0,
+      rating_count: 0,
+    };
   }
 
   @Get('data-comment')

src/modules/inputs/inputs.service.ts

@@ -1,4 +1,5 @@
 import { Body, HttpException, HttpStatus, Injectable } from '@nestjs/common';
+import { Timeout } from '@nestjs/schedule';
 import { InputNewCreateRequest } from '@victorradael/protospack';
 import { InputsClientService } from 'src/clients/inputs/client.service';
 import { IIdRequest, Info } from 'src/clients/inputs/interfaces';
@@ -60,6 +61,7 @@ export class InputsService {
     }
   }
 
+  @Timeout(60000 * 10) // Timeout set for 10 minutes
   async testConnection(data) {
     try {
       const testConnectionInputResponse = await this.inputClient.testConnection(