refactor: use graphql(skip) to omit field in graphql response

ee/tabby-webserver/graphql/schema.graphql

@@ -267,7 +267,6 @@ enum LicenseType {
 type OAuthCredential {
   provider: OAuthProvider!
   clientId: String!
-  clientSecret: String
   createdAt: DateTimeUtc!
   updatedAt: DateTimeUtc!
 }

ee/tabby-webserver/src/oauth/github.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use anyhow::{anyhow, Result};
+use anyhow::Result;
 use async_trait::async_trait;
 use serde::Deserialize;
 
@@ -63,9 +63,7 @@ impl GithubClient {
         code: String,
         credential: OAuthCredential,
     ) -> Result<GithubOAuthResponse> {
-        let Some(client_secret) = credential.client_secret else {
-            return Err(anyhow!("No client_secret present"));
-        };
+        let client_secret = credential.client_secret;
 
         let params = [
             ("client_id", credential.client_id.as_str()),

ee/tabby-webserver/src/oauth/google.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use anyhow::{anyhow, Result};
+use anyhow::Result;
 use async_trait::async_trait;
 use serde::Deserialize;
 
@@ -65,9 +65,7 @@ impl GoogleClient {
         credential: OAuthCredential,
         redirect_uri: String,
     ) -> Result<GoogleOAuthResponse> {
-        let Some(client_secret) = credential.client_secret else {
-            return Err(anyhow!("No client_secret present"));
-        };
+        let client_secret = credential.client_secret;
 
         let params = [
             ("client_id", credential.client_id.as_str()),

ee/tabby-webserver/src/schema/auth.rs

@@ -370,7 +370,8 @@ pub struct OAuthCredential {
     pub provider: OAuthProvider,
     pub client_id: String,
 
-    pub client_secret: Option<String>,
+    #[graphql(skip)]
+    pub client_secret: String,
     pub created_at: DateTime<Utc>,
     pub updated_at: DateTime<Utc>,
 }

ee/tabby-webserver/src/schema/mod.rs

@@ -348,14 +348,7 @@ impl Query {
         provider: OAuthProvider,
     ) -> Result<Option<OAuthCredential>> {
         check_admin(ctx).await?;
-        let Some(mut credentials) = ctx.locator.auth().read_oauth_credential(provider).await?
-        else {
-            return Ok(None);
-        };
-
-        // Client secret is not visible from GraphQL api.
-        credentials.client_secret = None;
-        Ok(Some(credentials))
+        ctx.locator.auth().read_oauth_credential(provider).await
     }
 
     async fn oauth_callback_url(ctx: &Context, provider: OAuthProvider) -> Result<String> {

ee/tabby-webserver/src/service/auth.rs

@@ -1394,6 +1394,6 @@ mod tests {
             .unwrap();
         assert_eq!(cred.provider, OAuthProvider::Google);
         assert_eq!(cred.client_id, "id");
-        assert_eq!(cred.client_secret, Some("secret".into()));
+        assert_eq!(cred.client_secret, "secret");
     }
 }

ee/tabby-webserver/src/service/dao.rs

@@ -67,7 +67,7 @@ impl TryFrom<OAuthCredentialDAO> for OAuthCredential {
             client_id: val.client_id,
             created_at: *val.created_at,
             updated_at: *val.updated_at,
-            client_secret: Some(val.client_secret),
+            client_secret: val.client_secret,
         })
     }
 }