primera iteracion de login + register con google funcionales

src/lib/components/FireBaseButton.svelte

@@ -1,17 +1,205 @@
 <script>
 	import { getFirebaseAuth } from '$lib/stores/firebase.ts';
+	import { loginFirebase } from '@/hooks/loginFirebase';
+	import { register } from '@/hooks/register';
+	import { registerFirebase } from '@/hooks/registerFirebase';
 	import { GoogleAuthProvider, signInWithPopup } from 'firebase/auth';
-	import Button from './ui/button/button.svelte';
+
+	let { mode } = $props();
 
 	const handleGoogleSignIn = async () => {
 		const auth = getFirebaseAuth();
 		const provider = new GoogleAuthProvider();
+		let ret;
 		try {
-			await signInWithPopup(auth, provider);
+			switch (mode) {
+				case 'register':
+					ret = await signInWithPopup(auth, provider);
+
+					/** @type {import('../../types').RegisterSsoDto} */
+					let dto2 = {
+						displayName: ret.user.displayName || '',
+						email: ret.user.email || '',
+						token: ret.user.accessToken || '',
+						uid: ret.user.uid,
+						username: ret.user.displayName?.replaceAll(' ', '_') || ''
+					};
+					registerFirebase(dto2, () => {});
+
+					break;
+				case 'login':
+					ret = await signInWithPopup(auth, provider);
+					/** @type {import('../../types').LoginSsoDto} */
+					let dto = {
+						uid: ret.user.uid,
+						accessToken: ret.user.accessToken
+					};
+					// console.log(ret);
+					await loginFirebase(dto, () => {});
+					// console.log(dto);
+					break;
+				default:
+					console.warn('Unknown mode:', mode);
+					break;
+			}
 		} catch (error) {
 			console.error('Error signing in with Google:', error);
 		}
 	};
 </script>
 
-<Button onclick={handleGoogleSignIn}>Sign in with Google</Button>
+<svelte:head>
+	<script src="https://accounts.google.com/gsi/client" async></script>
+</svelte:head>
+
+<button class="gsi-material-button w-full!" onclick={handleGoogleSignIn}>
+	<div class="gsi-material-button-state"></div>
+	<div class="gsi-material-button-content-wrapper">
+		<div class="gsi-material-button-icon">
+			<svg
+				version="1.1"
+				xmlns="http://www.w3.org/2000/svg"
+				viewBox="0 0 48 48"
+				xmlns:xlink="http://www.w3.org/1999/xlink"
+				style="display: block;"
+			>
+				<path
+					fill="#EA4335"
+					d="M24 9.5c3.54 0 6.71 1.22 9.21 3.6l6.85-6.85C35.9 2.38 30.47 0 24 0 14.62 0 6.51 5.38 2.56 13.22l7.98 6.19C12.43 13.72 17.74 9.5 24 9.5z"
+				></path>
+				<path
+					fill="#4285F4"
+					d="M46.98 24.55c0-1.57-.15-3.09-.38-4.55H24v9.02h12.94c-.58 2.96-2.26 5.48-4.78 7.18l7.73 6c4.51-4.18 7.09-10.36 7.09-17.65z"
+				></path>
+				<path
+					fill="#FBBC05"
+					d="M10.53 28.59c-.48-1.45-.76-2.99-.76-4.59s.27-3.14.76-4.59l-7.98-6.19C.92 16.46 0 20.12 0 24c0 3.88.92 7.54 2.56 10.78l7.97-6.19z"
+				></path>
+				<path
+					fill="#34A853"
+					d="M24 48c6.48 0 11.93-2.13 15.89-5.81l-7.73-6c-2.15 1.45-4.92 2.3-8.16 2.3-6.26 0-11.57-4.22-13.47-9.91l-7.98 6.19C6.51 42.62 14.62 48 24 48z"
+				></path>
+				<path fill="none" d="M0 0h48v48H0z"></path>
+			</svg>
+		</div>
+		<span class="gsi-material-button-contents">Continue with Google</span>
+		<span style="display: none;">Continue with Google</span>
+	</div>
+</button>
+
+<style>
+	.gsi-material-button {
+		-moz-user-select: none;
+		-webkit-user-select: none;
+		-ms-user-select: none;
+		-webkit-appearance: none;
+		appearance: none;
+		user-select: none;
+		background-color: WHITE;
+		background-image: none;
+		border: 1px solid #747775;
+		-webkit-border-radius: 20px;
+		border-radius: 20px;
+		-webkit-box-sizing: border-box;
+		box-sizing: border-box;
+		color: #1f1f1f;
+		cursor: pointer;
+		font-family: 'Roboto', arial, sans-serif;
+		font-size: 14px;
+		height: 40px;
+		letter-spacing: 0.25px;
+		outline: none;
+		overflow: hidden;
+		padding: 0 12px;
+		position: relative;
+		text-align: center;
+		-webkit-transition:
+			background-color 0.218s,
+			border-color 0.218s,
+			box-shadow 0.218s;
+		transition:
+			background-color 0.218s,
+			border-color 0.218s,
+			box-shadow 0.218s;
+		vertical-align: middle;
+		white-space: nowrap;
+		width: auto;
+		min-width: min-content;
+	}
+
+	.gsi-material-button .gsi-material-button-icon {
+		height: 20px;
+		margin-right: 10px;
+		min-width: 20px;
+		width: 20px;
+	}
+
+	.gsi-material-button .gsi-material-button-content-wrapper {
+		-webkit-align-items: center;
+		align-items: center;
+		display: flex;
+		-webkit-flex-direction: row;
+		flex-direction: row;
+		-webkit-flex-wrap: nowrap;
+		flex-wrap: nowrap;
+		height: 100%;
+		justify-content: space-between;
+		position: relative;
+		width: 100%;
+	}
+
+	.gsi-material-button .gsi-material-button-contents {
+		-webkit-flex-grow: 1;
+		flex-grow: 1;
+		font-family: 'Roboto', arial, sans-serif;
+		font-weight: 500;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		vertical-align: top;
+	}
+
+	.gsi-material-button .gsi-material-button-state {
+		-webkit-transition: opacity 0.218s;
+		transition: opacity 0.218s;
+		bottom: 0;
+		left: 0;
+		opacity: 0;
+		position: absolute;
+		right: 0;
+		top: 0;
+	}
+
+	.gsi-material-button:disabled {
+		cursor: default;
+		background-color: #ffffff61;
+		border-color: #1f1f1f1f;
+	}
+
+	.gsi-material-button:disabled .gsi-material-button-contents {
+		opacity: 38%;
+	}
+
+	.gsi-material-button:disabled .gsi-material-button-icon {
+		opacity: 38%;
+	}
+
+	.gsi-material-button:not(:disabled):active .gsi-material-button-state,
+	.gsi-material-button:not(:disabled):focus .gsi-material-button-state {
+		background-color: #303030;
+		opacity: 12%;
+	}
+
+	.gsi-material-button:not(:disabled):hover {
+		-webkit-box-shadow:
+			0 1px 2px 0 rgba(60, 64, 67, 0.3),
+			0 1px 3px 1px rgba(60, 64, 67, 0.15);
+		box-shadow:
+			0 1px 2px 0 rgba(60, 64, 67, 0.3),
+			0 1px 3px 1px rgba(60, 64, 67, 0.15);
+	}
+
+	.gsi-material-button:not(:disabled):hover .gsi-material-button-state {
+		background-color: #303030;
+		opacity: 8%;
+	}
+</style>

