Make rendering return Result, and handle infinite recursion

src-tauri/yaak-license/Cargo.toml

@@ -6,15 +6,15 @@ edition = "2021"
 publish = false
 
 [dependencies]
+chrono = "0.4.38"
+log = "0.4.26"
 reqwest = { workspace = true, features = ["json"] }
 serde = { version = "1.0.208", features = ["derive"] }
-ts-rs = { workspace = true }
-thiserror = { workspace = true }
-tauri = { workspace = true }
-yaak-models = { workspace = true }
-chrono = "0.4.38"
-log = "0.4.22"
 serde_json = "1.0.132"
+tauri = { workspace = true }
+thiserror = { workspace = true }
+ts-rs = { workspace = true }
+yaak-models = { workspace = true }
 
 [build-dependencies]
 tauri-plugin = { workspace = true, features = ["build"] }

src-tauri/yaak-license/bindings/gen_models.ts

@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type CheckActivationRequestPayload = { activationId: string, };
+export type CheckActivationRequestPayload = { appVersion: string, appPlatform: string, };

src-tauri/yaak-license/bindings/license.ts

@@ -8,6 +8,6 @@ export type ActivateLicenseResponsePayload = { activationId: string, };
 
 export type CheckActivationResponsePayload = { active: boolean, };
 
-export type DeactivateLicenseRequestPayload = { licenseKey: string, appVersion: string, appPlatform: string, };
+export type DeactivateLicenseRequestPayload = { appVersion: string, appPlatform: string, };
 
 export type LicenseCheckStatus = { "type": "personal_use", trial_ended: string, } | { "type": "commercial_use" } | { "type": "invalid_license" } | { "type": "trialing", end: string, };

src-tauri/yaak-license/src/commands.rs

@@ -1,5 +1,8 @@
-use crate::errors::Result;
-use crate::{activate_license, check_license, deactivate_license, get_activation_id, ActivateLicenseRequestPayload, CheckActivationRequestPayload, DeactivateLicenseRequestPayload, LicenseCheckStatus};
+use crate::error::Result;
+use crate::{
+    activate_license, check_license, deactivate_license, ActivateLicenseRequestPayload,
+    CheckActivationRequestPayload, DeactivateLicenseRequestPayload, LicenseCheckStatus,
+};
 use log::{debug, info};
 use std::string::ToString;
 use tauri::{command, AppHandle, Manager, Runtime, WebviewWindow};
@@ -7,10 +10,14 @@ use tauri::{command, AppHandle, Manager, Runtime, WebviewWindow};
 #[command]
 pub async fn check<R: Runtime>(app_handle: AppHandle<R>) -> Result<LicenseCheckStatus> {
     debug!("Checking license");
-    check_license(&app_handle, CheckActivationRequestPayload{
-        app_platform: get_os().to_string(),
-        app_version: app_handle.package_info().version.to_string(),
-    }).await
+    check_license(
+        &app_handle,
+        CheckActivationRequestPayload {
+            app_platform: get_os().to_string(),
+            app_version: app_handle.package_info().version.to_string(),
+        },
+    )
+    .await
 }
 
 #[command]

src-tauri/yaak-license/src/lib.rs

@@ -5,7 +5,7 @@ use tauri::{
 };
 
 mod commands;
-mod errors;
+pub mod error;
 mod license;
 
 use crate::commands::{activate, check, deactivate};

src-tauri/yaak-license/src/license.rs

@@ -1,5 +1,5 @@
-use crate::errors::Error::{ClientError, ServerError};
-use crate::errors::Result;
+use crate::error::Error::{ClientError, ServerError};
+use crate::error::Result;
 use chrono::{NaiveDateTime, Utc};
 use log::{debug, info, warn};
 use serde::{Deserialize, Serialize};