Merge pull request #37 from infinitybase/FEAT/transaction-split

Feat/transaction split

src/modules/dApps/controller.ts

@@ -25,6 +25,15 @@ export class DappController {
     }
   }
 
+  async current({ params }: IDappRequest) {
+    try {
+      const currentVaultId = await this._dappService.findCurrent(params.sessionId);
+      return successful(currentVaultId, Responses.Ok);
+    } catch (e) {
+      return error(e.error, e.statusCode);
+    }
+  }
+
   async accounts({ params, headers }: IDappRequest) {
     try {
       return successful(

src/modules/dApps/routes.ts

@@ -7,10 +7,13 @@ import { DAppsService } from './service';
 
 const router = Router();
 const dAppService = new DAppsService();
-const { currentAccount, accounts, state } = new DappController(dAppService);
+const { currentAccount, current, accounts, state } = new DappController(
+  dAppService,
+);
 
 router.get('/:sessionId/state', handleResponse(state));
 router.get('/:sessionId/accounts', handleResponse(accounts));
 router.get('/:sessionId/currentAccount', handleResponse(currentAccount));
+router.get('/:sessionId', handleResponse(current));
 
 export default router;

src/modules/dApps/service.ts

@@ -49,6 +49,23 @@ export class DAppsService implements IDAppsService {
       });
   }
 
+  async findCurrent(sessionID: string) {
+    return await DApp.createQueryBuilder('d')
+      .select()
+      .innerJoin('d.currentVault', 'currentVault')
+      .addSelect(['currentVault.predicateAddress', 'currentVault.id'])
+      .where('d.session_id = :sessionID', { sessionID })
+      .getOne()
+      .then(data => data?.currentVault.id ?? undefined)
+      .catch(e => {
+        throw new Internal({
+          type: ErrorTypes.Internal,
+          title: 'Error on find current to dapp',
+          detail: e,
+        });
+      });
+  }
+
   // async checkExist(address: string, sessionId, url: string) {
   //   return await DApp.createQueryBuilder('d')
   //     .innerJoin('d.users', 'users')

src/modules/dApps/types.ts

@@ -25,6 +25,7 @@ export interface IDappFilterParams {
 export interface IDAppsService {
   create: (payload: IDAPPCreatePayload) => Promise<DApp>;
   findBySessionID: (sessionID: string, origin: string) => Promise<DApp>;
+  findCurrent: (sessionID: string) => Promise<string>;
 }
 
 interface IDappRequestSchema extends ValidatedRequestSchema {

src/socket/calbacks.ts

@@ -32,11 +32,11 @@ export const popAuth: IEventsExecute = {
       const isIncludedVault = dapp.vaults.find(v => v.id === vaultId);
       if (!isIncludedVault) {
         dapp.vaults = [...dapp.vaults, predicate];
-        dapp.currentVault = predicate;
-
-        await dapp.save();
       }
 
+      dapp.currentVault = predicate;
+      await dapp.save();
+
       socket.to(room).emit(SocketEvents.DEFAULT, {
         type: SocketEvents.CONNECTION,
         data: [true],