accounts: Make path to avatar relative unless specifically asking for absolute

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/backend/accounts.py b/src/backend/accounts.py
index 6a3cb42f6a3aa786d4b6eae51bfc351e9a174398..7954312aebdadc6468c9c20dc96ecf3ca6c38baa 100644 (file)
--- a/src/backend/accounts.py
+++ b/src/backend/accounts.py
@@ -1183,8 +1183,12 @@ class Account(LDAPObject):
 
                return has_avatar
 
-       def avatar_url(self, size=None):
-               url = "https://people.ipfire.org/users/%s.jpg?h=%s" % (self.uid, self.avatar_hash)
+       def avatar_url(self, size=None, absolute=False):
+               url = "/users/%s.jpg?h=%s" % (self.uid, self.avatar_hash)
+
+               # Return an absolute URL
+               if absolute:
+                       url = urllib.parse.urljoin("https://people.ipfire.org", url)
 
                if size:
                        url += "&size=%s" % size

diff --git a/src/web/people.py b/src/web/people.py
index 4a469c40c7944b00bd7868d3c4174dac11cc566b..1124dda7a67727dbaadeee36a58df96787add476 100644 (file)
--- a/src/web/people.py
+++ b/src/web/people.py
@@ -396,7 +396,7 @@ class SSODiscourse(auth.CacheMixin, base.BaseHandler):
                        "bio" : self.current_user.description or "",
 
                        # Avatar
-                       "avatar_url" : self.current_user.avatar_url(),
+                       "avatar_url" : self.current_user.avatar_url(absolute=True),
                        "avatar_force_update" : "true",
 
                        # Send a welcome message