Merge pull request #21 from bgeo-gis/master

Added custom favicon
qwc-services · Jan 4, 2024 · 8b7ab78 · 8b7ab78
2 parents a8d0e1c + 2d34089
commit 8b7ab78
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/db_auth.py b/src/db_auth.py
@@ -73,6 +73,7 @@ def __init__(self, tenant, mail, app):
         self.login_background = config.get('background_image_url')
         self.customstylesheet = config.get('customstylesheet')
         self.terms_url = config.get('terms_url')
+        self.favicon = config.get('favicon')
         db_url = config.get('db_url')
 
         # get password constraints from config
@@ -174,6 +175,7 @@ def login(self):
         form.background = self.login_background
         form.customstylesheet = self.customstylesheet
         form.terms_url = self.terms_url
+        form.favicon = self.favicon
         if form.validate_on_submit():
             user = self.find_user(db_session, name=form.username.data)
 
@@ -297,6 +299,7 @@ def __verify(self, db_session, submit=True):
         form.logo = self.login_logo
         form.background = self.login_background
         form.customstylesheet = self.customstylesheet
+        form.favicon = self.favicon
         if submit and form.validate_on_submit():
             if self.user_totp_is_valid(user, form.token.data, db_session):
                 # TOTP verified
@@ -360,6 +363,7 @@ def __setup_totp(self, db_session, submit=True):
         form.logo = self.login_logo
         form.background = self.login_background
         form.customstylesheet = self.customstylesheet
+        form.favicon = self.favicon
         if submit and form.validate_on_submit():
             if pyotp.totp.TOTP(totp_secret).verify(
                 form.token.data, valid_window=1
@@ -460,6 +464,7 @@ def new_password(self):
         form.logo = self.login_logo
         form.background = self.login_background
         form.customstylesheet = self.customstylesheet
+        form.favicon = self.favicon
         if form.validate_on_submit():
             # create session for ConfigDB
             db_session = self.db_session()
@@ -513,6 +518,7 @@ def edit_password(self, token, identity=None):
         form.logo = self.login_logo
         form.background = self.login_background
         form.customstylesheet = self.customstylesheet
+        form.favicon = self.favicon
         if form.validate_on_submit():
             # create session for ConfigDB
             db_session = self.db_session()
@@ -637,6 +643,7 @@ def require_password_change(self, user, reason, target_url, db_session):
         form.logo = self.login_logo
         form.background = self.login_background
         form.customstylesheet = self.customstylesheet
+        form.favicon = self.favicon
         # set hidden fields
         form.reset_password_token.data = user.reset_password_token
         form.url.data = target_url
@@ -819,7 +826,7 @@ def __login_response(self, user, target_url):
             form.logo = self.login_logo
             form.background = self.login_background
             form.customstylesheet = self.customstylesheet
-
+            form.favicon = self.favicon
             # show expiry notice
             page = render_template(
                 'notification.html', form=form, i18n=i18n,

diff --git a/src/templates/base.html b/src/templates/base.html
@@ -9,6 +9,9 @@
         {% if form.customstylesheet %}
         <link rel="stylesheet" href="{{ url_for('static', filename=form.customstylesheet) }}" type="text/css">
         {% endif %}
+        {% if form.favicon %}
+        <link rel="icon" href="{{form.favicon}}">
+        {% endif %}
     </head>
     <body>
         {% if form.background %}