Merge pull request #233 from privacy-scaling-explorations/refactor/ne…

…w-design

New M3 design

apps/api/src/app/groups/entities/group.entity.ts

@@ -31,7 +31,9 @@ export class Group {
     @Column({ name: "fingerprint_duration" })
     fingerprintDuration: number
 
-    @OneToMany(() => Member, (member) => member.group, { cascade: ["insert"] })
+    @OneToMany(() => Member, (member) => member.group, {
+        cascade: ["insert"]
+    })
     members: Member[]
 
     @OneToMany(() => ReputationAccount, (account) => account.group, {

apps/api/src/app/groups/entities/member.entity.ts

@@ -21,7 +21,9 @@ export class Member {
     // i.e we allow same member id to be part of many groups.
     // But since this property is not used in any feature at the moment,
     // it is treated as many-to-one in the code for simplicity.
-    @ManyToOne(() => Group, (group) => group.members)
+    @ManyToOne(() => Group, (group) => group.members, {
+        onDelete: "CASCADE"
+    })
     @JoinColumn({ name: "group_id" })
     group: Group
 

apps/api/src/app/groups/groups.controller.ts

@@ -56,6 +56,12 @@ export class GroupsController {
         )
     }
 
+    @Delete(":group")
+    @UseGuards(AuthGuard)
+    async removeGroup(@Req() req: Request, @Param("group") groupId: string) {
+        await this.groupsService.removeGroup(groupId, req.session.adminId)
+    }
+
     @Patch(":group")
     @UseGuards(AuthGuard)
     async updateGroup(
@@ -75,6 +81,12 @@ export class GroupsController {
         )
     }
 
+    @Patch(":group/api-key")
+    @UseGuards(AuthGuard)
+    async updateApiKey(@Req() req: Request, @Param("group") groupId: string) {
+        return this.groupsService.updateApiKey(groupId, req.session.adminId)
+    }
+
     @Get(":group/members/:member")
     isGroupMember(
         @Param("group") groupId: string,

apps/api/src/app/groups/groups.service.ts

@@ -50,7 +50,7 @@ export class GroupsService {
     /**
      * Creates a new group.
      * @param dto External parameters used to create a new group.
-     * @param admin Admin id.
+     * @param adminId Admin id.
      * @returns Created group.
      */
     async createGroup(
@@ -61,11 +61,11 @@ export class GroupsService {
             treeDepth,
             fingerprintDuration
         }: CreateGroupDto,
-        admin: string
+        adminId: string
     ): Promise<Group> {
         const _groupId =
             groupId ||
-            BigInt(id(name + admin))
+            BigInt(id(name + adminId))
                 .toString()
                 .slice(0, 32)
 
@@ -75,7 +75,7 @@ export class GroupsService {
             description,
             treeDepth,
             fingerprintDuration,
-            adminId: admin,
+            adminId,
             members: []
         })
 
@@ -94,6 +94,27 @@ export class GroupsService {
         return group
     }
 
+    /**
+     * Removes a group.
+     * @param groupId Group id.
+     * @param adminId Admin id.
+     */
+    async removeGroup(groupId: string, adminId: string): Promise<void> {
+        const group = await this.getGroup(groupId)
+
+        if (group.adminId !== adminId) {
+            throw new UnauthorizedException(
+                `You are not the admin of the group '${groupId}'`
+            )
+        }
+
+        await this.groupRepository.remove(group)
+
+        this.cachedGroups.delete(groupId)
+
+        Logger.log(`GroupsService: group '${group.name}' has been removed`)
+    }
+
     /**
      * Updates some parameters of the group.
      * @param groupId Group id.
@@ -155,6 +176,37 @@ export class GroupsService {
         return group
     }
 
+    /**
+     * Updates the group api key.
+     * @param groupId Group id.
+     * @param adminId Group admin id.
+     */
+    async updateApiKey(groupId: string, adminId: string): Promise<string> {
+        const group = await this.getGroup(groupId)
+
+        if (group.adminId !== adminId) {
+            throw new UnauthorizedException(
+                `You are not the admin of the group '${groupId}'`
+            )
+        }
+
+        if (!group.apiEnabled) {
+            throw new UnauthorizedException(
+                `Group '${groupId}' APIs are not enabled`
+            )
+        }
+
+        group.apiKey = v4()
+
+        await this.groupRepository.save(group)
+
+        Logger.log(
+            `GroupsService: group '${group.name}' APIs have been updated`
+        )
+
+        return group.apiKey
+    }
+
     /**
      * Join the group by redeeming invite code.
      * @param groupId Group name.

apps/api/src/app/invites/entities/invite.entity.ts

@@ -22,7 +22,9 @@ export class Invite {
     @Column({ default: false, name: "is_redeemed" })
     isRedeemed?: boolean
 
-    @ManyToOne(() => Group)
+    @ManyToOne(() => Group, {
+        onDelete: "CASCADE"
+    })
     @JoinColumn({ name: "group_id" })
     group: Group
 

apps/api/src/app/reputation/entities/reputation-account.entity.ts

@@ -15,7 +15,9 @@ export class ReputationAccount {
     @PrimaryColumn()
     accountHash: string
 
-    @ManyToOne(() => Group, (group) => group.reputationAccounts)
+    @ManyToOne(() => Group, (group) => group.reputationAccounts, {
+        onDelete: "CASCADE"
+    })
     @JoinColumn({ name: "group_id" })
     group: Group
 }

apps/dashboard/.env.production

@@ -1,7 +1,7 @@
 # This file contains build time variables for prod env.
 
 VITE_API_URL=https://api.bandada.appliedzkp.org
-VITE_CLIENT_URL=https://client.bandada.appliedzkp.org
+VITE_CLIENT_INVITES_URL=https://client.bandada.appliedzkp.org/invites/\
 VITE_ETHEREUM_NETWORK=goerli
 VITE_GITHUB_CLIENT_ID=6ccd7b93e84260e353f9
 VITE_TWITTER_CLIENT_ID=NV82Mm85NWlSZ1llZkpLMl9vN3A6MTpjaQ

apps/dashboard/package.json

@@ -14,14 +14,14 @@
         "@chakra-ui/theme-tools": "^2.0.16",
         "@emotion/react": "^11.10.6",
         "@emotion/styled": "^11.10.6",
-        "@fontsource/ibm-plex-sans": "^4.5.13",
+        "@fontsource-variable/unbounded": "^5.0.5",
         "@rainbow-me/rainbowkit": "^0.12.8",
         "@semaphore-protocol/data": "3.10.0",
         "ethers": "^5.4.7",
         "framer-motion": "^10.0.1",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
-        "react-icons": "^4.8.0",
+        "react-icons": "^4.10.1",
         "react-router-dom": "^6.8.1",
         "siwe": "^1.1.6",
         "wagmi": "^0.12.12"

apps/dashboard/src/api/bandadaAPI.ts

@@ -126,6 +126,38 @@ export async function updateGroup(
     }
 }
 
+/**
+ * It generates a new API key.
+ * @param group The group id.
+ */
+export async function generateApiKey(groupId: string): Promise<string | null> {
+    try {
+        return await request(`${API_URL}/groups/${groupId}/api-key`, {
+            method: "PATCH"
+        })
+    } catch (error) {
+        console.error(error)
+
+        return null
+    }
+}
+
+/**
+ * It removes a group.
+ * @param groupId The group id.
+ */
+export async function removeGroup(groupId: string): Promise<void | null> {
+    try {
+        await request(`${API_URL}/groups/${groupId}`, {
+            method: "DELETE"
+        })
+    } catch (error) {
+        console.error(error)
+
+        return null
+    }
+}
+
 /**
  * It returns a random string to be used as a OAuth state, to to protect against
  * forgery attacks. It will be used to retrieve group, member, redirectURI and provider

apps/dashboard/src/api/semaphoreAPI.ts

@@ -25,7 +25,6 @@ export async function getGroups(adminAddress: string): Promise<Group[] | null> {
                 id: group.id,
                 name: groupName,
                 treeDepth: group.merkleTree.depth,
-                fingerprintDuration: 3600,
                 members: group.members as string[],
                 admin: group.admin as string,
                 type: "on-chain"