fix(webserver): allow setting only display name when updating provide…

…rs (#2077) * fix(webserver): allow setting only display name when updating providers * [autofix.ci] apply automated fixes * Update ee/tabby-db/src/gitlab_repository_provider.rs --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
TabbyML · May 9, 2024 · e62d2ad · e62d2ad
1 parent 4793c82
commit e62d2ad
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 8 deletions.
diff --git a/ee/tabby-db/src/github_repository_provider.rs b/ee/tabby-db/src/github_repository_provider.rs
@@ -59,8 +59,13 @@ impl DbConn {
         &self,
         id: i64,
         display_name: String,
-        access_token: String,
+        access_token: Option<String>,
     ) -> Result<()> {
+        let access_token = match access_token {
+            Some(access_token) => Some(access_token),
+            None => self.get_github_provider(id).await?.access_token,
+        };
+
         let res = query!(
             "UPDATE github_repository_provider SET display_name = ?, access_token=? WHERE id = ?;",
             display_name,

diff --git a/ee/tabby-db/src/gitlab_repository_provider.rs b/ee/tabby-db/src/gitlab_repository_provider.rs
@@ -59,8 +59,13 @@ impl DbConn {
         &self,
         id: i64,
         display_name: String,
-        access_token: String,
+        access_token: Option<String>,
     ) -> Result<()> {
+        let access_token = match access_token {
+            Some(access_token) => Some(access_token),
+            None => self.get_gitlab_provider(id).await?.access_token,
+        };
+
         let res = query!(
             "UPDATE gitlab_repository_provider SET display_name = ?, access_token=? WHERE id = ?;",
             display_name,

diff --git a/ee/tabby-schema/graphql/schema.graphql b/ee/tabby-schema/graphql/schema.graphql
@@ -125,7 +125,7 @@ input UpdateOAuthCredentialInput {
 input UpdateRepositoryProviderInput {
   id: ID!
   displayName: String!
-  accessToken: String!
+  accessToken: String
 }
 
 """

diff --git a/ee/tabby-schema/src/schema/repository/github.rs b/ee/tabby-schema/src/schema/repository/github.rs
@@ -70,7 +70,7 @@ pub trait GithubRepositoryService: Send + Sync + RepositoryProvider {
         &self,
         id: ID,
         display_name: String,
-        access_token: String,
+        access_token: Option<String>,
     ) -> Result<()>;
 
     async fn list_providers(

diff --git a/ee/tabby-schema/src/schema/repository/gitlab.rs b/ee/tabby-schema/src/schema/repository/gitlab.rs
@@ -70,7 +70,7 @@ pub trait GitlabRepositoryService: Send + Sync + RepositoryProvider {
         &self,
         id: ID,
         display_name: String,
-        access_token: String,
+        access_token: Option<String>,
     ) -> Result<()>;
 
     async fn list_providers(

diff --git a/ee/tabby-schema/src/schema/repository/types.rs b/ee/tabby-schema/src/schema/repository/types.rs
@@ -23,7 +23,7 @@ pub struct UpdateRepositoryProviderInput {
     ))]
     pub display_name: String,
     #[validate(length(code = "accessToken", min = 10, message = "Invalid access token"))]
-    pub access_token: String,
+    pub access_token: Option<String>,
 }
 
 #[derive(GraphQLEnum, Debug, PartialEq)]

diff --git a/ee/tabby-webserver/src/service/repository/github.rs b/ee/tabby-webserver/src/service/repository/github.rs
@@ -106,7 +106,7 @@ impl GithubRepositoryService for GithubRepositoryProviderServiceImpl {
         &self,
         id: ID,
         display_name: String,
-        access_token: String,
+        access_token: Option<String>,
     ) -> Result<()> {
         let id = id.as_rowid()?;
         self.db

diff --git a/ee/tabby-webserver/src/service/repository/gitlab.rs b/ee/tabby-webserver/src/service/repository/gitlab.rs
@@ -106,7 +106,7 @@ impl GitlabRepositoryService for GitlabRepositoryProviderServiceImpl {
         &self,
         id: ID,
         display_name: String,
-        access_token: String,
+        access_token: Option<String>,
     ) -> Result<()> {
         let id = id.as_rowid()?;
         self.db