Merge branch 'develop' into main

app/Http/Livewire/DeleteUserForm.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Http\Livewire;
+
+use Illuminate\Contracts\Auth\StatefulGuard;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Validation\ValidationException;
+use Laravel\Jetstream\Contracts\DeletesUsers;
+use Livewire\Component;
+
+class DeleteUserForm extends Component
+{
+    /**
+     * Indicates if user deletion is being confirmed.
+     *
+     * @var bool
+     */
+    public $confirmingUserDeletion = false;
+
+    /**
+     * The user's current password.
+     *
+     * @var string
+     */
+    public $password = '';
+
+    /**
+     * Confirm that the user would like to delete their account.
+     *
+     * @return void
+     */
+    public function confirmUserDeletion()
+    {
+        $this->resetErrorBag();
+
+        $this->password = '';
+
+        $this->dispatchBrowserEvent('confirming-delete-user');
+
+        $this->confirmingUserDeletion = true;
+    }
+
+    /**
+     * Delete the current user.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Laravel\Jetstream\Contracts\DeletesUsers  $deleter
+     * @param  \Illuminate\Contracts\Auth\StatefulGuard  $auth
+     * @return \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse
+     */
+    public function deleteUser(Request $request, DeletesUsers $deleter, StatefulGuard $auth)
+    {
+        $this->resetErrorBag();
+        if(Auth::user()->passwordSet()) {
+            if (!Hash::check($this->password, Auth::user()->password)) {
+                throw ValidationException::withMessages([
+                    'password' => [__('This password does not match our records.')],
+                ]);
+            }
+        }
+
+        $deleter->delete(Auth::user()->fresh());
+
+        $auth->logout();
+
+        if ($request->hasSession()) {
+            $request->session()->invalidate();
+            $request->session()->regenerateToken();
+        }
+
+        return redirect(config('fortify.redirects.logout') ?? '/');
+    }
+
+    /**
+     * Render the component.
+     *
+     * @return \Illuminate\View\View
+     */
+    public function render()
+    {
+        return view('profile.delete-user-form');
+    }
+}

app/Models/User.php

@@ -184,17 +184,17 @@ public function addStrike($reason = 'No reason provided.')
         //TODO: check for three, then suspend
     }
 
-    public function gallery()
+    public function gallery(): HasMany
     {
         return $this->hasMany(Gallery::class);
     }
 
-    public function reviews()
+    public function reviews(): HasMany
     {
         return $this->hasMany(Review::class);
     }
 
-    public function ratings()
+    public function ratings(): HasManyThrough
     {
         return $this->hasManyThrough(Review::class, Commission::class, 'creator_id', 'commission_id');
     }
@@ -414,4 +414,9 @@ function () {
             }
         );
     }
+
+    public function passwordSet(): bool
+    {
+        return !(empty($this->password));
+    }
 }

app/Models/UserStatistic.php

@@ -6,6 +6,10 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
+/**
+ * The purpose of this model is to provide statistics about a user,
+ * primarily for the purpose of sorting a creator on the Explore page
+ */
 class UserStatistic extends Model
 {
     use HasFactory;

database/migrations/2023_12_22_002533_alter_tickets_make_user_id_nullable.php

@@ -4,8 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
-{
+return new class () extends Migration {
     /**
      * Run the migrations.
      *

resources/views/profile/delete-user-form.blade.php

@@ -26,7 +26,7 @@
 
             <x-slot name="content">
                 {{ __('Are you sure you want to delete your account? Once your account is deleted, all of its resources and data will be permanently deleted. Please enter your password to confirm you would like to permanently delete your account.') }}
-
+                @if(auth()->user()->passwordSet())
                 <div class="mt-4" x-data="{}" x-on:confirming-delete-user.window="setTimeout(() => $refs.password.focus(), 250)">
                     <x-jet-input type="password" class="mt-1 block w-3/4"
                                 placeholder="{{ __('Password') }}"
@@ -36,6 +36,7 @@
 
                     <x-jet-input-error for="password" class="mt-2" />
                 </div>
+                @endif
             </x-slot>
 
             <x-slot name="footer">

resources/views/profile/show.blade.php

@@ -13,7 +13,7 @@
                 <x-jet-section-border />
             @endif
 
-            @if (Laravel\Fortify\Features::enabled(Laravel\Fortify\Features::updatePasswords()))
+            @if (Laravel\Fortify\Features::enabled(Laravel\Fortify\Features::updatePasswords()) && $user->passwordSet())
                 <div class="mt-10 sm:mt-0">
                     @livewire('profile.update-password-form')
                 </div>
@@ -48,7 +48,7 @@
                 <x-jet-section-border />
 
                 <div class="mt-10 sm:mt-0">
-                    @livewire('profile.delete-user-form')
+                    @livewire('delete-user-form')
                 </div>
             @endif
         </div>