From a316b8f5e6930beabdeb1dde77b81c98301a69f2 Mon Sep 17 00:00:00 2001 From: quexeky Date: Thu, 17 Oct 2024 17:07:47 +1100 Subject: [PATCH] Ensured everything is serializing/deserializing to camelCase --- desktop/src-tauri/src/auth.rs | 2 ++ desktop/src-tauri/src/db.rs | 8 +++++--- desktop/src-tauri/src/lib.rs | 2 ++ desktop/src-tauri/src/unpacker.rs | 3 +++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/desktop/src-tauri/src/auth.rs b/desktop/src-tauri/src/auth.rs index 57c542f5..f09c789b 100644 --- a/desktop/src-tauri/src/auth.rs +++ b/desktop/src-tauri/src/auth.rs @@ -17,6 +17,7 @@ use url::Url; use crate::{db::{fetch_base_url, DatabaseAuth}, AppState, AppStatus, User, DB}; #[derive(Serialize)] +#[serde(rename_all="camelCase")] struct InitiateRequestBody { name: String, platform: String, @@ -30,6 +31,7 @@ struct HandshakeRequestBody { } #[derive(Deserialize)] +#[serde(rename_all="camelCase")] struct HandshakeResponse { private: String, certificate: String, diff --git a/desktop/src-tauri/src/db.rs b/desktop/src-tauri/src/db.rs index 29558e54..b5b49e49 100644 --- a/desktop/src-tauri/src/db.rs +++ b/desktop/src-tauri/src/db.rs @@ -6,7 +6,7 @@ use std::{ use directories::BaseDirs; use rustbreak::{deser::Bincode, PathDatabase}; -use serde::Deserialize; +use serde::{Deserialize, Serialize}; use url::Url; use crate::DB; @@ -19,12 +19,14 @@ pub struct DatabaseAuth { pub client_id: String, } -#[derive(serde::Serialize, Clone, Deserialize)] +#[derive(Serialize, Clone, Deserialize)] +#[serde(rename_all="camelCase")] pub struct DatabaseApps { pub apps_base_dir: String, } -#[derive(serde::Serialize, Clone, Deserialize)] +#[derive(Serialize, Clone, Deserialize)] +#[serde(rename_all="camelCase")] pub struct Database { pub auth: Option, pub base_url: String, diff --git a/desktop/src-tauri/src/lib.rs b/desktop/src-tauri/src/lib.rs index 7c1d5a8b..c88e20b6 100644 --- a/desktop/src-tauri/src/lib.rs +++ b/desktop/src-tauri/src/lib.rs @@ -18,6 +18,7 @@ use std::{ use tauri_plugin_deep_link::DeepLinkExt; #[derive(Clone, Copy, Serialize)] +#[serde(rename_all="camelCase")] pub enum AppStatus { NotConfigured, SignedOut, @@ -35,6 +36,7 @@ pub struct User { } #[derive(Clone, Serialize)] +#[serde(rename_all="camelCase")] pub struct AppState { status: AppStatus, user: Option, diff --git a/desktop/src-tauri/src/unpacker.rs b/desktop/src-tauri/src/unpacker.rs index 5881a7d3..1d66a868 100644 --- a/desktop/src-tauri/src/unpacker.rs +++ b/desktop/src-tauri/src/unpacker.rs @@ -12,18 +12,21 @@ use std::{ use std::os::unix::fs::PermissionsExt; #[derive(Deserialize)] +#[serde(rename_all="camelCase")] struct ManifestChunk { uuid: String, index: i64, } #[derive(Deserialize)] +#[serde(rename_all="camelCase")] struct ManifestRecord { chunks: Vec, permissions: u32, } #[derive(Deserialize)] +#[serde(rename_all="camelCase")] struct Manifest { record: HashMap, }