Merge pull request #21 from Giveth/feature_add_admin_for_multisig_ses…

…sion add multisig session admin tab
Giveth · Nov 29, 2023 · 7639ff4 · 7639ff4
2 parents 15a4547 + 9f92bdd
commit 7639ff4
Show file tree

Hide file tree

Showing 4 changed files with 144 additions and 0 deletions.
diff --git a/config/.env.example b/config/.env.example
@@ -5,6 +5,8 @@ TYPEORM_DATABASE_USER=postgres
 TYPEORM_DATABASE_PASSWORD=postgres
 TYPEORM_DATABASE_HOST=127.0.0.1
 TYPEORM_DATABASE_PORT=5443
+# Handle as local, develop, staging, production
+ENVIRONMENT=local
 
 JWT_SECRET=fdksjalkfhjio472389roiewfhskjahfjka
 ACCESS_TOKEN_LIFETIME_HOURS=2000

diff --git a/migrations/1701273095150-addDefaultAdminUser.ts b/migrations/1701273095150-addDefaultAdminUser.ts
@@ -0,0 +1,38 @@
+import { Admin, AdminRole } from '@/src/entities/admin';
+import { MigrationInterface, QueryRunner } from 'typeorm';
+const bcrypt = require('bcrypt');
+
+export class addDefaultAdminUser1701273095150 implements MigrationInterface {
+  private defaultAdminEmail = '[email protected]';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    const isStagingOrLocal =
+      process.env.ENVIRONMENT === 'local' ||
+      process.env.ENVIRONMENT === 'staging' ||
+      process.env.ENVIRONMENT === 'develop';
+
+    if (isStagingOrLocal) {
+      const defaultAdmin = new Admin();
+      defaultAdmin.email = this.defaultAdminEmail;
+      const hash = await bcrypt.hash(
+        'password',
+        Number(process.env.BCRYPT_SALT),
+      );
+      defaultAdmin.encryptedPassword = hash; // Set your default password here
+
+      // Assign a default role if needed
+      defaultAdmin.role = AdminRole.ADMIN;
+
+      await queryRunner.manager.save(defaultAdmin);
+    }
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.manager
+      .createQueryBuilder()
+      .delete()
+      .from(Admin)
+      .where('email = :email', { email: this.defaultAdminEmail })
+      .execute();
+  }
+}
diff --git a/src/repositories/multisigSessionRepository.ts b/src/repositories/multisigSessionRepository.ts
@@ -33,6 +33,7 @@ export const findNonExpiredMultisigSessions = async (
     .andWhere('lower("multisigAddress") = :multisigAddress', {
       multisigAddress: multisigAddress.toLowerCase(),
     })
+    .andWhere('active = true')
     .orderBy('"createdAt"', 'DESC')
     .getOne();
 

diff --git a/src/routes/v1/adminbroRouter.ts b/src/routes/v1/adminbroRouter.ts
@@ -13,6 +13,7 @@ import { Database, Resource } from '@adminjs/typeorm';
 import { logger } from '../../utils/logger';
 import { AccessToken } from '../../entities/accessToken';
 import { findAdminByEmail } from '../../repositories/adminRepository';
+import { MultisigSession } from '@/src/entities/multisigSession';
 
 // eslint:disable-next-line:no-var-requires
 const RedisStore = require('connect-redis')(session);
@@ -74,6 +75,108 @@ const getAdminBroInstance = async () => {
       softwareBrothers: false,
     },
     resources: [
+      {
+        resource: MultisigSession,
+        options: {
+          properties: {
+            multisigAddress: {
+              isVisible: {
+                list: true,
+                filter: true,
+                show: true,
+                edit: false,
+                new: false,
+              },
+            },
+            safeMessageHash: {
+              isVisible: {
+                list: false,
+                filter: false,
+                show: false,
+                edit: false,
+                new: false,
+              },
+            },
+            network: {
+              isVisible: {
+                list: true,
+                filter: true,
+                show: true,
+                edit: false,
+                new: false,
+              },
+            },
+            active: {
+              isVisible: {
+                list: true,
+                filter: true,
+                show: true,
+                edit: true,
+                new: false,
+              },
+            },
+            status: {
+              isVisible: {
+                list: true,
+                filter: true,
+                show: true,
+                edit: false,
+                new: false,
+              },
+            },
+            expirationDate: {
+              isVisible: {
+                list: false,
+                filter: false,
+                show: true,
+                edit: false,
+                new: false,
+              },
+            },
+            approvalExpirationDate: {
+              isVisible: {
+                list: false,
+                filter: false,
+                show: true,
+                edit: false,
+                new: false,
+              },
+            },
+            createdAt: {
+              isVisible: {
+                list: false,
+                filter: false,
+                show: true,
+                edit: false,
+                new: false,
+              },
+            },
+            updatedAt: {
+              isVisible: {
+                list: false,
+                filter: false,
+                show: true,
+                edit: false,
+                new: false,
+              },
+            },
+          },
+          actions: {
+            delete: {
+              isVisible: false,
+            },
+            bulkDelete: {
+              isVisible: false,
+            },
+            new: {
+              isVisible: false,
+            },
+            edit: {
+              isVisible: true,
+            },
+          },
+        },
+      },
       {
         resource: Admin,
         options: {