Revert "Pass all properties from idp provider to jitsi"

This reverts commit 799d445.

Author: MarcelCoding

Cargo.lock

@@ -47,8 +47,7 @@ struct Session {
 
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 struct MyClaims {
-  #[serde(flatten)]
-  other: HashMap<String, String>,
+  affiliation: Option<String>,
 }
 
 impl AdditionalClaims for MyClaims {}

src/main.rs

@@ -13,7 +13,6 @@ use openidconnect::{
 };
 use serde::{self, Serializer};
 use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
 use time::{Duration, OffsetDateTime};
 use tracing::{error, warn};
 use uuid::Uuid;
@@ -241,12 +240,12 @@ fn id_token_claims(
   Ok(Some(JitsiUser {
     id: uid,
     email: claims.email().map(|email| email.to_string()),
+    affiliation: claims.additional_claims().affiliation.clone(),
     name: get_display_name_id_token(claims),
     avatar: claims
       .picture()
       .and_then(|x| x.get(None))
       .map(|x| x.to_string()),
-    other: claims.additional_claims().other.clone(),
   }))
 }
 
@@ -271,12 +270,12 @@ async fn user_info_claims(
           None => claims.subject().to_string(),
         },
         email: claims.email().map(|email| email.to_string()),
+        affiliation: claims.additional_claims().affiliation.clone(),
         name: get_display_name(&claims),
         avatar: claims
           .picture()
           .and_then(|x| x.get(None))
           .map(|x| x.to_string()),
-        other: claims.additional_claims().other.clone(),
       }))
     }
     Err(ConfigurationError::MissingUrl(_)) => Ok(None),
@@ -300,8 +299,6 @@ struct JitsiClaims {
   iat: OffsetDateTime,
   #[serde(serialize_with = "jwt_numeric_date")]
   exp: OffsetDateTime,
-  #[serde(flatten)]
-  other: HashMap<String, String>,
 }
 
 #[derive(Serialize)]
@@ -314,10 +311,9 @@ struct JitsiContext {
 struct JitsiUser {
   id: String,
   email: Option<String>,
+  affiliation: Option<String>,
   name: Option<String>,
   avatar: Option<String>,
-  #[serde(flatten)]
-  other: HashMap<String, String>,
 }
 
 fn create_jitsi_jwt(
@@ -332,12 +328,13 @@ fn create_jitsi_jwt(
   let iat = OffsetDateTime::now_utc();
   let exp = iat + Duration::days(1);
 
+  let context = JitsiContext {
+    user,
+    group: Some(group),
+  };
+
   let claims = JitsiClaims {
-    other: user.other.clone(),
-    context: JitsiContext {
-      user,
-      group: Some(group),
-    },
+    context,
     aud,
     iss,
     sub,