Events orgs (#26)

abbaspour · web-flow · commit f75d20a0b457 · 2025-11-03T10:00:23.000+11:00
* getting orgs to work

* orgs events &amp; sso-invite working.
diff --git a/.claude/settings.local.json b/.claude/settings.local.json
@@ -1,6 +1,13 @@
 {
+  "permissions": {
+    "allow": [
+      "WebFetch(domain:auth0.com)",
+      "mcp__context7__resolve-library-id",
+      "mcp__context7__get-library-docs"
+    ]
+  },
   "enabledMcpjsonServers": [
     "context7",
     "terraform"
   ]
-}
+}
diff --git a/admin/api/src/event.ts b/admin/api/src/event.ts
@@ -40,6 +40,27 @@ interface User {
     picture?: string;
 }
 
+/**
+ * Represents an organization event from Auth0
+ */
+interface Organization {
+    id: string;
+    name: string;
+    display_name?: string;
+    branding?: {
+        logo_url?: string;
+        colors?: {
+            primary?: string;
+            page_background?: string;
+        };
+    };
+    metadata?: {
+        [key: string]: any;
+    };
+    created_at?: string;
+    updated_at?: string;
+}
+
 /*
 eventsApp.use('/!*', async (c, next) => {
     const auth = bearerAuth({
@@ -71,6 +92,13 @@ eventsApp.post('/', async (c) => {
                 case 'user.deleted':
                     await handleUserDeleted(user, c);
                     break;
+                case 'organization.created':
+                case 'organization.updated':
+                    await handleOrganizationUpsert(user, time, c, type === 'organization.created');
+                    break;
+                case 'organization.deleted':
+                    await handleOrganizationDeleted(user, c);
+                    break;
                 default:
                     console.log(`Event type '${type}' not implemented yet.`);
             }
@@ -135,7 +163,7 @@ async function handleUserUpsert(user: User, time: string, c: Context, isNewUser:
 
     try {
         await c.env.DB.prepare(
-            `REPLACE INTO users(
+            `INSERT INTO users(
                 auth0_user_id,
                 auth0_org_id,
                 email,
@@ -152,7 +180,23 @@ async function handleUserUpsert(user: User, time: string, c: Context, isNewUser:
                 app_metadata,
                 identities,
                 last_event_processed
-            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
+            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+            ON CONFLICT(auth0_user_id) DO UPDATE SET
+                auth0_org_id = excluded.auth0_org_id,
+                email = excluded.email,
+                email_verified = excluded.email_verified,
+                name = excluded.name,
+                picture = excluded.picture,
+                blocked = excluded.blocked,
+                family_name = excluded.family_name,
+                given_name = excluded.given_name,
+                nickname = excluded.nickname,
+                phone_number = excluded.phone_number,
+                phone_verified = excluded.phone_verified,
+                user_metadata = excluded.user_metadata,
+                app_metadata = excluded.app_metadata,
+                identities = excluded.identities,
+                last_event_processed = excluded.last_event_processed`)
             .bind(
                 user_id,
                 auth0OrgId,
@@ -180,4 +224,67 @@ async function handleUserUpsert(user: User, time: string, c: Context, isNewUser:
     }
 }
 
+async function handleOrganizationDeleted(organization: Organization, c: Context) {
+    const {id} = organization;
+
+try {
+        // Delete the organization by Auth0 org id
+        await c.env.DB.prepare(`DELETE FROM Organizations WHERE auth0_org_id = ?`)
+            .bind(id)
+            .run();
+    } catch (err: any) {
+        console.error(`Database error while deleting org_id=${id}:`, err);
+        throw err;
+    }
+}
+
+
+async function handleOrganizationUpsert(organization: Organization, time: string, c: Context, isNewOrg: boolean) {
+    const {
+        id,
+        name,
+        display_name,
+        branding,
+        metadata,
+    } = organization;
+
+    // Convert complex objects to JSON strings for storage
+    const brandingJson = branding ? JSON.stringify(branding) : null;
+    const metadataJson = metadata ? JSON.stringify(metadata) : null;
+
+    try {
+        await c.env.DB.prepare(
+            `INSERT INTO Organizations(
+                auth0_org_id,
+                name,
+                display_name,
+                branding,
+                metadata,
+                org_type,
+                last_event_processed
+            ) VALUES (?, ?, ?, ?, ?, ?, ?)
+            ON CONFLICT(auth0_org_id) DO UPDATE SET
+                name = excluded.name,
+                display_name = excluded.display_name,
+                branding = excluded.branding,
+                metadata = excluded.metadata,
+                last_event_processed = excluded.last_event_processed`)
+            .bind(
+                id,
+                name || null,
+                display_name || null,
+                brandingJson,
+                metadataJson,
+                'supplier', // Default org_type for new organizations from Auth0
+                time
+            )
+            .run();
+
+        console.log(`Organization ${id} successfully ${isNewOrg ? 'inserted' : 'updated'} into Organizations.`);
+    } catch (err: any) {
+        console.error(`Database error while upserting org_id=${id}:`, err);
+        throw err;
+    }
+}
+
 export default eventsApp;
diff --git a/admin/api/src/index.ts b/admin/api/src/index.ts
@@ -361,7 +361,7 @@ app.get("/organizations/:orgId/sso-invitations", async (c) => {
         s.created_at AS created_at,
         CASE WHEN (strftime('%s','now') > (strftime('%s', s.created_at) + s.ttl)) THEN 'expired' ELSE 'invited' END AS sso_status
       FROM SsoInvitations s
-      JOIN Organizations o ON o.id = s.organization_id
+      JOIN Organizations o ON o.auth0_org_id = s.auth0_org_id
       WHERE o.auth0_org_id = ?`;
     const params: any[] = [orgId];
 
@@ -413,19 +413,23 @@ app.post("/organizations/:orgId/sso-invitations", async (c) => {
 
     try {
         // Lookup organization
-        const org = await c.env.DB.prepare("SELECT id, auth0_org_id, name FROM Organizations WHERE auth0_org_id = ?")
+        const org = await c.env.DB.prepare("SELECT name FROM Organizations WHERE auth0_org_id = ?")
             .bind(orgId)
             .first<{id: number; auth0_org_id: string; name: string}>();
-        if (!org) return c.json({error: "Not Found"}, 404);
+        if (!org) return c.json({error: "Org Not Found"}, 404);
 
         // Optional: resolve issuer user id from token sub
-        const token: any = c.get("token");
-        const sub = token?.sub as string | undefined;
-        let issuerUserId: number | null = null;
+        const token: JWTPayload = c.get("token");
+        const issuerUserId = token?.sub as string | undefined;
+        if(!issuerUserId) {
+            return c.json({error: "Bad Request"}, 400);
+        }
+        /*
         if (sub) {
             const issuer = await c.env.DB.prepare("SELECT id FROM Users WHERE auth0_user_id = ?").bind(sub).first<{id: number}>();
             if (issuer?.id) issuerUserId = issuer.id;
         }
+        */
 
         const domainVerification = body.domain_verification ? "Required" : "Off";
 
