From f8664216597e8a14fca667ffda92f0f9083951f6 Mon Sep 17 00:00:00 2001
From: awkawb <bryant.gitea@fastmail.com>
Date: Fri, 27 Dec 2024 15:50:00 -0500
Subject: [PATCH] default.nix: updated Invoice Ninja version, added patch to
 disable react

---
 default.nix                   | 31 +++++++++++++------------------
 disable-react-for-admin.patch | 13 +++++++++++++
 2 files changed, 26 insertions(+), 18 deletions(-)
 create mode 100644 disable-react-for-admin.patch

diff --git a/default.nix b/default.nix
index 6defb92..1f38465 100644
--- a/default.nix
+++ b/default.nix
@@ -7,26 +7,23 @@
 , runtimeDir ? "/run/invoice-ninja"
 }:
 
-let
-  # Helper script to generate an APP_KEY for .env
-  generate-invoice-ninja-app-key = writers.writeBashBin "generate-laravel-key" ''
-    echo "APP_KEY=base64:$(${openssl}/bin/openssl rand -base64 32)"
-  '';
-in
 php.buildComposerProject (finalAttrs: {
   pname = "invoice-ninja";
-  version = "5.10.3";
+  version = "5.11.3";
 
   src = fetchFromGitHub {
     owner = "invoiceninja";
     repo = "invoiceninja";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-QL6L+yT1yRQUTTGYGjaC4zbvzgw4ozgJSP2bYJCf014=";
+    hash = "sha256-PsDHQAFy7fnz03zTdJtcUzOVKT6jjHv0DmVmyLAOwkc=";
   };
 
-  vendorHash = "sha256-LGNBgaWWX2a8w9uE3+fVtBDqgbcv69FNnka4HjZKqsQ=";
+  vendorHash = "sha256-RA7IkPXz1HdqQAyB/VIbYg3BmCnlJKLxIVtODIRmZxg=";
 
-  propagatedBuildInput = [ generate-invoice-ninja-app-key ];
+  # Patch sources for more restrictive permissions
+  patches = [
+    ./disable-react-for-admin.patch
+  ];
 
   # Upstream composer.json has invalid license, webpatser/laravel-countries package is pointing
   # to commit-ref, and php required in require and require-dev
@@ -36,21 +33,19 @@ php.buildComposerProject (finalAttrs: {
     mv "$out/share/php/${finalAttrs.pname}"/* $out
     rm -R $out/bootstrap/cache
 
+    rm -rf $out/public/storage
+
     # Move static contents for the NixOS module to pick it up, if needed.
     mv $out/bootstrap $out/bootstrap-static
     mv $out/storage $out/storage-static
-    mv $out/vite.config.ts $out/vite.config.ts.static
-    mv $out/public/images $out/public/images-static
-    mv $out/public/react $out/public/react-static
+    mv $out/vendor/bin $out/vendor/bin-static
 
-    ln -s ${dataDir}/public/images $out/public/
-    ln -s ${dataDir}/public/react $out/public/
-    ln -s ${dataDir}/vite.config.ts $out/
+    # Link NixOS module files to derivation output
     ln -s ${dataDir}/.env $out/.env
     ln -s ${dataDir}/storage $out/
+    ln -s ${dataDir}/storage/app/public $out/public/storage
+    ln -s ${dataDir}/vendor/bin $out/vendor
     ln -s ${runtimeDir} $out/bootstrap
-
-    chmod +x $out/artisan
   '';
 
   meta = {
diff --git a/disable-react-for-admin.patch b/disable-react-for-admin.patch
new file mode 100644
index 0000000..d3f16f0
--- /dev/null
+++ b/disable-react-for-admin.patch
@@ -0,0 +1,13 @@
+diff --git a/app/Console/Commands/CreateAccount.php b/app/Console/Commands/CreateAccount.php
+index 228f8e8283..1ff3c54a61 100644
+--- a/app/Console/Commands/CreateAccount.php
++++ b/app/Console/Commands/CreateAccount.php
+@@ -79,7 +79,7 @@ class CreateAccount extends Command
+         $company->save();
+ 
+         $account->default_company_id = $company->id;
+-        $account->set_react_as_default_ap = true;
++        $account->set_react_as_default_ap = false;
+         $account->save();
+ 
+         $email = $this->option('email') ?? 'admin@example.com';