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