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

refactor(frontend): Auth pages update #9124

Open
wants to merge 12 commits into
base: dev
Choose a base branch
from
Open

refactor(frontend): Auth pages update #9124

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
399267a
Add auth components
kcze Dec 22, 2024
c033208
Add `/signup` page
kcze Dec 22, 2024
716f6d6
Update `supabase` packages
kcze Dec 23, 2024
7a1c05b
Move auth types to `types/auth.ts`
kcze Dec 23, 2024
9b4c078
Update auth components
kcze Dec 23, 2024
2503585
Add actions for reset password page
kcze Dec 23, 2024
ddc696e
Update auth pages
kcze Dec 23, 2024
1e5498c
Updates
kcze Dec 23, 2024
fa2951c
Fix login test
kcze Dec 24, 2024
d3fdffd
Remove terms check in login test
kcze Dec 24, 2024
70fa8d4
Fix login button in test
kcze Dec 24, 2024
3693f79
Remove commented social login code
kcze Dec 28, 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
51 changes: 19 additions & 32 deletions autogpt_platform/frontend/src/app/login/actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@ import { z } from "zod";
import * as Sentry from "@sentry/nextjs";
import getServerSupabase from "@/lib/supabase/getServerSupabase";
import BackendAPI from "@/lib/autogpt-server-api";

const loginFormSchema = z.object({
email: z.string().email().min(2).max(64),
password: z.string().min(6).max(64),
});
import { loginFormSchema, LoginProvider } from "@/types/auth";

export async function logout() {
return await Sentry.withServerActionInstrumentation(
Expand All @@ -25,7 +21,7 @@ export async function logout() {
const { error } = await supabase.auth.signOut();

if (error) {
console.log("Error logging out", error);
console.error("Error logging out", error);
return error.message;
}

Expand All @@ -47,18 +43,13 @@ export async function login(values: z.infer<typeof loginFormSchema>) {
// We are sure that the values are of the correct type because zod validates the form
const { data, error } = await supabase.auth.signInWithPassword(values);

await api.createUser();

if (error) {
console.log("Error logging in", error);
if (error.status == 400) {
// Hence User is not present
redirect("/login");
}

console.error("Error logging in", error);
return error.message;
}

await api.createUser();

if (data.session) {
await supabase.auth.setSession(data.session);
}
Expand All @@ -68,38 +59,34 @@ export async function login(values: z.infer<typeof loginFormSchema>) {
});
}

export async function signup(values: z.infer<typeof loginFormSchema>) {
"use server";
export async function providerLogin(provider: LoginProvider) {
return await Sentry.withServerActionInstrumentation(
"signup",
"providerLogin",
{},
async () => {
const supabase = getServerSupabase();
const api = new BackendAPI();

if (!supabase) {
redirect("/error");
}

// We are sure that the values are of the correct type because zod validates the form
const { data, error } = await supabase.auth.signUp(values);
const { error } = await supabase!.auth.signInWithOAuth({
provider: provider,
options: {
redirectTo:
process.env.AUTH_CALLBACK_URL ??
`http://localhost:3000/auth/callback`,
},
});

if (error) {
console.log("Error signing up", error);
if (error.message.includes("P0001")) {
return "Please join our waitlist for your turn: https://agpt.co/waitlist";
}
if (error.code?.includes("user_already_exists")) {
redirect("/login");
}
console.error("Error logging in", error);
return error.message;
}

if (data.session) {
await supabase.auth.setSession(data.session);
}
console.log("Signed up");
revalidatePath("/", "layout");
redirect("/store/profile");
await api.createUser();
console.log("Logged in");
},
);
}
Loading
Loading