update lockfile

update dependencies

.deepsource.toml

@@ -0,0 +1,7 @@
+version = 1
+
+[[analyzers]]
+name = "rust"
+
+  [analyzers.meta]
+  msrv = "stable"

.gitignore

@@ -2,3 +2,4 @@
 *_backup
 *ignore*
 msi/
+/src-tauri/gen/

library

@@ -1 +1 @@
-Subproject commit 3326ee886b0121237a84217ab9508728c722f8d4
+Subproject commit 96cb053e659123afc394187229949e7f32c23372

src-tauri/Cargo.toml

@@ -2,20 +2,25 @@
 name = "ipass-gui"
 version = "1.0.0"
 edition = "2021"
+license = "GNU GPLv3"
+description = "A Password manager"
+repository = "https://git.ipost.rocks/Code002Lover/IPass-GUI"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+name = "ipass_gui_lib"
+crate-type = ["staticlib", "cdylib", "rlib"]
 
 [build-dependencies]
-tauri-build = { version = "1.2", features = [] }
+tauri-build = { version = "2.0.0-beta", features = [] }
 
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.2.4", features = ["dialog-confirm"] }
+tauri = { version = "2.0.0-beta", features = [] }
 ip_lib = { path = "../library/" }
 rand="0.8.5"
-open="4.0"
-tokio="1.27"
+open="5.0.0"
+tokio="1.28.2"
 
 [features]
 # by default Tauri runs in production mode

src-tauri/src/lib.rs

@@ -0,0 +1,146 @@
+#![cfg_attr(
+    all(not(debug_assertions), target_os = "windows"),
+    windows_subsystem = "windows"
+)]
+
+use std::fs::File;
+use std::io::Write;
+use tauri::State;
+use tokio::runtime::Runtime;
+
+extern crate ip_lib;
+extern crate open;
+extern crate rand;
+
+// Learn more about Tauri commands at https://tauri.app/v1/guides/features/command
+
+#[tauri::command]
+fn get_version() -> String {
+    option_env!("CARGO_PKG_VERSION")
+        .unwrap_or("x.x.x")
+        .to_string()
+}
+
+#[tauri::command]
+fn create_entry(name: &str, username: String, pw: &str, mpw: &str) -> bool {
+    let username_and_pw = username + ";" + pw;
+    let return_value = ip_lib::create_entry(name, &username_and_pw, mpw);
+    if return_value {
+        isync_save();
+    }
+    return_value
+}
+
+#[tauri::command]
+fn random_password() -> String {
+    ip_lib::random_password()
+}
+
+#[tauri::command]
+fn get_entry(name: &str, mpw: &str) -> Result<(String, String), String> {
+    let binding = ip_lib::get_entry(name, mpw);
+    if let Ok(data) = binding {
+        let mut split = data.split(';');
+        Ok((
+            split.next().unwrap().to_string(),
+            split.next().unwrap().to_string(),
+        ))
+    } else {
+        Err(binding.expect_err("expected error"))
+    }
+}
+
+#[tauri::command]
+fn get_entries() -> Vec<String> {
+    let mut vector: Vec<String> = Vec::default();
+    for entry in ip_lib::get_entries() {
+        let entry_filename = entry.unwrap().file_name();
+        let ent = entry_filename.to_str().unwrap();
+        if ent != "token.ipasst" && ent.len() > 6 {
+            vector.insert(0, ent[..ent.len() - 6].to_string());
+        }
+    }
+
+    vector.sort();
+
+    vector
+}
+
+#[tauri::command]
+fn remove_entry(name: &str) -> bool {
+    let filepath = &(ip_lib::get_ipass_folder() + name + ".ipass");
+    if std::path::Path::new(filepath).exists() {
+        std::fs::remove_file(filepath).unwrap();
+        isync_save();
+        return true;
+    }
+    false
+}
+
+#[tauri::command]
+fn open_authorize() -> u32 {
+    let code: u32 = rand::random();
+    open::that(format!("https://ipost.rocks/authorize?id=1&extra={}", code)).unwrap();
+    //the IPass app id is 1
+    code
+}
+
+#[tauri::command]
+fn store_token(token: String) {
+    let filepath = &(ip_lib::get_ipass_folder() + "token.ipasst");
+    let mut file = File::create(filepath).unwrap();
+    file.write_all(token.as_bytes()).unwrap();
+}
+
+#[tauri::command]
+fn remove_token() {
+    let filepath = &(ip_lib::get_ipass_folder() + "token.ipasst");
+    std::fs::remove_file(filepath).unwrap();
+    //TODO: cleaner solution via IPass api call to unauthorize
+}
+
+#[tauri::command]
+fn get_isync_status() -> bool {
+    let filepath = &(ip_lib::get_ipass_folder() + "token.ipasst");
+    std::path::Path::new(filepath).exists()
+}
+
+fn isync_save() {
+    let isync_save_future = ip_lib::isync_save();
+
+    let rt = Runtime::new().unwrap();
+    let _save_output = rt.block_on(isync_save_future);
+    //println!("isync_save: {}",save_output);
+}
+
+#[tauri::command]
+fn sync_isync(rt: State<Runtime>) {
+    //println!("going to sync");
+    rt.spawn(async {
+        let _get_output = ip_lib::isync_get().await;
+        //println!("isync_get: {}",_get_output);
+    });
+}
+
+#[cfg_attr(mobile, tauri::mobile_entry_point)]
+pub fn run() {
+    let rt = Runtime::new().unwrap();
+
+    tauri::Builder::default()
+        .invoke_handler(tauri::generate_handler![
+            get_version,
+            create_entry,
+            random_password,
+            get_entry,
+            get_entries,
+            remove_entry,
+            open_authorize,
+            store_token,
+            get_isync_status,
+            sync_isync,
+            remove_token
+        ])
+        .manage(rt)
+        .run(tauri::generate_context!())
+        .expect("error while running tauri application");
+}

