diff --git a/libs/client-api/src/http_publish.rs b/libs/client-api/src/http_publish.rs index 846fd020..2aab7acd 100644 --- a/libs/client-api/src/http_publish.rs +++ b/libs/client-api/src/http_publish.rs @@ -29,6 +29,25 @@ impl Client { AppResponse::<()>::from_response(resp).await?.into_error() } + pub async fn get_workspace_publish_namespace( + &self, + workspace_id: &str, + ) -> Result { + let url = format!( + "{}/api/workspace/{}/publish-namespace", + self.base_url, workspace_id + ); + let resp = self + .http_client_with_auth(Method::GET, &url) + .await? + .get(&url) + .send() + .await?; + AppResponse::::from_response(resp) + .await? + .into_data() + } + pub async fn publish_collab( &self, workspace_id: &str, @@ -95,20 +114,6 @@ impl Client { // Guest API (no login required) impl Client { - pub async fn get_workspace_publish_namespace( - &self, - workspace_id: &str, - ) -> Result { - let url = format!( - "{}/api/workspace/{}/publish-namespace", - self.base_url, workspace_id - ); - let resp = self.cloud_client.get(&url).send().await?; - AppResponse::::from_response(resp) - .await? - .into_data() - } - pub async fn get_published_collab( &self, publish_namespace: &str, diff --git a/src/api/workspace.rs b/src/api/workspace.rs index 0ecbd40b..734f4c2a 100644 --- a/src/api/workspace.rs +++ b/src/api/workspace.rs @@ -959,7 +959,7 @@ async fn get_publish_namespace_handler( ) -> Result>> { let workspace_id = workspace_id.into_inner(); let namespace = - biz::workspace::ops::get_workspace_namespace(&state.pg_pool, &workspace_id).await?; + biz::workspace::ops::get_workspace_publish_namespace(&state.pg_pool, &workspace_id).await?; Ok(Json(AppResponse::Ok().with_data(namespace))) } diff --git a/src/biz/workspace/ops.rs b/src/biz/workspace/ops.rs index 4f53333b..05c2530a 100644 --- a/src/biz/workspace/ops.rs +++ b/src/biz/workspace/ops.rs @@ -135,7 +135,7 @@ pub async fn set_workspace_namespace( Ok(()) } -pub async fn get_workspace_namespace( +pub async fn get_workspace_publish_namespace( pg_pool: &PgPool, workspace_id: &Uuid, ) -> Result { diff --git a/tests/workspace/publish.rs b/tests/workspace/publish.rs index 4fc472f9..4c5bb7a8 100644 --- a/tests/workspace/publish.rs +++ b/tests/workspace/publish.rs @@ -12,13 +12,7 @@ async fn test_set_publish_namespace_set() { .await .err() .unwrap(); - - if format!("{:?}", err.code) != "PublishNamespaceNotSet" { - panic!( - "Expected PublishNamespaceNotSet, got: code {:?}, message {:?}", - err.code, err.message - ); - } + assert_eq!(format!("{:?}", err.code), "PublishNamespaceNotSet"); } let namespace = uuid::Uuid::new_v4().to_string();