Merge branch '2025-05-09-remove-duplicate-vault-reminders' of github.com:cmpickle/monica into 2025-05-09-remove-duplicate-vault-reminders

Author: cmpickle

.devcontainer/devcontainer.json

@@ -1,14 +1,40 @@
 {
   "name": "PHP & SQLite",
-  "image": "ghcr.io/asbiin/devcontainers/php:8.3",
+  "image": "ghcr.io/asbiin/devcontainers/php:8.4",
+
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "dbaeumer.vscode-eslint",
+        "xdebug.php-debug",
+        "bmewburn.vscode-intelephense-client",
+        "xdebug.php-pack",
+        "devsense.phptools-vscode",
+        "mikestead.dotenv",
+        "editorconfig.editorconfig",
+        "esbenp.prettier-vscode",
+        "bradlc.vscode-tailwindcss",
+        "vue.volar",
+        "qwtel.sqlite-viewer"
+      ]
+    }
+  },
 
   // For use with PHP or Apache (e.g.php -S localhost:8080 or apache2ctl start)
   "forwardPorts": [8080],
   "features": {
+    "ghcr.io/devcontainers/features/common-utils:2": {},
     "ghcr.io/devcontainers/features/github-cli:1": {}
   },
 
   // Use 'postCreateCommand' to run commands after the container is created.
   "postCreateCommand": ".devcontainer/postCreate.sh",
-  "postStartCommand": ".devcontainer/postStart.sh"
+  "postStartCommand": ".devcontainer/postStart.sh",
+
+  // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+  // "remoteUser": "root",
+
+  "mounts": [
+    "source=${localEnv:HOME}${localEnv:USERPROFILE}/.ssh,target=/home/vscode/.ssh,type=bind,consistency=cached"
+  ]
 }

.env.example

@@ -26,6 +26,10 @@ APP_DEBUG=true
 # The URL of your application.
 APP_URL=http://localhost:8000
 
+# Ability to disable signups on your instance.
+# Can be true or false. Default to false.
+APP_DISABLE_SIGNUP=false
+
 # Database to store information
 # The documentation is here: https://laravel.com/docs/10.x/database
 # You can also see the different values you can use in config/database.php

.sonarlint/connectedMode.json

@@ -1,4 +1,5 @@
 {
   "sonarCloudOrganization": "monicahq",
-  "projectKey": "monica"
+  "projectKey": "monica",
+  "region": "EU"
 }

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+  "sonarlint.connectedMode.project": {
+    "connectionId": "monicahq",
+    "projectKey": "monica"
+  }
+}

app/Actions/Jetstream/UserProfile.php

@@ -3,8 +3,8 @@
 namespace App\Actions\Jetstream;
 
 use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
+use App\Models\WebauthnKey;
 use Illuminate\Http\Request;
-use LaravelWebauthn\Models\WebauthnKey;
 
 class UserProfile
 {
@@ -27,7 +27,7 @@ public function __invoke(Request $request, array $data): array
                 'id' => $key->id,
                 'name' => $key->name,
                 'type' => $key->type,
-                'last_active' => $key->updated_at->diffForHumans(),
+                'last_used' => optional($key->used_at)->diffForHumans(),
             ])
             ->toArray();
 

app/Console/Commands/SetupApplication.php

@@ -24,7 +24,9 @@ class SetupApplication extends Command
     protected $signature = 'monica:setup
                             {--force : Force the operation to run when in production.}
                             {--skip-storage-link : Skip storage link create.}
