Add Facebook social login
This commit is contained in:
@@ -39,9 +39,10 @@
|
||||
"missing_token": "Reset-Token fehlt."
|
||||
},
|
||||
"actions_title": "Wähle deine Anmeldemethode",
|
||||
"actions_copy": "Greife sicher mit deinem Fotospiel-Login oder deinem Google-Konto auf das Kunden-Dashboard zu.",
|
||||
"actions_copy": "Greife sicher mit deinem Fotospiel-Login oder deinem Google- oder Facebook-Konto auf das Kunden-Dashboard zu.",
|
||||
"cta": "Mit Fotospiel-Login fortfahren",
|
||||
"google_cta": "Mit Google anmelden",
|
||||
"facebook_cta": "Mit Facebook anmelden",
|
||||
"open_account_login": "Konto-Login öffnen",
|
||||
"loading": "Bitte warten …",
|
||||
"oauth_error_title": "Login aktuell nicht möglich",
|
||||
@@ -54,7 +55,9 @@
|
||||
"invalid_scope": "Die App fordert Berechtigungen an, die nicht freigegeben sind.",
|
||||
"tenant_mismatch": "Du hast keinen Zugriff auf das Kundenkonto, das diese Anmeldung angefordert hat.",
|
||||
"google_failed": "Die Anmeldung mit Google war nicht erfolgreich. Bitte versuche es erneut oder wähle eine andere Methode.",
|
||||
"google_no_match": "Wir konnten dieses Google-Konto keinem Kunden-Admin zuordnen. Bitte melde dich mit Fotospiel-Zugangsdaten an."
|
||||
"google_no_match": "Wir konnten dieses Google-Konto keinem Kunden-Admin zuordnen. Bitte melde dich mit Fotospiel-Zugangsdaten an.",
|
||||
"facebook_failed": "Die Anmeldung mit Facebook war nicht erfolgreich. Bitte versuche es erneut oder wähle eine andere Methode.",
|
||||
"facebook_no_match": "Wir konnten dieses Facebook-Konto keinem Kunden-Admin zuordnen. Bitte melde dich mit Fotospiel-Zugangsdaten an."
|
||||
},
|
||||
"return_hint": "Nach dem Anmelden leiten wir dich automatisch zurück.",
|
||||
"support": "Du brauchst Zugriff? Kontaktiere dein Event-Team oder schreib uns an support@fotospiel.de.",
|
||||
|
||||
@@ -39,9 +39,10 @@
|
||||
"missing_token": "Reset token missing."
|
||||
},
|
||||
"actions_title": "Choose your sign-in method",
|
||||
"actions_copy": "Access the customer dashboard securely with your Fotospiel login or your Google account.",
|
||||
"actions_copy": "Access the customer dashboard securely with your Fotospiel login or your Google or Facebook account.",
|
||||
"cta": "Continue with Fotospiel login",
|
||||
"google_cta": "Continue with Google",
|
||||
"facebook_cta": "Continue with Facebook",
|
||||
"open_account_login": "Open account login",
|
||||
"loading": "Signing you in …",
|
||||
"oauth_error_title": "Login not possible right now",
|
||||
@@ -54,7 +55,9 @@
|
||||
"invalid_scope": "The app asked for permissions it cannot receive.",
|
||||
"tenant_mismatch": "You don’t have access to the customer account that requested this login.",
|
||||
"google_failed": "Google sign-in was not successful. Please try again or use another method.",
|
||||
"google_no_match": "We couldn’t link this Google account to a customer admin. Please sign in with Fotospiel credentials."
|
||||
"google_no_match": "We couldn’t link this Google account to a customer admin. Please sign in with Fotospiel credentials.",
|
||||
"facebook_failed": "Facebook sign-in was not successful. Please try again or use another method.",
|
||||
"facebook_no_match": "We couldn’t link this Facebook account to a customer admin. Please sign in with Fotospiel credentials."
|
||||
},
|
||||
"return_hint": "After signing in you’ll be brought back automatically.",
|
||||
"support": "Need access? Contact your event team or email support@fotospiel.de — we're happy to help.",
|
||||
|
||||
@@ -105,6 +105,16 @@ export default function MobileLoginPage() {
|
||||
return `/event-admin/auth/google?${params.toString()}`;
|
||||
}, [encodedFinal]);
|
||||
|
||||
const facebookHref = React.useMemo(() => {
|
||||
if (!encodedFinal) {
|
||||
return '/event-admin/auth/facebook';
|
||||
}
|
||||
|
||||
const params = new URLSearchParams({ return_to: encodedFinal });
|
||||
|
||||
return `/event-admin/auth/facebook?${params.toString()}`;
|
||||
}, [encodedFinal]);
|
||||
|
||||
React.useEffect(() => {
|
||||
if (status === 'authenticated') {
|
||||
navigate(finalTarget, { replace: true });
|
||||
@@ -115,6 +125,7 @@ export default function MobileLoginPage() {
|
||||
const [password, setPassword] = React.useState('');
|
||||
const [error, setError] = React.useState<string | null>(null);
|
||||
const [isRedirectingToGoogle, setIsRedirectingToGoogle] = React.useState(false);
|
||||
const [isRedirectingToFacebook, setIsRedirectingToFacebook] = React.useState(false);
|
||||
const [installBannerDismissed, setInstallBannerDismissedState] = React.useState(() => getInstallBannerDismissed());
|
||||
const installBanner = shouldShowInstallBanner(
|
||||
{
|
||||
@@ -170,6 +181,15 @@ export default function MobileLoginPage() {
|
||||
window.location.assign(googleHref);
|
||||
}, [googleHref]);
|
||||
|
||||
const handleFacebookLogin = React.useCallback(() => {
|
||||
if (typeof window === 'undefined') {
|
||||
return;
|
||||
}
|
||||
|
||||
setIsRedirectingToFacebook(true);
|
||||
window.location.assign(facebookHref);
|
||||
}, [facebookHref]);
|
||||
|
||||
return (
|
||||
<YStack
|
||||
minHeight="100vh"
|
||||
@@ -320,6 +340,29 @@ export default function MobileLoginPage() {
|
||||
</Text>
|
||||
</XStack>
|
||||
</Button>
|
||||
|
||||
<Button
|
||||
type="button"
|
||||
onPress={handleFacebookLogin}
|
||||
disabled={isRedirectingToFacebook || isSubmitting}
|
||||
height={52}
|
||||
borderRadius={16}
|
||||
backgroundColor={surface}
|
||||
borderColor={border}
|
||||
borderWidth={1}
|
||||
color={text}
|
||||
>
|
||||
<XStack alignItems="center" space="$2">
|
||||
{isRedirectingToFacebook ? (
|
||||
<Loader2 size={16} className="animate-spin" />
|
||||
) : (
|
||||
<FacebookIcon size={18} />
|
||||
)}
|
||||
<Text fontSize="$sm" color={text} fontWeight="700">
|
||||
{t('login.facebook_cta', 'Mit Facebook anmelden')}
|
||||
</Text>
|
||||
</XStack>
|
||||
</Button>
|
||||
</YStack>
|
||||
</form>
|
||||
</MobileCard>
|
||||
@@ -365,3 +408,14 @@ function GoogleIcon({ size = 18 }: { size?: number }) {
|
||||
</svg>
|
||||
);
|
||||
}
|
||||
|
||||
function FacebookIcon({ size = 18 }: { size?: number }) {
|
||||
return (
|
||||
<svg width={size} height={size} viewBox="0 0 24 24" aria-hidden>
|
||||
<path
|
||||
fill="#1877F2"
|
||||
d="M24 12.073C24 5.404 18.627 0 12 0S0 5.404 0 12.073C0 18.1 4.388 23.094 10.125 24v-8.437H7.078v-3.49h3.047V9.43c0-3.014 1.792-4.68 4.533-4.68 1.312 0 2.686.236 2.686.236v2.96h-1.513c-1.49 0-1.954.93-1.954 1.887v2.264h3.328l-.532 3.49h-2.796V24C19.612 23.094 24 18.1 24 12.073Z"
|
||||
/>
|
||||
</svg>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -103,13 +103,15 @@ vi.mock('lucide-react', () => ({
|
||||
import MobileLoginPage from '../LoginPage';
|
||||
|
||||
describe('MobileLoginPage', () => {
|
||||
it('renders Google login button', () => {
|
||||
it('renders OAuth login buttons', () => {
|
||||
locationSearch = '?return_to=encoded-value';
|
||||
|
||||
render(<MobileLoginPage />);
|
||||
|
||||
const googleButton = screen.getByText('Mit Google anmelden');
|
||||
expect(googleButton).toBeInTheDocument();
|
||||
const facebookButton = screen.getByText('Mit Facebook anmelden');
|
||||
expect(facebookButton).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('shows oauth error details when present', () => {
|
||||
|
||||
@@ -51,9 +51,9 @@ export default function LoginForm({ onSuccess, canResetPassword = true, locale,
|
||||
|
||||
const loginEndpoint = '/checkout/login';
|
||||
|
||||
const canUseGoogle = typeof packageId === "number" && !Number.isNaN(packageId);
|
||||
const canUseOauth = typeof packageId === "number" && !Number.isNaN(packageId);
|
||||
const googleHref = useMemo(() => {
|
||||
if (!canUseGoogle) {
|
||||
if (!canUseOauth) {
|
||||
return "";
|
||||
}
|
||||
|
||||
@@ -63,7 +63,20 @@ export default function LoginForm({ onSuccess, canResetPassword = true, locale,
|
||||
});
|
||||
|
||||
return `/checkout/auth/google?${params.toString()}`;
|
||||
}, [canUseGoogle, packageId, resolvedLocale]);
|
||||
}, [canUseOauth, packageId, resolvedLocale]);
|
||||
|
||||
const facebookHref = useMemo(() => {
|
||||
if (!canUseOauth) {
|
||||
return "";
|
||||
}
|
||||
|
||||
const params = new URLSearchParams({
|
||||
package_id: String(packageId),
|
||||
locale: resolvedLocale,
|
||||
});
|
||||
|
||||
return `/checkout/auth/facebook?${params.toString()}`;
|
||||
}, [canUseOauth, packageId, resolvedLocale]);
|
||||
|
||||
const [values, setValues] = useState({
|
||||
identifier: "",
|
||||
@@ -73,6 +86,7 @@ export default function LoginForm({ onSuccess, canResetPassword = true, locale,
|
||||
const [errors, setErrors] = useState<FieldErrors>({});
|
||||
const [isSubmitting, setIsSubmitting] = useState(false);
|
||||
const [isRedirectingToGoogle, setIsRedirectingToGoogle] = useState(false);
|
||||
const [isRedirectingToFacebook, setIsRedirectingToFacebook] = useState(false);
|
||||
const [hasTriedSubmit, setHasTriedSubmit] = useState(false);
|
||||
const [shouldFocusError, setShouldFocusError] = useState(false);
|
||||
|
||||
@@ -188,6 +202,15 @@ export default function LoginForm({ onSuccess, canResetPassword = true, locale,
|
||||
window.location.href = googleHref;
|
||||
};
|
||||
|
||||
const handleFacebookLogin = () => {
|
||||
if (!facebookHref) {
|
||||
return;
|
||||
}
|
||||
|
||||
setIsRedirectingToFacebook(true);
|
||||
window.location.href = facebookHref;
|
||||
};
|
||||
|
||||
return (
|
||||
<form onSubmit={submit} className="flex flex-col gap-6" noValidate>
|
||||
<div className="grid gap-6">
|
||||
@@ -243,27 +266,43 @@ export default function LoginForm({ onSuccess, canResetPassword = true, locale,
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
{canUseGoogle && (
|
||||
{canUseOauth && (
|
||||
<div className="space-y-3">
|
||||
<div className="flex items-center gap-3 text-xs font-semibold uppercase tracking-[0.3em] text-muted-foreground">
|
||||
<span className="h-px flex-1 bg-gray-200 dark:bg-gray-800" aria-hidden />
|
||||
{t("login.oauth_divider", "oder")}
|
||||
<span className="h-px flex-1 bg-gray-200 dark:bg-gray-800" aria-hidden />
|
||||
</div>
|
||||
<Button
|
||||
type="button"
|
||||
variant="outline"
|
||||
onClick={handleGoogleLogin}
|
||||
disabled={isSubmitting || isRedirectingToGoogle}
|
||||
className="flex w-full items-center justify-center gap-2"
|
||||
>
|
||||
{isRedirectingToGoogle ? (
|
||||
<LoaderCircle className="h-4 w-4 animate-spin" />
|
||||
) : (
|
||||
<GoogleIcon className="h-4 w-4" />
|
||||
)}
|
||||
<span>{t("login.google_cta")}</span>
|
||||
</Button>
|
||||
<div className="grid gap-3">
|
||||
<Button
|
||||
type="button"
|
||||
variant="outline"
|
||||
onClick={handleGoogleLogin}
|
||||
disabled={isSubmitting || isRedirectingToGoogle}
|
||||
className="flex w-full items-center justify-center gap-2"
|
||||
>
|
||||
{isRedirectingToGoogle ? (
|
||||
<LoaderCircle className="h-4 w-4 animate-spin" />
|
||||
) : (
|
||||
<GoogleIcon className="h-4 w-4" />
|
||||
)}
|
||||
<span>{t("login.google_cta")}</span>
|
||||
</Button>
|
||||
<Button
|
||||
type="button"
|
||||
variant="outline"
|
||||
onClick={handleFacebookLogin}
|
||||
disabled={isSubmitting || isRedirectingToFacebook}
|
||||
className="flex w-full items-center justify-center gap-2"
|
||||
>
|
||||
{isRedirectingToFacebook ? (
|
||||
<LoaderCircle className="h-4 w-4 animate-spin" />
|
||||
) : (
|
||||
<FacebookIcon className="h-4 w-4" />
|
||||
)}
|
||||
<span>{t("login.facebook_cta")}</span>
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -286,3 +325,14 @@ function GoogleIcon({ className }: { className?: string }) {
|
||||
</svg>
|
||||
);
|
||||
}
|
||||
|
||||
function FacebookIcon({ className }: { className?: string }) {
|
||||
return (
|
||||
<svg className={className} viewBox="0 0 24 24" aria-hidden>
|
||||
<path
|
||||
fill="#1877F2"
|
||||
d="M24 12.073C24 5.404 18.627 0 12 0S0 5.404 0 12.073C0 18.1 4.388 23.094 10.125 24v-8.437H7.078v-3.49h3.047V9.43c0-3.014 1.792-4.68 4.533-4.68 1.312 0 2.686.236 2.686.236v2.96h-1.513c-1.49 0-1.954.93-1.954 1.887v2.264h3.328l-.532 3.49h-2.796V24C19.612 23.094 24 18.1 24 12.073Z"
|
||||
/>
|
||||
</svg>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
|
||||
import toast from 'react-hot-toast';
|
||||
import { LoaderCircle, User, Mail, Lock } from 'lucide-react';
|
||||
import { Dialog, DialogContent, DialogTitle, DialogDescription } from '@/components/ui/dialog';
|
||||
import type { GoogleProfilePrefill } from '../marketing/checkout/types';
|
||||
import type { OAuthProfilePrefill } from '../marketing/checkout/types';
|
||||
|
||||
export interface RegisterSuccessPayload {
|
||||
user: unknown | null;
|
||||
@@ -17,8 +17,8 @@ interface RegisterFormProps {
|
||||
onSuccess?: (payload: RegisterSuccessPayload) => void;
|
||||
privacyHtml: string;
|
||||
locale?: string;
|
||||
prefill?: GoogleProfilePrefill;
|
||||
onClearGoogleProfile?: () => void;
|
||||
prefill?: OAuthProfilePrefill;
|
||||
onClearPrefill?: () => void;
|
||||
}
|
||||
|
||||
type RegisterFormFields = {
|
||||
@@ -50,7 +50,7 @@ const resolveMetaCsrfToken = (): string => {
|
||||
return (document.querySelector('meta[name="csrf-token"]') as HTMLMetaElement | null)?.content ?? '';
|
||||
};
|
||||
|
||||
export default function RegisterForm({ packageId, onSuccess, privacyHtml, locale, prefill, onClearGoogleProfile }: RegisterFormProps) {
|
||||
export default function RegisterForm({ packageId, onSuccess, privacyHtml, locale, prefill, onClearPrefill }: RegisterFormProps) {
|
||||
const [privacyOpen, setPrivacyOpen] = useState(false);
|
||||
const [hasTriedSubmit, setHasTriedSubmit] = useState(false);
|
||||
const [isSubmitting, setIsSubmitting] = useState(false);
|
||||
@@ -176,7 +176,7 @@ export default function RegisterForm({ packageId, onSuccess, privacyHtml, locale
|
||||
redirect: json?.redirect ?? null,
|
||||
pending_purchase: json?.pending_purchase ?? json?.user?.pending_purchase ?? false,
|
||||
});
|
||||
onClearGoogleProfile?.();
|
||||
onClearPrefill?.();
|
||||
reset();
|
||||
setHasTriedSubmit(false);
|
||||
return;
|
||||
|
||||
@@ -39,15 +39,17 @@ vi.mock('react-hot-toast', () => ({
|
||||
import LoginForm from '../LoginForm';
|
||||
|
||||
describe('LoginForm', () => {
|
||||
it('renders Google login option when packageId is provided', () => {
|
||||
it('renders OAuth login options when packageId is provided', () => {
|
||||
render(<LoginForm packageId={12} />);
|
||||
|
||||
expect(screen.getByText('login.google_cta')).toBeInTheDocument();
|
||||
expect(screen.getByText('login.facebook_cta')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('does not render Google login option without packageId', () => {
|
||||
it('does not render OAuth login options without packageId', () => {
|
||||
render(<LoginForm />);
|
||||
|
||||
expect(screen.queryByText('login.google_cta')).not.toBeInTheDocument();
|
||||
expect(screen.queryByText('login.facebook_cta')).not.toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
|
||||
@@ -24,6 +24,7 @@ export default function Login({ status, canResetPassword }: LoginProps) {
|
||||
const [hasTriedSubmit, setHasTriedSubmit] = useState(false);
|
||||
const [rawReturnTo, setRawReturnTo] = useState<string | null>(null);
|
||||
const [isRedirectingToGoogle, setIsRedirectingToGoogle] = useState(false);
|
||||
const [isRedirectingToFacebook, setIsRedirectingToFacebook] = useState(false);
|
||||
const { t } = useTranslation('auth');
|
||||
const page = usePage<{ flash?: { verification?: { status: string; title?: string; message?: string } } }>();
|
||||
const verificationFlash = page.props.flash?.verification;
|
||||
@@ -98,6 +99,18 @@ export default function Login({ status, canResetPassword }: LoginProps) {
|
||||
return `/event-admin/auth/google?${params.toString()}`;
|
||||
}, [rawReturnTo]);
|
||||
|
||||
const facebookHref = useMemo(() => {
|
||||
if (!rawReturnTo) {
|
||||
return '/event-admin/auth/facebook';
|
||||
}
|
||||
|
||||
const params = new URLSearchParams({
|
||||
return_to: rawReturnTo,
|
||||
});
|
||||
|
||||
return `/event-admin/auth/facebook?${params.toString()}`;
|
||||
}, [rawReturnTo]);
|
||||
|
||||
const handleGoogleLogin = () => {
|
||||
if (typeof window === 'undefined') {
|
||||
return;
|
||||
@@ -107,6 +120,15 @@ export default function Login({ status, canResetPassword }: LoginProps) {
|
||||
window.location.href = googleHref;
|
||||
};
|
||||
|
||||
const handleFacebookLogin = () => {
|
||||
if (typeof window === 'undefined') {
|
||||
return;
|
||||
}
|
||||
|
||||
setIsRedirectingToFacebook(true);
|
||||
window.location.href = facebookHref;
|
||||
};
|
||||
|
||||
return (
|
||||
<AuthLayout
|
||||
title={t('login.title')}
|
||||
@@ -271,9 +293,27 @@ export default function Login({ status, canResetPassword }: LoginProps) {
|
||||
)}
|
||||
<span>{t('login.google_cta')}</span>
|
||||
</Button>
|
||||
|
||||
<Button
|
||||
type="button"
|
||||
variant="outline"
|
||||
onClick={handleFacebookLogin}
|
||||
disabled={processing || isRedirectingToFacebook}
|
||||
className="flex h-12 w-full items-center justify-center gap-3 rounded-xl border-gray-200/80 bg-white/90 text-sm font-semibold text-gray-700 shadow-inner shadow-gray-200/40 transition hover:bg-white dark:border-gray-800/70 dark:bg-gray-900/60 dark:text-gray-100 dark:hover:bg-gray-900/80"
|
||||
>
|
||||
{isRedirectingToFacebook ? (
|
||||
<LoaderCircle className="h-5 w-5 animate-spin" aria-hidden />
|
||||
) : (
|
||||
<FacebookIcon className="h-5 w-5" />
|
||||
)}
|
||||
<span>{t('login.facebook_cta')}</span>
|
||||
</Button>
|
||||
<p className="text-center text-xs text-muted-foreground dark:text-gray-300">
|
||||
{t('login.google_helper', 'Nutze dein Google-Konto, um dich sicher bei der Eventverwaltung anzumelden.')}
|
||||
</p>
|
||||
<p className="text-center text-xs text-muted-foreground dark:text-gray-300">
|
||||
{t('login.facebook_helper', 'Melde dich schnell mit deinem Facebook-Konto an.')}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div className="rounded-2xl border border-gray-200/60 bg-gray-50/80 p-4 text-center text-sm text-muted-foreground shadow-inner dark:border-gray-800/70 dark:bg-gray-900/60">
|
||||
@@ -315,3 +355,14 @@ function GoogleIcon({ className }: { className?: string }) {
|
||||
</svg>
|
||||
);
|
||||
}
|
||||
|
||||
function FacebookIcon({ className }: { className?: string }) {
|
||||
return (
|
||||
<svg className={className} viewBox="0 0 24 24" aria-hidden>
|
||||
<path
|
||||
fill="#1877F2"
|
||||
d="M24 12.073C24 5.404 18.627 0 12 0S0 5.404 0 12.073C0 18.1 4.388 23.094 10.125 24v-8.437H7.078v-3.49h3.047V9.43c0-3.014 1.792-4.68 4.533-4.68 1.312 0 2.686.236 2.686.236v2.96h-1.513c-1.49 0-1.954.93-1.954 1.887v2.264h3.328l-.532 3.49h-2.796V24C19.612 23.094 24 18.1 24 12.073Z"
|
||||
/>
|
||||
</svg>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import React, { useEffect } from "react";
|
||||
import { Head, usePage } from "@inertiajs/react";
|
||||
import MarketingLayout from "@/layouts/mainWebsite";
|
||||
import type { CheckoutPackage, GoogleProfilePrefill } from "./checkout/types";
|
||||
import type { CheckoutPackage, OAuthProfilePrefill } from "./checkout/types";
|
||||
import { CheckoutWizard } from "./checkout/CheckoutWizard";
|
||||
import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
|
||||
import toast from "react-hot-toast";
|
||||
@@ -14,7 +14,12 @@ interface CheckoutWizardPageProps {
|
||||
googleAuth?: {
|
||||
status?: string | null;
|
||||
error?: string | null;
|
||||
profile?: GoogleProfilePrefill | null;
|
||||
profile?: OAuthProfilePrefill | null;
|
||||
};
|
||||
facebookAuth?: {
|
||||
status?: string | null;
|
||||
error?: string | null;
|
||||
profile?: OAuthProfilePrefill | null;
|
||||
};
|
||||
paddle?: {
|
||||
environment?: string | null;
|
||||
@@ -27,11 +32,13 @@ const CheckoutWizardPage: React.FC<CheckoutWizardPageProps> = ({
|
||||
packageOptions,
|
||||
privacyHtml,
|
||||
googleAuth,
|
||||
facebookAuth,
|
||||
paddle,
|
||||
}) => {
|
||||
const page = usePage<{ auth?: { user?: { id: number; email: string; name?: string; pending_purchase?: boolean } | null }, flash?: { verification?: { status: string; title?: string; message?: string } } }>();
|
||||
const currentUser = page.props.auth?.user ?? null;
|
||||
const googleProfile = googleAuth?.profile ?? null;
|
||||
const facebookProfile = facebookAuth?.profile ?? null;
|
||||
const { t: tAuth } = useTranslation('auth');
|
||||
const verificationFlash = page.props.flash?.verification;
|
||||
|
||||
@@ -85,6 +92,7 @@ const CheckoutWizardPage: React.FC<CheckoutWizardPageProps> = ({
|
||||
privacyHtml={privacyHtml}
|
||||
initialAuthUser={currentUser ? { id: currentUser.id, email: currentUser.email ?? '', name: currentUser.name ?? undefined, pending_purchase: Boolean(currentUser.pending_purchase) } : null}
|
||||
googleProfile={googleProfile}
|
||||
facebookProfile={facebookProfile}
|
||||
paddle={paddle ?? null}
|
||||
/>
|
||||
</div>
|
||||
|
||||
@@ -4,7 +4,7 @@ import { Steps } from "@/components/ui/Steps";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Progress } from "@/components/ui/progress";
|
||||
import { CheckoutWizardProvider, useCheckoutWizard } from "./WizardContext";
|
||||
import type { CheckoutPackage, CheckoutStepId, GoogleProfilePrefill } from "./types";
|
||||
import type { CheckoutPackage, CheckoutStepId, OAuthProfilePrefill } from "./types";
|
||||
import { PackageStep } from "./steps/PackageStep";
|
||||
import { AuthStep } from "./steps/AuthStep";
|
||||
import { ConfirmationStep } from "./steps/ConfirmationStep";
|
||||
@@ -25,7 +25,8 @@ interface CheckoutWizardProps {
|
||||
pending_purchase?: boolean;
|
||||
} | null;
|
||||
initialStep?: CheckoutStepId;
|
||||
googleProfile?: GoogleProfilePrefill | null;
|
||||
googleProfile?: OAuthProfilePrefill | null;
|
||||
facebookProfile?: OAuthProfilePrefill | null;
|
||||
paddle?: {
|
||||
environment?: string | null;
|
||||
client_token?: string | null;
|
||||
@@ -68,9 +69,9 @@ const PaymentStepFallback: React.FC = () => (
|
||||
|
||||
const WizardBody: React.FC<{
|
||||
privacyHtml: string;
|
||||
googleProfile?: GoogleProfilePrefill | null;
|
||||
onClearGoogleProfile?: () => void;
|
||||
}> = ({ privacyHtml, googleProfile, onClearGoogleProfile }) => {
|
||||
prefillProfile?: OAuthProfilePrefill | null;
|
||||
onClearPrefill?: () => void;
|
||||
}> = ({ privacyHtml, prefillProfile, onClearPrefill }) => {
|
||||
const primaryCtaClassName = "min-w-[160px] disabled:bg-muted disabled:text-muted-foreground disabled:hover:bg-muted disabled:hover:text-muted-foreground";
|
||||
const { t } = useTranslation('marketing');
|
||||
const {
|
||||
@@ -246,8 +247,8 @@ const WizardBody: React.FC<{
|
||||
{currentStep === "auth" && (
|
||||
<AuthStep
|
||||
privacyHtml={privacyHtml}
|
||||
googleProfile={googleProfile ?? undefined}
|
||||
onClearGoogleProfile={onClearGoogleProfile}
|
||||
prefill={prefillProfile ?? undefined}
|
||||
onClearPrefill={onClearPrefill}
|
||||
/>
|
||||
)}
|
||||
{currentStep === "payment" && (
|
||||
@@ -288,9 +289,10 @@ export const CheckoutWizard: React.FC<CheckoutWizardProps> = ({
|
||||
initialAuthUser,
|
||||
initialStep,
|
||||
googleProfile,
|
||||
facebookProfile,
|
||||
paddle,
|
||||
}) => {
|
||||
const [storedProfile, setStoredProfile] = useState<GoogleProfilePrefill | null>(() => {
|
||||
const [storedGoogleProfile, setStoredGoogleProfile] = useState<OAuthProfilePrefill | null>(() => {
|
||||
if (typeof window === 'undefined') {
|
||||
return null;
|
||||
}
|
||||
@@ -301,7 +303,7 @@ export const CheckoutWizard: React.FC<CheckoutWizardProps> = ({
|
||||
}
|
||||
|
||||
try {
|
||||
return JSON.parse(raw) as GoogleProfilePrefill;
|
||||
return JSON.parse(raw) as OAuthProfilePrefill;
|
||||
} catch (error) {
|
||||
console.warn('Failed to parse checkout google profile from storage', error);
|
||||
window.localStorage.removeItem('checkout-google-profile');
|
||||
@@ -314,21 +316,64 @@ export const CheckoutWizard: React.FC<CheckoutWizardProps> = ({
|
||||
return;
|
||||
}
|
||||
|
||||
setStoredProfile(googleProfile);
|
||||
setStoredGoogleProfile(googleProfile);
|
||||
|
||||
if (typeof window !== 'undefined') {
|
||||
window.localStorage.setItem('checkout-google-profile', JSON.stringify(googleProfile));
|
||||
}
|
||||
}, [googleProfile]);
|
||||
|
||||
const clearStoredProfile = useCallback(() => {
|
||||
setStoredProfile(null);
|
||||
const clearStoredGoogleProfile = useCallback(() => {
|
||||
setStoredGoogleProfile(null);
|
||||
if (typeof window !== 'undefined') {
|
||||
window.localStorage.removeItem('checkout-google-profile');
|
||||
}
|
||||
}, []);
|
||||
|
||||
const effectiveProfile = googleProfile ?? storedProfile;
|
||||
const [storedFacebookProfile, setStoredFacebookProfile] = useState<OAuthProfilePrefill | null>(() => {
|
||||
if (typeof window === 'undefined') {
|
||||
return null;
|
||||
}
|
||||
|
||||
const raw = window.localStorage.getItem('checkout-facebook-profile');
|
||||
if (!raw) {
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
return JSON.parse(raw) as OAuthProfilePrefill;
|
||||
} catch (error) {
|
||||
console.warn('Failed to parse checkout facebook profile from storage', error);
|
||||
window.localStorage.removeItem('checkout-facebook-profile');
|
||||
return null;
|
||||
}
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
if (!facebookProfile) {
|
||||
return;
|
||||
}
|
||||
|
||||
setStoredFacebookProfile(facebookProfile);
|
||||
|
||||
if (typeof window !== 'undefined') {
|
||||
window.localStorage.setItem('checkout-facebook-profile', JSON.stringify(facebookProfile));
|
||||
}
|
||||
}, [facebookProfile]);
|
||||
|
||||
const clearStoredFacebookProfile = useCallback(() => {
|
||||
setStoredFacebookProfile(null);
|
||||
if (typeof window !== 'undefined') {
|
||||
window.localStorage.removeItem('checkout-facebook-profile');
|
||||
}
|
||||
}, []);
|
||||
|
||||
const clearStoredProfiles = useCallback(() => {
|
||||
clearStoredGoogleProfile();
|
||||
clearStoredFacebookProfile();
|
||||
}, [clearStoredFacebookProfile, clearStoredGoogleProfile]);
|
||||
|
||||
const effectiveProfile = facebookProfile ?? storedFacebookProfile ?? googleProfile ?? storedGoogleProfile;
|
||||
|
||||
return (
|
||||
<CheckoutWizardProvider
|
||||
@@ -341,8 +386,8 @@ export const CheckoutWizard: React.FC<CheckoutWizardProps> = ({
|
||||
>
|
||||
<WizardBody
|
||||
privacyHtml={privacyHtml}
|
||||
googleProfile={effectiveProfile}
|
||||
onClearGoogleProfile={clearStoredProfile}
|
||||
prefillProfile={effectiveProfile}
|
||||
onClearPrefill={clearStoredProfiles}
|
||||
/>
|
||||
</CheckoutWizardProvider>
|
||||
);
|
||||
|
||||
@@ -3,7 +3,7 @@ import { describe, expect, it, vi } from 'vitest';
|
||||
import { fireEvent, render, screen } from '@testing-library/react';
|
||||
|
||||
vi.mock('@inertiajs/react', () => ({
|
||||
usePage: () => ({ props: { locale: 'de', googleAuth: {} } }),
|
||||
usePage: () => ({ props: { locale: 'de', googleAuth: {}, facebookAuth: {} } }),
|
||||
}));
|
||||
|
||||
vi.mock('react-i18next', () => ({
|
||||
@@ -77,14 +77,16 @@ vi.mock('lucide-react', () => ({
|
||||
|
||||
import { AuthStep } from '../steps/AuthStep';
|
||||
|
||||
describe('AuthStep Google controls', () => {
|
||||
it('hides the top Google button when switching to login mode', () => {
|
||||
describe('AuthStep OAuth controls', () => {
|
||||
it('hides the OAuth buttons when switching to login mode', () => {
|
||||
render(<AuthStep privacyHtml="" />);
|
||||
|
||||
expect(screen.getByText('checkout.auth_step.continue_with_google')).toBeInTheDocument();
|
||||
expect(screen.getByText('checkout.auth_step.continue_with_facebook')).toBeInTheDocument();
|
||||
|
||||
fireEvent.click(screen.getByText('checkout.auth_step.switch_to_login'));
|
||||
|
||||
expect(screen.queryByText('checkout.auth_step.continue_with_google')).not.toBeInTheDocument();
|
||||
expect(screen.queryByText('checkout.auth_step.continue_with_facebook')).not.toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
|
||||
@@ -3,7 +3,7 @@ import { usePage } from "@inertiajs/react";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
|
||||
import { useCheckoutWizard } from "../WizardContext";
|
||||
import type { GoogleProfilePrefill } from '../types';
|
||||
import type { OAuthProfilePrefill } from '../types';
|
||||
import LoginForm, { AuthUserPayload } from "../../../auth/LoginForm";
|
||||
import RegisterForm, { RegisterSuccessPayload } from "../../../auth/RegisterForm";
|
||||
import { Trans, useTranslation } from 'react-i18next';
|
||||
@@ -14,11 +14,11 @@ import { cn } from "@/lib/utils";
|
||||
|
||||
interface AuthStepProps {
|
||||
privacyHtml: string;
|
||||
googleProfile?: GoogleProfilePrefill;
|
||||
onClearGoogleProfile?: () => void;
|
||||
prefill?: OAuthProfilePrefill;
|
||||
onClearPrefill?: () => void;
|
||||
}
|
||||
|
||||
type GoogleAuthFlash = {
|
||||
type OAuthAuthFlash = {
|
||||
status?: string | null;
|
||||
error?: string | null;
|
||||
};
|
||||
@@ -34,26 +34,55 @@ const GoogleIcon: React.FC<{ className?: string }> = ({ className }) => (
|
||||
</svg>
|
||||
);
|
||||
|
||||
export const AuthStep: React.FC<AuthStepProps> = ({ privacyHtml, googleProfile, onClearGoogleProfile }) => {
|
||||
const FacebookIcon: React.FC<{ className?: string }> = ({ className }) => (
|
||||
<svg
|
||||
className={className}
|
||||
viewBox="0 0 24 24"
|
||||
aria-hidden="true"
|
||||
focusable="false"
|
||||
>
|
||||
<path
|
||||
fill="#1877F2"
|
||||
d="M24 12.073C24 5.404 18.627 0 12 0S0 5.404 0 12.073C0 18.1 4.388 23.094 10.125 24v-8.437H7.078v-3.49h3.047V9.43c0-3.014 1.792-4.68 4.533-4.68 1.312 0 2.686.236 2.686.236v2.96h-1.513c-1.49 0-1.954.93-1.954 1.887v2.264h3.328l-.532 3.49h-2.796V24C19.612 23.094 24 18.1 24 12.073Z"
|
||||
/>
|
||||
</svg>
|
||||
);
|
||||
|
||||
export const AuthStep: React.FC<AuthStepProps> = ({ privacyHtml, prefill, onClearPrefill }) => {
|
||||
const { t } = useTranslation('marketing');
|
||||
const page = usePage<{ locale?: string }>();
|
||||
const locale = page.props.locale ?? "de";
|
||||
const googleAuth = useMemo<GoogleAuthFlash>(() => {
|
||||
const props = page.props as { googleAuth?: GoogleAuthFlash };
|
||||
const googleAuth = useMemo<OAuthAuthFlash>(() => {
|
||||
const props = page.props as { googleAuth?: OAuthAuthFlash };
|
||||
return props.googleAuth ?? {};
|
||||
}, [page.props]);
|
||||
const facebookAuth = useMemo<OAuthAuthFlash>(() => {
|
||||
const props = page.props as { facebookAuth?: OAuthAuthFlash };
|
||||
return props.facebookAuth ?? {};
|
||||
}, [page.props]);
|
||||
const { isAuthenticated, authUser, setAuthUser, nextStep, selectedPackage } = useCheckoutWizard();
|
||||
const [mode, setMode] = useState<'login' | 'register'>('register');
|
||||
const [isRedirectingToGoogle, setIsRedirectingToGoogle] = useState(false);
|
||||
const [isRedirectingToFacebook, setIsRedirectingToFacebook] = useState(false);
|
||||
const [showGoogleHelper, setShowGoogleHelper] = useState(false);
|
||||
const showGoogleControls = mode === 'register';
|
||||
const showOauthControls = mode === 'register';
|
||||
const authErrorTitle = facebookAuth?.error
|
||||
? t('checkout.auth_step.facebook_error_title')
|
||||
: t('checkout.auth_step.google_error_title');
|
||||
|
||||
useEffect(() => {
|
||||
if (googleAuth?.status === 'signin') {
|
||||
toast.success(t('checkout.auth_step.google_success_toast'));
|
||||
onClearGoogleProfile?.();
|
||||
onClearPrefill?.();
|
||||
}
|
||||
}, [googleAuth?.status, onClearGoogleProfile, t]);
|
||||
}, [googleAuth?.status, onClearPrefill, t]);
|
||||
|
||||
useEffect(() => {
|
||||
if (facebookAuth?.status === 'signin') {
|
||||
toast.success(t('checkout.auth_step.facebook_success_toast'));
|
||||
onClearPrefill?.();
|
||||
}
|
||||
}, [facebookAuth?.status, onClearPrefill, t]);
|
||||
|
||||
useEffect(() => {
|
||||
if (googleAuth?.error) {
|
||||
@@ -61,6 +90,12 @@ export const AuthStep: React.FC<AuthStepProps> = ({ privacyHtml, googleProfile,
|
||||
}
|
||||
}, [googleAuth?.error]);
|
||||
|
||||
useEffect(() => {
|
||||
if (facebookAuth?.error) {
|
||||
toast.error(facebookAuth.error);
|
||||
}
|
||||
}, [facebookAuth?.error]);
|
||||
|
||||
useEffect(() => {
|
||||
if (mode !== 'login') {
|
||||
return;
|
||||
@@ -82,7 +117,7 @@ export const AuthStep: React.FC<AuthStepProps> = ({ privacyHtml, googleProfile,
|
||||
name: payload.name ?? undefined,
|
||||
pending_purchase: Boolean(payload.pending_purchase),
|
||||
});
|
||||
onClearGoogleProfile?.();
|
||||
onClearPrefill?.();
|
||||
nextStep();
|
||||
};
|
||||
|
||||
@@ -97,7 +132,7 @@ export const AuthStep: React.FC<AuthStepProps> = ({ privacyHtml, googleProfile,
|
||||
});
|
||||
}
|
||||
|
||||
onClearGoogleProfile?.();
|
||||
onClearPrefill?.();
|
||||
nextStep();
|
||||
};
|
||||
|
||||
@@ -115,6 +150,20 @@ export const AuthStep: React.FC<AuthStepProps> = ({ privacyHtml, googleProfile,
|
||||
window.location.href = `/checkout/auth/google?${params.toString()}`;
|
||||
}, [locale, selectedPackage, t]);
|
||||
|
||||
const handleFacebookLogin = useCallback(() => {
|
||||
if (!selectedPackage) {
|
||||
toast.error(t('checkout.auth_step.facebook_missing_package'));
|
||||
return;
|
||||
}
|
||||
|
||||
setIsRedirectingToFacebook(true);
|
||||
const params = new URLSearchParams({
|
||||
package_id: String(selectedPackage.id),
|
||||
locale,
|
||||
});
|
||||
window.location.href = `/checkout/auth/facebook?${params.toString()}`;
|
||||
}, [locale, selectedPackage, t]);
|
||||
|
||||
if (isAuthenticated && authUser) {
|
||||
return (
|
||||
<div className="space-y-6">
|
||||
@@ -159,37 +208,52 @@ export const AuthStep: React.FC<AuthStepProps> = ({ privacyHtml, googleProfile,
|
||||
>
|
||||
{t('checkout.auth_step.switch_to_login')}
|
||||
</Button>
|
||||
{showGoogleControls && (
|
||||
<div className="flex flex-1 justify-start gap-2 sm:flex-none">
|
||||
{showOauthControls && (
|
||||
<div className="flex flex-1 flex-wrap items-center gap-2 sm:flex-none">
|
||||
<div className="flex items-center gap-2">
|
||||
<Button
|
||||
variant="outline"
|
||||
onClick={handleGoogleLogin}
|
||||
disabled={isRedirectingToGoogle}
|
||||
className="flex items-center gap-2"
|
||||
>
|
||||
{isRedirectingToGoogle ? (
|
||||
<LoaderCircle className="h-4 w-4 animate-spin" />
|
||||
) : (
|
||||
<GoogleIcon className="h-4 w-4" />
|
||||
)}
|
||||
{t('checkout.auth_step.continue_with_google')}
|
||||
</Button>
|
||||
<CollapsibleTrigger asChild>
|
||||
<button
|
||||
type="button"
|
||||
className={cn(
|
||||
"inline-flex items-center gap-1 rounded-full border border-muted-foreground/30 px-3 py-1 text-xs font-medium text-muted-foreground transition hover:border-muted-foreground/60 hover:text-foreground",
|
||||
showGoogleHelper && "bg-muted/60 text-foreground"
|
||||
)}
|
||||
>
|
||||
{t('checkout.auth_step.google_helper_badge')}
|
||||
<ChevronDown className={cn("h-3 w-3 transition-transform", showGoogleHelper && "rotate-180")} />
|
||||
</button>
|
||||
</CollapsibleTrigger>
|
||||
</div>
|
||||
<Button
|
||||
variant="outline"
|
||||
onClick={handleGoogleLogin}
|
||||
disabled={isRedirectingToGoogle}
|
||||
onClick={handleFacebookLogin}
|
||||
disabled={isRedirectingToFacebook}
|
||||
className="flex items-center gap-2"
|
||||
>
|
||||
{isRedirectingToGoogle ? (
|
||||
{isRedirectingToFacebook ? (
|
||||
<LoaderCircle className="h-4 w-4 animate-spin" />
|
||||
) : (
|
||||
<GoogleIcon className="h-4 w-4" />
|
||||
<FacebookIcon className="h-4 w-4" />
|
||||
)}
|
||||
{t('checkout.auth_step.continue_with_google')}
|
||||
{t('checkout.auth_step.continue_with_facebook')}
|
||||
</Button>
|
||||
<CollapsibleTrigger asChild>
|
||||
<button
|
||||
type="button"
|
||||
className={cn(
|
||||
"inline-flex items-center gap-1 rounded-full border border-muted-foreground/30 px-3 py-1 text-xs font-medium text-muted-foreground transition hover:border-muted-foreground/60 hover:text-foreground",
|
||||
showGoogleHelper && "bg-muted/60 text-foreground"
|
||||
)}
|
||||
>
|
||||
{t('checkout.auth_step.google_helper_badge')}
|
||||
<ChevronDown className={cn("h-3 w-3 transition-transform", showGoogleHelper && "rotate-180")} />
|
||||
</button>
|
||||
</CollapsibleTrigger>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
{showGoogleControls && (
|
||||
{showOauthControls && (
|
||||
<CollapsibleContent>
|
||||
<Alert className="border-dashed border-muted/60 bg-muted/20 text-xs sm:text-sm">
|
||||
<AlertDescription>{t('checkout.auth_step.google_helper')}</AlertDescription>
|
||||
@@ -198,10 +262,10 @@ export const AuthStep: React.FC<AuthStepProps> = ({ privacyHtml, googleProfile,
|
||||
)}
|
||||
</Collapsible>
|
||||
|
||||
{googleAuth?.error && (
|
||||
{(googleAuth?.error || facebookAuth?.error) && (
|
||||
<Alert variant="destructive">
|
||||
<AlertTitle>{t('checkout.auth_step.google_error_title')}</AlertTitle>
|
||||
<AlertDescription>{googleAuth.error}</AlertDescription>
|
||||
<AlertTitle>{authErrorTitle}</AlertTitle>
|
||||
<AlertDescription>{facebookAuth?.error ?? googleAuth?.error}</AlertDescription>
|
||||
</Alert>
|
||||
)}
|
||||
|
||||
@@ -213,8 +277,8 @@ export const AuthStep: React.FC<AuthStepProps> = ({ privacyHtml, googleProfile,
|
||||
privacyHtml={privacyHtml}
|
||||
locale={locale}
|
||||
onSuccess={handleRegisterSuccess}
|
||||
prefill={googleProfile}
|
||||
onClearGoogleProfile={onClearGoogleProfile}
|
||||
prefill={prefill}
|
||||
onClearPrefill={onClearPrefill}
|
||||
/>
|
||||
)
|
||||
) : (
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
export type CheckoutStepId = 'package' | 'auth' | 'payment' | 'confirmation';
|
||||
|
||||
export interface GoogleProfilePrefill {
|
||||
export interface OAuthProfilePrefill {
|
||||
email?: string;
|
||||
name?: string;
|
||||
given_name?: string;
|
||||
|
||||
@@ -61,6 +61,8 @@
|
||||
"oauth_divider": "oder",
|
||||
"google_cta": "Mit Google anmelden",
|
||||
"google_helper": "Nutze dein Google-Konto, um dich sicher bei der Eventverwaltung anzumelden.",
|
||||
"facebook_cta": "Mit Facebook anmelden",
|
||||
"facebook_helper": "Nutze dein Facebook-Konto, um dich sicher bei der Eventverwaltung anzumelden.",
|
||||
"no_account": "Noch keinen Zugang?",
|
||||
"sign_up": "Jetzt registrieren"
|
||||
},
|
||||
|
||||
@@ -61,6 +61,8 @@
|
||||
"oauth_divider": "or",
|
||||
"google_cta": "Continue with Google",
|
||||
"google_helper": "Use your Google account to access the event dashboard securely.",
|
||||
"facebook_cta": "Continue with Facebook",
|
||||
"facebook_helper": "Use your Facebook account to access the event dashboard securely.",
|
||||
"no_account": "Don't have access yet?",
|
||||
"sign_up": "Create an account"
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user