fix webhooks

Author: motatoes

ui/src/api/orchestrator_orgs.ts

@@ -46,7 +46,6 @@ export async function getOrgSettings(
 
     if (!response.ok) {
       const text = await response.text()
-      console.log(text)
       throw new Error('Failed to get organization settings')
     }
 

ui/src/api/orchestrator_users.ts

@@ -15,6 +15,11 @@ export async function syncUserToBackend(userId: string, userEmail: string, orgId
         })
     })  
 
+    if (response.status === 409) {
+        console.log("User already exists in orchestrator")
+        return response.json();
+    }
+
     if (!response.ok) {
         throw new Error(`Failed to sync user: ${response.statusText}`);
     }

ui/src/api/statesman_orgs.ts

@@ -1,26 +1,27 @@
 
 
-export async function syncOrgToStatesman(orgId: string, orgName: string, userId: string, adminEmail: string) {
+export async function syncOrgToStatesman(orgId: string, orgName: string, displayName: string, userId: string, adminEmail: string) {
     const response = await fetch(`${process.env.STATESMAN_BACKEND_URL}/internal/api/orgs`, {
         method: 'POST',
         headers: {
             'Content-Type': 'application/json',
             'Authorization': `Bearer ${process.env.STATESMAN_BACKEND_WEBHOOK_SECRET}`,
-            'X-Org-ID': orgId,
+            'X-Org-ID': "",
             'X-User-ID': userId,
             'X-Email': adminEmail,
         },
         body: JSON.stringify({ 
-            "org_id": orgId,
+            "external_org_id": orgId,
             "name": orgName,
+            "display_name": displayName,
             "created_by": adminEmail,
         })
     })  
 
-    console.log(orgId)
-    console.log(orgName)
-    console.log(userId)
-    console.log(adminEmail)
+    if (response.status === 409) {
+        console.log("User already exists in statesman")
+        return response.json();
+    }
 
     if (!response.ok) {
         throw new Error(`Failed to sync organization to statesman: ${response.statusText}`);

ui/src/api/statesman_users.ts

@@ -16,7 +16,13 @@ export async function syncUserToStatesman(userId: string, userEmail: string, org
         })
     })
 
+    if (response.status === 409) {
+        console.log("User already exists in statesman")
+        return response.json();
+    }
+
     if (!response.ok) {
+        console.log(response.text())
         throw new Error(`Failed to sync user: ${response.statusText}`);
     }
 

ui/src/authkit/serverFunctions.ts

@@ -6,6 +6,8 @@ import { getWorkOS } from './ssr/workos';
 import type { GetAuthURLOptions, NoUserInfo, UserInfo } from './ssr/interfaces';
 import { Organization } from '@workos-inc/node';
 import { WidgetScope } from 'node_modules/@workos-inc/node/lib/widgets/interfaces/get-token';
+import { syncOrgToBackend } from '@/api/orchestrator_orgs';
+import { syncOrgToStatesman } from '@/api/statesman_orgs';
 
 export const getAuthorizationUrl = createServerFn({ method: 'GET' })
   .inputValidator((options?: GetAuthURLOptions) => options)
@@ -29,8 +31,8 @@ export const getOrganisationDetails = createServerFn({method: 'GET'})
 
 
 export const createOrganization = createServerFn({method: 'POST'})
