Refactor authentication method to requireUser

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

View File

@@ -4,7 +4,7 @@ import { notFound, redirect } from 'next/navigation';
import { ArrowLeft } from 'lucide-react';
import { Logger } from '@kit/shared/logger';
import { requireAuth } from '@kit/supabase/require-auth';
import { requireUser } from '@kit/supabase/require-user';
import { getSupabaseServerComponentClient } from '@kit/supabase/server-component-client';
import { AcceptInvitationContainer } from '@kit/team-accounts/components';
import { Button } from '@kit/ui/button';
@@ -12,6 +12,7 @@ import { Heading } from '@kit/ui/heading';
import { Trans } from '@kit/ui/trans';
import pathsConfig from '~/config/paths.config';
import { createI18nServerInstance } from '~/lib/i18n/i18n.server';
import { withI18n } from '~/lib/i18n/with-i18n';
interface Context {
@@ -20,9 +21,11 @@ interface Context {
};
}
export const generateMetadata = () => {
export const generateMetadata = async () => {
const i18n = await createI18nServerInstance();
return {
title: 'Join Team Account',
title: i18n.t('teams:joinTeamAccount'),
};
};
@@ -35,12 +38,12 @@ async function JoinTeamAccountPage({ searchParams }: Context) {
}
const client = getSupabaseServerComponentClient();
const session = await requireAuth(client);
const auth = await requireUser(client);
// if the user is not logged in or there is an error
// redirect to the sign up page with the invite token
// so that they will get back to this page after signing up
if (session.error ?? !session.data) {
if (auth.error ?? !auth.data) {
redirect(pathsConfig.auth.signUp + '?invite_token=' + token);
}
@@ -61,7 +64,7 @@ async function JoinTeamAccountPage({ searchParams }: Context) {
{
name: 'join-team-account',
accountId: invitation.account.id,
userId: session.data.user.id,
userId: auth.data.id,
},
'User is already in the account. Redirecting to account page.',
);
@@ -137,8 +140,6 @@ async function getInviteDataFromInviteToken(token: string) {
.gte('expires_at', new Date().toISOString())
.single();
console.log(invitation, error);
if (!invitation ?? error) {
return null;
}