Update settings/admin UI and misc fixes

app/routes/company.py

@@ -18,7 +18,7 @@ from ..uploads import (
     get_company_upload_bytes,
     is_valid_upload_relpath,
 )
-from ..models import Company, Display, DisplaySession, Playlist, PlaylistItem, User
+from ..models import AppSettings, Company, Display, DisplaySession, Playlist, PlaylistItem, User
 from ..email_utils import send_email
 from ..auth_tokens import make_password_reset_token
 
@@ -289,7 +289,13 @@ def invite_user():
     db.session.commit()
 
     token = make_password_reset_token(secret_key=current_app.config["SECRET_KEY"], user_id=u.id)
-    reset_url = url_for("auth.reset_password", token=token, _external=True)
+
+    settings = db.session.get(AppSettings, 1)
+    if settings and settings.public_domain:
+        path = url_for("auth.reset_password", token=token, _external=False)
+        reset_url = f"https://{settings.public_domain}{path}"
+    else:
+        reset_url = url_for("auth.reset_password", token=token, _external=True)
     body = (
         f"You have been invited to {company.name} on Signage.\n\n"
         "Set your password using this link (valid for 30 minutes):\n"