Merge pull request #15 from duylongpro99/development

feat: room document with multiple users, update document realtime

Author: duylongpro99

.github/workflows/deploy.yml

@@ -123,6 +123,9 @@ jobs:
           echo "CLERK_SECRET_KEY=${{ secrets.CLERK_SECRET_KEY }}" >> .env
           echo "NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY=${{ secrets.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY }}" >> .env
 
+          # Liveblocks secret key:
+          echo "LIVE_BLOCK_SECRET_API_KEY=${{secrets.LIVE_BLOCK_SECRET_API_KEY}}" >> .env
+
       # Install Vercel CLI
       - name: Install Vercel CLI
         run: npm install --global vercel@latest

convex/document.ts

@@ -80,7 +80,10 @@ export const remove = mutation({
       | string
       | undefined;
 
-    if (doc.ownerId !== user.subject && doc.organizationId !== organizationId)
+    if (
+      doc.ownerId !== user.subject &&
+      !!(doc.organizationId && doc.organizationId !== organizationId)
+    )
       throw new ConvexError("Unauthorized");
 
     return await ctx.db.delete(args.documentId);
@@ -100,9 +103,29 @@ export const update = mutation({
       | string
       | undefined;
 
-    if (doc.ownerId !== user.subject && doc.organizationId !== organizationId)
+    if (
+      doc.ownerId !== user.subject &&
+      !!(doc.organizationId && doc.organizationId !== organizationId)
+    )
       throw new ConvexError("Unauthorized");
 
     return await ctx.db.patch(args.documentId, { title: args.title });
   },
 });
+
+export const get = query({
+  args: { id: v.id("documents"), ignoreAuth: v.optional(v.boolean()) },
+  handler: async (ctx, { id, ignoreAuth }) => {
+    if (!ignoreAuth) {
+      const user = await ctx.auth.getUserIdentity();
+      if (!user) throw new ConvexError("Unauthorized");
+    }
+
+    const doc = await ctx.db.get(id);
+    if (!doc) {
+      throw new ConvexError("Document not found");
+    }
+
+    return doc;
+  },
+});

liveblocks.config.ts

@@ -0,0 +1,49 @@
+// Define Liveblocks types for your application
+// https://liveblocks.io/docs/api-reference/liveblocks-react#Typing-your-data
+declare global {
+  interface Liveblocks {
+    // Each user's Presence, for useMyPresence, useOthers, etc.
+    Presence: {
+      // Example, real-time cursor coordinates
+      // cursor: { x: number; y: number };
+    };
+
+    // The Storage tree for the room, for useMutation, useStorage, etc.
+    Storage: {
+      // Example, a conflict-free list
+      // animals: LiveList<string>;
+    };
+
+    // Custom user info set when authenticating with a secret key
+    UserMeta: {
+      id: string;
+      info: {
+        // Example properties, for useSelf, useUser, useOthers, etc.
+        // name: string;
+        // avatar: string;
+      };
+    };
+
+    // Custom events, for useBroadcastEvent, useEventListener
+    RoomEvent: {};
+      // Example has two events, using a union
+      // | { type: "PLAY" } 
+      // | { type: "REACTION"; emoji: "🔥" };
+
+    // Custom metadata set on threads, for useThreads, useCreateThread, etc.
+    ThreadMetadata: {
+      // Example, attaching coordinates to a thread
+      // x: number;
+      // y: number;
+    };
+
+    // Custom room info set with resolveRoomsInfo, for useRoomInfo
+    RoomInfo: {
+      // Example, rooms with a title and url
+      // title: string;
+      // url: string;
+    };
+  }
+}
+
+export {};

package.json

@@ -12,6 +12,11 @@
     "@clerk/clerk-react": "^5.24.1",
     "@clerk/nextjs": "^6.12.4",
     "@hookform/resolvers": "^3.10.0",
+    "@liveblocks/client": "^2.20.0",
+    "@liveblocks/node": "^2.20.0",
+    "@liveblocks/react": "^2.20.0",
+    "@liveblocks/react-tiptap": "^2.20.0",
+    "@liveblocks/react-ui": "^2.20.0",
     "@radix-ui/react-accordion": "^1.2.2",
     "@radix-ui/react-alert-dialog": "^1.1.5",
     "@radix-ui/react-aspect-ratio": "^1.1.1",