From 1f0c750bdcf659366198422873cbac43670b3d47 Mon Sep 17 00:00:00 2001 From: guimroque Date: Tue, 20 Feb 2024 22:20:05 -0300 Subject: [PATCH 01/17] fix(bsafe): version on sdk --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 7e9b89ead..235595ede 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,6 @@ "database:dev": "make -C ./docker/database start env_file=.env.dev", "database:stop": "make -C ./docker/database start", "database:start": "make -C ./docker/database start", - "postinstall": "patch-package --use-yarn", "run:prod": "make -C ./ prod env_file=.env.prod", "run:stg": "make -C ./ stg env_file=.env.staging" }, @@ -26,7 +25,7 @@ "axios": "1.5.1", "bcrypt": "5.1.0", "body-parser": "1.20.2", - "bsafe": "0.0.35", + "bsafe": "0.0.40", "cheerio": "1.0.0-rc.12", "class-validator": "0.14.0", "cookie-parser": "1.4.6", From 3339dd3d7aee50f66e3de45fda853098d981fcc8 Mon Sep 17 00:00:00 2001 From: guimroque Date: Tue, 20 Feb 2024 22:31:54 -0300 Subject: [PATCH 02/17] fix(node): increase version --- Dockerfile.stg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.stg b/Dockerfile.stg index ea04e620d..77c106541 100644 --- a/Dockerfile.stg +++ b/Dockerfile.stg @@ -1,4 +1,4 @@ -FROM node:18.14.2 +FROM node:18.18.2 # Create app directory From e796814ed8e8fdc2c2e06c4f91ec3ccd9ec54b9d Mon Sep 17 00:00:00 2001 From: luisburigo Date: Tue, 20 Feb 2024 22:41:01 -0300 Subject: [PATCH 03/17] chore: change import defaultConfig --- src/modules/workspace/controller.ts | 4 ++-- src/modules/workspace/services.ts | 4 ++-- src/utils/configurable.ts | 2 +- src/utils/testUtils/Wallet.ts | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/modules/workspace/controller.ts b/src/modules/workspace/controller.ts index e11f5a578..a35f1d046 100644 --- a/src/modules/workspace/controller.ts +++ b/src/modules/workspace/controller.ts @@ -1,5 +1,5 @@ import axios from 'axios'; -import { Vault, defaultConfigurable } from 'bsafe'; +import { Vault, defaultConfig } from 'bsafe'; import { BN, Provider, bn } from 'fuels'; import { parse } from 'path'; @@ -218,7 +218,7 @@ export class WorkspaceController { if (!data) { return await new UserService().create({ address: member, - provider: defaultConfigurable['provider'], + provider: defaultConfig['provider'], avatar: await new UserService().randomAvatar(), }); } diff --git a/src/modules/workspace/services.ts b/src/modules/workspace/services.ts index 2eb91a767..25497f8f5 100644 --- a/src/modules/workspace/services.ts +++ b/src/modules/workspace/services.ts @@ -1,4 +1,4 @@ -import { defaultConfigurable } from 'bsafe'; +import { defaultConfig } from 'bsafe'; import { Brackets } from 'typeorm'; import { User } from '@src/models'; @@ -162,7 +162,7 @@ export class WorkspaceService implements IWorkspaceService { if (!data) { return await new UserService().create({ address: member, - provider: defaultConfigurable['provider'], + provider: defaultConfig['provider'], avatar: await new UserService().randomAvatar(), }); } diff --git a/src/utils/configurable.ts b/src/utils/configurable.ts index f886ed32f..e10b2d9dc 100644 --- a/src/utils/configurable.ts +++ b/src/utils/configurable.ts @@ -1,4 +1,4 @@ -import { defaultConfigurable as conf } from 'bsafe'; +import { defaultConfig as conf } from 'bsafe'; export const defaultConfigurable = { provider: conf['provider'], diff --git a/src/utils/testUtils/Wallet.ts b/src/utils/testUtils/Wallet.ts index 1b211511d..eb84f3ba3 100644 --- a/src/utils/testUtils/Wallet.ts +++ b/src/utils/testUtils/Wallet.ts @@ -1,10 +1,10 @@ -import { defaultConfigurable, Vault } from 'bsafe'; +import { defaultConfig, Vault } from 'bsafe'; import { BN, Wallet, Provider } from 'fuels'; import { assets } from '@src/mocks/assets'; export const txParams = { - gasPrice: defaultConfigurable.gasPrice, + gasPrice: defaultConfig.GAS_PRICE, }; export const sendPredicateCoins = async ( @@ -15,7 +15,7 @@ export const sendPredicateCoins = async ( ) => { const wallet = Wallet.fromPrivateKey( rootWallet, - await Provider.create(defaultConfigurable.provider), + await Provider.create(defaultConfig.PROVIDER), ); // console.log( // '[ROOT_BALANCE]: ', @@ -31,7 +31,7 @@ export const sendPredicateCoins = async ( }; export const signBypK = async (message: string, privateKey: string) => { - const provider = await Provider.create(defaultConfigurable.provider); + const provider = await Provider.create(defaultConfig.PROVIDER); const signer = Wallet.fromPrivateKey(privateKey, provider); return signer.signMessage(message); }; From 9dceb7a1ffdb3c11f4632c1b7ab2513f2838f6cf Mon Sep 17 00:00:00 2001 From: luisburigo Date: Tue, 20 Feb 2024 22:42:16 -0300 Subject: [PATCH 04/17] chore: change import defaultConfig --- src/modules/user/__tests__/user.tests.ts | 2 +- src/server/index.ts | 4 ++-- src/socket/types.ts | 4 +--- src/utils/testUtils/Auth.ts | 2 +- src/utils/testUtils/Workspace.ts | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/modules/user/__tests__/user.tests.ts b/src/modules/user/__tests__/user.tests.ts index af165886a..d10f02e81 100644 --- a/src/modules/user/__tests__/user.tests.ts +++ b/src/modules/user/__tests__/user.tests.ts @@ -1,5 +1,5 @@ import axios from 'axios'; -import { accounts } from 'bsafe/dist/cjs/mocks/accounts'; +import { accounts } from 'bsafe'; import { Address } from 'fuels'; import { networks, providers } from '@src/mocks/networks'; diff --git a/src/server/index.ts b/src/server/index.ts index 39925fbf4..dfe1914b1 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -10,8 +10,8 @@ const start = async () => { }; BSafe.setup({ - api_url: process.env.API_URL, - bsafe_url: process.env.UI_URL, + API_URL: process.env.API_URL, + BSAFE_URL: process.env.UI_URL, }); try { diff --git a/src/socket/types.ts b/src/socket/types.ts index eb8c54c13..f4e55c06b 100644 --- a/src/socket/types.ts +++ b/src/socket/types.ts @@ -1,5 +1,3 @@ -import { Operation } from '@fuel-ts/providers'; - export enum SocketEvents { //auth CONNECTION = 'connection', @@ -44,7 +42,7 @@ export interface BaseSocketEvent { origin: string; name?: string; hash?: string; - operations?: Operation[]; + operations?: unknown[]; } export interface ISocketEvent { diff --git a/src/utils/testUtils/Auth.ts b/src/utils/testUtils/Auth.ts index 8d4c6b7a0..2faf3c485 100644 --- a/src/utils/testUtils/Auth.ts +++ b/src/utils/testUtils/Auth.ts @@ -1,6 +1,6 @@ import axios, { AxiosInstance } from 'axios'; import { IBSAFEAuth } from 'bsafe'; -import { IDefaultAccount } from 'bsafe/dist/cjs/mocks/accounts'; +import { IDefaultAccount } from 'bsafe'; import { createHash } from 'crypto'; import { Provider, Wallet } from 'fuels'; diff --git a/src/utils/testUtils/Workspace.ts b/src/utils/testUtils/Workspace.ts index fb337e2a0..a84b4d7ce 100644 --- a/src/utils/testUtils/Workspace.ts +++ b/src/utils/testUtils/Workspace.ts @@ -1,4 +1,4 @@ -import { accounts } from 'bsafe/dist/cjs/mocks/accounts'; +import { accounts } from 'bsafe'; import e from 'express'; import { Address } from 'fuels'; From c4766958bdaef18cc17135c05a0014ba6e71cdd3 Mon Sep 17 00:00:00 2001 From: guimroque Date: Tue, 20 Feb 2024 22:59:10 -0300 Subject: [PATCH 05/17] fix(node): increase version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 235595ede..e1372fb6d 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "axios": "1.5.1", "bcrypt": "5.1.0", "body-parser": "1.20.2", - "bsafe": "0.0.40", + "bsafe": "0.0.41", "cheerio": "1.0.0-rc.12", "class-validator": "0.14.0", "cookie-parser": "1.4.6", From a1d4415683ac860aff46fa362b9ae907a0efe142 Mon Sep 17 00:00:00 2001 From: guimroque Date: Tue, 20 Feb 2024 23:12:44 -0300 Subject: [PATCH 06/17] fix(node): increase version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e1372fb6d..c7a4c15fc 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "axios": "1.5.1", "bcrypt": "5.1.0", "body-parser": "1.20.2", - "bsafe": "0.0.41", + "bsafe": "0.0.42", "cheerio": "1.0.0-rc.12", "class-validator": "0.14.0", "cookie-parser": "1.4.6", From bc65dc96734ca33170ec6adc2fd5c65e97ca2c92 Mon Sep 17 00:00:00 2001 From: guimroque Date: Tue, 20 Feb 2024 23:31:31 -0300 Subject: [PATCH 07/17] fix(node): increase version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c7a4c15fc..670f532b9 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "axios": "1.5.1", "bcrypt": "5.1.0", "body-parser": "1.20.2", - "bsafe": "0.0.42", + "bsafe": "0.0.43", "cheerio": "1.0.0-rc.12", "class-validator": "0.14.0", "cookie-parser": "1.4.6", From 9124cb1188e0b4d216bfbd2b87767e3c901c6b56 Mon Sep 17 00:00:00 2001 From: luisburigo Date: Wed, 21 Feb 2024 13:54:04 -0300 Subject: [PATCH 08/17] fix: configurables props --- src/utils/configurable.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/utils/configurable.ts b/src/utils/configurable.ts index e10b2d9dc..bd6c7d848 100644 --- a/src/utils/configurable.ts +++ b/src/utils/configurable.ts @@ -1,8 +1,8 @@ import { defaultConfig as conf } from 'bsafe'; export const defaultConfigurable = { - provider: conf['provider'], - gasPrice: conf['gasPrice'], - gasLimit: conf['gasLimit'], + provider: conf['PROVIDER'], + gasPrice: conf['GAS_PRICE'], + gasLimit: conf['GAS_LIMIT'], chainId: conf['chainId'], }; From 7c46079960b1b7c41ba7d2027f58812637e8f1a4 Mon Sep 17 00:00:00 2001 From: pedroanastacio Date: Thu, 22 Feb 2024 11:33:55 -0300 Subject: [PATCH 09/17] fix(email-templates): removes styling from links used in emails --- src/templates/transaction-completed.html | 11 +++-------- src/templates/transaction-created.html | 11 +++-------- src/templates/transaction-declined.html | 11 +++-------- src/templates/transaction-signed.html | 11 +++-------- src/templates/vault-created.html | 11 +++-------- 5 files changed, 15 insertions(+), 40 deletions(-) diff --git a/src/templates/transaction-completed.html b/src/templates/transaction-completed.html index 5d39dc058..ff5c7f3c0 100644 --- a/src/templates/transaction-completed.html +++ b/src/templates/transaction-completed.html @@ -12,11 +12,6 @@ font-family: Roboto, Arial, Helvetica, sans-serif; } - a { - text-decoration: none; - color: #000000 !important; - } - .Body { max-width: 100%; width: 585px; @@ -75,9 +70,9 @@

