From 0342386a7615ab1a071c39c111c9677c3515f50e Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Thu, 9 Jun 2022 17:14:11 -0300 Subject: [PATCH] oauth almost complete --- package-lock.json | 17 +++-- package.json | 2 +- src/clients/inputs/client.service.ts | 90 +++++++++++++++++++------- src/modules/inputs/dtos/input.model.ts | 20 ++++++ src/modules/inputs/inputs.service.ts | 33 +++++----- src/utils/mustache.ts | 7 ++ 6 files changed, 121 insertions(+), 48 deletions(-) create mode 100644 src/modules/inputs/dtos/input.model.ts create mode 100644 src/utils/mustache.ts diff --git a/package-lock.json b/package-lock.json index 169589b..c1c0ef5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "@nestjs/platform-express": "^8.4.3", "@nestjs/schedule": "^1.1.0", "@nestjs/swagger": "^5.2.1", - "@victorradael/protospack": "2.4.5", + "@victorradael/protospack": "^2.4.6", "axios": "^0.25.0", "cron-parser": "^4.4.0", "dotenv": "^14.2.0", @@ -56,6 +56,9 @@ "ts-node": "^10.7.0", "tsconfig-paths": "^3.14.1", "typescript": "^4.6.3" + }, + "engines": { + "node": "18.3.0" } }, "node_modules/@ampproject/remapping": { @@ -2357,9 +2360,9 @@ } }, "node_modules/@victorradael/protospack": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/@victorradael/protospack/-/protospack-2.4.5.tgz", - "integrity": "sha512-yYitBEvWOIhJytwYuPvwOqysgyAK6awHAdEUeRH7s4emlqtY57Vpr0/p9snRQK5ytnxa9PbrgF5AewSe2/VkNA==", + "version": "2.4.6", + "resolved": "https://registry.npmjs.org/@victorradael/protospack/-/protospack-2.4.6.tgz", + "integrity": "sha512-IShD6T7CcgPbHHXGlYhglHPppQMY6hSf9wrs0SC8VWVuPLuMzrxTRBmFIteqnKpMOoYpzo5egteVwXAixuyhJQ==", "dependencies": { "rxjs": "^7.5.5" } @@ -10932,9 +10935,9 @@ } }, "@victorradael/protospack": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/@victorradael/protospack/-/protospack-2.4.5.tgz", - "integrity": "sha512-yYitBEvWOIhJytwYuPvwOqysgyAK6awHAdEUeRH7s4emlqtY57Vpr0/p9snRQK5ytnxa9PbrgF5AewSe2/VkNA==", + "version": "2.4.6", + "resolved": "https://registry.npmjs.org/@victorradael/protospack/-/protospack-2.4.6.tgz", + "integrity": "sha512-IShD6T7CcgPbHHXGlYhglHPppQMY6hSf9wrs0SC8VWVuPLuMzrxTRBmFIteqnKpMOoYpzo5egteVwXAixuyhJQ==", "requires": { "rxjs": "^7.5.5" } diff --git a/package.json b/package.json index 70b5a2e..bfdaf4e 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "@nestjs/platform-express": "^8.4.3", "@nestjs/schedule": "^1.1.0", "@nestjs/swagger": "^5.2.1", - "@victorradael/protospack": "2.4.5", + "@victorradael/protospack": "2.4.6", "axios": "^0.25.0", "cron-parser": "^4.4.0", "dotenv": "^14.2.0", diff --git a/src/clients/inputs/client.service.ts b/src/clients/inputs/client.service.ts index 33f2e63..58e0285 100644 --- a/src/clients/inputs/client.service.ts +++ b/src/clients/inputs/client.service.ts @@ -1,4 +1,4 @@ -import { OnModuleInit, Inject } from '@nestjs/common'; +import { OnModuleInit, Inject, HttpException } from '@nestjs/common'; import { ClientGrpc } from '@nestjs/microservices'; import { DecodeGrpcStruct, @@ -9,11 +9,14 @@ import { TestConnectionGetColumnsRequest, TestConnectionRequest, } from '@victorradael/protospack'; +import axios from 'axios'; import { lastValueFrom } from 'rxjs'; +import { InputModel } from 'src/modules/inputs/dtos/input.model'; import { objectCamelToSnake, objectSnakeToCamel, } from 'src/utils/CaseConverter'; +import { mustache } from 'src/utils/mustache'; import { IIdRequest, UpdateInputRequest } from './interfaces'; export class InputsClientService implements OnModuleInit { @@ -27,34 +30,22 @@ export class InputsClientService implements OnModuleInit { this.grpcClient.getService('InputService'); } - async create(createInputDto: InputNewCreateRequest) { + async newCreate(createInputDto: InputNewCreateRequest) { console.log('InputClientService', 'Create'); - const createInputResponse = await new Promise((resolve, reject) => { - this.inputService - .NewCreate(objectSnakeToCamel(createInputDto)) - .subscribe({ - next(x) { - resolve(objectCamelToSnake(x)); - }, - error(err) { - console.log('Observable Error'); - reject(err); - }, - complete() { - console.log('done'); - }, - }); - }).catch((err) => { - throw new Error(err); - }); - - return createInputResponse; + return await lastValueFrom( + this.inputService.NewCreate(objectSnakeToCamel(createInputDto)), + ); } async createGeneric(createInputGeneric) { console.log('InputClientService', 'Create'); - const grpcPayload = EncodeJsonToGrpcStruct(createInputGeneric); + const { info, ...data } = createInputGeneric; + createInputGeneric.credentials = await this.getInputTokens(data); + const grpcPayload = { + input: EncodeJsonToGrpcStruct(createInputGeneric), + info, + }; const structPayload = await lastValueFrom( this.inputService.Create(objectSnakeToCamel(grpcPayload)), ); @@ -232,4 +223,57 @@ export class InputsClientService implements OnModuleInit { return getColumnsResponse; } + async getAuthSecrets(plugin) { + switch (plugin) { + case 'hubspot': + return { + client_id: process.env.HUBSPOT_CLIENT_ID, + client_secret: process.env.HUBSPOT_CLIENT_SECRET, + }; + } + return {}; + } + async getInputTokens(input: InputModel) { + const { credentials, options } = input; + const credentialsTokens = {}; + switch (credentials.connection_type) { + case 'oauth': + const { oauth } = options; + const { get_tokens_url_params, get_tokens_set_response } = oauth; + const secrets = await this.getAuthSecrets(input.plugin); + if (oauth.content_type === 'application/x-www-form-urlencoded') { + const requestParams = new URLSearchParams(); + const get_tokens_url_params_string = mustache(get_tokens_url_params, { + ...secrets, + ...credentials, + }); + const get_tokens_url_params_obj = JSON.parse( + get_tokens_url_params_string, + ); + for (const key in get_tokens_url_params_obj) { + const value = get_tokens_url_params_obj[key]; + requestParams.append(key, value); + } + // const { data } = await axios + // .post(options.oauth.get_tokens_url, requestParams) + // .catch((err) => { + // console.log(err.response.data); + // throw new HttpException( + // err.response.data.message, + // err.response.status, + // ); + // }); + const data = { refresh_token: 'refresh', access_token: 'access' }; + for (const key in get_tokens_set_response) { + const responseKey = get_tokens_set_response[key]; + credentialsTokens[key] = data[responseKey]; + } + } + break; + } + return { ...credentials, ...credentialsTokens }; + } + // getOauthTokens(input){ + + // } } diff --git a/src/modules/inputs/dtos/input.model.ts b/src/modules/inputs/dtos/input.model.ts new file mode 100644 index 0000000..4bc5b47 --- /dev/null +++ b/src/modules/inputs/dtos/input.model.ts @@ -0,0 +1,20 @@ +export class InputModel { + category: string; + plugin: string; + name: string; + cron?: string; + credentials?: { + connection_type: string; + oauth: string; + oauth_code: string; + start_date: string; + }; + options?: { + oauth?: { + get_tokens_url: string; + get_tokens_url_params: string; + get_tokens_set_response: Record; + content_type: string; + }; + }; +} diff --git a/src/modules/inputs/inputs.service.ts b/src/modules/inputs/inputs.service.ts index 222abbb..0ec4c18 100644 --- a/src/modules/inputs/inputs.service.ts +++ b/src/modules/inputs/inputs.service.ts @@ -47,28 +47,27 @@ export class InputsService { } async create(@Body() data) { this.validateCron(data); - try { - if ( - data.plugin == 'csv' || - data.plugin == 'json' || - data.plugin == 'parquet' - ) { + let response; + switch (data.plugin.toLowerCase()) { + case 'csv': + case 'json': + case 'parquet': const { info, ...input } = data; const inputPayload = this.generateInputS3Payload(input); - const createInputResponse = await this.inputClient.createS3Inputs({ + response = await this.inputClient.createS3Inputs({ input: inputPayload, info, }); - return createInputResponse; - } else { - const createInputResponse: any = await this.inputClient.create(data); - if (createInputResponse?.input?.input_jdbc) { - return { input: createInputResponse?.input?.input_jdbc }; - } - return createInputResponse; - } - } catch (err) { - throw new HttpException(err.message, HttpStatus.NOT_FOUND); + return response; + case 'oracle': + case 'mysql': + case 'postgresql': + case 'sqlserver': + response = await this.inputClient.newCreate(data); + return { input: response?.input?.input_jdbc }; + default: + response = await this.inputClient.createGeneric(data); + return response; } } diff --git a/src/utils/mustache.ts b/src/utils/mustache.ts new file mode 100644 index 0000000..0f6064a --- /dev/null +++ b/src/utils/mustache.ts @@ -0,0 +1,7 @@ +export const mustache = (string: string, data: Record = {}) => { + return Object.entries(data).reduce((res, [key, value]) => { + const mainRe = new RegExp(`(?