From c27796104209decb6a8872b56c79e06f415a507c Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Tue, 10 Sep 2024 18:57:32 -0400
Subject: [PATCH 01/59] refactor: convert hex primary color to easily tinted
 oklch #533

---
 hushline/static/css/style.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hushline/static/css/style.css b/hushline/static/css/style.css
index e6a3e8e0..c6512e07 100644
--- a/hushline/static/css/style.css
+++ b/hushline/static/css/style.css
@@ -2,8 +2,8 @@
   --color-border: rgba(0, 0, 0, 0.18);
   --color-border-dark: #7d7d7d;
   --color-border-dark-1: #555;
-  --color-brand: #7d25c1;
-  --color-brand-dark: #ecdafa;
+  --color-brand: oklch(48.55% 0.222 304.47); /* #7d25c1 */
+  --color-brand-dark: oklch(from var(--color-brand) calc(1.8797 * l) calc(0.2117 * c) calc(1.0197 * h)); /* #ecdafa */
   --color-text: #333;
   --color-text-dark-alt-2: #e4e4e4;
   --color-text-dark-alt: #c2c2c2;

From f8a8407a41a2a08179de62583ed85b46eecc3608 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Tue, 10 Sep 2024 19:00:18 -0400
Subject: [PATCH 02/59] feat: add branding tab to settings template page #533

---
 hushline/templates/settings.html | 57 ++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/hushline/templates/settings.html b/hushline/templates/settings.html
index 3d6c09b2..3769cca6 100644
--- a/hushline/templates/settings.html
+++ b/hushline/templates/settings.html
@@ -43,6 +43,19 @@ <h2>Settings</h2>
           Email &amp; Encryption
         </button>
       </li>
+      <li role="presentation">
+        <button
+          type="button"
+          class="tab"
+          data-tab="branding"
+          role="tab"
+          aria-selected="false"
+          aria-controls="branding"
+          id="branding-tab"
+        >
+          Branding
+        </button>
+      </li>
       <li role="presentation">
         <button
           type="button"
@@ -452,6 +465,50 @@ <h3>Message Encryption</h3>
       {% endif %}
     </div>
 
+    <div
+      id="branding"
+      class="tab-content"
+      role="tabpanel"
+      aria-labelledby="branding-tab"
+      hidden
+    >
+      <h3>Primary Color</h3>
+      <form
+        method="POST"
+        action="{{ url_for('settings.update_brand_primary_color') }}"
+        class="formBody"
+      >
+        <label for="brand-primary-color">Choose Color</label>
+        <input
+          type="color"
+          id="brand-primary-color"
+          class="color-picker"
+        />
+        <button type="submit" class="btn" id="updateBrandPrimaryColor">
+          Update Color
+        </button>
+      </form>
+
+      <h3>App Name</h3>
+      <form
+        method="POST"
+        action="{{ url_for('settings.update_brand_app_name') }}"
+        class="formBody"
+      >
+        <label for="brand-app-name">Choose Name</label>
+        <input
+          type="text"
+          name="brand_app_name_choice"
+          id="brand-app-name"
+          placeholder="🤫 Hush Line"
+          value="{{ user.brand_app_name or '' }}"
+        />
+        <button type="submit" class="btn" id="updateBrandAppName">
+          Update Name
+        </button>
+      </form>
+    </div>
+
     <div
       id="advanced"
       class="tab-content"

From c67dc5d4476a984a3ec9ddd15ec4f740c70cf5cf Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Tue, 10 Sep 2024 19:03:04 -0400
Subject: [PATCH 03/59] style: add CSS section for input='color' branding
 element #533

---
 hushline/static/css/style.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/hushline/static/css/style.css b/hushline/static/css/style.css
index c6512e07..e710588f 100644
--- a/hushline/static/css/style.css
+++ b/hushline/static/css/style.css
@@ -39,6 +39,12 @@
   --line-height-base: 1.40625;
 }
 
+#brand-primary-color {
+  padding: 0.25rem;
+  width: 4rem;
+  height: 2rem;
+}
+
 @font-face {
   font-family: "Atkinson Hyperlegible";
   src:

From 19c8d40d8338fa39b17f2910fe5930efd1521b5c Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Tue, 10 Sep 2024 19:05:40 -0400
Subject: [PATCH 04/59] feat: add form types for persisting brand changes to
 server db #533

---
 hushline/settings.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/hushline/settings.py b/hushline/settings.py
index a17bb7de..14849e53 100644
--- a/hushline/settings.py
+++ b/hushline/settings.py
@@ -169,6 +169,14 @@ class ProfileForm(FlaskForm):
     )
 
 
+class UpdateBrandPrimaryColorForm(FlaskForm):
+    hex_color = StringField("HEX Color", validators=[DataRequired(), Length(min=3, max=7)])
+
+
+class UpdateBrandAppNameForm(FlaskForm):
+    app_name = StringField("App Name", validators=[DataRequired(), Length(min=2, max=30)])
+
+
 def set_field_attribute(input_field: Field, attribute: str, value: str) -> None:
     if input_field.render_kw is None:
         input_field.render_kw = {}

From ce8a5c52ed7b4b5cb95b60add8f3366b29d1c9d2 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Tue, 10 Sep 2024 19:08:28 -0400
Subject: [PATCH 05/59] feat: add preliminary routes to consume branding
 changes #533

---
 hushline/settings.py | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/hushline/settings.py b/hushline/settings.py
index 14849e53..89fe5114 100644
--- a/hushline/settings.py
+++ b/hushline/settings.py
@@ -664,6 +664,50 @@ def update_smtp_settings() -> Response | str:
         flash("👍 SMTP settings updated successfully")
         return redirect(url_for(".index"))
 
+    @bp.route("/update-brand-primary-color", methods=["POST"])
+    @authentication_required
+    def update_brand_primary_color() -> Response | str:
+        user_id = session.get("user_id")
+        if not user_id:
+            flash("Please log in to continue.")
+            return redirect(url_for("login"))
+
+        user = db.session.get(User, user_id)
+        if user.is_admin:
+            # TODO:
+            # db persistence logic + form retrieval + update root style variable
+            form = UpdateBrandPrimaryColorForm()
+            if form.validate_on_submit():
+                user.hex_color = form.hex_color
+                db.session.commit()
+                flash("👍 Brand primary color updated successfully.")
+                return redirect(url_for(".index"))
+
+        flash("User not found. Please log in again.")
+        return redirect(url_for("login"))
+
+    @bp.route("/update-brand-app-name", methods=["POST"])
+    @authentication_required
+    def update_brand_app_name() -> Response | str:
+        user_id = session.get("user_id")
+        if not user_id:
+            flash("Please log in to continue.")
+            return redirect(url_for("login"))
+
+        user = db.session.get(User, user_id)
+        if user.is_admin:
+            # TODO:
+            # db persistence logic + form retrieval + update h1
+            form = UpdateBrandAppNameForm()
+            if form.validate_on_submit():
+                user.brand_app_name = form.app_name
+                db.session.commit()
+                flash("👍 Brand app name updated successfully.")
+                return redirect(url_for(".index"))
+
+        flash("User not found. Please log in again.")
+        return redirect(url_for("login"))
+
     @bp.route("/delete-account", methods=["POST"])
     @authentication_required
     def delete_account() -> Response | str:

From d847a509ef134cc86cea4dc00a4778d97e73d579 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Thu, 12 Sep 2024 12:46:34 -0400
Subject: [PATCH 06/59] fix: use consistent route admin-required & redirect
 logic #573

For Roadmap Item #533

Suggested in review:
https://github.com/scidsg/hushline/pull/573#pullrequestreview-2300269011
https://github.com/scidsg/hushline/pull/573#discussion_r1756839214
https://github.com/scidsg/hushline/pull/573#discussion_r1756850694
https://github.com/scidsg/hushline/pull/573#discussion_r1756851086
https://github.com/scidsg/hushline/pull/573#discussion_r1756853462

Co-authored-by: Jeremy Moore <jeremymoore@gmail.com>
---
 hushline/settings.py             | 64 +++++++++++++-------------------
 hushline/templates/settings.html |  4 +-
 2 files changed, 27 insertions(+), 41 deletions(-)

diff --git a/hushline/settings.py b/hushline/settings.py
index f86d25a5..9782c0de 100644
--- a/hushline/settings.py
+++ b/hushline/settings.py
@@ -39,7 +39,7 @@
 from .db import db
 from .forms import ComplexPassword, TwoFactorForm
 from .model import Message, SecondaryUsername, SMTPEncryption, User
-from .utils import authentication_required, create_smtp_config
+from .utils import admin_authentication_required, authentication_required, create_smtp_config
 
 
 class ChangePasswordForm(FlaskForm):
@@ -713,48 +713,34 @@ def update_smtp_settings() -> Response | str:
         return redirect(url_for(".index"))
 
     @bp.route("/update-brand-primary-color", methods=["POST"])
-    @authentication_required
-    def update_brand_primary_color() -> Response | str:
-        user_id = session.get("user_id")
-        if not user_id:
-            flash("Please log in to continue.")
-            return redirect(url_for("login"))
-
-        user = db.session.get(User, user_id)
-        if user.is_admin:
-            # TODO:
-            # db persistence logic + form retrieval + update root style variable
-            form = UpdateBrandPrimaryColorForm()
-            if form.validate_on_submit():
-                user.hex_color = form.hex_color
-                db.session.commit()
-                flash("👍 Brand primary color updated successfully.")
-                return redirect(url_for(".index"))
+    @admin_authentication_required
+    def update_brand_primary_color(user: User) -> Response | str:
+        # TODO:
+        # db persistence logic + form retrieval + update root style variable
+        form = UpdateBrandPrimaryColorForm()
+        if form.validate_on_submit():
+            user.hex_color = form.hex_color
+            db.session.commit()
+            flash("👍 Brand primary color updated successfully.")
+            return redirect(url_for(".index"))
 
-        flash("User not found. Please log in again.")
-        return redirect(url_for("login"))
+        flash("⛔ Invalid form data. Please try again.")
+        return redirect(url_for(".index"))
 
     @bp.route("/update-brand-app-name", methods=["POST"])
-    @authentication_required
-    def update_brand_app_name() -> Response | str:
-        user_id = session.get("user_id")
-        if not user_id:
-            flash("Please log in to continue.")
-            return redirect(url_for("login"))
-
-        user = db.session.get(User, user_id)
-        if user.is_admin:
-            # TODO:
-            # db persistence logic + form retrieval + update h1
-            form = UpdateBrandAppNameForm()
-            if form.validate_on_submit():
-                user.brand_app_name = form.app_name
-                db.session.commit()
-                flash("👍 Brand app name updated successfully.")
-                return redirect(url_for(".index"))
+    @admin_authentication_required
+    def update_brand_app_name(user: User) -> Response | str:
+        # TODO:
+        # db persistence logic + form retrieval + update h1
+        form = UpdateBrandAppNameForm()
+        if form.validate_on_submit():
+            user.brand_app_name = form.app_name
+            db.session.commit()
+            flash("👍 Brand app name updated successfully.")
+            return redirect(url_for(".index"))
 
-        flash("User not found. Please log in again.")
-        return redirect(url_for("login"))
+        flash("⛔ Invalid form data. Please try again.")
+        return redirect(url_for(".index"))
 
     @bp.route("/delete-account", methods=["POST"])
     @authentication_required
diff --git a/hushline/templates/settings.html b/hushline/templates/settings.html
index ac5b9705..f3668c0c 100644
--- a/hushline/templates/settings.html
+++ b/hushline/templates/settings.html
@@ -490,7 +490,7 @@ <h3>Message Encryption</h3>
       <h3>Primary Color</h3>
       <form
         method="POST"
-        action="{{ url_for('settings.update_brand_primary_color') }}"
+        action="{{ url_for('settings.update_brand_primary_color', user=user) }}"
         class="formBody"
       >
         <label for="brand-primary-color">Choose Color</label>
@@ -507,7 +507,7 @@ <h3>Primary Color</h3>
       <h3>App Name</h3>
       <form
         method="POST"
-        action="{{ url_for('settings.update_brand_app_name') }}"
+        action="{{ url_for('settings.update_brand_app_name', user=user) }}"
         class="formBody"
       >
         <label for="brand-app-name">Choose Name</label>

From bd6c6a16ce597b72c46119424b49f96e67cc35e0 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Thu, 12 Sep 2024 13:10:30 -0400
Subject: [PATCH 07/59] feat: apply single-source color theme transformations
 to CSS #573

For Roadmap Item #533
---
 hushline/static/css/style.css | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/hushline/static/css/style.css b/hushline/static/css/style.css
index d63ff5be..7b196fbc 100644
--- a/hushline/static/css/style.css
+++ b/hushline/static/css/style.css
@@ -2,17 +2,17 @@
   --color-border: rgba(0, 0, 0, 0.18);
   --color-border-dark: #7d7d7d;
   --color-border-dark-1: #555;
-  --color-brand: oklch(48.55% 0.222 304.47); /* #7d25c1 */
-  --color-brand-dark: oklch(from var(--color-brand) calc(1.8797 * l) calc(0.2117 * c) calc(1.0197 * h)); /* #ecdafa */
+  --color-brand: oklch(48.55% 0.222 304.47);  /* #7d25c1 */
+  --color-brand-dark: oklch(from var(--color-brand) calc(1.8797 * l) calc(0.2117 * c) calc(1.0197 * h));  /* #ecdafa */
   --color-text: #333;
   --color-text-dark-alt-2: #e4e4e4;
   --color-text-dark-alt: #c2c2c2;
   --color-text-dark: #dadada;
   --color-text-light: #595959;
-  --color-highlight: rgba(125, 37, 193, 0.1);
-  --color-highlight-dark: rgba(220, 198, 237, 0.2);
-  --color-brand-bg: #fbf3ff;
-  --color-dark-bg: #222;
+  --color-highlight: oklch(from var(--color-brand) l c h / 0.1);  /* rgba(125, 37, 193, 0.1) */
+  --color-highlight-dark: oklch(from var(--color-brand-dark) l c h / 0.2);  /* rgba(220, 198, 237, 0.2) */
+  --color-brand-bg: oklch(from var(--color-brand) calc(2.0058 * l) calc(0.0811 * c) calc(1.0337 * h));  /* #fbf3ff */
+  --color-dark-bg: oklch(from var(--color-brand) calc(0.5191 * l) calc(0.0676 * c) calc(1.0541 * h));  /* was #222 now with brand hue */
   --color-dark-bg-alt: #333;
   --color-dark-bg-alt-1: #444;
   --color-dark-bg-alt-transparent: rgba(51, 51, 51, 0.7);
@@ -147,7 +147,7 @@
   /* Change background color of tabs on hover */
   .tab:hover,
   .subtab:hover {
-    background-color: #fbf3ff;
+    background-color: var(--color-brand-bg);  /* #fbf3ff */
   }
 
   /* Create an active/current tablink class */
@@ -193,7 +193,7 @@
     background-color: white;
     color: var(--color-brand);
     border: 1px solid var(--color-brand);
-    box-shadow: 0px 2px 0px 0px rgba(125, 37, 193, 0.25);
+    box-shadow: 0px 2px 0px 0px oklch(from var(--color-brand) l c h / 0.25);  /* rgba(125, 37, 193, 0.25) */
   }
 
   .formBody input[type="submit"]:hover,
@@ -208,7 +208,7 @@
   .btn:active,
   input[type="file"]::file-selector-button:active,
   select:active {
-    box-shadow: inset 0px 2px 0px 0px rgba(125, 37, 193, 0.25);
+    box-shadow: inset 0px 2px 0px 0px oklch(from var(--color-brand) l c h / 0.25);  /* rgba(125, 37, 193, 0.25) */
   }
 
   .btn-danger,
@@ -435,7 +435,7 @@
   /* Change background color of tabs on hover */
   .tab:hover,
   .subtab:hover {
-    background-color: rgba(255, 255, 255, 0.1);
+    background-color: oklch(from var(--color-dark-bg) l c h / 0.35);  /* was rgba(255, 255, 255, 0.1) now with color */
   }
 
   /* Create an active/current tablink class */
@@ -481,7 +481,7 @@
     background-color: var(--color-dark);
     color: var(--color-brand-dark);
     border: 1px solid var(--color-brand-dark);
-    box-shadow: 0px 2px 0px 0px rgba(125, 37, 193, 0.25);
+    box-shadow: 0px 2px 0px 0px oklch(from var(--color-brand) l c h / 0.25);  /* rgba(125, 37, 193, 0.25) */
   }
 
   .formBody input[type="submit"]:hover,
@@ -495,7 +495,7 @@
   .formBody button:active,
   .btn:active,
   input[type="file"]::file-selector-button:active {
-    box-shadow: inset 0px 2px 0px 0px rgba(125, 37, 193, 0.25);
+    box-shadow: inset 0px 2px 0px 0px oklch(from var(--color-brand) l c h / 0.25);  /* rgba(125, 37, 193, 0.25) */
   }
 
   .btn-danger,
@@ -618,7 +618,7 @@
   }
 
   .banner {
-    background-color: #ecdafa;
+    background-color: var(--color-brand-dark);  /* #ecdafa */
     color: #333;
   }
 
