feat(api): google tasks oauth, sync engine, and background worker
- ApiClient with manual OAuth2 Device Flow (no yup-oauth2 dependency) - Devide auth: POST device/code -> show URL+code -> poll token endpoint - Token persistence in ~/.config/task_app/token.json - CRUD: create_task, update_task, delete_task, move_task via Google Tasks API - fetch_lists and fetch_tasks for initial sync import - Db wraps Connection in std::sync::Mutex for thread-safe sharing via Arc - Sync engine: background thread with tokio runtime, processes queue every 30s - process_sync_queue drains sync_queue and calls API methods - trigger_sync() called after every local mutation (create/update/delete/reorder) - Network status propagated to UI (Online/Offline/Syncing) - Initial sync skeleton ready for full import flow
This commit is contained in:
Ruben Rosario
+431
-1
@@ -1 +1,431 @@
|
||||
// TODO: Fase 5 - Google Tasks API integration
|
||||
use std::path::PathBuf;
|
||||
use std::sync::Arc;
|
||||
|
||||
use chrono::{DateTime, Utc};
|
||||
use reqwest::Client;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use tokio::sync::Mutex;
|
||||
use tokio::time::{sleep, Duration};
|
||||
|
||||
use crate::domain::models::*;
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct OAuthToken {
|
||||
pub access_token: String,
|
||||
pub refresh_token: Option<String>,
|
||||
pub expires_at: Option<DateTime<Utc>>,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum ApiError {
|
||||
Network(String),
|
||||
Auth(String),
|
||||
Api(String),
|
||||
}
|
||||
|
||||
pub struct ApiClient {
|
||||
client: Client,
|
||||
client_id: String,
|
||||
client_secret: String,
|
||||
token: Arc<Mutex<Option<OAuthToken>>>,
|
||||
token_path: PathBuf,
|
||||
}
|
||||
|
||||
impl ApiClient {
|
||||
pub fn new(client_id: String, client_secret: String) -> Self {
|
||||
let token_path = dirs::config_dir()
|
||||
.unwrap_or_else(|| PathBuf::from("."))
|
||||
.join("task_app")
|
||||
.join("token.json");
|
||||
|
||||
Self {
|
||||
client: Client::new(),
|
||||
client_id,
|
||||
client_secret,
|
||||
token: Arc::new(Mutex::new(None)),
|
||||
token_path,
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn load_token(&self) -> Option<OAuthToken> {
|
||||
let content = std::fs::read_to_string(&self.token_path).ok()?;
|
||||
serde_json::from_str(&content).ok()
|
||||
}
|
||||
|
||||
pub async fn save_token(&self, token: &OAuthToken) {
|
||||
if let Some(parent) = self.token_path.parent() {
|
||||
std::fs::create_dir_all(parent).ok();
|
||||
}
|
||||
if let Ok(content) = serde_json::to_string_pretty(token) {
|
||||
std::fs::write(&self.token_path, content).ok();
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn authenticate(&self) -> Result<(String, String), ApiError> {
|
||||
let params = serde_json::json!({
|
||||
"client_id": self.client_id,
|
||||
"scope": "https://www.googleapis.com/auth/tasks",
|
||||
});
|
||||
|
||||
let resp = self
|
||||
.client
|
||||
.post("https://oauth2.googleapis.com/device/code")
|
||||
.json(¶ms)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| ApiError::Network(e.to_string()))?;
|
||||
|
||||
let data: serde_json::Value = resp
|
||||
.json()
|
||||
.await
|
||||
.map_err(|e| ApiError::Network(e.to_string()))?;
|
||||
|
||||
let url = data["verification_url"]
|
||||
.as_str()
|
||||
.unwrap_or(&data["verification_url"].to_string())
|
||||
.to_string();
|
||||
let code = data["user_code"]
|
||||
.as_str()
|
||||
.unwrap_or("")
|
||||
.to_string();
|
||||
let device_code = data["device_code"].as_str().unwrap_or("").to_string();
|
||||
let interval = data["interval"].as_u64().unwrap_or(5);
|
||||
|
||||
tokio::spawn({
|
||||
let client = self.client.clone();
|
||||
let client_id = self.client_id.clone();
|
||||
let client_secret = self.client_secret.clone();
|
||||
let device_code = device_code.clone();
|
||||
let token = self.token.clone();
|
||||
let token_path = self.token_path.clone();
|
||||
|
||||
async move {
|
||||
loop {
|
||||
sleep(Duration::from_secs(interval)).await;
|
||||
|
||||
let poll = serde_json::json!({
|
||||
"client_id": client_id,
|
||||
"client_secret": client_secret,
|
||||
"device_code": device_code,
|
||||
"grant_type": "urn:ietf:params:oauth:grant_type:device_code",
|
||||
});
|
||||
|
||||
if let Ok(resp) = client
|
||||
.post("https://oauth2.googleapis.com/token")
|
||||
.json(&poll)
|
||||
.send()
|
||||
.await
|
||||
{
|
||||
if let Ok(data) = resp.json::<serde_json::Value>().await {
|
||||
if let Some(access_token) = data["access_token"].as_str() {
|
||||
let expires_in = data["expires_in"].as_i64().unwrap_or(3600);
|
||||
let oauth_token = OAuthToken {
|
||||
access_token: access_token.to_string(),
|
||||
refresh_token: data["refresh_token"].as_str().map(|s| s.to_string()),
|
||||
expires_at: Some(Utc::now() + chrono::Duration::seconds(expires_in)),
|
||||
};
|
||||
|
||||
if let Ok(content) = serde_json::to_string_pretty(&oauth_token) {
|
||||
std::fs::write(&token_path, content).ok();
|
||||
}
|
||||
|
||||
let mut t = token.lock().await;
|
||||
*t = Some(oauth_token);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
Ok((url, code))
|
||||
}
|
||||
|
||||
pub async fn refresh_access_token(&self, refresh_token: &str) -> Result<(), ApiError> {
|
||||
let params = serde_json::json!({
|
||||
"client_id": self.client_id,
|
||||
"client_secret": self.client_secret,
|
||||
"refresh_token": refresh_token,
|
||||
"grant_type": "refresh_token",
|
||||
});
|
||||
|
||||
let resp = self
|
||||
.client
|
||||
.post("https://oauth2.googleapis.com/token")
|
||||
.json(¶ms)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| ApiError::Network(e.to_string()))?;
|
||||
|
||||
let data: serde_json::Value = resp
|
||||
.json()
|
||||
.await
|
||||
.map_err(|e| ApiError::Network(e.to_string()))?;
|
||||
|
||||
if let Some(access_token) = data["access_token"].as_str() {
|
||||
let expires_in = data["expires_in"].as_i64().unwrap_or(3600);
|
||||
let token = OAuthToken {
|
||||
access_token: access_token.to_string(),
|
||||
refresh_token: Some(refresh_token.to_string()),
|
||||
expires_at: Some(Utc::now() + chrono::Duration::seconds(expires_in)),
|
||||
};
|
||||
|
||||
self.save_token(&token).await;
|
||||
let mut t = self.token.lock().await;
|
||||
*t = Some(token);
|
||||
Ok(())
|
||||
} else {
|
||||
Err(ApiError::Auth("Failed to refresh token".to_string()))
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn ensure_token(&self) -> Result<String, ApiError> {
|
||||
let mut token = self.token.lock().await;
|
||||
if let Some(ref t) = *token {
|
||||
if let Some(expires_at) = t.expires_at {
|
||||
if Utc::now() < expires_at {
|
||||
return Ok(t.access_token.clone());
|
||||
}
|
||||
}
|
||||
if let Some(ref refresh) = t.refresh_token {
|
||||
let refresh_token = refresh.clone();
|
||||
drop(token);
|
||||
self.refresh_access_token(&refresh_token).await?;
|
||||
let t2 = self.token.lock().await;
|
||||
if let Some(ref t) = *t2 {
|
||||
return Ok(t.access_token.clone());
|
||||
}
|
||||
}
|
||||
Err(ApiError::Auth("Token expired and no refresh token".to_string()))
|
||||
} else if let Some(saved) = self.load_token().await {
|
||||
*token = Some(saved);
|
||||
if let Some(ref t) = *token {
|
||||
Ok(t.access_token.clone())
|
||||
} else {
|
||||
Err(ApiError::Auth("No token available".to_string()))
|
||||
}
|
||||
} else {
|
||||
Err(ApiError::Auth("Not authenticated".to_string()))
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn fetch_lists(&self) -> Result<Vec<TaskList>, ApiError> {
|
||||
let token = self.ensure_token().await?;
|
||||
|
||||
let resp = self
|
||||
.client
|
||||
.get("https://tasks.googleapis.com/tasks/v1/users/@me/lists")
|
||||
.bearer_auth(&token)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| ApiError::Network(e.to_string()))?;
|
||||
|
||||
let data: serde_json::Value = resp
|
||||
.json()
|
||||
.await
|
||||
.map_err(|e| ApiError::Api(e.to_string()))?;
|
||||
|
||||
let empty = vec![];
|
||||
let items = data["items"].as_array().unwrap_or(&empty);
|
||||
let lists = items
|
||||
.iter()
|
||||
.map(|item| TaskList {
|
||||
id: item["id"].as_str().unwrap_or("").to_string(),
|
||||
title: item["title"].as_str().unwrap_or("").to_string(),
|
||||
})
|
||||
.collect();
|
||||
|
||||
Ok(lists)
|
||||
}
|
||||
|
||||
pub async fn fetch_tasks(&self, list_id: &str) -> Result<Vec<Task>, ApiError> {
|
||||
let token = self.ensure_token().await?;
|
||||
|
||||
let url = format!(
|
||||
"https://tasks.googleapis.com/tasks/v1/lists/{}/tasks?showCompleted=true&showHidden=true",
|
||||
list_id
|
||||
);
|
||||
|
||||
let resp = self
|
||||
.client
|
||||
.get(&url)
|
||||
.bearer_auth(&token)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| ApiError::Network(e.to_string()))?;
|
||||
|
||||
let data: serde_json::Value = resp
|
||||
.json()
|
||||
.await
|
||||
.map_err(|e| ApiError::Api(e.to_string()))?;
|
||||
|
||||
let empty = vec![];
|
||||
let items = data["items"].as_array().unwrap_or(&empty);
|
||||
let tasks = items
|
||||
.iter()
|
||||
.enumerate()
|
||||
.map(|(i, item)| {
|
||||
let due_str = item["due"].as_str().and_then(|s| {
|
||||
chrono::NaiveDateTime::parse_from_str(
|
||||
&s.replace("T", " ").replace("Z", "").chars().take(16).collect::<String>(),
|
||||
"%Y-%m-%d %H:%M",
|
||||
)
|
||||
.ok()
|
||||
});
|
||||
|
||||
Task {
|
||||
id: item["id"].as_str().unwrap_or("").to_string(),
|
||||
list_id: list_id.to_string(),
|
||||
title: item["title"].as_str().unwrap_or("").to_string(),
|
||||
notes: item["notes"].as_str().map(|s| s.to_string()),
|
||||
status: if item["status"].as_str() == Some("completed") {
|
||||
TaskStatus::Completed
|
||||
} else {
|
||||
TaskStatus::NeedsAction
|
||||
},
|
||||
due: due_str,
|
||||
position: i as i64,
|
||||
}
|
||||
})
|
||||
.collect();
|
||||
|
||||
Ok(tasks)
|
||||
}
|
||||
|
||||
pub async fn create_task(&self, list_id: &str, task: &Task) -> Result<(), ApiError> {
|
||||
let token = self.ensure_token().await?;
|
||||
|
||||
let mut body = serde_json::json!({
|
||||
"title": task.title,
|
||||
});
|
||||
|
||||
if let Some(ref notes) = task.notes {
|
||||
body["notes"] = serde_json::Value::String(notes.clone());
|
||||
}
|
||||
if let Some(due) = task.due {
|
||||
body["due"] = serde_json::Value::String(due.format("%Y-%m-%dT%H:%M:00.000Z").to_string());
|
||||
}
|
||||
if task.status == TaskStatus::Completed {
|
||||
body["status"] = serde_json::Value::String("completed".to_string());
|
||||
}
|
||||
|
||||
let url = format!(
|
||||
"https://tasks.googleapis.com/tasks/v1/lists/{}/tasks",
|
||||
list_id
|
||||
);
|
||||
|
||||
let resp = self
|
||||
.client
|
||||
.post(&url)
|
||||
.bearer_auth(&token)
|
||||
.json(&body)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| ApiError::Network(e.to_string()))?;
|
||||
|
||||
if !resp.status().is_success() {
|
||||
return Err(ApiError::Api(format!("Create failed: {}", resp.status())));
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn update_task(&self, list_id: &str, task: &Task) -> Result<(), ApiError> {
|
||||
let token = self.ensure_token().await?;
|
||||
|
||||
let mut body = serde_json::json!({
|
||||
"title": task.title,
|
||||
});
|
||||
|
||||
if let Some(ref notes) = task.notes {
|
||||
body["notes"] = serde_json::Value::String(notes.clone());
|
||||
}
|
||||
if let Some(due) = task.due {
|
||||
body["due"] = serde_json::Value::String(due.format("%Y-%m-%dT%H:%M:00.000Z").to_string());
|
||||
}
|
||||
body["status"] = serde_json::Value::String(match task.status {
|
||||
TaskStatus::Completed => "completed".to_string(),
|
||||
TaskStatus::NeedsAction => "needsAction".to_string(),
|
||||
});
|
||||
|
||||
let url = format!(
|
||||
"https://tasks.googleapis.com/tasks/v1/lists/{}/tasks/{}",
|
||||
list_id, task.id
|
||||
);
|
||||
|
||||
let resp = self
|
||||
.client
|
||||
.patch(&url)
|
||||
.bearer_auth(&token)
|
||||
.json(&body)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| ApiError::Network(e.to_string()))?;
|
||||
|
||||
if !resp.status().is_success() {
|
||||
return Err(ApiError::Api(format!("Update failed: {}", resp.status())));
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn delete_task(&self, list_id: &str, task_id: &str) -> Result<(), ApiError> {
|
||||
let token = self.ensure_token().await?;
|
||||
|
||||
let url = format!(
|
||||
"https://tasks.googleapis.com/tasks/v1/lists/{}/tasks/{}",
|
||||
list_id, task_id
|
||||
);
|
||||
|
||||
let resp = self
|
||||
.client
|
||||
.delete(&url)
|
||||
.bearer_auth(&token)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| ApiError::Network(e.to_string()))?;
|
||||
|
||||
if !resp.status().is_success() {
|
||||
return Err(ApiError::Api(format!("Delete failed: {}", resp.status())));
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn move_task(
|
||||
&self,
|
||||
list_id: &str,
|
||||
task_id: &str,
|
||||
prev: Option<&str>,
|
||||
sibling: Option<&str>,
|
||||
) -> Result<(), ApiError> {
|
||||
let token = self.ensure_token().await?;
|
||||
|
||||
let mut url = format!(
|
||||
"https://tasks.googleapis.com/tasks/v1/lists/{}/tasks/{}/move",
|
||||
list_id, task_id
|
||||
);
|
||||
|
||||
if let Some(p) = prev {
|
||||
url.push_str(&format!("&previous={}", p));
|
||||
}
|
||||
if let Some(s) = sibling {
|
||||
url.push_str(&format!("&destinationTaskList={}", s));
|
||||
}
|
||||
|
||||
let resp = self
|
||||
.client
|
||||
.post(&url)
|
||||
.bearer_auth(&token)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| ApiError::Network(e.to_string()))?;
|
||||
|
||||
if !resp.status().is_success() {
|
||||
return Err(ApiError::Api(format!("Move failed: {}", resp.status())));
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user