mirror of
https://github.com/Bubka/2FAuth.git
synced 2025-08-18 17:38:20 +02:00
Fix user preferences not being applied correctly after sign-in
This commit is contained in:
@@ -94,8 +94,9 @@ class LoginController extends Controller
|
||||
$this->authenticated($request, $this->guard()->user());
|
||||
|
||||
return response()->json([
|
||||
'message' => 'authenticated',
|
||||
'name' => $name,
|
||||
'message' => 'authenticated',
|
||||
'name' => $name,
|
||||
'preferences' => $this->guard()->user()->preferences,
|
||||
], Response::HTTP_OK);
|
||||
}
|
||||
|
||||
@@ -107,7 +108,7 @@ class LoginController extends Controller
|
||||
*/
|
||||
protected function sendFailedLoginResponse(Request $request)
|
||||
{
|
||||
return response()->json(['message' => 'unauthorised'], Response::HTTP_UNAUTHORIZED);
|
||||
return response()->json(['message' => 'unauthorized'], Response::HTTP_UNAUTHORIZED);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -7,6 +7,7 @@ use App\Models\User;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Contracts\Support\Responsable;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Response;
|
||||
use Illuminate\Support\Arr;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Laragear\WebAuthn\Http\Requests\AssertedRequest;
|
||||
@@ -73,12 +74,19 @@ class WebAuthnLoginController extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @var \App\Models\User|null
|
||||
*/
|
||||
$user = $request->login();
|
||||
|
||||
if ($user) {
|
||||
$this->authenticated($user);
|
||||
|
||||
return response()->noContent();
|
||||
return response()->json([
|
||||
'message' => 'authenticated',
|
||||
'name' => $user->name,
|
||||
'preferences' => $user->preferences,
|
||||
], Response::HTTP_OK);
|
||||
}
|
||||
|
||||
return response()->noContent(422);
|
||||
|
Reference in New Issue
Block a user