Merge pull request #131 from infinitybase/staging

Staging

packages/api/src/config/database.ts

@@ -66,6 +66,9 @@ const test: ConnectionOptions = {
   entities: [entitiesDir],
   migrations: [migrationsDir, seedersDir],
   synchronize: false,
+  ssl: {
+    rejectUnauthorized: false,
+  },
   migrationsRun: true,
 };
 

packages/api/src/middlewares/auth/index.ts

@@ -1,40 +1,36 @@
 import { Request, Response, NextFunction } from 'express';
-import { request } from 'http';
 
 import { RecoverCode, RecoverCodeType } from '@src/models';
 import { PermissionRoles, Workspace } from '@src/models/Workspace';
-import { TokenUtils } from '@src/utils';
 import { validatePermissionGeneral } from '@src/utils/permissionValidate';
 
 import { ErrorTypes } from '@utils/error';
 import { Unauthorized, UnauthorizedErrorTitles } from '@utils/error/Unauthorized';
 
 import { IAuthRequest } from './types';
+import app from '@src/server/app';
 
 async function authMiddleware(req: Request, res: Response, next: NextFunction) {
   try {
     const requestAuth: IAuthRequest = req;
     const signature = requestAuth?.headers?.authorization;
-    const signerAddress = requestAuth.get('signerAddress');
     const isRecoverCode = !!signature && signature.includes('code');
-
-    if (!signature || !signerAddress) {
+    
+    if (!signature) {
       throw new Unauthorized({
         type: ErrorTypes.Unauthorized,
         title: UnauthorizedErrorTitles.MISSING_CREDENTIALS,
         detail: 'Some required credentials are missing',
       });
     }
 
-    if (isRecoverCode) return connectorMiddleware(req, res, next)
-
-    const token = await TokenUtils.recoverToken(signature);
-    await TokenUtils.renewToken(token);
+    if (isRecoverCode) return connectorMiddleware(req, res, next);
+    const token = await app._sessionCache.getSession(signature);
 
-    requestAuth.user = await TokenUtils.checkUserExists(signerAddress);
-    requestAuth.userToken = token;
-    requestAuth.workspace = await TokenUtils.findLoggedWorkspace(token);
 
+    requestAuth.user = token.user;
+    requestAuth.workspace = token.workspace;
+
     return next();
   } catch (e) {
     return next(e);
@@ -46,7 +42,8 @@ function authPermissionMiddleware(permission?: PermissionRoles[]) {
   return async function (req: Request, res: Response, next: NextFunction) {
     try {
       const requestAuth: IAuthRequest = req;
-
+
+
       if (!permission || permission.length === 0) return next();
       const { user, workspace } = requestAuth;
 

packages/api/src/mocks/networks.ts

@@ -4,6 +4,7 @@ export const networks: { [key: string]: string } = {
   beta5: 'https://beta-5.fuel.network/graphql',
   beta4: 'https://beta-4.fuel.network/graphql',
   local: 'http://127.0.0.1:4000/v1/graphql',
+  devnet: 'https://devnet.fuel.network/v1/graphql/',
 };
 
 export const providers: { [key: string]: () => Promise<Provider> } = {

packages/api/src/modules/addressBook/controller.ts

@@ -19,6 +19,10 @@ import {
 } from './types';
 import { IconUtils } from '@utils/icons';
 
+const {
+  API_DEFAULT_NETWORK
+} = process.env;
+
 export class AddressBookController {
   private addressBookService: IAddressBookService;
   private userService: IUserService;
@@ -32,7 +36,6 @@ export class AddressBookController {
     try {
       const { address, nickname } = req.body;
       const { workspace, user } = req;
-
       const duplicatedNickname = await new AddressBookService()
         .filter({
           owner: [workspace.id],
@@ -65,10 +68,9 @@ export class AddressBookController {
       if (!savedUser) {
         savedUser = await this.userService.create({
           address,
-          provider: user.provider,
+          provider: user.provider,// ?? API_DEFAULT_NETWORK,// ?? networks['devnet'],
           avatar: IconUtils.user(),
           type: TypeUser.FUEL,
-
           active: true,
         });
       }

packages/api/src/modules/addressBook/services.ts

@@ -112,11 +112,6 @@ export class AddressBookService implements IAddressBookService {
         ),
       );
 
-    //todo: add new subquery to order by, because the select is required distinct mode
-    // console.log('this._filter', this._filter, this._ordination);
-    // hasOrdination &&
-    //   queryBuilder.orderBy(`ab.${this._ordination.orderBy}`, this._ordination.sort);
-
     return hasPagination
       ? Pagination.create(queryBuilder)
           .paginate(this._pagination)

packages/api/src/modules/auth/controller.ts

@@ -23,6 +23,7 @@ import {
   ICreateRecoverCodeRequest,
   ISignInRequest,
 } from './types';
+import app from '@src/server/app';
 
 export class AuthController {
   private authService: IAuthService;
@@ -36,13 +37,14 @@ export class AuthController {
     try {
       const { digest, encoder, signature } = req.body;
 
-      const userToken = await TokenUtils.createAuthToken(
+      const {userToken, signin} = await TokenUtils.createAuthToken(
         signature,
         digest,
         encoder,
       );
 
-      return successful(userToken, Responses.Ok);
+      await app._sessionCache.addSession(userToken.token, userToken);
+      return successful(signin, Responses.Ok);
     } catch (e) {
       if (e instanceof GeneralError) throw e;
 
@@ -56,7 +58,7 @@ export class AuthController {
 
       return successful(response, Responses.Ok);
     } catch (e) {
-      return error(e.error[0], e.statusCode);
+      return error(e.error, e.statusCode);
     }
   }
 
@@ -75,7 +77,7 @@ export class AuthController {
 
       return successful(response, Responses.Ok);
     } catch (e) {
-      return error(e.error[0], e.statusCode);
+      return error(e.error, e.statusCode);
     }
   }
 
@@ -96,14 +98,14 @@ export class AuthController {
 
       const isUserMember = workspace.members.find(m => m.id === user);
 
-      const token = await this.authService.findToken({
-        userId: user,
-      });
+      const token = await TokenUtils.getTokenBySignature(req.headers.authorization);
 
       if (isUserMember) {
         token.workspace = workspace;
       }
 
+      await app._sessionCache.addSession(token.token, token);
+
       return successful(
         await token.save().then(({ workspace, token, user }: UserToken) => {
           return {

packages/api/src/modules/auth/services.ts

@@ -22,6 +22,7 @@ export class AuthService implements IAuthService {
           avatar: data.user.avatar,
           address: data.user.address,
           user_id: data.user.id,
+          expiredAt: data.expired_at,
           workspace: {
             id: data.workspace.id,
             name: data.workspace.name,

packages/api/src/modules/auth/types.ts

@@ -69,6 +69,7 @@ export interface IFindTokenParams {
 
 export interface ISignInResponse {
   accessToken: string;
+  expiredAt: Date;
   avatar: string;
   user_id: string;
   workspace: {

packages/api/src/modules/predicate/__tests__/predicate.tests.ts

@@ -21,16 +21,14 @@ describe('[PREDICATE]', () => {
     'Create predicate without version code',
     async () => {
       const {
-        data: data_workspace,
         data_user1,
         data_user2,
-        USER_5,
       } = await generateWorkspacePayload(api);
       const members = [data_user1.address, data_user2.address];
       const { predicatePayload } = await PredicateMock.create(1, members);
       const { data } = await api.axios.post('/predicate', predicatePayload);
 
-      const { data: workspace, status: status_find } = await api.axios.get(
+      const { data: workspace } = await api.axios.get(
         `/workspace/${api.workspace.id}`,
       );
 
@@ -184,7 +182,7 @@ describe('[PREDICATE]', () => {
     });
   });
 
-  test('Find predicate by id', async () => {
+  test('Find predicate by id', async () => {    
     const auth = new AuthValidations(networks['local'], accounts['USER_3']);
     await auth.create();
     await auth.createSession();
@@ -201,15 +199,15 @@ describe('[PREDICATE]', () => {
     //create a new nicknames
     const { data: n_data5 } = await auth.axios.post('/address-book/', {
       address: USER_5.address,
-      nickname: `[TESTE]${USER_5.address}`,
+      nickname: `[TESTE]${USER_5.address}${new Date().getTime()}`,
     });
     const { data: n_data1 } = await auth.axios.post('/address-book/', {
       address: data_user1.address,
-      nickname: `[TESTE]${data_user1.address}`,
+      nickname: `[TESTE]${data_user1.address}${new Date().getTime()}`,
     });
     const { data: n_data2 } = await auth.axios.post('/address-book/', {
       address: data_user2.address,
-      nickname: `[TESTE]${data_user2.address}`,
+      nickname: `[TESTE]${data_user2.address}${new Date().getTime()}`,
     });
 
     //create a vault

packages/api/src/modules/predicate/controller.ts

@@ -152,13 +152,9 @@ export class PredicateController {
 
   async findByAddress({ params: { address } }: IFindByHashRequest) {
     try {
-      const response = await this.predicateService
-        .filter({
-          address,
-        })
-        .paginate(undefined)
-        .list()
-        .then((data: Predicate[]) => data[0]);
+      const response = await Predicate.findOne({
+        where: { predicateAddress: address },
+      })
 
       const _response = await this.predicateService.findById(
         response.id,
@@ -174,16 +170,15 @@ export class PredicateController {
   async findByName(req: IFindByNameRequest) {
     const { params, workspace } = req;
     const { name } = params;
-
     try {
-      const response = await this.predicateService
-        .filter({
-          name,
-          workspace: [workspace.id],
-        })
-        .paginate(undefined)
-        .list()
-        .then((data: Predicate[]) => data[0]);
+      if(!name || name.length === 0) return successful(false, Responses.Ok);
+
+      const response = await Predicate.createQueryBuilder('p')
+        .leftJoin('p.workspace', 'w')
+        .addSelect(['w.id', 'w.name'])
+        .where('p.name = :name', { name })
+        .andWhere('w.id = :workspace', { workspace: workspace.id })
+        .getOne();
 
       return successful(!!response, Responses.Ok);
     } catch (e) {
@@ -270,23 +265,27 @@ export class PredicateController {
         })
         .list()
         .then((response: Workspace[]) => response[0]);
+
 
-      const allWk = await new WorkspaceService()
+      const hasSingle = singleWorkspace.id === workspace.id;
+
+      const _wk = hasSingle 
+        ? await new WorkspaceService()
         .filter({
           user: user.id,
         })
         .list()
-        .then((response: Workspace[]) => response.map(wk => wk.id));
+        .then((response: Workspace[]) => response.map(wk => wk.id)) 
+        : [workspace.id];
 
-      const hasSingle = singleWorkspace.id === workspace.id;
 
       const response = await this.predicateService
         .filter({
           address: predicateAddress,
           provider,
           owner,
           q,
-          workspace: hasSingle ? allWk : [workspace.id],
+          workspace: _wk,
           signer: hasSingle ? user.address : undefined,
         })
         .ordination({ orderBy, sort })

packages/api/src/modules/transaction/controller.ts

@@ -463,21 +463,25 @@ export class TransactionController {
       const { workspace, user } = req;
 
       const singleWorkspace = await new WorkspaceService()
-        .filter({
-          user: user.id,
-          single: true,
-        })
-        .list()
-        .then((response: Workspace[]) => response[0]);
-
-      const allWk = await new WorkspaceService()
-        .filter({
-          user: user.id,
-        })
-        .list()
-        .then((response: Workspace[]) => response.map(wk => wk.id));
+      .filter({
+        user: user.id,
+        single: true,
+      })
+      .list()
+      .then((response: Workspace[]) => response[0]);
+
+
+    const hasSingle = singleWorkspace.id === workspace.id;
+
+    const _wk = hasSingle 
+      ? await new WorkspaceService()
+      .filter({
+        user: user.id,
+      })
+      .list()
+      .then((response: Workspace[]) => response.map(wk => wk.id)) 
+      : [workspace.id];
 
-      const hasSingle = singleWorkspace.id === workspace.id;
 
       const result = await new TransactionService()
         .filter({
@@ -486,7 +490,7 @@ export class TransactionController {
           status: status ?? undefined,
           createdBy,
           name,
-          workspaceId: hasSingle ? allWk : [workspace.id],
+          workspaceId: _wk,
           signer: hasSingle ? user.address : undefined,
           predicateId: predicateId ?? undefined,
         })

packages/api/src/modules/transaction/services.ts

@@ -181,7 +181,6 @@ export class TransactionService implements ITransactionService {
         }),
       );
     // =============== specific for workspace ===============
-    //console.log('[transaction_FILTER]: ', this._filter);
 
     // =============== specific for home ===============
     (this._filter.workspaceId || this._filter.signer) &&
@@ -403,8 +402,6 @@ export class TransactionService implements ITransactionService {
         return resume;
       })
       .catch(e => {
-        console.log('[ERRO_SEND_TOCHAIN]: ', e);
-
         throw new Internal({
           type: ErrorTypes.Internal,
           title: 'Error on transaction sendToChain',
@@ -472,8 +469,6 @@ export class TransactionService implements ITransactionService {
           }
         }
       }
-
-      //console.log('[DENTRO_ELSE_IF]', _api_transaction, resume, a);
       return resume;
     }