refactor(webserver): always use schema::Result for graphql api responses

ee/tabby-webserver/src/juniper/relay/mod.rs

@@ -1,6 +1,6 @@
 use std::future::Future;
 
-use juniper::FieldResult;
+use anyhow::anyhow;
 
 mod connection;
 mod edge;
@@ -10,25 +10,33 @@
 pub use connection::Connection;
 pub use node_type::NodeType;
 
+use crate::schema;
+
 fn validate_first_last(
     first: Option<i32>,
     last: Option<i32>,
-) -> FieldResult<(Option<usize>, Option<usize>)> {
+) -> schema::Result<(Option<usize>, Option<usize>)> {
     if first.is_some() && last.is_some() {
-        return Err("The \"first\" and \"last\" parameters cannot exist at the same time".into());
+        Err(anyhow!(
+            "The \"first\" and \"last\" parameters cannot exist at the same time"
+        ))?;
     }
 
     let first = match first {
         Some(first) if first < 0 => {
-            return Err("The \"first\" parameter must be a non-negative number".into());
+            return Err(anyhow!(
+                "The \"first\" parameter must be a non-negative number"
+            ))?;
         }
         Some(first) => Some(first as usize),
         None => None,
     };
 
     let last = match last {
         Some(last) if last < 0 => {
-            return Err("The \"last\" parameter must be a non-negative number".into());
+            return Err(anyhow!(
+                "The \"last\" parameter must be a non-negative number"
+            ))?;
         }
         Some(last) => Some(last as usize),
         None => None,
@@ -43,15 +51,15 @@
     first: Option<i32>,
     last: Option<i32>,
     f: F,
-) -> FieldResult<Connection<Node>>
+) -> schema::Result<Connection<Node>>
 where
     Node: NodeType + Sync,
     F: FnOnce(
         Option<String>,
         Option<String>,
         Option<usize>,
         Option<usize>,
-    ) -> FieldResult<Vec<Node>>,
+    ) -> schema::Result<Vec<Node>>,
 {
     let (first, last) = validate_first_last(first, last)?;
 
@@ -75,11 +83,11 @@
     first: Option<i32>,
     last: Option<i32>,
     f: F,
-) -> FieldResult<Connection<Node>>
+) -> schema::Result<Connection<Node>>
 where
     Node: NodeType + Sync,
     F: FnOnce(Option<String>, Option<String>, Option<usize>, Option<usize>) -> R,