src-tauri/src/main.rs

@@ -1,123 +1,5 @@
-#![cfg_attr(
-    all(not(debug_assertions), target_os = "windows"),
-    windows_subsystem = "windows"
-)]
-
-use std::fs::File;
-use std::io::Write;
-use tokio::runtime::Runtime;
-
-extern crate ip_lib;
-extern crate rand;
-extern crate open;
-
-// Learn more about Tauri commands at https://tauri.app/v1/guides/features/command
-
-#[tauri::command]
-fn get_version() -> String {
-	option_env!("CARGO_PKG_VERSION").unwrap_or("x.x.x").to_string()
-}
-
-#[tauri::command]
-fn create_entry(name: String, username: String, pw: &str, mpw: String) -> bool {
-	let return_value = ip_lib::create_entry(&name, username+";"+pw, mpw);
-	if return_value {
-		isync_save();
-	}
-	return_value
-}
-
-#[tauri::command]
-fn random_password() -> String {
-	ip_lib::random_password()
-}
-
-#[tauri::command]
-fn get_entry(name: String, mpw: String) -> Result<(String,String),String> {
-	let binding = ip_lib::get_entry(&name, mpw);
-	if let Ok(data) = binding {
-		let mut split = data.split(';');
-		Ok((split.next().unwrap().to_string(),split.next().unwrap().to_string()))
-	} else {
-		Err(binding.expect_err("expected error"))
-	}
-}
-
-#[tauri::command]
-fn get_entries() -> Vec<String> {
-	let mut vector: Vec<String> = Vec::default();
-	for entry in ip_lib::get_entries() {
-		let entry_filename = entry.unwrap().file_name();
-		let ent = entry_filename.to_str().unwrap();
-		if ent != "token.ipasst" {
-			vector.insert(0, ent[..ent.len()-6].to_string());
-		}
-	}
-
-	vector.sort();
-
-	vector
-}
-
-#[tauri::command]
-fn remove_entry(name: &str) -> bool {
-	let filepath = &(ip_lib::get_ipass_folder()+name+".ipass");
-	if std::path::Path::new(filepath).exists() {
-		std::fs::remove_file(filepath).unwrap();
-		isync_save();
-		return true;
-	}
-	false
-}
-
-#[tauri::command]
-fn open_authorize() -> u32 {
-	let code:u32 = rand::random();
-    open::that(format!("https://ipost.rocks/authorize?id=1&extra={}",code)).unwrap();
-	code
-}
-
-#[tauri::command]
-fn store_token(token: String) {
-	let filepath = &(ip_lib::get_ipass_folder()+"token.ipasst");
-	let mut file = File::create(filepath).unwrap();
-    file.write_all(token.as_bytes()).unwrap();
-}
-
-#[tauri::command]
-fn get_isync_status() -> bool {
-	let filepath = &(ip_lib::get_ipass_folder()+"token.ipasst");
-	std::path::Path::new(filepath).exists()
-}
-
-fn isync_save() {
-	let isync_save_future = ip_lib::isync_save();
-
-	let rt = Runtime::new().unwrap();
-	let _save_output = rt.block_on(isync_save_future);
-	//println!("isync_save: {}",save_output);
-}
-
-#[tauri::command]
-fn sync_isync() {
-	let rt = Runtime::new().unwrap();
-
-	let isync_get_future = ip_lib::isync_get();
-
-	//println!("going to block on isync_get");
-	let _get_output = rt.block_on(isync_get_future);
-	//println!("isync_get: {}",get_output);
-}
+#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
 fn main() {
-	sync_isync();
-
-	tauri::Builder::default()
-		.invoke_handler(tauri::generate_handler![
-			get_version,create_entry,random_password,
-			get_entry,get_entries,remove_entry,
-			open_authorize,store_token,get_isync_status,
-			sync_isync])
-		.run(tauri::generate_context!())
-		.expect("error while running tauri application");
+    ipass_gui_lib::run();
 }

