Fixed Password Issue

Sopamo · Aug 25, 2016 · 19a7300 · 19a7300
1 parent 04638e8
commit 19a7300
Show file tree

Hide file tree

Showing 10 changed files with 175 additions and 224 deletions.
diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
diff --git a/.idea/libraries/phpmap_node_modules.xml b/.idea/libraries/phpmap_node_modules.xml
diff --git a/.idea/phpmap.iml b/.idea/phpmap.iml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/app/Http/Controllers/Api/Users/PasswordController.php b/app/Http/Controllers/Api/Users/PasswordController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Api\Users;
 
+use App\User;
 use Illuminate\Http\Request;
 
 use App\Http\Requests;

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -24,7 +24,7 @@ class AppServiceProvider extends ServiceProvider
     public function boot()
     {
         User::created(function ($user) {
-            if ($user->github_id != null) {
+            if ($user->github_id == null) {
                 Mail::to($user)
                     ->queue(new UserRegisteredMail($user));
             }

diff --git a/composer.lock b/composer.lock
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
@@ -21,6 +21,7 @@
         'address' => $faker->streetAddress,
         'city' => $faker->city,
         'country' => $faker->country,
+        'github_id' => str_random(3),
         'avatar' => 'https://www.gravatar.com/avatar/04d24379cd970b7670ee66fa203d646f?s=80&r=any&default=identicon&forcedefault=1',
         'password' => bcrypt(str_random(10)),
         'remember_token' => str_random(10),

diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
@@ -25,7 +25,7 @@ public function up()
 
             $table->boolean('is_admin')->default('0');
 
-            $table->string('github_id')->unique();
+            $table->string('github_id')->unique()->nullable();
 
             $table->string('lat')->nullable();
             $table->string('lng')->nullable();

diff --git a/routes/web.php b/routes/web.php
@@ -31,9 +31,9 @@
 
 
 Route::get('/test', function () {
-//    $users = factory(\PHPMap\User::class, 10)->create();
+   $users = factory(\App\User::class, 10)->create();
 
-    return auth()->user()->followers;
+    //return auth()->user()->followers;
 //    return str_random(20).'.'.str_random(5).'_'.str_random(15);
 
 //    $user = \PHPMap\User::findByUsername('fwartner');