diff --git a/package-lock.json b/package-lock.json index c1c0ef5..b16425b 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.6", + "@victorradael/protospack": "2.4.8", "axios": "^0.25.0", "cron-parser": "^4.4.0", "dotenv": "^14.2.0", @@ -2360,9 +2360,9 @@ } }, "node_modules/@victorradael/protospack": { - "version": "2.4.6", - "resolved": "https://registry.npmjs.org/@victorradael/protospack/-/protospack-2.4.6.tgz", - "integrity": "sha512-IShD6T7CcgPbHHXGlYhglHPppQMY6hSf9wrs0SC8VWVuPLuMzrxTRBmFIteqnKpMOoYpzo5egteVwXAixuyhJQ==", + "version": "2.4.8", + "resolved": "https://registry.npmjs.org/@victorradael/protospack/-/protospack-2.4.8.tgz", + "integrity": "sha512-iwqhytreFlPo6VwsK9LB+Po822178FDZwXn5z5Qk4LvuIsaBPhltmG6IWYY1rZShsdV3qRpiv9DzgiPT1W2edw==", "dependencies": { "rxjs": "^7.5.5" } @@ -10935,9 +10935,9 @@ } }, "@victorradael/protospack": { - "version": "2.4.6", - "resolved": "https://registry.npmjs.org/@victorradael/protospack/-/protospack-2.4.6.tgz", - "integrity": "sha512-IShD6T7CcgPbHHXGlYhglHPppQMY6hSf9wrs0SC8VWVuPLuMzrxTRBmFIteqnKpMOoYpzo5egteVwXAixuyhJQ==", + "version": "2.4.8", + "resolved": "https://registry.npmjs.org/@victorradael/protospack/-/protospack-2.4.8.tgz", + "integrity": "sha512-iwqhytreFlPo6VwsK9LB+Po822178FDZwXn5z5Qk4LvuIsaBPhltmG6IWYY1rZShsdV3qRpiv9DzgiPT1W2edw==", "requires": { "rxjs": "^7.5.5" } diff --git a/package.json b/package.json index bfdaf4e..7c8ee8d 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.6", + "@victorradael/protospack": "2.4.8", "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 58e0285..42d3e2a 100644 --- a/src/clients/inputs/client.service.ts +++ b/src/clients/inputs/client.service.ts @@ -41,14 +41,17 @@ export class InputsClientService implements OnModuleInit { async createGeneric(createInputGeneric) { console.log('InputClientService', 'Create'); const { info, ...data } = createInputGeneric; - createInputGeneric.credentials = await this.getInputTokens(data); + data.credentials = await this.getInputTokens(data); + data.options ? delete data.options : null; + data.credentials.oauth_code ? delete data.credentials.oauth_code : null; const grpcPayload = { - input: EncodeJsonToGrpcStruct(createInputGeneric), + input: EncodeJsonToGrpcStruct(data), info, }; const structPayload = await lastValueFrom( this.inputService.Create(objectSnakeToCamel(grpcPayload)), ); + objectCamelToSnake(structPayload); return DecodeGrpcStruct(structPayload.input); } @@ -254,16 +257,15 @@ export class InputsClientService implements OnModuleInit { 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' }; + 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, + ); + }); for (const key in get_tokens_set_response) { const responseKey = get_tokens_set_response[key]; credentialsTokens[key] = data[responseKey];