Public Queries

src/__mocks__/handlers/user/index.ts

@@ -1,2 +1 @@
-export * from "./createUser.mock";
 export * from "./user.mock";

src/app/organizations/[organizationSlug]/(manage)/layout.tsx

@@ -25,8 +25,6 @@ const ManageOrganizationLayout = async ({ params, children }: Props) => {
 
   const session = await auth();
 
-  if (!session) notFound();
-
   const organization = await getOrganization({ organizationSlug });
 
   if (!organization) notFound();
@@ -38,22 +36,26 @@ const ManageOrganizationLayout = async ({ params, children }: Props) => {
       queryKey: useOrganizationQuery.getKey({ slug: organizationSlug }),
       queryFn: useOrganizationQuery.fetcher({ slug: organizationSlug }),
     }),
-    queryClient.prefetchQuery({
-      queryKey: useOrganizationRoleQuery.getKey({
-        userId: session.user.rowId!,
-        organizationId: organization.rowId,
-      }),
-      queryFn: useOrganizationRoleQuery.fetcher({
-        userId: session.user.rowId!,
-        organizationId: organization.rowId,
-      }),
-    }),
+    ...(session
+      ? [
+          queryClient.prefetchQuery({
+            queryKey: useOrganizationRoleQuery.getKey({
+              userId: session.user.rowId!,
+              organizationId: organization.rowId,
+            }),
+            queryFn: useOrganizationRoleQuery.fetcher({
+              userId: session.user.rowId!,
+              organizationId: organization.rowId,
+            }),
+          }),
+        ]
+      : []),
   ]);
 
   return (
     <HydrationBoundary state={dehydrate(queryClient)}>
       <HStack h="full" w="full" gap={0}>
-        <ManagementSidebar user={session.user}>{children}</ManagementSidebar>
+        <ManagementSidebar user={session?.user}>{children}</ManagementSidebar>
       </HStack>
     </HydrationBoundary>
   );

src/app/organizations/[organizationSlug]/(manage)/members/page.tsx

@@ -21,6 +21,7 @@ import { getSdk } from "lib/graphql";
 import { getQueryClient, getSearchParams } from "lib/util";
 import { DialogType } from "store";
 
