diff --git a/platforms/blabsy/api/src/controllers/WebhookController.ts b/platforms/blabsy/api/src/controllers/WebhookController.ts index 5e7484eff..a3d3ced88 100644 --- a/platforms/blabsy/api/src/controllers/WebhookController.ts +++ b/platforms/blabsy/api/src/controllers/WebhookController.ts @@ -94,40 +94,47 @@ export class WebhookController { axios.post(new URL("blabsy", process.env.ANCHR_URL).toString(), req.body) } - // Early duplicate check - if (adapter.lockedIds.includes(id)) { + const mapping = Object.values(adapter.mapping).find( + (m) => m.schemaId === schemaId, + ); + if (!mapping) throw new Error(); + const tableName = mapping.tableName + "s"; + + // For chats, skip the lock check and use timestamp comparison instead + const isChatData = tableName === "chats"; + + if (!isChatData && adapter.lockedIds.includes(id)) { console.log(`Webhook skipped - ID ${id} already locked`); return res.status(200).json({ success: true, skipped: true }); } console.log(`Processing webhook for ID: ${id}`); - - // Lock the global ID immediately to prevent duplicates - adapter.addToLockedIds(id); - const mapping = Object.values(adapter.mapping).find( - (m) => m.schemaId === schemaId, - ); - if (!mapping) throw new Error(); - const tableName = mapping.tableName + "s"; + // Lock the global ID immediately to prevent duplicates (non-chat) + if (!isChatData) { + adapter.addToLockedIds(id); + } const local = await adapter.fromGlobal({ data, mapping }); - console.log("Webhook data received:", { - globalId: id, - tableName, + console.log("Webhook data received:", { + globalId: id, + tableName, hasEname: !!local.data.ename, - ename: local.data.ename + ename: local.data.ename }); - + // Get the local ID from the mapping database const localId = await adapter.mappingDb.getLocalId(id); if (localId) { console.log(`LOCAL, updating - ID: ${id}, LocalID: ${localId}`); - // Lock local ID early to prevent duplicate processing - adapter.addToLockedIds(localId); - await this.updateRecord(tableName, localId, local.data); + if (isChatData) { + await this.updateChatIfNewer(localId, local.data); + } else { + adapter.addToLockedIds(localId); + await this.updateRecord(tableName, localId, local.data); + } } else { console.log(`NOT LOCAL, creating - ID: ${id}`); await this.createRecord(tableName, local.data, req.body.id); @@ -252,6 +259,33 @@ export class WebhookController { const mappedData = await this.mapDataToFirebase(tableName, data); await docRef.update(mappedData); } + + private async updateChatIfNewer(localId: string, data: any) { + const docRef = this.db.collection("chats").doc(localId); + const docSnapshot = await docRef.get(); + + if (!docSnapshot.exists) { + console.warn(`Chat document '${localId}' does not exist. Skipping update.`); + return; + } + + const existing = docSnapshot.data(); + const mappedData = this.mapChatData(data, Timestamp.now()); + + // Compare updatedAt timestamps - accept if incoming is more recent + const existingUpdatedAt = existing?.updatedAt?.toMillis?.() ?? 0; + const incomingUpdatedAt = mappedData.updatedAt?.toMillis?.() ?? 0; + + if (incomingUpdatedAt < existingUpdatedAt) { + console.log(`Chat ${localId} webhook skipped - local data is more recent (local: ${existingUpdatedAt}, incoming: ${incomingUpdatedAt})`); + return; + } + + adapter.addToLockedIds(localId); + await docRef.update(mappedData); + console.log(`Chat ${localId} updated via webhook (timestamp check passed)`); + } + private mapDataToFirebase(tableName: string, data: any): any { const now = Timestamp.now(); console.log("MAPPING DATA TO ", tableName); diff --git a/platforms/group-charter-manager/api/src/controllers/GroupController.ts b/platforms/group-charter-manager/api/src/controllers/GroupController.ts index c66648426..bc2cb3106 100644 --- a/platforms/group-charter-manager/api/src/controllers/GroupController.ts +++ b/platforms/group-charter-manager/api/src/controllers/GroupController.ts @@ -338,6 +338,74 @@ export class GroupController { } } + async updateMemberRole(req: Request, res: Response) { + try { + const { groupId, userId: targetUserId } = req.params; + const requestingUserId = (req as any).user?.id; + + if (!requestingUserId) { + return res.status(401).json({ error: "Unauthorized" }); + } + + const { role } = req.body; + if (!["admin", "member", "owner"].includes(role)) { + return res.status(400).json({ error: "Invalid role. Must be 'admin', 'member', or 'owner'" }); + } + + const group = await this.groupService.getGroupById(groupId); + if (!group) { + return res.status(404).json({ error: "Group not found" }); + } + + // Verify target user is a participant + if (!group.participants.some(p => p.id === targetUserId)) { + return res.status(400).json({ error: "User is not a participant in this group" }); + } + + const isOwner = group.owner === requestingUserId; + const isAdmin = group.admins?.includes(requestingUserId); + + if (!isOwner && !isAdmin) { + return res.status(403).json({ error: "Access denied" }); + } + + const currentAdmins = group.admins || []; + + if (role === "admin") { + // Grant admin - admins and owners can do this + if (currentAdmins.includes(targetUserId)) { + return res.status(400).json({ error: "User is already an admin" }); + } + const newAdmins = [...currentAdmins, targetUserId]; + await this.groupService.updateGroup(groupId, { admins: newAdmins } as any); + } else if (role === "member") { + // Remove admin - admins and owners can do this + if (targetUserId === group.owner) { + return res.status(400).json({ error: "Cannot demote the owner" }); + } + const newAdmins = currentAdmins.filter(id => id !== targetUserId); + await this.groupService.updateGroup(groupId, { admins: newAdmins } as any); + } else if (role === "owner") { + // Transfer ownership - only owner can do this + if (!isOwner) { + return res.status(403).json({ error: "Only the owner can transfer ownership" }); + } + // Old owner becomes admin, new owner gets added to admins if not already + let newAdmins = currentAdmins.includes(requestingUserId) ? [...currentAdmins] : [...currentAdmins, requestingUserId]; + if (!newAdmins.includes(targetUserId)) { + newAdmins.push(targetUserId); + } + await this.groupService.updateGroup(groupId, { owner: targetUserId, admins: newAdmins } as any); + } + + const updatedGroup = await this.groupService.getGroupById(groupId); + res.json(updatedGroup); + } catch (error) { + console.error("Error updating member role:", error); + res.status(500).json({ error: "Internal server error" }); + } + } + async getCharterSigningStatus(req: Request, res: Response) { try { const { id } = req.params; diff --git a/platforms/group-charter-manager/api/src/index.ts b/platforms/group-charter-manager/api/src/index.ts index af27abde4..ee43e049a 100644 --- a/platforms/group-charter-manager/api/src/index.ts +++ b/platforms/group-charter-manager/api/src/index.ts @@ -157,6 +157,7 @@ app.get("/api/signing/sessions/:sessionId", authGuard, (req, res) => { app.get("/api/groups/:groupId", authGuard, groupController.getGroup.bind(groupController)); app.post("/api/groups/:groupId/participants", authGuard, groupController.addParticipants.bind(groupController)); app.delete("/api/groups/:groupId/participants/:userId", authGuard, groupController.removeParticipant.bind(groupController)); +app.patch("/api/groups/:groupId/members/:userId/role", authGuard, groupController.updateMemberRole.bind(groupController)); // Start server app.listen(port, () => { diff --git a/platforms/group-charter-manager/client/src/app/charter/[id]/page.tsx b/platforms/group-charter-manager/client/src/app/charter/[id]/page.tsx index ee352e4c5..120c379f4 100644 --- a/platforms/group-charter-manager/client/src/app/charter/[id]/page.tsx +++ b/platforms/group-charter-manager/client/src/app/charter/[id]/page.tsx @@ -419,12 +419,13 @@ export default function CharterDetail({ )} {/* Charter Signing Status */} - {group.charter && ( - - )} + diff --git a/platforms/group-charter-manager/client/src/components/charter-signing-status.tsx b/platforms/group-charter-manager/client/src/components/charter-signing-status.tsx index 22e575ac5..08da680ee 100644 --- a/platforms/group-charter-manager/client/src/components/charter-signing-status.tsx +++ b/platforms/group-charter-manager/client/src/components/charter-signing-status.tsx @@ -1,15 +1,25 @@ "use client"; import { useState, useEffect } from "react"; -import { CheckCircle, Circle, AlertTriangle } from "lucide-react"; +import { CheckCircle, Circle, AlertTriangle, MoreVertical, Shield, ShieldOff, Crown } from "lucide-react"; import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; import { Badge } from "@/components/ui/badge"; +import { Button } from "@/components/ui/button"; +import { + DropdownMenu, + DropdownMenuContent, + DropdownMenuItem, + DropdownMenuTrigger, +} from "@/components/ui/dropdown-menu"; import { apiClient } from "@/lib/apiClient"; import { useToast } from "@/hooks/use-toast"; interface CharterSigningStatusProps { groupId: string; charterContent: string; + currentUserId?: string; + currentUserIsAdmin?: boolean; + currentUserIsOwner?: boolean; } interface Participant { @@ -28,7 +38,7 @@ interface SigningStatus { isSigned: boolean; } -export function CharterSigningStatus({ groupId, charterContent }: CharterSigningStatusProps) { +export function CharterSigningStatus({ groupId, charterContent, currentUserId, currentUserIsAdmin, currentUserIsOwner }: CharterSigningStatusProps) { const [signingStatus, setSigningStatus] = useState(null); const [loading, setLoading] = useState(true); const { toast } = useToast(); @@ -54,6 +64,28 @@ export function CharterSigningStatus({ groupId, charterContent }: CharterSigning } }; + const handleRoleChange = async (targetUserId: string, newRole: "admin" | "member" | "owner") => { + if (newRole === "owner" && !window.confirm("Are you sure you want to transfer ownership? This cannot be undone.")) { + return; + } + try { + await apiClient.patch(`/api/groups/${groupId}/members/${targetUserId}/role`, { role: newRole }); + toast({ + title: "Success", + description: newRole === "admin" ? "Admin privileges granted" : newRole === "member" ? "Admin privileges removed" : "Ownership transferred", + }); + fetchSigningStatus(); + } catch (error: any) { + toast({ + title: "Error", + description: error.response?.data?.error || "Failed to update role", + variant: "destructive", + }); + } + }; + + const canManageRoles = currentUserIsAdmin || currentUserIsOwner; + if (loading) { @@ -102,22 +134,25 @@ export function CharterSigningStatus({ groupId, charterContent }: CharterSigning className="flex items-center justify-between p-3 bg-gray-50 rounded-lg" >
- {participant.hasSigned ? ( - - ) : ( - - )} + {charterContent ? ( + participant.hasSigned ? ( + + ) : ( + + ) + ) : null}

{participant.name || participant.ename || 'Unknown User'}

-

- {participant.hasSigned ? 'Signed' : 'Not signed yet'} -

+ {charterContent && ( +

+ {participant.hasSigned ? 'Signed' : 'Not signed yet'} +

+ )}
- {/* Show admin role if applicable */} {participant.isAdmin && ( Admin @@ -128,6 +163,35 @@ export function CharterSigningStatus({ groupId, charterContent }: CharterSigning Owner )} + {canManageRoles && participant.id !== currentUserId && ( + + + + + + {!participant.isAdmin && !participant.isOwner && ( + handleRoleChange(participant.id, "admin")}> + + Make Admin + + )} + {participant.isAdmin && !participant.isOwner && ( + handleRoleChange(participant.id, "member")}> + + Remove Admin + + )} + {!participant.isOwner && currentUserIsOwner && ( + handleRoleChange(participant.id, "owner")}> + + Transfer Ownership + + )} + + + )}
))}