diff --git a/src/SQRL.php b/src/SQRL.php index 44f31e7..bebf536 100644 --- a/src/SQRL.php +++ b/src/SQRL.php @@ -51,7 +51,7 @@ class SQRL * * @return array */ - public static function authNonce(): array + public static function authNonce(int $size=100): array { $url = config('sqrl.url'); @@ -67,7 +67,7 @@ class SQRL 'check_state_on'=>$route, 'sqrl_url'=>$sqrl_url, 'sqrl_url_encoded'=>self::base64_encode_url(sprintf('%s&can=%s',$sqrl_url,$o->can)), - 'qrcode'=>SQRL::qrCode($sqrl_url,100), + 'qrcode'=>SQRL::qrCode($sqrl_url,$size), ]; } diff --git a/src/SQRLController.php b/src/SQRLController.php index 8204268..ff1fbfc 100644 --- a/src/SQRLController.php +++ b/src/SQRLController.php @@ -39,7 +39,7 @@ class SQRLController extends Controller //Get the user by the original nonce $o = SQRLAuth\Nonce::check($request->get('nut'),'orig_nonce'); - Log::debug(sprintf('User [%s]',serialize($o->getAttributes()))); + Log::debug(sprintf('User [%s]',serialize($o ? $o->getAttributes() : NULL))); if ($o && $o->verified) { if ($o->pubkey && ! $o->pubkey->disabled) diff --git a/src/routes.php b/src/routes.php index f45aa90..ef4d0ed 100644 --- a/src/routes.php +++ b/src/routes.php @@ -8,7 +8,7 @@ if (app() instanceof \Illuminate\Foundation\Application) { Route::get('/login','SQRLController@auth')->name('login'); // Perform login - Route::post('/login','SQRLController@@login'); + Route::post('/login','SQRLController@login'); }); Route::group(['prefix'=>'api','namespace'=>'Leenooks\SQRL'], function() { diff --git a/src/views/login.blade.php b/src/views/login.blade.php index 3a752c9..0d4b096 100644 --- a/src/views/login.blade.php +++ b/src/views/login.blade.php @@ -78,80 +78,9 @@ - +@include('sqrl::login_js') - + \ No newline at end of file diff --git a/src/views/login_js.blade.php b/src/views/login_js.blade.php new file mode 100644 index 0000000..68223a0 --- /dev/null +++ b/src/views/login_js.blade.php @@ -0,0 +1,72 @@ + \ No newline at end of file