remove ID provider model & make configuration deserializable

Author: avdb13

crates/authifier/src/config/sso.rs

@@ -53,13 +53,13 @@ pub enum Claim {
     Email,
 }
 
-#[derive(Serialize, Deserialize, Clone)]
+#[derive(Clone)]
 pub struct IdProvider {
     pub id: String,
 
-    pub issuer: String,
+    pub issuer: reqwest::Url,
     pub name: Option<String>,
-    pub icon: Option<String>,
+    pub icon: Option<reqwest::Url>,
 
     pub scopes: Vec<String>,
     pub endpoints: Endpoints,
@@ -105,11 +105,41 @@ impl Serialize for SSO {
 }
 
 impl<'de> Deserialize<'de> for SSO {
-    fn deserialize<D>(_: D) -> Result<Self, D::Error>
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where
         D: Deserializer<'de>,
     {
-        todo!()
+        #[derive(Deserialize)]
+        pub struct Mock {
+            pub issuer: reqwest::Url,
+            pub name: Option<String>,
+            pub icon: Option<reqwest::Url>,
+
+            pub scopes: Vec<String>,
+            pub endpoints: Endpoints,
+            pub credentials: Credentials,
+            pub claims: HashMap<Claim, String>,
+
+            pub code_challenge: bool,
+        }
+
+        let map: HashMap<String, Mock> =
+            HashMap::deserialize(deserializer).map_err(serde::de::Error::custom)?;
+
+        Ok(SSO(map
+            .into_iter()
+            .map(|(id, mock)| IdProvider {
+                id,
+                issuer: mock.issuer,
+                name: mock.name,
+                icon: mock.icon,
+                scopes: mock.scopes,
+                endpoints: mock.endpoints,
+                credentials: mock.credentials,
+                claims: mock.claims,
+                code_challenge: mock.code_challenge,
+            })
+            .collect()))
     }
 }
 

crates/authifier/src/impl/id_provider.rs

@@ -19,8 +19,8 @@ use serde::Serialize;
 use sha2::{Digest, Sha256};
 
 use crate::{
-    config::{Credentials, Endpoints},
-    models::{Callback, IdProvider},
+    config::{Credentials, Endpoints, IdProvider},
+    models::Callback,
     util::secure_random_str,
     Authifier, Error, Result,
 };

crates/authifier/src/models/id_provider.rs

@@ -1,6 +1,5 @@
 mod account;
 mod callback;
-mod id_provider;
 mod invite;
 mod mfa;
 mod secret;
@@ -9,7 +8,6 @@ mod ticket;
 
 pub use account::*;
 pub use callback::*;
-pub use id_provider::*;
 pub use invite::*;
 pub use mfa::*;
 pub use secret::*;

crates/authifier/src/models/mod.rs

@@ -1,6 +1,5 @@
 //! Redirect to authorization interface
 //! GET /sso/authorize
-use authifier::models::IdProvider;
 use authifier::{Authifier, Error, Result};
 use rocket::http::{Cookie, CookieJar};
 use rocket::response::Redirect;
@@ -24,10 +23,11 @@ pub async fn authorize(
     };
 
     // Ensure given ID provider exists
-    let id_provider = match authifier.config.sso.get(idp_id).cloned() {
-        Some(config) => IdProvider::try_from(config).map_err(|_| Error::InvalidIdpConfig)?,
-        None => return Err(Error::InvalidIdpId),
-    };
+    let id_provider = authifier
+        .config
+        .sso
+        .get(idp_id)
+        .ok_or(Error::InvalidIdpId)?;
 
     // Build authorization URI
     let (state, uri) = id_provider

crates/rocket_authifier/src/routes/sso/authorize.rs

@@ -3,7 +3,7 @@
 use std::collections::HashMap;
 
 use authifier::config::Claim;
-use authifier::models::{Account, IdProvider};
+use authifier::models::Account;
 use authifier::util::{normalise_email, secure_random_str};
 use authifier::{Authifier, Error, Result};
 use iso8601_timestamp::Timestamp;
@@ -65,10 +65,11 @@ pub async fn callback(
     }
 
     // Ensure given ID provider exists
-    let id_provider = match authifier.config.sso.get(&*callback.idp_id).cloned() {
-        Some(config) => IdProvider::try_from(config).map_err(|_| Error::InvalidIdpConfig)?,
-        None => return Err(Error::InvalidIdpId),
-    };
+    let id_provider = authifier
+        .config
+        .sso
+        .get(&*callback.idp_id)
+        .ok_or(Error::InvalidIdpId)?;
 
     // Ensure authorization code was provided
     let Some(code) = data.code.as_deref() else {