From cc4cc99ccc328bc70a017758ffc6719e709fa1d1 Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Sat, 9 Dec 2023 11:58:03 -0300 Subject: [PATCH] FEAT: new refreshToken response - temporarily disable mixpanel tracking --- docsfera.json | 15 +++++++++++++-- package-lock.json | 14 +++++++------- package.json | 2 +- src/modules/auth/auth.controller.ts | 6 +++--- src/modules/auth/dtos/login.ts | 2 ++ src/modules/mixpanel/mixpanel.controller.ts | 2 ++ 6 files changed, 28 insertions(+), 13 deletions(-) diff --git a/docsfera.json b/docsfera.json index d4f616a..21ce95e 100644 --- a/docsfera.json +++ b/docsfera.json @@ -5010,7 +5010,14 @@ "parameters": [], "responses": { "201": { - "description": "" + "description": "", + "content": { + "application/json": { + "schema": { + "type": "object" + } + } + } } }, "security": [ @@ -5361,11 +5368,15 @@ }, "accessToken": { "type": "string" + }, + "refreshToken": { + "type": "string" } }, "required": [ "permissions", - "accessToken" + "accessToken", + "refreshToken" ] }, "CreateConnectionDto": { diff --git a/package-lock.json b/package-lock.json index 0e48d2b..dd2fd2a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "dependencies": { "@aws-sdk/client-secrets-manager": "^3.112.0", "@dadosfera/dadosfera-logs": "^1.0.0-beta.4", - "@dadosfera/protospack-v2": "3.32.0-beta.1", + "@dadosfera/protospack-v2": "3.32.0-beta.2", "@grpc/grpc-js": "^1.6.7", "@grpc/proto-loader": "^0.6.13", "@nestjs/cli": "^9.4.2", @@ -1453,9 +1453,9 @@ } }, "node_modules/@dadosfera/protospack-v2": { - "version": "3.32.0-beta.1", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.32.0-beta.1.tgz", - "integrity": "sha512-JEZ6qe3kJNf7e2gktg121LHqL06sfAw4jF19QDWCqs4xIghlo1DocGaatWeHXHwlMAKl5wbSoYwmjUDfh762bA==", + "version": "3.32.0-beta.2", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.32.0-beta.2.tgz", + "integrity": "sha512-0RTlTR2Ihaffz1M7I73tHufLiFUJhQ/ofIQPacoHFzvPOCAL1Sn2cKpp1Vlgfl1XHAr94KQqztQGglf6KpgCHA==", "dependencies": { "@grpc/grpc-js": "^1.9.3", "rxjs": "^7.5.5", @@ -12385,9 +12385,9 @@ } }, "@dadosfera/protospack-v2": { - "version": "3.32.0-beta.1", - "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.32.0-beta.1.tgz", - "integrity": "sha512-JEZ6qe3kJNf7e2gktg121LHqL06sfAw4jF19QDWCqs4xIghlo1DocGaatWeHXHwlMAKl5wbSoYwmjUDfh762bA==", + "version": "3.32.0-beta.2", + "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.32.0-beta.2.tgz", + "integrity": "sha512-0RTlTR2Ihaffz1M7I73tHufLiFUJhQ/ofIQPacoHFzvPOCAL1Sn2cKpp1Vlgfl1XHAr94KQqztQGglf6KpgCHA==", "requires": { "@grpc/grpc-js": "^1.9.3", "rxjs": "^7.5.5", diff --git a/package.json b/package.json index ccfd7fd..4cc626b 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "dependencies": { "@aws-sdk/client-secrets-manager": "^3.112.0", "@dadosfera/dadosfera-logs": "^1.0.0-beta.4", - "@dadosfera/protospack-v2": "3.32.0-beta.1", + "@dadosfera/protospack-v2": "3.32.0-beta.2", "@grpc/grpc-js": "^1.6.7", "@grpc/proto-loader": "^0.6.13", "@nestjs/cli": "^9.4.2", diff --git a/src/modules/auth/auth.controller.ts b/src/modules/auth/auth.controller.ts index 9a32e69..4cb12e1 100644 --- a/src/modules/auth/auth.controller.ts +++ b/src/modules/auth/auth.controller.ts @@ -60,7 +60,7 @@ import { getFrontendUrl } from 'src/utils/getFrontendBaseUrl'; @Controller('auth') export class AuthController { logger: DadosferaLogger; - frontendRedirectUrl: URL; + frontendRedirectUrl: string; constructor( @Inject(DadosferaLogger) @@ -68,7 +68,7 @@ export class AuthController { private authClient: AuthClientService, ) { this.logger = dadosferaLogger.logger; - this.frontendRedirectUrl = getFrontendUrl('/auth/login'); + this.frontendRedirectUrl = getFrontendUrl('/auth/login').href; } @Post('sign-in') @@ -369,7 +369,7 @@ export class AuthController { async callback(req: Request, oauth_type?: 'google' | 'magalu-id') { const { error, state } = req.query; const { authInfo } = req; - const url = this.frontendRedirectUrl; + const url = new URL(this.frontendRedirectUrl); let email, token, refreshToken, error_title, error_description; const language: 'pt-br' | 'en-us' = 'pt-br'; // let stateObject; diff --git a/src/modules/auth/dtos/login.ts b/src/modules/auth/dtos/login.ts index 33a779b..ea18338 100644 --- a/src/modules/auth/dtos/login.ts +++ b/src/modules/auth/dtos/login.ts @@ -117,4 +117,6 @@ export class AuthRefreshAccessTokenRes { permissions: string[]; @ApiProperty() accessToken: string; + @ApiProperty() + refreshToken: string; } diff --git a/src/modules/mixpanel/mixpanel.controller.ts b/src/modules/mixpanel/mixpanel.controller.ts index 76f7809..7876096 100644 --- a/src/modules/mixpanel/mixpanel.controller.ts +++ b/src/modules/mixpanel/mixpanel.controller.ts @@ -15,6 +15,8 @@ export class MixpanelController { @Post(':id') async trackEvent(@Param('id') id, @Body() body, @User() user: RequestUser) { delete body.info; + //TODO: remove this when mixpanel track is working + return true; const mixpanel = init(this.mixpanelToken); const separator = user.username.includes('-') ? '-' : '.';