From b130965264d45f3678533b19d313e2e073ea022c Mon Sep 17 00:00:00 2001
From: Valentin Tolmer <valentin@tolmer.fr>
Date: Sun, 7 Aug 2022 18:17:39 +0200
Subject: [PATCH] ldap: return user's avatar

---
 server/src/infra/ldap_handler.rs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/server/src/infra/ldap_handler.rs b/server/src/infra/ldap_handler.rs
index d50f59b..f013d7a 100644
--- a/server/src/infra/ldap_handler.rs
+++ b/server/src/infra/ldap_handler.rs
@@ -170,6 +170,13 @@ fn get_user_attribute(
         "mail" => vec![user.email.clone().into_bytes()],
         "givenname" => vec![user.first_name.clone().into_bytes()],
         "sn" => vec![user.last_name.clone().into_bytes()],
+        "jpegphoto" => {
+            let bytes = user.avatar.clone().into_bytes();
+            if bytes.is_empty() {
+                return Ok(None);
+            }
+            vec![bytes]
+        }
         "memberof" => groups
             .into_iter()
             .flatten()
@@ -238,6 +245,7 @@ const ALL_USER_ATTRIBUTE_KEYS: &[&str] = &[
     "givenname",
     "sn",
     "cn",
+    "jpegPhoto",
     "createtimestamp",
 ];
 
@@ -1481,6 +1489,7 @@ mod tests {
                 "cn",
                 "createTimestamp",
                 "entryUuid",
+                "jpegPhoto",
             ],
         );
         assert_eq!(
@@ -1568,6 +1577,10 @@ mod tests {
                             atype: "entryUuid".to_string(),
                             vals: vec![b"04ac75e0-2900-3e21-926c-2f732c26b3fc".to_vec()]
                         },
+                        LdapPartialAttribute {
+                            atype: "jpegPhoto".to_string(),
+                            vals: vec![JpegPhoto::for_tests().into_bytes()]
+                        },
                     ],
                 }),
                 make_search_success(),
@@ -2067,6 +2080,7 @@ mod tests {
                     display_name: "Bôb Böbberson".to_string(),
                     first_name: "Bôb".to_string(),
                     last_name: "Böbberson".to_string(),
+                    avatar: JpegPhoto::for_tests(),
                     ..Default::default()
                 },
                 groups: None,
@@ -2125,6 +2139,10 @@ mod tests {
                         atype: "cn".to_string(),
                         vals: vec!["Bôb Böbberson".to_string().into_bytes()],
                     },
+                    LdapPartialAttribute {
+                        atype: "jpegPhoto".to_string(),
+                        vals: vec![JpegPhoto::for_tests().into_bytes()],
+                    },
                     LdapPartialAttribute {
                         atype: "createtimestamp".to_string(),
                         vals: vec![chrono::Utc.timestamp(0, 0).to_rfc3339().into_bytes()],