FEAT: auth module refactored

src/modules/auth/auth.controller.ts

@@ -5,7 +5,6 @@ import {
   Post,
   HttpCode,
   HttpStatus,
-  OnApplicationBootstrap,
   Inject,
 } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
@@ -21,50 +20,22 @@ import {
   AuthVerifyTotpMfaRequest,
 } from 'protospack-v2/dist/lib/Duc/interfaces/messages';
 
-import { AuthClientService } from '../../clients/auth/client.service';
-import { PermissionsClientService } from '../../clients/permissions/client.service';
-import { Permissions } from '../../authentication/permissions.enum';
+import { AuthClientService } from './auth.service';
 import { DadosferaLogger } from 'dadosfera-logs';
-import ErrorBuilder from '../../utils/ErrorBuilder';
 
 @ApiTags('Auth')
 @Controller('auth')
-export class AuthController implements OnApplicationBootstrap {
+export class AuthController {
   logger: any;
 
   constructor(
     @Inject(DadosferaLogger)
     dadosferaLogger: DadosferaLogger,
     private authClient: AuthClientService,
-    private permissionsClient: PermissionsClientService,
   ) {
     this.logger = dadosferaLogger.logger;
   }
 
-  // internally used to send permissions to duc on microservice startup
-  async onApplicationBootstrap() {
-    this.logger.info('sending permissions to DUC...');
-
-    const permissions = Object.values(Permissions).flatMap((namespace) =>
-      Object.values(namespace),
-    );
-
-    return this.permissionsClient
-      .injectPermissions({ permissions })
-      .catch((err: ErrorBuilder) => {
-        if (
-          err.code === 'No connection established' &&
-          process.env.LOCAL_ENV === 'true'
-        ) {
-          return this.logger.info(
-            "couldn't connect to DUC. suppresing in local env",
-          );
-        }
-
-        throw err;
-      });
-  }
-
   @Post('sign-in')
   @HttpCode(HttpStatus.OK)
   async signIn(@Body() { username, password, totp }: AuthSignInRequest) {

src/modules/auth/auth.module.ts

@@ -0,0 +1,24 @@
+import { Module } from '@nestjs/common';
+import { ClientsModule } from '@nestjs/microservices';
+import { DadosferaLogger } from 'dadosfera-logs';
+
+import { AuthController } from './auth.controller';
+import { AuthClientService } from './auth.service';
+
+import { DucClient } from '../../clients/duc/client.config';
+const ducClient = new DucClient();
+
+@Module({
+  imports: [
+    ClientsModule.register([
+      {
+        name: 'DUC_PACKAGE',
+        ...ducClient.config(),
+      },
+    ]),
+  ],
+  controllers: [AuthController],
+  providers: [AuthClientService, DadosferaLogger],
+  exports: [AuthClientService],
+})
+export class AuthModule {}

src/modules/auth/auth.service.ts

@@ -0,0 +1,158 @@
+import { OnModuleInit, Inject, Injectable } from '@nestjs/common';
+import { ClientGrpc } from '@nestjs/microservices';
+import { DadosferaLogger } from 'dadosfera-logs';
+
+import { ProtoServices } from 'protospack-v2/dist/lib/Duc';
+import { AuthProtoService as AuthServiceInterface } from 'protospack-v2/dist/lib/Duc/interfaces/write-service';
+import {
+  AuthGetPublicKeysResponse,
+  AuthSignInRequest,
+  AuthSignInResponse,
+  AuthRefreshAccessTokenRequest,
+  AuthRefreshAccessTokenResponse,
+  AuthEnableTotpMfaRequest,
+  AuthEnableTotpMfaResponse,
+  AuthDisableTotpMfaRequest,
+  AuthDisableTotpMfaResponse,
+  AuthDismissTotpMfaRequest,
+  AuthDismissTotpMfaResponse,
+  AuthVerifyTotpMfaRequest,
+  AuthVerifyTotpMfaResponse,
+  AuthChangePasswordRequest,
+  AuthChangePasswordResponse,
+  AuthResetPasswordRequest,
+  AuthResetPasswordResponse,
+  AuthVerifyResetPasswordCodeRequest,
+  AuthVerifyResetPasswordCodeResponse,
+  AuthConfirmResetPasswordRequest,
+  AuthConfirmResetPasswordResponse,
+} from 'protospack-v2/dist/lib/Duc/interfaces/messages';
+
+import grpcHandler from '../../utils/grpcHandler';
+
+@Injectable()
+export class AuthClientService implements OnModuleInit {
+  logger: any;
+
+  private authService: AuthServiceInterface;
+  constructor(
+    @Inject(DadosferaLogger)
+    dadosferaLogger: DadosferaLogger,
+    @Inject('DUC_PACKAGE') private readonly grpcClient: ClientGrpc,
+  ) {
+    this.logger = dadosferaLogger.logger;
+  }
+
+  onModuleInit() {
+    this.authService = this.grpcClient.getService<AuthServiceInterface>(
+      ProtoServices.AuthProtoService,
+    );
+  }
+
+  async getPublicKeys() {
+    this.logger.info('GetPublicKeys');
+
+    return grpcHandler<AuthGetPublicKeysResponse>(
+      this.authService.AuthGetPublicKeys({}),
+    );
+  }
+
+  async signIn({ username, password, totp }: AuthSignInRequest) {
+    this.logger.info('SignIn');
+
+    return grpcHandler<AuthSignInResponse>(
+      this.authService.AuthSignIn({ username, password, totp }),
+    );
+  }
+
+  async refreshAccessToken({ refreshToken }: AuthRefreshAccessTokenRequest) {
+    this.logger.info('RefreshAccessToken');
+
+    return grpcHandler<AuthRefreshAccessTokenResponse>(
+      this.authService.AuthRefreshAccessToken({ refreshToken }),
+    );
+  }
+
+  async changePassword({
+    accessToken,
+    oldPassword,
+    newPassword,
+  }: AuthChangePasswordRequest) {
+    this.logger.info('ChangePassword');
+
+    return grpcHandler<AuthChangePasswordResponse>(
+      this.authService.AuthChangePassword({
+        accessToken,
+        oldPassword,
+        newPassword,
+      }),
+    );
+  }
+
+  async resetPassword({ username }: AuthResetPasswordRequest) {
+    this.logger.info('resetPassword');
+
+    return grpcHandler<AuthResetPasswordResponse>(
+      this.authService.AuthResetPassword({ username }),
+    );
+  }
+
+  async verifyResetPasswordCode({
+    username,
+    code,
+  }: AuthVerifyResetPasswordCodeRequest) {
+    this.logger.info('verifyResetPasswordCode');
+
+    return grpcHandler<AuthVerifyResetPasswordCodeResponse>(
+      this.authService.AuthVerifyResetPasswordCode({ username, code }),
+    );
+  }
+
+  async confirmResetPassword({
+    username,
+    code,
+    newPassword,
+  }: AuthConfirmResetPasswordRequest) {
+    this.logger.info('confirmResetPassword');
+
+    return grpcHandler<AuthConfirmResetPasswordResponse>(
+      this.authService.AuthConfirmResetPassword({
+        username,
+        code,
+        newPassword,
+      }),
+    );
+  }
+
+  async enableTotpMFA({ accessToken, password }: AuthEnableTotpMfaRequest) {
+    this.logger.info('enableTotpMFA');
+
+    return grpcHandler<AuthEnableTotpMfaResponse>(
+      this.authService.AuthEnableTotpMfa({ accessToken, password }),
+    );
+  }
+
+  async disableTotpMFA({ accessToken, password }: AuthDisableTotpMfaRequest) {
+    this.logger.info('disableTotpMFA');
+
+    return grpcHandler<AuthDisableTotpMfaResponse>(
+      this.authService.AuthDisableTotpMfa({ accessToken, password }),
+    );
+  }
+
+  async dismissTotpMFA({ accessToken }: AuthDismissTotpMfaRequest) {
+    this.logger.info('dismissTotpMFA');
+
+    return grpcHandler<AuthDismissTotpMfaResponse>(
+      this.authService.AuthDismissTotpMfa({ accessToken }),
+    );
+  }
+
+  async verifyTotp({ accessToken, totp }: AuthVerifyTotpMfaRequest) {
+    this.logger.info('disableTotpMFA');
+
+    return grpcHandler<AuthVerifyTotpMfaResponse>(
+      this.authService.AuthVerifyTotpMfa({ accessToken, totp }),
+    );
+  }
+}

src/modules/permissions/permissions.module.ts

@@ -0,0 +1,21 @@
+import { Module } from '@nestjs/common';
+import { ClientsModule } from '@nestjs/microservices';
+import { DadosferaLogger } from 'dadosfera-logs';
+
+import { PermissionsClientService } from './permissions.service';
+
+import { DucClient } from '../../clients/duc/client.config';
+const ducClient = new DucClient();
+
+@Module({
+  imports: [
+    ClientsModule.register([
+      {
+        name: 'DUC_PACKAGE',
+        ...ducClient.config(),
+      },
+    ]),
+  ],
+  providers: [PermissionsClientService, DadosferaLogger],
+})
+export class PermissionsModule {}

src/modules/permissions/permissions.service.ts

@@ -0,0 +1,73 @@
+import {
+  OnApplicationBootstrap,
+  OnModuleInit,
+  Inject,
+  Injectable,
+} from '@nestjs/common';
+import { ClientGrpc } from '@nestjs/microservices';
+
+import { ProtoServices } from 'protospack-v2/dist/lib/Duc';
+import { PermissionsProtoService as PermissionsServiceInterface } from 'protospack-v2/dist/lib/Duc/interfaces/write-service';
+import {
+  Empty,
+  InjectPermissionsRequest,
+} from 'protospack-v2/dist/lib/Duc/interfaces/messages';
+import { DadosferaLogger } from 'dadosfera-logs';
+import grpcHandler from '../../utils/grpcHandler';
+import { Permissions } from '../../authentication/permissions.enum';
+import ErrorBuilder from '../../utils/ErrorBuilder';
+
+@Injectable()
+export class PermissionsClientService
+  implements OnModuleInit, OnApplicationBootstrap
+{
+  logger: any;
+
+  private permissionsService: PermissionsServiceInterface;
+  constructor(
+    @Inject(DadosferaLogger)
+    dadosferaLogger: DadosferaLogger,
+    @Inject('DUC_PACKAGE') private readonly grpcClient: ClientGrpc,
+  ) {
+    this.logger = dadosferaLogger.logger;
+  }
+
+  onModuleInit() {
+    this.permissionsService =
+      this.grpcClient.getService<PermissionsServiceInterface>(
+        ProtoServices.PermissionsProtoService,
+      );
+  }
+
+  // internally used to send permissions to duc on microservice startup
+  async onApplicationBootstrap() {
+    this.logger.info('sending permissions to DUC...');
+
+    const permissions = Object.values(Permissions).flatMap((namespace) =>
+      Object.values(namespace),
+    );
+
+    return this.injectPermissions({
+      permissions,
+    }).catch((err: ErrorBuilder) => {
+      if (
+        err.code === 'No connection established' &&
+        process.env.LOCAL_ENV === 'true'
+      ) {
+        return this.logger.info(
+          "couldn't connect to DUC. suppresing in local env",
+        );
+      }
+
+      throw err;
+    });
+  }
+
+  async injectPermissions({ permissions }: InjectPermissionsRequest) {
+    this.logger.info('InjectPermissions');
+
+    return grpcHandler<Empty>(
+      this.permissionsService.InjectPermissions({ permissions }),
+    );
+  }
+}