Merge remote-tracking branch 'origin/main' into skip-unverified-emails

# Conflicts:
#	app/Listeners/SuppressMailNotificationListener.php
#	package-lock.json

Author: simonhamp

app/Filament/Resources/UserResource.php

@@ -2,7 +2,6 @@
 
 namespace App\Filament\Resources;
 
-use App\Enums\StripeConnectStatus;
 use App\Filament\Resources\UserResource\Pages;
 use App\Filament\Resources\UserResource\RelationManagers;
 use App\Models\User;
@@ -38,11 +37,11 @@ public static function form(Schema $schema): Schema
                             ->email()
                             ->required()
                             ->maxLength(255),
-                        Forms\Components\DateTimePicker::make('email_verified_at'),
                         Forms\Components\TextInput::make('password')
                             ->password()
                             ->dehydrated(fn ($state) => filled($state))
                             ->required(fn (string $context): bool => $context === 'create')
+                            ->hidden(fn (string $context): bool => $context === 'edit')
                             ->maxLength(255),
                     ]),
                 Schemas\Components\Section::make('Billing Information')
@@ -64,15 +63,26 @@ public static function form(Schema $schema): Schema
                             ->maxLength(255)
                             ->disabled(),
                     ]),
+                Schemas\Components\Section::make('Notifications')
+                    ->description('Once these are disabled, they cannot be re-enabled by an admin.')
+                    ->inlineLabel()
+                    ->columns(1)
+                    ->schema([
+                        Forms\Components\Toggle::make('receives_notification_emails')
+                            ->label('Email notifications')
+                            ->disabled(fn (?User $record) => $record && ! $record->receives_notification_emails),
+                        Forms\Components\Toggle::make('receives_new_plugin_notifications')
+                            ->label('New plugin notifications')
+                            ->disabled(fn (?User $record) => $record && ! $record->receives_new_plugin_notifications),
+                    ]),
                 Schemas\Components\Section::make('Developer Account')
                     ->inlineLabel()
                     ->columns(1)
                     ->visible(fn (?User $record) => $record?->developerAccount !== null)
                     ->schema([
-                        Forms\Components\Select::make('developerAccount.stripe_connect_status')
+                        Forms\Components\Placeholder::make('developerAccount.stripe_connect_status')
                             ->label('Stripe Connect Status')
-                            ->options(StripeConnectStatus::class)
-                            ->disabled(),
+                            ->content(fn (User $record) => $record->developerAccount->stripe_connect_status?->label() ?? '—'),
                         Forms\Components\Placeholder::make('developerAccount.stripe_connect_account_id')
                             ->label('Stripe Connect Account')
                             ->content(fn (User $record) => new HtmlString(

app/Http/Controllers/Auth/CustomerAuthController.php

@@ -9,6 +9,7 @@
 use App\Models\TeamUser;
 use App\Models\User;
 use App\Services\CartService;
+use Illuminate\Auth\Events\Registered;
 use Illuminate\Auth\Passwords\PasswordBroker;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
@@ -45,6 +46,8 @@ public function register(Request $request): RedirectResponse
             'password' => Hash::make($request->password),
         ]);
 
+        event(new Registered($user));
+
         Auth::login($user);
 
         // Transfer guest cart to user

app/Http/Controllers/Auth/EmailVerificationController.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\EmailVerificationRequest;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+
+class EmailVerificationController extends Controller
+{
+    public function notice(): RedirectResponse
+    {
+        return to_route('dashboard');
+    }
+
+    public function verify(EmailVerificationRequest $request): RedirectResponse
+    {
+        $request->fulfill();
+
+        return to_route('dashboard')->with('success', 'Your email address has been verified.');
+    }
+
+    public function resend(Request $request): RedirectResponse
+    {
+        $request->user()->sendEmailVerificationNotification();
+
+        return back()->with('status', 'A new verification link has been sent to your email address.');
+    }
+}

app/Http/Controllers/NotificationUnsubscribeController.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\User;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\View\View;
+
+class NotificationUnsubscribeController extends Controller
+{
+    public function unsubscribe(Request $request, User $user): RedirectResponse|View
+    {
+        $user->update(['receives_new_plugin_notifications' => false]);
+
+        if ($request->user()?->is($user)) {
+            return redirect()
+                ->route('customer.settings', ['tab' => 'notifications'])
+                ->with('new-plugin-notifications-disabled', true);
+        }
+
+        return view('notifications.unsubscribed', [
+            'maskedEmail' => $this->maskEmail($user->email),
+            'resubscribeUrl' => $this->signedResubscribeUrl($user),
+        ]);
+    }
+
+    public function resubscribe(Request $request, User $user): RedirectResponse|View
+    {
+        $user->update(['receives_new_plugin_notifications' => true]);
+
+        if ($request->user()?->is($user)) {
+            return redirect()
+                ->route('customer.settings', ['tab' => 'notifications'])
+                ->with('new-plugin-notifications-enabled', true);
+        }
+
+        return view('notifications.resubscribed', [
+            'maskedEmail' => $this->maskEmail($user->email),
+        ]);
+    }
+
+    public static function signedUnsubscribeUrl(User $user): string
+    {
+        return url()->signedRoute('notifications.unsubscribe', ['user' => $user]);
+    }
+
+    private function signedResubscribeUrl(User $user): string
+    {
+        return url()->signedRoute('notifications.resubscribe', ['user' => $user]);
+    }
+
+    private function maskEmail(string $email): string
+    {
+        [$local, $domain] = explode('@', $email);
+
+        if (strlen($local) <= 2) {
+            $maskedLocal = $local[0].str_repeat('*', max(1, strlen($local) - 1));
+        } else {
+            $maskedLocal = $local[0].str_repeat('*', strlen($local) - 2).$local[strlen($local) - 1];
+        }
+
+        return $maskedLocal.'@'.$domain;
+    }
+}

app/Jobs/SyncPluginReleases.php

@@ -78,7 +78,17 @@ public function handle(SatisService $satisService): void
             }
         }
 
