|
|
@@ -20,7 +20,9 @@ class LoginController extends Controller
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
- use AuthenticatesUsers;
|
|
|
+ use AuthenticatesUsers {
|
|
|
+ logout as traitLogout;
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
|
* Where to redirect users after login.
|
|
|
@@ -58,10 +60,11 @@ class LoginController extends Controller
|
|
|
if ($request->hasSession()) {
|
|
|
$request->session()->put('auth.password_confirmed_at', time());
|
|
|
}
|
|
|
- if($request->session()->has('token_fcm')) {
|
|
|
- User::query()
|
|
|
- ->where('email', $request->email)
|
|
|
- ->update(['token_fcm' => $request->session()->get('token_fcm')]);
|
|
|
+ if ($request->session()->has('token_fcm') && auth()->id()) {
|
|
|
+ $token = trim((string)$request->session()->get('token_fcm'));
|
|
|
+ if ($token !== '') {
|
|
|
+ User::assignUniqueFcmToken((int)auth()->id(), $token);
|
|
|
+ }
|
|
|
}
|
|
|
return $this->sendLoginResponse($request);
|
|
|
}
|
|
|
@@ -74,5 +77,13 @@ class LoginController extends Controller
|
|
|
return $this->sendFailedLoginResponse($request);
|
|
|
}
|
|
|
|
|
|
+ public function logout(Request $request)
|
|
|
+ {
|
|
|
+ if ($request->user()) {
|
|
|
+ User::clearFcmToken((int)$request->user()->id);
|
|
|
+ }
|
|
|
+
|
|
|
+ return $this->traitLogout($request);
|
|
|
+ }
|
|
|
|
|
|
}
|