feat: added encryption fix and app icon

Joel-Dandin · Dec 30, 2024 · 0c401c3 · 0c401c3
1 parent 9237844
commit 0c401c3
Show file tree

Hide file tree

Showing 54 changed files with 44 additions and 41 deletions.
diff --git a/index.html b/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>GitHub Profile Switcher</title>
+    <title>Git Profile Switcher</title>
   </head>
 
   <body>

diff --git a/src-tauri/icons/128x128.png b/src-tauri/icons/128x128.png
diff --git a/src-tauri/icons/128x128@2x.png b/src-tauri/icons/128x128@2x.png
diff --git a/src-tauri/icons/32x32.png b/src-tauri/icons/32x32.png
diff --git a/src-tauri/icons/Square107x107Logo.png b/src-tauri/icons/Square107x107Logo.png
diff --git a/src-tauri/icons/Square142x142Logo.png b/src-tauri/icons/Square142x142Logo.png
diff --git a/src-tauri/icons/Square150x150Logo.png b/src-tauri/icons/Square150x150Logo.png
diff --git a/src-tauri/icons/Square284x284Logo.png b/src-tauri/icons/Square284x284Logo.png
diff --git a/src-tauri/icons/Square30x30Logo.png b/src-tauri/icons/Square30x30Logo.png
diff --git a/src-tauri/icons/Square310x310Logo.png b/src-tauri/icons/Square310x310Logo.png
diff --git a/src-tauri/icons/Square44x44Logo.png b/src-tauri/icons/Square44x44Logo.png
diff --git a/src-tauri/icons/Square71x71Logo.png b/src-tauri/icons/Square71x71Logo.png
diff --git a/src-tauri/icons/Square89x89Logo.png b/src-tauri/icons/Square89x89Logo.png
diff --git a/src-tauri/icons/StoreLogo.png b/src-tauri/icons/StoreLogo.png
diff --git a/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png
diff --git a/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png
diff --git a/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png
diff --git a/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png
diff --git a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png
diff --git a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png
diff --git a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png
diff --git a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/src-tauri/icons/icon.icns b/src-tauri/icons/icon.icns
diff --git a/src-tauri/icons/icon.ico b/src-tauri/icons/icon.ico
diff --git a/src-tauri/icons/icon.png b/src-tauri/icons/icon.png
diff --git a/src-tauri/icons/ios/AppIcon-20x20@1x.png b/src-tauri/icons/ios/AppIcon-20x20@1x.png
diff --git a/src-tauri/icons/ios/AppIcon-20x20@2x-1.png b/src-tauri/icons/ios/AppIcon-20x20@2x-1.png
diff --git a/src-tauri/icons/ios/AppIcon-20x20@2x.png b/src-tauri/icons/ios/AppIcon-20x20@2x.png
diff --git a/src-tauri/icons/ios/AppIcon-20x20@3x.png b/src-tauri/icons/ios/AppIcon-20x20@3x.png
diff --git a/src-tauri/icons/ios/AppIcon-29x29@1x.png b/src-tauri/icons/ios/AppIcon-29x29@1x.png
diff --git a/src-tauri/icons/ios/AppIcon-29x29@2x-1.png b/src-tauri/icons/ios/AppIcon-29x29@2x-1.png
diff --git a/src-tauri/icons/ios/AppIcon-29x29@2x.png b/src-tauri/icons/ios/AppIcon-29x29@2x.png
diff --git a/src-tauri/icons/ios/AppIcon-29x29@3x.png b/src-tauri/icons/ios/AppIcon-29x29@3x.png
diff --git a/src-tauri/icons/ios/AppIcon-40x40@1x.png b/src-tauri/icons/ios/AppIcon-40x40@1x.png
diff --git a/src-tauri/icons/ios/AppIcon-40x40@2x-1.png b/src-tauri/icons/ios/AppIcon-40x40@2x-1.png
diff --git a/src-tauri/icons/ios/AppIcon-40x40@2x.png b/src-tauri/icons/ios/AppIcon-40x40@2x.png
diff --git a/src-tauri/icons/ios/AppIcon-40x40@3x.png b/src-tauri/icons/ios/AppIcon-40x40@3x.png
diff --git a/src-tauri/icons/ios/AppIcon-512@2x.png b/src-tauri/icons/ios/AppIcon-512@2x.png
diff --git a/src-tauri/icons/ios/AppIcon-60x60@2x.png b/src-tauri/icons/ios/AppIcon-60x60@2x.png
diff --git a/src-tauri/icons/ios/AppIcon-60x60@3x.png b/src-tauri/icons/ios/AppIcon-60x60@3x.png
diff --git a/src-tauri/icons/ios/AppIcon-76x76@1x.png b/src-tauri/icons/ios/AppIcon-76x76@1x.png
diff --git a/src-tauri/icons/ios/AppIcon-76x76@2x.png b/src-tauri/icons/ios/AppIcon-76x76@2x.png
diff --git a/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png b/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png
diff --git a/src-tauri/src/encryption.rs b/src-tauri/src/encryption.rs
@@ -5,7 +5,6 @@ use aes_gcm::{
 use base64::{engine::general_purpose::STANDARD as BASE64, Engine};
 use rand::Rng;
 use serde::{Deserialize, Serialize};
-use std::fs;
 use once_cell::sync::Lazy;
 use std::sync::Mutex;
 
@@ -26,11 +25,6 @@ pub fn set_encryption_key(key: &str) -> Result<(), String> {
     Ok(())
 }
 
-pub fn get_encryption_key() -> Result<String, String> {
-    let key = ENCRYPTION_KEY.lock().map_err(|e| e.to_string())?;
-    String::from_utf8(key.clone()).map_err(|e| e.to_string())
-}
-
 #[derive(Serialize, Deserialize)]
 pub struct EncryptedData {
     pub nonce: String,
@@ -39,6 +33,9 @@ pub struct EncryptedData {
 
 pub fn encrypt_string(data: &str) -> Result<String, String> {
     let key_data = ENCRYPTION_KEY.lock().map_err(|e| e.to_string())?;
+    if key_data.is_empty() {
+        return Err("Encryption key not set".to_string());
+    }
     let key = Key::<Aes256Gcm>::from_slice(&key_data);
     let cipher = Aes256Gcm::new(key);
 
@@ -61,6 +58,10 @@ pub fn encrypt_string(data: &str) -> Result<String, String> {
 }
 
 pub fn decrypt_string(encrypted_json: &str) -> Result<String, String> {
+    let key_data = ENCRYPTION_KEY.lock().map_err(|e| e.to_string())?;
+    if key_data.is_empty() {
+        return Err("Encryption key not set".to_string());
+    }
     // Parse encrypted data
     let encrypted_data: EncryptedData = serde_json::from_str(encrypted_json)
         .map_err(|e| format!("Failed to parse encrypted data: {}", e))?;
@@ -74,7 +75,6 @@ pub fn decrypt_string(encrypted_json: &str) -> Result<String, String> {
         .map_err(|e| format!("Failed to decode ciphertext: {}", e))?;
 
     // Get the current encryption key
-    let key_data = ENCRYPTION_KEY.lock().map_err(|e| e.to_string())?;
     let key = Key::<Aes256Gcm>::from_slice(&key_data);
     let cipher = Aes256Gcm::new(key);
     let nonce = Nonce::from_slice(&nonce_bytes);
@@ -86,16 +86,4 @@ pub fn decrypt_string(encrypted_json: &str) -> Result<String, String> {
 
     String::from_utf8(plaintext)
         .map_err(|e| format!("Failed to convert decrypted data to string: {}", e))
-}
-
-pub fn write_encrypted_file(path: &std::path::Path, content: &str) -> Result<(), String> {
-    let encrypted = encrypt_string(content)?;
-    fs::write(path, encrypted)
-        .map_err(|e| format!("Failed to write encrypted file: {}", e))
-}
-
-pub fn read_encrypted_file(path: &std::path::Path) -> Result<String, String> {
-    let encrypted = fs::read_to_string(path)
-        .map_err(|e| format!("Failed to read encrypted file: {}", e))?;
-    decrypt_string(&encrypted)
 }
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
@@ -9,7 +9,7 @@ use std::sync::Mutex;
 use once_cell::sync::Lazy;
 use opener;
 mod encryption; // Add this at the top
-use crate::encryption::{write_encrypted_file, read_encrypted_file, set_encryption_key};
+use crate::encryption::{encrypt_string, decrypt_string, set_encryption_key};
 
 // App configuration structure
 #[derive(Debug, Serialize, Deserialize, Clone)]
@@ -56,7 +56,10 @@ async fn save_profiles(profiles: Vec<GitProfile>) -> Result<(), String> {
     let json = serde_json::to_string_pretty(&profiles)
         .map_err(|e| format!("Failed to serialize profiles: {}", e))?;
 
-    write_encrypted_file(&profiles_file, &json)
+    // Encrypt the profiles data
+    let encrypted = encrypt_string(&json)?;
+    fs::write(&profiles_file, encrypted)
+        .map_err(|e| format!("Failed to write profiles file: {}", e))
 }
 
 #[command]
@@ -70,7 +73,11 @@ async fn load_profiles() -> Result<Vec<GitProfile>, String> {
         return Ok(Vec::new());
     }
 
-    let json = read_encrypted_file(&profiles_file)?;
+    let encrypted = fs::read_to_string(&profiles_file)
+        .map_err(|e| format!("Failed to read profiles file: {}", e))?;
+
+    // Decrypt the profiles data
+    let json = decrypt_string(&encrypted)?;
 
     serde_json::from_str(&json)
         .map_err(|e| format!("Failed to deserialize profiles: {}", e))
@@ -172,10 +179,19 @@ fn load_config() -> Result<AppConfig, String> {
         return Ok(config);
     }
 
-    let config_str = read_encrypted_file(&config_path)?;
+    // Read config as plain JSON
+    let config_str = fs::read_to_string(&config_path)
+        .map_err(|e| format!("Failed to read config file: {}", e))?;
 
-    serde_json::from_str(&config_str)
-        .map_err(|e| format!("Failed to parse config file: {}", e))
+    let config: AppConfig = serde_json::from_str(&config_str)
+        .map_err(|e| format!("Failed to parse config file: {}", e))?;
+
+    // If there's an encryption key, set it
+    if let Some(key) = &config.encryption_key {
+        set_encryption_key(key)?;
+    }
+
+    Ok(config)
 }
 
 fn save_config(config: &AppConfig) -> Result<(), String> {
@@ -187,10 +203,12 @@ fn save_config(config: &AppConfig) -> Result<(), String> {
             .map_err(|e| format!("Failed to create config directory: {}", e))?;
     }
 
+    // Save config as plain JSON
     let config_str = serde_json::to_string_pretty(config)
         .map_err(|e| format!("Failed to serialize config: {}", e))?;
 
-    write_encrypted_file(&config_path, &config_str)
+    fs::write(&config_path, config_str)
+        .map_err(|e| format!("Failed to write config file: {}", e))
 }
 // Add this function to initialize encryption on startup
 fn initialize_encryption() -> Result<(), String> {
@@ -243,9 +261,14 @@ async fn get_profiles_dir() -> Result<String, String> {
 #[command]
 async fn update_encryption_key(key: String) -> Result<(), String> {
     let mut config = APP_CONFIG.lock().map_err(|e| e.to_string())?;
-    config.encryption_key = Some(key.clone());
-    save_config(&config)?;
+
+    // Try to set the new encryption key
     set_encryption_key(&key)?;
+
+    // Update config with the new key
+    config.encryption_key = Some(key);
+    save_config(&config)?;
+
     Ok(())
 }
 

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
-  "productName": "github-profile-selector",
-  "version": "0.1.0",
+  "productName": "Git Profile Switcher",
+  "version": "1.0.0",
   "identifier": "com.github-profile-selector.app",
   "build": {
     "beforeDevCommand": "npm run dev",
@@ -12,7 +12,7 @@
   "app": {
     "windows": [
       {
-        "title": "github-profile-selector",
+        "title": "Git Profile Switcher",
         "width": 800,
         "height": 600
       }

diff --git a/src/pages/Settings.tsx b/src/pages/Settings.tsx
@@ -24,7 +24,7 @@ const Settings = () => {
   const { theme, setTheme } = useTheme();
   const [config, setConfig] = useState<AppConfig | null>(null);
   const [profilesPath, setProfilesPath] = useState("");
-  const [backupEnabled, setBackupEnabled] = useState<Boolean>(true);
+  const [backupEnabled, setBackupEnabled] = useState<boolean>(true);
   const [encryptionKey, setEncryptionKey] = useState("");
   const [isEncryptionSetup, setIsEncryptionSetup] = useState(false);
   const [showKey, setShowKey] = useState(false);
@@ -44,14 +44,6 @@ const Settings = () => {
     }
   };
 
-  const checkEncryptionStatus = async () => {
-    try {
-      const isSetup = await invoke<boolean>("is_encryption_setup");
-      setIsEncryptionSetup(isSetup);
-    } catch (error) {
-      toast.error("Failed to check encryption status");
-    }
-  };
 
   const handleUpdateEncryption = async () => {
     if (!encryptionKey) {