-                            {--skip-docs : Skip api docs generation.}';
+                            {--skip-docs : Skip api docs generation.}
+                            {--build : Run only build commands.}
+                            {--deploy : Run only deploy commands.}';
 
     /**
      * The console command description.
@@ -39,15 +41,17 @@ class SetupApplication extends Command
     public function handle(): void
     {
         if ($this->confirmToProceed()) {
-            $this->resetCache();
-            $this->clearConfig();
-            $this->symlink();
-            $this->migrate();
-            if ($this->option('skip-docs') !== true) {
+            if ($this->option('build') === true || ($this->option('build') === false && $this->option('deploy') === false)) {
+                $this->symlink();
+                $this->resetCache();
+                $this->clearConfig();
                 $this->documentation();
+                $this->cacheConfig();
+            }
+            if ($this->option('deploy') === true || ($this->option('build') === false && $this->option('deploy') === false)) {
+                $this->migrate();
+                $this->scout();
             }
-            $this->cacheConfig();
-            $this->scout();
         }
     }
 
@@ -69,7 +73,7 @@ protected function clearConfig(): void
         if ($this->getLaravel()->environment() == 'production') {
             $this->artisan('✓ Clear config cache', 'config:clear');
             $this->artisan('✓ Resetting route cache', 'route:cache');
-            $this->artisan('✓ Resetting view cache', 'view:clear');
+            $this->artisan('✓ Resetting view cache', 'view:cache');
             $this->artisan('✓ Resetting event cache', 'event:cache');
         } else {
             $this->artisan('✓ Clear config cache', 'config:clear');
@@ -124,7 +128,9 @@ protected function scout(): void
      */
     protected function documentation(): void
     {
-        $this->artisan('✓ Generate api documentation', 'scribe:setup', ['--clean' => true, '--force' => true]);
+        if ($this->option('skip-docs') !== true) {
+            $this->artisan('✓ Generate api documentation', 'scribe:setup', ['--clean' => true, '--force' => true]);
+        }
     }
 
     private function artisan(string $message, string $command, array $options = [])

app/Domains/Contact/ManageContactAddresses/Web/Controllers/ContactModuleAddressController.php