-    R: Future<Output = FieldResult<Vec<Node>>>,
+    R: Future<Output = schema::Result<Vec<Node>>>,
 {
     let (first, last) = validate_first_last(first, last)?;
 

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

@@ -18,8 +18,8 @@
 use chrono::{DateTime, Utc};
 use job::{JobRun, JobService};
 use juniper::{
-    graphql_object, graphql_value, EmptySubscription, FieldError, FieldResult, GraphQLObject,
-    IntoFieldError, Object, RootNode, ScalarValue, Value, ID,
+    graphql_object, graphql_value, EmptySubscription, FieldError, GraphQLObject, IntoFieldError,
+    Object, RootNode, ScalarValue, Value, ID,
 };
 use tabby_common::api::{code::CodeSearch, event::EventLogger};
 use tracing::error;
@@ -182,23 +182,18 @@
         before: Option<String>,
         first: Option<i32>,
         last: Option<i32>,
-    ) -> FieldResult<Connection<User>> {
+    ) -> Result<Connection<User>> {
         check_admin(ctx).await?;
         return relay::query_async(
             after,
             before,
             first,
             last,
             |after, before, first, last| async move {
-                match ctx
-                    .locator
+                ctx.locator
                     .auth()
                     .list_users(after, before, first, last)
                     .await
-                {
-                    Ok(users) => Ok(users),
-                    Err(err) => Err(FieldError::from(err)),
-                }
             },
         )
         .await;
@@ -210,23 +205,18 @@
         before: Option<String>,
         first: Option<i32>,
         last: Option<i32>,
-    ) -> FieldResult<Connection<Invitation>> {
+    ) -> Result<Connection<Invitation>> {
         check_admin(ctx).await?;
         relay::query_async(
             after,
             before,
             first,
             last,
             |after, before, first, last| async move {
-                match ctx
-                    .locator
+                ctx.locator
                     .auth()
                     .list_invitations(after, before, first, last)
                     .await
-                {
-                    Ok(invitations) => Ok(invitations),
-                    Err(err) => Err(FieldError::from(err)),
-                }
             },
         )
         .await
@@ -238,19 +228,18 @@
         before: Option<String>,
         first: Option<i32>,
         last: Option<i32>,
-    ) -> FieldResult<Connection<GithubRepositoryProvider>> {
+    ) -> Result<Connection<GithubRepositoryProvider>> {
         check_admin(ctx).await?;
         relay::query_async(
             after,
             before,
             first,
             last,
             |after, before, first, last| async move {
-                Ok(ctx
-                    .locator
+                ctx.locator
                     .github_repository_provider()
                     .list_github_repository_providers(after, before, first, last)
-                    .await?)
+                    .await
             },
         )
         .await
@@ -263,16 +252,15 @@
         before: Option<String>,
         first: Option<i32>,
         last: Option<i32>,
-    ) -> FieldResult<Connection<GithubProvidedRepository>> {
+    ) -> Result<Connection<GithubProvidedRepository>> {
         check_admin(ctx).await?;
         relay::query_async(
             after,
             before,
             first,
             last,
             |after, before, first, last| async move {
-                Ok(ctx
-                    .locator
+                ctx.locator
                     .github_repository_provider()
                     .list_github_provided_repositories_by_provider(
                         provider_ids,
@@ -281,7 +269,7 @@
                         first,
                         last,
                     )
-                    .await?)
+                    .await
             },
         )
         .await
@@ -295,26 +283,25 @@
         before: Option<String>,
         first: Option<i32>,
         last: Option<i32>,
-    ) -> FieldResult<Connection<JobRun>> {
+    ) -> Result<Connection<JobRun>> {
         check_admin(ctx).await?;
         relay::query_async(
             after,
             before,
             first,
             last,
             |after, before, first, last| async move {
-                Ok(ctx
-                    .locator
+                ctx.locator
                     .job()
                     .list(ids, jobs, after, before, first, last)
-                    .await?)
+                    .await
             },
         )
         .await
     }
 
-    async fn job_run_stats(ctx: &Context, jobs: Option<Vec<String>>) -> FieldResult<JobStats> {
-        Ok(ctx.locator.job().compute_stats(jobs).await?)
+    async fn job_run_stats(ctx: &Context, jobs: Option<Vec<String>>) -> Result<JobStats> {
+        ctx.locator.job().compute_stats(jobs).await
     }
 
     async fn email_setting(ctx: &Context) -> Result<Option<EmailSetting>> {
@@ -345,19 +332,18 @@
         before: Option<String>,
         first: Option<i32>,
         last: Option<i32>,
-    ) -> FieldResult<Connection<Repository>> {
+    ) -> Result<Connection<Repository>> {
         check_admin(ctx).await?;
         relay::query_async(
             after,
             before,
             first,
             last,
             |after, before, first, last| async move {
-                Ok(ctx
-                    .locator
+                ctx.locator
                     .repository()
                     .list_repositories(after, before, first, last)
-                    .await?)
+                    .await
             },
         )
         .await
@@ -367,13 +353,12 @@
         ctx: &Context,
         repository_name: String,
         pattern: String,
-    ) -> FieldResult<Vec<FileEntrySearchResult>> {
+    ) -> Result<Vec<FileEntrySearchResult>> {
         check_claims(ctx)?;
-        Ok(ctx
-            .locator
+        ctx.locator
             .repository()
             .search_files(&repository_name, &pattern, 40)
-            .await?)
+            .await
     }
 
     async fn oauth_credential(

rules/use-schema-result.yml

@@ -5,8 +5,10 @@ language: rust
 files:
 - ./ee/tabby-webserver/src/schema/**
 rule:
-  pattern: anyhow
-  not:
-    inside:
-      kind: enum_variant
-      stopBy: end
+  any:
+    - pattern: anyhow
+      not:
+        inside:
+          kind: enum_variant
+          stopBy: end
+    - pattern: FieldResult