lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CI fixes

Browse Source
This commit is contained in:
Max Kovalenko
2019-05-24 20:28:41 +03:00
committed by Max Kovalenko
parent 6086a275bf
commit bb2ab92d22
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/AuthController.php
View File

@@ -89,10 +89,11 @@ class AuthController extends Controller
* *
* This feels very hacky, but we have to juggle authentication and codes. * This feels very hacky, but we have to juggle authentication and codes.
* *
* @return \Illuminate\Http\RedirectResponse
* @throws \PragmaRX\Google2FA\Exceptions\IncompatibleWithGoogleAuthenticatorException * @throws \PragmaRX\Google2FA\Exceptions\IncompatibleWithGoogleAuthenticatorException
* @throws \PragmaRX\Google2FA\Exceptions\InvalidCharactersException * @throws \PragmaRX\Google2FA\Exceptions\InvalidCharactersException
* @throws \PragmaRX\Google2FA\Exceptions\SecretKeyTooShortException * @throws \PragmaRX\Google2FA\Exceptions\SecretKeyTooShortException
*
* @return \Illuminate\Http\RedirectResponse
*/ */
public function postTwoFactor() public function postTwoFactor()
{ {

3
app/Http/Controllers/Dashboard/UserController.php
View File

@@ -39,9 +39,10 @@ class UserController extends Controller
/** /**
* Updates the current user. * Updates the current user.
* *
* @return \Illuminate\View\View
* @throws \PragmaRX\Google2FA\Exceptions\IncompatibleWithGoogleAuthenticatorException * @throws \PragmaRX\Google2FA\Exceptions\IncompatibleWithGoogleAuthenticatorException
* @throws \PragmaRX\Google2FA\Exceptions\InvalidCharactersException * @throws \PragmaRX\Google2FA\Exceptions\InvalidCharactersException
*
* @return \Illuminate\View\View
*/ */
public function postUser() public function postUser()
{ {

2
resources/views/dashboard/user/index.blade.php
View File

@@ -69,7 +69,7 @@
$qrcode_image = base64_encode($writer->writeString($google2fa_url)); $qrcode_image = base64_encode($writer->writeString($google2fa_url));
?> ?>
<img src="data:image/png;base64, {{ $qrcode_image }}" class="img-responsive"/> <img src="data:image/png;base64, {{ $qrcode_image }}" alt="qr code" class="img-responsive"/>
<span class='help-block'>{!! trans('forms.user.2fa.help') !!}</span> <span class='help-block'>{!! trans('forms.user.2fa.help') !!}</span>
</div> </div>
@endif @endif