Compare commits

..
1 Commits
Author SHA1 Message Date
Rafael Santana eeef97679c Merge pull request #217 from dadosfera/ci/dockerhub
UPDATE: updating maestro to deploy image to dockerhub
2023-11-26 21:18:32 -03:00
16 changed files with 1655 additions and 3036 deletions
+8 -14
View File
@@ -13,11 +13,6 @@ on:
- stg - stg
- stg2 - stg2
- prd - prd
push_to_dockerhub:
description: "Push image to Dockerhub?"
required: true
type: boolean
default: false
jobs: jobs:
extract_environment: extract_environment:
@@ -44,11 +39,11 @@ jobs:
new_release_version: ${{ (steps.semantic.outputs.new_release_published == 'true' && steps.semantic.outputs.new_release_version) || (github.event_name == 'workflow_dispatch' && '0.0.0') }} new_release_version: ${{ (steps.semantic.outputs.new_release_published == 'true' && steps.semantic.outputs.new_release_version) || (github.event_name == 'workflow_dispatch' && '0.0.0') }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v3
- if: github.event_name != 'workflow_dispatch' - if: github.event_name != 'workflow_dispatch'
name: Semantic Release name: Semantic Release
uses: cycjimmy/semantic-release-action@v4 uses: cycjimmy/semantic-release-action@v3
id: semantic id: semantic
with: with:
extra_plugins: | extra_plugins: |
@@ -81,7 +76,7 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v3
- name: Update Pip - name: Update Pip
run: | run: |
@@ -100,14 +95,14 @@ jobs:
python3 -m pip install awsebcli --upgrade python3 -m pip install awsebcli --upgrade
- name: Configure AWS Region - name: Configure AWS Region
uses: aws-actions/configure-aws-credentials@v4 uses: aws-actions/configure-aws-credentials@v1-node16
id: aws id: aws
with: with:
aws-region: us-east-1 aws-region: us-east-1
- name: Login to AWS ECR - name: Login to AWS ECR
id: login_ecr id: login_ecr
uses: aws-actions/amazon-ecr-login@v2 uses: aws-actions/amazon-ecr-login@v1
- name: Build, Tag, and Push Image to AWS ECR - name: Build, Tag, and Push Image to AWS ECR
env: env:
@@ -119,21 +114,20 @@ jobs:
docker-compose -f build.docker-compose.yml push docker-compose -f build.docker-compose.yml push
- name: Login to Docker Hub - name: Login to Docker Hub
if: ${{inputs.push_to_dockerhub}}
uses: docker/login-action@v2 uses: docker/login-action@v2
with: with:
username: dadosfera username: dadosfera
password: ${{ secrets.DOCKERHUB_PASSWORD }} password: ${{ secrets.DOCKERHUB_PASSWORD }}
- name: Build, Tag, and Push Image to Dockerhub - name: Build, Tag, and Push Image to Dockerhub
if: ${{inputs.push_to_dockerhub}}
env: env:
ENV: ${{ needs.extract_environment.outputs.environment }} ENV: ${{ needs.extract_environment.outputs.environment }}
IMAGE_TAG: ${{ needs.semantic_release.outputs.new_release_version }} IMAGE_TAG: ${{ needs.semantic_release.outputs.new_release_version }}
ACCOUNT_ID: ${{ steps.aws.outputs.aws-account-id }} ACCOUNT_ID: ${{ steps.aws.outputs.aws-account-id }}
run: | run: |
docker-compose -f build.docker-compose.dockerhub.yml build docker-compose -f build.docker-compose.dockerhub.yml build
docker-compose -f build.docker-compose.dockerhub.yml push docker-compose -f build.docker-compose.dockerhub.yml push
- name: Create ZIP file to Deploy AWS Beanstalk - name: Create ZIP file to Deploy AWS Beanstalk
env: env:
-1
View File
@@ -12,7 +12,6 @@
"start:debug" "start:debug"
], ],
"runtimeExecutable": "npm", "runtimeExecutable": "npm",
"runtimeVersion": "18.10.0",
"skipFiles": [ "skipFiles": [
"<node_internals>/**" "<node_internals>/**"
], ],
+3 -75
View File
@@ -542,67 +542,6 @@
] ]
} }
}, },
"/auth/oauth/magalu-id": {
"get": {
"operationId": "AuthController_magaluIdOauth",
"parameters": [
{
"name": "dadosfera-lang",
"in": "header",
"required": false,
"schema": {
"enum": [
"pt-br",
"en-us"
],
"type": "string"
}
}
],
"responses": {
"200": {
"description": "",
"content": {
"application/json": {
"schema": {
"type": "boolean"
}
}
}
}
},
"tags": [
"Auth"
]
}
},
"/auth/oauth/magalu-id/callback": {
"get": {
"operationId": "AuthController_magaluIdOauthCallback",
"parameters": [
{
"name": "dadosfera-lang",
"in": "header",
"required": false,
"schema": {
"enum": [
"pt-br",
"en-us"
],
"type": "string"
}
}
],
"responses": {
"200": {
"description": ""
}
},
"tags": [
"Auth"
]
}
},
"/connections": { "/connections": {
"post": { "post": {
"operationId": "ConnectionController_createConnection", "operationId": "ConnectionController_createConnection",
@@ -5010,14 +4949,7 @@
"parameters": [], "parameters": [],
"responses": { "responses": {
"201": { "201": {
"description": "", "description": ""
"content": {
"application/json": {
"schema": {
"type": "object"
}
}
}
} }
}, },
"security": [ "security": [
@@ -5144,7 +5076,7 @@
} }
}, },
"info": { "info": {
"title": "Maestro - ci/dockerhub", "title": "Maestro - feat/generate-token",
"description": "This is the Maestro API", "description": "This is the Maestro API",
"version": "1.0.0", "version": "1.0.0",
"contact": {} "contact": {}
@@ -5368,15 +5300,11 @@
}, },
"accessToken": { "accessToken": {
"type": "string" "type": "string"
},
"refreshToken": {
"type": "string"
} }
}, },
"required": [ "required": [
"permissions", "permissions",
"accessToken", "accessToken"
"refreshToken"
] ]
}, },
"CreateConnectionDto": { "CreateConnectionDto": {
-1
View File
@@ -4,7 +4,6 @@ declare global {
NODE_ENV: 'test'; NODE_ENV: 'test';
ENV: 'local' | 'stg' | 'prd' | 'test'; ENV: 'local' | 'stg' | 'prd' | 'test';
LOCAL_ENV: 'stg' | 'prd'; LOCAL_ENV: 'stg' | 'prd';
CLOUD_ENVIRONMENT: 'aws' | 'gcp' | 'mgc';
DUC_URL: string; DUC_URL: string;
INFACTORY_URL: string; INFACTORY_URL: string;
+1603 -2753
View File
File diff suppressed because it is too large Load Diff
+4 -4
View File
@@ -29,7 +29,7 @@
"dependencies": { "dependencies": {
"@aws-sdk/client-secrets-manager": "^3.112.0", "@aws-sdk/client-secrets-manager": "^3.112.0",
"@dadosfera/dadosfera-logs": "^1.0.0-beta.4", "@dadosfera/dadosfera-logs": "^1.0.0-beta.4",
"@dadosfera/protospack-v2": "3.32.0-beta.2", "@dadosfera/protospack-v2": "3.31.0",
"@grpc/grpc-js": "^1.6.7", "@grpc/grpc-js": "^1.6.7",
"@grpc/proto-loader": "^0.6.13", "@grpc/proto-loader": "^0.6.13",
"@nestjs/cli": "^9.4.2", "@nestjs/cli": "^9.4.2",
@@ -43,7 +43,7 @@
"@nestjs/schematics": "^9.1.0", "@nestjs/schematics": "^9.1.0",
"@nestjs/swagger": "^6.3.0", "@nestjs/swagger": "^6.3.0",
"@nestjs/testing": "^9.4.0", "@nestjs/testing": "^9.4.0",
"axios": "^1.6.2", "axios": "^0.27.2",
"class-transformer": "^0.5.1", "class-transformer": "^0.5.1",
"class-validator": "^0.14.0", "class-validator": "^0.14.0",
"cron-parser": "^4.4.0", "cron-parser": "^4.4.0",
@@ -80,8 +80,8 @@
"@types/passport-google-oauth20": "^2.0.11", "@types/passport-google-oauth20": "^2.0.11",
"@types/passport-oauth2": "^1.4.11", "@types/passport-oauth2": "^1.4.11",
"@types/supertest": "^2.0.12", "@types/supertest": "^2.0.12",
"@typescript-eslint/eslint-plugin": "^5.35.0", "@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.35.0", "@typescript-eslint/parser": "^5.29.0",
"eslint": "^8.18.0", "eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0", "eslint-config-prettier": "^8.5.0",
"eslint-plugin-prettier": "^4.0.0", "eslint-plugin-prettier": "^4.0.0",
+1 -5
View File
@@ -79,13 +79,9 @@ export class AuthenticationGuard
request, request,
mustBeAuthenticated: boolean, mustBeAuthenticated: boolean,
): RequestUser | false { ): RequestUser | false {
const accessToken: string = request.get('Authorization'); const accessToken = request.get('Authorization');
let accessTokenPayload: RequestUser; let accessTokenPayload: RequestUser;
this.logger.info(`mustBeAuthenticated: ${mustBeAuthenticated}`);
this.logger.info(
`accessToken (first 5 chars): ${accessToken?.slice(0, 5)}`,
);
// If the user isn't authenticated, an error will occurr anywhere here. // If the user isn't authenticated, an error will occurr anywhere here.
// Fancy error avoidance isn't performed by purpose, such as avoiding to access null values. // Fancy error avoidance isn't performed by purpose, such as avoiding to access null values.
try { try {
+28 -92
View File
@@ -52,7 +52,6 @@ import jwt from 'jsonwebtoken';
import { LanguageEnum } from 'src/utils/languages.enum'; import { LanguageEnum } from 'src/utils/languages.enum';
import { Language } from 'src/decorators/language.decorator'; import { Language } from 'src/decorators/language.decorator';
import { ApiInternalOnlyEndpoint } from 'src/decorators/swagger.decorator'; import { ApiInternalOnlyEndpoint } from 'src/decorators/swagger.decorator';
import { getFrontendUrl } from 'src/utils/getFrontendBaseUrl';
@ApiTags('Auth') @ApiTags('Auth')
@ApiHeaders([{ name: 'dadosfera-lang', enum: LanguageEnum, required: false }]) @ApiHeaders([{ name: 'dadosfera-lang', enum: LanguageEnum, required: false }])
@@ -60,7 +59,7 @@ import { getFrontendUrl } from 'src/utils/getFrontendBaseUrl';
@Controller('auth') @Controller('auth')
export class AuthController { export class AuthController {
logger: DadosferaLogger; logger: DadosferaLogger;
frontendRedirectUrl: string; redirectUrl: string;
constructor( constructor(
@Inject(DadosferaLogger) @Inject(DadosferaLogger)
@@ -68,7 +67,17 @@ export class AuthController {
private authClient: AuthClientService, private authClient: AuthClientService,
) { ) {
this.logger = dadosferaLogger.logger; this.logger = dadosferaLogger.logger;
this.frontendRedirectUrl = getFrontendUrl('/auth/login').href;
switch (process.env.ENV) {
case 'stg':
this.redirectUrl = `https://app.${process.env.ENV}.dadosfera.ai/auth/login`;
break;
case 'prd':
this.redirectUrl = `https://app.dadosfera.ai/auth/login`;
break;
default:
this.redirectUrl = `http://localhost:4200/auth/login`;
}
} }
@Post('sign-in') @Post('sign-in')
@@ -96,7 +105,7 @@ export class AuthController {
customer_name, customer_name,
language, language,
}); });
this.logger.info(`metadata: ${metadata}`);
return this.authClient.refreshAccessToken({ refreshToken }, metadata); return this.authClient.refreshAccessToken({ refreshToken }, metadata);
} }
@@ -260,13 +269,7 @@ export class AuthController {
@UseGuards(AuthGuard('google-login')) @UseGuards(AuthGuard('google-login'))
@Redirect() @Redirect()
async googleOauthCallback(@Req() req) { async googleOauthCallback(@Req() req) {
const { const { url, email, token, language = 'pt-br' } = await this.callback(req);
url,
email,
token,
refreshToken,
language = 'pt-br',
} = await this.callback(req);
if (url.searchParams.get('error')) { if (url.searchParams.get('error')) {
this.logger.error('/oauth/google - ERROR'); this.logger.error('/oauth/google - ERROR');
return { url: url.href }; return { url: url.href };
@@ -276,7 +279,6 @@ export class AuthController {
.oauthSignIn({ .oauthSignIn({
username: email, username: email,
token, token,
refreshToken,
}) })
.then(({ session }) => { .then(({ session }) => {
this.logger.info('/oauth/google - SUCESS'); this.logger.info('/oauth/google - SUCESS');
@@ -306,79 +308,18 @@ export class AuthController {
return { url: url.href }; return { url: url.href };
} }
@ApiInternalOnlyEndpoint() async callback(req: Request) {
@Get('oauth/magalu-id')
@UseGuards(AuthGuard('magalu-id-login'))
magaluIdOauth() {
this.logger.info('/oauth/magalu-id');
return true;
}
@ApiInternalOnlyEndpoint()
@Get('oauth/magalu-id/callback')
@UseGuards(AuthGuard('magalu-id-login'))
@Redirect()
async magaluIdOauthCallback(@Req() req) {
const {
url,
email,
token,
refreshToken,
language = 'pt-br',
} = await this.callback(req, 'magalu-id');
if (url.searchParams.get('error')) {
this.logger.error('/oauth/magalu-id/callback - ERROR');
this.logger.error(url.searchParams.get('error'));
return { url: url.href };
}
await this.authClient
.oauthSignIn({
username: email,
token,
refreshToken,
})
.then(({ session }) => {
this.logger.info('/oauth/magalu-id/callback - SUCESS');
url.searchParams.set('session', session);
})
.catch((err) => {
this.logger.error('/oauth/magalu-id/callback - LOGIN ERROR');
let error = OauthErrors.INVALID_CREDENTIALS[language].error;
let error_description =
OauthErrors.INVALID_CREDENTIALS[language].error_description;
switch (err.details) {
case ErrorCodes.USER.NOT_FOUND:
error = OauthErrors.USER_NOT_FOUND[language].error;
error_description =
OauthErrors.USER_NOT_FOUND[language].error_description(email);
break;
case ErrorCodes.AUTH.UNAUTHORIZED:
error = OauthErrors.INVALID_SESSION[language].error;
error_description =
OauthErrors.INVALID_SESSION[language].error_description;
break;
}
url.searchParams.set('error', error);
url.searchParams.set('error_description', error_description);
return null;
});
return { url: url.href };
}
async callback(req: Request, oauth_type?: 'google' | 'magalu-id') {
const { error, state } = req.query; const { error, state } = req.query;
const { authInfo } = req; const { authInfo } = req;
const url = new URL(this.frontendRedirectUrl); const url = new URL(this.redirectUrl);
let email, token, refreshToken, error_title, error_description; let email, token, error_title, error_description;
const language: 'pt-br' | 'en-us' = 'pt-br'; let language: 'pt-br' | 'en-us' = 'pt-br';
// let stateObject;
// try { const stateObject = jwt.verify(
// stateObject = jwt.verify(state as string, process.env.JWT_PRIVATE_KEY); state as string,
// } catch (error) { process.env.JWT_PRIVATE_KEY,
// console.log('error', error); );
// } if (typeof stateObject != 'string') language = stateObject.language;
// if (typeof stateObject != 'string') language = stateObject.language;
if (error || !authInfo) { if (error || !authInfo) {
this.logger.error(error); this.logger.error(error);
@@ -389,16 +330,11 @@ export class AuthController {
OauthErrors.INVALID_CREDENTIALS[language].error_description; OauthErrors.INVALID_CREDENTIALS[language].error_description;
if (error) error_description += ` - [${error}]`; if (error) error_description += ` - [${error}]`;
} else { } else {
const { accessToken, refreshToken: rt } = authInfo as any; const { accessToken } = authInfo as any;
const { _json: userInfo = {} } = req.user as any; const { _json: userInfo } = req.user as any;
email = userInfo.email; email = userInfo.email;
token = accessToken; token = accessToken;
refreshToken = rt;
if (oauth_type === 'magalu-id') {
const jwtDecoded = jwt.decode(token, { json: true });
email = jwtDecoded.email;
}
} }
if (error_title) { if (error_title) {
@@ -406,6 +342,6 @@ export class AuthController {
url.searchParams.set('error_description', error_description); url.searchParams.set('error_description', error_description);
} }
return { token, refreshToken, email, url, language }; return { token, email, url, language };
} }
} }
-2
View File
@@ -8,7 +8,6 @@ import { AuthClientService } from './auth.service';
import { DucClient } from '../duc/client.config'; import { DucClient } from '../duc/client.config';
import { GoogleLoginStrategy } from './passport-strategies/google-strategy'; import { GoogleLoginStrategy } from './passport-strategies/google-strategy';
import { getOauthSecrets } from 'src/utils/OauthSecrets'; import { getOauthSecrets } from 'src/utils/OauthSecrets';
import { MagaluIdStrategy } from './passport-strategies/magalu-id-strategy';
const client = new DucClient(); const client = new DucClient();
@Module({ @Module({
@@ -18,7 +17,6 @@ const client = new DucClient();
AuthClientService, AuthClientService,
DadosferaLogger, DadosferaLogger,
GoogleLoginStrategy, GoogleLoginStrategy,
MagaluIdStrategy,
{ provide: 'OAUTH_SECRETS', useValue: getOauthSecrets() }, { provide: 'OAUTH_SECRETS', useValue: getOauthSecrets() },
], ],
exports: [AuthClientService], exports: [AuthClientService],
+3 -3
View File
@@ -17,7 +17,6 @@ import {
AuthResetPasswordRequest, AuthResetPasswordRequest,
AuthVerifyResetPasswordCodeRequest, AuthVerifyResetPasswordCodeRequest,
AuthConfirmResetPasswordRequest, AuthConfirmResetPasswordRequest,
AuthOauthSignInRequest,
} from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/messages'; } from '@dadosfera/protospack-v2/dist/lib/Duc/interfaces/messages';
import { DucClient } from '../duc/client.config'; import { DucClient } from '../duc/client.config';
import { Metadata } from '@grpc/grpc-js'; import { Metadata } from '@grpc/grpc-js';
@@ -163,7 +162,8 @@ export class AuthClientService implements OnModuleInit {
return lastValueFrom(this.authService.AuthGetSession({ session })); return lastValueFrom(this.authService.AuthGetSession({ session }));
} }
async oauthSignIn(data: AuthOauthSignInRequest) { async oauthSignIn(data: { username: string; token: string }) {
return lastValueFrom(this.authService.AuthOauthSignIn(data)); const { username, token } = data;
return lastValueFrom(this.authService.AuthOauthSignIn({ token, username }));
} }
} }
-2
View File
@@ -117,6 +117,4 @@ export class AuthRefreshAccessTokenRes {
permissions: string[]; permissions: string[];
@ApiProperty() @ApiProperty()
accessToken: string; accessToken: string;
@ApiProperty()
refreshToken: string;
} }
@@ -1,47 +0,0 @@
import {
Strategy as Oauth2Strategy,
StrategyOptions,
VerifyCallback,
VerifyFunction,
} from 'passport-oauth2';
import { PassportStrategy } from '@nestjs/passport';
import { Inject, Injectable } from '@nestjs/common';
import { OauthSecrets } from 'src/utils/OauthSecrets';
import { Request } from 'express';
import jwt from 'jsonwebtoken';
@Injectable()
export class MagaluIdStrategy extends PassportStrategy(
Oauth2Strategy,
'magalu-id-login',
) {
redirect_uri: string;
constructor() {
const options: StrategyOptions = {
clientID: process.env.MAGALU_ID_CLIENT_ID,
clientSecret: process.env.MAGALU_ID_CLIENT_SECRET,
callbackURL: process.env.MAGALU_ID_CALLBACK_URL,
scope: ['openid'],
authorizationURL: 'https://id.magalu.com/login',
tokenURL: 'https://id.magalu.com/oauth/token',
};
const verify: VerifyFunction = (
accessToken: string,
refreshToken: string,
profile: any,
verified: VerifyCallback,
) => {
return verified(null, profile, { accessToken, refreshToken });
};
super(options, verify);
}
// authenticate(req: Request, options: Record<string, any>) {
// const language =
// req.headers['dadosfera-lang'] || req.query.language || 'pt-br';
// // options.state = jwt.sign({ language }, process.env.JWT_PRIVATE_KEY);
// super.authenticate(req, options);
// console.log('authenticate', JSON.stringify(options));
// }
}
+1 -7
View File
@@ -49,16 +49,10 @@ class CatalogService implements OnModuleInit {
_getNimbusUrl(body) { _getNimbusUrl(body) {
const customer = body.info.customer.toLowerCase(); const customer = body.info.customer.toLowerCase();
const cloud_environment = process.env.CLOUD_ENVIRONMENT || 'aws'; if (process.env.ENV === 'prd') {
if (process.env.ENV === 'prd' && cloud_environment === 'aws') {
return `https://nimbus-${customer}.dadosfera.ai`; return `https://nimbus-${customer}.dadosfera.ai`;
} }
if (process.env.ENV === 'prd' && cloud_environment === 'mgc') {
return `https://nimbus-${customer}.dadosfera.com`;
}
return `https://nimbus-${customer}.${process.env.ENV.replace( return `https://nimbus-${customer}.${process.env.ENV.replace(
'local', 'local',
'stg', 'stg',
@@ -15,8 +15,6 @@ export class MixpanelController {
@Post(':id') @Post(':id')
async trackEvent(@Param('id') id, @Body() body, @User() user: RequestUser) { async trackEvent(@Param('id') id, @Body() body, @User() user: RequestUser) {
delete body.info; delete body.info;
//TODO: remove this when mixpanel track is working
return true;
const mixpanel = init(this.mixpanelToken); const mixpanel = init(this.mixpanelToken);
const separator = user.username.includes('-') ? '-' : '.'; const separator = user.username.includes('-') ? '-' : '.';
+2 -6
View File
@@ -152,9 +152,7 @@ export class UsersController {
}); });
this.logger.info('createUser', { user }); this.logger.info('createUser', { user });
this.userService.setLanguage(language); this.userService.setLanguage(language);
this.logger.info(`user: ${user}`);
this.logger.info(`body: ${body}`);
this.logger.info(`metadata: ${metadata}`);
return await this.userService.createUser(body, metadata); return await this.userService.createUser(body, metadata);
} }
@@ -173,9 +171,7 @@ export class UsersController {
access_token: user.access_token, access_token: user.access_token,
language, language,
}); });
this.logger.info(`user: ${user}`);
this.logger.info(`body: ${body}`);
this.logger.info(`metadata: ${metadata}`);
return await this.userService.batchCreateUser(body, metadata); return await this.userService.batchCreateUser(body, metadata);
} }
-20
View File
@@ -1,20 +0,0 @@
import getEnv from './getEnv';
export function getFrontendUrl(path?: string): URL {
const frontendUrl = new URL('https://app.dadosfera.ai');
if (path) frontendUrl.pathname = path;
const env = getEnv();
if (process.env.ENV === 'local') {
frontendUrl.protocol = 'http';
frontendUrl.host = 'localhost:4200';
return frontendUrl;
}
if (process.env.CLOUD_ENVIRONMENT === 'mgc')
frontendUrl.host = 'app.dadosfera.com';
if (env !== 'prd')
frontendUrl.host = frontendUrl.host.replace('app.', `app.${env}.`);
return frontendUrl;
}