Feat: Licensing: test, handle address, tax ID, etc

Website:
- Refactor org name form, get it to a working state
- Add pricing page tests
App frontend:
- Make local app connect to local license server, not live one
- Make license details dialog different if there is a license
- Customize links in About window
App backend:
- Add license shortcodes to make it all work

Author: vdavid

apps/desktop/src-tauri/src/lib.rs

@@ -126,9 +126,17 @@ pub fn run() {
             // Load persisted settings to initialize menu with correct state
             let saved_settings = settings::load_settings(app.handle());
 
+            // Check if there's an existing license (for menu text)
+            let has_existing_license = licensing::get_license_info(app.handle()).is_some();
+
             // Build and set the application menu with persisted showHiddenFiles
             // Note: view mode is per-pane and managed by frontend, so we default to Brief here
-            let menu_items = menu::build_menu(app.handle(), saved_settings.show_hidden_files, ViewMode::Brief)?;
+            let menu_items = menu::build_menu(
+                app.handle(),
+                saved_settings.show_hidden_files,
+                ViewMode::Brief,
+                has_existing_license,
+            )?;
             app.set_menu(menu_items.menu)?;
 
             // Store the CheckMenuItem references in app state

apps/desktop/src-tauri/src/licensing/mod.rs

@@ -19,7 +19,9 @@ use serde::{Deserialize, Serialize};
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct LicenseData {
     pub email: String,
+    #[serde(rename = "transactionId")]
     pub transaction_id: String,
+    #[serde(rename = "issuedAt")]
     pub issued_at: String,
     #[serde(rename = "type")]
     pub license_type: Option<String>,

apps/desktop/src-tauri/src/licensing/validation_client.rs

@@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize};
 
 /// License server URL (configured at compile time).
 #[cfg(debug_assertions)]
-const LICENSE_SERVER_URL: &str = "https://license.getcmdr.com"; // Use same URL in debug
+const LICENSE_SERVER_URL: &str = "http://localhost:8787";
 
 #[cfg(not(debug_assertions))]
 const LICENSE_SERVER_URL: &str = "https://license.getcmdr.com";

apps/desktop/src-tauri/src/licensing/verification.rs

@@ -14,6 +14,7 @@ use tauri_plugin_store::StoreExt;
 const PUBLIC_KEY_HEX: &str = "c3b18e765fc5c74f9fb7f3a9869d14c6bdeda1f28ec85aa6182de78113930d26";
 
 const STORE_KEY_LICENSE: &str = "license_key";
+const STORE_KEY_SHORT_CODE: &str = "license_short_code";
 
 /// Information about the current license.
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -23,53 +24,74 @@ pub struct LicenseInfo {
     pub transaction_id: String,
     pub issued_at: String,
     pub organization_name: Option<String>,
+    /// The short code used to activate (if available)
+    pub short_code: Option<String>,
 }
 
 /// Activate a license key. Returns the license info if valid.
-pub fn activate_license(app: &tauri::AppHandle, license_key: &str) -> Result<LicenseInfo, String> {
+/// The `short_code` parameter is the original short code if this was activated via short code exchange.
+fn activate_license_internal(
+    app: &tauri::AppHandle,
+    license_key: &str,
+    short_code: Option<&str>,
+) -> Result<LicenseInfo, String> {
     // Validate the license key
     let data = validate_license_key(license_key)?;
 
-    // Store the license key
+    // Store the license key and optionally the short code
     let store = app
         .store("license.json")
         .map_err(|e| format!("Failed to open store: {}", e))?;
 
     store.set(STORE_KEY_LICENSE, serde_json::json!(license_key));
+    if let Some(code) = short_code {
+        store.set(STORE_KEY_SHORT_CODE, serde_json::json!(code));
+    }
 
     Ok(LicenseInfo {
         email: data.email,
         transaction_id: data.transaction_id,
         issued_at: data.issued_at,
         organization_name: data.organization_name,
+        short_code: short_code.map(|s| s.to_string()),
     })
 }
 
+/// Activate a license key (full key, not short code). Returns the license info if valid.
+pub fn activate_license(app: &tauri::AppHandle, license_key: &str) -> Result<LicenseInfo, String> {
+    activate_license_internal(app, license_key, None)
+}
+
 /// Activate a license key or short code (async version).
 /// If the input is a short code (CMDR-XXXX-XXXX-XXXX), it first exchanges it for the full key.
 pub async fn activate_license_async(app: &tauri::AppHandle, input: &str) -> Result<LicenseInfo, String> {
-    let full_key = if is_short_code(input) {
+    let (full_key, short_code) = if is_short_code(input) {
         // Exchange short code for full key via server
-        activate_short_code(input).await?
+        let key = activate_short_code(input).await?;
+        (key, Some(input))
     } else {
         // Already a full key
-        input.to_string()
+        (input.to_string(), None)
     };
 
-    // Now activate with the full key
-    activate_license(app, &full_key)
+    // Now activate with the full key (and store the short code if we have one)
+    activate_license_internal(app, &full_key, short_code)
 }
 
 /// Get stored license info, if any.
 pub fn get_license_info(app: &tauri::AppHandle) -> Option<LicenseInfo> {
     let store = app.store("license.json").ok()?;
     let license_key = store.get(STORE_KEY_LICENSE)?.as_str()?.to_string();
+    let short_code = store
+        .get(STORE_KEY_SHORT_CODE)
+        .and_then(|v| v.as_str().map(|s| s.to_string()));
 
     validate_license_key(&license_key).ok().map(|data| LicenseInfo {
         email: data.email,
         transaction_id: data.transaction_id,
         issued_at: data.issued_at,
         organization_name: data.organization_name,
+        short_code,
     })
 }
 
@@ -114,8 +136,16 @@ fn validate_license_key_with_public_key(license_key: &str, public_key_hex: &str)
         .map_err(|_| "Invalid license key: signature verification failed")?;
 
     // Parse payload
-    let data: LicenseData =
-        serde_json::from_slice(&payload_bytes).map_err(|_| "Invalid license key: bad payload data")?;
+    let data: LicenseData = serde_json::from_slice(&payload_bytes).map_err(|e| {
+        log::info!(
+            "License payload parse error: {}. Raw payload: {}",
+            e,
+            String::from_utf8_lossy(&payload_bytes)
+        );
+        "Invalid license key: bad payload data"
+    })?;
+
+    log::info!("License validated successfully for: {}", data.email);
 
     Ok(data)
 }

apps/desktop/src-tauri/src/menu.rs

@@ -91,6 +91,7 @@ pub fn build_menu<R: Runtime>(
     app: &AppHandle<R>,
     show_hidden_files: bool,
     view_mode: ViewMode,
+    has_existing_license: bool,
 ) -> tauri::Result<MenuItems<R>> {
     // Start with the default menu (includes app menu with Quit, Hide, etc.)
     let menu = Menu::default(app)?;
@@ -113,11 +114,16 @@ pub fn build_menu<R: Runtime>(
                             submenu.remove(pred)?;
                             submenu.insert(&about_item, 0)?;
 
-                            // Add "Enter License Key..." after About
+                            // Add license menu item after About - text depends on license status
+                            let license_menu_text = if has_existing_license {
+                                "See license details..."
+                            } else {
+                                "Enter license key..."
+                            };
                             let enter_license_key_item = tauri::menu::MenuItem::with_id(
                                 app,
                                 ENTER_LICENSE_KEY_ID,
-                                "Enter license key...",
+                                license_menu_text,
                                 true,
                                 None::<&str>,
                             )?;

apps/desktop/src/lib/licensing/AboutWindow.svelte

@@ -67,6 +67,20 @@
         }
     }
 
+    // Determine if we should show the Upgrade link
+    function shouldShowUpgradeLink(): boolean {
+        if (!status) return true // No license - show upgrade
+        if (status.type === 'personal') return true
+        if (status.type === 'expired') return true
+        // Supporter and commercial don't show the generic upgrade link
+        return false
+    }
+
+    // Determine if we should show the commercial upgrade prompt (for supporters)
+    function shouldShowCommercialPrompt(): boolean {
+        return status?.type === 'supporter'
+    }
+
     function handleKeydown(event: KeyboardEvent) {
         // Stop propagation to prevent file explorer from handling keys while modal is open
         event.stopPropagation()
@@ -110,14 +124,24 @@
 
             <div class="license-info">
                 <p class="license-description">{getLicenseDescription()}</p>
+                {#if shouldShowCommercialPrompt()}
+                    <p class="commercial-prompt">
+                        Also using Cmdr for work? You must <a
+                            href="https://getcmdr.com/pricing"
+                            onclick={handleLinkClick('https://getcmdr.com/pricing')}>upgrade to a commercial license</a
+                        >.
+                    </p>
+                {/if}
             </div>
 
             <div class="links">
                 <a href="https://getcmdr.com" onclick={handleLinkClick('https://getcmdr.com')}>Website</a>
-                <span class="separator">•</span>
-                <a href="https://getcmdr.com/pricing" onclick={handleLinkClick('https://getcmdr.com/pricing')}
-                    >Upgrade</a
-                >
+                {#if shouldShowUpgradeLink()}
+                    <span class="separator">•</span>
+                    <a href="https://getcmdr.com/pricing" onclick={handleLinkClick('https://getcmdr.com/pricing')}
+                        >Upgrade</a
+                    >
+                {/if}
                 <span class="separator">•</span>
                 <a href="https://github.com/vdavid/cmdr" onclick={handleLinkClick('https://github.com/vdavid/cmdr')}
                     >GitHub</a
@@ -227,6 +251,22 @@
         margin: 0;
     }
 
+    .commercial-prompt {
+        color: var(--color-text-secondary, #aaa);
+        font-size: 13px;
+        line-height: 1.5;
+        margin: 12px 0 0;
+    }
+
+    .commercial-prompt a {
+        color: var(--color-accent);
+        text-decoration: underline;
+    }
+
+    .commercial-prompt a:hover {
+        color: var(--color-accent-hover, #6eb5ff);
+    }
+
     .links {
         margin-bottom: 16px;
     }