mirror of
https://github.com/dadosfera/maestro.git
synced 2026-11-18 17:39:09 +00:00
Fix and add upload file
This commit is contained in:
Generated
+6
-6
@@ -2428,9 +2428,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@victorradael/protospack-v2": {
|
||||
"version": "1.0.20",
|
||||
"resolved": "https://registry.npmjs.org/@victorradael/protospack-v2/-/protospack-v2-1.0.20.tgz",
|
||||
"integrity": "sha512-vwRvI5+Y2eOBBz7fuft2wBrkG+f3wp9h9UeW9SWe2KAPEsKpYCFPdGQo3Uy4r+RwpGfHXfFg2yM7BR5W8P7TJg==",
|
||||
"version": "1.0.24",
|
||||
"resolved": "https://registry.npmjs.org/@victorradael/protospack-v2/-/protospack-v2-1.0.24.tgz",
|
||||
"integrity": "sha512-E/SSpSLfVLfAmNLDaJpioKaXRhzO0aVBdV1EyIaB23v3l8RPWQP1cHxQC/hk+2ersEqegDKqF94h599/u2EztQ==",
|
||||
"dependencies": {
|
||||
"rxjs": "^7.5.5",
|
||||
"ts-proto": "^1.112.2"
|
||||
@@ -11096,9 +11096,9 @@
|
||||
}
|
||||
},
|
||||
"@victorradael/protospack-v2": {
|
||||
"version": "1.0.20",
|
||||
"resolved": "https://registry.npmjs.org/@victorradael/protospack-v2/-/protospack-v2-1.0.20.tgz",
|
||||
"integrity": "sha512-vwRvI5+Y2eOBBz7fuft2wBrkG+f3wp9h9UeW9SWe2KAPEsKpYCFPdGQo3Uy4r+RwpGfHXfFg2yM7BR5W8P7TJg==",
|
||||
"version": "1.0.24",
|
||||
"resolved": "https://registry.npmjs.org/@victorradael/protospack-v2/-/protospack-v2-1.0.24.tgz",
|
||||
"integrity": "sha512-E/SSpSLfVLfAmNLDaJpioKaXRhzO0aVBdV1EyIaB23v3l8RPWQP1cHxQC/hk+2ersEqegDKqF94h599/u2EztQ==",
|
||||
"requires": {
|
||||
"rxjs": "^7.5.5",
|
||||
"ts-proto": "^1.112.2"
|
||||
|
||||
@@ -10,7 +10,10 @@ export class AuthClient {
|
||||
options: {
|
||||
url: process.env.DUC_URL,
|
||||
package: DucPackages,
|
||||
credentials: credentials.createSsl(),
|
||||
credentials:
|
||||
process.env.LOCAL_ENV === 'local'
|
||||
? undefined
|
||||
: credentials.createSsl(),
|
||||
protoPath: DucProtoFilePath,
|
||||
loader: {
|
||||
enums: String,
|
||||
|
||||
@@ -12,10 +12,10 @@ export class ConnectorClientConfiguration {
|
||||
ConnectorManager.ProtoPackages.WritePackage,
|
||||
ConnectorManager.ProtoPackages.ReadPackage,
|
||||
],
|
||||
credentials:
|
||||
process.env.LOCAL_ENV === 'local'
|
||||
? undefined
|
||||
: credentials.createSsl(),
|
||||
credentials: undefined,
|
||||
// process.env.LOCAL_ENV === 'local'
|
||||
// ? undefined
|
||||
// : credentials.createSsl(),
|
||||
protoPath: [
|
||||
ConnectorManager.ProtoPaths.WriteFilePath,
|
||||
ConnectorManager.ProtoPaths.ReadFilePath,
|
||||
|
||||
@@ -33,10 +33,10 @@ export class ConnectorClientService implements OnModuleInit {
|
||||
buffer: uploadConnector.file.buffer,
|
||||
mimetypes: uploadConnector.file.mimetype,
|
||||
},
|
||||
connector: uploadConnector.connector,
|
||||
connector: JSON.stringify(uploadConnector.connector),
|
||||
};
|
||||
const serviceBody: ConnectorManager.Messages.RegisterConnectorRequest = {
|
||||
connectors: [connector],
|
||||
connector,
|
||||
};
|
||||
|
||||
const observable = from(
|
||||
@@ -57,6 +57,44 @@ export class ConnectorClientService implements OnModuleInit {
|
||||
},
|
||||
});
|
||||
}).catch((err) => {
|
||||
console.log(err.details);
|
||||
throw new HttpException(
|
||||
err.details,
|
||||
err.code === 6 ? HttpStatus.CONFLICT : 400,
|
||||
);
|
||||
});
|
||||
|
||||
console.log('ConnectorClientService', 'Upload');
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
async uploadFile(uploadFile) {
|
||||
const body: ConnectorManager.Messages.UploadFileRequest = {
|
||||
file: {
|
||||
buffer: uploadFile.file.buffer,
|
||||
mimetypes: uploadFile.file.mimetype,
|
||||
},
|
||||
name: uploadFile.name,
|
||||
};
|
||||
|
||||
const observable = from(this.connectorServiceWrite.UploadFile(body));
|
||||
|
||||
const result = await new Promise((resolve, reject) => {
|
||||
observable.subscribe({
|
||||
next(x) {
|
||||
resolve(x);
|
||||
},
|
||||
error(err) {
|
||||
console.log('Observable Error');
|
||||
reject(err);
|
||||
},
|
||||
complete() {
|
||||
console.log('done');
|
||||
},
|
||||
});
|
||||
}).catch((err) => {
|
||||
console.log(err.details);
|
||||
throw new HttpException(
|
||||
err.details,
|
||||
err.code === 6 ? HttpStatus.CONFLICT : 400,
|
||||
@@ -162,9 +200,10 @@ export class ConnectorClientService implements OnModuleInit {
|
||||
return result;
|
||||
}
|
||||
|
||||
async deleteConnector(plugin: string) {
|
||||
async deleteConnector(plugin: string, version: string) {
|
||||
const observable = from(
|
||||
this.connectorServiceWrite.DeleteConnector({
|
||||
version,
|
||||
plugin,
|
||||
}),
|
||||
);
|
||||
|
||||
@@ -15,9 +15,7 @@ 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();
|
||||
@@ -27,6 +25,7 @@ export class LoggerMiddleware implements NestMiddleware {
|
||||
|
||||
verify(idToken, privateKey, (err) => {
|
||||
if (err) {
|
||||
console.log(err);
|
||||
throw new UnauthorizedException();
|
||||
}
|
||||
});
|
||||
@@ -63,6 +62,8 @@ export class LoggerMiddleware implements NestMiddleware {
|
||||
customer,
|
||||
customer_tier,
|
||||
};
|
||||
|
||||
console.log('<-<>->');
|
||||
next();
|
||||
} else {
|
||||
throw new ForbiddenException();
|
||||
|
||||
@@ -11,19 +11,15 @@ import {
|
||||
UseInterceptors,
|
||||
} from '@nestjs/common';
|
||||
import { FileInterceptor } from '@nestjs/platform-express';
|
||||
import {
|
||||
ApiBasicAuth,
|
||||
ApiBearerAuth,
|
||||
ApiConsumes,
|
||||
ApiOAuth2,
|
||||
ApiTags,
|
||||
} from '@nestjs/swagger';
|
||||
import { ApiBearerAuth, ApiConsumes, 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 { DeleteConnectorDto } from './dtos/delete-connector';
|
||||
import { GetAllDto } from './dtos/get-all';
|
||||
import { RemoveTagDto } from './dtos/remove-tag';
|
||||
import { UpdateDto } from './dtos/update';
|
||||
import { UploadFileDto } from './dtos/upload-file';
|
||||
|
||||
@ApiTags('connectors')
|
||||
@ApiBearerAuth()
|
||||
@@ -31,7 +27,7 @@ import { UpdateDto } from './dtos/update';
|
||||
export class ConnectorController {
|
||||
constructor(private connectorClientService: ConnectorClientService) {}
|
||||
|
||||
@Post('/')
|
||||
@Post()
|
||||
@ApiConsumes('multipart/form-data')
|
||||
@UseInterceptors(FileInterceptor('file'))
|
||||
async uploadConnector(
|
||||
@@ -42,10 +38,22 @@ export class ConnectorController {
|
||||
|
||||
const response = await this.connectorClientService.uploadConnector({
|
||||
file,
|
||||
connector: body,
|
||||
connector: JSON.parse(body.connector),
|
||||
});
|
||||
|
||||
console.log('X', response);
|
||||
return response;
|
||||
}
|
||||
|
||||
@Post('/upload')
|
||||
@ApiConsumes('multipart/form-data')
|
||||
@UseInterceptors(FileInterceptor('file'))
|
||||
async uploadFile(@UploadedFile() file, @Body() { name }: UploadFileDto) {
|
||||
console.log(`/upload`, 'Upload Connector Route');
|
||||
|
||||
const response = await this.connectorClientService.uploadFile({
|
||||
file,
|
||||
name,
|
||||
});
|
||||
|
||||
return response;
|
||||
}
|
||||
@@ -171,11 +179,15 @@ export class ConnectorController {
|
||||
}
|
||||
|
||||
@Delete('/:plugin')
|
||||
async deleteConnector(@Param('plugin') plugin: string) {
|
||||
async deleteConnector(
|
||||
@Param('plugin') plugin: string,
|
||||
@Body() { version }: DeleteConnectorDto,
|
||||
) {
|
||||
console.log(`/upload`, 'Upload Connector Route');
|
||||
|
||||
const response: any = await this.connectorClientService.deleteConnector(
|
||||
plugin,
|
||||
version,
|
||||
);
|
||||
|
||||
return {
|
||||
|
||||
@@ -5,33 +5,5 @@ export class CreateConnectorDto {
|
||||
file: string;
|
||||
|
||||
@ApiProperty()
|
||||
category: string;
|
||||
|
||||
@ApiProperty()
|
||||
plugin: string;
|
||||
|
||||
@ApiProperty()
|
||||
image: string;
|
||||
|
||||
@ApiProperty()
|
||||
docs: string;
|
||||
|
||||
@ApiProperty()
|
||||
name: string;
|
||||
|
||||
@ApiProperty({
|
||||
description: 'skip_select_entities: boolean skip_select_columns: boolean;',
|
||||
})
|
||||
options: {
|
||||
skip_select_entities: boolean;
|
||||
skip_select_columns: boolean;
|
||||
};
|
||||
|
||||
@ApiProperty({
|
||||
type: 'array',
|
||||
items: {
|
||||
properties: {},
|
||||
},
|
||||
})
|
||||
connection_controls: object[];
|
||||
connector: string;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
import { ApiProperty } from '@nestjs/swagger';
|
||||
|
||||
export class DeleteConnectorDto {
|
||||
@ApiProperty()
|
||||
version: string;
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
import { ApiProperty } from '@nestjs/swagger';
|
||||
|
||||
export class UploadFileDto {
|
||||
@ApiProperty({ format: 'binary' })
|
||||
file: string;
|
||||
|
||||
@ApiProperty()
|
||||
name: string;
|
||||
}
|
||||
+1
-1
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user