From df517cfbfafc6a4e4a625b9bf70dfca256a0f064 Mon Sep 17 00:00:00 2001
From: Lance Edgar <lance@wuttaproject.org>
Date: Wed, 25 Feb 2026 14:36:28 -0600
Subject: [PATCH 1/3] fix: expose config for farmOS OAuth2 client_id and scope

refs: #3
---
 src/wuttafarm/farmos/handler.py               |  6 +++++
 .../web/templates/appinfo/configure.mako      | 22 +++++++++++++++++++
 src/wuttafarm/web/views/auth.py               |  5 +++--
 src/wuttafarm/web/views/settings.py           | 13 ++++++++++-
 4 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/src/wuttafarm/farmos/handler.py b/src/wuttafarm/farmos/handler.py
index 6eee14f..e905f92 100644
--- a/src/wuttafarm/farmos/handler.py
+++ b/src/wuttafarm/farmos/handler.py
@@ -94,3 +94,9 @@ class FarmOSHandler(GenericHandler):
             return f"{base}/{path}"
 
         return base
+
+    def get_oauth2_client_id(self):
+        return self.config.get("farmos.oauth2.client_id", default="farm")
+
+    def get_oauth2_scope(self):
+        return self.config.get("farmos.oauth2.scope", default="farm_manager")
diff --git a/src/wuttafarm/web/templates/appinfo/configure.mako b/src/wuttafarm/web/templates/appinfo/configure.mako
index 3760577..8dc5e8a 100644
--- a/src/wuttafarm/web/templates/appinfo/configure.mako
+++ b/src/wuttafarm/web/templates/appinfo/configure.mako
@@ -14,6 +14,28 @@
       </b-input>
     </b-field>
 
+    <b-field grouped>
+
+      <b-field label="OAuth2 Client ID">
+        <b-input name="farmos.oauth2.client_id"
+                 v-model="simpleSettings['farmos.oauth2.client_id']"
+                 @input="settingsNeedSaved = true">
+        </b-input>
+      </b-field>
+
+      <b-field label="OAuth2 Scope">
+        <b-input name="farmos.oauth2.scope"
+                 v-model="simpleSettings['farmos.oauth2.scope']"
+                 @input="settingsNeedSaved = true">
+        </b-input>
+      </b-field>
+
+    </b-field>
+
+    <b-field label="OAuth2 Redirect URI">
+      <wutta-copyable-text text="${url('farmos_oauth_callback')}" />
+    </b-field>
+
     <b-field label="farmOS Integration Mode">
       <b-select name="${app.appname}.farmos_integration_mode"
                 v-model="simpleSettings['${app.appname}.farmos_integration_mode']"
diff --git a/src/wuttafarm/web/views/auth.py b/src/wuttafarm/web/views/auth.py
index db757cc..0ab893d 100644
--- a/src/wuttafarm/web/views/auth.py
+++ b/src/wuttafarm/web/views/auth.py
@@ -55,9 +55,10 @@ class AuthView(base.AuthView):
         return None
 
     def get_farmos_oauth2_session(self):
+        farmos = self.app.get_farmos_handler()
         return OAuth2Session(
-            client_id="farm",
-            scope="farm_manager",
+            client_id=farmos.get_oauth2_client_id(),
+            scope=farmos.get_oauth2_scope(),
             redirect_uri=self.request.route_url("farmos_oauth_callback"),
         )
 
diff --git a/src/wuttafarm/web/views/settings.py b/src/wuttafarm/web/views/settings.py
index 86d7a0c..74cc0a0 100644
--- a/src/wuttafarm/web/views/settings.py
+++ b/src/wuttafarm/web/views/settings.py
@@ -57,10 +57,21 @@ class AppInfoView(base.AppInfoView):
         return info
 
     def configure_get_simple_settings(self):  # pylint: disable=empty-docstring
+        farmos = self.app.get_farmos_handler()
         simple_settings = super().configure_get_simple_settings()
         simple_settings.extend(
             [
-                {"name": "farmos.url.base"},
+                {
+                    "name": "farmos.url.base",
+                },
+                {
+                    "name": "farmos.oauth2.client_id",
+                    "default": farmos.get_oauth2_client_id(),
+                },
+                {
+                    "name": "farmos.oauth2.scope",
+                    "default": farmos.get_oauth2_scope(),
+                },
                 {
                     "name": f"{self.app.appname}.farmos_integration_mode",
                     "default": self.app.get_farmos_integration_mode(),

From 30e1fd23d6e6f16f978de62272b787cbdec14bd9 Mon Sep 17 00:00:00 2001
From: Lance Edgar <lance@wuttaproject.org>
Date: Wed, 25 Feb 2026 14:55:30 -0600
Subject: [PATCH 2/3] fix: only show quick form menu if perms allow

---
 src/wuttafarm/web/menus.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wuttafarm/web/menus.py b/src/wuttafarm/web/menus.py
index 6ce4a8d..fe7719e 100644
--- a/src/wuttafarm/web/menus.py
+++ b/src/wuttafarm/web/menus.py
@@ -72,7 +72,7 @@ class WuttaFarmMenuHandler(base.MenuHandler):
                 {
                     "title": "Eggs",
                     "route": "quick.eggs",
-                    # "perm": "assets.list",
+                    "perm": "quick.eggs",
                 },
             ],
         }

From 127ea49d744bd0492be424084501f985cb8710ba Mon Sep 17 00:00:00 2001
From: Lance Edgar <lance@wuttaproject.org>
Date: Wed, 25 Feb 2026 14:55:47 -0600
Subject: [PATCH 3/3] fix: add more default perms for first site admin user

---
 src/wuttafarm/web/views/common.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/wuttafarm/web/views/common.py b/src/wuttafarm/web/views/common.py
index f15e92b..674d76e 100644
--- a/src/wuttafarm/web/views/common.py
+++ b/src/wuttafarm/web/views/common.py
@@ -87,10 +87,20 @@ class CommonView(base.CommonView):
                 "farmos_logs_medical.view",
                 "farmos_logs_observation.list",
                 "farmos_logs_observation.view",
+                "farmos_plant_assets.list",
+                "farmos_plant_assets.view",
+                "farmos_plant_types.list",
+                "farmos_plant_types.view",
+                "farmos_quantities_standard.list",
+                "farmos_quantities_standard.view",
+                "farmos_quantity_types.list",
+                "farmos_quantity_types.view",
                 "farmos_structure_assets.list",
                 "farmos_structure_assets.view",
                 "farmos_structure_types.list",
                 "farmos_structure_types.view",
+                "farmos_units.list",
+                "farmos_units.view",
                 "farmos_users.list",
                 "farmos_users.view",
                 "group_assets.create",
@@ -121,6 +131,7 @@ class CommonView(base.CommonView):
                 "logs_observation.list",
                 "logs_observation.view",
                 "logs_observation.versions",
+                "quick.eggs",
                 "structure_types.list",
                 "structure_types.view",
                 "structure_types.versions",