chore: Changed default user model location

app/Classes/Authentication/Authenticator.php

@@ -4,7 +4,7 @@
 
 use App\Models\AuthLog;
 use App\Models\Permission;
-use App\User;
+use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;

app/Classes/Authentication/KeycloakAuthenticator.php

@@ -3,7 +3,7 @@
 namespace App\Classes\Authentication;
 
 use App\Models\Oauth2Token;
-use App\User;
+use App\Models\User;
 use GuzzleHttp\Client;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Hash;

app/Classes/Authentication/LDAPAuthenticator.php

@@ -12,7 +12,7 @@
 use App\Models\RoleUser;
 use App\Models\Server;
 use App\Models\UserSettings;
-use App\User;
+use App\Models\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Log;

app/Http/Controllers/API/AuthController.php

@@ -7,7 +7,7 @@
 use App\Classes\Authentication\LimanAuthenticator;
 use App\Http\Controllers\Controller;
 use App\Models\SystemSettings;
-use App\User;
+use App\Models\User;
 use Illuminate\Auth\Events\PasswordReset;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;

app/Http/Controllers/API/DashboardController.php

@@ -7,7 +7,7 @@
 use App\Models\Permission;
 use App\Models\Server;
 use App\Models\UserExtensionUsageStats;
-use App\User;
+use App\Models\User;
 
 /**
  * Dashboard Controller

app/Http/Controllers/API/ProfileController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\API;
 
 use App\Http\Controllers\Controller;
-use App\User;
+use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
 

app/Http/Controllers/API/Server/AccessLogController.php

@@ -7,7 +7,7 @@
 use App\Models\Extension;
 use App\Models\Permission;
 use App\System\Command;
-use App\User;
+use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Http\Response;
 

app/Http/Controllers/API/Settings/HealthController.php

@@ -5,7 +5,7 @@
 use App\Http\Controllers\Controller;
 use App\Jobs\HighAvailabilitySyncer;
 use App\System\Command;
-use App\User;
+use App\Models\User;
 use Illuminate\Contracts\Bus\Dispatcher;
 
 class HealthController extends Controller

app/Http/Controllers/API/Settings/LdapPermissionsController.php

@@ -8,7 +8,7 @@
 use App\Http\Controllers\Controller;
 use App\Models\LdapRestriction;
 use App\Models\RoleMapping;
-use App\User;
+use App\Models\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;

app/Http/Controllers/API/Settings/RoleController.php

@@ -9,7 +9,7 @@
 use App\Models\Role;
 use App\Models\RoleUser;
 use App\Models\Server;
-use App\User;
+use App\Models\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;

app/Http/Controllers/API/Settings/UserController.php

@@ -8,7 +8,7 @@
 use App\Models\Permission;
 use App\Models\Role;
 use App\Models\RoleUser;
-use App\User;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;

app/Http/Middleware/APILogin.php

@@ -3,7 +3,7 @@
 namespace App\Http\Middleware;
 
 use App\Models\AccessToken;
-use App\User;
+use App\Models\User;
 use Carbon\Carbon;
 use Closure;
 use Illuminate\Support\Facades\Auth;

app/Models/AuditLog.php

@@ -4,7 +4,7 @@
 
 use App\Casts\Jsonb;
 use App\Support\Database\CacheQueryBuilder;
-use App\User;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Model;
 
 class AuditLog extends Model

app/Models/AuthLog.php

@@ -3,7 +3,7 @@
 namespace App\Models;
 
 use App\Support\Database\CacheQueryBuilder;
-use App\User;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Model;
 
 class AuthLog extends Model

app/Models/Notification.php

@@ -3,7 +3,7 @@
 namespace App\Models;
 
 use App\Casts\Jsonb;
-use App\User;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Concerns\HasEvents;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;

app/Models/Permission.php

@@ -3,7 +3,7 @@
 namespace App\Models;
 
 use App\Support\Database\CacheQueryBuilder;
-use App\User;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 

app/Models/Role.php

@@ -30,6 +30,6 @@ public function permissions()
      */
     public function users()
     {
-        return $this->belongsToMany('App\User', 'role_users');
+        return $this->belongsToMany('App\Models\User', 'role_users');
     }
 }

app/Models/RoleUser.php

@@ -21,7 +21,7 @@ class RoleUser extends Model
      */
     public function user()
     {
-        return $this->belongsTo('App\User');
+        return $this->belongsTo('App\Models\User');
     }
 
     /**

app/User.php → app/Models/User.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use App\Models\Extension;
 use App\Models\Permission;
@@ -18,7 +18,7 @@
 use Tymon\JWTAuth\Contracts\JWTSubject as JWTSubject;
 
 /**
- * App\User
+ * App\Models\User
  *
  * @property-read mixed $id
  *

app/Observers/UserObserver.php

@@ -4,15 +4,15 @@
 
 use App\Mail\Information;
 use App\Models\Notification;
-use App\User;
+use App\Models\User;
 use Illuminate\Support\Facades\Mail;
 
 class UserObserver
 {
     /**
      * Listen to the User created event.
      *
-     * @param  \App\User  $user
+     * @param  \App\Models\User  $user
      * @return void
      */
     public function created(User $user)
@@ -40,7 +40,7 @@ public function created(User $user)
     /**
      * Listen to the User updating event.
      *
-     * @param  \App\User  $user
+     * @param  \App\Models\User  $user
      * @return void
      */
     public function updating(User $user)

app/Policies/ServerPolicy.php

@@ -4,7 +4,7 @@
 
 use App\Models\Permission;
 use App\Models\Server;
-use App\User;
+use App\Models\User;
 use Illuminate\Auth\Access\HandlesAuthorization;
 
 /**

app/Providers/AppServiceProvider.php

@@ -7,7 +7,7 @@
 use App\Observers\NotificationObserver;
 use App\Observers\ServerObserver;
 use App\Observers\UserObserver;
-use App\User;
+use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Auth\Notifications\ResetPassword;
 use Illuminate\Contracts\Http\Kernel;
@@ -40,7 +40,7 @@ public function boot(
         Server::observe(ServerObserver::class);
 
         Relation::morphMap([
-            'users' => 'App\User',
+            'users' => 'App\Models\User',
             'roles' => 'App\Models\Role',
         ]);
 

config/auth.php

@@ -67,7 +67,7 @@
     'providers' => [
         'users' => [
             'driver' => 'eloquent',
-            'model' => App\User::class,
+            'model' => App\Models\User::class,
         ],
 
         // 'users' => [

config/jwt.php

@@ -178,7 +178,7 @@
     |
     | This will determine whether a `prv` claim is automatically added to
     | the token. The purpose of this is to ensure that if you have multiple
-    | authentication models e.g. `App\User` & `App\OtherPerson`, then we
+    | authentication models e.g. `App\Models\User` & `App\OtherPerson`, then we
     | should prevent one authentication request from impersonating another,
     | if 2 tokens happen to have the same id across the 2 different models.
     |

config/services.php

@@ -30,7 +30,7 @@
     ],
 
     'stripe' => [
-        'model' => App\User::class,
+        'model' => App\Models\User::class,
         'key' => env('STRIPE_KEY'),
         'secret' => env('STRIPE_SECRET'),
         'webhook' => [

database/factories/UserFactory.php

@@ -13,7 +13,7 @@
 |
 */
 
-$factory->define(App\User::class, function (Faker $faker) {
+$factory->define(App\Models\User::class, function (Faker $faker) {
     return [
         'name' => $faker->name,
         'email' => $faker->unique()->safeEmail,