drkthunder02/w4rpservices
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allowed login models and update of login controller

Browse Source
This commit is contained in:
drkthunder02
2019-01-09 01:12:13 -06:00
parent 2304ad653c
commit 120378f293
10 changed files with 9 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/AdminController.php
View File

@@ -14,7 +14,7 @@ class AdminController extends Controller
{ {
public function __construct() { public function __construct() {
$this->middleware('auth'); $this->middleware('auth');
$this->middleware('role:Admin'); $this->middleware('permission:role.admin');
} }
public function displayDashboard() { public function displayDashboard() {

2
app/Http/Controllers/DashboardController.php
View File

@@ -21,7 +21,7 @@ class DashboardController extends Controller
public function __construct() public function __construct()
{ {
$this->middleware('auth'); $this->middleware('auth');
$this->middleware('role:Guest'); $this->middleware('permission:role.guest');
} }
/** /**

2
app/Http/Controllers/EsiScopeController.php
View File

@@ -14,7 +14,7 @@ class EsiScopeController extends Controller
{ {
public function __construct() { public function __construct() {
$this->middleware('auth'); $this->middleware('auth');
$this->middleware('role:User'); $this->middleware('permission:role.user');
} }
public function displayScopes() { public function displayScopes() {

2
app/Http/Controllers/FinancesController.php
View File

@@ -8,7 +8,7 @@ class FinancesController extends Controller
{ {
public function __construct() { public function __construct() {
$this->middleware('auth'); $this->middleware('auth');
$this->middleware('role:Admin'); $this->middleware('permission:role.admin');
} }
public function displayFinances() { public function displayFinances() {

2
app/Http/Controllers/FleetsController.php
View File

@@ -24,7 +24,7 @@ class FleetsController extends Controller
*/ */
public function __construct() { public function __construct() {
$this->middleware('auth'); $this->middleware('auth');
$this->middleware('role:User'); $this->middleware('permission:role.user');
} }
/** /**

2
app/Http/Controllers/MoonsAdminController.php
View File

@@ -18,7 +18,7 @@ class MoonsAdminController extends Controller
{ {
public function __construct() { public function __construct() {
$this->middleware('auth'); $this->middleware('auth');
$this->middleware('role:Admin'); $this->middleware('permission:role.admin');
} }
public function showJournalEntries() { public function showJournalEntries() {

2
app/Http/Controllers/MoonsController.php
View File

@@ -14,7 +14,7 @@ class MoonsController extends Controller
{ {
public function __construct() { public function __construct() {
$this->middleware('auth'); $this->middleware('auth');
$this->middleware('role:User'); $this->middleware('permission:role.user');
} }
/** /**

2
app/Http/Controllers/WikiController.php
View File

@@ -15,7 +15,7 @@ class WikiController extends Controller
{ {
public function __construct() { public function __construct() {
$this->middleware('auth'); $this->middleware('auth');
$this->middleware('role:User'); $this->middleware('permission:role.user');
} }
public function displayRegister() { public function displayRegister() {

8
app/Http/Middleware/RequirePermission.php
View File

@@ -19,7 +19,7 @@ class RequirePermission
public function handle($request, Closure $next, $permission) public function handle($request, Closure $next, $permission)
{ {
$confirmed = false; $confirmed = false;
/*
if(strpos($permission, 'role.')) { if(strpos($permission, 'role.')) {
$confirmed = $this->CheckRole($permission); $confirmed = $this->CheckRole($permission);
} else { } else {
@@ -29,12 +29,6 @@ class RequirePermission
if($confirmed === false) { if($confirmed === false) {
abort(403, "You don't have permission to access this area."); abort(403, "You don't have permission to access this area.");
} }
*/
$check = UserPermission::where(['character_id' => auth()->user()->character_id, 'permission' => $permission])->get(['permission']);
if(!isset($check[0]->permission)) {
abort(403, "You don't have permission to access this area.");
}
return $next($request); return $next($request);
} }

47
app/Http/Middleware/RequireRole.php
View File

@@ -1,47 +0,0 @@
<?php
namespace App\Http\Middleware;
use Closure;
use DB;
use App\Models\User\UserPermission;
class RequireRole
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next, $role)
{
$confirmed = false;
$ranking = [
'role.none' => 0,
'role.guest' => 1,
'role.user' => 2,
'role.director' => 3,
'role.admin' => 4,
];
//Using eloquent let's get the roles for the character
$check = UserPermission::where(['character_id' => auth()->user()->character_id, 'permission' => $role])->get(['permission']);
if(!isset($check[0]->role)) {
abort(403, "You don't have permissions to access this area!");
}
if($ranking[$check[0]->role] === $ranking[$role]) {
$confirmed = true;
}
if($ranking[$check[0]->role] >= $ranking[$role]) {
$confirmed = true;
}
abort_unless(auth()->check() && $confirmed, 403, "You don't have permissions to access this area!");
return $next($request);
}
}