songtianlun/prmbr-image-mksaas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fix localized callback url after login

Browse Source
This commit is contained in:
javayhu 2025-09-02 23:51:29 +08:00
parent 9899e1d164
commit 794c18a7e6
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/auth/login-form.tsx
View File

@ -17,7 +17,7 @@ import { Input } from '@/components/ui/input';
import { websiteConfig } from '@/config/website'; import { websiteConfig } from '@/config/website';
import { LocaleLink } from '@/i18n/navigation'; import { LocaleLink } from '@/i18n/navigation';
import { authClient } from '@/lib/auth-client'; import { authClient } from '@/lib/auth-client';
import { getUrlWithLocaleInCallbackUrl } from '@/lib/urls/urls'; import { getUrlWithLocale } from '@/lib/urls/urls';
import { cn } from '@/lib/utils'; import { cn } from '@/lib/utils';
import { DEFAULT_LOGIN_REDIRECT, Routes } from '@/routes'; import { DEFAULT_LOGIN_REDIRECT, Routes } from '@/routes';
import { zodResolver } from '@hookform/resolvers/zod'; import { zodResolver } from '@hookform/resolvers/zod';
@ -45,10 +45,10 @@ export const LoginForm = ({
const paramCallbackUrl = searchParams.get('callbackUrl'); const paramCallbackUrl = searchParams.get('callbackUrl');
// Use prop callback URL or param callback URL if provided, otherwise use the default login redirect // Use prop callback URL or param callback URL if provided, otherwise use the default login redirect
const locale = useLocale(); const locale = useLocale();
const defaultCallbackUrl = getUrlWithLocaleInCallbackUrl( const defaultCallbackUrl = getUrlWithLocale(DEFAULT_LOGIN_REDIRECT, locale);
DEFAULT_LOGIN_REDIRECT, // console.log('login form, propCallbackUrl', propCallbackUrl);
locale // console.log('login form, paramCallbackUrl', paramCallbackUrl);
); // console.log('login form, defaultCallbackUrl', defaultCallbackUrl);
const callbackUrl = propCallbackUrl || paramCallbackUrl || defaultCallbackUrl; const callbackUrl = propCallbackUrl || paramCallbackUrl || defaultCallbackUrl;
console.log('login form, callbackUrl', callbackUrl); console.log('login form, callbackUrl', callbackUrl);

10
src/components/auth/register-form.tsx
View File

@ -16,7 +16,7 @@ import {
import { Input } from '@/components/ui/input'; import { Input } from '@/components/ui/input';
import { websiteConfig } from '@/config/website'; import { websiteConfig } from '@/config/website';
import { authClient } from '@/lib/auth-client'; import { authClient } from '@/lib/auth-client';
import { getUrlWithLocaleInCallbackUrl } from '@/lib/urls/urls'; import { getUrlWithLocale } from '@/lib/urls/urls';
import { DEFAULT_LOGIN_REDIRECT, Routes } from '@/routes'; import { DEFAULT_LOGIN_REDIRECT, Routes } from '@/routes';
import { zodResolver } from '@hookform/resolvers/zod'; import { zodResolver } from '@hookform/resolvers/zod';
import { EyeIcon, EyeOffIcon, Loader2Icon } from 'lucide-react'; import { EyeIcon, EyeOffIcon, Loader2Icon } from 'lucide-react';
@ -40,10 +40,10 @@ export const RegisterForm = ({
const paramCallbackUrl = searchParams.get('callbackUrl'); const paramCallbackUrl = searchParams.get('callbackUrl');
// Use prop callback URL or param callback URL if provided, otherwise use the default login redirect // Use prop callback URL or param callback URL if provided, otherwise use the default login redirect
const locale = useLocale(); const locale = useLocale();
const defaultCallbackUrl = getUrlWithLocaleInCallbackUrl( const defaultCallbackUrl = getUrlWithLocale(DEFAULT_LOGIN_REDIRECT, locale);
DEFAULT_LOGIN_REDIRECT, // console.log('register form, propCallbackUrl', propCallbackUrl);
locale // console.log('register form, paramCallbackUrl', paramCallbackUrl);
); // console.log('register form, defaultCallbackUrl', defaultCallbackUrl);
const callbackUrl = propCallbackUrl || paramCallbackUrl || defaultCallbackUrl; const callbackUrl = propCallbackUrl || paramCallbackUrl || defaultCallbackUrl;
console.log('register form, callbackUrl', callbackUrl); console.log('register form, callbackUrl', callbackUrl);

7
src/components/auth/social-login-button.tsx
View File

@ -6,7 +6,7 @@ import { GoogleIcon } from '@/components/icons/google';
import { Button } from '@/components/ui/button'; import { Button } from '@/components/ui/button';
import { websiteConfig } from '@/config/website'; import { websiteConfig } from '@/config/website';
import { authClient } from '@/lib/auth-client'; import { authClient } from '@/lib/auth-client';
import { getUrlWithLocaleInCallbackUrl } from '@/lib/urls/urls'; import { getUrlWithLocale } from '@/lib/urls/urls';
import { DEFAULT_LOGIN_REDIRECT, Routes } from '@/routes'; import { DEFAULT_LOGIN_REDIRECT, Routes } from '@/routes';
import { Loader2Icon } from 'lucide-react'; import { Loader2Icon } from 'lucide-react';
import { useLocale, useTranslations } from 'next-intl'; import { useLocale, useTranslations } from 'next-intl';
@ -37,10 +37,7 @@ export const SocialLoginButton = ({
const paramCallbackUrl = searchParams.get('callbackUrl'); const paramCallbackUrl = searchParams.get('callbackUrl');
// Use prop callback URL or param callback URL if provided, otherwise use the default login redirect // Use prop callback URL or param callback URL if provided, otherwise use the default login redirect
const locale = useLocale(); const locale = useLocale();
const defaultCallbackUrl = getUrlWithLocaleInCallbackUrl( const defaultCallbackUrl = getUrlWithLocale(DEFAULT_LOGIN_REDIRECT, locale);
DEFAULT_LOGIN_REDIRECT,
locale
);
const callbackUrl = propCallbackUrl || paramCallbackUrl || defaultCallbackUrl; const callbackUrl = propCallbackUrl || paramCallbackUrl || defaultCallbackUrl;
const [isLoading, setIsLoading] = useState<'google' | 'github' | null>(null); const [isLoading, setIsLoading] = useState<'google' | 'github' | null>(null);
console.log('social login button, callbackUrl', callbackUrl); console.log('social login button, callbackUrl', callbackUrl);

2
src/lib/urls/urls.ts
View File

@ -35,7 +35,7 @@ export function getUrlWithLocale(url: string, locale?: Locale | null): string {
* Input: http://localhost:3000/api/auth/reset-password/token?callbackURL=/auth/reset-password * Input: http://localhost:3000/api/auth/reset-password/token?callbackURL=/auth/reset-password
* Output: http://localhost:3000/api/auth/reset-password/token?callbackURL=/zh/auth/reset-password * Output: http://localhost:3000/api/auth/reset-password/token?callbackURL=/zh/auth/reset-password
* *
* http://localhost:3000/api/auth/verify-email?token=eyJhbGciOiJIUzI1NiJ9&callbackURL=/dashboard * Input: http://localhost:3000/api/auth/verify-email?token=eyJhbGciOiJIUzI1NiJ9&callbackURL=/dashboard
* Output: http://localhost:3000/api/auth/verify-email?token=eyJhbGciOiJIUzI1NiJ9&callbackURL=/zh/dashboard * Output: http://localhost:3000/api/auth/verify-email?token=eyJhbGciOiJIUzI1NiJ9&callbackURL=/zh/dashboard
* *
* @param url - The original URL with callbackURL parameter * @param url - The original URL with callbackURL parameter