Ling0925
/
buster
mirror of https://github.com/buster-so/buster.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #283 from buster-so/staging 

Add logging to login
This commit is contained in:
Nate Kelley 2025-05-07 12:51:07 -06:00 committed by GitHub
parent d3f637e0e8 e11128c798
commit 3a98a42fd4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/Dockerfile
View File

@ -1,5 +1,5 @@
# Build stage # Build stage
FROM node:20-alpine AS builder FROM node:22-alpine AS builder
WORKDIR /app WORKDIR /app

4
web/package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "web", "name": "web",
"version": "0.1.5", "version": "0.1.0",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "web", "name": "web",
"version": "0.1.5", "version": "0.1.0",
"dependencies": { "dependencies": {
"@dnd-kit/core": "^6.3.1", "@dnd-kit/core": "^6.3.1",
"@dnd-kit/modifiers": "^9.0.0", "@dnd-kit/modifiers": "^9.0.0",

19
web/src/components/features/auth/LoginForm.tsx
View File

@ -50,9 +50,9 @@ export const LoginForm: React.FC<{}> = ({}) => {
async ({ email, password }: { email: string; password: string }) => { async ({ email, password }: { email: string; password: string }) => {
setLoading('email'); setLoading('email');
try { try {
const res = await signInWithEmailAndPassword({ email, password }); await signInWithEmailAndPassword({ email, password });
if (res?.error) throw res.error;
} catch (error: any) { } catch (error: any) {
console.error(error);
errorFallback(error); errorFallback(error);
setLoading(null); setLoading(null);
} }
@ -62,9 +62,9 @@ export const LoginForm: React.FC<{}> = ({}) => {
const onSignInWithGoogle = useMemoizedFn(async () => { const onSignInWithGoogle = useMemoizedFn(async () => {
setLoading('google'); setLoading('google');
try { try {
const res = await signInWithGoogle(); await signInWithGoogle();
if (res?.error) throw res.error;
} catch (error: any) { } catch (error: any) {
console.error(error);
errorFallback(error); errorFallback(error);
setLoading(null); setLoading(null);
} }
@ -74,8 +74,8 @@ export const LoginForm: React.FC<{}> = ({}) => {
setLoading('github'); setLoading('github');
try { try {
const res = await signInWithGithub(); const res = await signInWithGithub();
if (res?.error) throw res.error;
} catch (error: any) { } catch (error: any) {
console.error(error);
errorFallback(error); errorFallback(error);
setLoading(null); setLoading(null);
} }
@ -84,8 +84,7 @@ export const LoginForm: React.FC<{}> = ({}) => {
const onSignInWithAzure = useMemoizedFn(async () => { const onSignInWithAzure = useMemoizedFn(async () => {
setLoading('azure'); setLoading('azure');
try { try {
const res = await signInWithAzure(); await signInWithAzure();
if (res?.error) throw res.error;
} catch (error: any) { } catch (error: any) {
errorFallback(error); errorFallback(error);
setLoading(null); setLoading(null);
@ -95,11 +94,10 @@ export const LoginForm: React.FC<{}> = ({}) => {
const onSignUp = useMemoizedFn(async (d: { email: string; password: string }) => { const onSignUp = useMemoizedFn(async (d: { email: string; password: string }) => {
setLoading('email'); setLoading('email');
try { try {
const res = await signUp(d); await signUp(d);
if (res?.error) throw res.error;
setSignUpSuccess(true); setSignUpSuccess(true);
} catch (error: any) { } catch (error: any) {
console.error(error);
errorFallback(error); errorFallback(error);
setLoading(null); setLoading(null);
} }
@ -113,6 +111,7 @@ export const LoginForm: React.FC<{}> = ({}) => {
if (signUpFlow) onSignUp(d); if (signUpFlow) onSignUp(d);
else onSignInWithUsernameAndPassword(d); else onSignInWithUsernameAndPassword(d);
} catch (error: any) { } catch (error: any) {
console.error(error);
const errorMessage = rustErrorHandler(error); const errorMessage = rustErrorHandler(error);
if (errorMessage?.message == 'User already registered') { if (errorMessage?.message == 'User already registered') {
onSignInWithUsernameAndPassword(d); onSignInWithUsernameAndPassword(d);

18
web/src/lib/supabase/signIn.ts
View File

@ -17,7 +17,6 @@ export const signInWithEmailAndPassword = async ({
password: string; password: string;
}) => { }) => {
'use server'; 'use server';
const supabase = await createClient(); const supabase = await createClient();
const { data, error } = await supabase.auth.signInWithPassword({ const { data, error } = await supabase.auth.signInWithPassword({
@ -26,7 +25,7 @@ export const signInWithEmailAndPassword = async ({
}); });
if (error) { if (error) {
return { error: error.message }; throw error;
} }
revalidatePath('/', 'layout'); revalidatePath('/', 'layout');
@ -50,7 +49,7 @@ export const signInWithGoogle = async () => {
}); });
if (error) { if (error) {
return { error: error.message }; throw error;
} }
revalidatePath('/', 'layout'); revalidatePath('/', 'layout');
@ -70,7 +69,7 @@ export const signInWithGithub = async () => {
}); });
if (error) { if (error) {
return { error: error.message }; throw error;
} }
revalidatePath('/', 'layout'); revalidatePath('/', 'layout');
@ -91,7 +90,7 @@ export const signInWithAzure = async () => {
}); });
if (error) { if (error) {
return { error: error.message }; throw error;
} }
revalidatePath('/', 'layout'); revalidatePath('/', 'layout');
return redirect(data.url); return redirect(data.url);
@ -99,12 +98,15 @@ export const signInWithAzure = async () => {
export const signUp = async ({ email, password }: { email: string; password: string }) => { export const signUp = async ({ email, password }: { email: string; password: string }) => {
'use server'; 'use server';
console.log('signUp', email, password);
const supabase = await createClient(); const supabase = await createClient();
console.log('supabase', supabase);
const authURL = createBusterRoute({ const authURL = createBusterRoute({
route: BusterRoutes.AUTH_CONFIRM route: BusterRoutes.AUTH_CONFIRM
}); });
console.log('authURL', authURL);
const authURLFull = `${process.env.NEXT_PUBLIC_URL}${authURL}`; const authURLFull = `${process.env.NEXT_PUBLIC_URL}${authURL}`;
console.log('authURLFull', authURLFull);
const { error } = await supabase.auth.signUp({ const { error } = await supabase.auth.signUp({
email, email,
@ -113,9 +115,9 @@ export const signUp = async ({ email, password }: { email: string; password: str
emailRedirectTo: authURLFull emailRedirectTo: authURLFull
} }
}); });
console.log('error', error);
if (error) { if (error) {
return { error: error.message }; throw error;
} }
revalidatePath('/', 'layout'); revalidatePath('/', 'layout');