feat: ✨ split generic auth action

ralinejs · Oct 7, 2024 · 03626b9 · 03626b9
1 parent 4e9328d
commit 03626b9
Show file tree

Hide file tree

Showing 11 changed files with 247 additions and 205 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ description = "just for oauth2 login"
 edition = "2021"
 license = "MIT"
 name = "just-auth"
-version = "0.1.2"
+version = "0.1.3"
 
 [dependencies]
 async-trait = "0.1"

diff --git a/src/baidu.rs b/src/baidu.rs
@@ -1,6 +1,8 @@
 //! https://openauth.baidu.com/doc/doc.html
 use crate::error::Result;
-use crate::{auth_server_builder, AuthAction, AuthConfig, AuthUrlProvider, AuthUser};
+use crate::{
+    auth_server_builder, AuthAction, AuthConfig, AuthUrlProvider, AuthUser, GenericAuthAction,
+};
 use async_trait::async_trait;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
@@ -46,6 +48,33 @@ impl AuthAction for AuthorizationServer {
     type AuthToken = TokenResponse;
     type AuthUser = UserInfoResponse;
 
+    async fn get_access_token(&self, callback: Self::AuthCallback) -> Result<Self::AuthToken> {
+        let AuthConfig {
+            client_id,
+            client_secret,
+            redirect_uri,
+            ..
+        } = &self.config;
+        let access_token_url = Self::access_token_url(GetTokenRequest {
+            client_id: client_id.to_string(),
+            client_secret: client_secret.clone().expect("client_secret is empty"),
+            code: callback.code,
+            redirect_uri: redirect_uri.to_string(),
+        })?;
+        Ok(reqwest::get(access_token_url).await?.json().await?)
+    }
+
+    async fn get_user_info(&self, token: Self::AuthToken) -> Result<Self::AuthUser> {
+        let user_info_url = Self::user_info_url(GetUserInfoRequest {
+            access_token: token.access_token,
+            get_unionid: Some(1),
+        })?;
+        Ok(reqwest::get(user_info_url).await?.json().await?)
+    }
+}
+
+#[async_trait]
+impl GenericAuthAction for AuthorizationServer {
     async fn authorize<S: Into<String> + Send>(&self, state: S) -> Result<String> {
         let AuthConfig {
             client_id,
@@ -62,7 +91,8 @@ impl AuthAction for AuthorizationServer {
         })
     }
 
-    async fn login(&self, callback: Self::AuthCallback) -> Result<AuthUser> {
+    async fn login<S: Into<String> + Send>(&self, callback: S) -> Result<AuthUser> {
+        let callback: AuthCallback = serde_urlencoded::from_str(&callback.into())?;
         let token = self.get_access_token(callback).await?;
         let user = self.get_user_info(token.clone()).await?;
         Ok(AuthUser {
@@ -74,30 +104,6 @@ impl AuthAction for AuthorizationServer {
             extra: user.extra,
         })
     }
-
-    async fn get_access_token(&self, callback: Self::AuthCallback) -> Result<Self::AuthToken> {
-        let AuthConfig {
-            client_id,
-            client_secret,
-            redirect_uri,
-            ..
-        } = &self.config;
-        let access_token_url = Self::access_token_url(GetTokenRequest {
-            client_id: client_id.to_string(),
-            client_secret: client_secret.clone().expect("client_secret is empty"),
-            code: callback.code,
-            redirect_uri: redirect_uri.to_string(),
-        })?;
-        Ok(reqwest::get(access_token_url).await?.json().await?)
-    }
-
-    async fn get_user_info(&self, token: Self::AuthToken) -> Result<Self::AuthUser> {
-        let user_info_url = Self::user_info_url(GetUserInfoRequest {
-            access_token: token.access_token,
-            get_unionid: Some(1),
-        })?;
-        Ok(reqwest::get(user_info_url).await?.json().await?)
-    }
 }
 
 #[serde_as]

diff --git a/src/error.rs b/src/error.rs
@@ -5,6 +5,9 @@ pub enum AuthError {
     #[error(transparent)]
     UrlEncodedSerializeErr(#[from] serde_urlencoded::ser::Error),
 
+    #[error(transparent)]
+    UrlEncodedDeserializeErr(#[from] serde_urlencoded::de::Error),
+
     #[error(transparent)]
     JsonParseErr(#[from] serde_json::Error),
 

diff --git a/src/facebook.rs b/src/facebook.rs
@@ -1,6 +1,7 @@
 //! https://developers.facebook.com/docs/facebook-login/guides/advanced/manual-flow
 use crate::{
     auth_server_builder, error::Result, AuthAction, AuthConfig, AuthUrlProvider, AuthUser,
+    GenericAuthAction,
 };
 use async_trait::async_trait;
 use serde::{Deserialize, Serialize};
@@ -48,6 +49,32 @@ impl AuthAction for AuthorizationServer {
     type AuthToken = TokenResponse;
     type AuthUser = UserInfoResponse;
 
+    async fn get_access_token(&self, callback: Self::AuthCallback) -> Result<Self::AuthToken> {
+        let AuthConfig {
+            client_id,
+            client_secret,
+            redirect_uri,
+            ..
+        } = &self.config;
+        let access_token_url = Self::access_token_url(GetTokenRequest {
+            client_id: client_id.to_string(),
+            client_secret: client_secret.clone().expect("client_secret is empty"),
+            code: callback.code,
+            redirect_uri: redirect_uri.to_string(),
+        })?;
+        Ok(reqwest::get(access_token_url).await?.json().await?)
+    }
+
+    async fn get_user_info(&self, token: Self::AuthToken) -> Result<Self::AuthUser> {
+        let user_info_url = Self::user_info_url(GetUserInfoRequest {
+            access_token: token.access_token,
+        })?;
+        Ok(reqwest::get(user_info_url).await?.json().await?)
+    }
+}
+
+#[async_trait]
+impl GenericAuthAction for AuthorizationServer {
     async fn authorize<S: Into<String> + Send>(&self, state: S) -> Result<String> {
         let AuthConfig {
             client_id,
@@ -64,7 +91,8 @@ impl AuthAction for AuthorizationServer {
         })
     }
 
-    async fn login(&self, callback: Self::AuthCallback) -> Result<AuthUser> {
+    async fn login<S: Into<String> + Send>(&self, callback: S) -> Result<AuthUser> {
+        let callback: AuthCallback = serde_urlencoded::from_str(&callback.into())?;
         let token = self.get_access_token(callback).await?;
         let user = self.get_user_info(token.clone()).await?;
         Ok(AuthUser {
@@ -76,29 +104,6 @@ impl AuthAction for AuthorizationServer {
             extra: user.extra,
         })
     }
-
-    async fn get_access_token(&self, callback: Self::AuthCallback) -> Result<Self::AuthToken> {
-        let AuthConfig {
-            client_id,
-            client_secret,
-            redirect_uri,
-            ..
-        } = &self.config;
-        let access_token_url = Self::access_token_url(GetTokenRequest {
-            client_id: client_id.to_string(),
-            client_secret: client_secret.clone().expect("client_secret is empty"),
-            code: callback.code,
-            redirect_uri: redirect_uri.to_string(),
-        })?;
-        Ok(reqwest::get(access_token_url).await?.json().await?)
-    }
-
-    async fn get_user_info(&self, token: Self::AuthToken) -> Result<Self::AuthUser> {
-        let user_info_url = Self::user_info_url(GetUserInfoRequest {
-            access_token: token.access_token,
-        })?;
-        Ok(reqwest::get(user_info_url).await?.json().await?)
-    }
 }
 
 #[serde_as]

diff --git a/src/github.rs b/src/github.rs
@@ -1,6 +1,8 @@
 //! https://docs.github.com/zh/apps/oauth-apps/building-oauth-apps/authorizing-oauth-apps
 use crate::error::Result;
-use crate::{auth_server_builder, AuthAction, AuthConfig, AuthUrlProvider, AuthUser};
+use crate::{
+    auth_server_builder, AuthAction, AuthConfig, AuthUrlProvider, AuthUser, GenericAuthAction,
+};
 use async_trait::async_trait;
 use reqwest::header::ACCEPT;
 use serde::{Deserialize, Serialize};
@@ -42,38 +44,6 @@ impl AuthAction for AuthorizationServer {
     type AuthToken = TokenResponse;
     type AuthUser = UserInfoResponse;
 
-    async fn authorize<S: Into<String> + Send>(&self, state: S) -> Result<String> {
-        let AuthConfig {
-            client_id,
-            redirect_uri,
-            scope,
-            ..
-        } = &self.config;
-        Self::authorize_url(AuthRequest {
-            client_id: client_id.to_string(),
-            redirect_uri: redirect_uri.to_string(),
-            state: state.into(),
-            scope: scope
-                .clone()
-                .or_else(|| Some(vec!["read:user".into(), "user:email".into()]))
-                .expect("scope is empty"),
-            ..Default::default()
-        })
-    }
-
-    async fn login(&self, callback: Self::AuthCallback) -> Result<AuthUser> {
-        let token = self.get_access_token(callback).await?;
-        let user = self.get_user_info(token.clone()).await?;
-        Ok(AuthUser {
-            user_id: user.id.to_string(),
-            name: user.name,
-            access_token: token.access_token,
-            refresh_token: token.token_type,
-            expires_in: i64::MAX,
-            extra: user.extra,
-        })
-    }
-
     async fn get_access_token(&self, callback: Self::AuthCallback) -> Result<Self::AuthToken> {
         let AuthConfig {
             client_id,
@@ -108,6 +78,42 @@ impl AuthAction for AuthorizationServer {
     }
 }
 
+#[async_trait]
+impl GenericAuthAction for AuthorizationServer {
+    async fn authorize<S: Into<String> + Send>(&self, state: S) -> Result<String> {
+        let AuthConfig {
+            client_id,
+            redirect_uri,
+            scope,
+            ..
+        } = &self.config;
+        Self::authorize_url(AuthRequest {
+            client_id: client_id.to_string(),
+            redirect_uri: redirect_uri.to_string(),
+            state: state.into(),
+            scope: scope
+                .clone()
+                .or_else(|| Some(vec!["read:user".into(), "user:email".into()]))
+                .expect("scope is empty"),
+            ..Default::default()
+        })
+    }
+
+    async fn login<S: Into<String> + Send>(&self, callback: S) -> Result<AuthUser> {
+        let callback: AuthCallback = serde_urlencoded::from_str(&callback.into())?;
+        let token = self.get_access_token(callback).await?;
+        let user = self.get_user_info(token.clone()).await?;
+        Ok(AuthUser {
+            user_id: user.id.to_string(),
+            name: user.name,
+            access_token: token.access_token,
+            refresh_token: token.token_type,
+            expires_in: i64::MAX,
+            extra: user.extra,
+        })
+    }
+}
+
 #[serde_as]
 #[derive(Debug, Default, Serialize, Deserialize)]
 pub struct AuthRequest {

diff --git a/src/lib.rs b/src/lib.rs
@@ -97,15 +97,18 @@ pub trait AuthAction {
     type AuthToken: Send;
     type AuthUser;
 
-    async fn authorize<S: Into<String> + Send>(&self, state: S) -> Result<String>;
-
-    async fn login(&self, callback: Self::AuthCallback) -> Result<AuthUser>;
-
     async fn get_access_token(&self, callback: Self::AuthCallback) -> Result<Self::AuthToken>;
 
     async fn get_user_info(&self, token: Self::AuthToken) -> Result<Self::AuthUser>;
 }
 
+#[async_trait]
+pub trait GenericAuthAction {
+    async fn authorize<S: Into<String> + Send>(&self, state: S) -> Result<String>;
+
+    async fn login<S: Into<String> + Send>(&self, callback_raw_query: S) -> Result<AuthUser>;
+}
+
 pub struct AuthUser {
     pub user_id: String,
     pub name: String,