mirror of
https://github.com/Bubka/2FAuth.git
synced 2025-08-17 00:51:04 +02:00
Apply Laravel Pint fixes
This commit is contained in:
@ -2,26 +2,25 @@
|
||||
|
||||
namespace App\Api\v1\Controllers;
|
||||
|
||||
use App\Models\TwoFAccount;
|
||||
use App\Api\v1\Requests\TwoFAccountBatchRequest;
|
||||
use App\Api\v1\Requests\TwoFAccountDynamicRequest;
|
||||
use App\Api\v1\Requests\TwoFAccountImportRequest;
|
||||
use App\Api\v1\Requests\TwoFAccountReorderRequest;
|
||||
use App\Api\v1\Requests\TwoFAccountStoreRequest;
|
||||
use App\Api\v1\Requests\TwoFAccountUpdateRequest;
|
||||
use App\Api\v1\Requests\TwoFAccountImportRequest;
|
||||
use App\Api\v1\Requests\TwoFAccountBatchRequest;
|
||||
use App\Api\v1\Requests\TwoFAccountUriRequest;
|
||||
use App\Api\v1\Requests\TwoFAccountDynamicRequest;
|
||||
use App\Api\v1\Resources\TwoFAccountCollection;
|
||||
use App\Api\v1\Resources\TwoFAccountReadResource;
|
||||
use App\Api\v1\Resources\TwoFAccountStoreResource;
|
||||
use App\Facades\Groups;
|
||||
use App\Facades\TwoFAccounts;
|
||||
use Illuminate\Support\Arr;
|
||||
use Illuminate\Http\Request;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\TwoFAccount;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Arr;
|
||||
|
||||
class TwoFAccountController extends Controller
|
||||
{
|
||||
|
||||
/**
|
||||
* List all resources
|
||||
*
|
||||
@ -32,12 +31,10 @@ class TwoFAccountController extends Controller
|
||||
return new TwoFAccountCollection(TwoFAccount::ordered()->get());
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Display a 2FA account
|
||||
*
|
||||
* @param \App\Models\TwoFAccount $twofaccount
|
||||
*
|
||||
* @return \App\Api\v1\Resources\TwoFAccountReadResource
|
||||
*/
|
||||
public function show(TwoFAccount $twofaccount)
|
||||
@ -45,7 +42,6 @@ class TwoFAccountController extends Controller
|
||||
return new TwoFAccountReadResource($twofaccount);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Store a new 2FA account
|
||||
*
|
||||
@ -60,13 +56,12 @@ class TwoFAccountController extends Controller
|
||||
// - The advanced form has been used and all individual parameters
|
||||
// -> We use the parameters array to define the account
|
||||
|
||||
$validated = $request->validated();
|
||||
$validated = $request->validated();
|
||||
$twofaccount = new TwoFAccount;
|
||||
|
||||
if (Arr::has($validated, 'uri')) {
|
||||
$twofaccount->fillWithURI($validated['uri'], Arr::get($validated, 'custom_otp') === TwoFAccount::STEAM_TOTP);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$twofaccount->fillWithOtpParameters($validated);
|
||||
}
|
||||
$twofaccount->save();
|
||||
@ -79,8 +74,6 @@ class TwoFAccountController extends Controller
|
||||
->setStatusCode(201);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Update a 2FA account
|
||||
*
|
||||
@ -98,10 +91,8 @@ class TwoFAccountController extends Controller
|
||||
return (new TwoFAccountReadResource($twofaccount))
|
||||
->response()
|
||||
->setStatusCode(200);
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Convert a migration resource to a valid TwoFAccounts collection
|
||||
*
|
||||
@ -114,17 +105,15 @@ class TwoFAccountController extends Controller
|
||||
|
||||
if (Arr::has($validated, 'file')) {
|
||||
$migrationResource = $request->file('file');
|
||||
|
||||
|
||||
return $migrationResource instanceof \Illuminate\Http\UploadedFile
|
||||
? new TwoFAccountCollection(TwoFAccounts::migrate($migrationResource->get()))
|
||||
: response()->json(['message' => __('errors.file_upload_failed')], 500);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
return new TwoFAccountCollection(TwoFAccounts::migrate($request->payload));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Save 2FA accounts order
|
||||
*
|
||||
@ -140,10 +129,9 @@ class TwoFAccountController extends Controller
|
||||
return response()->json(['message' => 'order saved'], 200);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Preview account using an uri, without any db moves
|
||||
*
|
||||
*
|
||||
* @param \App\Api\v1\Requests\TwoFAccountUriRequest $request
|
||||
* @return \App\Api\v1\Resources\TwoFAccountStoreResource
|
||||
*/
|
||||
@ -155,12 +143,11 @@ class TwoFAccountController extends Controller
|
||||
return new TwoFAccountStoreResource($twofaccount);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get a One-Time Password
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param string|null $id
|
||||
* @param string|null $id
|
||||
* @return \Illuminate\Http\JsonResponse
|
||||
*/
|
||||
public function otp(Request $request, $id = null)
|
||||
@ -173,17 +160,16 @@ class TwoFAccountController extends Controller
|
||||
}
|
||||
|
||||
// The request input is an uri
|
||||
else if ( $request->has('uri') ) {
|
||||
elseif ($request->has('uri')) {
|
||||
// return 404 if uri is provided with any parameter other than otp_type
|
||||
if ((count($inputs) == 2 && $request->missing('custom_otp')) || count($inputs) > 2) {
|
||||
return response()->json([
|
||||
'message' => 'bad request',
|
||||
'reason' => ['uri' => __('validation.onlyCustomOtpWithUri')]
|
||||
'reason' => ['uri' => __('validation.onlyCustomOtpWithUri')],
|
||||
], 400);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$validatedData = $request->validate((new TwoFAccountUriRequest)->rules());
|
||||
$twofaccount = new TwoFAccount;
|
||||
$twofaccount = new TwoFAccount;
|
||||
$twofaccount->fillWithURI($validatedData['uri'], Arr::get($validatedData, 'custom_otp') === TwoFAccount::STEAM_TOTP, true);
|
||||
}
|
||||
}
|
||||
@ -191,14 +177,13 @@ class TwoFAccountController extends Controller
|
||||
// The request inputs should define an account
|
||||
else {
|
||||
$validatedData = $request->validate((new TwoFAccountStoreRequest)->rules());
|
||||
$twofaccount = new TwoFAccount();
|
||||
$twofaccount = new TwoFAccount();
|
||||
$twofaccount->fillWithOtpParameters($validatedData, true);
|
||||
}
|
||||
|
||||
return response()->json($twofaccount->getOTP(), 200);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* A simple and light method to get the account count.
|
||||
*
|
||||
@ -207,33 +192,30 @@ class TwoFAccountController extends Controller
|
||||
*/
|
||||
public function count(Request $request)
|
||||
{
|
||||
return response()->json([ 'count' => TwoFAccount::count() ], 200);
|
||||
return response()->json(['count' => TwoFAccount::count()], 200);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* Withdraw one or more accounts from their group
|
||||
*
|
||||
* @param \App\Api\v1\Requests\TwoFAccountBatchRequest $request
|
||||
*
|
||||
* @param \App\Api\v1\Requests\TwoFAccountBatchRequest $request
|
||||
* @return \Illuminate\Http\JsonResponse
|
||||
*/
|
||||
public function withdraw(TwoFAccountBatchRequest $request)
|
||||
{
|
||||
{
|
||||
$validated = $request->validated();
|
||||
|
||||
|
||||
if ($this->tooManyIds($validated['ids'])) {
|
||||
return response()->json([
|
||||
'message' => 'bad request',
|
||||
'reason' => [__('errors.too_many_ids')]
|
||||
'reason' => [__('errors.too_many_ids')],
|
||||
], 400);
|
||||
}
|
||||
|
||||
TwoFAccounts::withdraw($validated['ids']);
|
||||
|
||||
return response()->json([ 'message' => 'accounts withdrawn' ], 200);
|
||||
}
|
||||
|
||||
return response()->json(['message' => 'accounts withdrawn'], 200);
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
@ -248,7 +230,6 @@ class TwoFAccountController extends Controller
|
||||
return response()->json(null, 204);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Remove the specified resources from storage.
|
||||
*
|
||||
@ -262,7 +243,7 @@ class TwoFAccountController extends Controller
|
||||
if ($this->tooManyIds($validated['ids'])) {
|
||||
return response()->json([
|
||||
'message' => 'bad request',
|
||||
'reason' => [__('errors.too_many_ids')]
|
||||
'reason' => [__('errors.too_many_ids')],
|
||||
], 400);
|
||||
}
|
||||
|
||||
@ -271,19 +252,17 @@ class TwoFAccountController extends Controller
|
||||
return response()->json(null, 204);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Checks ids length
|
||||
*
|
||||
* @param string $ids comma-separated ids
|
||||
*
|
||||
* @param string $ids comma-separated ids
|
||||
* @return bool whether or not the number of ids is acceptable
|
||||
*/
|
||||
private function tooManyIds(string $ids) : bool
|
||||
{
|
||||
$arIds = explode(',', $ids, 100);
|
||||
$nb = count($arIds);
|
||||
$nb = count($arIds);
|
||||
|
||||
return $nb > 99 ? true : false;
|
||||
}
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user