+import type { Member } from "generated/graphql";
 import type { SearchParams } from "nuqs/server";
 
 export const generateMetadata = async ({ params }: Props) => {
@@ -50,8 +51,6 @@ const OrganizationMembersPage = async ({ params, searchParams }: Props) => {
 
   const session = await auth();
 
-  if (!session) notFound();
-
   const organization = await getOrganization({
     organizationSlug,
   });
@@ -60,12 +59,17 @@ const OrganizationMembersPage = async ({ params, searchParams }: Props) => {
 
   const sdk = getSdk({ session });
 
-  const { memberByUserIdAndOrganizationId: member } =
-    await sdk.OrganizationRole({
-      userId: session.user.rowId!,
+  let member: Partial<Member> | null = null;
+
+  if (session) {
+    const { memberByUserIdAndOrganizationId } = await sdk.OrganizationRole({
+      userId: session?.user.rowId!,
       organizationId: organization.rowId,
     });
 
+    member = memberByUserIdAndOrganizationId ?? null;
+  }
+
   const queryClient = getQueryClient();
 
   const { search, roles } = await getSearchParams.parse(searchParams);
@@ -95,16 +99,20 @@ const OrganizationMembersPage = async ({ params, searchParams }: Props) => {
         excludeRoles: [Role.Owner],
       }),
     }),
-    queryClient.prefetchQuery({
-      queryKey: useOrganizationRoleQuery.getKey({
-        organizationId: organization.rowId,
-        userId: session.user.rowId!,
-      }),
-      queryFn: useOrganizationRoleQuery.fetcher({
-        organizationId: organization.rowId,
-        userId: session.user.rowId!,
-      }),
-    }),
+    ...(session
+      ? [
+          queryClient.prefetchQuery({
+            queryKey: useOrganizationRoleQuery.getKey({
+              organizationId: organization.rowId,
+              userId: session.user.rowId!,
+            }),
+            queryFn: useOrganizationRoleQuery.fetcher({
+              organizationId: organization.rowId,
+              userId: session.user.rowId!,
+            }),
+          }),
+        ]
+      : []),
   ]);
 
   return (
@@ -132,7 +140,7 @@ const OrganizationMembersPage = async ({ params, searchParams }: Props) => {
 
         <MembershipFilters />
 
-        <Members user={session.user} organizationId={organization.rowId} />
+        <Members user={session?.user} organizationId={organization.rowId} />
 
         {/* dialogs */}
         {/* TODO: allow adding owners when transferring ownership is resolved. Restricting to single ownership for now. */}

src/app/organizations/[organizationSlug]/(manage)/settings/page.tsx

@@ -37,13 +37,12 @@ interface Props {
 const OrganizationSettingsPage = async ({ params }: Props) => {
   const { organizationSlug } = await params;
 
-  const session = await auth();
-
-  if (!session) notFound();
-
-  const organization = await getOrganization({ organizationSlug });
+  const [session, organization] = await Promise.all([
+    auth(),
+    getOrganization({ organizationSlug }),
+  ]);
 
-  if (!organization) notFound();
+  if (!session || !organization) notFound();
 
   const sdk = getSdk({ session });
 
@@ -58,23 +57,23 @@ const OrganizationSettingsPage = async ({ params }: Props) => {
 
   await Promise.all([
     queryClient.prefetchQuery({
-      queryKey: useOrganizationRoleQuery.getKey({
-        userId: session.user.rowId!,
+      queryKey: useMembersQuery.getKey({
         organizationId: organization.rowId,
+        roles: [Role.Owner],
       }),
-      queryFn: useOrganizationRoleQuery.fetcher({
-        userId: session.user.rowId!,
+      queryFn: useMembersQuery.fetcher({
         organizationId: organization.rowId,
+        roles: [Role.Owner],
       }),
     }),
     queryClient.prefetchQuery({
-      queryKey: useMembersQuery.getKey({
+      queryKey: useOrganizationRoleQuery.getKey({
+        userId: session.user.rowId!,
         organizationId: organization.rowId,
-        roles: [Role.Owner],
       }),
-      queryFn: useMembersQuery.fetcher({
+      queryFn: useOrganizationRoleQuery.fetcher({
+        userId: session.user.rowId!,
         organizationId: organization.rowId,
-        roles: [Role.Owner],
       }),
     }),
   ]);

src/app/organizations/[organizationSlug]/page.tsx

@@ -26,6 +26,7 @@ import { getQueryClient } from "lib/util";
 import { DialogType } from "store";
 
 import type { BreadcrumbRecord } from "components/core";
+import type { Member } from "generated/graphql";
 
 export const generateMetadata = async ({ params }: Props) => {
   const { organizationSlug } = await params;
@@ -52,8 +53,6 @@ const OrganizationPage = async ({ params }: Props) => {
 
   const session = await auth();
 
-  if (!session) notFound();
-
   const [
     organization,
     { isOwnerSubscribed, hasBasicTierPrivileges, hasTeamTierPrivileges },
@@ -66,12 +65,17 @@ const OrganizationPage = async ({ params }: Props) => {
 
   const sdk = getSdk({ session });
 
-  const { memberByUserIdAndOrganizationId: member } =
-    await sdk.OrganizationRole({
-      userId: session.user.rowId!,
+  let member: Partial<Member> | null = null;
+
+  if (session) {
+    const { memberByUserIdAndOrganizationId } = await sdk.OrganizationRole({
+      userId: session?.user.rowId!,
       organizationId: organization.rowId,
     });
 
+    member = memberByUserIdAndOrganizationId ?? null;
+  }
+
   const hasAdminPrivileges =
     member?.role === Role.Admin || member?.role === Role.Owner;
 
@@ -109,16 +113,20 @@ const OrganizationPage = async ({ params }: Props) => {
         organizationId: organization.rowId,
       }),
     }),
-    queryClient.prefetchQuery({
-      queryKey: useOrganizationRoleQuery.getKey({
-        organizationId: organization.rowId,
-        userId: session.user.rowId!,
-      }),
-      queryFn: useOrganizationRoleQuery.fetcher({
-        organizationId: organization.rowId,
-        userId: session.user.rowId!,
-      }),
-    }),
+    ...(session
+      ? [
+          queryClient.prefetchQuery({
+            queryKey: useOrganizationRoleQuery.getKey({
+              organizationId: organization.rowId,
+              userId: session.user.rowId!,
+            }),
+            queryFn: useOrganizationRoleQuery.fetcher({
+              organizationId: organization.rowId,
+              userId: session.user.rowId!,
+            }),
+          }),
+        ]
+      : []),
   ]);
 
   return (
@@ -162,7 +170,7 @@ const OrganizationPage = async ({ params }: Props) => {
           <OrganizationMetrics organizationId={organization.rowId} />
 
           <OrganizationManagement
-            user={session.user}
+            user={session?.user}
             organizationId={organization.rowId}
             hasAdminPrivileges={hasAdminPrivileges}
           />