- To view your transaction details, please click - here to log in to your BSAFE account and navigate - to your vault. + To view your transaction details, please + click here to log in to your BSAFE account and + navigate to your vault.
diff --git a/src/templates/transaction-created.html b/src/templates/transaction-created.html index f4958d6a9..7325a7f55 100644 --- a/src/templates/transaction-created.html +++ b/src/templates/transaction-created.html @@ -12,11 +12,6 @@ font-family: Roboto, Arial, Helvetica, sans-serif; } - a { - text-decoration: none; - color: #000000 !important; - } - .Body { max-width: 100%; width: 585px; @@ -75,9 +70,9 @@

- To view your transaction details, please click - here to log in to your BSAFE account and navigate - to your vault. + To view your transaction details, please + click here to log in to your BSAFE account and + navigate to your vault.
diff --git a/src/templates/transaction-declined.html b/src/templates/transaction-declined.html index cae3e8f9c..33ba04d3f 100644 --- a/src/templates/transaction-declined.html +++ b/src/templates/transaction-declined.html @@ -12,11 +12,6 @@ font-family: Roboto, Arial, Helvetica, sans-serif; } - a { - text-decoration: none; - color: #000000 !important; - } - .Body { max-width: 100%; width: 585px; @@ -75,9 +70,9 @@

- To view your transaction details, please click - here to log in to your BSAFE account and navigate - to your vault. + To view your transaction details, please + click here to log in to your BSAFE account and + navigate to your vault.
diff --git a/src/templates/transaction-signed.html b/src/templates/transaction-signed.html index 2132ae712..6d8c48686 100644 --- a/src/templates/transaction-signed.html +++ b/src/templates/transaction-signed.html @@ -12,11 +12,6 @@ font-family: Roboto, Arial, Helvetica, sans-serif; } - a { - text-decoration: none; - color: #000000 !important; - } - .Body { max-width: 100%; width: 585px; @@ -75,9 +70,9 @@

- To view your transaction details, please click - here to log in to your BSAFE account and navigate - to your vault. + To view your transaction details, please + click here to log in to your BSAFE account and + navigate to your vault.
diff --git a/src/templates/vault-created.html b/src/templates/vault-created.html index efb45c0b1..09b3cd45e 100644 --- a/src/templates/vault-created.html +++ b/src/templates/vault-created.html @@ -12,11 +12,6 @@ font-family: Roboto, Arial, Helvetica, sans-serif; } - a { - text-decoration: none; - color: #000000 !important; - } - .Body { max-width: 100%; width: 585px; @@ -74,9 +69,9 @@

- To view your vault details, please click - here to log in to your BSAFE account and navigate - to your vault. + To view your vault details, please + click here to log in to your BSAFE account and + navigate to your vault.
From aecfbb17f4dea4099a783180c3b5efe5f8fa90fc Mon Sep 17 00:00:00 2001 From: guimroque Date: Thu, 22 Feb 2024 14:14:18 -0300 Subject: [PATCH 10/17] fix(adb): adb returns --- .env | 3 +- .gitignore | 1 + src/middlewares/auth/types.ts | 6 ++++ src/modules/addressBook/controller.ts | 44 +++++++++++++++++++++------ src/modules/addressBook/services.ts | 8 ++++- src/modules/addressBook/types.ts | 2 +- src/modules/auth/controller.ts | 16 ++++------ src/modules/auth/types.ts | 5 +-- src/modules/predicate/controller.ts | 17 ++--------- src/modules/predicate/services.ts | 1 + 10 files changed, 64 insertions(+), 39 deletions(-) diff --git a/.env b/.env index f1c495d9f..b18fdb186 100644 --- a/.env +++ b/.env @@ -10,7 +10,8 @@ API_PORT=3333 API_NAME=bsafe-api API_DOCKERFILE= API_ENVIRONMENT=development -UI_URL=http://localhost:5175 +#UI_URL=http://localhost:5175 +UI_URL=https://app.bsafe.pro API_URL=http://localhost:3333 # Admin user diff --git a/.gitignore b/.gitignore index e206e2456..6d441cf55 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ yarn.lock package-lock.json .editorconfig bsafe/ +pnpm-lock.yaml #env .env.staging diff --git a/src/middlewares/auth/types.ts b/src/middlewares/auth/types.ts index 7a24b4b66..68c7b3b3b 100644 --- a/src/middlewares/auth/types.ts +++ b/src/middlewares/auth/types.ts @@ -19,4 +19,10 @@ export interface AuthValidatedRequest workspace?: Workspace; } +export interface UnloggedRequest extends Request { + body: T[ContainerTypes.Body]; + headers: T[ContainerTypes.Headers]; +} + export type IAuthRequest = AuthValidatedRequest; +export type IChangeWorkspaceRequest = AuthValidatedRequest; diff --git a/src/modules/addressBook/controller.ts b/src/modules/addressBook/controller.ts index 069d32057..deac03517 100644 --- a/src/modules/addressBook/controller.ts +++ b/src/modules/addressBook/controller.ts @@ -149,20 +149,46 @@ export class AddressBookController { try { const owner = [workspace.id]; - if (includePersonal) { - await new WorkspaceService() - .filter({ - user: user.id, - single: true, - }) - .list() - .then((response: Workspace[]) => owner.push(response[0].id)); + const singleWk = await new WorkspaceService() + .filter({ + user: user.id, + single: true, + }) + .list() + .then((response: Workspace[]) => response[0].id); + + if (includePersonal === 'true') { + owner.push(singleWk); } + const response = await this.addressBookService .filter({ owner, q }) .ordination({ orderBy, sort }) .paginate({ page, perPage }) - .list(); + .list() + .then((res: AddressBook[]) => { + return res.reduce((acc, currentItem) => { + const existingItem = acc.find( + item => item.user.id === currentItem.user.id, + ); + + if (!existingItem) { + acc.push(currentItem); + return acc; + } + // Se já existe, retornar de preferencia o que tem o wk igual ao single + if ( + currentItem.owner.id === (includePersonal ? singleWk : workspace.id) + ) { + const existingIndex = acc.findIndex( + item => item.user.id === currentItem.user.id, + ); + acc[existingIndex] = currentItem; + } + + return acc; + }, []); + }); return successful(response, Responses.Ok); } catch (e) { diff --git a/src/modules/addressBook/services.ts b/src/modules/addressBook/services.ts index b28b552ef..a18da17d4 100644 --- a/src/modules/addressBook/services.ts +++ b/src/modules/addressBook/services.ts @@ -56,7 +56,13 @@ export class AddressBookService implements IAddressBookService { .select(['ab.id', 'ab.nickname']) .innerJoin('ab.user', 'user') .innerJoin('ab.owner', 'owner') - .addSelect(['user.id', 'user.address', 'user.avatar', 'owner.id']); + .addSelect([ + 'user.id', + 'user.address', + 'user.avatar', + 'user.address', + 'owner.id', + ]); const handleInternalError = e => { if (e instanceof GeneralError) throw e; diff --git a/src/modules/addressBook/types.ts b/src/modules/addressBook/types.ts index 2fef11e2f..8414ce613 100644 --- a/src/modules/addressBook/types.ts +++ b/src/modules/addressBook/types.ts @@ -65,7 +65,7 @@ interface IListAddressBookRequestSchema extends ValidatedRequestSchema { sort: Sort; page: string; perPage: string; - includePersonal: boolean; + includePersonal: string; }; } diff --git a/src/modules/auth/controller.ts b/src/modules/auth/controller.ts index 47ec642b2..61c20ad6e 100644 --- a/src/modules/auth/controller.ts +++ b/src/modules/auth/controller.ts @@ -15,7 +15,12 @@ import { Responses, successful, bindMethods, Web3Utils } from '@utils/index'; import { IUserService } from '../user/types'; import { WorkspaceService } from '../workspace/services'; -import { IAuthService, IChangeWorkspaceRequest, ISignInRequest } from './types'; +import { + IAuthService, + IChangeWorkspaceRequest, + IGoToSingleWorkspaceRequest, + ISignInRequest, +} from './types'; export class AuthController { private authService: IAuthService; @@ -89,7 +94,6 @@ export class AuthController { async updateWorkspace(req: IChangeWorkspaceRequest) { try { const { workspace: workspaceId, user } = req.body; - const workspace = await new WorkspaceService() .filter({ id: workspaceId }) .list() @@ -104,14 +108,6 @@ export class AuthController { const isUserMember = workspace.members.find(m => m.id === user); - // if (!isUserMember) { - // throw new Unauthorized({ - // type: ErrorTypes.NotFound, - // title: UnauthorizedErrorTitles.INVALID_PERMISSION, - // detail: `User not found`, - // }); - // } - const token = await this.authService.findToken({ userId: user, }); diff --git a/src/modules/auth/types.ts b/src/modules/auth/types.ts index c8e549423..ef43938a8 100644 --- a/src/modules/auth/types.ts +++ b/src/modules/auth/types.ts @@ -5,7 +5,7 @@ import { IPermissions, Workspace } from '@src/models/Workspace'; import UserToken, { Encoder } from '@models/UserToken'; import { User } from '@models/index'; -import { AuthValidatedRequest } from '@middlewares/auth/types'; +import { AuthValidatedRequest, UnloggedRequest } from '@middlewares/auth/types'; export interface ICreateUserTokenPayload { token: string; @@ -93,7 +93,8 @@ export interface IUpgradeWorkspace extends ValidatedRequestSchema { } export type IListRequest = AuthValidatedRequest; -export type ISignInRequest = AuthValidatedRequest; +export type ISignInRequest = UnloggedRequest; +export type IGoToSingleWorkspaceRequest = AuthValidatedRequest; export type IFindDappRequest = AuthValidatedRequest; export type IActiveSession = AuthValidatedRequest; export type IChangeWorkspaceRequest = AuthValidatedRequest; diff --git a/src/modules/predicate/controller.ts b/src/modules/predicate/controller.ts index 529c7f57d..52eedc264 100644 --- a/src/modules/predicate/controller.ts +++ b/src/modules/predicate/controller.ts @@ -120,24 +120,11 @@ export class PredicateController { } } - async findById({ params: { id }, user, workspace }: IFindByIdRequest) { + async findById({ params: { id }, user }: IFindByIdRequest) { try { const predicate = await this.predicateService.findById(id, user.address); - const membersIds = predicate.members.map(member => member.id); - const favorites = (await this.addressBookService - .filter({ owner: [workspace.id], userIds: membersIds }) - .list()) as AddressBook[]; - const response = { - ...predicate, - members: predicate.members.map(member => ({ - ...member, - nickname: - favorites?.find(({ user }) => user.id === member.id)?.nickname ?? - undefined, - })), - }; - return successful(response, Responses.Ok); + return successful(predicate, Responses.Ok); } catch (e) { return error(e.error, e.statusCode); } diff --git a/src/modules/predicate/services.ts b/src/modules/predicate/services.ts index dc9838de0..2566fd503 100644 --- a/src/modules/predicate/services.ts +++ b/src/modules/predicate/services.ts @@ -205,6 +205,7 @@ export class PredicateService implements IPredicateService { if (this._filter.signer) { qb.orWhere(subQb => { const subQuery = subQb + //@ts-ignore .subQuery() .select('1') .from('predicate_members', 'pm') From b8343b476eb15f56194ce88a6d74e1534920b8f8 Mon Sep 17 00:00:00 2001 From: guimroque Date: Thu, 22 Feb 2024 15:35:28 -0300 Subject: [PATCH 11/17] fix(build): fixed build --- Dockerfile | 8 ++-- Dockerfile.stg | 6 +-- package.json | 13 ++++--- ...64-add-parovider-and-connected-to-users.ts | 25 ++++++------ ...1695163991051-add-collumns-to-usertoken.ts | 38 +++++++++---------- ...1695646779754-add-collumn-to-user-token.ts | 13 +++---- ...dd-notifications-columns-to-users-table.ts | 27 ++++++------- src/modules/predicate/services.ts | 1 + src/modules/transaction/services.ts | 2 + 9 files changed, 68 insertions(+), 65 deletions(-) diff --git a/Dockerfile b/Dockerfile index 73d44ee17..ba9c6c9b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,15 +5,15 @@ WORKDIR api ADD . /api # Install app dependencies -RUN yarn install +RUN pnpm install # Install pm2 -RUN yarn global add pm2 +RUN pnpm global add pm2 # Build -RUN yarn build +RUN pnpm build # Run! EXPOSE 3333 -ENTRYPOINT ["yarn", "start"] +ENTRYPOINT ["pnpm", "start"] diff --git a/Dockerfile.stg b/Dockerfile.stg index 77c106541..4d5f7d87f 100644 --- a/Dockerfile.stg +++ b/Dockerfile.stg @@ -7,12 +7,12 @@ WORKDIR api ADD . /api # Install app dependencies -RUN yarn install +RUN pnpm install # Build -RUN yarn build +RUN pnpm build # Run! EXPOSE 3333 -ENTRYPOINT ["yarn", "start"] \ No newline at end of file +ENTRYPOINT ["pnpm", "start"] \ No newline at end of file diff --git a/package.json b/package.json index 670f532b9..70c06ce02 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "dotenv": "8.2.0", "express": "4.17.1", "express-joi-validation": "5.0.0", + "fuels": "0.73.0", "joi": "17.4.0", "jsonwebtoken": "9.0.1", "morgan": "1.10.0", @@ -47,8 +48,7 @@ "socket.io-client": "4.7.2", "ts-node": "^10.9.1", "tsconfig-paths": "^3.9.0", - "typeorm": "^0.2.29", - "typescript": "^4.6.3" + "typeorm": "^0.2.29" }, "devDependencies": { "@commitlint/cli": "12.0.1", @@ -61,9 +61,9 @@ "@types/morgan": "1.9.2", "@types/node": "20.6.0", "@types/supertest": "2.0.10", - "@typescript-eslint/eslint-plugin": "4.19.0", - "@typescript-eslint/parser": "4.19.0", - "eslint": "7.22.0", + "@typescript-eslint/eslint-plugin": "7.0.2", + "@typescript-eslint/parser": "7.0.2", + "eslint": "8.56.0", "eslint-config-prettier": "8.1.0", "eslint-plugin-prettier": "3.3.1", "husky": "5.2.0", @@ -74,7 +74,8 @@ "supertest": "6.1.3", "ts-jest": "^29.1.1", "ts-node-dev": "1.1.6", - "tscpaths": "0.0.9" + "tscpaths": "0.0.9", + "typescript": "^5.3.3" }, "resolutions": { "string-width": "4.1.0" diff --git a/src/database/migrations/1695162520664-add-parovider-and-connected-to-users.ts b/src/database/migrations/1695162520664-add-parovider-and-connected-to-users.ts index d14be4be1..bf364914d 100644 --- a/src/database/migrations/1695162520664-add-parovider-and-connected-to-users.ts +++ b/src/database/migrations/1695162520664-add-parovider-and-connected-to-users.ts @@ -1,21 +1,22 @@ -import { MigrationInterface, QueryRunner, Table, TableColumn } from 'typeorm'; +import { MigrationInterface, QueryRunner, TableColumn } from 'typeorm'; + +const cProvider = new TableColumn({ + name: 'provider', + type: 'varchar', +}); + +const cUsers = new TableColumn({ + name: 'address', + type: 'varchar', +}); export class addParoviderAndConnectedToUsers1695162520664 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - await queryRunner.addColumns('users', [ - new TableColumn({ - name: 'address', - type: 'varchar', - }), - new TableColumn({ - name: 'provider', - type: 'varchar', - }), - ]); + await queryRunner.addColumns('users', [cProvider, cUsers]); } public async down(queryRunner: QueryRunner): Promise { - await queryRunner.dropColumns('users', ['connected_users', 'provider']); + await queryRunner.dropColumns('users', [cProvider, cUsers]); } } diff --git a/src/database/migrations/1695163991051-add-collumns-to-usertoken.ts b/src/database/migrations/1695163991051-add-collumns-to-usertoken.ts index fb8cbe530..00471cd96 100644 --- a/src/database/migrations/1695163991051-add-collumns-to-usertoken.ts +++ b/src/database/migrations/1695163991051-add-collumns-to-usertoken.ts @@ -1,29 +1,27 @@ import { MigrationInterface, QueryRunner, TableColumn } from 'typeorm'; +const cExpired = new TableColumn({ + name: 'expired_at', + type: 'timestamp', + isNullable: true, +}); + +const cEncoder = new TableColumn({ + name: 'encoder', + type: 'varchar', +}); + +const cProvider = new TableColumn({ + name: 'provider', + type: 'varchar', +}); + export class addCollumnsToUsertoken1695163991051 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - await queryRunner.addColumns('user_tokens', [ - new TableColumn({ - name: 'expired_at', - type: 'timestamp', - isNullable: true, - }), - new TableColumn({ - name: 'encoder', - type: 'varchar', - }), - new TableColumn({ - name: 'provider', - type: 'varchar', - }), - ]); + await queryRunner.addColumns('user_tokens', [cExpired, cEncoder, cProvider]); } public async down(queryRunner: QueryRunner): Promise { - await queryRunner.dropColumns('user_tokens', [ - 'expired_at', - 'encoder', - 'provider', - ]); + await queryRunner.dropColumns('user_tokens', [cExpired, cEncoder, cProvider]); } } diff --git a/src/database/migrations/1695646779754-add-collumn-to-user-token.ts b/src/database/migrations/1695646779754-add-collumn-to-user-token.ts index e2bed0839..8b9f4fe58 100644 --- a/src/database/migrations/1695646779754-add-collumn-to-user-token.ts +++ b/src/database/migrations/1695646779754-add-collumn-to-user-token.ts @@ -1,16 +1,15 @@ import { MigrationInterface, QueryRunner, TableColumn } from 'typeorm'; +const cpayload = new TableColumn({ + name: 'payload', + type: 'text', +}); export class addCollumnToUserToken1695646779754 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - await queryRunner.addColumns('user_tokens', [ - new TableColumn({ - name: 'payload', - type: 'text', - }), - ]); + await queryRunner.addColumns('user_tokens', [cpayload]); } public async down(queryRunner: QueryRunner): Promise { - await queryRunner.dropColumns('user_tokens', ['payload']); + await queryRunner.dropColumns('user_tokens', [cpayload]); } } diff --git a/src/database/migrations/1702391257625-add-notifications-columns-to-users-table.ts b/src/database/migrations/1702391257625-add-notifications-columns-to-users-table.ts index eac14cc04..8472b1160 100644 --- a/src/database/migrations/1702391257625-add-notifications-columns-to-users-table.ts +++ b/src/database/migrations/1702391257625-add-notifications-columns-to-users-table.ts @@ -1,23 +1,24 @@ import { MigrationInterface, QueryRunner, TableColumn } from 'typeorm'; +const cnotify = new TableColumn({ + name: 'notify', + type: 'boolean', + default: false, +}); + +const cFirstLogin = new TableColumn({ + name: 'first_login', + type: 'boolean', + default: true, +}); + export class addNotificationsColumnsToUsersTable1702391257625 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - await queryRunner.addColumns('users', [ - new TableColumn({ - name: 'first_login', - type: 'boolean', - default: true, - }), - new TableColumn({ - name: 'notify', - type: 'boolean', - default: false, - }), - ]); + await queryRunner.addColumns('users', [cFirstLogin, cnotify]); } public async down(queryRunner: QueryRunner): Promise { - await queryRunner.dropColumns('users', ['first_login', 'notify']); + await queryRunner.dropColumns('users', [cnotify, cFirstLogin]); } } diff --git a/src/modules/predicate/services.ts b/src/modules/predicate/services.ts index 2566fd503..d5422ba9d 100644 --- a/src/modules/predicate/services.ts +++ b/src/modules/predicate/services.ts @@ -205,6 +205,7 @@ export class PredicateService implements IPredicateService { if (this._filter.signer) { qb.orWhere(subQb => { const subQuery = subQb + // eslint-disable-next-line @typescript-eslint/ban-ts-comment //@ts-ignore .subQuery() .select('1') diff --git a/src/modules/transaction/services.ts b/src/modules/transaction/services.ts index fec0db9f3..34c62b197 100644 --- a/src/modules/transaction/services.ts +++ b/src/modules/transaction/services.ts @@ -179,6 +179,8 @@ export class TransactionService implements ITransactionService { }); } if (this._filter.signer) { + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + //@ts-expect-error qb.orWhere(subQb => { subQb.where('witnesses.account = :signer', { signer: this._filter.signer, From 531ccbf566e866e92136cfe661709d606b579fe8 Mon Sep 17 00:00:00 2001 From: guimroque Date: Thu, 22 Feb 2024 16:25:58 -0300 Subject: [PATCH 12/17] fix(revert): revert last commit --- Dockerfile | 8 ++++---- Dockerfile.stg | 6 +++--- package.json | 13 ++++++------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index ba9c6c9b6..73d44ee17 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,15 +5,15 @@ WORKDIR api ADD . /api # Install app dependencies -RUN pnpm install +RUN yarn install # Install pm2 -RUN pnpm global add pm2 +RUN yarn global add pm2 # Build -RUN pnpm build +RUN yarn build # Run! EXPOSE 3333 -ENTRYPOINT ["pnpm", "start"] +ENTRYPOINT ["yarn", "start"] diff --git a/Dockerfile.stg b/Dockerfile.stg index 4d5f7d87f..77c106541 100644 --- a/Dockerfile.stg +++ b/Dockerfile.stg @@ -7,12 +7,12 @@ WORKDIR api ADD . /api # Install app dependencies -RUN pnpm install +RUN yarn install # Build -RUN pnpm build +RUN yarn build # Run! EXPOSE 3333 -ENTRYPOINT ["pnpm", "start"] \ No newline at end of file +ENTRYPOINT ["yarn", "start"] \ No newline at end of file diff --git a/package.json b/package.json index 70c06ce02..670f532b9 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,6 @@ "dotenv": "8.2.0", "express": "4.17.1", "express-joi-validation": "5.0.0", - "fuels": "0.73.0", "joi": "17.4.0", "jsonwebtoken": "9.0.1", "morgan": "1.10.0", @@ -48,7 +47,8 @@ "socket.io-client": "4.7.2", "ts-node": "^10.9.1", "tsconfig-paths": "^3.9.0", - "typeorm": "^0.2.29" + "typeorm": "^0.2.29", + "typescript": "^4.6.3" }, "devDependencies": { "@commitlint/cli": "12.0.1", @@ -61,9 +61,9 @@ "@types/morgan": "1.9.2", "@types/node": "20.6.0", "@types/supertest": "2.0.10", - "@typescript-eslint/eslint-plugin": "7.0.2", - "@typescript-eslint/parser": "7.0.2", - "eslint": "8.56.0", + "@typescript-eslint/eslint-plugin": "4.19.0", + "@typescript-eslint/parser": "4.19.0", + "eslint": "7.22.0", "eslint-config-prettier": "8.1.0", "eslint-plugin-prettier": "3.3.1", "husky": "5.2.0", @@ -74,8 +74,7 @@ "supertest": "6.1.3", "ts-jest": "^29.1.1", "ts-node-dev": "1.1.6", - "tscpaths": "0.0.9", - "typescript": "^5.3.3" + "tscpaths": "0.0.9" }, "resolutions": { "string-width": "4.1.0" From dc750fac3a25c791c9e5a42fd1e0ca5cca3c0cfc Mon Sep 17 00:00:00 2001 From: guimroque Date: Thu, 22 Feb 2024 16:46:15 -0300 Subject: [PATCH 13/17] fix(deploy): push --- .env | 2 +- docker-compose.yml | 10 +++++----- package.json | 3 ++- src/modules/transaction/services.ts | 2 -- src/server/bootstrap.ts | 2 -- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.env b/.env index b18fdb186..dd4f0d5c4 100644 --- a/.env +++ b/.env @@ -17,7 +17,7 @@ API_URL=http://localhost:3333 # Admin user APP_ADMIN_EMAIL=admin_user_email APP_ADMIN_PASSWORD=admin_user_password - +TOKEN_EXPIRATION_TIME=15 # ADMIN USER APP_ADMIN_EMAIL=admin_user_email diff --git a/docker-compose.yml b/docker-compose.yml index b44244ed3..5bc141733 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,11 +13,11 @@ services: environment: - NODE_ENV=${API_ENVIRONMENT} # DATABASE - - DATABASE_HOST=${DATABASE_HOST} - - DATABASE_PORT=${DATABASE_PORT} - - DATABASE_USERNAME=${DATABASE_USERNAME} - - DATABASE_PASSWORD=${DATABASE_PASSWORD} - - DATABASE_NAME=${DATABASE_NAME} + - DATABASE_HOST=viaduct.proxy.rlwy.net + - DATABASE_PORT=10417 + - DATABASE_USERNAME=postgres + - DATABASE_PASSWORD=B5gFeEfECab55DdAg56e3BaF1G12Dccb + - DATABASE_NAME=railway # APP - API_PORT=${API_PORT} - APP_NAME=${API_NAME} diff --git a/package.json b/package.json index 670f532b9..808275b0d 100644 --- a/package.json +++ b/package.json @@ -32,9 +32,10 @@ "copyfiles": "2.4.1", "cors": "2.8.5", "date-fns": "2.30.0", - "dotenv": "8.2.0", + "dotenv": "16.4.5", "express": "4.17.1", "express-joi-validation": "5.0.0", + "fuels": "0.73.0", "joi": "17.4.0", "jsonwebtoken": "9.0.1", "morgan": "1.10.0", diff --git a/src/modules/transaction/services.ts b/src/modules/transaction/services.ts index 34c62b197..fec0db9f3 100644 --- a/src/modules/transaction/services.ts +++ b/src/modules/transaction/services.ts @@ -179,8 +179,6 @@ export class TransactionService implements ITransactionService { }); } if (this._filter.signer) { - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - //@ts-expect-error qb.orWhere(subQb => { subQb.where('witnesses.account = :signer', { signer: this._filter.signer, diff --git a/src/server/bootstrap.ts b/src/server/bootstrap.ts index 863e775ba..6d111d389 100644 --- a/src/server/bootstrap.ts +++ b/src/server/bootstrap.ts @@ -4,8 +4,6 @@ import { getConnection } from 'typeorm'; import startConnection from '@database/connection'; import runSeeders from '@database/seeders'; -import config from '../config/database'; - class Bootstrap { static async connectDatabase() { return await startConnection(); From 9b48d760d2118616adadac01382ab4d9a1256a51 Mon Sep 17 00:00:00 2001 From: guimroque Date: Thu, 22 Feb 2024 16:46:47 -0300 Subject: [PATCH 14/17] fix(deploy): push --- docker-compose.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5bc141733..b44244ed3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,11 +13,11 @@ services: environment: - NODE_ENV=${API_ENVIRONMENT} # DATABASE - - DATABASE_HOST=viaduct.proxy.rlwy.net - - DATABASE_PORT=10417 - - DATABASE_USERNAME=postgres - - DATABASE_PASSWORD=B5gFeEfECab55DdAg56e3BaF1G12Dccb - - DATABASE_NAME=railway + - DATABASE_HOST=${DATABASE_HOST} + - DATABASE_PORT=${DATABASE_PORT} + - DATABASE_USERNAME=${DATABASE_USERNAME} + - DATABASE_PASSWORD=${DATABASE_PASSWORD} + - DATABASE_NAME=${DATABASE_NAME} # APP - API_PORT=${API_PORT} - APP_NAME=${API_NAME} From 7f88a195c0a1b1459f8806eefc339b6c1e91bbef Mon Sep 17 00:00:00 2001 From: guimroque Date: Thu, 22 Feb 2024 19:11:00 -0300 Subject: [PATCH 15/17] fix(transactions): block create new transactions with pending sends --- src/modules/auth/controller.ts | 11 +---------- src/modules/transaction/controller.ts | 7 ++----- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/modules/auth/controller.ts b/src/modules/auth/controller.ts index 61c20ad6e..ef8b432e0 100644 --- a/src/modules/auth/controller.ts +++ b/src/modules/auth/controller.ts @@ -3,10 +3,6 @@ import { add, addMinutes } from 'date-fns'; import { Encoder } from '@src/models'; import { Workspace } from '@src/models/Workspace'; import GeneralError, { ErrorTypes } from '@src/utils/error/GeneralError'; -import { - Unauthorized, - UnauthorizedErrorTitles, -} from '@src/utils/error/Unauthorized'; import { IAuthRequest } from '@middlewares/auth/types'; @@ -15,12 +11,7 @@ import { Responses, successful, bindMethods, Web3Utils } from '@utils/index'; import { IUserService } from '../user/types'; import { WorkspaceService } from '../workspace/services'; -import { - IAuthService, - IChangeWorkspaceRequest, - IGoToSingleWorkspaceRequest, - ISignInRequest, -} from './types'; +import { IAuthService, IChangeWorkspaceRequest, ISignInRequest } from './types'; export class AuthController { private authService: IAuthService; diff --git a/src/modules/transaction/controller.ts b/src/modules/transaction/controller.ts index d27c415d2..db6d52be9 100644 --- a/src/modules/transaction/controller.ts +++ b/src/modules/transaction/controller.ts @@ -98,11 +98,8 @@ export class TransactionController { ), ).length ?? 0, transactionsBlocked: - result.filter(transaction => - transaction.witnesses.find( - w => w.status === WitnessesStatus.PENDING, - ), - ).length > 0 ?? false, + result.filter(t => t.status === TransactionStatus.AWAIT_REQUIREMENTS) + .length > 0 ?? false, }; }); return successful(result, Responses.Ok); From 9b5ec0437808f9fc9fed33ac291e7276b250acd7 Mon Sep 17 00:00:00 2001 From: guimroque Date: Thu, 22 Feb 2024 21:56:58 -0300 Subject: [PATCH 16/17] chore(env): use of dotenv --- src/modules/notification/routes.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/notification/routes.ts b/src/modules/notification/routes.ts index ab8a744cd..d2660a41a 100644 --- a/src/modules/notification/routes.ts +++ b/src/modules/notification/routes.ts @@ -11,10 +11,11 @@ import { NotificationService } from './services'; const router = Router(); const notificationService = new NotificationService(); const { readAll, list } = new NotificationController(notificationService); +const { MAIL_TESTING_NOTIFICATIONS } = process.env; // ENDPOINT TO VALIDATE EMAIL SENDING router.get('/mail', async (_, res) => { - const to = 'guilherme@infinitybase.com'; + const to = MAIL_TESTING_NOTIFICATIONS; const data = { summary: { vaultName: 'Vault Name', From 066befaec394579c3ee2a86ec5dc9f4ae2a36fb6 Mon Sep 17 00:00:00 2001 From: guimroque Date: Thu, 22 Feb 2024 22:35:52 -0300 Subject: [PATCH 17/17] fix(sign): decline transaction --- src/modules/transaction/controller.ts | 2 +- src/modules/transaction/types.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/transaction/controller.ts b/src/modules/transaction/controller.ts index db6d52be9..125352ab6 100644 --- a/src/modules/transaction/controller.ts +++ b/src/modules/transaction/controller.ts @@ -266,7 +266,7 @@ export class TransactionController { // acc_signed, // Signer.recoverAddress(hashMessage(hash), signer).toString(), // ); - if (signer && confirm) { + if (signer && confirm === 'true') { const acc_signed = Signer.recoverAddress(hashMessage(hash), signer).toString() == user.address; diff --git a/src/modules/transaction/types.ts b/src/modules/transaction/types.ts index b67ba71b5..b90425bbc 100644 --- a/src/modules/transaction/types.ts +++ b/src/modules/transaction/types.ts @@ -88,7 +88,7 @@ export type ICloseTransactionBody = { export interface ISignByIdPayload { signer: string; account: string; - confirm: boolean; + confirm: string; } interface ICreateTransactionRequestSchema extends ValidatedRequestSchema {