Alexander Musikhin 6 өдөр өмнө
parent
commit
ecc7350584

+ 6 - 2
app/Http/Controllers/Auth/LoginController.php

@@ -60,10 +60,14 @@ class LoginController extends Controller
             if ($request->hasSession()) {
                 $request->session()->put('auth.password_confirmed_at', time());
             }
-            if ($request->session()->has('token_fcm') && auth()->id()) {
-                $token = trim((string)$request->session()->get('token_fcm'));
+            if (auth()->id()) {
+                $tokenFromRequest = trim((string)$request->input('token_fcm', ''));
+                $tokenFromSession = trim((string)$request->session()->get('token_fcm', ''));
+                $token = $tokenFromRequest !== '' ? $tokenFromRequest : $tokenFromSession;
+
                 if ($token !== '') {
                     User::assignUniqueFcmToken((int)auth()->id(), $token);
+                    $request->session()->put('token_fcm', $token);
                 }
             }
             return $this->sendLoginResponse($request);

+ 1 - 1
app/Http/Middleware/CatchTokenFcmMiddleware.php

@@ -16,7 +16,7 @@ class CatchTokenFcmMiddleware
      */
     public function handle(Request $request, Closure $next): Response
     {
-        if (isset($request->app) && isset($request->token_fcm)) {
+        if (isset($request->token_fcm)) {
             $token = trim((string)$request->token_fcm);
 
             if ($token !== '' && auth()->check()) {