Revert "fix(organization): 👽 fix ci issue due to clerk upgrade"

This reverts commit 07949c8.

app/(main)/dashboard/settings/page.tsx

@@ -5,7 +5,7 @@ import { Input } from "@/components/ui/input";
 import { api } from "@/convex/_generated/api";
 import useApiMutation from "@/lib/hooks/use-api-mutation";
 import { useQuery } from "convex/react";
-import { Copy, Loader2, RefreshCcw, Trash } from "lucide-react";
+import { Copy, RefreshCcw, Trash } from "lucide-react";
 import { toast } from "sonner";
 
 const AccountSettingsPage = () => {
@@ -38,8 +38,6 @@ const AccountSettingsPage = () => {
       .catch(() => toast.error("Failed to revoke API key"));
   };
 
-  if (existingAPIKey === undefined) return <Loader2 className="animate-spin" />;
-
   return (
     <>
       {existingAPIKey ? (

app/api/webhooks/clerk/utils/organization.ts

@@ -33,7 +33,7 @@ function mapOrgJsonToOrg(orgJson: OrganizationJSON): Organization {
   return {
     clerkId: orgJson.id,
     name: orgJson.name,
-    imageUrl: orgJson.image_url || "",
+    imageUrl: orgJson.image_url,
     createdBy: orgJson.created_by,
   };
 }

app/api/webhooks/clerk/utils/user.ts

@@ -33,7 +33,7 @@ function mapUserJsonToUser(userJson: UserJSON): User {
       userJson.email_addresses.find(
         (email) => email.id === userJson.primary_email_address_id
       )?.email_address || `${userJson.id}@nothanks.com`,
-    firstName: userJson.first_name,
+    firstName: userJson.first_name ?? userJson.id,
     imageUrl: userJson.image_url,
   };
 }