src-tauri/tauri.conf.json

@@ -1,40 +1,31 @@
 {
-  "build": {
-    "beforeDevCommand": "",
-    "beforeBuildCommand": "",
-    "devPath": "../src",
-    "distDir": "../src",
+  "app": {
+    "windows": [
+      {
+        "fullscreen": false,
+        "height": 600,
+        "resizable": true,
+        "theme": "Dark",
+        "title": "IPass",
+        "width": 880
+      }
+    ],
     "withGlobalTauri": true
   },
-  "package": {
-    "productName": "ipass",
-    "version": "1.0.0"
-  },
-  "tauri": {
-    "allowlist": {
-      "all": false,
-      "dialog": {
-        "all": false,
-        "open": false,
-        "save": false,
-        "ask": false,
-        "message": false,
-        "confirm": true
-      }
+  "build": {
+    "beforeBuildCommand": "",
+    "beforeDevCommand": "",
+    "frontendDist": "../src"
   },
   "bundle": {
     "active": true,
     "category": "DeveloperTool",
     "copyright": "",
-      "deb": {
-        "depends": []
-      },
     "externalBin": [],
     "icon": [
       "icons/icon.ico",
       "icons/icon.png"
     ],
-      "identifier": "rocks.ipost.ipass",
     "longDescription": "",
     "macOS": {
       "entitlements": null,
@@ -52,21 +43,7 @@
       "timestampUrl": ""
     }
   },
-    "security": {
-      "csp": null
-    },
-    "updater": {
-      "active": false
-    },
-    "windows": [
-      {
-        "fullscreen": false,
-        "height": 600,
-        "resizable": true,
-        "title": "IPass",
-        "width": 880,
-        "theme": "Dark"
-      }
-    ]
-  }
+  "plugins": {},
+  "productName": "ipass",
+  "version": "1.0.0"
 }

src/main.js

@@ -1,4 +1,4 @@
-const { invoke } = window.__TAURI__.tauri;
+const { invoke } = window.__TAURI__.core;
 
 let master_pw;
 let lock_status = true;
@@ -30,6 +30,7 @@ async function run_isync() {
 	}
 }
 setInterval(run_isync, 1000 * 10);
+run_isync();
 
 async function startup() {
 
@@ -66,7 +67,9 @@ async function startup() {
 
 				if(!lock_status) {
 					let isUsername = input.parentElement.classList.contains("entry_user")
-					let entry_name = input.parentElement.id.slice(0,input.parentElement.id.length-5)
+					let qs = "#"+input.parentElement.id.slice(0,input.parentElement.id.length-5)+"_name > input[type=text]"
+					console.log(qs)
+					let entry_name = document.querySelector(qs).value
 					console.log(entry_name,input.parentElement.id)
 
 					let info = await invoke("get_entry",{
@@ -272,8 +275,8 @@ async function get_pw() {
 }
 
 async function showEntry(entry_name) {
-	let entry_user = document.querySelector(`#${entry_name.replaceAll(" ","-")}_user > input`);
-	let entry_pass = document.querySelector(`#${entry_name.replaceAll(" ","-")}_pass > input`);
+	let entry_user = document.querySelector(`#${entry_name.replaceAll(" ","-").replaceAll(".","\\.")}_user > input`);
+	let entry_pass = document.querySelector(`#${entry_name.replaceAll(" ","-").replaceAll(".","\\.")}_pass > input`);
 
 	if(this.innerText == "Show"){
 		let info = await invoke("get_entry",{

src/settings.html

@@ -13,7 +13,7 @@
         <h2>ISync</h2>
         <h4>Keep your passwords up-to-date on multiple devices</h4>
         <span>Current status: <b id="ISyncStatus">Checking</b></span>
-        <a href="/enableISync.html" class="nostyle" id="enableISync">Enable ISync</a>
+        <button id="enableISyncButton"><a href="/enableISync.html" class="nostyle" id="enableISync">Enable ISync</a></button>
     </div>
     <script>
         const { invoke } = window.__TAURI__.tauri;
@@ -21,7 +21,11 @@
             let status = await invoke("get_isync_status")
             document.getElementById("ISyncStatus").innerText=status?"Enabled":"Disabled"
             if(status){
+                document.getElementById("enableISyncButton").innerText="Disable ISync"
                 document.getElementById("enableISync").remove()
+                document.getElementById("enableISyncButton").addEventListener("onclick",(_e)=>{
+                    invoke("remove_token")
+                })
             }
         }
         start()