From 795dbd97f8d521901aa23522c1f9fc9fc1454282 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Mon, 23 Oct 2023 09:57:29 +0100
Subject: [PATCH] imp:web: cleanups; use --allow on Sandstorm (#834)

---
 .sandstorm/launcher.sh                |  2 +-
 hledger-web/Hledger/Web/WebOptions.hs | 10 +++++-----
 hledger-web/hledger-web.m4.md         |  3 ++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.sandstorm/launcher.sh b/.sandstorm/launcher.sh
index 74ea0a060..aff75576c 100755
--- a/.sandstorm/launcher.sh
+++ b/.sandstorm/launcher.sh
@@ -29,4 +29,4 @@ set -euo pipefail
 mkdir -p /var/lib/hledger
 touch /var/lib/hledger/Ledger
 cd /var
-hledger-web --capabilities-header=X-Sandstorm-Permissions --serve --base-url='' -f /var/lib/hledger/Ledger --port 8000
+hledger-web --allow=sandstorm --serve --base-url='' -f /var/lib/hledger/Ledger --port 8000
diff --git a/hledger-web/Hledger/Web/WebOptions.hs b/hledger-web/Hledger/Web/WebOptions.hs
index cbf8878d3..0bc3c8a8f 100644
--- a/hledger-web/Hledger/Web/WebOptions.hs
+++ b/hledger-web/Hledger/Web/WebOptions.hs
@@ -45,6 +45,11 @@ webflags =
       ["serve-api"]
       (setboolopt "serve-api")
       "like --serve, but serve only the JSON web API, without the server-side web UI"
+  , flagReq
+      ["allow"]
+      (\s opts -> Right $ setopt "allow" s opts)
+      "view|add|edit"
+      "set the user's access level for changing data (default: `add`). It also accepts `sandstorm` for use on that platform (reads permissions from the `X-Sandstorm-Permissions` request header)."
   , flagReq
       ["cors"]
       (\s opts -> Right $ setopt "cors" s opts)
@@ -75,11 +80,6 @@ webflags =
       (\s opts -> Right $ setopt "file-url" s opts)
       "FILEURL"
       "set the static files url (default: BASEURL/static)"
-  , flagReq
-      ["allow"]
-      (\s opts -> Right $ setopt "allow" s opts)
-      "view|add|edit"
-      "set the user's access level for changing data (default: `add`). (There is also `sandstorm`, used when running on Sandstorm.)"
   , flagNone
       ["test"]
       (setboolopt "test")
diff --git a/hledger-web/hledger-web.m4.md b/hledger-web/hledger-web.m4.md
index 7b3c0eda2..01074b6bc 100644
--- a/hledger-web/hledger-web.m4.md
+++ b/hledger-web/hledger-web.m4.md
@@ -96,7 +96,8 @@ serve them from another server for efficiency, you would set the url with this.
 
 `--allow=view|add|edit`
 : set the user's access level for changing data (default: `add`).
-(There is also `sandstorm`, used when running on the Sandstorm app platform.)
+It also accepts `sandstorm` for use on that platform (reads
+permissions from the `X-Sandstorm-Permissions` request header).
 
 `--test`
 : run hledger-web's tests and exit. hspec test runner args may follow a --, eg: hledger-web --test -- --help