From 28f162b5d6409d6a79c4d3c123dc7ba2bc1d4a75 Mon Sep 17 00:00:00 2001
From: Benjamin Takats <mail@benjamintakats.de>
Date: Thu, 1 Dec 2022 20:58:25 +0100
Subject: [PATCH] profile update changed

---
 .../Fortify/UpdateUserProfileInformation.php  | 23 ++++++++++++-------
 .../update-profile-information-form.blade.php |  2 +-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/app/Actions/Fortify/UpdateUserProfileInformation.php b/app/Actions/Fortify/UpdateUserProfileInformation.php
index c7576323..44499326 100644
--- a/app/Actions/Fortify/UpdateUserProfileInformation.php
+++ b/app/Actions/Fortify/UpdateUserProfileInformation.php
@@ -14,15 +14,19 @@ class UpdateUserProfileInformation implements UpdatesUserProfileInformation
      *
      * @param  mixed  $user
      * @param  array  $input
+     *
      * @return void
      */
     public function update($user, array $input)
     {
         Validator::make($input, [
-            'name' => ['required', 'string', 'max:255'],
-            'email' => ['required', 'email', 'max:255', Rule::unique('users')->ignore($user->id)],
+            'name'  => ['required', 'string', 'max:255'],
+            'email' => ['email', 'max:255', Rule::unique('users')
+                                                ->ignore($user->id)
+            ],
             'photo' => ['nullable', 'mimes:jpg,jpeg,png', 'max:1024'],
-        ])->validateWithBag('updateProfileInformation');
+        ])
+                 ->validateWithBag('updateProfileInformation');
 
         if (isset($input['photo'])) {
             $user->updateProfilePhoto($input['photo']);
@@ -33,9 +37,10 @@ class UpdateUserProfileInformation implements UpdatesUserProfileInformation
             $this->updateVerifiedUser($user, $input);
         } else {
             $user->forceFill([
-                'name' => $input['name'],
+                'name'  => $input['name'],
                 'email' => $input['email'],
-            ])->save();
+            ])
+                 ->save();
         }
     }
 
@@ -44,15 +49,17 @@ class UpdateUserProfileInformation implements UpdatesUserProfileInformation
      *
      * @param  mixed  $user
      * @param  array  $input
+     *
      * @return void
      */
     protected function updateVerifiedUser($user, array $input)
     {
         $user->forceFill([
-            'name' => $input['name'],
-            'email' => $input['email'],
+            'name'              => $input['name'],
+            'email'             => $input['email'],
             'email_verified_at' => null,
-        ])->save();
+        ])
+             ->save();
 
         $user->sendEmailVerificationNotification();
     }
diff --git a/resources/views/profile/update-profile-information-form.blade.php b/resources/views/profile/update-profile-information-form.blade.php
index dd7bdd8c..e1e84f59 100644
--- a/resources/views/profile/update-profile-information-form.blade.php
+++ b/resources/views/profile/update-profile-information-form.blade.php
@@ -67,7 +67,7 @@
             <x-jet-input id="email" type="email" class="mt-1 block w-full" wire:model.defer="state.email"/>
             <x-jet-input-error for="email" class="mt-2"/>
 
-            @if (Laravel\Fortify\Features::enabled(Laravel\Fortify\Features::emailVerification()) && ! $this->user->hasVerifiedEmail())
+            @if (Laravel\Fortify\Features::enabled(Laravel\Fortify\Features::emailVerification()) && !$this->user->hasVerifiedEmail() && $this->user->email)
                 <p class="text-sm mt-2">
                     {{ __('Your email address is unverified.') }}