src/lib/head/Header.svelte

@@ -20,7 +20,7 @@
 
 	onMount(() => {
 		sesionStore.subscribe((value) => {
-			showCerrarSesion = !!value?.accessToken;
+			showCerrarSesion = !!value?.username;
 		});
 	});
 

src/lib/hooks/loginFirebase.ts

@@ -0,0 +1,30 @@
+import { apiBase } from '@/stores/url';
+import type { LoginSsoDto, Sesion } from '../../types';
+import { sesionStore } from '@/stores/usuario';
+import { goto } from '$app/navigation';
+import { get } from 'svelte/store';
+
+export async function loginFirebase(dto: LoginSsoDto, callbackfn: () => void) {
+	if (dto.accessToken == '' || dto.uid == '') return;
+	try {
+		const req = await fetch(get(apiBase) + '/api/auth/login/sso', {
+			method: 'POST',
+			headers: {
+				'Content-Type': 'application/json'
+			},
+			credentials: 'include',
+			body: JSON.stringify(dto)
+		});
+		if (req.ok) {
+			const token: Sesion = await req.json();
+			console.log(token);
+			sesionStore.set(token);
+			goto('/');
+		} else {
+			callbackfn();
+		}
+	} catch {
+		// callbackfn();
+		console.error('fallo al intentar alcanzar el servidor');
+	}
+}

src/lib/hooks/registerFirebase.ts

@@ -0,0 +1,30 @@
+import { apiBase } from '@/stores/url';
+import { goto } from '$app/navigation';
+import type { RegisterDto, RegisterSsoDto } from '../../types';
+import { get } from 'svelte/store';
+
+export async function registerFirebase(
+	dto: RegisterSsoDto,
+	callbackfn: () => void,
+	admin: boolean = false
+) {
+	if (dto.uid == '' || dto.token == '' || !dto.email?.includes('@') || dto.username == '') return;
+	try {
+		const req = await fetch(get(apiBase) + '/api/auth/register/sso', {
+			method: 'POST',
+			headers: {
+				'Content-Type': 'application/json'
+			},
+			body: JSON.stringify(dto)
+		});
+		if (req.ok) {
+			const data = await req.json();
+			if (!admin) goto('/login?msg=' + data.message);
+		} else {
+			callbackfn();
+		}
+	} catch {
+		callbackfn();
+		console.error('fallo al intentar alcanzar el servidor');
+	}
+}

src/lib/stores/usuario.ts

@@ -21,6 +21,10 @@ export const sesionStore = {
 	reset: () => currentSesion.set(null)
 };
 
