wip

app/Http/Controllers/Auth/NewPasswordController.php

@@ -58,11 +58,9 @@ function ($user) use ($request) {
         );
 
         if ($status !== Password::PASSWORD_RESET) {
-            throw ValidationException::withMessages([
-                'email' => [__($status)],
-            ]);
+            return redirect()->back()->with('error', __($status));
         }
 
-        return redirect()->route('login')->with('status', __($status));
+        return redirect()->route('auth.login')->with('success', __($status));
     }
 }

app/Http/Controllers/Auth/PasswordResetLinkController.php

@@ -42,9 +42,10 @@ public function store(Request $request): RedirectResponse
             $request->only('email')
         );
 
-        return back()->with('status', [
-            'success' => $status === Password::RESET_LINK_SENT,
-            'message' => __($status),
-        ]);
+        $successOrError = $status === Password::RESET_LINK_SENT
+            ? 'success'
+            : 'error';
+
+        return redirect()->back()->with($successOrError, __($status));
     }
 }

app/Http/Middleware/HandleInertiaRequests.php

@@ -19,6 +19,7 @@ public function share(Request $request): array
             [
                 'appName' => config('app.name'),
                 'auth' => $this->getCurrentUser($request->user()),
+                'flash' => fn () => $this->flash($request),
             ]
         );
     }
@@ -40,4 +41,26 @@ protected function getCurrentUser(?User $user): ?UserResource
             ? UserResource::make($user)
             : null;
     }
+
+    protected function flash(Request $request): ?array
+    {
+        if (! $request->hasSession()) {
+            return null;
+        }
+
+        $type = match (true) {
+            $request->session()->has('error') => 'error',
+            $request->session()->has('success') => 'success',
+            default => null,
+        };
+
+        if ($type === null) {
+            return null;
+        }
+
+        return [
+            'success' => $type === 'success',
+            'message' => $request->session()->get($type),
+        ];
+    }
 }

app/Models/User.php

@@ -7,7 +7,6 @@
 // use Illuminate\Contracts\Auth\MustVerifyEmail;
 use App\Http\Resources\IssueResource;
 use App\Http\Resources\MapPointResource;
-use App\Notifications\User\ResetPasswordNotification as UserResetPasswordNotification;
 use Filament\Models\Contracts\FilamentUser;
 use Filament\Models\Contracts\HasAvatar;
 use Filament\Models\Contracts\HasName;
@@ -160,11 +159,6 @@ private static function getAddress($fields)
         return null;
     }
 
-    public function sendPasswordResetNotification($token)
-    {
-        $this->notify(new UserResetPasswordNotification($token));
-    }
-
     public function issues(): HasMany
     {
         return $this->hasMany(Issue::class);

app/Providers/AuthServiceProvider.php

@@ -5,6 +5,8 @@
 namespace App\Providers;
 
 // use Illuminate\Support\Facades\Gate;
+
+use Illuminate\Auth\Notifications\ResetPassword;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 use Illuminate\Validation\Rules\Password;
 
@@ -27,5 +29,12 @@ public function boot(): void
                 ->numbers()
                 ->symbols();
         });
+
+        ResetPassword::$createUrlCallback = function ($notifiable, $token) {
+            return route('auth.password.reset', [
+                'token' => $token,
+                'email' => $notifiable->getEmailForPasswordReset(),
+            ]);
+        };
     }
 }

config/app.php

@@ -172,7 +172,6 @@
         App\Providers\Filament\AdminPanelProvider::class,
         App\Providers\RouteServiceProvider::class,
         Spatie\Permission\PermissionServiceProvider::class,
