Test cleanup

Added SignInWithSSO Model Added SSOSignInOptions Added SSOSuccess
supabase-community · Oct 10, 2024 · bb86c15 · bb86c15
1 parent d6bc2b4
commit bb86c15
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 14 deletions.
diff --git a/src/client.rs b/src/client.rs
@@ -12,13 +12,15 @@ use crate::{
     models::{
         AuthClient, AuthServerHealth, AuthServerSettings, LogoutScope, Provider,
         RefreshSessionPayload, RequestMagicLinkPayload, ResendParams, ResetPasswordForEmailPayload,
-        SSOResponse, Session, SignInEmailOtpParams, SignInWithEmailAndPasswordPayload,
+        Session, SignInEmailOtpParams, SignInWithEmailAndPasswordPayload,
         SignInWithEmailOtpPayload, SignInWithIdTokenCredentials, SignInWithOAuthOptions,
         SignInWithPhoneAndPasswordPayload, SignInWithSSO, SignUpWithEmailAndPasswordPayload,
         SignUpWithPhoneAndPasswordPayload, UpdateUserPayload, User, VerifyOtpParams,
     },
 };
 
+const AUTH_V1: &str = "/auth/v1";
+
 impl AuthClient {
     /// Create a new Auth Client
     /// You can find your project url and keys at https://supabase.com/dashboard/project/<your project id>/settings/api
@@ -84,8 +86,8 @@ impl AuthClient {
         let response = self
             .client
             .post(format!(
-                "{}/auth/v1/token?grant_type=password",
-                self.project_url
+                "{}{}/token?grant_type=password",
+                self.project_url, AUTH_V1
             ))
             .headers(headers)
             .body(body)
@@ -685,6 +687,7 @@ impl AuthClient {
         Ok(response)
     }
 
+    // WARN: Untested, requires a SAML 2.0 Provider and Supabase Pro plan
     /// Get the project URL from an AuthClient
     pub fn project_url(&self) -> &String {
         &self.project_url

diff --git a/src/models.rs b/src/models.rs
@@ -442,6 +442,33 @@ pub enum LogoutScope {
     Others,
 }
 
+#[derive(Debug, Serialize, Deserialize)]
+pub struct SignInWithSSO {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub provider_id: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub domain: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub options: Option<SSOSignInOptions>,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct SSOSignInOptions {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    captcha_token: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    redirect_to: Option<String>,
+}
+
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct SSOSuccess {
+    pub url: String,
+    pub status: u16,
+    pub headers: Headers,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
 // Implement custom Debug to avoid exposing sensitive information
 impl fmt::Debug for AuthClient {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

diff --git a/tests/client_tests.rs b/tests/client_tests.rs
@@ -1,8 +1,8 @@
 use std::{collections::HashMap, env};
 
 use supabase_auth::models::{
-    AuthClient, DesktopResendParams, LogoutScope, ResendParams, SignInWithOAuthOptions,
-    UpdateUserPayload,
+    AuthClient, DesktopResendParams, LogoutScope, ResendParams, SSOSignInOptions, SSOSuccess,
+    SignInWithOAuthOptions, SignInWithSSO, UpdateUserPayload,
 };
 
 fn create_test_client() -> AuthClient {
@@ -24,7 +24,7 @@ async fn test_login_with_email() {
     let demo_password = "qwerqwer";
 
     let session = auth_client
-        .sign_in_with_email_and_password(demo_email.as_ref(), demo_password)
+        .login_with_email(demo_email.as_ref(), demo_password)
         .await
         .unwrap();
 
@@ -39,7 +39,7 @@ async fn test_login_with_email_invalid() {
     let demo_password = "invalid";
 
     let session = auth_client
-        .sign_in_with_email_and_password(demo_email, demo_password)
+        .login_with_email(demo_email, demo_password)
         .await;
 
     assert!(session.is_err())
@@ -147,7 +147,7 @@ async fn sign_in_with_oauth_test() {
     let demo_password = "qwerqwer";
 
     let session = auth_client
-        .sign_in_with_email_and_password(demo_email.as_ref(), demo_password)
+        .login_with_email(demo_email.as_ref(), demo_password)
         .await;
 
     if session.is_err() {
@@ -185,7 +185,7 @@ async fn sign_in_with_oauth_no_options_test() {
     let demo_password = "qwerqwer";
 
     let session = auth_client
-        .sign_in_with_email_and_password(demo_email.as_ref(), demo_password)
+        .login_with_email(demo_email.as_ref(), demo_password)
         .await;
 
     if session.is_err() {
@@ -217,7 +217,7 @@ async fn get_user_test() {
     let demo_password = "qwerqwer";
 
     let session = auth_client
-        .sign_in_with_email_and_password(demo_email.as_ref(), demo_password)
+        .login_with_email(demo_email.as_ref(), demo_password)
         .await;
 
     if session.is_err() {
@@ -241,7 +241,7 @@ async fn update_user_test() {
     let demo_password = "qwerqwer";
 
     let session = auth_client
-        .sign_in_with_email_and_password(demo_email.as_ref(), demo_password)
+        .login_with_email(demo_email.as_ref(), demo_password)
         .await;
 
     if session.is_err() {
@@ -266,7 +266,7 @@ async fn update_user_test() {
     let test_password = "qqqqwwww";
 
     let new_session = auth_client
-        .sign_in_with_email_and_password(demo_email.as_ref(), test_password)
+        .login_with_email(demo_email.as_ref(), test_password)
         .await;
 
     if new_session.is_err() {
@@ -295,7 +295,7 @@ async fn exchange_token_for_session() {
     let demo_password = "qwerqwer";
 
     let original_session = auth_client
-        .sign_in_with_email_and_password(demo_email.as_ref(), demo_password)
+        .login_with_email(demo_email.as_ref(), demo_password)
         .await
         .unwrap();
 
@@ -360,7 +360,7 @@ async fn logout_test() {
     let demo_password = "qwerqwer";
 
     let session = auth_client
-        .sign_in_with_email_and_password(demo_email, demo_password.to_string())
+        .login_with_email(demo_email, demo_password.to_string())
         .await
         .unwrap();