@@ -1171,7 +1171,7 @@ button,
 input[type="file"]::file-selector-button {
   cursor: pointer;
   text-decoration: none;
-  box-shadow: 0px 2px 0px 0px rgba(125, 37, 193, 0.25);
+  box-shadow: 0px 2px 0px 0px oklch(from var(--color-brand) l c h / 0.25);  /* rgba(125, 37, 193, 0.25) */
 }
 
 textarea {

From 75269c70e3cbd667e271e8d7e3be12a0118ca6ed Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Thu, 12 Sep 2024 15:16:31 -0400
Subject: [PATCH 08/59] fix: add hex color code validator consistent with input
 element #573

For Roadmap Item #533

Suggested in review:
https://github.com/scidsg/hushline/pull/573#discussion_r1756836679

Co-authored-by: Jeremy Moore <jeremymoore@gmail.com>
---
 hushline/forms.py    | 9 +++++++++
 hushline/settings.py | 6 ++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/hushline/forms.py b/hushline/forms.py
index 3bc1a0ef..05ab89e1 100644
--- a/hushline/forms.py
+++ b/hushline/forms.py
@@ -25,5 +25,14 @@ def __call__(self, form: Form, field: Field) -> None:
             raise ValidationError(self.message)
 
 
+class HexColor:
+    hex_color_regex: re.Pattern = re.compile(r"^#[0-9a-fA-F]{6}$")
+
+    def __call__(self, form: Form, field: Field) -> None:
+        color: str = field.data
+        if not self.hex_color_regex.match(color):
+            raise ValidationError(f"{color=} is an invalid 6-hexit color code.")
+
+
 class TwoFactorForm(FlaskForm):
     verification_code = StringField("2FA Code", validators=[DataRequired(), Length(min=6, max=6)])
diff --git a/hushline/settings.py b/hushline/settings.py
index 9782c0de..21e83294 100644
--- a/hushline/settings.py
+++ b/hushline/settings.py
@@ -37,7 +37,7 @@
 
 from .crypto import is_valid_pgp_key
 from .db import db
-from .forms import ComplexPassword, TwoFactorForm
+from .forms import ComplexPassword, HexColor, TwoFactorForm
 from .model import Message, SecondaryUsername, SMTPEncryption, User
 from .utils import admin_authentication_required, authentication_required, create_smtp_config
 
@@ -195,7 +195,9 @@ class ProfileForm(FlaskForm):
 
 
 class UpdateBrandPrimaryColorForm(FlaskForm):
-    hex_color = StringField("HEX Color", validators=[DataRequired(), Length(min=3, max=7)])
+    hex_color = StringField(
+        "HEX Color", validators=[DataRequired(), HexColor(), Length(min=3, max=7)]
+    )
 
 
 class UpdateBrandAppNameForm(FlaskForm):

From 241b1df73bb09391f6ec0c635be905367aedd594 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Thu, 12 Sep 2024 15:23:27 -0400
Subject: [PATCH 09/59] fix: give brand form data to renamed db object
 attributes #573

For Roadmap Item #533

Suggested in review:
https://github.com/scidsg/hushline/pull/573#discussion_r1756841440

Co-authored-by: Jeremy Moore <jeremymoore@gmail.com>
---
 hushline/settings.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hushline/settings.py b/hushline/settings.py
index 21e83294..fef57e0a 100644
--- a/hushline/settings.py
+++ b/hushline/settings.py
@@ -721,7 +721,7 @@ def update_brand_primary_color(user: User) -> Response | str:
         # db persistence logic + form retrieval + update root style variable
         form = UpdateBrandPrimaryColorForm()
         if form.validate_on_submit():
-            user.hex_color = form.hex_color
+            user.brand_primary_hex_color = form.hex_color.data
             db.session.commit()
             flash("👍 Brand primary color updated successfully.")
             return redirect(url_for(".index"))
@@ -736,7 +736,7 @@ def update_brand_app_name(user: User) -> Response | str:
         # db persistence logic + form retrieval + update h1
         form = UpdateBrandAppNameForm()
         if form.validate_on_submit():
-            user.brand_app_name = form.app_name
+            user.brand_app_name = form.app_name.data
             db.session.commit()
             flash("👍 Brand app name updated successfully.")
             return redirect(url_for(".index"))

From 5f246a8ea6caeb6b8559f562d878e68e8ce9a417 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Thu, 12 Sep 2024 15:57:33 -0400
Subject: [PATCH 10/59] fix: remove redundant length validator covered by
 ``HexColor`` #573

For Roadmap Item #533

Co-authored-by: Jeremy Moore <jeremymoore@gmail.com>
---
 hushline/forms.py    | 1 +
 hushline/settings.py | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/hushline/forms.py b/hushline/forms.py
index 05ab89e1..345be088 100644
--- a/hushline/forms.py
+++ b/hushline/forms.py
@@ -26,6 +26,7 @@ def __call__(self, form: Form, field: Field) -> None:
 
 
 class HexColor:
+    # HTML input color elements only give & accept 6-hexit color codes
     hex_color_regex: re.Pattern = re.compile(r"^#[0-9a-fA-F]{6}$")
 
     def __call__(self, form: Form, field: Field) -> None:
diff --git a/hushline/settings.py b/hushline/settings.py
index fef57e0a..7565c6c4 100644
--- a/hushline/settings.py
+++ b/hushline/settings.py
@@ -195,9 +195,7 @@ class ProfileForm(FlaskForm):
 
 
 class UpdateBrandPrimaryColorForm(FlaskForm):
-    hex_color = StringField(
-        "HEX Color", validators=[DataRequired(), HexColor(), Length(min=3, max=7)]
-    )
+    hex_color = StringField("HEX Color", validators=[DataRequired(), HexColor()])
 
 
 class UpdateBrandAppNameForm(FlaskForm):

From f421b9bd1f5116c154412ebbf12ef395d1430b97 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Thu, 12 Sep 2024 21:28:42 -0400
Subject: [PATCH 11/59] fix: match template structure for brand color & name
 sections #573

Prepare for the default color to be inserted as a fallback if no
specific branding is specified.

For Roadmap Item #533
---
 hushline/templates/settings.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hushline/templates/settings.html b/hushline/templates/settings.html
index f3668c0c..268e1315 100644
--- a/hushline/templates/settings.html
+++ b/hushline/templates/settings.html
@@ -496,8 +496,10 @@ <h3>Primary Color</h3>
         <label for="brand-primary-color">Choose Color</label>
         <input
           type="color"
+          name="brand_primary_color_choice"
           id="brand-primary-color"
           class="color-picker"
+          value="{{ user.brand_primary_hex_color or '#7d25c1' }}"
         />
         <button type="submit" class="btn" id="updateBrandPrimaryColor">
           Update Color

From e397e8f646de1f65ef324a647eb7bb1f8dccd5a6 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Thu, 12 Sep 2024 21:39:58 -0400
Subject: [PATCH 12/59] refactor: use input type specifier & relocate CSS
 section #573

For Roadmap Item #533
---
 hushline/static/css/style.css | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/hushline/static/css/style.css b/hushline/static/css/style.css
index 7b196fbc..4cbb321d 100644
--- a/hushline/static/css/style.css
+++ b/hushline/static/css/style.css
@@ -39,12 +39,6 @@
   --line-height-base: 1.40625;
 }
 
-#brand-primary-color {
-  padding: 0.25rem;
-  width: 4rem;
-  height: 2rem;
-}
-
 @font-face {
   font-family: "Atkinson Hyperlegible";
   src:
@@ -1114,6 +1108,12 @@ input[type="file"]::file-selector-button {
   border: 0;
 }
 
+input[type="color"] {
+  padding: 0.25rem;
+  width: 4rem;
+  height: 2rem;
+}
+
 header .btn {
   font-size: var(--font-size-small);
   margin-left: 1rem;

From ed8a92fad21880676479448a7d902fa0e706e5f9 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Fri, 13 Sep 2024 16:57:02 -0400
Subject: [PATCH 13/59] feat: apply CSS changes on JS input & change color
 events #573

For Roadmap Item #533
---
 hushline/static/js/settings.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/hushline/static/js/settings.js b/hushline/static/js/settings.js
index d440cd38..41525ba8 100644
--- a/hushline/static/js/settings.js
+++ b/hushline/static/js/settings.js
@@ -75,6 +75,24 @@ document.addEventListener("DOMContentLoaded", function () {
     });
   });
 
+  // Update color in real-time as they're being browsed
+  document
+    .getElementById("brand-primary-color")
+    .addEventListener("input", function(event) {
+      const brandColor = `lch(from ${event.target.value} l c h)`;
+      document.documentElement.style.setProperty("--color-brand", brandColor);
+      document.body.offsetHeight;  // force a reflow
+    });
+
+  // Update color once it's been finalized
+  document
+    .getElementById("brand-primary-color")
+    .addEventListener("change", function(event) {
+      const brandColor = `lch(from ${event.target.value} l c h)`;
+      document.documentElement.style.setProperty("--color-brand", brandColor);
+      document.body.offsetHeight;  // force a reflow
+    });
+
   var forwarding_enabled = document.querySelector(
     "input[id='forwarding_enabled']",
   ).checked;

From 434939456e0ed0bfca5caea891c2cbed66dc6753 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Fri, 13 Sep 2024 16:58:25 -0400
Subject: [PATCH 14/59] feat: apply more accessible & stable color
 transformations #573

For Roadmap Item #533
---
 hushline/static/css/style.css | 70 ++++++++++++++++++++++++-----------
 1 file changed, 49 insertions(+), 21 deletions(-)

diff --git a/hushline/static/css/style.css b/hushline/static/css/style.css
index 4cbb321d..19399ac5 100644
--- a/hushline/static/css/style.css
+++ b/hushline/static/css/style.css
@@ -3,16 +3,32 @@
   --color-border-dark: #7d7d7d;
   --color-border-dark-1: #555;
   --color-brand: oklch(48.55% 0.222 304.47);  /* #7d25c1 */
-  --color-brand-dark: oklch(from var(--color-brand) calc(1.8797 * l) calc(0.2117 * c) calc(1.0197 * h));  /* #ecdafa */
+  --color-brand-min-contrast: oklch(
+    from var(--color-brand) clamp(0.1, l, 0.6) c h
+  );
+  --color-brand-dark: oklch(  /* was #ecdafa now slightly more saturated */
+    from var(--color-brand)
+    clamp(0.85, l + 0.4271, 0.98) calc(0.25 * c) calc(h + 6)
+  );
   --color-text: #333;
   --color-text-dark-alt-2: #e4e4e4;
   --color-text-dark-alt: #c2c2c2;
   --color-text-dark: #dadada;
   --color-text-light: #595959;
-  --color-highlight: oklch(from var(--color-brand) l c h / 0.1);  /* rgba(125, 37, 193, 0.1) */
-  --color-highlight-dark: oklch(from var(--color-brand-dark) l c h / 0.2);  /* rgba(220, 198, 237, 0.2) */
-  --color-brand-bg: oklch(from var(--color-brand) calc(2.0058 * l) calc(0.0811 * c) calc(1.0337 * h));  /* #fbf3ff */
-  --color-dark-bg: oklch(from var(--color-brand) calc(0.5191 * l) calc(0.0676 * c) calc(1.0541 * h));  /* was #222 now with brand hue */
+  --color-highlight: oklch(  /* rgba(125, 37, 193, 0.1) */
+    from var(--color-brand) l c h / 0.1
+  );
+  --color-highlight-dark: oklch(  /* rgba(220, 198, 237, 0.2) */
+    from var(--color-brand-dark) l c h / 0.2
+  );
+  --color-brand-bg: oklch(  /* #fbf3ff */
+    from var(--color-brand)
+    clamp(0.6, l + 0.4883, 0.98) min(c, 0.0179) calc(h + 10.26)
+  );
+  --color-dark-bg: oklch(  /* was #222 now with brand hue */
+    from var(--color-brand)
+    clamp(0.15, l - 0.2335, 0.4) min(c, 0.012) calc(h + 16.47)
+  );
   --color-dark-bg-alt: #333;
   --color-dark-bg-alt-1: #444;
   --color-dark-bg-alt-transparent: rgba(51, 51, 51, 0.7);
@@ -74,7 +90,7 @@
   }
 
   a {
-    color: var(--color-brand);
+    color: var(--color-brand-min-contrast);
   }
 
   p.meta {
@@ -167,8 +183,8 @@
   button:focus,
   input[type="file"]::file-selector-button:focus,
   select:focus {
-    outline: 4px double var(--color-brand);
-    border: 1px solid var(--color-brand);
+    outline: 4px double var(--color-brand-min-contrast);
+    border: 1px solid var(--color-brand-min-contrast);
     box-shadow: none;
   }
 
@@ -177,7 +193,7 @@
   .btn,
   input[type="file"]::file-selector-button {
     border: 0px;
-    background-color: var(--color-brand);
+    background-color: var(--color-brand-min-contrast);
     color: white;
   }
 
@@ -185,9 +201,11 @@
   .formBody button,
   .btn {
     background-color: white;
-    color: var(--color-brand);
-    border: 1px solid var(--color-brand);
-    box-shadow: 0px 2px 0px 0px oklch(from var(--color-brand) l c h / 0.25);  /* rgba(125, 37, 193, 0.25) */
+    color: var(--color-brand-min-contrast);
+    border: 1px solid var(--color-brand-min-contrast);
+    box-shadow: 0px 2px 0px 0px oklch(  /* rgba(125, 37, 193, 0.25) */
+      from var(--color-brand) min(l, 0.95) c h / 0.25
+    );
   }
 
   .formBody input[type="submit"]:hover,
@@ -202,7 +220,9 @@
   .btn:active,
   input[type="file"]::file-selector-button:active,
   select:active {
-    box-shadow: inset 0px 2px 0px 0px oklch(from var(--color-brand) l c h / 0.25);  /* rgba(125, 37, 193, 0.25) */
+    box-shadow: inset 0px 2px 0px 0px oklch(  /* rgba(125, 37, 193, 0.25) */
+      from var(--color-brand) min(l, 0.95) c h / 0.25
+    );
   }
 
   .btn-danger,
@@ -213,8 +233,8 @@
 
   p.badge {
     background-color: white;
-    color: var(--color-brand);
-    border: 1px solid var(--color-brand);
+    color: var(--color-brand-min-contrast);
+    border: 1px solid var(--color-brand-min-contrast);
   }
 
   .search-highlight {
@@ -268,7 +288,7 @@
   }
 
   .toggle-ui input[type="checkbox"]:checked ~ label .toggle {
-    background: var(--color-brand);
+    background: var(--color-brand-min-contrast);
   }
 
   .flash-messages {
@@ -310,7 +330,7 @@
   }
 
   .banner {
-    background-color: var(--color-brand);
+    background-color: var(--color-brand-min-contrast);
     color: white;
   }
 
@@ -429,7 +449,9 @@
   /* Change background color of tabs on hover */
   .tab:hover,
   .subtab:hover {
-    background-color: oklch(from var(--color-dark-bg) l c h / 0.35);  /* was rgba(255, 255, 255, 0.1) now with color */
+    background-color: oklch(  /* was rgba(255, 255, 255, 0.1) now with color */
+      from var(--color-dark-bg) l c h / 0.2
+    );
   }
 
   /* Create an active/current tablink class */
@@ -475,7 +497,9 @@
     background-color: var(--color-dark);
     color: var(--color-brand-dark);
     border: 1px solid var(--color-brand-dark);
-    box-shadow: 0px 2px 0px 0px oklch(from var(--color-brand) l c h / 0.25);  /* rgba(125, 37, 193, 0.25) */
+    box-shadow: 0px 2px 0px 0px oklch(  /* rgba(125, 37, 193, 0.25) */
+      from var(--color-brand) l c h / 0.25
+    );
   }
 
   .formBody input[type="submit"]:hover,
@@ -489,7 +513,9 @@
   .formBody button:active,
   .btn:active,
   input[type="file"]::file-selector-button:active {
-    box-shadow: inset 0px 2px 0px 0px oklch(from var(--color-brand) l c h / 0.25);  /* rgba(125, 37, 193, 0.25) */
+    box-shadow: inset 0px 2px 0px 0px oklch(  /* rgba(125, 37, 193, 0.25) */
+      from var(--color-brand) l c h / 0.25
+    );
   }
 
   .btn-danger,
