{
const supabase = createMiddlewareClient(req, res);
- const { data } = await supabase.auth.getSession();
+ const { data: user } = await supabase.auth.getUser();
// check if we need to verify MFA (user is authenticated but needs to verify MFA)
const isVerifyMfa = req.nextUrl.pathname === pathsConfig.auth.verifyMfa;
// If user is logged in and does not need to verify MFA,
// redirect to home page.
- if (data.session && !isVerifyMfa) {
+ if (user && !isVerifyMfa) {
return NextResponse.redirect(
new URL(pathsConfig.app.home, req.nextUrl.origin).href,
);
@@ -145,12 +133,12 @@ function getPatterns() {
pattern: new URLPattern({ pathname: '/home*' }),
handler: async (req: NextRequest, res: NextResponse) => {
const supabase = createMiddlewareClient(req, res);
- const { data, error } = await supabase.auth.getSession();
+ const { data: user, error } = await supabase.auth.getUser();
const origin = req.nextUrl.origin;
const next = req.nextUrl.pathname;
// If user is not logged in, redirect to sign in page.
- if (!data.session || error) {
+ if (!user || error) {
const signIn = pathsConfig.auth.signIn;
const redirectPath = `${signIn}?next=${next}`;
diff --git a/apps/web/package.json b/apps/web/package.json
index 90acc8279..9809afbaa 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -7,7 +7,7 @@
"analyze": "ANALYZE=true pnpm run build",
"build": "pnpm with-env next build",
"clean": "git clean -xdf .next .turbo node_modules",
- "dev": "pnpm with-env next dev --turbo",
+ "dev": "pnpm with-env next dev",
"lint": "next lint",
"format": "prettier --check \"**/*.{js,cjs,mjs,ts,tsx,md,json}\"",
"start": "pnpm with-env next start",
diff --git a/packages/features/accounts/src/components/personal-account-dropdown.tsx b/packages/features/accounts/src/components/personal-account-dropdown.tsx
index e0cc39f3c..7dd22030b 100644
--- a/packages/features/accounts/src/components/personal-account-dropdown.tsx
+++ b/packages/features/accounts/src/components/personal-account-dropdown.tsx
@@ -4,7 +4,7 @@ import { useMemo } from 'react';
import Link from 'next/link';
-import type { Session } from '@supabase/gotrue-js';
+import type { User } from '@supabase/supabase-js';
import {
EllipsisVertical,
@@ -31,14 +31,14 @@ import { usePersonalAccountData } from '../hooks/use-personal-account-data';
export function PersonalAccountDropdown({
className,
- session,
+ user,
signOutRequested,
showProfileName,
paths,
features,
}: {
className?: string;
- session: Session | null;
+ user: User | null;
signOutRequested: () => unknown;
showProfileName?: boolean;
paths: {
@@ -49,20 +49,19 @@ export function PersonalAccountDropdown({
};
}) {
const { data: personalAccountData } = usePersonalAccountData();
- const authUser = session?.user;
const signedInAsLabel = useMemo(() => {
- const email = authUser?.email ?? undefined;
- const phone = authUser?.phone ?? undefined;
+ const email = user?.email ?? undefined;
+ const phone = user?.phone ?? undefined;
return email ?? phone;
- }, [authUser?.email, authUser?.phone]);
+ }, [user?.email, user?.phone]);
- const displayName = personalAccountData?.name ?? authUser?.email ?? '';
+ const displayName = personalAccountData?.name ?? user?.email ?? '';
const isSuperAdmin = useMemo(() => {
- return authUser?.app_metadata.role === 'super-admin';
- }, [authUser]);
+ return user?.app_metadata.role === 'super-admin';
+ }, [user]);
return (
@@ -79,7 +78,7 @@ export function PersonalAccountDropdown({
)}
>
diff --git a/packages/supabase/src/hooks/use-user.ts b/packages/supabase/src/hooks/use-user.ts
index be26aeb22..3217c9653 100644
--- a/packages/supabase/src/hooks/use-user.ts
+++ b/packages/supabase/src/hooks/use-user.ts
@@ -1,10 +1,12 @@
import { useRouter } from 'next/navigation';
+import type { User } from '@supabase/supabase-js';
+
import { useQuery } from '@tanstack/react-query';
import { useSupabase } from './use-supabase';
-export function useUser() {
+export function useUser(initialData?: User | null) {
const client = useSupabase();
const router = useRouter();
const queryKey = ['supabase:user'];
@@ -27,5 +29,6 @@ export function useUser() {
return useQuery({
queryFn,
queryKey,
+ initialData,
});
}