From 67bb00681267646ab38a95f27f9a772a1a7be8ee Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Mon, 5 Nov 2018 21:35:17 -0600 Subject: [PATCH] relationships and roles --- app/Models/EsiToken.php | 4 ++++ app/User.php | 16 +++++++++++----- ...2018_11_05_001352_create_user_roles_table.php | 1 + .../2018_11_06_013105_create_esi_scopes.php | 1 + 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/app/Models/EsiToken.php b/app/Models/EsiToken.php index a1793533a..f66e166f6 100644 --- a/app/Models/EsiToken.php +++ b/app/Models/EsiToken.php @@ -26,4 +26,8 @@ class EsiToken extends Model 'refresh_token', 'expires_in', ]; + + public function esiscopes() { + return $this->hasMany('App\Models\EsiScope'); + } } diff --git a/app/User.php b/app/User.php index b5d9aee26..d5c6dd016 100644 --- a/app/User.php +++ b/app/User.php @@ -6,6 +6,8 @@ use Illuminate\Notifications\Notifiable; use Illuminate\Contracts\Auth\MustVerifyEmail; use Illuminate\Foundation\Auth\User as Authenticatable; + + class User extends Authenticatable { use Notifiable; @@ -46,7 +48,15 @@ class User extends Authenticatable //Used in middleware to make sure a user is able to access many of the pages public function hasRole($role) { - + $charId = User::where('character_id')->get(); + $checks = DB::table('user_roles')->where('character_id', $charId)->get(); + foreach($checks as $check) { + if($check['role'] == $role) { + return true; + } + } + + return false; //return User::where('role', $role)->get(); } @@ -58,10 +68,6 @@ class User extends Authenticatable return $this->hasMany('App\Models\UserRole'); } - public function esiscopes() { - return $this->hasMany('App\Models\EsiScope'); - } - public function esitoken() { return $this->hasOne('App\Models\EsiToken'); } diff --git a/database/migrations/2018_11_05_001352_create_user_roles_table.php b/database/migrations/2018_11_05_001352_create_user_roles_table.php index bd2c9f7fd..0b8d41454 100644 --- a/database/migrations/2018_11_05_001352_create_user_roles_table.php +++ b/database/migrations/2018_11_05_001352_create_user_roles_table.php @@ -18,6 +18,7 @@ class CreateUserRolesTable extends Migration $table->increments('id'); $table->integer('character_id'); $table->string('role')->default('None'); + $table->foreign('character_id')->references('character_id')->on('users'); $table->timestamps(); }); } diff --git a/database/migrations/2018_11_06_013105_create_esi_scopes.php b/database/migrations/2018_11_06_013105_create_esi_scopes.php index 9204aa527..e1d60bce5 100644 --- a/database/migrations/2018_11_06_013105_create_esi_scopes.php +++ b/database/migrations/2018_11_06_013105_create_esi_scopes.php @@ -17,6 +17,7 @@ class CreateEsiScopes extends Migration Schema::create('EsiScopes', function(Blueprint $table) { $table->increments('id'); $table->integer('character_id'); + $table->foreign('character_id')->references('character_id')->on('EsiToken'); $table->string('scope'); $table->timestamps(); });