Shield OIDC: Add support for subprovider slugs

RustForWeb · Dec 29, 2024 · 7dbac7d · 7dbac7d
1 parent 3ee6b78
commit 7dbac7d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 11 deletions.
diff --git a/packages/providers/shield-oidc/src/provider.rs b/packages/providers/shield-oidc/src/provider.rs
@@ -42,7 +42,7 @@ impl<U: User> OidcProvider<U> {
         self
     }
 
-    async fn oidc_subprovider_by_id(
+    async fn oidc_subprovider_by_id_or_slug(
         &self,
         subprovider_id: &str,
     ) -> Result<OidcSubprovider, ShieldError> {
@@ -54,7 +54,11 @@ impl<U: User> OidcProvider<U> {
             return Ok(subprovider.clone());
         }
 
-        if let Some(subprovider) = self.storage.oidc_subprovider_by_id(subprovider_id).await? {
+        if let Some(subprovider) = self
+            .storage
+            .oidc_subprovider_by_id_or_slug(subprovider_id)
+            .await?
+        {
             return Ok(subprovider);
         }
 
@@ -183,7 +187,7 @@ impl<U: User> Provider for OidcProvider<U> {
         &self,
         subprovider_id: &str,
     ) -> Result<Option<Box<dyn Subprovider>>, ShieldError> {
-        self.oidc_subprovider_by_id(subprovider_id)
+        self.oidc_subprovider_by_id_or_slug(subprovider_id)
             .await
             .map(|subprovider| Some(Box::new(subprovider) as Box<dyn Subprovider>))
     }
@@ -194,7 +198,7 @@ impl<U: User> Provider for OidcProvider<U> {
         session: Session,
     ) -> Result<Response, ShieldError> {
         let subprovider = match request.subprovider_id {
-            Some(subprovider_id) => self.oidc_subprovider_by_id(&subprovider_id).await?,
+            Some(subprovider_id) => self.oidc_subprovider_by_id_or_slug(&subprovider_id).await?,
             None => return Err(ProviderError::SubproviderMissing.into()),
         };
 
@@ -287,7 +291,7 @@ impl<U: User> Provider for OidcProvider<U> {
             .ok_or_else(|| ShieldError::Validation("Missing authorization code.".to_owned()))?;
 
         let subprovider = match request.subprovider_id {
-            Some(subprovider_id) => self.oidc_subprovider_by_id(&subprovider_id).await?,
+            Some(subprovider_id) => self.oidc_subprovider_by_id_or_slug(&subprovider_id).await?,
             None => return Err(ProviderError::SubproviderMissing.into()),
         };
 
@@ -405,7 +409,7 @@ impl<U: User> Provider for OidcProvider<U> {
         session: Session,
     ) -> Result<Response, ShieldError> {
         let subprovider = match request.subprovider_id {
-            Some(subprovider_id) => self.oidc_subprovider_by_id(&subprovider_id).await?,
+            Some(subprovider_id) => self.oidc_subprovider_by_id_or_slug(&subprovider_id).await?,
             None => return Err(ProviderError::SubproviderMissing.into()),
         };
 

diff --git a/packages/providers/shield-oidc/src/storage.rs b/packages/providers/shield-oidc/src/storage.rs
@@ -11,7 +11,7 @@ use crate::{
 pub trait OidcStorage<U: User>: Storage<U> + Sync {
     async fn oidc_subproviders(&self) -> Result<Vec<OidcSubprovider>, StorageError>;
 
-    async fn oidc_subprovider_by_id(
+    async fn oidc_subprovider_by_id_or_slug(
         &self,
         subprovider_id: &str,
     ) -> Result<Option<OidcSubprovider>, StorageError>;

diff --git a/packages/storage/shield-memory/src/providers/oidc.rs b/packages/storage/shield-memory/src/providers/oidc.rs
@@ -20,7 +20,7 @@ impl OidcStorage<User> for MemoryStorage {
         Ok(vec![])
     }
 
-    async fn oidc_subprovider_by_id(
+    async fn oidc_subprovider_by_id_or_slug(
         &self,
         _subprovider_id: &str,
     ) -> Result<Option<OidcSubprovider>, StorageError> {

diff --git a/packages/storage/shield-sea-orm/src/providers/oidc.rs b/packages/storage/shield-sea-orm/src/providers/oidc.rs
@@ -1,5 +1,5 @@
 use async_trait::async_trait;
-use sea_orm::{ActiveModelTrait, ActiveValue, ColumnTrait, EntityTrait, QueryFilter};
+use sea_orm::{ActiveModelTrait, ActiveValue, ColumnTrait, Condition, EntityTrait, QueryFilter};
 use shield::StorageError;
 use shield_oidc::{
     CreateOidcConnection, OidcConnection, OidcProviderPkceCodeChallenge, OidcProviderVisibility,
@@ -27,11 +27,16 @@ impl OidcStorage<User> for SeaOrmStorage {
             })
     }
 
-    async fn oidc_subprovider_by_id(
+    async fn oidc_subprovider_by_id_or_slug(
         &self,
         subprovider_id: &str,
     ) -> Result<Option<OidcSubprovider>, StorageError> {
-        oidc_provider::Entity::find_by_id(Self::parse_uuid(subprovider_id)?)
+        oidc_provider::Entity::find()
+            .filter(
+                Condition::any()
+                    .add(oidc_provider::Column::Id.eq(Self::parse_uuid(subprovider_id)?))
+                    .add(oidc_provider::Column::Slug.eq(subprovider_id.to_lowercase())),
+            )
             .one(&self.database)
             .await
             .map_err(|err| StorageError::Engine(err.to_string()))