Find All

src/app.module.ts

@@ -112,6 +112,7 @@ export class AppModule implements NestModule {
         OutputsController,
         PipelinesController,
         CatalogController,
+        ConnectorController,
       );
   }
 }

src/clients/auth/client.config.ts

@@ -10,9 +10,7 @@ export class AuthClient {
       options: {
         url: process.env.DUC_URL,
         package: DucPackages,
-        credentials: process.env.LOCAL_ENV
-          ? undefined
-          : credentials.createSsl(),
+        credentials: credentials.createSsl(),
         protoPath: DucProtoFilePath,
         loader: {
           enums: String,

src/clients/connector/client.config.ts

@@ -12,9 +12,10 @@ export class ConnectorClientConfiguration {
           ConnectorManager.ProtoPackages.WritePackage,
           ConnectorManager.ProtoPackages.ReadPackage,
         ],
-        credentials: process.env.LOCAL_ENV
-          ? undefined
-          : credentials.createSsl(),
+        credentials:
+          process.env.LOCAL_ENV === 'local'
+            ? undefined
+            : credentials.createSsl(),
         protoPath: [
           ConnectorManager.ProtoPaths.WriteFilePath,
           ConnectorManager.ProtoPaths.ReadFilePath,

src/clients/connector/client.service.ts

@@ -68,9 +68,7 @@ export class ConnectorClientService implements OnModuleInit {
     return result;
   }
 
-  async getAllConnectors(
-    body: ConnectorManager.Messages.GetAllConnectorsRequest,
-  ) {
+  async getAllConnectors(body) {
     const observable = from(
       this.connectorServiceRead.GetAllConnectors({
         search: body.search,

src/middlewares/authentication.ts

@@ -15,7 +15,9 @@ import { HttpExceptionFilter } from '../error/http-exception.filter';
 export class LoggerMiddleware implements NestMiddleware {
   use = async (request: Request, response: Response, next: NextFunction) => {
     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();

src/modules/auth/auth.controller.ts

@@ -6,6 +6,7 @@ import {
   HttpCode,
   HttpStatus,
 } from '@nestjs/common';
+import { ApiTags } from '@nestjs/swagger';
 import {
   AuthSignInRequest,
   AuthRefreshAccessTokenRequest,
@@ -21,7 +22,9 @@ import {
 import { AuthClientService } from 'src/clients/auth/client.service';
 
 import ErrorBuilder from '../../utils/ErrorBuilder';
+import { LoginDto } from './dtos/login';
 
+@ApiTags('auth')
 @Controller('auth')
 export class AuthController {
   constructor(private authClient: AuthClientService) {}
@@ -45,7 +48,7 @@ export class AuthController {
 
   @Post('sign-in')
   @HttpCode(HttpStatus.OK)
-  async signIn(@Body() { username, password, totp }: AuthSignInRequest) {
+  async signIn(@Body() { username, password, totp }: LoginDto) {
     console.log(`/auth`, 'SignIn');
 
     const tokens = await this.authClient

src/modules/auth/dtos/login.ts

@@ -0,0 +1,12 @@
+import { ApiProperty } from '@nestjs/swagger';
+
+export class LoginDto {
+  @ApiProperty()
+  username: string;
+
+  @ApiProperty()
+  password: string;
+
+  @ApiProperty({ required: false })
+  totp: string;
+}

src/modules/connector/connector.controller.ts

@@ -11,15 +11,22 @@ import {
   UseInterceptors,
 } from '@nestjs/common';
 import { FileInterceptor } from '@nestjs/platform-express';
-import { ApiConsumes, ApiTags } from '@nestjs/swagger';
-import { ConnectorManager } from '@victorradael/protospack-v2';
+import {
+  ApiBasicAuth,
+  ApiBearerAuth,
+  ApiConsumes,
+  ApiOAuth2,
+  ApiTags,
+} from '@nestjs/swagger';
 import { ConnectorClientService } from 'src/clients/connector/client.service';
 import { AddTagDto } from './dtos/add-tag';
 import { CreateConnectorDto } from './dtos/create-connector';
+import { GetAllDto } from './dtos/get-all';
 import { RemoveTagDto } from './dtos/remove-tag';
 import { UpdateDto } from './dtos/update';
 
 @ApiTags('connectors')
+@ApiBearerAuth()
 @Controller('connectors')
 export class ConnectorController {
   constructor(private connectorClientService: ConnectorClientService) {}
@@ -32,22 +39,19 @@ export class ConnectorController {
     @Body() body: CreateConnectorDto,
   ) {
     console.log(`/upload`, 'Upload Connector Route');
-    console.log(file, body);
 
-    // const response = await this.connectorClientService.uploadConnector({
-    //   file: fileField.file,
-    //   connector: body.connector,
-    // });
+    const response = await this.connectorClientService.uploadConnector({
+      file,
+      connector: body,
+    });
 
-    // console.log('X', response);
+    console.log('X', response);
 
-    // return response;
+    return response;
   }
 
-  @Get('/')
-  async getAllConnectors(
-    @Body() body: ConnectorManager.Messages.GetAllConnectorsRequest,
-  ) {
+  @Post('/all')
+  async getAllConnectors(@Body() body: GetAllDto) {
     console.log(`/upload`, 'Upload Connector Route');
     const { filters, search } = body;
 
@@ -56,9 +60,11 @@ export class ConnectorController {
       search,
     });
 
+    const connectors = JSON.parse(response.connectors).connectors;
+
     return {
       message: response.message,
-      connector: { ...JSON.parse(response.connector) },
+      connectors,
     };
   }
 

src/modules/connector/dtos/get-all.ts

@@ -0,0 +1,9 @@
+import { ApiProperty } from '@nestjs/swagger';
+
+export class GetAllDto {
+  @ApiProperty()
+  search: string;
+
+  @ApiProperty()
+  filters: object;
+}