Defaults to Models directory

Author: avvertix

src/Console/Commands/ScaffoldAuthenticationControllers.php

@@ -97,7 +97,7 @@ protected function identifyApplicationNamespace()
                 $this->comment("Using [$this->namespace] as application namespace.");
             }
 
-            $this->modelNamespace = is_dir(app_path('Models')) ? $this->namespace.'\Models' : $this->namespace;
+            $this->modelNamespace = is_dir(app_path('Models')) ? $this->namespace.'Models' : $this->namespace;
         } catch (RuntimeException $ex) {
             $this->warn("Unable to identity the application namespace, assuming [$this->namespace].");
         }

src/Facades/Identity.php

@@ -26,14 +26,14 @@ class Identity extends Facade
      *
      * @var string
      */
-    public static $userModel = 'App\\User';
+    public static $userModel = 'App\\Models\\User';
 
     /**
      * The identity model that should be used.
      *
      * @var string
      */
-    public static $identityModel = 'App\\Identity';
+    public static $identityModel = 'App\\Models\\Identity';
 
     /**
      * Get the registered name of the component.
@@ -53,24 +53,34 @@ protected static function getFacadeAccessor()
      */
     public static function routes()
     {
+        /**
+         * @var \Illuminate\Routing\Router
+         */
         $router = static::$app->make('router');
 
         $namespace = '\\'.rtrim(self::$appNamespace, '\\');
 
-        $router->match(['get', 'post'], 'login-via/{provider}', "$namespace\Http\Controllers\Identities\Auth\LoginController@redirect")
-            ->name('oneofftech::login.provider');
-        $router->get('login-via/{provider}/callback', "$namespace\Http\Controllers\Identities\Auth\LoginController@login")
-            ->name('oneofftech::login.callback');
+        $router
+            ->middleware('web')
+            ->group(function($groupRouter) use ($namespace) {
+                $groupRouter->match(['get', 'post'], 'login-via/{provider}', "$namespace\Http\Controllers\Identities\Auth\LoginController@redirect")
+                    ->name('oneofftech::login.provider');
+                $groupRouter->get('login-via/{provider}/callback', "$namespace\Http\Controllers\Identities\Auth\LoginController@login")
+                    ->name('oneofftech::login.callback');
+
+                $groupRouter->match(['get', 'post'], 'register-via/{provider}', "$namespace\Http\Controllers\Identities\Auth\RegisterController@redirect")
+                    ->name('oneofftech::register.provider');
+                $groupRouter->get('register-via/{provider}/callback', "$namespace\Http\Controllers\Identities\Auth\RegisterController@register")
+                    ->name('oneofftech::register.callback');
+
+                $groupRouter->match(['get', 'post'], 'connect-via/{provider}', "$namespace\Http\Controllers\Identities\Auth\ConnectController@redirect")
+                    ->middleware('auth')
+                    ->name('oneofftech::connect.provider');
+                $groupRouter->get('connect-via/{provider}/callback', "$namespace\Http\Controllers\Identities\Auth\ConnectController@connect")
+                    ->middleware('auth')
+                    ->name('oneofftech::connect.callback');
+            });
 
-        $router->match(['get', 'post'], 'register-via/{provider}', "$namespace\Http\Controllers\Identities\Auth\RegisterController@redirect")
-            ->name('oneofftech::register.provider');
-        $router->get('register-via/{provider}/callback', "$namespace\Http\Controllers\Identities\Auth\RegisterController@register")
-            ->name('oneofftech::register.callback');
-
-        $router->match(['get', 'post'], 'connect-via/{provider}', "$namespace\Http\Controllers\Identities\Auth\ConnectController@redirect")
-            ->name('oneofftech::connect.provider');
-        $router->get('connect-via/{provider}/callback', "$namespace\Http\Controllers\Identities\Auth\ConnectController@connect")
-            ->name('oneofftech::connect.callback');
     }
 
     /**

stubs/Identities/Auth/RegisterController.stub

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Identities\Auth;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Support\Str;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Hash;
@@ -58,7 +58,7 @@ class RegisterController extends Controller
         return User::create([
             'name' => $data['name'],
             'email' => $data['email'],
-            'password' => Hash::make($data['password'] ?? Str::random(20)),
+            'password' => Hash::make($data['password'] ?? Str::random(30)),
         ]);
     }
 }