fix: Remove unnecessary oauth type

Author: lakinwecker

snowflake-api/src/requests.rs

@@ -16,7 +16,6 @@ pub struct LoginRequest<T> {
 
 pub type PasswordLoginRequest = LoginRequest<PasswordRequestData>;
 pub type OAuthLoginRequest = LoginRequest<OAuthRequestData>;
-pub type SPCSOAuthLoginRequest = LoginRequest<SPCSOAuthRequestData>;
 #[cfg(feature = "cert-auth")]
 pub type CertLoginRequest = LoginRequest<CertRequestData>;
 
@@ -65,15 +64,6 @@ pub struct OAuthRequestData {
     pub authenticator: String,
 }
 
-#[derive(Serialize, Debug)]
-#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
-pub struct SPCSOAuthRequestData {
-    #[serde(flatten)]
-    pub login_request_common: LoginRequestCommon,
-    pub token: String,
-    pub authenticator: String,
-}
-
 #[derive(Serialize, Debug)]
 #[serde(rename_all = "SCREAMING_SNAKE_CASE")]
 pub struct CertRequestData {

snowflake-api/src/session.rs

@@ -14,8 +14,7 @@ use crate::connection::{Connection, QueryType};
 use crate::requests::{CertLoginRequest, CertRequestData};
 use crate::requests::{
     ClientEnvironment, LoginRequest, LoginRequestCommon, OAuthLoginRequest, OAuthRequestData,
-    PasswordLoginRequest, PasswordRequestData, RenewSessionRequest, SPCSOAuthLoginRequest,
-    SPCSOAuthRequestData, SessionParameters,
+    PasswordLoginRequest, PasswordRequestData, RenewSessionRequest, SessionParameters,
 };
 use crate::responses::AuthResponse;
 
@@ -457,8 +456,15 @@ impl Session {
     }
 
     async fn spcs_create(&self) -> Result<AuthTokens, AuthError> {
+        // We should wait until we are ready to send the request
+        // before we read the token, as it expires after 10 minutes
         let token = fs::read_to_string("/snowflake/session/token")
             .map_err(|_| AuthError::MissingSPCSOAuthToken)?;
+
+        // fixme: I am not sure if waiting until now to read all of these
+        //        is necessary or not, but I figured I would allow the user
+        //        to override these on instantiation and only replace the
+        //        user provided ones with the env provides ones if necessary
         let warehouse = self
             .warehouse
             .clone()
@@ -470,8 +476,8 @@ impl Session {
         let schema = self.warehouse.clone().or(env::var("SNOWFLAKE_SCHEMA").ok());
         let role = self.warehouse.clone().or(env::var("SNOWFLAKE_ROLE").ok());
 
-        let body = SPCSOAuthLoginRequest {
-            data: SPCSOAuthRequestData {
+        let body = OAuthLoginRequest {
+            data: OAuthRequestData {
                 login_request_common: self.login_request_common(),
                 token,
                 authenticator: "OAUTH".to_string(),