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-lock.json

@@ -1715,9 +1715,9 @@
       }
     },
     "@victorradael/protospack": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@victorradael/protospack/-/protospack-1.7.2.tgz",
-      "integrity": "sha512-7mbMXlFGIBNnGsu7PCKN7JcHlotlmuoq1Cv1pZ3dMtwL79uZNvEc4S+p/7SDmIcZgKsFGZgg1Br2y5nUfjgKnA==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/@victorradael/protospack/-/protospack-1.7.4.tgz",
+      "integrity": "sha512-iQLJn88TaS6msH3JSm3CDqctqY24Xy42tZRRfbxipQ4NMfrQ2TEjLhNYeKEGHqidCjTHF/bhSnx+4ml2yqkpKQ==",
       "requires": {
         "rxjs": "^7.5.5"
       }

package.json

@@ -31,7 +31,7 @@
     "@nestjs/platform-express": "^8.4.3",
     "@nestjs/schedule": "^1.1.0",
     "@nestjs/swagger": "^5.2.1",
-    "@victorradael/protospack": "1.7.2",
+    "@victorradael/protospack": "1.7.4",
     "axios": "^0.25.0",
     "dotenv": "^14.2.0",
     "helmet": "^5.0.2",

src/clients/auth/client.service.ts

@@ -2,7 +2,12 @@ import { OnModuleInit, Inject } from '@nestjs/common';
 import { ClientGrpc } from '@nestjs/microservices';
 
 import {
+  AuthConfirmationRequest,
+  AuthDisableTotpMfaRequest,
+  AuthEnableTotpMfaRequest,
+  AuthResendConfirmationCodeRequest,
   AuthServiceInterface,
+  AuthVerifyTotpMfaRequest,
   DucServicesNames,
 } from '@victorradael/protospack';
 
@@ -44,6 +49,144 @@ 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,

src/modules/auth/auth.controller.ts

@@ -1,4 +1,14 @@
-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';
 import { ISignIn, IRefreshAccessToken } from 'src/clients/auth/interfaces';
@@ -16,6 +26,13 @@ export class AuthController {
   }
 
   @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');
 
@@ -30,7 +47,9 @@ export class AuthController {
   }
 
   @Post('refresh-access-token')
-  async refreshAccessToken(@Body() { username, refreshToken }: IRefreshAccessToken) {
+  async refreshAccessToken(
+    @Body() { username, refreshToken }: IRefreshAccessToken,
+  ) {
     console.log(`/auth`, 'RefreshAccessToken');
 
     const accessToken = await this.authClient
@@ -42,4 +61,40 @@ export class AuthController {
 
     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;
+  }
 }