Merge branch 'authentication' into user_management

This commit is contained in:
Michal Kváček
2016-01-21 11:53:24 +01:00
5 changed files with 25 additions and 21 deletions
+14 -9
View File
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Admin;
use App\Http\Controllers\Controller;
use App\Http\Requests;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
/**
* Class Login
@@ -15,22 +16,26 @@ use Illuminate\Http\Request;
*/
class Login extends Controller
{
/**
* @param array $data
*/
protected function validator(array $data)
public function getLoginForm()
{
return Validator::make($data, [
'name' => 'required|max:255',
'email' => 'required|email|max:255|unique:users',
'password' => 'required|confirmed|min:6',
]);
if (Auth::check()) {
return redirect()->route('admin.dashboard');
}
return view('admin.loginForm.form');
}
/**
* @param Request $request
*
* @return \Illuminate\Http\RedirectResponse
*/
public function postLogin(Request $request)
{
if (Auth::attempt($request->only('email', 'password'))) {
return redirect()->route('admin.dashboard');
}
echo "neplatne prihlaseni";
}
}
+1 -1
View File
@@ -17,7 +17,7 @@ class Authenticate
*/
public function handle($request, Closure $next, $guard = null)
{
if (Auth::guard($guard)->guest()) {
if (Auth::check()) {
if ($request->ajax()) {
return response('Unauthorized.', 401);
} else {
+6 -7
View File
@@ -2,25 +2,24 @@
namespace App\Models;
use App\Http\Requests\Request;
use Illuminate\Auth\Authenticatable;
use Illuminate\Auth\Passwords\CanResetPassword;
use Illuminate\Contracts\Auth\Authenticatable as AuthenticableInterface;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\ValidationException;
use Symfony\Component\Process\Exception\InvalidArgumentException;
use Illuminate\Foundation\Auth\Access\Authorizable;
/**
* Class User
*/
class User extends Model
class User extends Model implements AuthenticableInterface
{
use Authenticatable, Authorizable, CanResetPassword;
public $timestamps = false;
protected $fillable = [
'email',
'username',
'password',
'role',
'name',
'status'
];
protected $guarded = [];
/**