DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update auth controllers to use translations

Browse source
This commit is contained in:
snipe 2019-03-20 00:50:09 -07:00
parent cf92618c70
commit 5699e021de
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/Http/Controllers/Auth/LoginController.php
View file

@ -210,7 +210,7 @@ class LoginController extends Controller
{ {
if (!Auth::check()) { if (!Auth::check()) {
return redirect()->route('login')->with('error', 'You must be logged in.'); return redirect()->route('login')->with('error', trans('auth/general.login_prompt'));
} }
@ -218,10 +218,9 @@ class LoginController extends Controller
$user = Auth::user(); $user = Auth::user();
if (($user->two_factor_secret!='') && ($user->two_factor_enrolled==1)) { if (($user->two_factor_secret!='') && ($user->two_factor_enrolled==1)) {
return redirect()->route('two-factor')->with('error', 'Your device is already enrolled.'); return redirect()->route('two-factor')->with('error', trans('auth/message.two_factor.already_enrolled'));
} }
$google2fa = new Google2FA(); $google2fa = new Google2FA();
$secret = $google2fa->generateSecretKey(); $secret = $google2fa->generateSecretKey();
$user->two_factor_secret = $secret; $user->two_factor_secret = $secret;
@ -242,7 +241,7 @@ class LoginController extends Controller
public function getTwoFactorAuth() public function getTwoFactorAuth()
{ {
if (!Auth::check()) { if (!Auth::check()) {
return redirect()->route('login')->with('error', 'You must be logged in.'); return redirect()->route('login')->with('error', trans('auth/general.login_prompt'));
} }
$user = Auth::user(); $user = Auth::user();
@ -263,11 +262,11 @@ class LoginController extends Controller
{ {
if (!Auth::check()) { if (!Auth::check()) {
return redirect()->route('login')->with('error', 'You must be logged in.'); return redirect()->route('login')->with('error', trans('auth/general.login_prompt'));
} }
if (!$request->has('two_factor_secret')) { if (!$request->has('two_factor_secret')) {
return redirect()->route('two-factor')->with('error', 'Two-factor code is required.'); return redirect()->route('two-factor')->with('error', trans('auth/message.two_factor.code_required'));
} }
$user = Auth::user(); $user = Auth::user();
@ -281,8 +280,7 @@ class LoginController extends Controller
return redirect()->route('home')->with('success', 'You are logged in!'); return redirect()->route('home')->with('success', 'You are logged in!');
} }
\Log::debug('Did not match'); return redirect()->route('two-factor')->with('error', trans('auth/message.two_factor.invalid_code'));
return redirect()->route('two-factor')->with('error', 'Invalid two-factor code');
} }
@ -305,7 +303,7 @@ class LoginController extends Controller
return redirect()->away($customLogoutUrl); return redirect()->away($customLogoutUrl);
} }
return redirect()->route('login')->with('success', 'You have successfully logged out!'); return redirect()->route('login')->with('success', trans('auth/general.logout.success'));
} }