Hot Fix for Issue #10

ddavaham · Mar 7, 2017 · 52b2c14 · 52b2c14 · ahinkle · Mar 7, 2017
1 parent e8ba788
commit 52b2c14
Show file tree

Hide file tree

Showing 24 changed files with 5 additions and 3 deletions.
diff --git a/.ftpconfig b/.ftpconfig
diff --git a/app/Console/Commands/MailHeaderUpdater.php b/app/Console/Commands/MailHeaderUpdater.php
diff --git a/app/Console/Commands/PurgeOldMailBodies.php b/app/Console/Commands/PurgeOldMailBodies.php
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
@@ -87,9 +87,11 @@ public function callback ()
             'alliance_id' => (isset($esi_character_data->response->alliance_id)) ? $esi_character_data->response->alliance_id : null
         ]);
         $updateOrCreate->save();
-        User::find($oauth_verify_access_token->response->CharacterID)->email()->create([
-            'character_id' => $oauth_verify_access_token->response->CharacterID
-        ]);
+        if ($updateOrCreate->wasRecentlyCreated) {
+            User::find($oauth_verify_access_token->response->CharacterID)->email()->create([
+                'character_id' => $oauth_verify_access_token->response->CharacterID
+            ]);
+        }
         $user = User::find($oauth_verify_access_token->response->CharacterID);
 
         Auth::login($user);

diff --git a/app/Http/Controllers/HTTPController.php b/app/Http/Controllers/HTTPController.php
diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
diff --git a/app/Http/Controllers/TokenController.php b/app/Http/Controllers/TokenController.php
diff --git a/app/Mail/EmailVerification.php b/app/Mail/EmailVerification.php
diff --git a/app/Mail/NewMailNotification.php b/app/Mail/NewMailNotification.php
diff --git a/app/UserPreferences.php b/app/UserPreferences.php
diff --git a/database/migrations/2017_03_06_124703_create_user_preferences_table.php b/database/migrations/2017_03_06_124703_create_user_preferences_table.php
diff --git a/database/migrations/2017_03_06_163303_add_preferences_column_to_users_table.php b/database/migrations/2017_03_06_163303_add_preferences_column_to_users_table.php
diff --git a/resources/views/about.blade.php b/resources/views/about.blade.php
diff --git a/resources/views/bedrock/navbar.blade.php b/resources/views/bedrock/navbar.blade.php
diff --git a/resources/views/email/email_verification.blade.php b/resources/views/email/email_verification.blade.php
diff --git a/resources/views/extra/navbar.blade.php b/resources/views/extra/navbar.blade.php
diff --git a/resources/views/extra/settings_nav.blade.php b/resources/views/extra/settings_nav.blade.php
diff --git a/resources/views/services.blade.php b/resources/views/services.blade.php
diff --git a/resources/views/settings/construction.blade.php b/resources/views/settings/construction.blade.php
diff --git a/resources/views/settings/email.blade.php b/resources/views/settings/email.blade.php
diff --git a/resources/views/settings/overview.blade.php b/resources/views/settings/overview.blade.php
diff --git a/resources/views/settings/preferences.blade.php b/resources/views/settings/preferences.blade.php
diff --git a/routes/web.php b/routes/web.php