-  .inputValidator((data: {name: string, userId: string}) => data)
-  .handler(async ({data: {name, userId}}) : Promise<Organization> => {
+  .inputValidator((data: {name: string, userId: string, email: string}) => data)
+  .handler(async ({data: {name, userId, email}}) : Promise<Organization> => {
     try {
       const organization = await getWorkOS().organizations.createOrganization({ name: name });
 
@@ -40,6 +42,14 @@ export const createOrganization = createServerFn({method: 'POST'})
         roleSlug: "admin",
       });
 
+      try {
+        await syncOrgToBackend(organization.id, organization.name, email);
+        await syncOrgToStatesman(organization.id, organization.name, organization.name, userId, email);
+      } catch (error) {
+        console.error('Error syncing organization to backend:', error);
+        throw error;
+      }
+
       return organization;
     } catch (error) {
       console.error('Error creating organization:', error);

ui/src/authkit/ssr/workos_api.ts

@@ -43,6 +43,18 @@ export async function getOrganisationDetails(orgId: string) {
   }
 }
 
+export async function getOranizationsForUser(userId: string) {
+  try {
+    const memberships = await getWorkOS().userManagement.listOrganizationMemberships({
+      userId: userId,
+    });
+    return memberships.data;
+  } catch (error) {
+    console.error('Error fetching user organizations:', error);
+    throw error;
+  }
+}
+
 export async function listUserOrganizationInvitations(email: string) {
   try {
     const invitations = await getWorkOS().userManagement.listInvitations({

ui/src/components/CreateOrganisationButtonWOS.tsx

@@ -7,15 +7,15 @@ import { useState } from "react";
 import { useToast } from "@/hooks/use-toast";
 
 
-export default function CreateOrganizationBtn({ userId }: { userId: string }) {
+export default function CreateOrganizationBtn({ userId, email }: { userId: string, email: string }) {
   const [name, setName] = useState("");
   const [open, setOpen] = useState(false);
   const { toast } = useToast();
   async function handleSubmit(e: React.FormEvent) {
     e.preventDefault();
 
       try {
-        const organization = await createOrganization({ data: { name: name, userId: userId } });
+        const organization = await createOrganization({ data: { name: name, userId: userId, email: email } });
         toast({
           title: "Organization created",
           description: "The page will now reload to refresh organisations list. To use this new organization, select it from the list.",

ui/src/components/WorkosSettings.tsx

@@ -26,11 +26,12 @@ type LoaderData = {
 
 type WorkosSettingsProps = {
   userId: string;
+  email: string;
   organisationId: string;
   role: 'admin' | 'member' | string;
 };
 
-export function WorkosSettings({ userId, organisationId, role }: WorkosSettingsProps) {
+export function WorkosSettings({ userId, email, organisationId, role }: WorkosSettingsProps) {
   const [authToken, setAuthToken] = React.useState<string | null>(null);
   const [error, setError] = React.useState<string | null>(null);
   const [loading, setLoading] = React.useState(true);
@@ -65,7 +66,7 @@ export function WorkosSettings({ userId, organisationId, role }: WorkosSettingsP
         />
         <div className="h-4" />
         {/* Add your org creation UI here */}
-        <CreateOrganizationBtn userId={userId} />
+        <CreateOrganizationBtn userId={userId} email={email} />
         <div className="h-4" />
         <UserProfile authToken={authToken} />
         <div className="h-4" />

ui/src/routeTree.gen.ts

@@ -12,6 +12,8 @@ import { Route as rootRouteImport } from './routes/__root'
 import { Route as LogoutRouteImport } from './routes/logout'
 import { Route as AuthenticatedRouteImport } from './routes/_authenticated'
 import { Route as IndexRouteImport } from './routes/index'
+import { Route as TfeSplatRouteImport } from './routes/tfe/$'
+import { Route as WellKnownTerraform_jsonRouteImport } from './routes/_well-known.terraform_json'
 import { Route as OrchestratorJob_artefactsRouteImport } from './routes/_orchestrator/job_artefacts'
 import { Route as AuthenticatedDashboardRouteImport } from './routes/_authenticated/_dashboard'
 import { Route as OrchestratorGithubWebhookRouteImport } from './routes/orchestrator/github/webhook'
@@ -54,6 +56,16 @@ const IndexRoute = IndexRouteImport.update({
   path: '/',
   getParentRoute: () => rootRouteImport,
 } as any)
+const TfeSplatRoute = TfeSplatRouteImport.update({
+  id: '/tfe/$',
+  path: '/tfe/$',
+  getParentRoute: () => rootRouteImport,
+} as any)
+const WellKnownTerraform_jsonRoute = WellKnownTerraform_jsonRouteImport.update({
+  id: '/_well-known/terraform_json',
+  path: '/terraform_json',
+  getParentRoute: () => rootRouteImport,
+} as any)
 const OrchestratorJob_artefactsRoute =
   OrchestratorJob_artefactsRouteImport.update({
     id: '/_orchestrator/job_artefacts',
@@ -218,6 +230,8 @@ export interface FileRoutesByFullPath {
   '/': typeof IndexRoute
   '/logout': typeof LogoutRoute
   '/job_artefacts': typeof OrchestratorJob_artefactsRoute
+  '/terraform_json': typeof WellKnownTerraform_jsonRoute
+  '/tfe/$': typeof TfeSplatRoute
   '/api/auth/callback': typeof ApiAuthCallbackRoute
   '/orchestrator/github/callback': typeof OrchestratorGithubCallbackRoute
   '/orchestrator/github/webhook': typeof OrchestratorGithubWebhookRoute
@@ -248,6 +262,8 @@ export interface FileRoutesByTo {
   '/': typeof IndexRoute
   '/logout': typeof LogoutRoute
   '/job_artefacts': typeof OrchestratorJob_artefactsRoute
+  '/terraform_json': typeof WellKnownTerraform_jsonRoute
+  '/tfe/$': typeof TfeSplatRoute
   '/api/auth/callback': typeof ApiAuthCallbackRoute
   '/orchestrator/github/callback': typeof OrchestratorGithubCallbackRoute
   '/orchestrator/github/webhook': typeof OrchestratorGithubWebhookRoute
@@ -279,6 +295,8 @@ export interface FileRoutesById {
   '/logout': typeof LogoutRoute
   '/_authenticated/_dashboard': typeof AuthenticatedDashboardRouteWithChildren
   '/_orchestrator/job_artefacts': typeof OrchestratorJob_artefactsRoute
+  '/_well-known/terraform_json': typeof WellKnownTerraform_jsonRoute
+  '/tfe/$': typeof TfeSplatRoute
   '/api/auth/callback': typeof ApiAuthCallbackRoute
   '/orchestrator/github/callback': typeof OrchestratorGithubCallbackRoute
   '/orchestrator/github/webhook': typeof OrchestratorGithubWebhookRoute
@@ -311,6 +329,8 @@ export interface FileRouteTypes {
     | '/'
     | '/logout'
     | '/job_artefacts'
+    | '/terraform_json'
+    | '/tfe/$'
     | '/api/auth/callback'
     | '/orchestrator/github/callback'
     | '/orchestrator/github/webhook'
@@ -341,6 +361,8 @@ export interface FileRouteTypes {
     | '/'
     | '/logout'
     | '/job_artefacts'
+    | '/terraform_json'
+    | '/tfe/$'
     | '/api/auth/callback'
     | '/orchestrator/github/callback'
     | '/orchestrator/github/webhook'
@@ -371,6 +393,8 @@ export interface FileRouteTypes {
     | '/logout'
     | '/_authenticated/_dashboard'
     | '/_orchestrator/job_artefacts'
+    | '/_well-known/terraform_json'
+    | '/tfe/$'
     | '/api/auth/callback'
     | '/orchestrator/github/callback'
     | '/orchestrator/github/webhook'
@@ -403,6 +427,8 @@ export interface RootRouteChildren {
   AuthenticatedRoute: typeof AuthenticatedRouteWithChildren
   LogoutRoute: typeof LogoutRoute
   OrchestratorJob_artefactsRoute: typeof OrchestratorJob_artefactsRoute
+  WellKnownTerraform_jsonRoute: typeof WellKnownTerraform_jsonRoute
+  TfeSplatRoute: typeof TfeSplatRoute
   ApiAuthCallbackRoute: typeof ApiAuthCallbackRoute
   OrchestratorGithubCallbackRoute: typeof OrchestratorGithubCallbackRoute
   OrchestratorGithubWebhookRoute: typeof OrchestratorGithubWebhookRoute
@@ -439,6 +465,20 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof IndexRouteImport
       parentRoute: typeof rootRouteImport
     }
+    '/tfe/$': {
+      id: '/tfe/$'
+      path: '/tfe/$'
+      fullPath: '/tfe/$'
+      preLoaderRoute: typeof TfeSplatRouteImport
+      parentRoute: typeof rootRouteImport
+    }
+    '/_well-known/terraform_json': {
+      id: '/_well-known/terraform_json'
+      path: '/terraform_json'
+      fullPath: '/terraform_json'
+      preLoaderRoute: typeof WellKnownTerraform_jsonRouteImport
+      parentRoute: typeof rootRouteImport
+    }
     '/_orchestrator/job_artefacts': {
       id: '/_orchestrator/job_artefacts'
       path: '/job_artefacts'
@@ -738,6 +778,8 @@ const rootRouteChildren: RootRouteChildren = {
   AuthenticatedRoute: AuthenticatedRouteWithChildren,
   LogoutRoute: LogoutRoute,
   OrchestratorJob_artefactsRoute: OrchestratorJob_artefactsRoute,
+  WellKnownTerraform_jsonRoute: WellKnownTerraform_jsonRoute,
+  TfeSplatRoute: TfeSplatRoute,
   ApiAuthCallbackRoute: ApiAuthCallbackRoute,
   OrchestratorGithubCallbackRoute: OrchestratorGithubCallbackRoute,
   OrchestratorGithubWebhookRoute: OrchestratorGithubWebhookRoute,

ui/src/routes/_authenticated/_dashboard/dashboard/settings.tsx

@@ -16,6 +16,6 @@ function RouteComponent() {
   const { user, role, organisationId } = Route.useLoaderData()
 
   return (
-    <WorkosSettings userId={user?.id || ''} role={role || ''} organisationId={organisationId || ''} />
+    <WorkosSettings userId={user?.id || ''} email={user?.email || ''} role={role || ''} organisationId={organisationId || ''} />
   )
 }