Default configuration and test client use user avatars

canaille/account.py

@@ -519,7 +519,7 @@ def reset(uid, hash):
 
 @bp.route("/profile/<uid>/<field>")
 def photo(uid, field):
-    if field != "jpegPhoto":
+    if field.lower() != "jpegphoto":
         abort(404)
 
     user = User.get(uid)

canaille/conf/config.sample.toml

@@ -156,6 +156,7 @@ FAMILY_NAME = "{{ user.sn[0] }}"
 PREFERRED_USERNAME = "{{ user.displayName[0] }}"
 LOCALE = "{{ user.preferredLanguage[0] }}"
 ADDRESS = "{{ user.postalAddress[0] }}"
+PICTURE = "{% if user.jpegPhoto %}{{ url_for('account.photo', uid=user.uid[0], field='jpegPhoto', _external=True) }}{% endif %}"
 
 # The SMTP server options. If not set, mail related features such as
 # user invitations, and password reset emails, will be disabled.

demo/client/templates/index.html

@@ -29,12 +29,12 @@
             {% if user %}
                 <a class="item" href="{{ url_for('logout') }}">
                     <i class="sign out alternate icon"></i>
-            Log out
+                    Sign out
                 </a>
             {% else %}
                 <a class="item" href="{{ url_for('login') }}">
                     <i class="sign in alternate icon"></i>
-            Log in
+                    Sign in
                 </a>
             {% endif %}
         </nav>
@@ -50,17 +50,32 @@
 
             <div class="ui segment">
                 <h2 class="ui header">{{ name }}</h2>
-            <div>
                 {% if user %}
-                <p>Welcome {{ user.name }}</p>
+                <div class="ui centered card">
-                {% if user.groups %}
+                    {% if user.picture %}
-                <p>You're a member of the following groups: {{ user.groups }}</p>
+                        <div class="image">
+                            <img src="{{ user.picture }}" alt="Avatar">
+                        </div>
                     {% endif %}
-            {% else %}
+                    <div class="content">
-                Welcome, please <a href="{{ url_for('login') }}">log-in</a>.
+                        <span class="header">{{ user.name }}</span>
+                        <div class="meta">
+                            {{ user.sub }}
+                        </div>
+                        {% if user.groups %}
+                            <div class="extra content">
+                                <i class="user users icon"></i>
+                                {% for group in user.groups %}
+                                    <span class="label">{{ group }}</span>
+                                {% endfor %}
+                            </div>
                         {% endif %}
                     </div>
                 </div>
+                {% else %}
+                    <a class="ui primary button" href="{{ url_for('login') }}">Sign in</a>.
+                {% endif %}
+            </div>
         </div>
 
         <script src="/static/jquery/jquery.min.js"></script>

demo/conf/canaille.toml

@@ -162,6 +162,7 @@ FAMILY_NAME = "{{ user.sn[0] }}"
 PREFERRED_USERNAME = "{{ user.displayName[0] }}"
 LOCALE = "{{ user.preferredLanguage[0] }}"
 ADDRESS = "{{ user.postalAddress[0] }}"
+PICTURE = "{% if user.jpegPhoto %}{{ url_for('account.photo', uid=user.uid[0], field='jpegPhoto', _external=True) }}{% endif %}"
 
 # The SMTP server options. If not set, mail related features such as
 # user invitations, and password reset emails, will be disabled.

doc/configuration.rst

@@ -212,6 +212,10 @@ Attributes are rendered using jinja2, and can use a ``user`` variable.
 :ADDRESS:
     *Optional.* Defaults to ``{{ user.postalAddress[0] }}``
 
+:PICTURE:
+    *Optional.* Defaults to ``{% if user.jpegPhoto %}{{ url_for('account.photo', uid=user.uid[0], field='jpegPhoto', _external=True) }}{% endif %}``
+
+
 SMTP
 ----
 Canaille needs you to configure a SMTP server to send some mails, including the *I forgot my password* and the *invitation* mails.

tests/conftest.py

@@ -187,6 +187,7 @@ def configuration(slapd_server, smtpd, keypair_path):
                 "FAMILY_NAME": "{{ user.sn[0] }}",
                 "PREFERRED_USERNAME": "{{ user.displayName[0] }}",
                 "LOCALE": "{{ user.preferredLanguage[0] }}",
+                "PICTURE": "{% if user.jpegPhoto %}{{ url_for('account.photo', uid=user.uid[0], field='jpegPhoto', _external=True) }}{% endif %}",
             },
         },
         "SMTP": {