zaid.marzguioui/myeasycms-v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor authentication method to requireUser

Browse Source 
Replaced the requireAuth method with requireUser to improve clarity and modified all instances where it was used. Renamed the import throughout multiple files and services and made changes accordingly, thus making it more specific and understandable that a logged-in user is needed. The return type of the method was also updated from Session to User to more accurately reflect the information it provides.
This commit is contained in:
giancarlo
2024-03-29 15:52:32 +08:00
parent 40c730141a
commit 2b0fbc445b
22 changed files with 121 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/web/app/(dashboard)/home/[account]/billing/server-actions.ts
View File

@@ -6,7 +6,7 @@ import { z } from 'zod';
import { getLineItemsFromPlanId } from '@kit/billing';
import { getBillingGatewayProvider } from '@kit/billing-gateway';
import { requireAuth } from '@kit/supabase/require-auth';
import { requireUser } from '@kit/supabase/require-user';
import { getSupabaseServerActionClient } from '@kit/supabase/server-actions-client';
import appConfig from '~/config/app.config';
@@ -33,13 +33,13 @@ export async function createTeamAccountCheckoutSession(params: {
const productId = z.string().min(1).parse(params.productId);
// we require the user to be authenticated
const { data: session } = await requireAuth(client);
const { data: user } = await requireUser(client);
if (!session) {
if (!user) {
throw new Error('Authentication required');
}
const userId = session.user.id;
const userId = user.id;
const accountId = params.accountId;
const hasPermission = await getPermissionsForAccountId(userId, accountId);
@@ -67,7 +67,7 @@ export async function createTeamAccountCheckoutSession(params: {
// find the customer ID for the account if it exists
// (eg. if the account has been billed before)
const customerId = await getCustomerIdFromAccountId(client, accountId);
const customerEmail = session.user.email;
const customerEmail = user.email;
// the return URL for the checkout session
const returnUrl = getCheckoutSessionReturnUrl(params.slug);
@@ -100,13 +100,13 @@ export async function createBillingPortalSession(formData: FormData) {
})
.parse(Object.fromEntries(formData));
const { data: session, error } = await requireAuth(client);
const { data: user, error } = await requireUser(client);
if (error ?? !session) {
if (error ?? !user) {
throw new Error('Authentication required');
}
const userId = session.user.id;
const userId = user.id;
// we require the user to have permissions to manage billing for the account
const hasPermission = await getPermissionsForAccountId(userId, accountId);