fix. line cancel redirect

This commit is contained in:
ukyo 2025-02-06 15:32:09 +08:00
parent c880210f61
commit ffede88eec

View File

@ -42,12 +42,22 @@ public function redirectToProvider(Request $request)
*/ */
public function handleProviderCallback(Request $request) public function handleProviderCallback(Request $request)
{ {
// 如果用户取消了授权
// 从 Session 获取 $redirectTo if ($request->has('error') && $request->get('error') === 'access_denied') {
$redirectTo = session('redirect_to', 'member'); $redirectTo = session('redirect_to', 'member');
if ($redirectTo === 'admin') {
return redirect()->route('admin.login')->with('error', '您已取消 LINE 授权');
} else {
return redirect()->route('login')->with('error', '您已取消 LINE 授权');
}
}
try {
// 获取 LINE 用户信息
$user = Socialite::driver('line')->user(); $user = Socialite::driver('line')->user();
Log::info('line', ['user' => $user]); Log::info('line', ['user' => $user]);
$lineId = $user->getId(); $lineId = $user->getId();
$name = $user->getName(); $name = $user->getName();
$avatar = $user->getAvatar() ?? ''; $avatar = $user->getAvatar() ?? '';
@ -55,9 +65,12 @@ public function handleProviderCallback(Request $request)
Log::info('email', [$email]); Log::info('email', [$email]);
if ($redirectTo == 'admin') { // 从 Session 获取跳转路径
$redirectTo = session('redirect_to', 'member');
if ($redirectTo === 'admin') {
// Admin 登录逻辑 // Admin 登录逻辑
$existingUser = $user = User::where('line_id', $lineId) $existingUser = User::where('line_id', $lineId)
->orWhere('email', $email) ->orWhere('email', $email)
->first(); ->first();
@ -94,7 +107,6 @@ public function handleProviderCallback(Request $request)
'password' => bcrypt(env('DEFAULT_PASSWORD')), 'password' => bcrypt(env('DEFAULT_PASSWORD')),
'source' => 'cafeg', 'source' => 'cafeg',
'avatar' => $avatar, 'avatar' => $avatar,
'email' => $email, 'email' => $email,
]); ]);
Auth::guard('member')->login($newUser); Auth::guard('member')->login($newUser);
@ -105,7 +117,14 @@ public function handleProviderCallback(Request $request)
? redirect()->route('member.index') ? redirect()->route('member.index')
: redirect()->route('member.profile'); : redirect()->route('member.profile');
} }
} catch (\Exception $e) {
Log::error('LINE 登录失败: ' . $e->getMessage());
// 发生异常时,返回登录页面并提示错误
return redirect()->route('login')->with('error', 'LINE 登录失败,请稍后再试');
} }
}
public function adminLogout() public function adminLogout()
{ {