testing

app/Console/Commands/RefreshUserJwts.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Models\User;
+use App\Models\Auth\User;
 use App\Services\JwtService;
 use Illuminate\Console\Command;
 

app/Http/Controllers/Auth/EsiScopeController.php

@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Auth;
 
 //Library
 use App\Http\Controllers\Controller;
-use App\Models\Auth\User;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -12,7 +11,7 @@ use Laravel\Socialite\Facades\Socialite;
 use Throwable;
 
 //Models
-use App\Models\User\User;
+use App\Models\Auth\User;
 use App\Models\Esi\EsiScope;
 
 class EsiScopeController extends Controller

app/Http/Middleware/RequirePermission.php

@@ -7,9 +7,10 @@ use Illuminate\Http\Request;
 use Symfony\Component\HttpFoundation\Response;
 use DB;
 
-use App\Models\User\UserPermission;
-use App\Models\User\UserRole;
-use App\Models\User\AvailableUserPermission;
+use App\Models\Auth\User;
+use App\Models\Auth\UserPermission;
+use App\Models\Auth\UserRole;
+use App\Models\Auth\AvailableUserPermission;
 
 class RequirePermission
 {

app/Http/Middleware/RequireRole.php

@@ -6,8 +6,8 @@ use Closure;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpFoundation\Response;
 
-use App\Models\User\UserRole;
-use App\Models\User\AvailableUserRole;
+use App\Models\Auth\UserRole;
+use App\Models\Auth\AvailableUserRole;
 
 class RequireRole
 {

app/Library/Helpers/TaxesHelper.php

@@ -6,9 +6,9 @@ namespace App\Library\Helpers;
 use Carbon\Carbon;
 
 //Models
-use App\Models\User\User;
-use App\Models\User\UserRole;
-use App\Models\User\UserPermission;
+use App\Models\Auth\User;
+use App\Models\Auth\UserRole;
+use App\Models\Auth\UserPermission;
 use App\Models\Finances\AllianceWalletJournal;
 use App\Models\MiningTax\Invoice;
 use App\Models\MoonRental\AllianceMoonRental;

app/Models/Auth/AvailableUserPermission.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Models\Auth;
+
+use Illuminate\Database\Eloquent\Model;
+
+class AvailableUserPermission extends Model
+{
+    /**
+     * Database Table
+     * 
+     */
+    protected $table = 'available_user_permissions';
+
+    /**
+     * Primary Key
+     */
+    public $primaryKey = 'id';
+
+    /**
+     * Timestamps enabled for the rows
+     */
+    public $timestamps = false;
+
+    /**
+     * The attributes that are mass assignable
+     */
+    protected $fillable = [
+        'permission',
+    ];
+}

app/Models/Auth/AvailableUserRole.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Models\Auth;
+
+use Illuminate\Database\Eloquent\Model;
+
+class AvailableUserRole extends Model
+{
+    //Table Name
+    protected $table = 'available_user_roles';
+
+    //Primary Key
+    public $primaryKey = 'id';
+
+    //Timestamps
+    public $timestamps = false;
+
+    /**
+     * The attribute that are mass assignable
+     */
+    protected $fillable = [
+        'role',
+        'rank',
+        'description',
+    ];
+}

app/Models/Auth/UserPermission.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Models\Auth;
+
+use Illuminate\Database\Eloquent\Model;
+
+class UserPermission extends Model
+{
+    /**
+     * Database Table
+     */
+    protected $table = 'user_permissions';
+
+    //Primary Key
+    public $primaryKey = 'id';
+
+    /**
+     * The attributes that are mass assignable
+     * 
+     * @var array
+     */
+    protected $fillable = [
+        'character_id',
+        'permission',
+    ];
+
+    
+    public function user() {
+        return $this->belongsTo(User::class);
+    }
+}

app/Models/Auth/UserRole.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Models\Auth;
+
+use Illuminate\Database\Eloquent\Model;
+
+class UserRole extends Model
+{
+    /**
+     * Database Table
+     */
+    protected $table = 'user_roles';
+
+    //Primary Key
+    public $primaryKey = 'id';
+
+    /**
+     * Attributes which are mass assignable
+     * 
+     * @var array
+     */
+    protected $fillable = [
+        'character_id',
+        'role',
+    ];
+
+    public function user() {
+        return $this->belongsTo(User::class);
+    }
+}

app/Models/Esi/EsiScope.php

@@ -26,6 +26,6 @@ class EsiScope extends Model
     ];
 
     public function user() {
-        return $this->belongsTo(App\Models\User\User::class, 'character_id', 'character_id');
+        return $this->belongsTo(App\Models\Auth\User::class, 'character_id', 'character_id');
     }
 }

app/Models/Esi/EsiToken.php

@@ -29,7 +29,7 @@ class EsiToken extends Model
     ];
 
     public function user() {
-        return $this->belongsTo(App\Models\User\User::class, 'character_id', 'character_id');
+        return $this->belongsTo(App\Models\Auth\User::class, 'character_id', 'character_id');
     }
 
     public function esiscopes() {

app/Services/UserPrivilegesService.php

@@ -2,7 +2,7 @@
 
 namespace App\Services;
 
-use App\Models\User;
+use App\Models\Auth\User;
 use Illuminate\Support\Facades\DB;
 
 class UserPrivilegeService

config/auth.php

@@ -62,7 +62,7 @@ return [
     'providers' => [
         'users' => [
             'driver' => 'eloquent',
-            'model' => env('AUTH_MODEL', App\Models\User::class),
+            'model' => env('AUTH_MODEL', App\Models\Auth\User::class),
         ],
 
         // 'users' => [

database/factories/UserFactory.php

@@ -7,7 +7,7 @@ use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
 
 /**
- * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\User>
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Auth\User>
  */
 class UserFactory extends Factory
 {

database/seeders/DatabaseSeeder.php

@@ -2,7 +2,7 @@
 
 namespace Database\Seeders;
 
-use App\Models\User;
+use App\Models\Auth\User;
 use Illuminate\Database\Console\Seeds\WithoutModelEvents;
 use Illuminate\Database\Seeder;