fix(webserver): /resolve/all should read from RepositoryService (#1796)

TabbyML · Apr 9, 2024 · f628f5c · f628f5c
1 parent e111769
commit f628f5c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/ee/tabby-webserver/src/repositories/mod.rs b/ee/tabby-webserver/src/repositories/mod.rs
@@ -87,5 +87,5 @@ async fn meta(
 }
 
 async fn resolve(State(rs): State<Arc<ResolveState>>) -> Result<Response, StatusCode> {
-    rs.resolve_all().map_err(|_| StatusCode::NOT_FOUND)
+    rs.resolve_all().await.map_err(|_| StatusCode::NOT_FOUND)
 }
diff --git a/ee/tabby-webserver/src/repositories/resolve.rs b/ee/tabby-webserver/src/repositories/resolve.rs
@@ -264,15 +264,17 @@ impl RepositoryCache {
         None
     }
 
-    pub fn resolve_all(&self) -> Result<Response> {
-        let entries: Vec<_> = self
-            .repository_lookup
-            .read()
-            .unwrap()
-            .keys()
+    pub async fn resolve_all(&self) -> Result<Response> {
+        let repositories = self
+            .service
+            .list_repositories(None, None, None, None)
+            .await?;
+
+        let entries = repositories
+            .into_iter()
             .map(|repo| DirEntry {
                 kind: DirEntryKind::Dir,
-                basename: repo.repo_name.clone(),
+                basename: repo.name.clone(),
             })
             .collect();