@@ -77,7 +77,7 @@ public function update(Request $request, string $vaultId, string $contactId, int
         $contact = Contact::find($contactId);
 
         // update pivot table
-        $contact->addresses()->where('address_id', $addressId)->update([
+        $contact->addresses()->updateExistingPivot($addressId, [
             'is_past_address' => $request->input('is_past_address'),
         ]);
 

app/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedAddress.php

@@ -3,6 +3,7 @@
 namespace App\Domains\Contact\ManageContactFeed\Web\ViewHelpers\Actions;
 
 use App\Helpers\MapHelper;
+use App\Models\Address;
 use App\Models\ContactFeedItem;
 use App\Models\User;
 
@@ -15,7 +16,7 @@ public static function data(ContactFeedItem $item, User $user): array
 
         return [
             'address' => [
-                'object' => $address ? [
+                'object' => $address instanceof Address ? [
                     'id' => $address->id,
                     'line_1' => $address->line_1,
                     'line_2' => $address->line_2,

app/Domains/Contact/ManageDocuments/Listeners/DeleteFileInStorage.php

@@ -28,11 +28,6 @@ class DeleteFileInStorage
      */
     public Api $api;
 
-    /**
-     * Create the event listener.
-     */
-    public function __construct() {}
-
     /**
      * Handle the event.
      */

app/Domains/Contact/ManageLoans/Web/ViewHelpers/ModuleLoanViewHelper.php

@@ -21,7 +21,7 @@ public static function data(Contact $contact, User $user): array
             ->concat($loansAsLoanee)
             ->sortBy('loaned_at')
             ->unique('id')
-            ->map(fn (Loan $loan): array => self::dtoLoan($loan, $contact, $user)); // @phpstan-ignore-line
+            ->map(fn (Loan $loan): array => self::dtoLoan($loan, $contact, $user));
 
         return [
             'loans' => $loansAssociatedWithContactCollection,

app/Domains/Vault/ManageVaultSettings/Web/ViewHelpers/VaultSettingsIndexViewHelper.php

@@ -31,7 +31,7 @@ public static function data(Vault $vault): array
         $usersInAccount = $vault->account->users()->whereNotNull('email_verified_at')->get();
         $usersInVault = $vault->users()->get();
         $usersInAccount = $usersInAccount->diff($usersInVault);
-        $usersInAccountCollection = $usersInAccount->map(fn (User $user): array => self::dtoUser($user, $vault)); // @phpstan-ignore-line
+        $usersInAccountCollection = $usersInAccount->map(fn (User $user): array => self::dtoUser($user, $vault));
         $usersInVaultCollection = $usersInVault->map(fn (User $user): array => self::dtoUser($user, $vault));
 
         // labels

app/Helpers/SignupHelper.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Helpers;
+
+use App\Models\Account;
+use Illuminate\Config\Repository as Config;
+
+class SignupHelper
+{
+    /**
+     * Create a new instance.
+     *
+     * @return void
+     */
+    public function __construct(
+        private Config $config
+    ) {}
+
+    /**
+     * Check if signup is enabled.
+     */
+    public function isEnabled(): bool
+    {
+        return ! ($this->isDisabledByConfig() && $this->hasAtLeastOneAccount());
+    }
+
+    private function isDisabledByConfig(): bool
+    {
+        return $this->config->get('monica.disable_signup', false);
+    }
+
+    private function hasAtLeastOneAccount(): bool
+    {
+        return ! empty(Account::first());
+    }
+}

app/Http/Controllers/Auth/LoginController.php

@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers\Auth;
 
+use App\Helpers\SignupHelper;
 use App\Helpers\WallpaperHelper;
 use App\Http\Controllers\Controller;
-use App\Models\User;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Cookie;
+use Illuminate\Http\Response as HttpResponse;
 use Illuminate\Support\Facades\Route;
 use Inertia\Inertia;
 use Inertia\Response;
@@ -30,20 +30,27 @@ public function __invoke(Request $request): Response
 
         $data = [];
 
-        if ($webauthnRemember = $request->cookie('webauthn_remember')) {
-            if (($user = User::find($webauthnRemember)) && $user->webauthnKeys()->count() > 0) {
-                $data['publicKey'] = Webauthn::prepareAssertion($user);
-                $data['userName'] = $user->name;
-            } else {
-                Cookie::expire('webauthn_remember');
-            }
+        if (Webauthn::userless()) {
+            $data['publicKey'] = Webauthn::prepareAssertion(null);
+            $data['userless'] = true;
+            $data['autologin'] = $request->cookie('return') === 'true';
         }
 
         return Inertia::render('Auth/Login', $data + [
+            'isSignupEnabled' => app(SignupHelper::class)->isEnabled(),
             'canResetPassword' => Route::has('password.request'),
             'status' => session('status'),
             'wallpaperUrl' => WallpaperHelper::getRandomWallpaper(),
             'providers' => $providers,
+            'beta' => $request->cookie('beta') !== 'false',
         ]);
     }
+
+    /**
+     * Remove beta text box.
+     */
+    public function closeBeta(Request $request): HttpResponse
+    {
+        return response([])->cookie('beta', 'false', 60 * 24 * 365);
+    }
 }

app/Http/Controllers/Auth/RegisterController.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Inertia\Inertia;
+use Inertia\Response;
+
+class RegisterController extends Controller
+{
+    /**
+     * Display the register view.
+     */
+    public function __invoke(Request $request): Response
+    {
+        $providers = collect(config('auth.login_providers'))
+            ->filter(fn ($provider) => ! empty($provider))
+            ->mapWithKeys(fn ($provider) => [
+                $provider => [
+                    'name' => config("services.$provider.name") ?? trans_ignore("auth.login_provider_{$provider}"),
+                    'logo' => config("services.$provider.logo") ?? "/img/auth/$provider.svg",
+                ],
+            ]);
+
+        return Inertia::render('Auth/Register', [
+            'providers' => $providers,
+            'beta' => $request->cookie('beta') !== 'false',
+        ]);
+    }
+}

app/Http/Middleware/EnsureSignupIsEnabled.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use App\Helpers\SignupHelper;
+use Closure;
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class EnsureSignupIsEnabled
+{
+    /**
+     * Create a new middleware instance.
+     *
+     * @return void
+     */
+    public function __construct(
+        private Application $app,
+    ) {}
+
+    public function handle(Request $request, Closure $next): Response
+    {
+        abort_if(! $this->app[SignupHelper::class]->isEnabled(), 403, trans('Registration is currently disabled'));
+
+        return $next($request);
+    }
+}