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] 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(),