chore: remove userKey from schemas and apply authenticatedProcedures …

…to dao routes
renlabs-dev · Sep 17, 2024 · 4e3a6d2 · 4e3a6d2
1 parent cfc13ad
commit 4e3a6d2
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 58 deletions.
diff --git a/apps/commune-governance/src/app/components/comments/report-comment.tsx b/apps/commune-governance/src/app/components/comments/report-comment.tsx
@@ -7,7 +7,6 @@ import { ExclamationTriangleIcon } from "@heroicons/react/20/solid";
 import { z } from "zod";
 
 import type { AppRouter } from "@commune-ts/api";
-import { useCommune } from "@commune-ts/providers/use-commune";
 import { toast } from "@commune-ts/providers/use-toast";
 
 import { api } from "~/trpc/react";
@@ -35,8 +34,6 @@ export function ReportComment({ commentId }: ReportCommentProps) {
 
   const [errors, setErrors] = useState<Partial<ReportFormData>>({});
 
-  const { selectedAccount } = useCommune();
-
   const reportCommentMutation =
     api.proposalComment.createCommentReport.useMutation({
       onSuccess: () => {
@@ -85,7 +82,6 @@ export function ReportComment({ commentId }: ReportCommentProps) {
     if (validateForm()) {
       reportCommentMutation.mutate({
         commentId,
-        userKey: selectedAccount?.address,
         reason: formData.reason,
         content: formData.content,
       });

diff --git a/apps/commune-governance/src/app/components/dao/create-cadre-candidates.tsx b/apps/commune-governance/src/app/components/dao/create-cadre-candidates.tsx
@@ -84,7 +84,6 @@ export function CreateCadreCandidates() {
       createCadreCandidateMutation.mutate({
         discordId,
         content,
-        userKey: selectedAccount.address,
       });
     } catch (err) {
       if (err instanceof z.ZodError) {

diff --git a/apps/commune-governance/src/app/components/dao/dao-vote-card.tsx b/apps/commune-governance/src/app/components/dao/dao-vote-card.tsx
@@ -71,15 +71,13 @@ export function DaoVoteCard(props: {
       // If user has already voted, first remove the existing vote
       deleteVoteMutation.mutate(
         {
-          userKey: selectedAccount.address,
           daoId,
         },
         {
           onSuccess: () => {
             // After successful deletion, create a new "remove" vote
             createVoteMutation.mutate({
               daoId,
-              userKey: selectedAccount.address,
               daoVoteType: vote,
             });
           },
@@ -89,7 +87,6 @@ export function DaoVoteCard(props: {
       // If user hasn't voted yet, directly create a "remove" vote
       createVoteMutation.mutate({
         daoId,
-        userKey: selectedAccount.address,
         daoVoteType: "REMOVE",
       });
     }
@@ -120,7 +117,6 @@ export function DaoVoteCard(props: {
 
     createVoteMutation.mutate({
       daoId,
-      userKey: selectedAccount.address,
       daoVoteType: vote,
     });
   }
@@ -132,7 +128,6 @@ export function DaoVoteCard(props: {
     }
 
     deleteVoteMutation.mutate({
-      userKey: selectedAccount.address,
       daoId,
     });
   }
@@ -178,23 +173,21 @@ export function DaoVoteCard(props: {
             <>
               <div className="flex w-full gap-4">
                 <button
-                  className={`w-full border border-green-600 py-1 ${
-                    vote === "ACCEPT"
-                      ? "border-green-500 bg-green-500/10 text-green-500"
-                      : "text-green-600"
-                  } ${createVoteMutation.isPending && "cursor-not-allowed"}`}
+                  className={`w-full border border-green-600 py-1 ${vote === "ACCEPT"
+                    ? "border-green-500 bg-green-500/10 text-green-500"
+                    : "text-green-600"
+                    } ${createVoteMutation.isPending && "cursor-not-allowed"}`}
                   onClick={() => handleVotePreference("ACCEPT")}
                   type="button"
                   disabled={createVoteMutation.isPending}
                 >
                   Approve
                 </button>
                 <button
-                  className={`w-full border border-red-600 py-1 ${
-                    vote === "REFUSE"
-                      ? "border-red-500 bg-red-500/10 text-red-500"
-                      : "text-red-500"
-                  } ${createVoteMutation.isPending && "cursor-not-allowed"}`}
+                  className={`w-full border border-red-600 py-1 ${vote === "REFUSE"
+                    ? "border-red-500 bg-red-500/10 text-red-500"
+                    : "text-red-500"
+                    } ${createVoteMutation.isPending && "cursor-not-allowed"}`}
                   onClick={() => handleVotePreference("REFUSE")}
                   type="button"
                   disabled={createVoteMutation.isPending}
@@ -203,11 +196,10 @@ export function DaoVoteCard(props: {
                 </button>
               </div>
               <button
-                className={`mt-4 w-full border p-1.5 ${
-                  !vote || createVoteMutation.isPending
-                    ? "cursor-not-allowed border-gray-400 text-gray-400"
-                    : "border-blue-400 bg-blue-500/10 text-blue-400"
-                } `}
+                className={`mt-4 w-full border p-1.5 ${!vote || createVoteMutation.isPending
+                  ? "cursor-not-allowed border-gray-400 text-gray-400"
+                  : "border-blue-400 bg-blue-500/10 text-blue-400"
+                  } `}
                 disabled={!vote || createVoteMutation.isPending}
                 onClick={handleVote}
                 type="button"

diff --git a/apps/commune-validator/src/app/components/delegated-modules-list.tsx b/apps/commune-validator/src/app/components/delegated-modules-list.tsx
@@ -103,14 +103,11 @@ export function DelegatedModulesList() {
 
     try {
       // Delete existing user module data
-      await deleteUserModuleData.mutateAsync({
-        userKey: selectedAccount.address,
-      });
+      await deleteUserModuleData.mutateAsync();
 
       // Submit new user module data
       for (const delegatedModule of delegatedModules) {
         await createUserModuleData.mutateAsync({
-          userKey: selectedAccount.address,
           moduleId: delegatedModule.id,
           weight: delegatedModule.percentage,
         });
@@ -190,9 +187,8 @@ export function DelegatedModulesList() {
                 <span>{isOpen ? "COLLAPSE VIEW" : "EXPAND VIEW"}</span>
                 <span>
                   <ChevronUpIcon
-                    className={`h-5 w-5 transform transition-transform ${
-                      isOpen ? "rotate-180" : ""
-                    }`}
+                    className={`h-5 w-5 transform transition-transform ${isOpen ? "rotate-180" : ""
+                      }`}
                   />
                 </span>
               </button>
@@ -245,12 +241,11 @@ export function DelegatedModulesList() {
               <div className="flex flex-col gap-3">
                 <button
                   onClick={handleSubmit}
-                  className={`mt-4 w-full animate-fade rounded-full border border-white/20 bg-[#898989]/5 p-2 text-white backdrop-blur-md transition duration-200 animate-delay-300 ${
-                    isSubmitting ||
+                  className={`mt-4 w-full animate-fade rounded-full border border-white/20 bg-[#898989]/5 p-2 text-white backdrop-blur-md transition duration-200 animate-delay-300 ${isSubmitting ||
                     totalPercentage !== 100 ||
                     (!selectedAccount.address &&
                       `hover:border-green-500 hover:bg-green-500/10`)
-                  } disabled:opacity-50`}
+                    } disabled:opacity-50`}
                   disabled={
                     isSubmitting ||
                     totalPercentage !== 100 ||

diff --git a/apps/commune-validator/src/app/components/report-module.tsx b/apps/commune-validator/src/app/components/report-module.tsx
@@ -5,17 +5,16 @@ import { XMarkIcon } from "@heroicons/react/16/solid";
 import { ExclamationTriangleIcon } from "@heroicons/react/20/solid";
 import { z } from "zod";
 
-import { useCommune } from "@commune-ts/providers/use-commune";
 import { toast } from "@commune-ts/providers/use-toast";
 
 import { api } from "~/trpc/react";
 
 enum ReportReason {
-  spam = "spam",
-  harassment = "harassment",
-  hateSpeech = "hateSpeech",
-  violence = "violence",
-  sexualContent = "sexualContent",
+  spam = "SPAM",
+  harassment = "HARASSMENT",
+  hateSpeech = "HATE_SPEECH",
+  violence = "VIOLENCE",
+  sexualContent = "SEXUAL_CONTENT",
 }
 
 const reportSchema = z.object({
@@ -37,8 +36,6 @@ export function ReportModule({ moduleId }: ReportModuleProps) {
   });
   const [errors, setErrors] = useState<Partial<ReportFormData>>({});
 
-  const { selectedAccount } = useCommune();
-
   const reportModuleMutation = api.module.createModuleReport.useMutation({
     onSuccess: () => {
       setModalOpen(false);
@@ -84,7 +81,6 @@ export function ReportModule({ moduleId }: ReportModuleProps) {
     if (validateForm()) {
       reportModuleMutation.mutate({
         moduleId,
-        userKey: selectedAccount?.address,
         reason: formData.reason,
         content: formData.content,
       });

diff --git a/packages/api/src/router/dao.ts b/packages/api/src/router/dao.ts
@@ -16,7 +16,7 @@ import {
   DAO_VOTE_INSERT_SCHEMA,
 } from "@commune-ts/db/validation";
 
-import { publicProcedure } from "../trpc";
+import { authenticatedProcedure, publicProcedure } from "../trpc";
 
 export const daoRouter = {
   // GET
@@ -37,48 +37,56 @@ export const daoRouter = {
     return ctx.db.query.cadreCandidatesSchema.findMany();
   }),
   // POST
-  createVote: publicProcedure
+  createVote: authenticatedProcedure
     .input(DAO_VOTE_INSERT_SCHEMA)
     .mutation(async ({ ctx, input }) => {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const userKey = ctx.user!.userKey
       await ctx.db
         .update(daoVoteSchema)
         .set({
           deletedAt: new Date(),
         })
         .where(
           and(
-            eq(daoVoteSchema.userKey, input.userKey),
+            eq(daoVoteSchema.userKey, userKey),
             eq(daoVoteSchema.daoId, input.daoId),
             isNull(daoVoteSchema.deletedAt),
           ),
         )
         .execute();
 
-      await ctx.db.insert(daoVoteSchema).values(input).execute();
+      await ctx.db.insert(daoVoteSchema).values({...input, userKey: userKey}).execute();
     }),
-  deleteVote: publicProcedure
-    .input(z.object({ userKey: z.string(), daoId: z.number() }))
+  deleteVote: authenticatedProcedure
+    .input(z.object({ daoId: z.number() }))
     .mutation(async ({ ctx, input }) => {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const userKey = ctx.user!.userKey
       await ctx.db
         .update(daoVoteSchema)
         .set({
           deletedAt: new Date(),
         })
         .where(
           and(
-            eq(daoVoteSchema.userKey, input.userKey),
+            eq(daoVoteSchema.userKey, userKey),
             eq(daoVoteSchema.daoId, input.daoId),
           ),
         );
     }),
-  addCadreCandidates: publicProcedure
+  addCadreCandidates: authenticatedProcedure
     .input(CADRE_CANDIDATES_INSERT_SCHEMA)
     .mutation(async ({ ctx, input }) => {
-      await ctx.db.insert(cadreCandidatesSchema).values(input).execute();
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const userKey = ctx.user!.userKey
+      await ctx.db.insert(cadreCandidatesSchema).values({...input, userKey: userKey }).execute();
     }),
-  createCadreVote: publicProcedure
+  createCadreVote: authenticatedProcedure
     .input(CADRE_VOTE_INSERT_SCHEMA)
     .mutation(async ({ ctx, input }) => {
-      await ctx.db.insert(cadreVoteSchema).values(input).execute();
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const userKey = ctx.user!.userKey
+      await ctx.db.insert(cadreVoteSchema).values({...input, userKey: userKey }).execute();
     }),
 } satisfies TRPCRouterRecord;
diff --git a/packages/api/src/router/proposal-comment.ts b/packages/api/src/router/proposal-comment.ts
@@ -64,21 +64,21 @@ export const proposalCommentRouter = {
   }),
   // POST
   createComment: authenticatedProcedure
-    .input(PROPOSAL_COMMENT_INSERT_SCHEMA.omit({ userKey: true }))
+    .input(PROPOSAL_COMMENT_INSERT_SCHEMA)
     .mutation(async ({ ctx, input }) => {
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       const userKey = ctx.user!.userKey;
       await ctx.db.insert(proposalCommentSchema).values({ ...input, userKey });
     }),
   createCommentReport: authenticatedProcedure
-    .input(COMMENT_REPORT_INSERT_SCHEMA.omit({ userKey: true }))
+    .input(COMMENT_REPORT_INSERT_SCHEMA)
     .mutation(async ({ ctx, input }) => {
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       const userKey = ctx.user!.userKey;
       await ctx.db.insert(commentReportSchema).values({ ...input, userKey });
     }),
   castVote: authenticatedProcedure
-    .input(COMMENT_INTERACTION_INSERT_SCHEMA.omit({ userKey: true }))
+    .input(COMMENT_INTERACTION_INSERT_SCHEMA)
     .mutation(async ({ ctx, input }) => {
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       const userKey = ctx.user!.userKey;

diff --git a/packages/db/src/validation.ts b/packages/db/src/validation.ts
@@ -47,6 +47,7 @@ export const PROPOSAL_COMMENT_INSERT_SCHEMA = createInsertSchema(
   id: true,
   createdAt: true,
   deletedAt: true,
+  userKey: true,
 });
 
 export const COMMENT_INTERACTION_INSERT_SCHEMA = createInsertSchema(
@@ -57,6 +58,7 @@ export const COMMENT_INTERACTION_INSERT_SCHEMA = createInsertSchema(
 ).omit({
   id: true,
   createdAt: true,
+  userKey: true,
 });
 
 export const COMMENT_REPORT_INSERT_SCHEMA = createInsertSchema(
@@ -72,6 +74,7 @@ export const COMMENT_REPORT_INSERT_SCHEMA = createInsertSchema(
 ).omit({
   id: true,
   createdAt: true,
+  userKey: true,
 });
 
 export const MODULE_REPORT_INSERT_SCHEMA = createInsertSchema(moduleReport, {
@@ -93,13 +96,15 @@ export const USER_MODULE_DATA_INSERT_SCHEMA = createInsertSchema(
   },
 ).omit({
   id: true,
+  userKey: true
 });
 
 export const DAO_VOTE_INSERT_SCHEMA = createInsertSchema(daoVoteSchema).omit({
   id: true,
   createdAt: true,
   updatedAt: true,
   deletedAt: true,
+  userKey: true,
 });
 
 export const CADRE_INSERT_SCHEMA = createInsertSchema(cadreSchema).omit({
@@ -115,6 +120,7 @@ export const CADRE_CANDIDATES_INSERT_SCHEMA = createInsertSchema(
   id: true,
   createdAt: true,
   deletedAt: true,
+  userKey: true,
 });
 
 export const CADRE_VOTE_INSERT_SCHEMA = createInsertSchema(
@@ -124,4 +130,5 @@ export const CADRE_VOTE_INSERT_SCHEMA = createInsertSchema(
   createdAt: true,
   updatedAt: true,
   deletedAt: true,
+  userKey: true,
 });