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

Merge pull request #1231 from phecho/dev-login

Browse Source 
User can login with username or email
This commit is contained in:
James Brooks
2015-12-16 18:03:47 +00:00
parent 04af799052 c57c9db54a
commit 3a5405e032
17 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@ use Illuminate\Support\Facades\Redirect;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Session;
use Illuminate\Support\Facades\View;
use Illuminate\Support\Str;
use PragmaRX\Google2FA\Vendor\Laravel\Facade as Google2FA;
class AuthController extends Controller
@@ -40,7 +41,12 @@ class AuthController extends Controller
*/
public function postLogin()
{
$loginData = Binput::only(['email', 'password']);
$loginData = Binput::only(['login', 'password']);
// Login with username or email.
$loginKey = Str::contains($loginData['login'], '@') ? 'email' : 'username';
$loginData[$loginKey] = array_pull($loginData, 'login');
// Validate login credentials.
if (Auth::validate($loginData)) {
// Log the user in for one request.