feat(sync): support self-managed GitLab snippets
This commit is contained in:
18 files changed
+734
-98
No files matched your search
@@ -7,9 +7,9 @@ use dbx_core::cloud_sync::{
|
||||
forget_snippet_token, forget_webdav_password,
|
||||
forget_webdav_sync_secrets_passphrase as core_forget_webdav_sync_secrets_passphrase, resolve_snippet_token,
|
||||
resolve_webdav_password, resolve_webdav_sync_secrets_passphrase, retry_pending_snippet_cleanup,
|
||||
save_snippet_sync_id as core_save_snippet_sync_id, save_snippet_token, save_webdav_password,
|
||||
save_snippet_sync_id_for_instance as core_save_snippet_sync_id, save_snippet_token, save_webdav_password,
|
||||
save_webdav_sync_secrets_preference as core_save_webdav_sync_secrets_preference, snippet_saved_token_status,
|
||||
snippet_sync_settings as core_snippet_sync_settings, webdav_saved_password_status,
|
||||
snippet_sync_settings_for_instance as core_snippet_sync_settings, webdav_saved_password_status,
|
||||
webdav_sync_secrets_status as core_webdav_sync_secrets_status, ApplySnapshotOptions, ApplySnapshotSummary,
|
||||
SnippetProvider, SnippetSyncClient, SnippetSyncConfig, SnippetSyncSettings, SnippetSyncSummary, SnippetTokenStatus,
|
||||
WebDavClient, WebDavConfig, WebDavPasswordStatus, WebDavSyncSecretsStatus, WebDavSyncSummary,
|
||||
@@ -111,12 +111,14 @@ pub struct SnippetDownloadRequest {
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct SnippetSyncSettingsRequest {
|
||||
pub provider: SnippetProvider,
|
||||
pub instance_url: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct SaveSnippetSyncIdRequest {
|
||||
pub provider: SnippetProvider,
|
||||
pub instance_url: Option<String>,
|
||||
pub snippet_id: Option<String>,
|
||||
}
|
||||
|
||||
@@ -224,7 +226,7 @@ pub async fn snippet_sync_test(
|
||||
Json(mut req): Json<SnippetConfigRequest>,
|
||||
) -> Result<Json<()>, AppError> {
|
||||
resolve_snippet_token(&state.app.storage, &mut req.config).await.map_err(AppError::from)?;
|
||||
SnippetSyncClient::new(req.config).test().await.map_err(AppError::from)?;
|
||||
SnippetSyncClient::new(req.config).map_err(AppError::from)?.test().await.map_err(AppError::from)?;
|
||||
Ok(Json(()))
|
||||
}
|
||||
|
||||
@@ -255,14 +257,17 @@ pub async fn snippet_sync_settings(
|
||||
State(state): State<Arc<WebState>>,
|
||||
Json(req): Json<SnippetSyncSettingsRequest>,
|
||||
) -> Result<Json<SnippetSyncSettings>, AppError> {
|
||||
core_snippet_sync_settings(&state.app.storage, req.provider).await.map(Json).map_err(AppError::from)
|
||||
core_snippet_sync_settings(&state.app.storage, req.provider, req.instance_url.as_deref())
|
||||
.await
|
||||
.map(Json)
|
||||
.map_err(AppError::from)
|
||||
}
|
||||
|
||||
pub async fn save_snippet_sync_id(
|
||||
State(state): State<Arc<WebState>>,
|
||||
Json(req): Json<SaveSnippetSyncIdRequest>,
|
||||
) -> Result<Json<()>, AppError> {
|
||||
core_save_snippet_sync_id(&state.app.storage, req.provider, req.snippet_id.as_deref())
|
||||
core_save_snippet_sync_id(&state.app.storage, req.provider, req.instance_url.as_deref(), req.snippet_id.as_deref())
|
||||
.await
|
||||
.map_err(AppError::from)?;
|
||||
Ok(Json(()))
|
||||
@@ -274,7 +279,7 @@ pub async fn retry_snippet_legacy_cleanup(
|
||||
) -> Result<Json<SnippetSyncSettings>, AppError> {
|
||||
resolve_snippet_token(&state.app.storage, &mut req.config).await.map_err(AppError::from)?;
|
||||
let provider = req.config.provider;
|
||||
let client = SnippetSyncClient::new(req.config);
|
||||
let client = SnippetSyncClient::new(req.config).map_err(AppError::from)?;
|
||||
retry_pending_snippet_cleanup(&state.app.storage, provider, &client).await.map(Json).map_err(AppError::from)
|
||||
}
|
||||
|
||||
@@ -298,7 +303,7 @@ pub async fn snippet_sync_upload(
|
||||
build_sync_snapshot(&state.app.storage, env!("CARGO_PKG_VERSION"), req.editor_settings, secrets_passphrase)
|
||||
.await
|
||||
.map_err(AppError::from)?;
|
||||
let client = SnippetSyncClient::new(req.config);
|
||||
let client = SnippetSyncClient::new(req.config).map_err(AppError::from)?;
|
||||
let mut summary = client
|
||||
.put_snapshot(&snapshot, req.snippet_passphrase.as_deref(), secrets_passphrase)
|
||||
.await
|
||||
@@ -313,6 +318,7 @@ pub async fn snippet_sync_download(
|
||||
) -> Result<Json<SnippetDownloadResult>, AppError> {
|
||||
resolve_snippet_token(&state.app.storage, &mut req.config).await.map_err(AppError::from)?;
|
||||
let (snapshot, summary) = SnippetSyncClient::new(req.config)
|
||||
.map_err(AppError::from)?
|
||||
.get_snapshot(req.snippet_passphrase.as_deref())
|
||||
.await
|
||||
.map_err(AppError::from)?;
|
||||
@@ -360,7 +366,7 @@ mod tests {
|
||||
let state = Arc::new(WebState::for_tests(app, dir.clone()));
|
||||
let Json(settings) = super::snippet_sync_settings(
|
||||
State(state),
|
||||
Json(super::SnippetSyncSettingsRequest { provider: SnippetProvider::GitHub }),
|
||||
Json(super::SnippetSyncSettingsRequest { provider: SnippetProvider::GitHub, instance_url: None }),
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
Reference in new issue
Block a user