@@ -438,7 +442,7 @@ app.post("/organizations/:orgId/sso-invitations", async (c) => {
             {
                 enabled_organizations: [
                     {
-                        organization_id: org.auth0_org_id,
+                        organization_id: orgId,
                         assign_membership_on_login: true,
                         show_as_button: true,
                     },
@@ -462,11 +466,12 @@ app.post("/organizations/:orgId/sso-invitations", async (c) => {
         const auth0TicketId: string | null = null;
 
         const insert = await c.env.DB.prepare(
-            `INSERT INTO SsoInvitations (organization_id, issuer_user_id, display_name, link, auth0_ticket_id, auth0_connection_name, domain_verification, accept_idp_init_saml, ttl)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+            `INSERT INTO SsoInvitations (auth0_org_id, issuer_auth0_user_id, display_name, link, auth0_ticket_id,
+                                         auth0_connection_name, domain_verification, accept_idp_init_saml, ttl)
+             VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
         )
             .bind(
-                org.id,
+                orgId,
                 issuerUserId,
                 org.name,
                 link,
@@ -479,7 +484,7 @@ app.post("/organizations/:orgId/sso-invitations", async (c) => {
             .run();
 
         // Update org sso_status to invited
-        await c.env.DB.prepare("UPDATE Organizations SET sso_status = 'invited' WHERE id = ?").bind(org.id).run();
+        await c.env.DB.prepare("UPDATE Organizations SET sso_status = 'invited' WHERE auth0_org_id = ?").bind(orgId).run();
 
         // Return created resource
         const invitation_id = (insert as any)?.lastInsertRowId ?? undefined;
diff --git a/admin/db/admin-ddl.sql b/admin/db/admin-ddl.sql
@@ -12,14 +12,18 @@ CREATE TABLE Organizations (
                                auth0_org_id TEXT UNIQUE NOT NULL,
                                org_type TEXT NOT NULL CHECK(org_type IN ('supplier', 'community', 'logistics')),
                                name TEXT NOT NULL,
+                               display_name TEXT,
                                domain TEXT, -- Single domain used for HRD (e.g., 'acme.com')
+                               branding TEXT, -- Stored as JSON string for Auth0 branding data
+                               metadata TEXT, -- Stored as JSON string for Auth0 metadata
                                sso_status TEXT DEFAULT 'not_started' CHECK(sso_status IN ('not_started', 'invited', 'configured', 'active')),
                                pickup_address TEXT,
                                delivery_address TEXT,
                                coverage_regions TEXT,
                                vehicle_types TEXT, -- Stored as a JSON array string '["van", "truck"]'
                                created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                               updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
+                               updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+                               last_event_processed TIMESTAMP
 );
 CREATE INDEX idx_organizations_auth0_org_id ON Organizations(auth0_org_id);
 CREATE INDEX idx_organizations_org_type ON Organizations(org_type);
diff --git a/tf/10-user-events-crm.tf b/tf/10-user-events-crm.tf
@@ -3,9 +3,14 @@ resource "auth0_event_stream" "crm" {
   name             = "crm"
   destination_type = "webhook"
   subscriptions = [
+    // user
     "user.created",
     "user.updated",
-    "user.deleted"
+    "user.deleted",
+    // organization
+    "organization.created",
+    "organization.updated",
+    "organization.deleted"
   ]
 
   webhook_configuration {
