diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index d00009190..48c516d79 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -2,6 +2,11 @@ namespace App\Http\Controllers\Auth; +use App\User; +use App\Models\UserEsiScope; +use App\Models\EsiToken; +use App\Models\UserRole; + use App\Http\Controllers\Controller; use Illuminate\Foundation\Auth\AuthenticatesUsers; use Illuminate\Http\Request; @@ -9,11 +14,6 @@ use Socialite; use Auth; use DB; -use App\User; -use App\Models\EsiScope; -use App\Models\EsiToken; -use App\Models\UserRole; - use Seat\Eseye\Cache\NullCache; use Seat\Eseye\Configuration; use Seat\Eseye\Containers\EsiAuthentication; diff --git a/app/Models/EsiScope.php b/app/Models/UserEsiScope.php similarity index 93% rename from app/Models/EsiScope.php rename to app/Models/UserEsiScope.php index 30926f425..ac4450fb8 100644 --- a/app/Models/EsiScope.php +++ b/app/Models/UserEsiScope.php @@ -4,7 +4,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Model; -class EsiScope extends Model +class UserEsiScope extends Model { // Table Name protected $table = 'UserEsiScopes'; @@ -12,10 +12,6 @@ class EsiScope extends Model // Timestamps public $timestamps = true; - public function user() { - return $this->belongsTo('App\User', 'character_id', 'character_id'); - } - /** * The attributes that are mass assignable * @@ -25,4 +21,8 @@ class EsiScope extends Model 'character_id', 'scope', ]; + + public function user() { + return $this->belongsTo('App\User', 'character_id', 'character_id'); + } }