mirror of
https://github.com/Bubka/2FAuth.git
synced 2025-08-09 21:57:47 +02:00
Apply Laravel Pint fixes
This commit is contained in:
@ -2,9 +2,9 @@
|
||||
|
||||
namespace App\Http\Controllers\Auth;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class ForgotPasswordController extends Controller
|
||||
{
|
||||
@ -21,7 +21,6 @@ class ForgotPasswordController extends Controller
|
||||
|
||||
use SendsPasswordResetEmails;
|
||||
|
||||
|
||||
/**
|
||||
* Validate the email for the given request.
|
||||
*
|
||||
|
@ -2,17 +2,16 @@
|
||||
|
||||
namespace App\Http\Controllers\Auth;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\LoginRequest;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Foundation\Auth\AuthenticatesUsers;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Response;
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\Lang;
|
||||
use App\Http\Requests\LoginRequest;
|
||||
use Illuminate\Foundation\Auth\AuthenticatesUsers;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
|
||||
class LoginController extends Controller
|
||||
{
|
||||
/*
|
||||
@ -28,7 +27,6 @@ class LoginController extends Controller
|
||||
|
||||
use AuthenticatesUsers;
|
||||
|
||||
|
||||
/**
|
||||
* Handle a login request to the application.
|
||||
*
|
||||
@ -65,10 +63,10 @@ class LoginController extends Controller
|
||||
return $this->sendFailedLoginResponse($request);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* log out current user
|
||||
* @param Request $request
|
||||
*
|
||||
* @param Request $request
|
||||
* @return \Illuminate\Http\JsonResponse
|
||||
*/
|
||||
public function logout(Request $request)
|
||||
@ -79,7 +77,6 @@ class LoginController extends Controller
|
||||
return response()->json(['message' => 'signed out'], Response::HTTP_OK);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Send the response after the user was authenticated.
|
||||
*
|
||||
@ -96,11 +93,10 @@ class LoginController extends Controller
|
||||
|
||||
return response()->json([
|
||||
'message' => 'authenticated',
|
||||
'name' => $name
|
||||
'name' => $name,
|
||||
], Response::HTTP_OK);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get the failed login response instance.
|
||||
*
|
||||
@ -111,7 +107,6 @@ class LoginController extends Controller
|
||||
{
|
||||
return response()->json(['message' => 'unauthorised'], Response::HTTP_UNAUTHORIZED);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Redirect the user after determining they are locked out.
|
||||
@ -128,7 +123,6 @@ class LoginController extends Controller
|
||||
return response()->json(['message' => Lang::get('auth.throttle', ['seconds' => $seconds])], Response::HTTP_TOO_MANY_REQUESTS);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get the needed authorization credentials from the request.
|
||||
*
|
||||
@ -139,13 +133,12 @@ class LoginController extends Controller
|
||||
{
|
||||
$credentials = [
|
||||
$this->username() => strtolower($request->input($this->username())),
|
||||
'password' => $request->get('password'),
|
||||
'password' => $request->get('password'),
|
||||
];
|
||||
|
||||
return $credentials;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* The user has been authenticated.
|
||||
*
|
||||
@ -160,4 +153,4 @@ class LoginController extends Controller
|
||||
|
||||
Log::info('User authenticated');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
namespace App\Http\Controllers\Auth;
|
||||
|
||||
use App\Http\Requests\UserPatchPwdRequest;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\UserPatchPwdRequest;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
@ -13,19 +13,20 @@ class PasswordController extends Controller
|
||||
/**
|
||||
* Update the user's password.
|
||||
*
|
||||
* @param \App\Http\Requests\UserPatchPwdRequest $request
|
||||
* @param \App\Http\Requests\UserPatchPwdRequest $request
|
||||
* @return \Illuminate\Http\JsonResponse
|
||||
*/
|
||||
public function update(UserPatchPwdRequest $request)
|
||||
{
|
||||
$validated = $request->validated();
|
||||
|
||||
if (!Hash::check( $validated['currentPassword'], Auth::user()->password) ) {
|
||||
if (! Hash::check($validated['currentPassword'], Auth::user()->password)) {
|
||||
Log::notice('Password update failed: wrong password provided');
|
||||
|
||||
return response()->json(['message' => __('errors.wrong_current_password')], 400);
|
||||
}
|
||||
|
||||
if (!config('2fauth.config.isDemoApp') ) {
|
||||
if (! config('2fauth.config.isDemoApp')) {
|
||||
$request->user()->update([
|
||||
'password' => bcrypt($validated['password']),
|
||||
]);
|
||||
@ -34,4 +35,4 @@ class PasswordController extends Controller
|
||||
|
||||
return response()->json(['message' => __('auth.forms.password_successfully_changed')]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -2,12 +2,12 @@
|
||||
|
||||
namespace App\Http\Controllers\Auth;
|
||||
|
||||
use App\Models\User;
|
||||
use App\Http\Requests\UserStoreRequest;
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use App\Http\Requests\UserStoreRequest;
|
||||
use App\Models\User;
|
||||
use Illuminate\Auth\Events\Registered;
|
||||
use Illuminate\Foundation\Auth\RegistersUsers;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
class RegisterController extends Controller
|
||||
@ -25,7 +25,6 @@ class RegisterController extends Controller
|
||||
|
||||
use RegistersUsers;
|
||||
|
||||
|
||||
/**
|
||||
* Handle a registration request for the application.
|
||||
*
|
||||
@ -42,11 +41,10 @@ class RegisterController extends Controller
|
||||
|
||||
return response()->json([
|
||||
'message' => 'account created',
|
||||
'name' => $user->name,
|
||||
'name' => $user->name,
|
||||
], 201);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Create a new user instance after a valid registration.
|
||||
*
|
||||
@ -56,8 +54,8 @@ class RegisterController extends Controller
|
||||
protected function create(array $data)
|
||||
{
|
||||
return User::create([
|
||||
'name' => $data['name'],
|
||||
'email' => $data['email'],
|
||||
'name' => $data['name'],
|
||||
'email' => $data['email'],
|
||||
'password' => Hash::make($data['password']),
|
||||
]);
|
||||
}
|
||||
|
@ -19,5 +19,4 @@ class ResetPasswordController extends Controller
|
||||
*/
|
||||
|
||||
use ResetsPasswords;
|
||||
|
||||
}
|
||||
|
@ -2,37 +2,38 @@
|
||||
|
||||
namespace App\Http\Controllers\Auth;
|
||||
|
||||
use App\Http\Requests\UserUpdateRequest;
|
||||
use App\Http\Requests\UserDeleteRequest;
|
||||
use App\Api\v1\Resources\UserResource;
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use App\Http\Requests\UserDeleteRequest;
|
||||
use App\Http\Requests\UserUpdateRequest;
|
||||
use Illuminate\Support\Facades\Artisan;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
class UserController extends Controller
|
||||
{
|
||||
{
|
||||
/**
|
||||
* Update the user's profile information.
|
||||
*
|
||||
* @param \App\Http\Requests\UserUpdateRequest $request
|
||||
* @param \App\Http\Requests\UserUpdateRequest $request
|
||||
* @return \App\Api\v1\Resources\UserResource|\Illuminate\Http\JsonResponse
|
||||
*/
|
||||
public function update(UserUpdateRequest $request)
|
||||
{
|
||||
$user = $request->user();
|
||||
$user = $request->user();
|
||||
$validated = $request->validated();
|
||||
|
||||
if (!Hash::check( $request->password, Auth::user()->password) ) {
|
||||
if (! Hash::check($request->password, Auth::user()->password)) {
|
||||
Log::notice('Account update failed: wrong password provided');
|
||||
|
||||
return response()->json(['message' => __('errors.wrong_current_password')], 400);
|
||||
}
|
||||
|
||||
if (!config('2fauth.config.isDemoApp') ) {
|
||||
if (! config('2fauth.config.isDemoApp')) {
|
||||
$user->update([
|
||||
'name' => $validated['name'],
|
||||
'name' => $validated['name'],
|
||||
'email' => $validated['email'],
|
||||
]);
|
||||
}
|
||||
@ -41,11 +42,10 @@ class UserController extends Controller
|
||||
return new UserResource($user);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Delete the user's account.
|
||||
*
|
||||
* @param \App\Http\Requests\UserDeleteRequest $request
|
||||
* @param \App\Http\Requests\UserDeleteRequest $request
|
||||
* @return \Illuminate\Http\JsonResponse
|
||||
*/
|
||||
public function delete(UserDeleteRequest $request)
|
||||
@ -53,7 +53,7 @@ class UserController extends Controller
|
||||
Log::info('User deletion requested');
|
||||
$validated = $request->validated();
|
||||
|
||||
if (!Hash::check( $validated['password'], Auth::user()->password) ) {
|
||||
if (! Hash::check($validated['password'], Auth::user()->password)) {
|
||||
return response()->json(['message' => __('errors.wrong_current_password')], 400);
|
||||
}
|
||||
|
||||
@ -79,6 +79,7 @@ class UserController extends Controller
|
||||
// @codeCoverageIgnoreStart
|
||||
catch (\Throwable $e) {
|
||||
Log::error('User deletion failed');
|
||||
|
||||
return response()->json(['message' => __('errors.user_deletion_failed')], 400);
|
||||
}
|
||||
// @codeCoverageIgnoreEnd
|
||||
@ -86,4 +87,4 @@ class UserController extends Controller
|
||||
|
||||
return response()->json(null, 204);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -27,4 +27,4 @@
|
||||
// * @var string
|
||||
// */
|
||||
// protected $redirectTo = RouteServiceProvider::HOME;
|
||||
// }
|
||||
// }
|
||||
|
@ -2,26 +2,25 @@
|
||||
|
||||
namespace App\Http\Controllers\Auth;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
use App\Extensions\WebauthnCredentialBroker;
|
||||
use Illuminate\Foundation\Auth\ResetsPasswords;
|
||||
use Illuminate\Support\Facades\Password;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\WebauthnDeviceLostRequest;
|
||||
use Illuminate\Foundation\Auth\ResetsPasswords;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Password;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
|
||||
class WebAuthnDeviceLostController extends Controller
|
||||
{
|
||||
use ResetsPasswords;
|
||||
|
||||
|
||||
/**
|
||||
* Send a recovery email to the user.
|
||||
*
|
||||
* @param \App\Http\Requests\WebauthnDeviceLostRequest $request
|
||||
* @param \App\Http\Requests\WebauthnDeviceLostRequest $request
|
||||
* @param \App\Extensions\WebauthnCredentialBroker $broker
|
||||
*
|
||||
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
|
||||
*
|
||||
* @throws \Illuminate\Validation\ValidationException
|
||||
*/
|
||||
public function sendRecoveryEmail(WebauthnDeviceLostRequest $request, WebauthnCredentialBroker $broker)
|
||||
@ -35,14 +34,13 @@ class WebAuthnDeviceLostController extends Controller
|
||||
: $this->sendRecoveryLinkFailedResponse($request, $response);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get the response for a failed account recovery link.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param string $response
|
||||
*
|
||||
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
|
||||
*
|
||||
* @throws \Illuminate\Validation\ValidationException
|
||||
*/
|
||||
protected function sendRecoveryLinkFailedResponse(Request $request, string $response)
|
||||
@ -56,17 +54,15 @@ class WebAuthnDeviceLostController extends Controller
|
||||
->withErrors(['email' => trans($response)]);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get the response for a successful account recovery link.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param string $response
|
||||
*
|
||||
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
|
||||
*/
|
||||
protected function sendRecoveryLinkResponse(Request $request, string $response)
|
||||
{
|
||||
return response()->json(['message' => __('auth.webauthn.account_recovery_email_sent')]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -2,14 +2,14 @@
|
||||
|
||||
namespace App\Http\Controllers\Auth;
|
||||
|
||||
use App\Models\User;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\User;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Laragear\WebAuthn\Http\Requests\AssertionRequest;
|
||||
use Laragear\WebAuthn\Http\Requests\AssertedRequest;
|
||||
use Illuminate\Contracts\Support\Responsable;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Laragear\WebAuthn\Http\Requests\AssertedRequest;
|
||||
use Laragear\WebAuthn\Http\Requests\AssertionRequest;
|
||||
use Laragear\WebAuthn\WebAuthn;
|
||||
|
||||
class WebAuthnLoginController extends Controller
|
||||
@ -31,13 +31,13 @@ class WebAuthnLoginController extends Controller
|
||||
* @param \Laragear\WebAuthn\Http\Requests\AssertionRequest $request
|
||||
* @return \Illuminate\Contracts\Support\Responsable|\Illuminate\Http\JsonResponse
|
||||
*/
|
||||
public function options(AssertionRequest $request): Responsable|JsonResponse
|
||||
public function options(AssertionRequest $request) : Responsable|JsonResponse
|
||||
{
|
||||
switch (env('WEBAUTHN_USER_VERIFICATION')) {
|
||||
case WebAuthn::USER_VERIFICATION_DISCOURAGED:
|
||||
$request = $request->fastLogin(); // Makes the authenticator to only check for user presence on registration
|
||||
break;
|
||||
case WebAuthn::USER_VERIFICATION_REQUIRED:
|
||||
case WebAuthn::USER_VERIFICATION_REQUIRED:
|
||||
$request = $request->secureLogin(); // Makes the authenticator to always verify the user thoroughly on registration
|
||||
break;
|
||||
}
|
||||
@ -50,10 +50,9 @@ class WebAuthnLoginController extends Controller
|
||||
return $user
|
||||
? $request->toVerify($user)
|
||||
: response()->json([
|
||||
'message' => 'no registered user'
|
||||
'message' => 'no registered user',
|
||||
], 400);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Log the user in.
|
||||
@ -70,28 +69,27 @@ class WebAuthnLoginController extends Controller
|
||||
|
||||
// Some authenticators do not send a userHandle so we hack the response to be compliant
|
||||
// with Larapass/webauthn-lib implementation that waits for a userHandle
|
||||
if(!$response['userHandle']) {
|
||||
if (! $response['userHandle']) {
|
||||
$response['userHandle'] = User::getFromCredentialId($request->id)?->userHandle();
|
||||
$request->merge(['response' => $response]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$user = $request->login();
|
||||
|
||||
if ($user) {
|
||||
$this->authenticated($user);
|
||||
|
||||
return response()->noContent();
|
||||
}
|
||||
|
||||
return response()->noContent(422);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* The user has been authenticated.
|
||||
*
|
||||
* @param mixed $user
|
||||
*
|
||||
* @return void|\Illuminate\Http\JsonResponse
|
||||
*/
|
||||
protected function authenticated($user)
|
||||
@ -101,4 +99,4 @@ class WebAuthnLoginController extends Controller
|
||||
|
||||
Log::info('User authenticated via webauthn');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -4,16 +4,15 @@ namespace App\Http\Controllers\Auth;
|
||||
|
||||
use App\Facades\Settings;
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Http\Request;
|
||||
use App\Http\Requests\WebauthnRenameRequest;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
class WebAuthnManageController extends Controller
|
||||
{
|
||||
|
||||
{
|
||||
/**
|
||||
* List all WebAuthn registered credentials
|
||||
*
|
||||
*
|
||||
* @return \Illuminate\Http\JsonResponse
|
||||
*/
|
||||
public function index(Request $request)
|
||||
@ -23,12 +22,11 @@ class WebAuthnManageController extends Controller
|
||||
return response()->json($allUserCredentials, 200);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Rename a WebAuthn credential
|
||||
*
|
||||
* @param \App\Http\Requests\WebauthnRenameRequest $request
|
||||
* @param string $credential
|
||||
*
|
||||
* @param \App\Http\Requests\WebauthnRenameRequest $request
|
||||
* @param string $credential
|
||||
* @return \Illuminate\Http\JsonResponse
|
||||
*/
|
||||
public function rename(WebauthnRenameRequest $request, string $credential)
|
||||
@ -38,17 +36,15 @@ class WebAuthnManageController extends Controller
|
||||
abort_if(! $request->user()->renameCredential($credential, $validated['name']), 404);
|
||||
|
||||
return response()->json([
|
||||
'name' => $validated['name'],
|
||||
], 200);
|
||||
'name' => $validated['name'],
|
||||
], 200);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Remove the specified credential from storage.
|
||||
*
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param string|array $credential
|
||||
*
|
||||
* @return \Illuminate\Http\JsonResponse
|
||||
*/
|
||||
public function delete(Request $request, $credential)
|
||||
@ -71,4 +67,4 @@ class WebAuthnManageController extends Controller
|
||||
|
||||
return response()->json(null, 204);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -2,22 +2,21 @@
|
||||
|
||||
namespace App\Http\Controllers\Auth;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\WebauthnRecoveryRequest;
|
||||
use App\Extensions\WebauthnCredentialBroker;
|
||||
use App\Facades\Settings;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\WebauthnRecoveryRequest;
|
||||
use Illuminate\Auth\AuthenticationException;
|
||||
use Illuminate\Foundation\Auth\ResetsPasswords;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Foundation\Auth\ResetsPasswords;
|
||||
use Illuminate\Support\Facades\Password;
|
||||
use Illuminate\Support\Facades\App;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
|
||||
class WebAuthnRecoveryController extends Controller
|
||||
{
|
||||
use ResetsPasswords;
|
||||
use ResetsPasswords;
|
||||
|
||||
/**
|
||||
* Let the user regain access to his account using email+password by resetting
|
||||
@ -25,8 +24,8 @@ class WebAuthnRecoveryController extends Controller
|
||||
*
|
||||
* @param \App\Http\Requests\WebauthnRecoveryRequest $request
|
||||
* @param \App\Extensions\WebauthnCredentialBroker $broker
|
||||
*
|
||||
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
|
||||
*
|
||||
* @throws \Illuminate\Validation\ValidationException
|
||||
*/
|
||||
public function recover(WebauthnRecoveryRequest $request, WebauthnCredentialBroker $broker)
|
||||
@ -54,66 +53,57 @@ class WebAuthnRecoveryController extends Controller
|
||||
$user->flushCredentials();
|
||||
}
|
||||
Settings::delete('useWebauthnOnly');
|
||||
} else {
|
||||
throw new AuthenticationException();
|
||||
}
|
||||
else throw new AuthenticationException();
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
return $response === Password::PASSWORD_RESET
|
||||
? $this->sendRecoveryResponse($request, $response)
|
||||
: $this->sendRecoveryFailedResponse($request, $response);
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Check if the user has set to revoke all credentials.
|
||||
*
|
||||
* @param \App\Http\Requests\WebauthnRecoveryRequest $request
|
||||
*
|
||||
* @return bool|mixed
|
||||
*/
|
||||
protected function shouldRevokeAllCredentials(WebauthnRecoveryRequest $request): mixed
|
||||
protected function shouldRevokeAllCredentials(WebauthnRecoveryRequest $request) : mixed
|
||||
{
|
||||
return filter_var($request->header('WebAuthn-Unique'), FILTER_VALIDATE_BOOLEAN)
|
||||
?: $request->input('revokeAll', true);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get the response for a successful account recovery.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param string $response
|
||||
*
|
||||
* @return \Illuminate\Http\JsonResponse
|
||||
*
|
||||
*/
|
||||
protected function sendRecoveryResponse(Request $request, string $response): JsonResponse
|
||||
protected function sendRecoveryResponse(Request $request, string $response) : JsonResponse
|
||||
{
|
||||
return response()->json(['message' => __('auth.webauthn.webauthn_login_disabled')]);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get the response for a failed account recovery.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param string $response
|
||||
*
|
||||
* @return \Illuminate\Http\JsonResponse
|
||||
*
|
||||
* @throws \Illuminate\Validation\ValidationException
|
||||
*
|
||||
*/
|
||||
protected function sendRecoveryFailedResponse(Request $request, string $response): JsonResponse
|
||||
protected function sendRecoveryFailedResponse(Request $request, string $response) : JsonResponse
|
||||
{
|
||||
switch ($response) {
|
||||
case Password::INVALID_TOKEN:
|
||||
throw ValidationException::withMessages(['token' => [__('auth.webauthn.invalid_reset_token')]]);
|
||||
|
||||
default:
|
||||
throw ValidationException::withMessages(['email' => [trans($response)]]);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -17,13 +17,13 @@ class WebAuthnRegisterController extends Controller
|
||||
* @param \Laragear\WebAuthn\Http\Requests\AttestationRequest $request
|
||||
* @return \Illuminate\Contracts\Support\Responsable
|
||||
*/
|
||||
public function options(AttestationRequest $request): Responsable
|
||||
public function options(AttestationRequest $request) : Responsable
|
||||
{
|
||||
switch (env('WEBAUTHN_USER_VERIFICATION')) {
|
||||
case WebAuthn::USER_VERIFICATION_DISCOURAGED:
|
||||
$request = $request->fastRegistration(); // Makes the authenticator to only check for user presence on registration
|
||||
break;
|
||||
case WebAuthn::USER_VERIFICATION_REQUIRED:
|
||||
case WebAuthn::USER_VERIFICATION_REQUIRED:
|
||||
$request = $request->secureRegistration(); // Makes the authenticator to always verify the user thoroughly on registration
|
||||
break;
|
||||
}
|
||||
@ -34,17 +34,16 @@ class WebAuthnRegisterController extends Controller
|
||||
->toCreate();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Registers a device for further WebAuthn authentication.
|
||||
*
|
||||
* @param \Laragear\WebAuthn\Http\Requests\AttestedRequest $request
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function register(AttestedRequest $request): Response
|
||||
public function register(AttestedRequest $request) : Response
|
||||
{
|
||||
$request->save();
|
||||
|
||||
return response()->noContent();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -2,10 +2,10 @@
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use Illuminate\Foundation\Bus\DispatchesJobs;
|
||||
use Illuminate\Routing\Controller as BaseController;
|
||||
use Illuminate\Foundation\Validation\ValidatesRequests;
|
||||
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
|
||||
use Illuminate\Foundation\Bus\DispatchesJobs;
|
||||
use Illuminate\Foundation\Validation\ValidatesRequests;
|
||||
use Illuminate\Routing\Controller as BaseController;
|
||||
|
||||
class Controller extends BaseController
|
||||
{
|
||||
|
@ -2,16 +2,15 @@
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Events\ScanForNewReleaseCalled;
|
||||
use App\Facades\Settings;
|
||||
use Illuminate\Support\Facades\App;
|
||||
use App\Events\ScanForNewReleaseCalled;
|
||||
|
||||
class SinglePageController extends Controller
|
||||
{
|
||||
|
||||
|
||||
/**
|
||||
* return the main view
|
||||
*
|
||||
* @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory
|
||||
*/
|
||||
public function index()
|
||||
@ -20,14 +19,14 @@ class SinglePageController extends Controller
|
||||
|
||||
return view('landing')->with([
|
||||
'appSettings' => Settings::all()->toJson(),
|
||||
'appConfig' => collect([
|
||||
'proxyAuth' => config("auth.defaults.guard") === 'reverse-proxy-guard' ? true : false,
|
||||
'proxyLogoutUrl' => config("2fauth.config.proxyLogoutUrl") ? config("2fauth.config.proxyLogoutUrl") : false,
|
||||
'appConfig' => collect([
|
||||
'proxyAuth' => config('auth.defaults.guard') === 'reverse-proxy-guard' ? true : false,
|
||||
'proxyLogoutUrl' => config('2fauth.config.proxyLogoutUrl') ? config('2fauth.config.proxyLogoutUrl') : false,
|
||||
])->toJson(),
|
||||
'lang' => App::currentLocale(),
|
||||
'isDemoApp' => config("2fauth.config.isDemoApp") ? 'true' : 'false',
|
||||
'isTestingApp' => config("2fauth.config.isTestingApp") ? 'true' : 'false',
|
||||
'locales' => collect(config("2fauth.locales"))->toJson() /** @phpstan-ignore-line */
|
||||
'lang' => App::currentLocale(),
|
||||
'isDemoApp' => config('2fauth.config.isDemoApp') ? 'true' : 'false',
|
||||
'isTestingApp' => config('2fauth.config.isTestingApp') ? 'true' : 'false',
|
||||
'locales' => collect(config('2fauth.locales'))->toJson(), /** @phpstan-ignore-line */
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
@ -2,9 +2,8 @@
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Services\ReleaseRadarService;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Facades\Settings;
|
||||
use App\Services\ReleaseRadarService;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
@ -12,35 +11,35 @@ class SystemController extends Controller
|
||||
{
|
||||
/**
|
||||
* Get detailed information about the current installation
|
||||
*
|
||||
*
|
||||
* @return \Illuminate\Http\JsonResponse
|
||||
*/
|
||||
public function infos(Request $request)
|
||||
{
|
||||
$infos = array();
|
||||
$infos['Date'] = date(DATE_RFC2822);
|
||||
$infos['userAgent'] = $request->header('user-agent');
|
||||
$infos = [];
|
||||
$infos['Date'] = date(DATE_RFC2822);
|
||||
$infos['userAgent'] = $request->header('user-agent');
|
||||
// App info
|
||||
$infos['Version'] = config('2fauth.version');
|
||||
$infos['Environment'] = config('app.env');
|
||||
$infos['Debug'] = var_export(config('app.debug'), true);
|
||||
$infos['Cache driver'] = config('cache.default');
|
||||
$infos['Log channel'] = config('logging.default');
|
||||
$infos['Log level'] = env('LOG_LEVEL');
|
||||
$infos['DB driver'] = DB::getDriverName();
|
||||
$infos['Version'] = config('2fauth.version');
|
||||
$infos['Environment'] = config('app.env');
|
||||
$infos['Debug'] = var_export(config('app.debug'), true);
|
||||
$infos['Cache driver'] = config('cache.default');
|
||||
$infos['Log channel'] = config('logging.default');
|
||||
$infos['Log level'] = env('LOG_LEVEL');
|
||||
$infos['DB driver'] = DB::getDriverName();
|
||||
// PHP info
|
||||
$infos['PHP version'] = PHP_VERSION;
|
||||
$infos['Operating system'] = PHP_OS;
|
||||
$infos['interface'] = PHP_SAPI;
|
||||
$infos['PHP version'] = PHP_VERSION;
|
||||
$infos['Operating system'] = PHP_OS;
|
||||
$infos['interface'] = PHP_SAPI;
|
||||
// Auth info
|
||||
if ($request->user()) {
|
||||
$infos['Auth guard'] = config('auth.defaults.guard');
|
||||
$infos['Auth guard'] = config('auth.defaults.guard');
|
||||
if ($infos['Auth guard'] === 'reverse-proxy-guard') {
|
||||
$infos['Auth proxy header for user'] = config('auth.auth_proxy_headers.user');
|
||||
$infos['Auth proxy header for user'] = config('auth.auth_proxy_headers.user');
|
||||
$infos['Auth proxy header for email'] = config('auth.auth_proxy_headers.email');
|
||||
}
|
||||
$infos['webauthn user verification'] = config('larapass.login_verify');
|
||||
$infos['Trusted proxies'] = config('2fauth.trustedProxies') ?: 'none';
|
||||
$infos['Trusted proxies'] = config('2fauth.trustedProxies') ?: 'none';
|
||||
}
|
||||
// User info
|
||||
if ($request->user()) {
|
||||
@ -50,10 +49,9 @@ class SystemController extends Controller
|
||||
return response()->json($infos);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get latest release
|
||||
*
|
||||
*
|
||||
* @return \Illuminate\Http\JsonResponse
|
||||
*/
|
||||
public function latestRelease(Request $request, ReleaseRadarService $releaseRadar)
|
||||
|
Reference in New Issue
Block a user