Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: changed Supabase getSession API to getUser #216

Merged
merged 2 commits into from
Jan 5, 2025
Merged

fix: changed Supabase getSession API to getUser #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
815d3c9
fix: changed Supabase getSession API to getUser
Dec 30, 2024
8bea064
updated auth user check
Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/forms/app/(workspace)/dashboard/new/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ export default async function OnboardWithNewFormPage({

const supabase = createServerComponentClient(cookieStore);

const { data } = await supabase.auth.getSession();
const { data: auth } = await supabase.auth.getUser();
// if no auth, sign in, redirect back here
if (data.session === null || data.session.user === null) {
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Used this similar logic at https://github.com/gridaco/grida/blob/main/apps/forms/app/(site)/organizations/%5Borganization_name%5D/settings/profile/page.tsx#L38-L40 to alias data and to check !auth.user

if (!auth.user) {
const search = new URLSearchParams(searchParams).toString();
const uri = encodeURIComponent("/dashboard/new?" + search);
redirect("/sign-in?redirect_uri=" + uri);
Expand Down
2 changes: 1 addition & 1 deletion apps/forms/middleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export async function middleware(req: NextRequest) {
const supabase = createMiddlewareClient({ req, res });

// Refresh session if expired - required for Server Components
await supabase.auth.getSession();
await supabase.auth.getUser();

return res;
}
Expand Down