From 2fd2d659042923e1c803d42d07b7c0e3774bfa5e Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Mon, 5 Nov 2018 19:31:49 -0600 Subject: [PATCH] test --- app/Http/Controllers/Auth/LoginController.php | 8 ++-- app/Models/UserEsiScope.php | 4 +- .../2018_11_06_013105_create_esi_scopes.php | 37 +++++++++++++++++++ vendor/composer/autoload_classmap.php | 12 +++--- vendor/composer/autoload_static.php | 12 +++--- 5 files changed, 57 insertions(+), 16 deletions(-) create mode 100644 database/migrations/2018_11_06_013105_create_esi_scopes.php diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index dd7239406..d82b109b1 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -3,7 +3,7 @@ namespace App\Http\Controllers\Auth; use App\User; -use App\Models\UserEsiScope; +use App\Models\EsiScope; use App\Models\EsiToken; use App\Models\UserRole; @@ -140,16 +140,16 @@ class LoginController extends Controller } //After creating the token, we need to update the table for scopes //First we look for all the scopes, then if need be add entries or delete entries from the database - DB::table('UserEsiScopes')->where('character_id', $eve_user->id)->delete(); + DB::table('EsiScopes')->where('character_id', $eve_user->id)->delete(); //EsiScopes::where('character_id', $eve_user->id)->delete(); $scopes = explode(' ', $eve_user->user['Scopes']); foreach($scopes as $scope) { - $data = new App\Models\UserEsiScope; + $data = new App\Models\EsiScope; $data->character_id = $eve_user->id; $data->scopoe = $scope; $data->save(); /* - DB::table('UserEsiScopes')->insert([ + DB::table('EsiScopes')->insert([ 'character_id' => $eve_user->id, 'scope' => $scope, ]); diff --git a/app/Models/UserEsiScope.php b/app/Models/UserEsiScope.php index ac4450fb8..ea9608546 100644 --- a/app/Models/UserEsiScope.php +++ b/app/Models/UserEsiScope.php @@ -4,10 +4,10 @@ namespace App\Models; use Illuminate\Database\Eloquent\Model; -class UserEsiScope extends Model +class EsiScope extends Model { // Table Name - protected $table = 'UserEsiScopes'; + protected $table = 'EsiScopes'; // Timestamps public $timestamps = true; diff --git a/database/migrations/2018_11_06_013105_create_esi_scopes.php b/database/migrations/2018_11_06_013105_create_esi_scopes.php new file mode 100644 index 000000000..6095f385d --- /dev/null +++ b/database/migrations/2018_11_06_013105_create_esi_scopes.php @@ -0,0 +1,37 @@ +integer('id')->increments(); + $table->integer('character_id'); + $table->string('scope'); + $table->timestamps(); + }); + } + + Schema::dropIfExists('UserEsiScopes'); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('EsiScopes'); + } +} diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 43b678a71..480560841 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -7,9 +7,7 @@ $baseDir = dirname($vendorDir); return array( 'App\\Console\\Kernel' => $baseDir . '/app/Console/Kernel.php', - 'App\\EsiToken' => $baseDir . '/app/Models/EsiToken.php', 'App\\Exceptions\\Handler' => $baseDir . '/app/Exceptions/Handler.php', - 'App\\HoldingCorpJournal' => $baseDir . '/app/Models/HoldingCorpJournal.php', 'App\\Http\\Controllers\\Auth\\ForgotPasswordController' => $baseDir . '/app/Http/Controllers/Auth/ForgotPasswordController.php', 'App\\Http\\Controllers\\Auth\\LoginController' => $baseDir . '/app/Http/Controllers/Auth/LoginController.php', 'App\\Http\\Controllers\\Auth\\RegisterController' => $baseDir . '/app/Http/Controllers/Auth/RegisterController.php', @@ -32,26 +30,30 @@ return array( 'App\\Http\\Middleware\\TrustProxies' => $baseDir . '/app/Http/Middleware/TrustProxies.php', 'App\\Http\\Middleware\\VerifyCsrfToken' => $baseDir . '/app/Http/Middleware/VerifyCsrfToken.php', 'App\\Library\\Finances' => $baseDir . '/app/Library/Finances.php', + 'App\\Library\\Fleet' => $baseDir . '/app/Library/Fleet.php', 'App\\Library\\Mail' => $baseDir . '/app/Library/Mail.php', 'App\\Library\\MoonCalc' => $baseDir . '/app/Library/MoonCalc.php', 'App\\Library\\MoonMine' => $baseDir . '/app/Library/MoonMine.php', - 'App\\MarketOrder' => $baseDir . '/app/Models/MarketOrder.php', 'App\\Models\\Config' => $baseDir . '/app/Models/Config.php', 'App\\Models\\DokuGroupNames' => $baseDir . '/app/Models/DokuGroupNames.php', 'App\\Models\\DokuMember' => $baseDir . '/app/Models/DokuMember.php', 'App\\Models\\DokuUser' => $baseDir . '/app/Models/DokuUser.php', + 'App\\Models\\EsiScope' => $baseDir . '/app/Models/UserEsiScope.php', + 'App\\Models\\EsiToken' => $baseDir . '/app/Models/EsiToken.php', + 'App\\Models\\HoldingCorpJournal' => $baseDir . '/app/Models/HoldingCorpJournal.php', 'App\\Models\\ItemComposition' => $baseDir . '/app/Models/ItemComposition.php', + 'App\\Models\\MarketOrder' => $baseDir . '/app/Models/MarketOrder.php', 'App\\Models\\Moon' => $baseDir . '/app/Models/Moon.php', 'App\\Models\\OrePrice' => $baseDir . '/app/Models/OrePrice.php', 'App\\Models\\Price' => $baseDir . '/app/Models/Price.php', + 'App\\Models\\Structure' => $baseDir . '/app/Models/Structure.php', + 'App\\Models\\UserRole' => $baseDir . '/app/Models/UserRole.php', 'App\\Providers\\AppServiceProvider' => $baseDir . '/app/Providers/AppServiceProvider.php', 'App\\Providers\\AuthServiceProvider' => $baseDir . '/app/Providers/AuthServiceProvider.php', 'App\\Providers\\BroadcastServiceProvider' => $baseDir . '/app/Providers/BroadcastServiceProvider.php', 'App\\Providers\\EventServiceProvider' => $baseDir . '/app/Providers/EventServiceProvider.php', 'App\\Providers\\RouteServiceProvider' => $baseDir . '/app/Providers/RouteServiceProvider.php', - 'App\\Structure' => $baseDir . '/app/Models/Structure.php', 'App\\User' => $baseDir . '/app/User.php', - 'App\\UserRole' => $baseDir . '/app/Models/UserRole.php', 'BeyondCode\\DumpServer\\DumpServerCommand' => $vendorDir . '/beyondcode/laravel-dump-server/src/DumpServerCommand.php', 'BeyondCode\\DumpServer\\DumpServerServiceProvider' => $vendorDir . '/beyondcode/laravel-dump-server/src/DumpServerServiceProvider.php', 'BeyondCode\\DumpServer\\Dumper' => $vendorDir . '/beyondcode/laravel-dump-server/src/Dumper.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 75fe5e68c..df6ee774f 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -402,9 +402,7 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 public static $classMap = array ( 'App\\Console\\Kernel' => __DIR__ . '/../..' . '/app/Console/Kernel.php', - 'App\\EsiToken' => __DIR__ . '/../..' . '/app/Models/EsiToken.php', 'App\\Exceptions\\Handler' => __DIR__ . '/../..' . '/app/Exceptions/Handler.php', - 'App\\HoldingCorpJournal' => __DIR__ . '/../..' . '/app/Models/HoldingCorpJournal.php', 'App\\Http\\Controllers\\Auth\\ForgotPasswordController' => __DIR__ . '/../..' . '/app/Http/Controllers/Auth/ForgotPasswordController.php', 'App\\Http\\Controllers\\Auth\\LoginController' => __DIR__ . '/../..' . '/app/Http/Controllers/Auth/LoginController.php', 'App\\Http\\Controllers\\Auth\\RegisterController' => __DIR__ . '/../..' . '/app/Http/Controllers/Auth/RegisterController.php', @@ -427,26 +425,30 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 'App\\Http\\Middleware\\TrustProxies' => __DIR__ . '/../..' . '/app/Http/Middleware/TrustProxies.php', 'App\\Http\\Middleware\\VerifyCsrfToken' => __DIR__ . '/../..' . '/app/Http/Middleware/VerifyCsrfToken.php', 'App\\Library\\Finances' => __DIR__ . '/../..' . '/app/Library/Finances.php', + 'App\\Library\\Fleet' => __DIR__ . '/../..' . '/app/Library/Fleet.php', 'App\\Library\\Mail' => __DIR__ . '/../..' . '/app/Library/Mail.php', 'App\\Library\\MoonCalc' => __DIR__ . '/../..' . '/app/Library/MoonCalc.php', 'App\\Library\\MoonMine' => __DIR__ . '/../..' . '/app/Library/MoonMine.php', - 'App\\MarketOrder' => __DIR__ . '/../..' . '/app/Models/MarketOrder.php', 'App\\Models\\Config' => __DIR__ . '/../..' . '/app/Models/Config.php', 'App\\Models\\DokuGroupNames' => __DIR__ . '/../..' . '/app/Models/DokuGroupNames.php', 'App\\Models\\DokuMember' => __DIR__ . '/../..' . '/app/Models/DokuMember.php', 'App\\Models\\DokuUser' => __DIR__ . '/../..' . '/app/Models/DokuUser.php', + 'App\\Models\\EsiScope' => __DIR__ . '/../..' . '/app/Models/UserEsiScope.php', + 'App\\Models\\EsiToken' => __DIR__ . '/../..' . '/app/Models/EsiToken.php', + 'App\\Models\\HoldingCorpJournal' => __DIR__ . '/../..' . '/app/Models/HoldingCorpJournal.php', 'App\\Models\\ItemComposition' => __DIR__ . '/../..' . '/app/Models/ItemComposition.php', + 'App\\Models\\MarketOrder' => __DIR__ . '/../..' . '/app/Models/MarketOrder.php', 'App\\Models\\Moon' => __DIR__ . '/../..' . '/app/Models/Moon.php', 'App\\Models\\OrePrice' => __DIR__ . '/../..' . '/app/Models/OrePrice.php', 'App\\Models\\Price' => __DIR__ . '/../..' . '/app/Models/Price.php', + 'App\\Models\\Structure' => __DIR__ . '/../..' . '/app/Models/Structure.php', + 'App\\Models\\UserRole' => __DIR__ . '/../..' . '/app/Models/UserRole.php', 'App\\Providers\\AppServiceProvider' => __DIR__ . '/../..' . '/app/Providers/AppServiceProvider.php', 'App\\Providers\\AuthServiceProvider' => __DIR__ . '/../..' . '/app/Providers/AuthServiceProvider.php', 'App\\Providers\\BroadcastServiceProvider' => __DIR__ . '/../..' . '/app/Providers/BroadcastServiceProvider.php', 'App\\Providers\\EventServiceProvider' => __DIR__ . '/../..' . '/app/Providers/EventServiceProvider.php', 'App\\Providers\\RouteServiceProvider' => __DIR__ . '/../..' . '/app/Providers/RouteServiceProvider.php', - 'App\\Structure' => __DIR__ . '/../..' . '/app/Models/Structure.php', 'App\\User' => __DIR__ . '/../..' . '/app/User.php', - 'App\\UserRole' => __DIR__ . '/../..' . '/app/Models/UserRole.php', 'BeyondCode\\DumpServer\\DumpServerCommand' => __DIR__ . '/..' . '/beyondcode/laravel-dump-server/src/DumpServerCommand.php', 'BeyondCode\\DumpServer\\DumpServerServiceProvider' => __DIR__ . '/..' . '/beyondcode/laravel-dump-server/src/DumpServerServiceProvider.php', 'BeyondCode\\DumpServer\\Dumper' => __DIR__ . '/..' . '/beyondcode/laravel-dump-server/src/Dumper.php',