Apply suggestion, add back authentication middleware

TabbyML · Apr 10, 2024 · 6e33d34 · 6e33d34
1 parent 8b7b73d
commit 6e33d34
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/ee/tabby-webserver/src/handler.rs b/ee/tabby-webserver/src/handler.rs
@@ -86,7 +86,11 @@ impl WebserverHandle {
             )
             .nest(
                 "/integrations/github",
-                integrations::github::routes(ctx.setting(), ctx.github_repository_provider()),
+                integrations::github::routes(
+                    ctx.auth(),
+                    ctx.setting(),
+                    ctx.github_repository_provider(),
+                ),
             )
             .route(
                 "/avatar/:id",

diff --git a/ee/tabby-webserver/src/hub/mod.rs b/ee/tabby-webserver/src/hub/mod.rs
@@ -166,7 +166,7 @@ impl Hub for Arc<HubImpl> {
 
         let provider_service = self.ctx.github_repository_provider();
         let repository_providers = provider_service
-            .list_github_repository_providers(None, None, Some(1024), None)
+            .list_github_repository_providers(None, None, None, None)
             .await
             .unwrap_or_else(|e| {
                 warn!("Failed to fetch GitHub repository providers: {e}");
@@ -186,7 +186,7 @@ impl Hub for Arc<HubImpl> {
                     vec![provider.id.clone()],
                     None,
                     None,
-                    Some(1024),
+                    None,
                     None,
                 )
                 .await

diff --git a/ee/tabby-webserver/src/integrations/github.rs b/ee/tabby-webserver/src/integrations/github.rs
@@ -3,6 +3,7 @@ use std::sync::Arc;
 use anyhow::Result;
 use axum::{
     extract::{Path, Query, State},
+    middleware::from_fn_with_state,
     response::Redirect,
     routing, Router,
 };
@@ -12,8 +13,12 @@ use serde::Deserialize;
 use tracing::error;
 use url::Url;
 
-use crate::schema::{
-    github_repository_provider::GithubRepositoryProviderService, setting::SettingService,
+use crate::{
+    handler::require_login_middleware,
+    schema::{
+        auth::AuthenticationService, github_repository_provider::GithubRepositoryProviderService,
+        setting::SettingService,
+    },
 };
 
 #[derive(Debug, Deserialize)]
@@ -47,6 +52,7 @@ struct IntegrationState {
 }
 
 pub fn routes(
+    auth: Arc<dyn AuthenticationService>,
     settings: Arc<dyn SettingService>,
     github_repository_provider: Arc<dyn GithubRepositoryProviderService>,
 ) -> Router {
@@ -57,6 +63,7 @@ pub fn routes(
     Router::new()
         .route("/connect/:id", routing::get(connect))
         .route("/callback", routing::get(callback))
+        .layer(from_fn_with_state(auth, require_login_middleware))
         .with_state(state)
 }