-        $this->plugin->update(['last_synced_at' => now()]);
+        $updateData = ['last_synced_at' => now()];
+
+        if ($this->hasNewReleases) {
+            $latestVersion = $this->plugin->versions()->latest('published_at')->first();
+
+            if ($latestVersion) {
+                $updateData['latest_version'] = $latestVersion->version;
+            }
+        }
+
+        $this->plugin->update($updateData);
 
         Log::info('[SyncPluginReleases] Processing complete', [
             'plugin_id' => $this->plugin->id,

app/Listeners/SuppressMailNotificationListener.php

@@ -3,6 +3,7 @@
 namespace App\Listeners;
 
 use App\Models\User;
+use Illuminate\Auth\Notifications\VerifyEmail;
 use Illuminate\Notifications\Events\NotificationSending;
 
 class SuppressMailNotificationListener
@@ -17,10 +18,15 @@ public function handle(NotificationSending $event): bool
             return true;
         }
 
+        // System notifications like email verification should always be sent
+        if ($event->notification instanceof VerifyEmail) {
+            return true;
+        }
+
         if (! $event->notifiable->email_verified_at) {
             return false;
         }
 
-        return $event->notifiable->receives_notification_emails;
+        return (bool) $event->notifiable->receives_notification_emails;
     }
 }

app/Models/User.php

@@ -2,13 +2,13 @@
 
 namespace App\Models;
 
-// use Illuminate\Contracts\Auth\MustVerifyEmail;
 use App\Enums\PriceTier;
 use App\Enums\Subscription;
 use App\Enums\TeamUserStatus;
 use Filament\Models\Contracts\FilamentUser;
 use Filament\Models\Contracts\HasName;
 use Filament\Panel;
+use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -19,7 +19,7 @@
 use Laravel\Cashier\Billable;
 use Laravel\Sanctum\HasApiTokens;
 
-class User extends Authenticatable implements FilamentUser, HasName
+class User extends Authenticatable implements FilamentUser, HasName, MustVerifyEmail
 {
     use Billable, HasApiTokens, HasFactory, Notifiable;
 

app/Notifications/NewPluginAvailable.php

@@ -2,7 +2,9 @@
 
 namespace App\Notifications;
 
+use App\Http\Controllers\NotificationUnsubscribeController;
 use App\Models\Plugin;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
@@ -30,12 +32,15 @@ public function via(object $notifiable): array
 
     public function toMail(object $notifiable): MailMessage
     {
+        /** @var User $notifiable */
+        $unsubscribeUrl = NotificationUnsubscribeController::signedUnsubscribeUrl($notifiable);
+
         return (new MailMessage)
             ->subject("New Plugin: {$this->plugin->name}")
             ->greeting('A new plugin is available!')
             ->line("**{$this->plugin->name}** has just been added to the NativePHP Plugin Marketplace.")
             ->action('View Plugin', route('plugins.show', $this->plugin->routeParams()))
-            ->line('[Manage your notification preferences]('.route('customer.settings', ['tab' => 'notifications']).').');
+            ->line('[Unsubscribe from new plugin notifications]('.$unsubscribeUrl.').');
     }
 
     /**