@@ -1171,7 +1197,9 @@ button,
 input[type="file"]::file-selector-button {
   cursor: pointer;
   text-decoration: none;
-  box-shadow: 0px 2px 0px 0px oklch(from var(--color-brand) l c h / 0.25);  /* rgba(125, 37, 193, 0.25) */
+  box-shadow: 0px 2px 0px 0px oklch(  /* rgba(125, 37, 193, 0.25) */
+    from var(--color-brand) l c h / 0.25
+  );
 }
 
 textarea {

From 9593477f8dfc2e4528ba6e992f0586f5bf0105e3 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Sat, 14 Sep 2024 03:02:36 -0400
Subject: [PATCH 15/59] fix: use oklch instead of lch in JS & remove force
 reflow #573

For Roadmap Item #533
---
 hushline/static/js/settings.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/hushline/static/js/settings.js b/hushline/static/js/settings.js
index 41525ba8..e1a41ee7 100644
--- a/hushline/static/js/settings.js
+++ b/hushline/static/js/settings.js
@@ -79,18 +79,16 @@ document.addEventListener("DOMContentLoaded", function () {
   document
     .getElementById("brand-primary-color")
     .addEventListener("input", function(event) {
-      const brandColor = `lch(from ${event.target.value} l c h)`;
+      const brandColor = `oklch(from ${event.target.value} l c h)`;
       document.documentElement.style.setProperty("--color-brand", brandColor);
-      document.body.offsetHeight;  // force a reflow
     });
 
   // Update color once it's been finalized
   document
     .getElementById("brand-primary-color")
     .addEventListener("change", function(event) {
-      const brandColor = `lch(from ${event.target.value} l c h)`;
+      const brandColor = `oklch(from ${event.target.value} l c h)`;
       document.documentElement.style.setProperty("--color-brand", brandColor);
-      document.body.offsetHeight;  // force a reflow
     });
 
   var forwarding_enabled = document.querySelector(

From 09f7f73b328366ebd92e45be942985b5428115f8 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Sat, 14 Sep 2024 03:10:40 -0400
Subject: [PATCH 16/59] fix: clamp max lightness lower to keep light color
 saturation #573

For Roadmap Item #533
---
 hushline/static/css/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hushline/static/css/style.css b/hushline/static/css/style.css
index 19399ac5..519699fe 100644
--- a/hushline/static/css/style.css
+++ b/hushline/static/css/style.css
@@ -8,7 +8,7 @@
   );
   --color-brand-dark: oklch(  /* was #ecdafa now slightly more saturated */
     from var(--color-brand)
-    clamp(0.85, l + 0.4271, 0.98) calc(0.25 * c) calc(h + 6)
+    clamp(0.85, l + 0.4271, 0.95) calc(0.25 * c) calc(h + 6)
   );
   --color-text: #333;
   --color-text-dark-alt-2: #e4e4e4;

From c1ace7678bdbde2be9cd37c306973472a6e5fe8d Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Sat, 14 Sep 2024 03:36:57 -0400
Subject: [PATCH 17/59] feat: create new ``HostOrganization`` table for
 instance data #573

For Roadmap Item #533
---
 hushline/model.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/hushline/model.py b/hushline/model.py
index c14d7ffb..1b5b0aec 100644
--- a/hushline/model.py
+++ b/hushline/model.py
@@ -28,6 +28,14 @@ def default(cls) -> "SMTPEncryption":
         return cls.StartTLS
 
 
+class HostOrganization(Model):
+    __tablename__ = "host_organization"
+
+    id: Mapped[int] = mapped_column(primary_key=True, default=1)
+    brand_app_name: Mapped[str] = mapped_column(db.String(255), default="🤫 Hush Line")
+    brand_primary_hex_color: Mapped[str] = mapped_column(db.String(255), default="#7d25c1")
+
+
 class User(Model):
     __tablename__ = "users"
 

From bdc00e44618f852f325f63810b7476ea02f05747 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Sat, 14 Sep 2024 03:45:13 -0400
Subject: [PATCH 18/59] feat: install ``HostOrganization`` record into jinja
 templates #573

Also ensure the new table is created.

For Roadmap Item #533
---
 hushline/__init__.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/hushline/__init__.py b/hushline/__init__.py
index e918e849..9c1368f9 100644
--- a/hushline/__init__.py
+++ b/hushline/__init__.py
@@ -10,7 +10,7 @@
 
 from . import admin, routes, settings
 from .db import db
-from .model import User
+from .model import HostOrganization, User
 from .version import __version__
 
 
@@ -61,6 +61,9 @@ def create_app() -> Flask:
     db.init_app(app)
     Migrate(app, db)
 
+    with app.app_context():
+        db.create_all()
+
     routes.init_app(app)
     for module in [admin, settings]:
         app.register_blueprint(module.create_blueprint())
@@ -77,6 +80,14 @@ def inject_user() -> dict[str, Any]:
             return {"user": user}
         return {}
 
+    @app.context_processor
+    def inject_host() -> dict[str, HostOrganization]:
+        if (host_org := db.session.get(HostOrganization, 1)) is None:
+            host_org = HostOrganization()
+            db.session.add(host_org)
+            db.session.commit()
+        return dict(host_org=host_org)
+
     # Add Onion-Location header to all responses
     if app.config["ONION_HOSTNAME"]:
 

From 1352dfc1c462d9c6d32eabd7176dd9a1dfc06fe2 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Sat, 14 Sep 2024 04:20:20 -0400
Subject: [PATCH 19/59] fix: rename front/back -end forms & db object for
 proper comms #573

For Roadmap Item #533
---
 hushline/settings.py             | 20 +++++++++++---------
 hushline/templates/settings.html | 12 ++++++------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/hushline/settings.py b/hushline/settings.py
index 7565c6c4..e46f9ab7 100644
--- a/hushline/settings.py
+++ b/hushline/settings.py
@@ -38,7 +38,7 @@
 from .crypto import is_valid_pgp_key
 from .db import db
 from .forms import ComplexPassword, HexColor, TwoFactorForm
-from .model import Message, SecondaryUsername, SMTPEncryption, User
+from .model import HostOrganization, Message, SecondaryUsername, SMTPEncryption, User
 from .utils import admin_authentication_required, authentication_required, create_smtp_config
 
 
@@ -195,11 +195,11 @@ class ProfileForm(FlaskForm):
 
 
 class UpdateBrandPrimaryColorForm(FlaskForm):
-    hex_color = StringField("HEX Color", validators=[DataRequired(), HexColor()])
+    brand_primary_hex_color = StringField("Hex Color", validators=[DataRequired(), HexColor()])
 
 
 class UpdateBrandAppNameForm(FlaskForm):
-    app_name = StringField("App Name", validators=[DataRequired(), Length(min=2, max=30)])
+    brand_app_name = StringField("App Name", validators=[DataRequired(), Length(min=2, max=30)])
 
 
 def set_field_attribute(input_field: Field, attribute: str, value: str) -> None:
@@ -714,12 +714,12 @@ def update_smtp_settings() -> Response | str:
 
     @bp.route("/update-brand-primary-color", methods=["POST"])
     @admin_authentication_required
-    def update_brand_primary_color(user: User) -> Response | str:
-        # TODO:
-        # db persistence logic + form retrieval + update root style variable
+    def update_brand_primary_color() -> Response | str:
+        if (host_org := db.session.get(HostOrganization, 1)) is None:
+            host_org = HostOrganization()  # only needed for mypy
         form = UpdateBrandPrimaryColorForm()
         if form.validate_on_submit():
-            user.brand_primary_hex_color = form.hex_color.data
+            host_org.brand_primary_hex_color = form.brand_primary_hex_color.data
             db.session.commit()
             flash("👍 Brand primary color updated successfully.")
             return redirect(url_for(".index"))
@@ -729,12 +729,14 @@ def update_brand_primary_color(user: User) -> Response | str:
 
     @bp.route("/update-brand-app-name", methods=["POST"])
     @admin_authentication_required
-    def update_brand_app_name(user: User) -> Response | str:
+    def update_brand_app_name() -> Response | str:
         # TODO:
         # db persistence logic + form retrieval + update h1
+        if (host_org := db.session.get(HostOrganization, 1)) is None:
+            host_org = HostOrganization()  # only needed for mypy
         form = UpdateBrandAppNameForm()
         if form.validate_on_submit():
-            user.brand_app_name = form.app_name.data
+            host_org.brand_app_name = form.brand_app_name.data
             db.session.commit()
             flash("👍 Brand app name updated successfully.")
             return redirect(url_for(".index"))
diff --git a/hushline/templates/settings.html b/hushline/templates/settings.html
index 268e1315..752e374a 100644
--- a/hushline/templates/settings.html
+++ b/hushline/templates/settings.html
@@ -490,16 +490,16 @@ <h3>Message Encryption</h3>
       <h3>Primary Color</h3>
       <form
         method="POST"
-        action="{{ url_for('settings.update_brand_primary_color', user=user) }}"
+        action="{{ url_for('settings.update_brand_primary_color') }}"
         class="formBody"
       >
         <label for="brand-primary-color">Choose Color</label>
         <input
           type="color"
-          name="brand_primary_color_choice"
+          name="brand_primary_hex_color"
           id="brand-primary-color"
           class="color-picker"
-          value="{{ user.brand_primary_hex_color or '#7d25c1' }}"
+          value="{{ host_org.brand_primary_hex_color or '#7d25c1' }}"
         />
         <button type="submit" class="btn" id="updateBrandPrimaryColor">
           Update Color
@@ -509,16 +509,16 @@ <h3>Primary Color</h3>
       <h3>App Name</h3>
       <form
         method="POST"
-        action="{{ url_for('settings.update_brand_app_name', user=user) }}"
+        action="{{ url_for('settings.update_brand_app_name') }}"
         class="formBody"
       >
         <label for="brand-app-name">Choose Name</label>
         <input
           type="text"
-          name="brand_app_name_choice"
+          name="brand_app_name"
           id="brand-app-name"
           placeholder="🤫 Hush Line"
-          value="{{ user.brand_app_name or '' }}"
+          value="{{ host_org.brand_app_name or '' }}"
         />
         <button type="submit" class="btn" id="updateBrandAppName">
           Update Name

From e2e1f246511d09ba18f17bb520144ad73cff3173 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Sat, 14 Sep 2024 04:28:52 -0400
Subject: [PATCH 20/59] fix: add CSRF tokens to new brand color & name forms
 #573

For Roadmap Item #533
---
 hushline/settings.py             | 4 ++++
 hushline/templates/settings.html | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/hushline/settings.py b/hushline/settings.py
index e46f9ab7..65ac5986 100644
--- a/hushline/settings.py
+++ b/hushline/settings.py
@@ -280,6 +280,8 @@ async def index() -> str | Response:
         display_name_form = DisplayNameForm()
         directory_visibility_form = DirectoryVisibilityForm()
         profile_form = ProfileForm()
+        update_brand_primary_color_form = UpdateBrandPrimaryColorForm()
+        update_brand_app_name_form = UpdateBrandAppNameForm()
 
         # Handle form submissions
         if request.method == "POST":
@@ -403,6 +405,8 @@ async def index() -> str | Response:
             user=user,
             secondary_usernames=secondary_usernames,
             all_users=all_users,  # Pass to the template for admin view
+            update_brand_primary_color_form=update_brand_primary_color_form,
+            update_brand_app_name_form=update_brand_app_name_form,
             email_forwarding_form=email_forwarding_form,
             change_password_form=change_password_form,
             change_username_form=change_username_form,
diff --git a/hushline/templates/settings.html b/hushline/templates/settings.html
index 752e374a..e2fd0e27 100644
--- a/hushline/templates/settings.html
+++ b/hushline/templates/settings.html
@@ -493,6 +493,7 @@ <h3>Primary Color</h3>
         action="{{ url_for('settings.update_brand_primary_color') }}"
         class="formBody"
       >
+        {{ update_brand_primary_color_form.hidden_tag() }}
         <label for="brand-primary-color">Choose Color</label>
         <input
           type="color"
@@ -512,6 +513,7 @@ <h3>App Name</h3>
         action="{{ url_for('settings.update_brand_app_name') }}"
         class="formBody"
       >
+        {{ update_brand_app_name_form.hidden_tag() }}
         <label for="brand-app-name">Choose Name</label>
         <input
           type="text"

From 499455fac37e0b75a0c9dbe212a9bd8ea3ed10ed Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Sat, 14 Sep 2024 04:43:47 -0400
Subject: [PATCH 21/59] fix: import & render custom persisted branding
 configuration #573

For Roadmap Item #533
---
 hushline/templates/base.html | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/hushline/templates/base.html b/hushline/templates/base.html
index bac09f64..265e1b4c 100644
--- a/hushline/templates/base.html
+++ b/hushline/templates/base.html
@@ -64,6 +64,16 @@
       rel="stylesheet"
       href="{{ url_for('static', filename='css/style.css') }}"
     />
+    <script>
+      function importHostConfiguration() {
+        // Update page theme with host's brand color from the database
+        const brandColor = "{{ host_org.brand_primary_hex_color or '#7d25c1' }}";
+        document.documentElement.style.setProperty(
+          "--color-brand", `oklch(from ${brandColor} l c h)`
+        );
+      }
+      importHostConfiguration();
+    </script>
   </head>
 
   <body>

From b63b76a983c5f1c4289344bc556a53adb050edcf Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Sat, 14 Sep 2024 12:39:54 -0400
Subject: [PATCH 22/59] fix: return failure status code when db in incoherent
 state #573

For Roadmap Item #533
---
 hushline/settings.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/hushline/settings.py b/hushline/settings.py
index 65ac5986..3bc948c6 100644
--- a/hushline/settings.py
+++ b/hushline/settings.py
@@ -12,6 +12,7 @@
 from bs4 import BeautifulSoup
 from flask import (
     Blueprint,
+    abort,
     current_app,
     flash,
     redirect,
@@ -720,7 +721,8 @@ def update_smtp_settings() -> Response | str:
     @admin_authentication_required
     def update_brand_primary_color() -> Response | str:
         if (host_org := db.session.get(HostOrganization, 1)) is None:
-            host_org = HostOrganization()  # only needed for mypy
+            abort(500)
+
         form = UpdateBrandPrimaryColorForm()
         if form.validate_on_submit():
             host_org.brand_primary_hex_color = form.brand_primary_hex_color.data
@@ -737,7 +739,8 @@ def update_brand_app_name() -> Response | str:
         # TODO:
         # db persistence logic + form retrieval + update h1
         if (host_org := db.session.get(HostOrganization, 1)) is None:
-            host_org = HostOrganization()  # only needed for mypy
+            abort(500)
+
         form = UpdateBrandAppNameForm()
         if form.validate_on_submit():
             host_org.brand_app_name = form.brand_app_name.data

From 1cda43dbc977dc4445b80a5f5ae3ea46d0b410f6 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Sat, 14 Sep 2024 12:54:16 -0400
Subject: [PATCH 23/59] feat: update page h1 when app name is being typed #573

For Roadmap Item #533
---
 hushline/static/js/settings.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/hushline/static/js/settings.js b/hushline/static/js/settings.js
index e1a41ee7..9b0f9024 100644
--- a/hushline/static/js/settings.js
+++ b/hushline/static/js/settings.js
@@ -91,6 +91,13 @@ document.addEventListener("DOMContentLoaded", function () {
       document.documentElement.style.setProperty("--color-brand", brandColor);
     });
 
+  // Update app name in real-time as it's being typed
+  document
+    .getElementById("brand-app-name")
+    .addEventListener("input", function(event) {
+      document.querySelector("h1").innerText = event.target.value;
+    });
+
   var forwarding_enabled = document.querySelector(
     "input[id='forwarding_enabled']",
   ).checked;

From 93ddcf568184318b912ca2a13eebd33d3b1dac39 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Sat, 14 Sep 2024 13:12:29 -0400
Subject: [PATCH 24/59] feat: update page h1 with host's brand name from the
 database #573

For Roadmap Item #533
---
 hushline/settings.py         | 2 --
 hushline/templates/base.html | 8 +++++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/hushline/settings.py b/hushline/settings.py
index 3bc948c6..4ad9c2d9 100644
--- a/hushline/settings.py
+++ b/hushline/settings.py
@@ -736,8 +736,6 @@ def update_brand_primary_color() -> Response | str:
     @bp.route("/update-brand-app-name", methods=["POST"])
     @admin_authentication_required
     def update_brand_app_name() -> Response | str:
-        # TODO:
-        # db persistence logic + form retrieval + update h1
         if (host_org := db.session.get(HostOrganization, 1)) is None:
             abort(500)
 
diff --git a/hushline/templates/base.html b/hushline/templates/base.html
index 265e1b4c..0453ce85 100644
--- a/hushline/templates/base.html
+++ b/hushline/templates/base.html
@@ -71,8 +71,11 @@
         document.documentElement.style.setProperty(
           "--color-brand", `oklch(from ${brandColor} l c h)`
         );
+
+        // Update page h1 with host's brand name from the database
+        const brandName = "{{ host_org.brand_app_name or '🤫 Hush Line' }}";
+        document.querySelector("h1").innerText = brandName;
       }
-      importHostConfiguration();
     </script>
   </head>
 
@@ -161,6 +164,9 @@ <h1>🤫 Hush Line</h1>
           >
         </div>
       </nav>
+      <script>
+        importHostConfiguration();
+      </script>
     </header>
 
     <main>

From 732059658b7dbe3ea2a503509777a83472226f7a Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Sat, 14 Sep 2024 14:02:10 -0400
Subject: [PATCH 25/59] refactor: clean up redundant &/or unused values #573

For Roadmap Item #533
---
 hushline/templates/base.html     |  4 ++--
 hushline/templates/settings.html | 14 ++++----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/hushline/templates/base.html b/hushline/templates/base.html
index 0453ce85..84f348a1 100644
--- a/hushline/templates/base.html
+++ b/hushline/templates/base.html
@@ -67,13 +67,13 @@
     <script>
       function importHostConfiguration() {
         // Update page theme with host's brand color from the database
-        const brandColor = "{{ host_org.brand_primary_hex_color or '#7d25c1' }}";
+        const brandColor = "{{ host_org.brand_primary_hex_color }}";
         document.documentElement.style.setProperty(
           "--color-brand", `oklch(from ${brandColor} l c h)`
         );
 
         // Update page h1 with host's brand name from the database
-        const brandName = "{{ host_org.brand_app_name or '🤫 Hush Line' }}";
+        const brandName = "{{ host_org.brand_app_name }}";
         document.querySelector("h1").innerText = brandName;
       }
     </script>
diff --git a/hushline/templates/settings.html b/hushline/templates/settings.html
index e2fd0e27..772b2aa1 100644
--- a/hushline/templates/settings.html
+++ b/hushline/templates/settings.html
@@ -499,12 +499,9 @@ <h3>Primary Color</h3>
           type="color"
           name="brand_primary_hex_color"
           id="brand-primary-color"
-          class="color-picker"
-          value="{{ host_org.brand_primary_hex_color or '#7d25c1' }}"
+          value="{{ host_org.brand_primary_hex_color }}"
         />
-        <button type="submit" class="btn" id="updateBrandPrimaryColor">
-          Update Color
-        </button>
+        <button type="submit" class="btn">Update Color</button>
       </form>
 
       <h3>App Name</h3>
@@ -519,12 +516,9 @@ <h3>App Name</h3>
           type="text"
           name="brand_app_name"
           id="brand-app-name"
-          placeholder="🤫 Hush Line"
-          value="{{ host_org.brand_app_name or '' }}"
+          value="{{ host_org.brand_app_name }}"
         />
-        <button type="submit" class="btn" id="updateBrandAppName">
-          Update Name
-        </button>
+        <button type="submit" class="btn">Update Name</button>
       </form>
     </div>
 

From 25c49d250eaac2b95f020284238e7209451ed032 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Sat, 14 Sep 2024 14:07:59 -0400
Subject: [PATCH 26/59] feat: validate app names are canonical under html
 conversions #573

For Roadmap Item #533
---
 hushline/forms.py    | 8 ++++++++
 hushline/settings.py | 6 ++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/hushline/forms.py b/hushline/forms.py
index 345be088..33e33425 100644
--- a/hushline/forms.py
+++ b/hushline/forms.py
@@ -1,3 +1,4 @@
+import html
 import re
 
 from flask_wtf import FlaskForm
@@ -35,5 +36,12 @@ def __call__(self, form: Form, field: Field) -> None:
             raise ValidationError(f"{color=} is an invalid 6-hexit color code.")
 
 
+class CanonicalHTML:
+    def __call__(self, form: Form, field: Field) -> None:
+        text: str = field.data
+        if text != html.escape(text).strip():
+            raise ValidationError(f"{text=} is ambiguous or unescaped.")
+
+
 class TwoFactorForm(FlaskForm):
     verification_code = StringField("2FA Code", validators=[DataRequired(), Length(min=6, max=6)])
diff --git a/hushline/settings.py b/hushline/settings.py
index 4ad9c2d9..3aae89b7 100644
--- a/hushline/settings.py
+++ b/hushline/settings.py
@@ -38,7 +38,7 @@
 
 from .crypto import is_valid_pgp_key
 from .db import db
-from .forms import ComplexPassword, HexColor, TwoFactorForm
+from .forms import CanonicalHTML, ComplexPassword, HexColor, TwoFactorForm
 from .model import HostOrganization, Message, SecondaryUsername, SMTPEncryption, User
 from .utils import admin_authentication_required, authentication_required, create_smtp_config
 
@@ -200,7 +200,9 @@ class UpdateBrandPrimaryColorForm(FlaskForm):
 
 
 class UpdateBrandAppNameForm(FlaskForm):
-    brand_app_name = StringField("App Name", validators=[DataRequired(), Length(min=2, max=30)])
+    brand_app_name = StringField(
+        "App Name", validators=[CanonicalHTML(), DataRequired(), Length(min=2, max=30)]
+    )
 
 
 def set_field_attribute(input_field: Field, attribute: str, value: str) -> None:

From d745fdd284f72c08b1f5776b2fc8ba1aa008ab6f Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Sat, 14 Sep 2024 14:33:20 -0400
Subject: [PATCH 27/59] refactor: remove redundant form validator #573

For Roadmap Item #533
---
 hushline/settings.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/hushline/settings.py b/hushline/settings.py
index 3aae89b7..1939ae93 100644
--- a/hushline/settings.py
+++ b/hushline/settings.py
@@ -200,9 +200,7 @@ class UpdateBrandPrimaryColorForm(FlaskForm):
 
 
 class UpdateBrandAppNameForm(FlaskForm):
-    brand_app_name = StringField(
-        "App Name", validators=[CanonicalHTML(), DataRequired(), Length(min=2, max=30)]
-    )
+    brand_app_name = StringField("App Name", validators=[CanonicalHTML(), Length(min=2, max=30)])
 
 
 def set_field_attribute(input_field: Field, attribute: str, value: str) -> None:

From 7c390b51b9e6d55e7f962d65fbd2e570a725ab80 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Sat, 14 Sep 2024 14:54:31 -0400
Subject: [PATCH 28/59] revert: "refactor: remove redundant form validator
 #573"

This reverts commit d745fdd284f72c08b1f5776b2fc8ba1aa008ab6f. The
removed validator is necessary since it's ensured not to be skipped
when form fields are empty.

For Roadmap Item #533
---
 hushline/settings.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hushline/settings.py b/hushline/settings.py
index 1939ae93..3aae89b7 100644
--- a/hushline/settings.py
+++ b/hushline/settings.py
@@ -200,7 +200,9 @@ class UpdateBrandPrimaryColorForm(FlaskForm):
 
 
 class UpdateBrandAppNameForm(FlaskForm):
-    brand_app_name = StringField("App Name", validators=[CanonicalHTML(), Length(min=2, max=30)])
+    brand_app_name = StringField(
+        "App Name", validators=[CanonicalHTML(), DataRequired(), Length(min=2, max=30)]
+    )
 
 
 def set_field_attribute(input_field: Field, attribute: str, value: str) -> None:

From 22127762bd41ae578783ddcc3f5f277cb612a1f9 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Sat, 14 Sep 2024 18:02:13 -0400
Subject: [PATCH 29/59] fix: apply admin-only controls for rendering branding
 features #573

For Roadmap Item #533
---
 hushline/static/js/settings.js   | 42 +++++++++++++++++---------------
 hushline/templates/settings.html |  8 ++++--
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/hushline/static/js/settings.js b/hushline/static/js/settings.js
index 9b0f9024..9fa34555 100644
--- a/hushline/static/js/settings.js
+++ b/hushline/static/js/settings.js
@@ -75,28 +75,30 @@ document.addEventListener("DOMContentLoaded", function () {
     });
   });
 
-  // Update color in real-time as they're being browsed
-  document
-    .getElementById("brand-primary-color")
-    .addEventListener("input", function(event) {
-      const brandColor = `oklch(from ${event.target.value} l c h)`;
-      document.documentElement.style.setProperty("--color-brand", brandColor);
-    });
+  if (document.getElementById("branding")) {
+    // Update color in real-time as they're being browsed
+    document
+      .getElementById("brand-primary-color")
+      .addEventListener("input", function(event) {
+        const brandColor = `oklch(from ${event.target.value} l c h)`;
+        document.documentElement.style.setProperty("--color-brand", brandColor);
+      });
 
-  // Update color once it's been finalized
-  document
-    .getElementById("brand-primary-color")
-    .addEventListener("change", function(event) {
-      const brandColor = `oklch(from ${event.target.value} l c h)`;
-      document.documentElement.style.setProperty("--color-brand", brandColor);
-    });
+    // Update color once it's been finalized
+    document
+      .getElementById("brand-primary-color")
+      .addEventListener("change", function(event) {
+        const brandColor = `oklch(from ${event.target.value} l c h)`;
+        document.documentElement.style.setProperty("--color-brand", brandColor);
+      });
 
-  // Update app name in real-time as it's being typed
-  document
-    .getElementById("brand-app-name")
-    .addEventListener("input", function(event) {
-      document.querySelector("h1").innerText = event.target.value;
-    });
+    // Update app name in real-time as it's being typed
+    document
+      .getElementById("brand-app-name")
+      .addEventListener("input", function(event) {
+        document.querySelector("h1").innerText = event.target.value;
+      });
+  }
 
   var forwarding_enabled = document.querySelector(
     "input[id='forwarding_enabled']",
diff --git a/hushline/templates/settings.html b/hushline/templates/settings.html
index 772b2aa1..782096da 100644
--- a/hushline/templates/settings.html
+++ b/hushline/templates/settings.html
@@ -43,10 +43,11 @@ <h2>Settings</h2>
           Email &amp; Encryption
         </button>
       </li>
+      {% if user.is_admin %}
       <li role="presentation">
         <button
           type="button"
-          class="tab"
+          class="tab admin-only"
           data-tab="branding"
           role="tab"
           aria-selected="false"
@@ -56,6 +57,7 @@ <h2>Settings</h2>
           Branding
         </button>
       </li>
+      {% endif %}
       <li role="presentation">
         <button
           type="button"
@@ -480,9 +482,10 @@ <h3>Message Encryption</h3>
       {% endif %}
     </div>
 
+    {% if user.is_admin %}
     <div
       id="branding"
-      class="tab-content"
+      class="tab-content admin-only"
       role="tabpanel"
       aria-labelledby="branding-tab"
       hidden
@@ -521,6 +524,7 @@ <h3>App Name</h3>
         <button type="submit" class="btn">Update Name</button>
       </form>
     </div>
+    {% endif %}
 
     <div
       id="advanced"

From 4ecc67f0e17737f44875afffcbca2f312f8f99a4 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Sat, 14 Sep 2024 23:41:33 -0400
Subject: [PATCH 30/59] fix: increase contrast ratios to minimum
 recommendations #573

Key text elements now pass AAA Success Criterion 1.4.6 with a
contrast ratio of +7:1 as described in the WCAG 2.2 standard.

WCAG 2.2: https://www.w3.org/TR/WCAG22/#contrast-enhanced
Contrast Tool: https://webaim.org/resources/contrastchecker/

For Roadmap Item #533
---
 hushline/static/css/style.css | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/hushline/static/css/style.css b/hushline/static/css/style.css
index 519699fe..8bc1eded 100644
--- a/hushline/static/css/style.css
+++ b/hushline/static/css/style.css
@@ -6,6 +6,9 @@
   --color-brand-min-contrast: oklch(
     from var(--color-brand) clamp(0.1, l, 0.6) c h
   );
+  --color-brand-max-contrast: oklch(
+    from var(--color-brand-min-contrast) max(l - 0.175, 0.1) calc(1.25 * c) h
+  );
   --color-brand-dark: oklch(  /* was #ecdafa now slightly more saturated */
     from var(--color-brand)
     clamp(0.85, l + 0.4271, 0.95) calc(0.25 * c) calc(h + 6)
@@ -23,11 +26,11 @@
   );
   --color-brand-bg: oklch(  /* #fbf3ff */
     from var(--color-brand)
-    clamp(0.6, l + 0.4883, 0.98) min(c, 0.0179) calc(h + 10.26)
+    clamp(0.8, l + 0.4883, 0.98) min(c, 0.0179) calc(h + 10.26)
   );
   --color-dark-bg: oklch(  /* was #222 now with brand hue */
     from var(--color-brand)
-    clamp(0.15, l - 0.2335, 0.4) min(c, 0.012) calc(h + 16.47)
+    clamp(0.15, l - 0.2335, 0.275) min(c, 0.012) calc(h + 16.47)
   );
   --color-dark-bg-alt: #333;
   --color-dark-bg-alt-1: #444;
@@ -90,7 +93,7 @@
   }
 
   a {
-    color: var(--color-brand-min-contrast);
+    color: var(--color-brand-max-contrast);
   }
 
   p.meta {
@@ -157,7 +160,9 @@
   /* Change background color of tabs on hover */
   .tab:hover,
   .subtab:hover {
-    background-color: var(--color-brand-bg);  /* #fbf3ff */
+    background-color: oklch(  /* #fbf3ff */
+      from var(--color-brand-bg) 0.97 c h / 0.85
+    );
   }
 
   /* Create an active/current tablink class */
@@ -201,7 +206,7 @@
   .formBody button,
   .btn {
     background-color: white;
-    color: var(--color-brand-min-contrast);
+    color: var(--color-brand-max-contrast);
     border: 1px solid var(--color-brand-min-contrast);
     box-shadow: 0px 2px 0px 0px oklch(  /* rgba(125, 37, 193, 0.25) */
       from var(--color-brand) min(l, 0.95) c h / 0.25
@@ -233,7 +238,7 @@
 
   p.badge {
     background-color: white;
-    color: var(--color-brand-min-contrast);
+    color: var(--color-brand-max-contrast);
     border: 1px solid var(--color-brand-min-contrast);
   }
 
@@ -450,7 +455,7 @@
   .tab:hover,
   .subtab:hover {
     background-color: oklch(  /* was rgba(255, 255, 255, 0.1) now with color */
-      from var(--color-dark-bg) l c h / 0.2
+      from var(--color-dark-bg) 0.15 calc(12 * c) h / 0.0675
     );
   }
 

From 2ab4fa435e42a8c98206c5b707e0b41d4f79a5ad Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Sun, 15 Sep 2024 00:00:45 -0400
Subject: [PATCH 31/59] fix: require data for brand app name form to be sent
 #573

For Roadmap Item #533
---
 hushline/templates/settings.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hushline/templates/settings.html b/hushline/templates/settings.html
index 782096da..ba5d83cc 100644
--- a/hushline/templates/settings.html
+++ b/hushline/templates/settings.html
@@ -520,6 +520,7 @@ <h3>App Name</h3>
           name="brand_app_name"
           id="brand-app-name"
           value="{{ host_org.brand_app_name }}"
+          required
         />
         <button type="submit" class="btn">Update Name</button>
       </form>

From a236353ffa79396bd8a5d681e1ecc49293559f86 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Sun, 15 Sep 2024 11:32:17 -0400
Subject: [PATCH 32/59] fix: make dark mode brand colors more vibrant #573

For Roadmap Item #533
---
 hushline/static/css/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hushline/static/css/style.css b/hushline/static/css/style.css
index 8bc1eded..3d6fc59e 100644
--- a/hushline/static/css/style.css
+++ b/hushline/static/css/style.css
@@ -11,7 +11,7 @@
   );
   --color-brand-dark: oklch(  /* was #ecdafa now slightly more saturated */
     from var(--color-brand)
-    clamp(0.85, l + 0.4271, 0.95) calc(0.25 * c) calc(h + 6)
+    clamp(0.9126, l + 0.4271, 0.95) calc(0.35 * c) calc(h + 6)
   );
   --color-text: #333;
   --color-text-dark-alt-2: #e4e4e4;

From 55d0a5d177ba38a3258aa806de350ece540605f6 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Sun, 15 Sep 2024 14:01:55 -0400
Subject: [PATCH 33/59] fix: apply only medium contrast tinting for bold text
 #573

For Roadmap Item #533
---
 hushline/static/css/style.css | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/hushline/static/css/style.css b/hushline/static/css/style.css
index 3d6fc59e..25d41751 100644
--- a/hushline/static/css/style.css
+++ b/hushline/static/css/style.css
@@ -6,8 +6,11 @@
   --color-brand-min-contrast: oklch(
     from var(--color-brand) clamp(0.1, l, 0.6) c h
   );
+  --color-brand-mid-contrast: oklch(
+    from var(--color-brand-min-contrast) max(l - 0.125, 0.1) calc(1.25 * c) h
+  );
   --color-brand-max-contrast: oklch(
-    from var(--color-brand-min-contrast) max(l - 0.175, 0.1) calc(1.25 * c) h
+    from var(--color-brand-min-contrast) max(l - 0.25, 0.1) calc(1.25 * c) h
   );
   --color-brand-dark: oklch(  /* was #ecdafa now slightly more saturated */
     from var(--color-brand)
@@ -198,7 +201,7 @@
   .btn,
   input[type="file"]::file-selector-button {
     border: 0px;
-    background-color: var(--color-brand-min-contrast);
+    background-color: var(--color-brand-mid-contrast);
     color: white;
   }
 
@@ -206,7 +209,7 @@
   .formBody button,
   .btn {
     background-color: white;
-    color: var(--color-brand-max-contrast);
+    color: var(--color-brand-mid-contrast);
     border: 1px solid var(--color-brand-min-contrast);
     box-shadow: 0px 2px 0px 0px oklch(  /* rgba(125, 37, 193, 0.25) */
       from var(--color-brand) min(l, 0.95) c h / 0.25
@@ -238,7 +241,7 @@
 
   p.badge {
     background-color: white;
-    color: var(--color-brand-max-contrast);
+    color: var(--color-brand-mid-contrast);
     border: 1px solid var(--color-brand-min-contrast);
   }
 

From 6d7eaff0d179ab962f3c0316eb011bf8b5a28b1a Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Mon, 16 Sep 2024 10:07:17 -0400
Subject: [PATCH 34/59] refactor: improve the readability of JS code additions
 #573

For Roadmap Item #533
---
 hushline/static/js/settings.js | 31 ++++++++++++++-----------------
 hushline/templates/base.html   |  5 ++---
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/hushline/static/js/settings.js b/hushline/static/js/settings.js
index 9fa34555..9d585e78 100644
--- a/hushline/static/js/settings.js
+++ b/hushline/static/js/settings.js
@@ -76,28 +76,25 @@ document.addEventListener("DOMContentLoaded", function () {
   });
 
   if (document.getElementById("branding")) {
-    // Update color in real-time as they're being browsed
-    document
-      .getElementById("brand-primary-color")
-      .addEventListener("input", function(event) {
-        const brandColor = `oklch(from ${event.target.value} l c h)`;
-        document.documentElement.style.setProperty("--color-brand", brandColor);
-      });
 
-    // Update color once it's been finalized
-    document
-      .getElementById("brand-primary-color")
-      .addEventListener("change", function(event) {
+    // Update color in real-time as they're being browsed & finalized
+    const colorPicker = document.getElementById("brand-primary-color");
+
+    for (const eventName of ["input", "change"]) {
+      colorPicker.addEventListener(eventName, function (event) {
         const brandColor = `oklch(from ${event.target.value} l c h)`;
-        document.documentElement.style.setProperty("--color-brand", brandColor);
+        const cssVariable = ["--color-brand", brandColor];
+        document.documentElement.style.setProperty(...cssVariable);
       });
+    }
 
     // Update app name in real-time as it's being typed
-    document
-      .getElementById("brand-app-name")
-      .addEventListener("input", function(event) {
-        document.querySelector("h1").innerText = event.target.value;
-      });
+    const appNameBox = document.getElementById("brand-app-name");
+
+    appNameBox.addEventListener("input", function (event) {
+      document.querySelector("h1").innerText = event.target.value;
+    });
+
   }
 
   var forwarding_enabled = document.querySelector(
diff --git a/hushline/templates/base.html b/hushline/templates/base.html
index 84f348a1..3a1a0ded 100644
--- a/hushline/templates/base.html
+++ b/hushline/templates/base.html
@@ -68,9 +68,8 @@
       function importHostConfiguration() {
         // Update page theme with host's brand color from the database
         const brandColor = "{{ host_org.brand_primary_hex_color }}";
-        document.documentElement.style.setProperty(
-          "--color-brand", `oklch(from ${brandColor} l c h)`
-        );
+        const cssVariable = ["--color-brand", brandColor];
+        document.documentElement.style.setProperty(...cssVariable);
 
         // Update page h1 with host's brand name from the database
         const brandName = "{{ host_org.brand_app_name }}";

From 47d49da26ac78d123b0ad310de2b76f70ce2f222 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Mon, 16 Sep 2024 10:14:15 -0400
Subject: [PATCH 35/59] style: adjust jinja formatting to reduce extra
 whitespace #573

For Roadmap Item #533
---
 hushline/templates/settings.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hushline/templates/settings.html b/hushline/templates/settings.html
index ba5d83cc..b9bec0db 100644
--- a/hushline/templates/settings.html
+++ b/hushline/templates/settings.html
@@ -43,7 +43,7 @@ <h2>Settings</h2>
           Email &amp; Encryption
         </button>
       </li>
-      {% if user.is_admin %}
+      {% if user.is_admin -%}
       <li role="presentation">
         <button
           type="button"
@@ -57,7 +57,7 @@ <h2>Settings</h2>
           Branding
         </button>
       </li>
-      {% endif %}
+      {%- endif %}
       <li role="presentation">
         <button
           type="button"
@@ -482,7 +482,7 @@ <h3>Message Encryption</h3>
       {% endif %}
     </div>
 
-    {% if user.is_admin %}
+    {% if user.is_admin -%}
     <div
       id="branding"
       class="tab-content admin-only"
@@ -525,7 +525,7 @@ <h3>App Name</h3>
         <button type="submit" class="btn">Update Name</button>
       </form>
     </div>
-    {% endif %}
+    {%- endif %}
 
     <div
       id="advanced"

From e9ca02df0fad9c3aa1e25102f599a0520d0340d7 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Mon, 16 Sep 2024 14:31:36 -0400
Subject: [PATCH 36/59] fix: remove early creation of all db tables #573

Suggested in review:
https://github.com/scidsg/hushline/pull/573#discussion_r1761586224

For Roadmap Item #533

Co-authored-by: Jeremy Moore <jeremymoore@gmail.com>
---
 hushline/__init__.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/hushline/__init__.py b/hushline/__init__.py
index 9c1368f9..15c6ab84 100644
--- a/hushline/__init__.py
+++ b/hushline/__init__.py
@@ -61,9 +61,6 @@ def create_app() -> Flask:
     db.init_app(app)
     Migrate(app, db)
 
-    with app.app_context():
-        db.create_all()
-
     routes.init_app(app)
     for module in [admin, settings]:
         app.register_blueprint(module.create_blueprint())

From ab0a21251f9a94858515c724e86c00f3f172ec27 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Mon, 16 Sep 2024 14:36:12 -0400
Subject: [PATCH 37/59] fix: limit hex color-code db field length to 7
 characters #573

Suggested in review:
https://github.com/scidsg/hushline/pull/573#discussion_r1761591879

For Roadmap Item #533

Co-authored-by: Jeremy Moore <jeremymoore@gmail.com>
---
 hushline/model.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hushline/model.py b/hushline/model.py
index 1b5b0aec..4866a070 100644
--- a/hushline/model.py
+++ b/hushline/model.py
@@ -33,7 +33,7 @@ class HostOrganization(Model):
 
     id: Mapped[int] = mapped_column(primary_key=True, default=1)
     brand_app_name: Mapped[str] = mapped_column(db.String(255), default="🤫 Hush Line")
-    brand_primary_hex_color: Mapped[str] = mapped_column(db.String(255), default="#7d25c1")
+    brand_primary_hex_color: Mapped[str] = mapped_column(db.String(7), default="#7d25c1")
 
 
 class User(Model):

From 377035437ec61993ba2a3fe76e3dd94aa9c30e7f Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Tue, 17 Sep 2024 11:10:32 -0400
Subject: [PATCH 38/59] fix: improve dark themes accuracy, dynamism, & vibrancy
 #573

For Roadmap Item #533
---
 hushline/static/css/style.css | 51 +++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 20 deletions(-)

diff --git a/hushline/static/css/style.css b/hushline/static/css/style.css
index 25d41751..b080c4cb 100644
--- a/hushline/static/css/style.css
+++ b/hushline/static/css/style.css
@@ -12,9 +12,17 @@
   --color-brand-max-contrast: oklch(
     from var(--color-brand-min-contrast) max(l - 0.25, 0.1) calc(1.25 * c) h
   );
-  --color-brand-dark: oklch(  /* was #ecdafa now slightly more saturated */
+  --color-brand-dark-min-saturation: oklch(
     from var(--color-brand)
-    clamp(0.9126, l + 0.4271, 0.95) calc(0.35 * c) calc(h + 6)
+    clamp(0.96, l + 0.425, 0.98) calc(0.5 * c) h
+  );
+  --color-brand-dark-mid-saturation: oklch(
+    from var(--color-brand)
+    clamp(0.93, l + 0.4, 0.98) calc(0.75 * c) h
+  );
+  --color-brand-dark-max-saturation: oklch(
+    from var(--color-brand)
+    clamp(0.8, l + 0.175, 0.94) calc(1.5 * c) calc(h - 6)
   );
   --color-text: #333;
   --color-text-dark-alt-2: #e4e4e4;
@@ -25,7 +33,7 @@
     from var(--color-brand) l c h / 0.1
   );
   --color-highlight-dark: oklch(  /* rgba(220, 198, 237, 0.2) */
-    from var(--color-brand-dark) l c h / 0.2
+    from var(--color-brand-dark-mid-saturation) l c h / 0.2
   );
   --color-brand-bg: oklch(  /* #fbf3ff */
     from var(--color-brand)
@@ -33,7 +41,7 @@
   );
   --color-dark-bg: oklch(  /* was #222 now with brand hue */
     from var(--color-brand)
-    clamp(0.15, l - 0.2335, 0.275) min(c, 0.012) calc(h + 16.47)
+    clamp(0.18, l - 0.275, 0.215) min(c, 0.01) calc(h + 10.26)
   );
   --color-dark-bg-alt: #333;
   --color-dark-bg-alt-1: #444;
@@ -381,7 +389,7 @@
   }
 
   a {
-    color: var(--color-brand-dark);
+    color: var(--color-brand-dark-mid-saturation);
   }
 
   p.meta {
@@ -465,8 +473,8 @@
   /* Create an active/current tablink class */
   .tab.active,
   .subtab.active {
-    box-shadow: 0 -2px 0 inset var(--color-brand-dark);
-    border-bottom: 1px solid var(--color-brand-dark);
+    box-shadow: 0 -2px 0 inset var(--color-brand-dark-min-saturation);
+    border-bottom: 1px solid var(--color-brand-dark-min-saturation);
   }
 
   .user,
@@ -486,16 +494,17 @@
   button:focus,
   input[type="file"]::file-selector-button:focus,
   select:focus {
-    outline: 4px double var(--color-brand-dark);
-    border: 1px solid var(--color-brand-dark);
+    outline: 4px double var(--color-brand-dark-min-saturation);
+    border: 1px solid var(--color-brand-dark-min-saturation);
     box-shadow: none;
   }
 
   input[type="submit"],
   button,
-  .btn {
+  .btn,
+  input[type="file"]::file-selector-button {
     border: 0px;
-    background-color: var(--color-brand-dark);
+    background-color: var(--color-brand-dark-min-saturation);
     color: var(--color-text);
   }
 
@@ -503,10 +512,10 @@
   .formBody button,
   .btn {
     background-color: var(--color-dark);
-    color: var(--color-brand-dark);
-    border: 1px solid var(--color-brand-dark);
+    color: var(--color-brand-dark-min-saturation);
+    border: 1px solid var(--color-brand-dark-max-saturation);
     box-shadow: 0px 2px 0px 0px oklch(  /* rgba(125, 37, 193, 0.25) */
-      from var(--color-brand) l c h / 0.25
+      from var(--color-brand-dark-max-saturation) l c h / 0.25
     );
   }
 
@@ -528,14 +537,16 @@
 
   .btn-danger,
   .formBody .btn-danger {
-    color: lightpink;
-    border-color: lightpink;
+    background-color: darkred;
+    color: white;
+    border: 1px solid oklch(1 0 0 / 0.55);
+    box-shadow: 0px 4px 8px -4px oklch(1 0 0 / 0.25);
   }
 
   p.badge {
     background-color: var(--color-dark-bg-alt-1);
-    color: var(--color-brand-dark);
-    border: 1px solid var(--color-brand-dark);
+    color: var(--color-brand-dark-min-saturation);
+    border: 1px solid var(--color-brand-dark-max-saturation);
   }
 
   h2.submit + .badgeContainer p.badge {
@@ -598,7 +609,7 @@
   }
 
   .toggle-ui input[type="checkbox"]:checked ~ label .toggle {
-    background: var(--color-brand-dark);
+    background: var(--color-brand-dark-mid-saturation);
   }
 
   footer {
@@ -646,7 +657,7 @@
   }
 
   .banner {
-    background-color: var(--color-brand-dark);  /* #ecdafa */
+    background-color: var(--color-brand-dark-min-saturation);  /* #ecdafa */
     color: #333;
   }
 

From 7f154fe070b83e2868b01abb5db0bb50ba50e3e7 Mon Sep 17 00:00:00 2001
From: Jeremy Moore <jeremymoore@gmail.com>
Date: Tue, 17 Sep 2024 13:17:12 -0400
Subject: [PATCH 39/59] lint

---
 hushline/static/css/style.css    |  78 ++++++++++++-----------
 hushline/static/js/settings.js   |   2 -
 hushline/templates/settings.html | 106 +++++++++++++++----------------
 3 files changed, 94 insertions(+), 92 deletions(-)

diff --git a/hushline/static/css/style.css b/hushline/static/css/style.css
index b080c4cb..9fea8801 100644
--- a/hushline/static/css/style.css
+++ b/hushline/static/css/style.css
@@ -2,7 +2,7 @@
   --color-border: rgba(0, 0, 0, 0.18);
   --color-border-dark: #7d7d7d;
   --color-border-dark-1: #555;
-  --color-brand: oklch(48.55% 0.222 304.47);  /* #7d25c1 */
+  --color-brand: oklch(48.55% 0.222 304.47); /* #7d25c1 */
   --color-brand-min-contrast: oklch(
     from var(--color-brand) clamp(0.1, l, 0.6) c h
   );
@@ -13,35 +13,34 @@
     from var(--color-brand-min-contrast) max(l - 0.25, 0.1) calc(1.25 * c) h
   );
   --color-brand-dark-min-saturation: oklch(
-    from var(--color-brand)
-    clamp(0.96, l + 0.425, 0.98) calc(0.5 * c) h
+    from var(--color-brand) clamp(0.96, l + 0.425, 0.98) calc(0.5 * c) h
   );
   --color-brand-dark-mid-saturation: oklch(
-    from var(--color-brand)
-    clamp(0.93, l + 0.4, 0.98) calc(0.75 * c) h
+    from var(--color-brand) clamp(0.93, l + 0.4, 0.98) calc(0.75 * c) h
   );
   --color-brand-dark-max-saturation: oklch(
-    from var(--color-brand)
-    clamp(0.8, l + 0.175, 0.94) calc(1.5 * c) calc(h - 6)
+    from var(--color-brand) clamp(0.8, l + 0.175, 0.94) calc(1.5 * c)
+      calc(h - 6)
   );
   --color-text: #333;
   --color-text-dark-alt-2: #e4e4e4;
   --color-text-dark-alt: #c2c2c2;
   --color-text-dark: #dadada;
   --color-text-light: #595959;
-  --color-highlight: oklch(  /* rgba(125, 37, 193, 0.1) */
-    from var(--color-brand) l c h / 0.1
+  --color-highlight: oklch(
+    /* rgba(125, 37, 193, 0.1) */ from var(--color-brand) l c h / 0.1
   );
-  --color-highlight-dark: oklch(  /* rgba(220, 198, 237, 0.2) */
-    from var(--color-brand-dark-mid-saturation) l c h / 0.2
+  --color-highlight-dark: oklch(
+    /* rgba(220, 198, 237, 0.2) */ from var(--color-brand-dark-mid-saturation) l
+      c h / 0.2
   );
-  --color-brand-bg: oklch(  /* #fbf3ff */
-    from var(--color-brand)
-    clamp(0.8, l + 0.4883, 0.98) min(c, 0.0179) calc(h + 10.26)
+  --color-brand-bg: oklch(
+    /* #fbf3ff */ from var(--color-brand) clamp(0.8, l + 0.4883, 0.98)
+      min(c, 0.0179) calc(h + 10.26)
   );
-  --color-dark-bg: oklch(  /* was #222 now with brand hue */
-    from var(--color-brand)
-    clamp(0.18, l - 0.275, 0.215) min(c, 0.01) calc(h + 10.26)
+  --color-dark-bg: oklch(
+    /* was #222 now with brand hue */ from var(--color-brand)
+      clamp(0.18, l - 0.275, 0.215) min(c, 0.01) calc(h + 10.26)
   );
   --color-dark-bg-alt: #333;
   --color-dark-bg-alt-1: #444;
@@ -171,8 +170,8 @@
   /* Change background color of tabs on hover */
   .tab:hover,
   .subtab:hover {
-    background-color: oklch(  /* #fbf3ff */
-      from var(--color-brand-bg) 0.97 c h / 0.85
+    background-color: oklch(
+      /* #fbf3ff */ from var(--color-brand-bg) 0.97 c h / 0.85
     );
   }
 
@@ -219,9 +218,11 @@
     background-color: white;
     color: var(--color-brand-mid-contrast);
     border: 1px solid var(--color-brand-min-contrast);
-    box-shadow: 0px 2px 0px 0px oklch(  /* rgba(125, 37, 193, 0.25) */
-      from var(--color-brand) min(l, 0.95) c h / 0.25
-    );
+    box-shadow: 0px 2px 0px 0px
+      oklch(
+        /* rgba(125, 37, 193, 0.25) */ from var(--color-brand) min(l, 0.95) c h /
+          0.25
+      );
   }
 
   .formBody input[type="submit"]:hover,
@@ -236,9 +237,11 @@
   .btn:active,
   input[type="file"]::file-selector-button:active,
   select:active {
-    box-shadow: inset 0px 2px 0px 0px oklch(  /* rgba(125, 37, 193, 0.25) */
-      from var(--color-brand) min(l, 0.95) c h / 0.25
-    );
+    box-shadow: inset 0px 2px 0px 0px
+      oklch(
+        /* rgba(125, 37, 193, 0.25) */ from var(--color-brand) min(l, 0.95) c h /
+          0.25
+      );
   }
 
   .btn-danger,
@@ -465,8 +468,9 @@
   /* Change background color of tabs on hover */
   .tab:hover,
   .subtab:hover {
-    background-color: oklch(  /* was rgba(255, 255, 255, 0.1) now with color */
-      from var(--color-dark-bg) 0.15 calc(12 * c) h / 0.0675
+    background-color: oklch(
+      /* was rgba(255, 255, 255, 0.1) now with color */ from
+        var(--color-dark-bg) 0.15 calc(12 * c) h / 0.0675
     );
   }
 
@@ -514,9 +518,11 @@
     background-color: var(--color-dark);
     color: var(--color-brand-dark-min-saturation);
     border: 1px solid var(--color-brand-dark-max-saturation);
-    box-shadow: 0px 2px 0px 0px oklch(  /* rgba(125, 37, 193, 0.25) */
-      from var(--color-brand-dark-max-saturation) l c h / 0.25
-    );
+    box-shadow: 0px 2px 0px 0px
+      oklch(
+        /* rgba(125, 37, 193, 0.25) */ from
+          var(--color-brand-dark-max-saturation) l c h / 0.25
+      );
   }
 
   .formBody input[type="submit"]:hover,
@@ -530,9 +536,8 @@
   .formBody button:active,
   .btn:active,
   input[type="file"]::file-selector-button:active {
-    box-shadow: inset 0px 2px 0px 0px oklch(  /* rgba(125, 37, 193, 0.25) */
-      from var(--color-brand) l c h / 0.25
-    );
+    box-shadow: inset 0px 2px 0px 0px
+      oklch(/* rgba(125, 37, 193, 0.25) */ from var(--color-brand) l c h / 0.25);
   }
 
   .btn-danger,
@@ -657,7 +662,7 @@
   }
 
   .banner {
-    background-color: var(--color-brand-dark-min-saturation);  /* #ecdafa */
+    background-color: var(--color-brand-dark-min-saturation); /* #ecdafa */
     color: #333;
   }
 
@@ -1216,9 +1221,8 @@ button,
 input[type="file"]::file-selector-button {
   cursor: pointer;
   text-decoration: none;
-  box-shadow: 0px 2px 0px 0px oklch(  /* rgba(125, 37, 193, 0.25) */
-    from var(--color-brand) l c h / 0.25
-  );
+  box-shadow: 0px 2px 0px 0px
+    oklch(/* rgba(125, 37, 193, 0.25) */ from var(--color-brand) l c h / 0.25);
 }
 
 textarea {
diff --git a/hushline/static/js/settings.js b/hushline/static/js/settings.js
index 9d585e78..f3bf64d8 100644
--- a/hushline/static/js/settings.js
+++ b/hushline/static/js/settings.js
@@ -76,7 +76,6 @@ document.addEventListener("DOMContentLoaded", function () {
   });
 
   if (document.getElementById("branding")) {
-
     // Update color in real-time as they're being browsed & finalized
     const colorPicker = document.getElementById("brand-primary-color");
 
@@ -94,7 +93,6 @@ document.addEventListener("DOMContentLoaded", function () {
     appNameBox.addEventListener("input", function (event) {
       document.querySelector("h1").innerText = event.target.value;
     });
-
   }
 
   var forwarding_enabled = document.querySelector(
diff --git a/hushline/templates/settings.html b/hushline/templates/settings.html
index b9bec0db..eb4a2d09 100644
--- a/hushline/templates/settings.html
+++ b/hushline/templates/settings.html
@@ -44,19 +44,19 @@ <h2>Settings</h2>
         </button>
       </li>
       {% if user.is_admin -%}
-      <li role="presentation">
-        <button
-          type="button"
-          class="tab admin-only"
-          data-tab="branding"
-          role="tab"
-          aria-selected="false"
-          aria-controls="branding"
-          id="branding-tab"
-        >
-          Branding
-        </button>
-      </li>
+        <li role="presentation">
+          <button
+            type="button"
+            class="tab admin-only"
+            data-tab="branding"
+            role="tab"
+            aria-selected="false"
+            aria-controls="branding"
+            id="branding-tab"
+          >
+            Branding
+          </button>
+        </li>
       {%- endif %}
       <li role="presentation">
         <button
@@ -483,48 +483,48 @@ <h3>Message Encryption</h3>
     </div>
 
     {% if user.is_admin -%}
-    <div
-      id="branding"
-      class="tab-content admin-only"
-      role="tabpanel"
-      aria-labelledby="branding-tab"
-      hidden
-    >
-      <h3>Primary Color</h3>
-      <form
-        method="POST"
-        action="{{ url_for('settings.update_brand_primary_color') }}"
-        class="formBody"
+      <div
+        id="branding"
+        class="tab-content admin-only"
+        role="tabpanel"
+        aria-labelledby="branding-tab"
+        hidden
       >
-        {{ update_brand_primary_color_form.hidden_tag() }}
-        <label for="brand-primary-color">Choose Color</label>
-        <input
-          type="color"
-          name="brand_primary_hex_color"
-          id="brand-primary-color"
-          value="{{ host_org.brand_primary_hex_color }}"
-        />
-        <button type="submit" class="btn">Update Color</button>
-      </form>
+        <h3>Primary Color</h3>
+        <form
+          method="POST"
+          action="{{ url_for('settings.update_brand_primary_color') }}"
+          class="formBody"
+        >
+          {{ update_brand_primary_color_form.hidden_tag() }}
+          <label for="brand-primary-color">Choose Color</label>
+          <input
+            type="color"
+            name="brand_primary_hex_color"
+            id="brand-primary-color"
+            value="{{ host_org.brand_primary_hex_color }}"
+          />
+          <button type="submit" class="btn">Update Color</button>
+        </form>
 
-      <h3>App Name</h3>
-      <form
-        method="POST"
-        action="{{ url_for('settings.update_brand_app_name') }}"
-        class="formBody"
-      >
-        {{ update_brand_app_name_form.hidden_tag() }}
-        <label for="brand-app-name">Choose Name</label>
-        <input
-          type="text"
-          name="brand_app_name"
-          id="brand-app-name"
-          value="{{ host_org.brand_app_name }}"
-          required
-        />
-        <button type="submit" class="btn">Update Name</button>
-      </form>
-    </div>
+        <h3>App Name</h3>
+        <form
+          method="POST"
+          action="{{ url_for('settings.update_brand_app_name') }}"
+          class="formBody"
+        >
+          {{ update_brand_app_name_form.hidden_tag() }}
+          <label for="brand-app-name">Choose Name</label>
+          <input
+            type="text"
+            name="brand_app_name"
+            id="brand-app-name"
+            value="{{ host_org.brand_app_name }}"
+            required
+          />
+          <button type="submit" class="btn">Update Name</button>
+        </form>
+      </div>
     {%- endif %}
 
     <div

From 098426312c501aab3a64a37d6624756a2bf9d112 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Tue, 17 Sep 2024 15:37:17 -0400
Subject: [PATCH 40/59] fix: make dark danger button border more subtle #573

For Roadmap Item #533
---
 hushline/static/css/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hushline/static/css/style.css b/hushline/static/css/style.css
index b080c4cb..d4c44dfc 100644
--- a/hushline/static/css/style.css
+++ b/hushline/static/css/style.css
@@ -539,7 +539,7 @@
   .formBody .btn-danger {
     background-color: darkred;
     color: white;
-    border: 1px solid oklch(1 0 0 / 0.55);
+    border: 1px solid oklch(1 0 0 / 0.15);
     box-shadow: 0px 4px 8px -4px oklch(1 0 0 / 0.25);
   }
 

From 65c183f511f3796b75107beb8b07e03a1bc6bc62 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Tue, 17 Sep 2024 15:40:09 -0400
Subject: [PATCH 41/59] fix: convert the dark hamburger menu icon to color
 neutral #573

For Roadmap Item #533
---
 hushline/static/img/app/icon-menu-light.png | Bin 244 -> 686 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/hushline/static/img/app/icon-menu-light.png b/hushline/static/img/app/icon-menu-light.png
index b111b82911da30345ee5dceafb4ccae6e78a9979..9e32607c142cb6686c531e6520c7eb458c663968 100644
GIT binary patch
delta 649
zcmV;40(SlM0j>p*9De~I1<4Tr00D$)LqkwWLqi~Na&Km7Y-IodD3N`UJxIeq9K~N-
zr79H>JE%Bhs7@B7ia2T&iclfc3avVrT>1q~8j=(jN5Qq=;KyRs!Nplu2UkH5`~Y!w
za8h)U691PJTEuv8+>dwn9(V5mf4$69vtt5KHOojP;zB07Dt`oD(T#o#U<fgZnfjb4
zCgC~0?&0I>U6f~epZjz4Dmjw@K7n|a>4rtTK|H-_>74h8!>lMN#OK8023?T&k?XR{
zZ=4Gb`*~*ANT=qB!^A?Njpa6GMMEW?B917kM*04X%L?Z$&T6^Jn)l={4CS<yWv<g4
zK>~|df(QXJs(&b<3=2_OHBwBZXg}`ZA9nmAxny#cz{s(H3RFmrAN&t~cWdS+V{TF?
z4s^cQ_Qxm?+yxpn+x|Yb?ZycZcm}StmcLR5W<E);wY10)(6<d-T(>lN54hX`2A_1v
zkQ^yM)1S`+?`QN)SzzE6=vi}nYwqLp0Z3C<$s6F{5EvLMQ1-gVySv(Z`}a(<zaO9f
za=GgI1`v@U7=O@7L_t(&-tF1Z4TB&MfML!!fG^%0UBMALX-BXdbPjoPgX@zCF_j{f
zD9!&p5ls;AkOQ4Nj4TE3y)9)`6?X~Vdkb6k7vw`P$MrQ;9UQLv;<myvoILI7-jgxJ
zDW8~>$o&@0p*H$-k)iq_8WZc8RrOB90bs!?vDlp6gJzqEbSaheeZQIG#g@#Mnf=_*
z^M+`erbp@!#WprgB%|n<WB>pF1v9#sJ=xwKIY-`2R<FxslQSWds?<N7oE>DF8A692
jahe$+RAmSO08q6zg5Ex|v8~y100000NkvXXu0mjfBQGw4

delta 205
zcmV;;05bos1@r-s90dSZ0{MrNu>lx=0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH
z0EtONK~#7F?bfjk!cYu^;kyW^DPRPsS%D4Mlohf8HH?5#q)i%Ugy>m`k|+J&0G4d)
zEK2|Y002-aE1~-iZ`o%p>~cRnRp_7$`=y=8H6XQGnxhvglnU|xH$J>Vh_AOiW2-``
z3^dY55n4g<KpRyqwSlmU@AYiW;0o1=S7K|t5&!@I0I-z_p5huI<(94`00000NkvXX
Hu0mjfOYl(A


From ec2e6173a32fb5d146a1f0be7be0bf869a78da51 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Tue, 17 Sep 2024 17:04:53 -0400
Subject: [PATCH 42/59] fix: apply subtle theme color to dark menu label text
 #573

For Roadmap Item #533
---
 hushline/static/css/style.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hushline/static/css/style.css b/hushline/static/css/style.css
index b7c81bb9..be2771ae 100644
--- a/hushline/static/css/style.css
+++ b/hushline/static/css/style.css
@@ -416,6 +416,7 @@
 
   .mobileNav {
     background-image: url("../img/app/icon-menu-light.png");
+    color: var(--color-brand-dark-min-saturation);
   }
 
   .container {

From 416db1b64cd145b81db3d33346095126d613a6f0 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Tue, 17 Sep 2024 17:05:59 -0400
Subject: [PATCH 43/59] fix: improve dark theme accessibility with wider
 contrasts #573

In dark mode, now the greyest text has a +7:1 contrast on top of
the lightest background.
https://webaim.org/resources/contrastchecker/?fcolor=C4C4C4&bcolor=353535

For Roadmap Item #533
---
 hushline/static/css/style.css | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/hushline/static/css/style.css b/hushline/static/css/style.css
index be2771ae..4b1ea633 100644
--- a/hushline/static/css/style.css
+++ b/hushline/static/css/style.css
@@ -1,7 +1,7 @@
 :root {
   --color-border: rgba(0, 0, 0, 0.18);
-  --color-border-dark: #7d7d7d;
-  --color-border-dark-1: #555;
+  --color-border-dark: #787878;
+  --color-border-dark-1: #505050;
   --color-brand: oklch(48.55% 0.222 304.47); /* #7d25c1 */
   --color-brand-min-contrast: oklch(
     from var(--color-brand) clamp(0.1, l, 0.6) c h
@@ -23,9 +23,9 @@
       calc(h - 6)
   );
   --color-text: #333;
-  --color-text-dark-alt-2: #e4e4e4;
-  --color-text-dark-alt: #c2c2c2;
-  --color-text-dark: #dadada;
+  --color-text-dark-alt-2: #e6e6e6;
+  --color-text-dark-alt: #c4c4c4;
+  --color-text-dark: #dcdcdc;
   --color-text-light: #595959;
   --color-highlight: oklch(
     /* rgba(125, 37, 193, 0.1) */ from var(--color-brand) l c h / 0.1
@@ -40,10 +40,10 @@
   );
   --color-dark-bg: oklch(
     /* was #222 now with brand hue */ from var(--color-brand)
-      clamp(0.18, l - 0.275, 0.215) min(c, 0.01) calc(h + 10.26)
+      clamp(0.18, l - 0.275, 0.2) min(c, 0.01) calc(h + 10.26)
   );
-  --color-dark-bg-alt: #333;
-  --color-dark-bg-alt-1: #444;
+  --color-dark-bg-alt: #272727;
+  --color-dark-bg-alt-1: #353535;
   --color-dark-bg-alt-transparent: rgba(51, 51, 51, 0.7);
 
   --border: 1px solid var(--color-border);

From 2cf9518c8cac279d9f03b1ee1b4b9bf8e5148295 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Wed, 18 Sep 2024 09:12:34 -0400
Subject: [PATCH 44/59] docs: provide hex color code example in error message
 #573

Suggested in review:
https://github.com/scidsg/hushline/pull/573#discussion_r1764482960

For Roadmap Item #533

Co-authored-by: brassy endomorph <brassy-endomorph@riseup.net>
---
 hushline/forms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hushline/forms.py b/hushline/forms.py
index 33e33425..d5aed42c 100644
--- a/hushline/forms.py
+++ b/hushline/forms.py
@@ -33,7 +33,7 @@ class HexColor:
     def __call__(self, form: Form, field: Field) -> None:
         color: str = field.data
         if not self.hex_color_regex.match(color):
-            raise ValidationError(f"{color=} is an invalid 6-hexit color code.")
+            raise ValidationError(f"{color=} is an invalid 6-hexit color code. (eg. #7d25c1)")
 
 
 class CanonicalHTML:

From 007cf1b1688684d8cf8751d28d8f4537788fb390 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Wed, 18 Sep 2024 11:34:14 -0400
Subject: [PATCH 45/59] refactor: apply DRY principles & avoid magic value use
 #573

Removed reliance on javascript for insertion of database values,
instead directly rely on jinja to fill elements from the database.

Suggested in review:
https://github.com/scidsg/hushline/pull/573#discussion_r1764484915
https://github.com/scidsg/hushline/pull/573#discussion_r1764487410

For Roadmap Item #533

Co-authored-by: brassy endomorph <brassy-endomorph@riseup.net>
---
 hushline/__init__.py         |  2 +-
 hushline/model.py            | 22 ++++++++++++++++++----
 hushline/settings.py         |  4 ++--
 hushline/templates/base.html | 20 +++++---------------
 4 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/hushline/__init__.py b/hushline/__init__.py
index 15c6ab84..b56a6326 100644
--- a/hushline/__init__.py
+++ b/hushline/__init__.py
@@ -79,7 +79,7 @@ def inject_user() -> dict[str, Any]:
 
     @app.context_processor
     def inject_host() -> dict[str, HostOrganization]:
-        if (host_org := db.session.get(HostOrganization, 1)) is None:
+        if (host_org := HostOrganization.default()) is None:
             host_org = HostOrganization()
             db.session.add(host_org)
             db.session.commit()
diff --git a/hushline/model.py b/hushline/model.py
index 4866a070..d29c960c 100644
--- a/hushline/model.py
+++ b/hushline/model.py
@@ -1,7 +1,7 @@
 import enum
 import secrets
 from datetime import datetime, timedelta, timezone
-from typing import TYPE_CHECKING, Optional, Set
+from typing import TYPE_CHECKING, Optional, Self, Set
 
 from flask import current_app
 from flask_sqlalchemy.model import Model
@@ -31,9 +31,23 @@ def default(cls) -> "SMTPEncryption":
 class HostOrganization(Model):
     __tablename__ = "host_organization"
 
-    id: Mapped[int] = mapped_column(primary_key=True, default=1)
-    brand_app_name: Mapped[str] = mapped_column(db.String(255), default="🤫 Hush Line")
-    brand_primary_hex_color: Mapped[str] = mapped_column(db.String(7), default="#7d25c1")
+    _DEFAULT_PRIMARY_KEY: int = 1
+    _DEFAULT_BRAND_PRIMARY_HEX_COLOR: str = "#7d25c1"
+    _DEFAULT_BRAND_APP_NAME: str = "🤫 Hush Line"
+
+    id: Mapped[int] = mapped_column(primary_key=True)
+    brand_app_name: Mapped[str] = mapped_column(db.String(255), default=_DEFAULT_BRAND_APP_NAME)
+    brand_primary_hex_color: Mapped[str] = mapped_column(
+        db.String(7), default=_DEFAULT_BRAND_PRIMARY_HEX_COLOR
+    )
+
+    @classmethod
+    def default(cls) -> Self | None:
+        return db.session.get(cls, cls._DEFAULT_PRIMARY_KEY)
+
+    def __init__(self, primary_key: int | None = None) -> None:
+        super().__init__()
+        self.id = primary_key if isinstance(primary_key, int) else self._DEFAULT_PRIMARY_KEY
 
 
 class User(Model):
diff --git a/hushline/settings.py b/hushline/settings.py
index 3aae89b7..e9ffc808 100644
--- a/hushline/settings.py
+++ b/hushline/settings.py
@@ -722,7 +722,7 @@ def update_smtp_settings() -> Response | str:
     @bp.route("/update-brand-primary-color", methods=["POST"])
     @admin_authentication_required
     def update_brand_primary_color() -> Response | str:
-        if (host_org := db.session.get(HostOrganization, 1)) is None:
+        if (host_org := HostOrganization.default()) is None:
             abort(500)
 
         form = UpdateBrandPrimaryColorForm()
@@ -738,7 +738,7 @@ def update_brand_primary_color() -> Response | str:
     @bp.route("/update-brand-app-name", methods=["POST"])
     @admin_authentication_required
     def update_brand_app_name() -> Response | str:
-        if (host_org := db.session.get(HostOrganization, 1)) is None:
+        if (host_org := HostOrganization.default()) is None:
             abort(500)
 
         form = UpdateBrandAppNameForm()
diff --git a/hushline/templates/base.html b/hushline/templates/base.html
index 3a1a0ded..5ec737f1 100644
--- a/hushline/templates/base.html
+++ b/hushline/templates/base.html
@@ -64,18 +64,11 @@
       rel="stylesheet"
       href="{{ url_for('static', filename='css/style.css') }}"
     />
-    <script>
-      function importHostConfiguration() {
-        // Update page theme with host's brand color from the database
-        const brandColor = "{{ host_org.brand_primary_hex_color }}";
-        const cssVariable = ["--color-brand", brandColor];
-        document.documentElement.style.setProperty(...cssVariable);
-
-        // Update page h1 with host's brand name from the database
-        const brandName = "{{ host_org.brand_app_name }}";
-        document.querySelector("h1").innerText = brandName;
+    <style>
+      :root {
+        --color-brand: oklch(from {{ host_org.brand_primary_hex_color }} l c h);
       }
-    </script>
+    </style>
   </head>
 
   <body>
@@ -107,7 +100,7 @@
 
     <header>
       <!-- Navigation bar, logo, etc. -->
-      <h1>🤫 Hush Line</h1>
+      <h1>{{ host_org.brand_app_name }}</h1>
       <nav>
         <div class="navGroup">
           <a class="mobileNav btnIcon" aria-label="Navigation menu">Menu</a>
@@ -163,9 +156,6 @@ <h1>🤫 Hush Line</h1>
           >
         </div>
       </nav>
-      <script>
-        importHostConfiguration();
-      </script>
     </header>
 
     <main>

From 4097ffe5741400d260a55d27607f60e495481419 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Wed, 18 Sep 2024 12:33:28 -0400
Subject: [PATCH 46/59] fix(exc): log missing ``host_org`` record error state
 #573

Suggested in review:
https://github.com/scidsg/hushline/pull/573#discussion_r1764486752

For Roadmap Item #533

Co-authored-by: brassy endomorph <brassy-endomorph@riseup.net>
---
 hushline/settings.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hushline/settings.py b/hushline/settings.py
index e9ffc808..c0e1dec0 100644
--- a/hushline/settings.py
+++ b/hushline/settings.py
@@ -723,6 +723,7 @@ def update_smtp_settings() -> Response | str:
     @admin_authentication_required
     def update_brand_primary_color() -> Response | str:
         if (host_org := HostOrganization.default()) is None:
+            current_app.logger.error("Fatal! `host_org` record is undefined.")
             abort(500)
 
         form = UpdateBrandPrimaryColorForm()
@@ -739,6 +740,7 @@ def update_brand_primary_color() -> Response | str:
     @admin_authentication_required
     def update_brand_app_name() -> Response | str:
         if (host_org := HostOrganization.default()) is None:
+            current_app.logger.error("Fatal! `host_org` record is undefined.")
             abort(500)
 
         form = UpdateBrandAppNameForm()

From 06042b73b1b8367c9a117296d3addc114357e772 Mon Sep 17 00:00:00 2001
From: rmlibre <rmlibre@riseup.net>
Date: Wed, 18 Sep 2024 13:59:40 -0400
Subject: [PATCH 47/59] style: attempt prettier ignore on HTML style element
 #573

For Roadmap Item #533
---
 hushline/templates/base.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hushline/templates/base.html b/hushline/templates/base.html
index 5ec737f1..919e6f34 100644
--- a/hushline/templates/base.html
+++ b/hushline/templates/base.html
@@ -64,6 +64,7 @@
       rel="stylesheet"
       href="{{ url_for('static', filename='css/style.css') }}"
     />
+    <!-- prettier-ignore -->
     <style>
       :root {
         --color-brand: oklch(from {{ host_org.brand_primary_hex_color }} l c h);

From 9cad57194ee0ac72a8a56a53d950bb2da2b64d1e Mon Sep 17 00:00:00 2001
From: brassy endomorph <brassy-endomorph@riseup.net>
Date: Sat, 28 Sep 2024 08:07:32 +0000
Subject: [PATCH 48/59] rename HostOrganization.default() to fetch_or_default()
 for clarity

---
 hushline/__init__.py          |  6 +-----
 hushline/model.py             | 15 +++++++++++++--
 hushline/settings/__init__.py | 13 ++++---------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/hushline/__init__.py b/hushline/__init__.py
index 72fa05c4..a8a33691 100644
--- a/hushline/__init__.py
+++ b/hushline/__init__.py
@@ -92,11 +92,7 @@ def inject_user() -> dict[str, Any]:
 
     @app.context_processor
     def inject_host() -> dict[str, HostOrganization]:
-        if (host_org := HostOrganization.default()) is None:
-            host_org = HostOrganization()
-            db.session.add(host_org)
-            db.session.commit()
-        return dict(host_org=host_org)
+        return dict(host_org=HostOrganization.fetch_or_default())
 
     @app.context_processor
     def inject_is_personal_server() -> dict[str, Any]:
diff --git a/hushline/model.py b/hushline/model.py
index 23413e26..b9c0ffb4 100644
--- a/hushline/model.py
+++ b/hushline/model.py
@@ -4,6 +4,7 @@
 from datetime import datetime, timedelta, timezone
 from typing import TYPE_CHECKING, Any, Generator, Optional, Self, Sequence
 
+from flask import current_app
 from flask_sqlalchemy.model import Model
 from passlib.hash import scrypt
 from sqlalchemy import Index
@@ -42,8 +43,18 @@ class HostOrganization(Model):
     )
 
     @classmethod
-    def default(cls) -> Self | None:
-        return db.session.get(cls, cls._DEFAULT_PRIMARY_KEY)
+    def fetch_or_default(cls) -> Self | None:
+        if instance := db.session.get(cls, cls._DEFAULT_PRIMARY_KEY):
+            return instance
+
+        current_app.logger.warning(
+            f"Fetching {cls.__class__.__name__} from DB failed. No instance was returned."
+        )
+        return cls(
+            id=cls._DEFAULT_PRIMARY_KEY,
+            brand_app_name=cls._DEFAULT_BRAND_APP_NAME,
+            brand_primary_hex_color=cls._DEFAULT_BRAND_PRIMARY_HEX_COLOR,
+        )
 
     def __init__(self, primary_key: int | None = None) -> None:
         super().__init__()
diff --git a/hushline/settings/__init__.py b/hushline/settings/__init__.py
index ae3a3ece..0bc565a1 100644
--- a/hushline/settings/__init__.py
+++ b/hushline/settings/__init__.py
@@ -9,7 +9,6 @@
 from bs4 import BeautifulSoup
 from flask import (
     Blueprint,
-    abort,
     current_app,
     flash,
     redirect,
@@ -615,13 +614,11 @@ def update_smtp_settings() -> Response | str:
     @bp.route("/update-brand-primary-color", methods=["POST"])
     @admin_authentication_required
     def update_brand_primary_color() -> Response | str:
-        if (host_org := HostOrganization.default()) is None:
-            current_app.logger.error("Fatal! `host_org` record is undefined.")
-            abort(500)
-
+        host_org = HostOrganization.fetch_or_default()
         form = UpdateBrandPrimaryColorForm()
         if form.validate_on_submit():
             host_org.brand_primary_hex_color = form.brand_primary_hex_color.data
+            db.session.add(host_org)  # explicitly add because instance might be new
             db.session.commit()
             flash("👍 Brand primary color updated successfully.")
             return redirect(url_for(".index"))
@@ -632,13 +629,11 @@ def update_brand_primary_color() -> Response | str:
     @bp.route("/update-brand-app-name", methods=["POST"])
     @admin_authentication_required
     def update_brand_app_name() -> Response | str:
-        if (host_org := HostOrganization.default()) is None:
-            current_app.logger.error("Fatal! `host_org` record is undefined.")
-            abort(500)
-
+        host_org = HostOrganization.fetch_or_default()
         form = UpdateBrandAppNameForm()
         if form.validate_on_submit():
             host_org.brand_app_name = form.brand_app_name.data
+            db.session.add(host_org)  # explicitly add because instance might be new
             db.session.commit()
             flash("👍 Brand app name updated successfully.")
             return redirect(url_for(".index"))

From 8d096fd64fb039fa1ca51cda08bb82e8c784d1a3 Mon Sep 17 00:00:00 2001
From: brassy endomorph <brassy-endomorph@riseup.net>
Date: Sat, 28 Sep 2024 08:55:42 +0000
Subject: [PATCH 49/59] log missing HostOrg on app startup

---
 hushline/__init__.py | 14 ++++++++++++++
 hushline/model.py    | 27 ++++++++++-----------------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/hushline/__init__.py b/hushline/__init__.py
index a8a33691..7fc78b4a 100644
--- a/hushline/__init__.py
+++ b/hushline/__init__.py
@@ -6,6 +6,7 @@
 from flask import Flask, flash, redirect, request, session, url_for
 from flask_migrate import Migrate
 from jinja2 import StrictUndefined
+from sqlalchemy.exc import ProgrammingError
 from werkzeug.middleware.proxy_fix import ProxyFix
 from werkzeug.wrappers.response import Response
 
@@ -108,4 +109,17 @@ def add_onion_location_header(response: Response) -> Response:
             )
             return response
 
+    # we can't
+    if app.config.get("FLASK_ENV", None) != "development":
+        with app.app_context():
+            try:
+                host_org = HostOrganization.fetch()
+            except ProgrammingError:
+                app.logger.warning(
+                    "Could not check for existence of HostOrganization", exc_info=True
+                )
+            else:
+                if host_org is None:
+                    app.logger.warning("HostOrganization data not found in database.")
+
     return app
diff --git a/hushline/model.py b/hushline/model.py
index b9c0ffb4..d69108e4 100644
--- a/hushline/model.py
+++ b/hushline/model.py
@@ -4,7 +4,6 @@
 from datetime import datetime, timedelta, timezone
 from typing import TYPE_CHECKING, Any, Generator, Optional, Self, Sequence
 
-from flask import current_app
 from flask_sqlalchemy.model import Model
 from passlib.hash import scrypt
 from sqlalchemy import Index
@@ -32,7 +31,7 @@ def default(cls) -> "SMTPEncryption":
 class HostOrganization(Model):
     __tablename__ = "host_organization"
 
-    _DEFAULT_PRIMARY_KEY: int = 1
+    _DEFAULT_ID: int = 1
     _DEFAULT_BRAND_PRIMARY_HEX_COLOR: str = "#7d25c1"
     _DEFAULT_BRAND_APP_NAME: str = "🤫 Hush Line"
 
@@ -43,22 +42,16 @@ class HostOrganization(Model):
     )
 
     @classmethod
-    def fetch_or_default(cls) -> Self | None:
-        if instance := db.session.get(cls, cls._DEFAULT_PRIMARY_KEY):
-            return instance
-
-        current_app.logger.warning(
-            f"Fetching {cls.__class__.__name__} from DB failed. No instance was returned."
-        )
-        return cls(
-            id=cls._DEFAULT_PRIMARY_KEY,
-            brand_app_name=cls._DEFAULT_BRAND_APP_NAME,
-            brand_primary_hex_color=cls._DEFAULT_BRAND_PRIMARY_HEX_COLOR,
-        )
-
-    def __init__(self, primary_key: int | None = None) -> None:
+    def fetch(cls) -> Self | None:
+        return db.session.get(cls, cls._DEFAULT_ID)
+
+    @classmethod
+    def fetch_or_default(cls) -> Self:
+        return cls.fetch() or cls()
+
+    def __init__(self, id: int | None = None) -> None:
         super().__init__()
-        self.id = primary_key if isinstance(primary_key, int) else self._DEFAULT_PRIMARY_KEY
+        self.id = id if id is not None else self._DEFAULT_ID
 
 
 @dataclass(frozen=True, repr=False, eq=False)

From 90cbf25a21074db83542f8df8f33c89b2b832ef6 Mon Sep 17 00:00:00 2001
From: brassy endomorph <brassy-endomorph@riseup.net>
Date: Sat, 28 Sep 2024 09:09:16 +0000
Subject: [PATCH 50/59] avoid hiding errors in Makefile

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 027b588d..89ba610b 100644
--- a/Makefile
+++ b/Makefile
@@ -27,13 +27,13 @@ migrate-prod: ## Run prod env (alembic) migrations
 lint: ## Lint the code
 	poetry run ruff format --check && \
 	poetry run ruff check && \
-	poetry run mypy .
+	poetry run mypy . && \
 	docker compose run --rm app npx prettier --check ./*.md ./docs ./.github/workflows/* ./hushline
 
 .PHONY: fix
 fix: ## Format the code
 	poetry run ruff format && \
-	poetry run ruff check --fix
+	poetry run ruff check --fix && \
 	docker compose run --rm app npx prettier --write ./*.md ./docs ./.github/workflows/* ./hushline
 
 .PHONY: revision

From 8294ffe1c0fd1eb41003039b8d4b3e4501603ba0 Mon Sep 17 00:00:00 2001
From: brassy endomorph <brassy-endomorph@riseup.net>
Date: Sat, 28 Sep 2024 09:10:09 +0000
Subject: [PATCH 51/59] idiomatically use super() constructors in DB models

and fix one bug from incorrect usage
---
 hushline/model.py | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/hushline/model.py b/hushline/model.py
index d69108e4..48ca1462 100644
--- a/hushline/model.py
+++ b/hushline/model.py
@@ -50,8 +50,9 @@ def fetch_or_default(cls) -> Self:
         return cls.fetch() or cls()
 
     def __init__(self, id: int | None = None) -> None:
-        super().__init__()
-        self.id = id if id is not None else self._DEFAULT_ID
+        super().__init__(
+            id=id if id is not None else self._DEFAULT_ID,  # type: ignore[call-arg]
+        )
 
 
 @dataclass(frozen=True, repr=False, eq=False)
@@ -99,9 +100,11 @@ def __init__(
         is_primary: bool,
         **kwargs: Any,
     ) -> None:
-        super().__init__(**kwargs)
-        self._username = _username
-        self.is_primary = is_primary
+        super().__init__(
+            _username=_username,  # type: ignore[call-arg]
+            is_primary=is_primary,  # type: ignore[call-arg]
+            **kwargs,
+        )
 
     @property
     def username(self) -> str:
@@ -245,7 +248,7 @@ def __init__(self, **kwargs: Any) -> None:
             if key in kwargs:
                 raise ValueError(f"Key {key!r} cannot be mannually set. Try 'password' instead.")
         pw = kwargs.pop("password", None)
-        super().__init__()
+        super().__init__(**kwargs)
         self.password_hash = pw
 
 
@@ -281,11 +284,12 @@ def __init__(
         otp_code: str | None = None,
         timecode: int | None = None,
     ) -> None:
-        super().__init__()
-        self.user_id = user_id
-        self.successful = successful
-        self.otp_code = otp_code
-        self.timecode = timecode
+        super().__init__(
+            user_id=user_id,  # type: ignore[call-arg]
+            successful=successful,  # type: ignore[call-arg]
+            otp_code=otp_code,  # type: ignore[call-arg]
+            timecode=timecode,  # type: ignore[call-arg]
+        )
 
 
 class Message(Model):
@@ -299,8 +303,10 @@ class Message(Model):
     def __init__(self, content: str, **kwargs: Any) -> None:
         if "_content" in kwargs:
             raise ValueError("Cannot set '_content' directly. Use 'content'")
-        super().__init__(**kwargs)
-        self.content = content
+        super().__init__(
+            content=content,  # type: ignore[call-arg]
+            **kwargs,
+        )
 
     @property
     def content(self) -> str | None:
@@ -323,9 +329,10 @@ class InviteCode(Model):
     expiration_date: Mapped[datetime]
 
     def __init__(self) -> None:
-        super().__init__()
-        self.code = secrets.token_urlsafe(16)
-        self.expiration_date = datetime.now(timezone.utc) + timedelta(days=365)
+        super().__init__(
+            code=secrets.token_urlsafe(16),  # type: ignore[call-arg]
+            expiration_date=datetime.now(timezone.utc) + timedelta(days=365),  # type: ignore[call-arg]
+        )
 
     def __repr__(self) -> str:
         return f"<InviteCode {self.code}>"

From 3e228673db958a592d4ca332c2412222932f8747 Mon Sep 17 00:00:00 2001
From: brassy endomorph <brassy-endomorph@riseup.net>
Date: Sat, 28 Sep 2024 09:10:29 +0000
Subject: [PATCH 52/59] app branding tests

---
 tests/conftest.py      | 22 ++++++++++++++++++++++
 tests/test_settings.py | 34 +++++++++++++++++++++++++++++++++-
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 8f4ee069..86c2d885 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -187,6 +187,28 @@ def _authenticated_user(client: FlaskClient, user: User) -> None:
         session["is_authenticated"] = True
 
 
+@pytest.fixture()
+def admin(app: Flask, user_password: str, database: str) -> User:
+    user = User(password=user_password, is_admin=True)
+    db.session.add(user)
+    db.session.flush()
+
+    uuid_ish = str(uuid4())[0:12]
+    username = Username(user_id=user.id, _username=f"test-{uuid_ish}", is_primary=True)
+    db.session.add(username)
+    db.session.commit()
+
+    return user
+
+
+@pytest.fixture()
+def _authenticated_admin(client: FlaskClient, admin: User) -> None:
+    with client.session_transaction() as session:
+        session["user_id"] = admin.id
+        session["username"] = admin.primary_username.username
+        session["is_authenticated"] = True
+
+
 @pytest.fixture()
 def _pgp_user(client: FlaskClient, user: User) -> None:
     with open("tests/test_pgp_key.txt") as f:
diff --git a/tests/test_settings.py b/tests/test_settings.py
index dfb920ea..88601ea0 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -6,7 +6,7 @@
 from flask.testing import FlaskClient
 
 from hushline.db import db
-from hushline.model import Message, SMTPEncryption, User, Username
+from hushline.model import HostOrganization, Message, SMTPEncryption, User, Username
 
 
 @pytest.mark.usefixtures("_authenticated_user")
@@ -478,3 +478,35 @@ def test_alias_change_directory_visibility(
     assert resp.status_code == 200
     assert "Directory visibility updated successfully" in resp.text
     assert db.session.scalar(db.select(Username.show_in_directory).filter_by(id=user_alias.id))
+
+
+@pytest.mark.usefixtures("_authenticated_admin")
+def test_update_brand_primary_color(client: FlaskClient, admin: User) -> None:
+    color = "#acab00"
+    resp = client.post(
+        url_for("settings.update_brand_primary_color"),
+        data={"brand_primary_hex_color": color},
+        follow_redirects=True,
+    )
+    assert resp.status_code == 200
+    assert "Brand primary color updated successfully" in resp.text
+
+    host_org = HostOrganization.fetch()
+    assert host_org
+    assert host_org.brand_primary_hex_color == color
+
+
+@pytest.mark.usefixtures("_authenticated_admin")
+def test_update_brand_app_name(client: FlaskClient, admin: User) -> None:
+    name = "h4cK3rZ"
+    resp = client.post(
+        url_for("settings.update_brand_app_name"),
+        data={"brand_app_name": name},
+        follow_redirects=True,
+    )
+    assert resp.status_code == 200
+    assert "Brand app name updated successfully" in resp.text
+
+    host_org = HostOrganization.fetch()
+    assert host_org
+    assert host_org.brand_app_name == name

From 3067628c2ad5ff44d06797324c1701daa466ab71 Mon Sep 17 00:00:00 2001
From: brassy endomorph <brassy-endomorph@riseup.net>
Date: Sat, 28 Sep 2024 09:41:27 +0000
Subject: [PATCH 53/59] require single tenant instances for updating brand
 settings

---
 hushline/settings/__init__.py          |   9 ++-
 hushline/templates/settings/index.html |  18 ++---
 hushline/utils.py                      |  11 +++
 tests/conftest.py                      |  11 ++-
 tests/test_settings.py                 | 105 +++++++++++++++++--------
 5 files changed, 111 insertions(+), 43 deletions(-)

diff --git a/hushline/settings/__init__.py b/hushline/settings/__init__.py
index 0bc565a1..1b09d9b6 100644
--- a/hushline/settings/__init__.py
+++ b/hushline/settings/__init__.py
@@ -26,7 +26,12 @@
 from ..db import db
 from ..forms import TwoFactorForm
 from ..model import HostOrganization, Message, SMTPEncryption, User, Username
-from ..utils import admin_authentication_required, authentication_required, create_smtp_config
+from ..utils import (
+    admin_authentication_required,
+    authentication_required,
+    create_smtp_config,
+    personal_server_required,
+)
 from .forms import (
     ChangePasswordForm,
     ChangeUsernameForm,
@@ -613,6 +618,7 @@ def update_smtp_settings() -> Response | str:
 
     @bp.route("/update-brand-primary-color", methods=["POST"])
     @admin_authentication_required
+    @personal_server_required
     def update_brand_primary_color() -> Response | str:
         host_org = HostOrganization.fetch_or_default()
         form = UpdateBrandPrimaryColorForm()
@@ -628,6 +634,7 @@ def update_brand_primary_color() -> Response | str:
 
     @bp.route("/update-brand-app-name", methods=["POST"])
     @admin_authentication_required
+    @personal_server_required
     def update_brand_app_name() -> Response | str:
         host_org = HostOrganization.fetch_or_default()
         form = UpdateBrandAppNameForm()
diff --git a/hushline/templates/settings/index.html b/hushline/templates/settings/index.html
index 258cbb10..b700b927 100644
--- a/hushline/templates/settings/index.html
+++ b/hushline/templates/settings/index.html
@@ -7,16 +7,16 @@ <h2>Settings</h2>
   <div class="settings-tabs {% if user.is_admin %}is-admin{% endif %}">
     <ul class="tab-list" role="tablist">
       {% with buttons = [
-        ('profile', 'Profile', False),
-        ('aliases', 'Aliases', False),
-        ('auth', 'Authentication', False),
-        ('email', 'Email & Encryption', False),
-        ('advanced', 'Advanced', False),
-        ('branding', 'Branding', True),
-        ('admin', 'Admin', True)
+        ('profile', 'Profile', False, False),
+        ('aliases', 'Aliases', False, False),
+        ('auth', 'Authentication', False, False),
+        ('email', 'Email & Encryption', False, False),
+        ('advanced', 'Advanced', False, False),
+        ('branding', 'Branding', True, True),
+        ('admin', 'Admin', True, False)
       ] %}
-        {% for (id, display, requires_admin) in buttons %}
-          {% if not requires_admin or user.is_admin %}
+        {% for (id, display, requires_admin, requires_personal_server) in buttons %}
+          {% if (not requires_admin or user.is_admin) and (not requires_personal_server or is_personal_server) %}
             <li role="presentation">
               <button
                 type="button"
diff --git a/hushline/utils.py b/hushline/utils.py
index def218b4..d0979bf0 100644
--- a/hushline/utils.py
+++ b/hushline/utils.py
@@ -40,6 +40,17 @@ def decorated_function(*args: Any, **kwargs: Any) -> Any:
     return decorated_function
 
 
+def personal_server_required(f: Callable[..., Any]) -> Callable[..., Any]:
+    @wraps(f)
+    @authentication_required
+    def decorated_function(*args: Any, **kwargs: Any) -> Any:
+        if not current_app.config["IS_PERSONAL_SERVER"]:
+            abort(403)
+        return f(*args, **kwargs)
+
+    return decorated_function
+
+
 @dataclass
 class SMTPConfig:
     username: str
diff --git a/tests/conftest.py b/tests/conftest.py
index 86c2d885..83de667b 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -3,7 +3,7 @@
 import string
 import time
 from contextlib import contextmanager
-from typing import TYPE_CHECKING, Any, Generator
+from typing import TYPE_CHECKING, Any, Callable, Generator
 from uuid import uuid4
 
 import flask_migrate
@@ -140,7 +140,12 @@ def _insecure_scrypt_params(mocker: MockFixture) -> None:
 
 
 @pytest.fixture()
-def app(database: str) -> Generator[Flask, None, None]:
+def inject_app_configs() -> Callable[[Flask], None]:
+    return lambda x: None
+
+
+@pytest.fixture()
+def app(database: str, inject_app_configs: Callable[[Flask], None]) -> Generator[Flask, None, None]:
     os.environ["REGISTRATION_CODES_REQUIRED"] = "False"
     os.environ["SQLALCHEMY_DATABASE_URI"] = CONN_FMT_STR.format(database=database)
 
@@ -150,6 +155,8 @@ def app(database: str) -> Generator[Flask, None, None]:
     app.config["SERVER_NAME"] = "localhost:8080"
     app.config["PREFERRED_URL_SCHEME"] = "http"
 
+    inject_app_configs(app)
+
     with app.app_context():
         yield app
 
diff --git a/tests/test_settings.py b/tests/test_settings.py
index 88601ea0..d65c9474 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -1,8 +1,9 @@
+from typing import Callable
 from unittest.mock import ANY, MagicMock, patch
 from uuid import uuid4
 
 import pytest
-from flask import url_for
+from flask import Flask, url_for
 from flask.testing import FlaskClient
 
 from hushline.db import db
@@ -480,33 +481,75 @@ def test_alias_change_directory_visibility(
     assert db.session.scalar(db.select(Username.show_in_directory).filter_by(id=user_alias.id))
 
 
-@pytest.mark.usefixtures("_authenticated_admin")
-def test_update_brand_primary_color(client: FlaskClient, admin: User) -> None:
-    color = "#acab00"
-    resp = client.post(
-        url_for("settings.update_brand_primary_color"),
-        data={"brand_primary_hex_color": color},
-        follow_redirects=True,
-    )
-    assert resp.status_code == 200
-    assert "Brand primary color updated successfully" in resp.text
-
-    host_org = HostOrganization.fetch()
-    assert host_org
-    assert host_org.brand_primary_hex_color == color
-
-
-@pytest.mark.usefixtures("_authenticated_admin")
-def test_update_brand_app_name(client: FlaskClient, admin: User) -> None:
-    name = "h4cK3rZ"
-    resp = client.post(
-        url_for("settings.update_brand_app_name"),
-        data={"brand_app_name": name},
-        follow_redirects=True,
-    )
-    assert resp.status_code == 200
-    assert "Brand app name updated successfully" in resp.text
-
-    host_org = HostOrganization.fetch()
-    assert host_org
-    assert host_org.brand_app_name == name
+class TestSingleTenant:
+    @pytest.fixture()
+    def inject_app_configs(self) -> Callable[[Flask], None]:
+        def injector(app: Flask) -> None:
+            app.config["IS_PERSONAL_SERVER"] = True
+
+        return injector
+
+    @pytest.mark.usefixtures("_authenticated_admin")
+    def test_update_brand_primary_color(self, client: FlaskClient, admin: User) -> None:
+        color = "#acab00"
+        resp = client.post(
+            url_for("settings.update_brand_primary_color"),
+            data={"brand_primary_hex_color": color},
+            follow_redirects=True,
+        )
+        assert resp.status_code == 200
+        assert "Brand primary color updated successfully" in resp.text
+
+        assert (host_org := HostOrganization.fetch())
+        assert host_org.brand_primary_hex_color == color
+
+    @pytest.mark.usefixtures("_authenticated_admin")
+    def test_update_brand_app_name(self, client: FlaskClient, admin: User) -> None:
+        name = "h4cK3rZ"
+        resp = client.post(
+            url_for("settings.update_brand_app_name"),
+            data={"brand_app_name": name},
+            follow_redirects=True,
+        )
+        assert resp.status_code == 200
+        assert "Brand app name updated successfully" in resp.text
+
+        assert (host_org := HostOrganization.fetch())
+        assert host_org.brand_app_name == name
+
+
+class TestMultiTenant:
+    @pytest.fixture()
+    def inject_app_configs(self) -> Callable[[Flask], None]:
+        def injector(app: Flask) -> None:
+            app.config["IS_PERSONAL_SERVER"] = False
+
+        return injector
+
+    @pytest.mark.usefixtures("_authenticated_admin")
+    def test_update_brand_primary_color(self, client: FlaskClient, admin: User) -> None:
+        color = "#acab00"
+        resp = client.post(
+            url_for("settings.update_brand_primary_color"),
+            data={"brand_primary_hex_color": color},
+            follow_redirects=True,
+        )
+        assert resp.status_code == 403
+
+        # acceptable states: not in DB, or in DB and color not updated
+        if host_org := HostOrganization.fetch():
+            assert host_org.brand_primary_hex_color != color
+
+    @pytest.mark.usefixtures("_authenticated_admin")
+    def test_update_brand_app_name(self, client: FlaskClient, admin: User) -> None:
+        name = "h4cK3rZ"
+        resp = client.post(
+            url_for("settings.update_brand_app_name"),
+            data={"brand_app_name": name},
+            follow_redirects=True,
+        )
+        assert resp.status_code == 403
+
+        # acceptable states: not in DB, or in DB and name not updated
+        if host_org := HostOrganization.fetch():
+            assert host_org.brand_app_name != name

From 9674b1e06e1dab58fec0f44fa2bc5a04d59c2de3 Mon Sep 17 00:00:00 2001
From: brassy endomorph <brassy-endomorph@riseup.net>
Date: Sat, 28 Sep 2024 09:46:40 +0000
Subject: [PATCH 54/59] migration for host_organization table

---
 ...410668e15ad_add_host_organization_table.py | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 migrations/versions/5410668e15ad_add_host_organization_table.py

diff --git a/migrations/versions/5410668e15ad_add_host_organization_table.py b/migrations/versions/5410668e15ad_add_host_organization_table.py
new file mode 100644
index 00000000..0badc566
--- /dev/null
+++ b/migrations/versions/5410668e15ad_add_host_organization_table.py
@@ -0,0 +1,36 @@
+"""add host_organization table
+
+Revision ID: 5410668e15ad
+Revises: 5ffe5a5c8e9a
+Create Date: 2024-09-28 09:38:02.716771
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "5410668e15ad"
+down_revision = "5ffe5a5c8e9a"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.create_table(
+        "host_organization",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("brand_app_name", sa.String(length=255), nullable=False),
+        sa.Column("brand_primary_hex_color", sa.String(length=7), nullable=False),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_host_organization")),
+    )
+
+    op.execute(
+        "INSERT INTO host_organization (id, brand_app_name, brand_primary_hex_color) "
+        "VALUES (1, '🤫 Hush Line', '#7d25c1')"
+    )
+
+
+def downgrade() -> None:
+    op.drop_table("host_organization")

From 8e02dc9a577a0b782a2e332d257411334bd0250c Mon Sep 17 00:00:00 2001
From: brassy endomorph <brassy-endomorph@riseup.net>
Date: Mon, 30 Sep 2024 08:36:35 +0000
Subject: [PATCH 55/59] silence migrations deprecation warning

---
 migrations/env.py | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/migrations/env.py b/migrations/env.py
index c4c00993..3229bdc0 100644
--- a/migrations/env.py
+++ b/migrations/env.py
@@ -15,12 +15,7 @@
 
 
 def get_engine():
-    try:
-        # this works with Flask-SQLAlchemy<3 and Alchemical
-        return current_app.extensions["migrate"].db.get_engine()
-    except (TypeError, AttributeError):
-        # this works with Flask-SQLAlchemy>=3
-        return current_app.extensions["migrate"].db.engine
+    return current_app.extensions["migrate"].db.engine
 
 
 def get_engine_url():
@@ -37,11 +32,6 @@ def get_engine_url():
 config.set_main_option("sqlalchemy.url", get_engine_url())
 target_db = current_app.extensions["migrate"].db
 
-# other values from the config, defined by the needs of env.py,
-# can be acquired:
-# my_important_option = config.get_main_option("my_important_option")
-# ... etc.
-
 
 def get_metadata():
     if hasattr(target_db, "metadatas"):

From 14fe514282598275b099b31fdb051ba2a29c2fad Mon Sep 17 00:00:00 2001
From: brassy endomorph <brassy-endomorph@riseup.net>
Date: Mon, 30 Sep 2024 08:46:59 +0000
Subject: [PATCH 56/59] tests to check for updated strings in response html

---
 tests/test_settings.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tests/test_settings.py b/tests/test_settings.py
index d65c9474..85ed2d63 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -3,6 +3,7 @@
 from uuid import uuid4
 
 import pytest
+from bs4 import BeautifulSoup
 from flask import Flask, url_for
 from flask.testing import FlaskClient
 
@@ -500,6 +501,15 @@ def test_update_brand_primary_color(self, client: FlaskClient, admin: User) -> N
         assert resp.status_code == 200
         assert "Brand primary color updated successfully" in resp.text
 
+        soup = BeautifulSoup(resp.text, "html.parser")
+        styles = soup.find_all("style")
+        assert styles  # sensibility check
+        for style in styles:
+            if f"--color-brand: oklch(from {color} l c h);" in style.string:
+                break
+        else:
+            pytest.fail("Brand color CSS not updated in response <style>")
+
         assert (host_org := HostOrganization.fetch())
         assert host_org.brand_primary_hex_color == color
 
@@ -514,6 +524,15 @@ def test_update_brand_app_name(self, client: FlaskClient, admin: User) -> None:
         assert resp.status_code == 200
         assert "Brand app name updated successfully" in resp.text
 
+        soup = BeautifulSoup(resp.text, "html.parser")
+        h1s = soup.select("header h1")
+        assert h1s  # sensibility check
+        for h1 in h1s:
+            if name in h1.string:
+                break
+        else:
+            pytest.fail("Brand name not updated in header <h1>")
+
         assert (host_org := HostOrganization.fetch())
         assert host_org.brand_app_name == name
 

From d014458d81a7021cd0ab1695d65970dcfd1c91b0 Mon Sep 17 00:00:00 2001
From: brassy endomorph <brassy-endomorph@riseup.net>
Date: Mon, 30 Sep 2024 08:54:16 +0000
Subject: [PATCH 57/59] update HostOrganization constructor to always return a
 fully populated object

---
 hushline/model.py | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/hushline/model.py b/hushline/model.py
index 48ca1462..ddc264ef 100644
--- a/hushline/model.py
+++ b/hushline/model.py
@@ -49,9 +49,22 @@ def fetch(cls) -> Self | None:
     def fetch_or_default(cls) -> Self:
         return cls.fetch() or cls()
 
-    def __init__(self, id: int | None = None) -> None:
+    def __init__(self, **kwargs: Any) -> None:
+        # never allow setting of the ID. It should only ever be `1`
+        if "id" in kwargs:
+            raise ValueError(f"Cannot manually set {self.__class__.__name__} attribute `id`")
+
+        # always initialize all values so that the object is populated for use in templates
+        # even when it's not pulled from the DB.
+        # yes, we have to do this here and not rely on `mapped_column(default='...')` because
+        # that logic doesn't trigger until insert, and we want these here pre-insert
+        if "brand_app_name" not in kwargs:
+            kwargs["brand_app_name"] = self._DEFAULT_BRAND_APP_NAME
+        if "brand_primary_hex_color" not in kwargs:
+            kwargs["brand_primary_hex_color"] = self._DEFAULT_BRAND_PRIMARY_HEX_COLOR
         super().__init__(
-            id=id if id is not None else self._DEFAULT_ID,  # type: ignore[call-arg]
+            id=self._DEFAULT_ID,  # type: ignore[call-arg]
+            **kwargs,
         )
 
 

From 886a2f0344d29a726f828d3b32a500ebb7a4423b Mon Sep 17 00:00:00 2001
From: brassy endomorph <brassy-endomorph@riseup.net>
Date: Mon, 30 Sep 2024 15:31:56 +0000
Subject: [PATCH 58/59] make registration codes an app config

---
 docker-compose.yaml  | 2 +-
 hushline/__init__.py | 1 +
 hushline/routes.py   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index e9aa54a6..b5e9e4c5 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -12,7 +12,7 @@ services:
       ENCRYPTION_KEY: bi5FDwhZGKfc4urLJ_ChGtIAaOPgxd3RDOhnvct10mw=
       SECRET_KEY: cb3f4afde364bfb3956b97ca22ef4d2b593d9d980a4330686267cabcd2c0befd
       SQLALCHEMY_DATABASE_URI: postgresql://hushline:hushline@postgres:5432/hushline
-      REGISTRATION_CODES_REQUIRED: False
+      REGISTRATION_CODES_REQUIRED: 'false'
       SESSION_COOKIE_NAME: session
       NOTIFICATIONS_ADDRESS: notifications@hushline.app
     volumes:
diff --git a/hushline/__init__.py b/hushline/__init__.py
index 7fc78b4a..3296e47d 100644
--- a/hushline/__init__.py
+++ b/hushline/__init__.py
@@ -48,6 +48,7 @@ def create_app() -> Flask:
     app.config["IS_PERSONAL_SERVER"] = (
         os.environ.get("IS_PERSONAL_SERVER", "False").lower() == "true"
     )
+    app.config['REGISTRATION_CODES_REQUIRED'] = os.environ.get("REGISTRATION_CODES_REQUIRED", "true").lower() == "true"
     app.config["NOTIFICATIONS_ADDRESS"] = os.environ.get("NOTIFICATIONS_ADDRESS", None)
     app.config["SMTP_USERNAME"] = os.environ.get("SMTP_USERNAME", None)
     app.config["SMTP_SERVER"] = os.environ.get("SMTP_SERVER", None)
diff --git a/hushline/routes.py b/hushline/routes.py
index f09e2fdb..1e477480 100644
--- a/hushline/routes.py
+++ b/hushline/routes.py
@@ -320,7 +320,7 @@ def register() -> Response | str | tuple[Response | str, int]:
             flash("👉 You are already logged in.")
             return redirect(url_for("inbox"))
 
-        require_invite_code = os.environ.get("REGISTRATION_CODES_REQUIRED", "True") == "True"
+        require_invite_code = app.config["REGISTRATION_CODES_REQUIRED"]
         form = RegistrationForm()
         if not require_invite_code:
             del form.invite_code

From 246ae1bc9e04911dbda1d67159d339338f7e1b18 Mon Sep 17 00:00:00 2001
From: brassy endomorph <brassy-endomorph@riseup.net>
Date: Mon, 30 Sep 2024 15:38:52 +0000
Subject: [PATCH 59/59] roll back multi-tenancy logic for brand settings
 updates

---
 hushline/__init__.py                   |   4 +-
 hushline/routes.py                     |   1 -
 hushline/settings/__init__.py          |   3 -
 hushline/templates/settings/index.html |  18 ++--
 hushline/utils.py                      |  11 --
 tests/conftest.py                      |  11 +-
 tests/test_settings.py                 | 139 +++++++++----------------
 7 files changed, 61 insertions(+), 126 deletions(-)

diff --git a/hushline/__init__.py b/hushline/__init__.py
index 3296e47d..3bda6329 100644
--- a/hushline/__init__.py
+++ b/hushline/__init__.py
@@ -48,7 +48,9 @@ def create_app() -> Flask:
     app.config["IS_PERSONAL_SERVER"] = (
         os.environ.get("IS_PERSONAL_SERVER", "False").lower() == "true"
     )
-    app.config['REGISTRATION_CODES_REQUIRED'] = os.environ.get("REGISTRATION_CODES_REQUIRED", "true").lower() == "true"
+    app.config["REGISTRATION_CODES_REQUIRED"] = (
+        os.environ.get("REGISTRATION_CODES_REQUIRED", "true").lower() == "true"
+    )
     app.config["NOTIFICATIONS_ADDRESS"] = os.environ.get("NOTIFICATIONS_ADDRESS", None)
     app.config["SMTP_USERNAME"] = os.environ.get("SMTP_USERNAME", None)
     app.config["SMTP_SERVER"] = os.environ.get("SMTP_SERVER", None)
diff --git a/hushline/routes.py b/hushline/routes.py
index 1e477480..d9df24c1 100644
--- a/hushline/routes.py
+++ b/hushline/routes.py
@@ -1,5 +1,4 @@
 import logging
-import os
 import re
 import secrets
 import socket
diff --git a/hushline/settings/__init__.py b/hushline/settings/__init__.py
index 1b09d9b6..5d13508d 100644
--- a/hushline/settings/__init__.py
+++ b/hushline/settings/__init__.py
@@ -30,7 +30,6 @@
     admin_authentication_required,
     authentication_required,
     create_smtp_config,
-    personal_server_required,
 )
 from .forms import (
     ChangePasswordForm,
@@ -618,7 +617,6 @@ def update_smtp_settings() -> Response | str:
 
     @bp.route("/update-brand-primary-color", methods=["POST"])
     @admin_authentication_required
-    @personal_server_required
     def update_brand_primary_color() -> Response | str:
         host_org = HostOrganization.fetch_or_default()
         form = UpdateBrandPrimaryColorForm()
@@ -634,7 +632,6 @@ def update_brand_primary_color() -> Response | str:
 
     @bp.route("/update-brand-app-name", methods=["POST"])
     @admin_authentication_required
-    @personal_server_required
     def update_brand_app_name() -> Response | str:
         host_org = HostOrganization.fetch_or_default()
         form = UpdateBrandAppNameForm()
diff --git a/hushline/templates/settings/index.html b/hushline/templates/settings/index.html
index b700b927..258cbb10 100644
--- a/hushline/templates/settings/index.html
+++ b/hushline/templates/settings/index.html
@@ -7,16 +7,16 @@ <h2>Settings</h2>
   <div class="settings-tabs {% if user.is_admin %}is-admin{% endif %}">
     <ul class="tab-list" role="tablist">
       {% with buttons = [
-        ('profile', 'Profile', False, False),
-        ('aliases', 'Aliases', False, False),
-        ('auth', 'Authentication', False, False),
-        ('email', 'Email & Encryption', False, False),
-        ('advanced', 'Advanced', False, False),
-        ('branding', 'Branding', True, True),
-        ('admin', 'Admin', True, False)
+        ('profile', 'Profile', False),
+        ('aliases', 'Aliases', False),
+        ('auth', 'Authentication', False),
+        ('email', 'Email & Encryption', False),
+        ('advanced', 'Advanced', False),
+        ('branding', 'Branding', True),
+        ('admin', 'Admin', True)
       ] %}
-        {% for (id, display, requires_admin, requires_personal_server) in buttons %}
-          {% if (not requires_admin or user.is_admin) and (not requires_personal_server or is_personal_server) %}
+        {% for (id, display, requires_admin) in buttons %}
+          {% if not requires_admin or user.is_admin %}
             <li role="presentation">
               <button
                 type="button"
diff --git a/hushline/utils.py b/hushline/utils.py
index d0979bf0..def218b4 100644
--- a/hushline/utils.py
+++ b/hushline/utils.py
@@ -40,17 +40,6 @@ def decorated_function(*args: Any, **kwargs: Any) -> Any:
     return decorated_function
 
 
-def personal_server_required(f: Callable[..., Any]) -> Callable[..., Any]:
-    @wraps(f)
-    @authentication_required
-    def decorated_function(*args: Any, **kwargs: Any) -> Any:
-        if not current_app.config["IS_PERSONAL_SERVER"]:
-            abort(403)
-        return f(*args, **kwargs)
-
-    return decorated_function
-
-
 @dataclass
 class SMTPConfig:
     username: str
diff --git a/tests/conftest.py b/tests/conftest.py
index 83de667b..86c2d885 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -3,7 +3,7 @@
 import string
 import time
 from contextlib import contextmanager
-from typing import TYPE_CHECKING, Any, Callable, Generator
+from typing import TYPE_CHECKING, Any, Generator
 from uuid import uuid4
 
 import flask_migrate
@@ -140,12 +140,7 @@ def _insecure_scrypt_params(mocker: MockFixture) -> None:
 
 
 @pytest.fixture()
-def inject_app_configs() -> Callable[[Flask], None]:
-    return lambda x: None
-
-
-@pytest.fixture()
-def app(database: str, inject_app_configs: Callable[[Flask], None]) -> Generator[Flask, None, None]:
+def app(database: str) -> Generator[Flask, None, None]:
     os.environ["REGISTRATION_CODES_REQUIRED"] = "False"
     os.environ["SQLALCHEMY_DATABASE_URI"] = CONN_FMT_STR.format(database=database)
 
@@ -155,8 +150,6 @@ def app(database: str, inject_app_configs: Callable[[Flask], None]) -> Generator
     app.config["SERVER_NAME"] = "localhost:8080"
     app.config["PREFERRED_URL_SCHEME"] = "http"
 
-    inject_app_configs(app)
-
     with app.app_context():
         yield app
 
diff --git a/tests/test_settings.py b/tests/test_settings.py
index 85ed2d63..8bed9770 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -1,10 +1,9 @@
-from typing import Callable
 from unittest.mock import ANY, MagicMock, patch
 from uuid import uuid4
 
 import pytest
 from bs4 import BeautifulSoup
-from flask import Flask, url_for
+from flask import url_for
 from flask.testing import FlaskClient
 
 from hushline.db import db
@@ -482,93 +481,49 @@ def test_alias_change_directory_visibility(
     assert db.session.scalar(db.select(Username.show_in_directory).filter_by(id=user_alias.id))
 
 
-class TestSingleTenant:
-    @pytest.fixture()
-    def inject_app_configs(self) -> Callable[[Flask], None]:
-        def injector(app: Flask) -> None:
-            app.config["IS_PERSONAL_SERVER"] = True
-
-        return injector
-
-    @pytest.mark.usefixtures("_authenticated_admin")
-    def test_update_brand_primary_color(self, client: FlaskClient, admin: User) -> None:
-        color = "#acab00"
-        resp = client.post(
-            url_for("settings.update_brand_primary_color"),
-            data={"brand_primary_hex_color": color},
-            follow_redirects=True,
-        )
-        assert resp.status_code == 200
-        assert "Brand primary color updated successfully" in resp.text
-
-        soup = BeautifulSoup(resp.text, "html.parser")
-        styles = soup.find_all("style")
-        assert styles  # sensibility check
-        for style in styles:
-            if f"--color-brand: oklch(from {color} l c h);" in style.string:
-                break
-        else:
-            pytest.fail("Brand color CSS not updated in response <style>")
-
-        assert (host_org := HostOrganization.fetch())
-        assert host_org.brand_primary_hex_color == color
-
-    @pytest.mark.usefixtures("_authenticated_admin")
-    def test_update_brand_app_name(self, client: FlaskClient, admin: User) -> None:
-        name = "h4cK3rZ"
-        resp = client.post(
-            url_for("settings.update_brand_app_name"),
-            data={"brand_app_name": name},
-            follow_redirects=True,
-        )
-        assert resp.status_code == 200
-        assert "Brand app name updated successfully" in resp.text
-
-        soup = BeautifulSoup(resp.text, "html.parser")
-        h1s = soup.select("header h1")
-        assert h1s  # sensibility check
-        for h1 in h1s:
-            if name in h1.string:
-                break
-        else:
-            pytest.fail("Brand name not updated in header <h1>")
-
-        assert (host_org := HostOrganization.fetch())
-        assert host_org.brand_app_name == name
-
-
-class TestMultiTenant:
-    @pytest.fixture()
-    def inject_app_configs(self) -> Callable[[Flask], None]:
-        def injector(app: Flask) -> None:
-            app.config["IS_PERSONAL_SERVER"] = False
-
-        return injector
-
-    @pytest.mark.usefixtures("_authenticated_admin")
-    def test_update_brand_primary_color(self, client: FlaskClient, admin: User) -> None:
-        color = "#acab00"
-        resp = client.post(
-            url_for("settings.update_brand_primary_color"),
-            data={"brand_primary_hex_color": color},
-            follow_redirects=True,
-        )
-        assert resp.status_code == 403
-
-        # acceptable states: not in DB, or in DB and color not updated
-        if host_org := HostOrganization.fetch():
-            assert host_org.brand_primary_hex_color != color
-
-    @pytest.mark.usefixtures("_authenticated_admin")
-    def test_update_brand_app_name(self, client: FlaskClient, admin: User) -> None:
-        name = "h4cK3rZ"
-        resp = client.post(
-            url_for("settings.update_brand_app_name"),
-            data={"brand_app_name": name},
-            follow_redirects=True,
-        )
-        assert resp.status_code == 403
-
-        # acceptable states: not in DB, or in DB and name not updated
-        if host_org := HostOrganization.fetch():
-            assert host_org.brand_app_name != name
+@pytest.mark.usefixtures("_authenticated_admin")
+def test_update_brand_primary_color(client: FlaskClient, admin: User) -> None:
+    color = "#acab00"
+    resp = client.post(
+        url_for("settings.update_brand_primary_color"),
+        data={"brand_primary_hex_color": color},
+        follow_redirects=True,
+    )
+    assert resp.status_code == 200
+    assert "Brand primary color updated successfully" in resp.text
+
+    soup = BeautifulSoup(resp.text, "html.parser")
+    styles = soup.find_all("style")
+    assert styles  # sensibility check
+    for style in styles:
+        if f"--color-brand: oklch(from {color} l c h);" in style.string:
+            break
+    else:
+        pytest.fail("Brand color CSS not updated in response <style>")
+
+    assert (host_org := HostOrganization.fetch())
+    assert host_org.brand_primary_hex_color == color
+
+
+@pytest.mark.usefixtures("_authenticated_admin")
+def test_update_brand_app_name(client: FlaskClient, admin: User) -> None:
+    name = "h4cK3rZ"
+    resp = client.post(
+        url_for("settings.update_brand_app_name"),
+        data={"brand_app_name": name},
+        follow_redirects=True,
+    )
+    assert resp.status_code == 200
+    assert "Brand app name updated successfully" in resp.text
+
+    soup = BeautifulSoup(resp.text, "html.parser")
+    h1s = soup.select("header h1")
+    assert h1s  # sensibility check
+    for h1 in h1s:
+        if name in h1.string:
+            break
+    else:
+        pytest.fail("Brand name not updated in header <h1>")
+
+    assert (host_org := HostOrganization.fetch())
+    assert host_org.brand_app_name == name