5.4.1

laravelwebdev · laravelwebdev · commit 05c56557fb3f · 2025-03-19T10:42:55.000+08:00
diff --git a/composer.json b/composer.json
@@ -169,5 +169,5 @@
   },
   "minimum-stability": "dev",
   "prefer-stable": true,
-  "version": "5.4.0"
+  "version": "5.4.1"
 }
diff --git a/database/migrations/2018_01_01_000000_create_action_events_table.php b/database/migrations/2018_01_01_000000_create_action_events_table.php
@@ -18,7 +18,7 @@ public function up()
         Schema::create('action_events', function (Blueprint $table) {
             $table->id();
             $table->char('batch_id', 36);
-            $table->foreignIdFor(Util::userModel(), 'user_id')->index();
+            $table->foreignIdFor(Util::userModelOrFallback(), 'user_id')->index();
             $table->string('name');
             $table->morphs('actionable');
             $table->morphs('target');
diff --git a/package-lock.json b/package-lock.json
diff --git a/public/app.js b/public/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,5 +1,5 @@
 {
-    "/app.js": "/app.js?id=2c7db6aee86bcec654c10a02f3f81021",
+    "/app.js": "/app.js?id=3ddbff62c536804bfe9fb3e0a0157759",
     "/ui.js": "/ui.js?id=592866a715b1c20b43fff6ca7980b279",
     "/manifest.js": "/manifest.js?id=3267e5c99fd7b729e2f38ec55b50397d",
     "/app.css": "/app.css?id=4ac240e9b4c482451bf95d4161751414",
diff --git a/public/ui.js.LICENSE.txt b/public/ui.js.LICENSE.txt
@@ -0,0 +1,31 @@
+/*! #__NO_SIDE_EFFECTS__ */
+
+/**
+* @vue/compiler-core v3.5.13
+* (c) 2018-present Yuxi (Evan) You and Vue contributors
+* @license MIT
+**/
+
+/**
+* @vue/reactivity v3.5.13
+* (c) 2018-present Yuxi (Evan) You and Vue contributors
+* @license MIT
+**/
+
+/**
+* @vue/runtime-core v3.5.13
+* (c) 2018-present Yuxi (Evan) You and Vue contributors
+* @license MIT
+**/
+
+/**
+* @vue/runtime-dom v3.5.13
+* (c) 2018-present Yuxi (Evan) You and Vue contributors
+* @license MIT
+**/
+
+/**
+* @vue/shared v3.5.13
+* (c) 2018-present Yuxi (Evan) You and Vue contributors
+* @license MIT
+**/
diff --git a/resources/js/mixins/PerformsSearches.js b/resources/js/mixins/PerformsSearches.js
@@ -14,7 +14,7 @@ export default {
      * @param {object} resource
      */
     selectResource(resource) {
-      this.selectedResourceId = resource.value
+      this.selectedResourceId = resource?.value ?? null
 
       if (this.field) {
         if (typeof this['emitFieldValueChange'] == 'function') {
diff --git a/src/Actions/ActionEvent.php b/src/Actions/ActionEvent.php
@@ -52,7 +52,7 @@ class ActionEvent extends Model
      */
     public function user()
     {
-        return $this->belongsTo(Util::userModel(), 'user_id');
+        return $this->belongsTo(Util::userModelOrFallback(), 'user_id');
     }
 
     /**
@@ -62,7 +62,9 @@ public function user()
      */
     public function target()
     {
-        $queryWithTrashed = static fn ($query) => $query->withTrashed();
+        $queryWithTrashed = static function ($query) {
+            return $query->withTrashed();
+        };
 
         return $this->morphTo('target', 'target_type', 'target_id')
                     ->constrain(
diff --git a/src/Http/Controllers/ImpersonateController.php b/src/Http/Controllers/ImpersonateController.php
@@ -22,9 +22,10 @@ public function startImpersonating(NovaRequest $request, ImpersonatesUsers $impe
         }
 
         /** @var class-string<\Illuminate\Contracts\Auth\Authenticatable&\Illuminate\Database\Eloquent\Model> $userModel */
-        $userModel = with(Nova::modelInstanceForKey($request->input('resource')), static function ($model) {
-            return ! \is_null($model) ? $model::class : Util::userModel();
-        });
+        $userModel = with(
+            Nova::modelInstanceForKey($request->input('resource')),
+            static fn ($model) => ! \is_null($model) ? $model::class : Util::userModel()
+        );
 
         $authGuard = Util::sessionAuthGuardForModel($userModel);
 
diff --git a/src/Nova.php b/src/Nova.php
@@ -598,7 +598,7 @@ protected static function defaultCreateUserCommandCallback(): callable
     protected static function defaultCreateUserCallback(): Closure
     {
         return function ($name, $email, $password) {
-            $model = Util::userModel();
+            $model = Util::userModelOrFallback();
 
             return tap((new $model)->forceFill([
                 'name' => $name,
diff --git a/src/PendingFortifyConfiguration.php b/src/PendingFortifyConfiguration.php
@@ -346,11 +346,7 @@ public function bootstrap(): void
         /** @var \Laravel\Nova\PendingRouteRegistration $routes */
         $routes = Nova::routes();
 
-        if ($this->withFrontendRoutes === true && $routes->withAuthentication === false && $routes->withPasswordReset === false) {
-            return;
-        }
-
-        Nova::serving(function (ServingNova $event) {
+        Nova::serving(function (ServingNova $event) use ($routes) {
             $this->sync();
 
             /** @var \Illuminate\Contracts\Foundation\Application $app */
@@ -359,13 +355,28 @@ public function bootstrap(): void
             $app->scoped(StatefulGuard::class, static fn () => Auth::guard(Util::userGuard()));
             $app->scoped(RedirectAsIntended::class, RedirectAsIntendedForNova::class);
 
-            $app->scoped(LoginViewResponseContract::class, LoginViewResponse::class);
-            $app->scoped(LoginResponseContract::class, LoginResponse::class);
-            $app->scoped(LogoutResponseContract::class, LogoutResponse::class);
-
-            $app->scoped(ResetPasswordViewResponseContract::class, ResetPasswordViewResponse::class);
-            $app->scoped(RequestPasswordResetLinkViewResponseContract::class, RequestPasswordResetLinkViewResponse::class);
-            $app->scoped(ResetsUserPasswordsContract::class, ResetUserPassword::class);
+            if ($routes->withAuthentication === true) {
+                $app->scoped(LoginViewResponseContract::class, LoginViewResponse::class);
+                $app->scoped(LoginResponseContract::class, LoginResponse::class);
+                $app->scoped(LogoutResponseContract::class, LogoutResponse::class);
+                $app->scoped(TwoFactorChallengeViewResponseContract::class, TwoFactorChallengeViewResponse::class);
+                $app->scoped(TwoFactorLoginResponseContract::class, TwoFactorLoginResponse::class);
+                $app->scoped(FortifyRedirectIfTwoFactorAuthenticatable::class, RedirectIfTwoFactorAuthenticatable::class);
+            }
+
+            if ($routes->withPasswordReset === true) {
+                $app->scoped(ResetPasswordViewResponseContract::class, ResetPasswordViewResponse::class);
+                $app->scoped(RequestPasswordResetLinkViewResponseContract::class, RequestPasswordResetLinkViewResponse::class);
+                $app->scoped(ResetsUserPasswordsContract::class, ResetUserPassword::class);
+
+                ResetPassword::toMailUsing(static function ($notifiable, $token) {
+                    return (new MailMessage)
+                        ->subject(Nova::__('Reset Password Notification'))
+                        ->line(Nova::__('You are receiving this email because we received a password reset request for your account.'))
+                        ->action(Nova::__('Reset Password'), route('nova.pages.password.reset', ['token' => $token]))
+                        ->line(Nova::__('If you did not request a password reset, no further action is required.'));
+                });
+            }
 
             $app->scoped(VerifyEmailViewResponseContract::class, VerifyEmailViewResponse::class);
 
@@ -375,19 +386,6 @@ public function bootstrap(): void
             $app->scoped(ConfirmPasswordViewResponseContract::class, ConfirmPasswordViewResponse::class);
             $app->scoped(PasswordConfirmedResponseContract::class, PasswordConfirmedResponse::class);
             $app->scoped(FailedPasswordConfirmationResponseContract::class, FailedPasswordConfirmationResponse::class);
-
-            $app->scoped(TwoFactorChallengeViewResponseContract::class, TwoFactorChallengeViewResponse::class);
-            $app->scoped(TwoFactorLoginResponseContract::class, TwoFactorLoginResponse::class);
-
-            $app->scoped(FortifyRedirectIfTwoFactorAuthenticatable::class, RedirectIfTwoFactorAuthenticatable::class);
-
-            ResetPassword::toMailUsing(static function ($notifiable, $token) {
-                return (new MailMessage)
-                    ->subject(Nova::__('Reset Password Notification'))
-                    ->line(Nova::__('You are receiving this email because we received a password reset request for your account.'))
-                    ->action(Nova::__('Reset Password'), route('nova.pages.password.reset', ['token' => $token]))
-                    ->line(Nova::__('If you did not request a password reset, no further action is required.'));
-            });
         });
     }
 }
diff --git a/src/PendingRouteRegistration.php b/src/PendingRouteRegistration.php
@@ -238,7 +238,12 @@ protected function bootstrapAuthenticationRoutes(Application $app): void
     {
         $limiter = config('fortify.limiters.login');
 
-        if ($this->withAuthentication === true) {
+        if ($this->withAuthentication === false && ! empty($this->loginPath)) {
+            Nova::router(middleware: $this->authenticationMiddlewares)
+                ->group(function (Router $router) {
+                    $router->redirect('/login', $this->loginPath)->name('nova.pages.login');
+                });
+        } else {
             if (
                 $this->withDefaultAuthentication === true
                 && ! Route::has('login')
@@ -259,14 +264,17 @@ protected function bootstrapAuthenticationRoutes(Application $app): void
                 ->group(static function (Router $router) {
                     $router->post('/logout', [AuthenticatedSessionController::class, 'destroy'])->name('nova.logout');
                 });
-        } elseif (! empty($this->loginPath)) {
-            Nova::router(middleware: $this->authenticationMiddlewares)
-                ->group(function (Router $router) {
-                    $router->redirect('/login', $this->loginPath)->name('nova.pages.login');
-                });
         }
 
-        if ($this->withPasswordReset === true || Nova::fortify()->enabled(Features::resetPasswords())) {
+        if ($this->withPasswordReset === false && ! empty($this->forgotPasswordPath)) {
+            Nova::router(middleware: $this->passwordResetMiddlewares)
+                ->group(function (Router $router) {
+                    $router->redirect('/password/reset', $this->forgotPasswordPath)->name('nova.pages.password.email');
+                });
+        } elseif (
+            $this->withPasswordReset === true
+            || (Nova::fortify()->enabled(Features::resetPasswords()) && $this->withDefaultAuthentication === true)
+        ) {
             Nova::router(middleware: $this->passwordResetMiddlewares)
                 ->group(static function (Router $router) {
                     $router->get('/password/reset', [PasswordResetLinkController::class, 'create'])->name('nova.pages.password.email');
diff --git a/src/Util.php b/src/Util.php
@@ -7,6 +7,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\Concerns\AsPivot;
 use Illuminate\Database\Eloquent\Relations\Pivot;
+use Illuminate\Foundation\Auth\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use RuntimeException;
@@ -147,6 +148,16 @@ public static function userModel(): ?string
         return static::userModelFromGuard(static::userGuard());
     }
 
+    /**
+     * Get the user model for Laravel Nova, use default User model available from Framework as fallback.
+     *
+     * @return class-string<\Illuminate\Foundation\Auth\User|\Illuminate\Database\Eloquent\Model>
+     */
+    public static function userModelOrFallback(): string
+    {
+        return static::userModel() ?? User::class;
+    }
+
     /**
      * Get the user model for Laravel Nova.
      *

Original file line number	Diff line number	Diff line change
`@@ -169,5 +169,5 @@`
`169`	`169`	`},`
`170`	`170`	`"minimum-stability": "dev",`
`171`	`171`	`"prefer-stable": true,`
`172`		`- "version": "5.4.0"`
	`172`	`+ "version": "5.4.1"`
`173`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "/app.js": "/app.js?id=2c7db6aee86bcec654c10a02f3f81021",`
	`2`	`+ "/app.js": "/app.js?id=3ddbff62c536804bfe9fb3e0a0157759",`
`3`	`3`	`"/ui.js": "/ui.js?id=592866a715b1c20b43fff6ca7980b279",`
`4`	`4`	`"/manifest.js": "/manifest.js?id=3267e5c99fd7b729e2f38ec55b50397d",`
`5`	`5`	`"/app.css": "/app.css?id=4ac240e9b4c482451bf95d4161751414",`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class ActionEvent extends Model`
`52`	`52`	`*/`
`53`	`53`	`public function user()`
`54`	`54`	`{`
`55`		`- return $this->belongsTo(Util::userModel(), 'user_id');`
	`55`	`+ return $this->belongsTo(Util::userModelOrFallback(), 'user_id');`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`/**`
`@@ -62,7 +62,9 @@ public function user()`
`62`	`62`	`*/`
`63`	`63`	`public function target()`
`64`	`64`	`{`
`65`		`- $queryWithTrashed = static fn ($query) => $query->withTrashed();`
	`65`	`+ $queryWithTrashed = static function ($query) {`
	`66`	`+ return $query->withTrashed();`
	`67`	`+ };`
`66`	`68`
`67`	`69`	`return $this->morphTo('target', 'target_type', 'target_id')`
`68`	`70`	`->constrain(`
Original file line number	Diff line number	Diff line change
`@@ -598,7 +598,7 @@ protected static function defaultCreateUserCommandCallback(): callable`
`598`	`598`	`protected static function defaultCreateUserCallback(): Closure`
`599`	`599`	`{`
`600`	`600`	`return function ($name, $email, $password) {`
`601`		`- $model = Util::userModel();`
	`601`	`+ $model = Util::userModelOrFallback();`
`602`	`602`
`603`	`603`	`return tap((new $model)->forceFill([`
`604`	`604`	`'name' => $name,`