-
     ])->toArray(),
 
     /*
@@ -188,7 +187,6 @@
 
     'aliases' => Facade::defaultAliases()->merge([
         // 'Example' => App\Facades\Example::class,
-        'ReCaptcha' => Biscolab\ReCaptcha\Facades\ReCaptcha::class,
     ])->toArray(),
 
 ];

resources/js/Components/Dashboard/ChangePasswordForm.vue

@@ -33,6 +33,8 @@
                     required
                 />
             </div>
+
+            <Alert v-if="message" type="success" :message="message" />
         </div>
 
         <template #footer>
@@ -42,23 +44,28 @@
 </template>
 
 <script setup>
-    import { useForm, usePage } from '@inertiajs/vue3';
+    import { ref } from 'vue';
+    import { useForm } from '@inertiajs/vue3';
     import route from '@/Helpers/useRoute';
+    import Alert from '@/Components/Alert.vue';
     import Button from '@/Components/Button.vue';
     import Panel from '@/Components/Panel.vue';
     import Input from '@/Components/Form/Input.vue';
 
-    const page = usePage();
-
     const form = useForm({
         current_password: null,
         password: null,
         password_confirmation: null,
     });
 
+    const message = ref(null);
+
     const submit = () => {
         form.post(route('front.account.password'), {
-            onSuccess: () => form.reset(),
+            onSuccess: (page) => {
+                form.reset();
+                message.value = page.props.flash.message;
+            },
         });
     };
 </script>

resources/js/Components/Dashboard/UpdateProfileForm.vue

@@ -41,6 +41,8 @@
                     :errors="[form.errors.phone]"
                 />
             </div>
+
+            <Alert v-if="message" type="success" :message="message" />
         </div>
 
         <template #footer>
@@ -50,8 +52,10 @@
 </template>
 
 <script setup>
+    import { ref } from 'vue';
     import { useForm, usePage } from '@inertiajs/vue3';
     import route from '@/Helpers/useRoute';
+    import Alert from '@/Components/Alert.vue';
     import Button from '@/Components/Button.vue';
     import Panel from '@/Components/Panel.vue';
     import Input from '@/Components/Form/Input.vue';
@@ -65,7 +69,13 @@
         phone: page.props.auth.phone,
     });
 
+    const message = ref(null);
+
     const submit = () => {
-        form.post(route('front.account.profile'));
+        form.post(route('front.account.profile'), {
+            onSuccess: (page) => {
+                message.value = page.props.flash.message;
+            },
+        });
     };
 </script>

resources/js/Components/Form/Input.vue

@@ -12,13 +12,14 @@
                 :placeholder="placeholder"
                 :required="required"
                 :disabled="disabled"
+                :readonly="readonly"
             />
         </template>
     </FormField>
 </template>
 
 <script setup>
-    import { computed, ref } from 'vue';
+    import { computed } from 'vue';
     import { CheckIcon } from '@heroicons/vue/16/solid';
     import InputText from 'primevue/inputtext';
     import FormField from '@/Components/Form/Field.vue';
@@ -40,6 +41,10 @@
             type: Boolean,
             default: false,
         },
+        readonly: {
+            type: Boolean,
+            default: false,
+        },
         label: {
             type: String,
             default: null,

resources/js/Layouts/AuthLayout.vue

@@ -15,9 +15,9 @@
 
                 <div class="mt-10">
                     <Alert
-                        v-if="$page.props.status"
-                        :type="$page.props.status.success ? 'success' : 'error'"
-                        :message="$page.props.status.message"
+                        v-if="$page.props.flash"
+                        :type="$page.props.flash.success ? 'success' : 'error'"
+                        :message="$page.props.flash.message"
                         class="mb-6"
                     />
 
@@ -29,7 +29,7 @@
         <div
             class="flex flex-col items-center justify-center flex-1 px-4 py-12 sm:px-6 lg:px-20 xl:px-24 bg-primary-700"
         >
-            <div class="prose text-white prose-headings:text-white">
+            <div class="prose-sm prose text-white sm:prose-base prose-headings:text-white">
                 <slot name="backdrop" />
             </div>
         </div>

resources/js/Pages/Auth/ForgotPassword.vue

@@ -14,7 +14,7 @@
             </ul>
         </template>
 
-        <form class="grid gap-6" @submit.prevent="reset">
+        <form class="grid gap-6" @submit.prevent="submit">
             <Input
                 name="email"
                 type="email"
@@ -49,18 +49,11 @@
     import Button from '@/Components/Button.vue';
     import Input from '@/Components/Form/Input.vue';
 
-    defineProps({
-        canResetPassword: {
-            type: Boolean,
-            default: false,
-        },
-    });
-
     const form = useForm({
         email: null,
     });
 
-    const reset = () => {
+    const submit = () => {
         form.post(route('auth.password.request'), {
             onSuccess: () => form.reset(),
         });

resources/js/Pages/Auth/Login.vue

@@ -14,7 +14,7 @@
             </ul>
         </template>
 
-        <form class="grid gap-6" @submit.prevent="login">
+        <form class="grid gap-6" @submit.prevent="submit">
             <Input
                 name="email"
                 type="email"
@@ -73,10 +73,6 @@
             type: Boolean,
             default: false,
         },
-        status: {
-            type: String,
-            default: null,
-        },
     });
 
     const form = useForm({
@@ -85,7 +81,7 @@
         remember: false,
     });
 
-    const login = () => {
+    const submit = () => {
         form.post(route('auth.login'), {
             onFinish: () => form.reset('password'),
             replace: true,