OAuth 2 (#158)

2026-04-17 14:29:46 +02:00 · 2025-01-26 13:13:45 -08:00
parent 82b1ad35ff
commit f678593903
99 changed files with 3492 additions and 1583 deletions
--- a/src-tauri/yaak-models/src/models.rs
+++ b/src-tauri/yaak-models/src/models.rs
@@ -10,7 +10,7 @@ use ts_rs::TS;

 #[derive(Debug, Clone, Serialize, Deserialize, TS)]
 #[serde(rename_all = "camelCase", tag = "type")]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub enum ProxySetting {
    Enabled {
        http: String,
@@ -22,7 +22,7 @@ pub enum ProxySetting {

 #[derive(Debug, Clone, Serialize, Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub struct ProxySettingAuth {
    pub user: String,
    pub password: String,
@@ -30,7 +30,7 @@ pub struct ProxySettingAuth {

 #[derive(Debug, Clone, Serialize, Deserialize, TS)]
 #[serde(rename_all = "snake_case")]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub enum EditorKeymap {
    Default,
    Vim,
@@ -72,7 +72,7 @@ impl Default for EditorKeymap {

 #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)]
 #[serde(default, rename_all = "camelCase")]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub struct Settings {
    #[ts(type = "\"settings\"")]
    pub model: String,
@@ -149,7 +149,7 @@ impl<'s> TryFrom<&Row<'s>> for Settings {

 #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)]
 #[serde(default, rename_all = "camelCase")]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub struct Workspace {
    #[ts(type = "\"workspace\"")]
    pub model: String,
@@ -215,7 +215,7 @@ impl Workspace {

 #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)]
 #[serde(default, rename_all = "camelCase")]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub struct WorkspaceMeta {
    #[ts(type = "\"workspace_meta\"")]
    pub model: String,
@@ -255,7 +255,7 @@ impl<'s> TryFrom<&Row<'s>> for WorkspaceMeta {
 }

 #[derive(Debug, Clone, Serialize, Deserialize, TS)]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 enum CookieDomain {
    HostOnly(String),
    Suffix(String),
@@ -264,14 +264,14 @@ enum CookieDomain {
 }

 #[derive(Debug, Clone, Serialize, Deserialize, TS)]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 enum CookieExpires {
    AtUtc(String),
    SessionEnd,
 }

 #[derive(Debug, Clone, Serialize, Deserialize, TS)]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub struct Cookie {
    raw_cookie: String,
    domain: CookieDomain,
@@ -281,7 +281,7 @@ pub struct Cookie {

 #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)]
 #[serde(default, rename_all = "camelCase")]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub struct CookieJar {
    #[ts(type = "\"cookie_jar\"")]
    pub model: String,
@@ -327,7 +327,7 @@ impl<'s> TryFrom<&Row<'s>> for CookieJar {

 #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)]
 #[serde(default, rename_all = "camelCase")]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub struct Environment {
    #[ts(type = "\"environment\"")]
    pub model: String,
@@ -376,7 +376,7 @@ impl<'s> TryFrom<&Row<'s>> for Environment {

 #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)]
 #[serde(default, rename_all = "camelCase")]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub struct EnvironmentVariable {
    #[serde(default = "default_true")]
    #[ts(optional, as = "Option<bool>")]
@@ -389,7 +389,7 @@ pub struct EnvironmentVariable {

 #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)]
 #[serde(default, rename_all = "camelCase")]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub struct Folder {
    #[ts(type = "\"folder\"")]
    pub model: String,
@@ -440,7 +440,7 @@ impl<'s> TryFrom<&Row<'s>> for Folder {

 #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)]
 #[serde(default, rename_all = "camelCase")]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub struct HttpRequestHeader {
    #[serde(default = "default_true")]
    #[ts(optional, as = "Option<bool>")]
@@ -453,7 +453,7 @@ pub struct HttpRequestHeader {

 #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)]
 #[serde(default, rename_all = "camelCase")]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub struct HttpUrlParameter {
    #[serde(default = "default_true")]
    #[ts(optional, as = "Option<bool>")]
@@ -466,7 +466,7 @@ pub struct HttpUrlParameter {

 #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)]
 #[serde(default, rename_all = "camelCase")]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub struct HttpRequest {
    #[ts(type = "\"http_request\"")]
    pub model: String,
@@ -548,7 +548,7 @@ impl<'s> TryFrom<&Row<'s>> for HttpRequest {

 #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)]
 #[serde(default, rename_all = "camelCase")]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub struct HttpResponseHeader {
    pub name: String,
    pub value: String,
@@ -556,7 +556,7 @@ pub struct HttpResponseHeader {

 #[derive(Debug, Clone, Serialize, Deserialize, TS)]
 #[serde(rename_all = "snake_case")]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub enum HttpResponseState {
    Initialized,
    Connected,
@@ -571,7 +571,7 @@ impl Default for HttpResponseState {

 #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)]
 #[serde(default, rename_all = "camelCase")]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub struct HttpResponse {
    #[ts(type = "\"http_response\"")]
    pub model: String,
@@ -660,7 +660,7 @@ impl HttpResponse {

 #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)]
 #[serde(default, rename_all = "camelCase")]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub struct GrpcMetadataEntry {
    #[serde(default = "default_true")]
    #[ts(optional, as = "Option<bool>")]
@@ -673,7 +673,7 @@ pub struct GrpcMetadataEntry {

 #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)]
 #[serde(default, rename_all = "camelCase")]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub struct GrpcRequest {
    #[ts(type = "\"grpc_request\"")]
    pub model: String,
@@ -748,7 +748,7 @@ impl<'s> TryFrom<&Row<'s>> for GrpcRequest {

 #[derive(Debug, Clone, Serialize, Deserialize, TS)]
 #[serde(rename_all = "snake_case")]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub enum GrpcConnectionState {
    Initialized,
    Connected,
@@ -763,7 +763,7 @@ impl Default for GrpcConnectionState {

 #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)]
 #[serde(default, rename_all = "camelCase")]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub struct GrpcConnection {
    #[ts(type = "\"grpc_connection\"")]
    pub model: String,
@@ -831,7 +831,7 @@ impl<'s> TryFrom<&Row<'s>> for GrpcConnection {

 #[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, TS)]
 #[serde(rename_all = "snake_case")]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub enum GrpcEventType {
    Info,
    Error,
@@ -849,7 +849,7 @@ impl Default for GrpcEventType {

 #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)]
 #[serde(default, rename_all = "camelCase")]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub struct GrpcEvent {
    #[ts(type = "\"grpc_event\"")]
    pub model: String,
@@ -911,7 +911,7 @@ impl<'s> TryFrom<&Row<'s>> for GrpcEvent {

 #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)]
 #[serde(default, rename_all = "camelCase")]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub struct Plugin {
    #[ts(type = "\"plugin\"")]
    pub model: String,
@@ -959,7 +959,7 @@ impl<'s> TryFrom<&Row<'s>> for Plugin {

 #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)]
 #[serde(default, rename_all = "camelCase")]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub struct SyncState {
    #[ts(type = "\"sync_state\"")]
    pub model: String,
@@ -977,7 +977,7 @@ pub struct SyncState {

 #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)]
 #[serde(default, rename_all = "camelCase")]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub struct SyncHistory {
    #[ts(type = "\"sync_history\"")]
    pub model: String,
@@ -1029,7 +1029,7 @@ impl<'s> TryFrom<&Row<'s>> for SyncState {

 #[derive(Debug, Clone, Serialize, Deserialize, Default, TS)]
 #[serde(default, rename_all = "camelCase")]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub struct KeyValue {
    #[ts(type = "\"key_value\"")]
    pub model: String,
@@ -1069,6 +1069,48 @@ impl<'s> TryFrom<&Row<'s>> for KeyValue {
    }
 }

+#[derive(Debug, Clone, Serialize, Deserialize, Default, TS)]
+#[serde(default, rename_all = "camelCase")]
+#[ts(export, export_to = "gen_models.ts")]
+pub struct PluginKeyValue {
+    #[ts(type = "\"plugin_key_value\"")]
+    pub model: String,
+    pub created_at: NaiveDateTime,
+    pub updated_at: NaiveDateTime,
+
+    pub plugin_name: String,
+    pub key: String,
+    pub value: String,
+}
+
+#[derive(Iden)]
+pub enum PluginKeyValueIden {
+    #[iden = "plugin_key_values"]
+    Table,
+    Model,
+    CreatedAt,
+    UpdatedAt,
+
+    PluginName,
+    Key,
+    Value,
+}
+
+impl<'s> TryFrom<&Row<'s>> for PluginKeyValue {
+    type Error = rusqlite::Error;
+
+    fn try_from(r: &Row<'s>) -> Result<Self, Self::Error> {
+        Ok(PluginKeyValue {
+            model: r.get("model")?,
+            created_at: r.get("created_at")?,
+            updated_at: r.get("updated_at")?,
+            plugin_name: r.get("plugin_name")?,
+            key: r.get("key")?,
+            value: r.get("value")?,
+        })
+    }
+}
+
 fn default_true() -> bool {
    true
 }
@@ -1114,7 +1156,7 @@ impl ModelType {

 #[derive(Debug, Clone, Serialize, TS)]
 #[serde(rename_all = "camelCase", untagged)]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub enum AnyModel {
    CookieJar(CookieJar),
    Environment(Environment),
--- a/src-tauri/yaak-models/src/queries.rs
+++ b/src-tauri/yaak-models/src/queries.rs
@@ -1,13 +1,6 @@
 use crate::error::Error::ModelNotFound;
 use crate::error::Result;
-use crate::models::{
-    AnyModel, CookieJar, CookieJarIden, Environment, EnvironmentIden, Folder, FolderIden,
-    GrpcConnection, GrpcConnectionIden, GrpcConnectionState, GrpcEvent, GrpcEventIden, GrpcRequest,
-    GrpcRequestIden, HttpRequest, HttpRequestIden, HttpResponse, HttpResponseHeader,
-    HttpResponseIden, HttpResponseState, KeyValue, KeyValueIden, ModelType, Plugin, PluginIden,
-    Settings, SettingsIden, SyncState, SyncStateIden, Workspace, WorkspaceIden, WorkspaceMeta,
-    WorkspaceMetaIden,
-};
+use crate::models::{AnyModel, CookieJar, CookieJarIden, Environment, EnvironmentIden, Folder, FolderIden, GrpcConnection, GrpcConnectionIden, GrpcConnectionState, GrpcEvent, GrpcEventIden, GrpcRequest, GrpcRequestIden, HttpRequest, HttpRequestIden, HttpResponse, HttpResponseHeader, HttpResponseIden, HttpResponseState, KeyValue, KeyValueIden, ModelType, Plugin, PluginIden, PluginKeyValue, PluginKeyValueIden, Settings, SettingsIden, SyncState, SyncStateIden, Workspace, WorkspaceIden, WorkspaceMeta, WorkspaceMetaIden};
 use crate::plugin::SqliteConnection;
 use chrono::{NaiveDateTime, Utc};
 use log::{debug, error, info, warn};
@@ -165,6 +158,90 @@ pub async fn get_key_value_raw<R: Runtime>(
    db.query_row(sql.as_str(), &*params.as_params(), |row| row.try_into()).ok()
 }

+pub async fn get_plugin_key_value<R: Runtime>(
+    mgr: &impl Manager<R>,
+    plugin_name: &str,
+    key: &str,
+) -> Option<PluginKeyValue> {
+    let dbm = &*mgr.state::<SqliteConnection>();
+    let db = dbm.0.lock().await.get().unwrap();
+    let (sql, params) = Query::select()
+        .from(PluginKeyValueIden::Table)
+        .column(Asterisk)
+        .cond_where(
+            Cond::all()
+                .add(Expr::col(PluginKeyValueIden::PluginName).eq(plugin_name))
+                .add(Expr::col(PluginKeyValueIden::Key).eq(key)),
+        )
+        .build_rusqlite(SqliteQueryBuilder);
+
+    db.query_row(sql.as_str(), &*params.as_params(), |row| row.try_into()).ok()
+}
+
+pub async fn set_plugin_key_value<R: Runtime>(
+    mgr: &impl Manager<R>,
+    plugin_name: &str,
+    key: &str,
+    value: &str,
+) -> (PluginKeyValue, bool) {
+    let existing = get_plugin_key_value(mgr, plugin_name, key).await;
+
+    let dbm = &*mgr.state::<SqliteConnection>();
+    let db = dbm.0.lock().await.get().unwrap();
+    let (sql, params) = Query::insert()
+        .into_table(PluginKeyValueIden::Table)
+        .columns([
+            PluginKeyValueIden::CreatedAt,
+            PluginKeyValueIden::UpdatedAt,
+            PluginKeyValueIden::PluginName,
+            PluginKeyValueIden::Key,
+            PluginKeyValueIden::Value,
+        ])
+        .values_panic([
+            CurrentTimestamp.into(),
+            CurrentTimestamp.into(),
+            plugin_name.into(),
+            key.into(),
+            value.into(),
+        ])
+        .on_conflict(
+            OnConflict::new()
+                .update_columns([PluginKeyValueIden::UpdatedAt, PluginKeyValueIden::Value])
+                .to_owned(),
+        )
+        .returning_all()
+        .build_rusqlite(SqliteQueryBuilder);
+
+    let mut stmt = db.prepare(sql.as_str()).expect("Failed to prepare PluginKeyValue upsert");
+    let m: PluginKeyValue = stmt
+        .query_row(&*params.as_params(), |row| row.try_into())
+        .expect("Failed to upsert KeyValue");
+    (m, existing.is_none())
+}
+
+pub async fn delete_plugin_key_value<R: Runtime>(
+    mgr: &impl Manager<R>,
+    plugin_name: &str,
+    key: &str,
+) -> bool {
+    if let None = get_plugin_key_value(mgr, plugin_name, key).await {
+        return false;
+    }
+
+    let dbm = &*mgr.state::<SqliteConnection>();
+    let db = dbm.0.lock().await.get().unwrap();
+    let (sql, params) = Query::delete()
+        .from_table(PluginKeyValueIden::Table)
+        .cond_where(
+            Cond::all()
+                .add(Expr::col(PluginKeyValueIden::PluginName).eq(plugin_name))
+                .add(Expr::col(PluginKeyValueIden::Key).eq(key)),
+        )
+        .build_rusqlite(SqliteQueryBuilder);
+    db.execute(sql.as_str(), &*params.as_params()).expect("Failed to delete PluginKeyValue");
+    true
+}
+
 pub async fn list_workspaces<R: Runtime>(mgr: &impl Manager<R>) -> Result<Vec<Workspace>> {
    let dbm = &*mgr.state::<SqliteConnection>();
    let db = dbm.0.lock().await.get().unwrap();
@@ -1999,7 +2076,7 @@ pub fn generate_id() -> String {

 #[derive(Debug, Clone, Serialize, Deserialize, TS)]
 #[serde(rename_all = "camelCase")]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub struct ModelPayload {
    pub model: AnyModel,
    pub window_label: String,
@@ -2008,7 +2085,7 @@ pub struct ModelPayload {

 #[derive(Debug, Clone, Serialize, Deserialize, TS)]
 #[serde(rename_all = "snake_case")]
-#[ts(export, export_to = "models.ts")]
+#[ts(export, export_to = "gen_models.ts")]
 pub enum UpdateSource {
    Sync,
    Window,