Refactored Supabase Clients using the new recommended approach by Supabase by centralizing all clients around one single implementation. (#51)

The previous clients have been marked as deprecated and will be removed at some point.

packages/features/accounts/src/server/personal-accounts-server-actions.ts

@@ -6,15 +6,15 @@ import { redirect } from 'next/navigation';
 import { z } from 'zod';
 
 import { enhanceAction } from '@kit/next/actions';
-import { getSupabaseServerActionClient } from '@kit/supabase/server-actions-client';
-
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+import { getSupabaseServerAdminClient } from '@kit/supabase/server-admin-client';
 import { DeletePersonalAccountSchema } from '../schema/delete-personal-account.schema';
 import { createDeletePersonalAccountService } from './services/delete-personal-account.service';
 
 const emailSettings = getEmailSettingsFromEnvironment();
 
 export async function refreshAuthSession() {
-  const client = getSupabaseServerActionClient();
+  const client = getSupabaseServerClient();
 
   await client.auth.refreshSession();
 
@@ -32,7 +32,7 @@ export const deletePersonalAccountAction = enhanceAction(
       throw new Error('Invalid form data');
     }
 
-    const client = getSupabaseServerActionClient();
+    const client = getSupabaseServerClient();
 
     // create a new instance of the personal accounts service
     const service = createDeletePersonalAccountService();
@@ -42,7 +42,7 @@ export const deletePersonalAccountAction = enhanceAction(
 
     // delete the user's account and cancel all subscriptions
     await service.deletePersonalAccount({
-      adminClient: getSupabaseServerActionClient({ admin: true }),
+      adminClient: getSupabaseServerAdminClient(),
       userId: user.id,
       userEmail: user.email ?? null,
       emailSettings,

packages/features/admin/src/components/admin-account-page.tsx

@@ -7,7 +7,7 @@ import {
 } from 'lucide-react';
 
 import { Database } from '@kit/supabase/database';
-import { getSupabaseServerComponentClient } from '@kit/supabase/server-component-client';
+import { getSupabaseServerAdminClient } from '@kit/supabase/server-admin-client';
 import { Alert, AlertDescription, AlertTitle } from '@kit/ui/alert';
 import { AppBreadcrumbs } from '@kit/ui/app-breadcrumbs';
 import { Badge } from '@kit/ui/badge';
@@ -49,9 +49,7 @@ export function AdminAccountPage(props: {
 }
 
 async function PersonalAccountPage(props: { account: Account }) {
-  const client = getSupabaseServerComponentClient({
-    admin: true,
-  });
+  const client = getSupabaseServerAdminClient();
 
   const memberships = await getMemberships(props.account.id);
   const { data, error } = await client.auth.admin.getUserById(props.account.id);
@@ -196,9 +194,7 @@ async function TeamAccountPage(props: {
 }
 
 async function SubscriptionsTable(props: { accountId: string }) {
-  const client = getSupabaseServerComponentClient({
-    admin: true,
-  });
+  const client = getSupabaseServerAdminClient();
 
   const { data: subscription, error } = await client
     .from('subscriptions')
@@ -345,9 +341,7 @@ async function SubscriptionsTable(props: { accountId: string }) {
 }
 
 async function getMemberships(userId: string) {
-  const client = getSupabaseServerComponentClient({
-    admin: true,
-  });
+  const client = getSupabaseServerAdminClient();
 
   const memberships = await client
     .from('accounts_memberships')
@@ -370,9 +364,7 @@ async function getMemberships(userId: string) {
 }
 
 async function getMembers(accountSlug: string) {
-  const client = getSupabaseServerComponentClient({
-    admin: true,
-  });
+  const client = getSupabaseServerAdminClient();
 
   const members = await client.rpc('get_account_members', {
     account_slug: accountSlug,

packages/features/admin/src/components/admin-guard.tsx

@@ -1,6 +1,6 @@
 import { notFound } from 'next/navigation';
 
-import { getSupabaseServerComponentClient } from '@kit/supabase/server-component-client';
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
 
 import { isSuperAdmin } from '../lib/server/utils/is-super-admin';
 
@@ -15,7 +15,7 @@ export function AdminGuard<Params extends object>(
   Component: LayoutOrPageComponent<Params>,
 ) {
   return async function AdminGuardServerComponentWrapper(params: Params) {
-    const client = getSupabaseServerComponentClient();
+    const client = getSupabaseServerClient();
     const isUserSuperAdmin = await isSuperAdmin(client);
 
     // if the user is not a super-admin, we redirect to a 404

packages/features/admin/src/lib/server/admin-server-actions.ts

@@ -5,7 +5,8 @@ import { redirect } from 'next/navigation';
 
 import { enhanceAction } from '@kit/next/actions';
 import { getLogger } from '@kit/shared/logger';
-import { getSupabaseServerActionClient } from '@kit/supabase/server-actions-client';
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+import { getSupabaseServerAdminClient } from '@kit/supabase/server-admin-client';
 
 import {
   BanUserSchema,
@@ -150,14 +151,14 @@ export const deleteAccountAction = adminAction(
 );
 
 function getAdminAuthService() {
-  const client = getSupabaseServerActionClient();
-  const adminClient = getSupabaseServerActionClient({ admin: true });
+  const client = getSupabaseServerClient();
+  const adminClient = getSupabaseServerAdminClient();
 
   return createAdminAuthUserService(client, adminClient);
 }
 
 function getAdminAccountsService() {
-  const adminClient = getSupabaseServerActionClient({ admin: true });
+  const adminClient = getSupabaseServerAdminClient();
 
   return createAdminAccountsService(adminClient);
 }

packages/features/admin/src/lib/server/loaders/admin-dashboard.loader.ts

@@ -2,7 +2,7 @@ import 'server-only';
 
 import { cache } from 'react';
 
-import { getSupabaseServerComponentClient } from '@kit/supabase/server-component-client';
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
 
 import { createAdminDashboardService } from '../services/admin-dashboard.service';
 
@@ -14,7 +14,7 @@ import { createAdminDashboardService } from '../services/admin-dashboard.service
 export const loadAdminDashboard = cache(adminDashboardLoader);
 
 function adminDashboardLoader() {
-  const client = getSupabaseServerComponentClient({ admin: true });
+  const client = getSupabaseServerClient();
   const service = createAdminDashboardService(client);
 
   return service.getDashboardData();

packages/features/admin/src/lib/server/utils/admin-action.ts

@@ -1,6 +1,6 @@
 import { notFound } from 'next/navigation';
 
-import { getSupabaseServerActionClient } from '@kit/supabase/server-actions-client';
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
 
 import { isSuperAdmin } from './is-super-admin';
 
@@ -11,7 +11,7 @@ import { isSuperAdmin } from './is-super-admin';
  */
 export function adminAction<Args, Response>(fn: (params: Args) => Response) {
   return async (params: Args) => {
-    const isAdmin = await isSuperAdmin(getSupabaseServerActionClient());
+    const isAdmin = await isSuperAdmin(getSupabaseServerClient());
 
     if (!isAdmin) {
       notFound();

packages/features/team-accounts/src/server/actions/create-team-account-server-actions.ts

@@ -4,7 +4,7 @@ import { redirect } from 'next/navigation';
 
 import { enhanceAction } from '@kit/next/actions';
 import { getLogger } from '@kit/shared/logger';
-import { getSupabaseServerActionClient } from '@kit/supabase/server-actions-client';
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
 
 import { CreateTeamSchema } from '../../schema/create-team.schema';
 import { createCreateTeamAccountService } from '../services/create-team-account.service';
@@ -12,7 +12,7 @@ import { createCreateTeamAccountService } from '../services/create-team-account.
 export const createTeamAccountAction = enhanceAction(
   async ({ name }, user) => {
     const logger = await getLogger();
-    const client = getSupabaseServerActionClient();
+    const client = getSupabaseServerClient();
     const service = createCreateTeamAccountService(client);
 
     const ctx = {

packages/features/team-accounts/src/server/actions/leave-team-account-server-actions.ts

@@ -4,7 +4,7 @@ import { revalidatePath } from 'next/cache';
 import { redirect } from 'next/navigation';
 
 import { enhanceAction } from '@kit/next/actions';
-import { getSupabaseServerActionClient } from '@kit/supabase/server-actions-client';
+import { getSupabaseServerAdminClient } from '@kit/supabase/server-admin-client';
 
 import { LeaveTeamAccountSchema } from '../../schema/leave-team-account.schema';
 import { createLeaveTeamAccountService } from '../services/leave-team-account.service';
@@ -15,7 +15,7 @@ export const leaveTeamAccountAction = enhanceAction(
     const params = LeaveTeamAccountSchema.parse(body);
 
     const service = createLeaveTeamAccountService(
-      getSupabaseServerActionClient({ admin: true }),
+      getSupabaseServerAdminClient(),
     );
 
     await service.leaveTeamAccount({

packages/features/team-accounts/src/server/actions/team-details-server-actions.ts

@@ -4,13 +4,13 @@ import { redirect } from 'next/navigation';
 
 import { enhanceAction } from '@kit/next/actions';
 import { getLogger } from '@kit/shared/logger';
-import { getSupabaseServerActionClient } from '@kit/supabase/server-actions-client';
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
 
 import { UpdateTeamNameSchema } from '../../schema/update-team-name.schema';
 
 export const updateTeamAccountName = enhanceAction(
   async (params) => {
-    const client = getSupabaseServerActionClient();
+    const client = getSupabaseServerClient();
     const logger = await getLogger();
     const { name, path, slug } = params;
 

packages/features/team-accounts/src/server/actions/team-invitations-server-actions.ts

@@ -6,7 +6,8 @@ import { redirect } from 'next/navigation';
 import { z } from 'zod';
 
 import { enhanceAction } from '@kit/next/actions';
-import { getSupabaseServerActionClient } from '@kit/supabase/server-actions-client';
+import { getSupabaseServerAdminClient } from '@kit/supabase/server-admin-client';
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
 
 import { AcceptInvitationSchema } from '../../schema/accept-invitation.schema';
 import { DeleteInvitationSchema } from '../../schema/delete-invitation.schema';
@@ -22,7 +23,7 @@ import { createAccountPerSeatBillingService } from '../services/account-per-seat
  */
 export const createInvitationsAction = enhanceAction(
   async (params) => {
-    const client = getSupabaseServerActionClient();
+    const client = getSupabaseServerClient();
 
     // Create the service
     const service = createAccountInvitationsService(client);
@@ -51,7 +52,7 @@ export const createInvitationsAction = enhanceAction(
  */
 export const deleteInvitationAction = enhanceAction(
   async (data) => {
-    const client = getSupabaseServerActionClient();
+    const client = getSupabaseServerClient();
     const service = createAccountInvitationsService(client);
 
     // Delete the invitation
@@ -74,7 +75,7 @@ export const deleteInvitationAction = enhanceAction(
  */
 export const updateInvitationAction = enhanceAction(
   async (invitation) => {
-    const client = getSupabaseServerActionClient();
+    const client = getSupabaseServerClient();
     const service = createAccountInvitationsService(client);
 
     await service.updateInvitation(invitation);
@@ -96,7 +97,7 @@ export const updateInvitationAction = enhanceAction(
  */
 export const acceptInvitationAction = enhanceAction(
   async (data: FormData, user) => {
-    const client = getSupabaseServerActionClient();
+    const client = getSupabaseServerClient();
 
     const { inviteToken, nextPath } = AcceptInvitationSchema.parse(
       Object.fromEntries(data),
@@ -106,14 +107,14 @@ export const acceptInvitationAction = enhanceAction(
     const perSeatBillingService = createAccountPerSeatBillingService(client);
     const service = createAccountInvitationsService(client);
 
+    // use admin client to accept invitation
+    const adminClient = getSupabaseServerAdminClient();
+
     // Accept the invitation
-    const accountId = await service.acceptInvitationToTeam(
-      getSupabaseServerActionClient({ admin: true }),
-      {
-        inviteToken,
-        userId: user.id,
-      },
-    );
+    const accountId = await service.acceptInvitationToTeam(adminClient, {
+      inviteToken,
+      userId: user.id,
+    });
 
     // If the account ID is not present, throw an error
     if (!accountId) {
@@ -134,7 +135,7 @@ export const acceptInvitationAction = enhanceAction(
  */
 export const renewInvitationAction = enhanceAction(
   async (params) => {
-    const client = getSupabaseServerActionClient();
+    const client = getSupabaseServerClient();
     const { invitationId } = RenewInvitationSchema.parse(params);
 
     const service = createAccountInvitationsService(client);