update methods to better handle ACTIVATION=false

Author: jeremykenedy

app/Http/Controllers/Auth/ActivateController.php

@@ -86,15 +86,21 @@ public static function activeRedirect($user, $currentRoute)
         if ($user->activated) {
             Log::info('Activated user attempted to visit '.$currentRoute.'. ', [$user]);
 
+            $message = trans('auth.regThanks');
+            if (config('settings.activation')) {
+                $message = trans('auth.alreadyActivated');
+            }
+
             if ($user->isAdmin()) {
                 return redirect()->route(self::getAdminHomeRoute())
                 ->with('status', 'info')
-                ->with('message', trans('auth.alreadyActivated'));
+                ->with('message', $message);
             }
 
+
             return redirect()->route(self::getUserHomeRoute())
                 ->with('status', 'info')
-                ->with('message', trans('auth.alreadyActivated'));
+                ->with('message', $message);
         }
 
         return false;

app/Http/Controllers/Auth/RegisterController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
+use App\Models\Profile;
 use App\Models\User;
 use App\Traits\ActivationTrait;
 use App\Traits\CaptchaTrait;
@@ -101,7 +102,14 @@ protected function validator(array $data)
     protected function create(array $data)
     {
         $ipAddress = new CaptureIpTrait();
-        $role = Role::where('slug', '=', 'unverified')->first();
+
+        if (config('settings.activation')) {
+            $role = Role::where('slug', '=', 'unverified')->first();
+            $activated = false;
+        } else {
+            $role = Role::where('slug', '=', 'user')->first();
+            $activated = true;
+        }
 
         $user = User::create([
             'name'              => $data['name'],
@@ -111,12 +119,18 @@ protected function create(array $data)
             'password'          => Hash::make($data['password']),
             'token'             => str_random(64),
             'signup_ip_address' => $ipAddress->getClientIp(),
-            'activated'         => ! config('settings.activation'),
+            'activated'         => $activated,
         ]);
 
         $user->attachRole($role);
         $this->initiateEmailActivation($user);
 
+        if (! config('settings.activation')) {
+            $profile = new Profile();
+            $user->profile()->save($profile);
+            $user->save();
+        }
+
         return $user;
     }
 }

composer.json

@@ -18,7 +18,7 @@
         "intervention/image": "^2.5",
         "jaybizzle/laravel-crawler-detect": "^1.2",
         "jeremykenedy/laravel-blocker": "^2.2",
-        "jeremykenedy/laravel-exception-notifier": "^1.2",
+        "jeremykenedy/laravel-exception-notifier": "^2.1.0",
         "jeremykenedy/laravel-https": "^1.1",
         "jeremykenedy/laravel-logger": "^3.2",
         "jeremykenedy/laravel-phpinfo": "^1.2",