extern/2FAuth
1
0
Fork 0
mirror of https://github.com/Bubka/2FAuth.git synced 2025-04-11 19:18:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update QrCode controller to work with new TwoFAccount model

Browse Source
This commit is contained in:
Bubka 2020-11-12 00:18:38 +01:00
parent 8baa2156a8
commit 45a3f60fc6
1 changed files with 6 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/Http/Controllers/QrCodeController.php
View File

@ -2,14 +2,10 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use OTPHP\TOTP;
use OTPHP\Factory;
use Zxing\QrReader; use Zxing\QrReader;
use App\TwoFAccount; use App\TwoFAccount;
use App\Classes\Options; use App\Classes\Options;
use Illuminate\Http\File;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Assert\AssertionFailedException;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
use chillerlan\QRCode\{QRCode, QROptions}; use chillerlan\QRCode\{QRCode, QROptions};
@ -46,6 +42,8 @@ public function decode(Request $request)
if( Options::get('useBasicQrcodeReader') || $request->inputFormat === 'fileUpload') { if( Options::get('useBasicQrcodeReader') || $request->inputFormat === 'fileUpload') {
// The frontend send an image resource of the QR code
// input validation // input validation
$this->validate($request, [ $this->validate($request, [
'qrcode' => 'required|image', 'qrcode' => 'required|image',
@ -61,7 +59,7 @@ public function decode(Request $request)
Storage::delete($path); Storage::delete($path);
} }
else { else {
// The QR code has been flashed and the URI is already decoded
$this->validate($request, [ $this->validate($request, [
'uri' => 'required|string', 'uri' => 'required|string',
]); ]);
@ -70,36 +68,10 @@ public function decode(Request $request)
} }
// return the OTP object // return the OTP object
try { $twofaccount = new TwoFAccount;
$twofaccount->populateFromUri($uri);
$otp = Factory::loadFromProvisioningUri($uri); return response()->json($twofaccount->makeVisible(['secret', 'algorithm']), 200);
if(!$otp->getIssuer()) {
$otp->setIssuer($otp->getLabel());
$otp->setLabel('');
}
// returned object
$twofaccount = (object) array(
'service' => $otp->getIssuer(),
'account' => $otp->getLabel(),
'uri' => $uri,
'icon' => '',
'options' => $otp->getParameters()
);
return response()->json($twofaccount, 200);
}
catch (AssertionFailedException $exception) {
$error = \Illuminate\Validation\ValidationException::withMessages([
'qrcode' => __('errors.response.no_valid_otp')
]);
throw $error;
}
} }
} }