test configuration and small fixes

Author: avdb13

crates/authifier/src/config/sso.rs

@@ -5,16 +5,17 @@ use std::{
     ops::Deref,
 };
 
+use reqwest::Url;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
 #[serde(rename_all = "lowercase", tag = "type")]
 pub enum Endpoints {
     Discoverable,
     Manual {
-        authorization: String,
-        token: String,
-        userinfo: String,
+        authorization: Url,
+        token: Url,
+        userinfo: Url,
     },
 }
 
@@ -53,13 +54,13 @@ pub enum Claim {
     Email,
 }
 
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct IdProvider {
     pub id: String,
 
-    pub issuer: reqwest::Url,
+    pub issuer: Url,
     pub name: Option<String>,
-    pub icon: Option<reqwest::Url>,
+    pub icon: Option<Url>,
 
     pub scopes: Vec<String>,
     pub endpoints: Endpoints,
@@ -92,7 +93,7 @@ impl Hash for IdProvider {
     }
 }
 
-#[derive(Default, Clone)]
+#[derive(Debug, Default, Clone, PartialEq, Eq)]
 pub struct SSO(HashSet<IdProvider>);
 
 impl Serialize for SSO {
@@ -111,9 +112,9 @@ impl<'de> Deserialize<'de> for SSO {
     {
         #[derive(Deserialize)]
         pub struct Mock {
-            pub issuer: reqwest::Url,
+            pub issuer: Url,
             pub name: Option<String>,
-            pub icon: Option<reqwest::Url>,
+            pub icon: Option<Url>,
 
             pub scopes: Vec<String>,
             pub endpoints: Endpoints,
@@ -150,3 +151,67 @@ impl Deref for SSO {
         &self.0
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn deserialize_sso_config() {
+        let value = serde_json::json!(
+            {
+                "Gitlab": {
+                    "issuer": "https://gitlab.com",
+                    "scopes": ["openid"],
+
+                    "endpoints": {
+                        "type": "discoverable"
+                    },
+                    "credentials": {
+                        "type": "post",
+                        "client_id": "foobar",
+                        "client_secret": "baz"
+                    },
+                    "claims": {
+                        "id": "sub",
+                        "email": "preferred_email"
+                    },
+
+                    "code_challenge": false,
+                }
+            }
+        );
+
+        let result: SSO = serde_json::from_value(value).expect("config deserializes successfully");
+
+        assert_eq!(
+            result,
+            SSO([IdProvider {
+                id: "Gitlab".to_owned(),
+
+                issuer: "https://gitlab.com"
+                    .parse()
+                    .expect("issuer should be valid"),
+                name: None,
+                icon: None,
+
+                scopes: vec!["openid".to_owned()],
+                endpoints: Endpoints::Discoverable,
+                credentials: Credentials::Post {
+                    client_id: "foobar".to_owned(),
+                    client_secret: "baz".to_owned(),
+                },
+                claims: [
+                    (Claim::Id, "sub".to_owned()),
+                    (Claim::Email, "preferred_email".to_owned())
+                ]
+                .into_iter()
+                .collect(),
+
+                code_challenge: false,
+            }]
+            .into_iter()
+            .collect())
+        );
+    }
+}

crates/authifier/src/impl/id_provider.rs

@@ -61,7 +61,7 @@ impl IdProvider {
 
                 metadata.authorization_endpoint().to_owned()
             }
-            Endpoints::Manual { authorization, .. } => authorization.parse().unwrap(),
+            Endpoints::Manual { authorization, .. } => authorization.clone(),
         };
 
         // Append the client ID, redirect URI and state to the authorization URI
@@ -129,7 +129,7 @@ impl IdProvider {
 
                 metadata.token_endpoint().to_owned()
             }
-            Endpoints::Manual { token, .. } => token.parse().unwrap(),
+            Endpoints::Manual { token, .. } => token.clone(),
         };
 
         // Build request for access token with authorization code
@@ -175,7 +175,7 @@ impl IdProvider {
 
                 metadata.userinfo_endpoint.as_ref().cloned()
             }
-            Endpoints::Manual { userinfo, .. } => Some(userinfo.parse().unwrap()),
+            Endpoints::Manual { userinfo, .. } => Some(userinfo.clone()),
         }) else {
             return Ok(None);
         };