+sesionStore.subscribe((value) => {
+	console.log(value);
+});
+
 if (browser) {
 	currentSesion.subscribe((value) => {
 		localStorage.setItem('sesion', JSON.stringify(value));
@@ -45,9 +49,32 @@ if (browser) {
 		}
 	};
 
-	const shouldRefreshToken = (sesion: Sesion | null): boolean => {
+	const shouldRefreshToken = async (sesion: Sesion | null): Promise<boolean> => {
 		if (!sesion || !sesion.accessToken) return false;
 
+		if (sesion.isFirebase) {
+			try {
+				// Simulamos la importación dinámica de Firebase
+				const { getAuth } = await import('firebase/auth');
+				const auth = getAuth();
+				const user = auth.currentUser;
+
+				if (user) {
+					const token = await user.getIdToken(true);
+					currentSesion.update((s) => {
+						if (s) {
+							return { ...s, accessToken: token };
+						}
+						return s;
+					});
+					return false;
+				}
+			} catch (error) {
+				console.error('Error obteniendo token de Firebase:', error);
+				return false;
+			}
+		}
+
 		const decoded = decodeJWT(sesion.accessToken);
 		if (!decoded || !decoded.exp) return false;
 
@@ -61,28 +88,31 @@ if (browser) {
 	const refreshAccessToken = async () => {
 		try {
 			const sesion = get(currentSesion);
-			if (!shouldRefreshToken(sesion)) return;
+			if (!(await shouldRefreshToken(sesion))) return;
 
-			console.log('refrescando token');
+			// Solo ejecutar este código si NO es Firebase
-			const response = await fetch(get(apiBase) + '/api/auth/refresh', {
+			if (!sesion?.isFirebase) {
-				method: 'POST',
+				console.log('refrescando token');
-				headers: {
+				const response = await fetch(get(apiBase) + '/api/auth/refresh', {
-					'Content-Type': 'application/json'
+					method: 'POST',
-				},
+					headers: {
-				credentials: 'include'
+						'Content-Type': 'application/json'
-			});
+					},
-
+					credentials: 'include'
-			if (response.ok) {
-				const data = await response.json();
-				currentSesion.update((sesion) => {
-					if (sesion) {
-						return { ...sesion, accessToken: data.accessToken };
-					}
-					return sesion;
 				});
-			} else {
+
-				console.error('Error refrescando token:', response.statusText);
+				if (response.ok) {
-				currentSesion.set(null);
+					const data = await response.json();
+					currentSesion.update((sesion) => {
+						if (sesion) {
+							return { ...sesion, accessToken: data.accessToken };
+						}
+						return sesion;
+					});
+				} else {
+					console.error('Error refrescando token:', response.statusText);
+					currentSesion.set(null);
+				}
 			}
 		} catch (error) {
 			console.error('Error refrescando token:', error);
@@ -90,6 +120,9 @@ if (browser) {
 		}
 	};
 
-	setInterval(refreshAccessToken, 30 * 1000); // Check every 30 seconds
+	setInterval(() => {
+		refreshAccessToken();
+	}, 30 * 1000); // Check every 30 seconds
+
 	refreshAccessToken();
 }

src/routes/login/+page.svelte

@@ -4,6 +4,9 @@
 	import AlertCircleIcon from '@lucide/svelte/icons/alert-circle';
 	import { fade, fly } from 'svelte/transition';
 	import Info from '@lucide/svelte/icons/info';
+	import Card from '@/components/ui/card/card.svelte';
+	import CardContent from '@/components/ui/card/card-content.svelte';
+	import FireBaseButton from '@/components/FireBaseButton.svelte';
 
 	let { data } = $props();
 
@@ -41,6 +44,12 @@
 			</div>
 		{/if}
 		<LoginForm bind:showAlert id="1" />
+
+		<Card class="mt-2">
+			<CardContent>
+				<FireBaseButton mode="login" />
+			</CardContent>
+		</Card>
 		{#if showAlert}
 			<div class="mt-2" transition:fade>
 				<Alert.Root variant="destructive">

src/routes/register/+page.svelte

@@ -27,7 +27,7 @@
 
 		<Card class="mt-2">
 			<CardContent>
-				<FireBaseButton />
+				<FireBaseButton mode="register" />
 			</CardContent>
 		</Card>
 		{#if showAlert}

src/types.d.ts

@@ -39,6 +39,7 @@ export interface Sesion {
 	displayName: string;
 	username: string;
 	isAdmin: boolean;
+	isFirebase: boolean;
 }
 
 export interface LoginDto {
@@ -46,6 +47,11 @@ export interface LoginDto {
 	password: string?;
 }
 
+export interface LoginSsoDto {
+	accessToken: string;
+	uid: string;
+}
+
 export interface RegisterDto {
 	username: string;
 	email: string;
@@ -53,6 +59,14 @@ export interface RegisterDto {
 	displayName: string;
 }
 
+export interface RegisterSsoDto {
+	username: string;
+	email: string;
+	displayName: string;
+	token: string;
+	uid: string;
+}
+
 export interface CreatePostDto {
 	content: string;
 	imageUrl: string?;