Remove .env.local file and update middleware, page, and auth callback files to enhance logging and user experience. Translate comments and console logs to English for better clarity. Refactor Create Short URL form and Debug page for improved user feedback and error handling.
This commit is contained in:
@@ -9,38 +9,38 @@ export async function GET(request: NextRequest) {
|
||||
|
||||
console.log('Auth callback received:', { url: request.url, hasCode: !!code });
|
||||
|
||||
// 如果没有code参数,则重定向到登录页面
|
||||
// If no code parameter found, redirect to login page
|
||||
if (!code) {
|
||||
console.log('没有找到code参数,重定向到登录页面');
|
||||
console.log('No code parameter found, redirecting to login page');
|
||||
return NextResponse.redirect(new URL('/login', request.url));
|
||||
}
|
||||
|
||||
try {
|
||||
// 创建supabase客户端
|
||||
// Create Supabase client
|
||||
const cookieStore = cookies();
|
||||
const supabaseRouteHandler = createRouteHandlerClient({ cookies: () => cookieStore });
|
||||
|
||||
// 交换code获取会话
|
||||
console.log('开始交换code获取会话');
|
||||
// Exchange code for session
|
||||
console.log('Starting code exchange for session');
|
||||
const { data, error } = await supabaseRouteHandler.auth.exchangeCodeForSession(code);
|
||||
|
||||
if (error) {
|
||||
console.error('交换会话时出错:', error);
|
||||
console.error('Error exchanging code for session:', error);
|
||||
throw error;
|
||||
}
|
||||
|
||||
console.log('成功获取会话,用户:', data.session?.user.email);
|
||||
console.log('Successfully retrieved session, user:', data.session?.user.email);
|
||||
|
||||
// 检查会话是否成功创建
|
||||
// Check if session was successfully created
|
||||
if (data.session) {
|
||||
console.log('会话创建成功:', {
|
||||
console.log('Session created successfully:', {
|
||||
userId: data.session.user.id,
|
||||
email: data.session.user.email,
|
||||
expiresAt: data.session.expires_at ? new Date(data.session.expires_at * 1000).toISOString() : 'unknown'
|
||||
});
|
||||
|
||||
// 设置额外的cookie以确保客户端能检测到登录状态
|
||||
// 使用Next.js的Response来设置cookie
|
||||
// Set additional cookie to ensure client can detect login status
|
||||
// Use Next.js Response to set cookie
|
||||
const response = NextResponse.redirect(new URL('/', request.url));
|
||||
response.cookies.set({
|
||||
name: 'sb-auth-token',
|
||||
@@ -51,16 +51,16 @@ export async function GET(request: NextRequest) {
|
||||
secure: process.env.NODE_ENV === 'production',
|
||||
httpOnly: false,
|
||||
});
|
||||
console.log('设置了备用cookie: sb-auth-token');
|
||||
console.log('Set backup cookie: sb-auth-token');
|
||||
return response;
|
||||
}
|
||||
|
||||
// 优先使用应用程序根路径重定向
|
||||
console.log('重定向到首页');
|
||||
// Redirect to home page by default
|
||||
console.log('Redirecting to home page');
|
||||
return NextResponse.redirect(new URL('/', request.url));
|
||||
} catch (error) {
|
||||
console.error('Auth callback error:', error);
|
||||
// 出错时重定向到登录页面
|
||||
// Redirect to login page on error
|
||||
return NextResponse.redirect(
|
||||
new URL('/login?message=Authentication failed. Please try again.', request.url)
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user