NYM-589: privy linking fixes (#4718)

Author: agentpietrucha

nym-vpn-app/CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Improve Accessibility for sliders
+- Fix privy social linking check
 
 ## [1.24.0] - 2026-02-17
 

nym-vpn-app/src-tauri/src/commands/account.rs

@@ -2,8 +2,8 @@ use tauri::State;
 use tracing::{error, info, instrument, warn};
 
 use crate::state::SharedAppState;
-use crate::vpnd::account::AccountState;
 use crate::vpnd::account::StoredAccountMode;
+use crate::vpnd::account::{AccountState, AccountSummary};
 use crate::vpnd::account_links::AccountLinks;
 use crate::vpnd::tunnel::TunnelState;
 use crate::{error::BackendError, vpnd::client::VpndClient};
@@ -166,3 +166,14 @@ pub async fn get_account_mode(
         e.into()
     })
 }
+
+#[instrument(skip_all)]
+#[tauri::command]
+pub async fn get_account_summary(
+    vpnd: State<'_, VpndClient>,
+) -> Result<Option<AccountSummary>, BackendError> {
+    vpnd.get_account_summary().await.map_err(|e| {
+        error!("failed to get account summary: {e}");
+        e.into()
+    })
+}

nym-vpn-app/src-tauri/src/main.rs

@@ -301,6 +301,7 @@ async fn main() -> Result<()> {
             account::account_links,
             account::get_deep_link,
             account::store_deeplink_account,
+            account::get_account_summary,
             cmd_daemon::daemon_status,
             cmd_daemon::set_network,
             cmd_daemon::system_messages,

nym-vpn-app/src-tauri/src/vpnd/account.rs

@@ -92,3 +92,76 @@ impl From<lib::StoredAccountMode> for StoredAccountMode {
         }
     }
 }
+
+#[derive(Serialize, Clone, Debug, PartialEq, TS)]
+#[ts(export, export_to = "tauri.ts", rename = "TAccountSummary")]
+#[serde(rename_all = "kebab-case")]
+pub struct AccountSummary {
+    pub subscription_valid_until: Option<String>,
+    pub traffic_used_gb: u64,
+    pub traffic_limit_gb: u64,
+    pub traffic_reset_time: Option<String>,
+    pub account_addr: String,
+    pub canonical_account_addr: Option<String>,
+    pub auth_methods: Vec<AuthMethod>,
+}
+
+impl From<lib::VpnAccountSummary> for AccountSummary {
+    fn from(summary: lib::VpnAccountSummary) -> Self {
+        AccountSummary {
+            subscription_valid_until: summary.subscription_valid_until.map(|dt| dt.to_string()),
+            traffic_used_gb: summary.traffic_used_gb,
+            traffic_limit_gb: summary.traffic_limit_gb,
+            traffic_reset_time: summary.traffic_reset_time.map(|dt| dt.to_string()),
+            account_addr: summary.account_addr,
+            canonical_account_addr: summary.canonical_account_addr,
+            auth_methods: summary
+                .auth_methods
+                .into_iter()
+                .map(AuthMethod::from)
+                .collect(),
+        }
+    }
+}
+
+#[derive(Serialize, Clone, Debug, PartialEq, TS)]
+#[ts(export, export_to = "tauri.ts", rename = "TAuthMethod")]
+#[serde(rename_all = "kebab-case")]
+pub struct AuthMethod {
+    pub id: String,
+    pub pubkey: String,
+    pub kind: String,
+    pub label: String,
+    pub status: VpnAccountStatus,
+}
+
+impl From<lib::VpnAccountAuthMethod> for AuthMethod {
+    fn from(auth_method: lib::VpnAccountAuthMethod) -> Self {
+        AuthMethod {
+            id: auth_method.id,
+            pubkey: auth_method.pubkey,
+            kind: auth_method.kind,
+            label: auth_method.label,
+            status: auth_method.status.into(),
+        }
+    }
+}
+
+#[derive(Serialize, Clone, Debug, PartialEq, TS)]
+#[ts(export, export_to = "tauri.ts", rename = "TVpnAccountStatus")]
+#[serde(rename_all = "kebab-case")]
+pub enum VpnAccountStatus {
+    Active,
+    Inactive,
+    DeleteMe,
+}
+
+impl From<lib::VpnAccountStatus> for VpnAccountStatus {
+    fn from(status: lib::VpnAccountStatus) -> Self {
+        match status {
+            lib::VpnAccountStatus::Active => VpnAccountStatus::Active,
+            lib::VpnAccountStatus::Inactive => VpnAccountStatus::Inactive,
+            lib::VpnAccountStatus::DeleteMe => VpnAccountStatus::DeleteMe,
+        }
+    }
+}

nym-vpn-app/src-tauri/src/vpnd/client.rs

@@ -1,5 +1,5 @@
 pub use super::{
-    account::StoredAccountMode,
+    account::{AccountSummary, StoredAccountMode},
     account_links::AccountLinks,
     error::VpndError,
     feature_flags::FeatureFlags,
@@ -908,4 +908,15 @@ impl VpndClient {
             .or_else(async |e| self.handle_rpc_error("set_mixnet_traffic_config", e).await)
             .await
     }
+
+    pub async fn get_account_summary(&self) -> Result<Option<AccountSummary>, VpndError> {
+        let mut vpnd = self.vpnd().await?;
+
+        let summary = vpnd
+            .get_account_summary()
+            .or_else(async |e| self.handle_rpc_error("get_account_summary", e).await)
+            .await?;
+
+        Ok(summary.map(Into::into))
+    }
 }

nym-vpn-app/src/contexts/main/reducer.ts

@@ -21,6 +21,7 @@ import {
   ProgressMsg,
   SelectedNode,
   TAccountMode,
+  TAccountSummary,
   ThemeMode,
   Tunnel,
   TunnelAction,
@@ -85,7 +86,8 @@ export type StateAction =
   | { type: 'set-custom-dns'; dns: string[] }
   | { type: 'set-default-dns'; dns: string[] }
   | { type: 'set-enable-lewes-protocol'; enabled: boolean }
-  | { type: 'set-mixnet-traffic-config'; config: MixnetTrafficConfig };
+  | { type: 'set-mixnet-traffic-config'; config: MixnetTrafficConfig }
+  | { type: 'set-account-summary'; summary: TAccountSummary };
 
 export const initialState: AppState = {
   initialized: false,
@@ -94,6 +96,7 @@ export const initialState: AppState = {
   tunnelError: null,
   accountState: null,
   accountMode: null,
+  accountSummary: null,
   accountSyncing: false,
   accountError: null,
   daemonStatus: 'down',
@@ -457,6 +460,11 @@ export function reducer(state: AppState, action: StateAction): AppState {
         ...state,
         mixnetTrafficConfig: action.config,
       };
+    case 'set-account-summary':
+      return {
+        ...state,
+        accountSummary: action.summary,
+      };
     case 'reset':
       return initialState;
   }

nym-vpn-app/src/screens/settings/account/Account.tsx

@@ -1,5 +1,5 @@
 import { useTranslation } from 'react-i18next';
-import { useCallback, useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
 import { invoke } from '@tauri-apps/api/core';
 import { openUrl } from '@tauri-apps/plugin-opener';
 import { useNavigate } from 'react-router';
@@ -23,7 +23,7 @@ import {
 } from '../../../contexts';
 import { routes } from '../../../router';
 import { useDeepLink, useLogout } from '../../../hooks';
-import { StateDispatch, TAccountMode } from '../../../types';
+import { StateDispatch, TAccountMode, TAccountSummary } from '../../../types';
 import { getAccountColor, getAccountDescription } from './utils';
 
 const IdsTimeToLive = 120; // sec
@@ -40,6 +40,7 @@ function Account() {
     accountSyncing,
     daemonStatus,
     accountMode,
+    accountSummary,
     backendFlags,
   } = useMainState();
   const dispatch = useMainDispatch() as StateDispatch;
@@ -49,29 +50,43 @@ function Account() {
       accountState === 'bandwidth-exceeded');
 
   const [isAccountLinking, setIsAccountLinking] = useState(false);
-  const [accountId, setAccountId] = useState<string | null>(null);
   const [deviceId, setDeviceId] = useState<string | null>(null);
 
-  const linkable = accountMode === 'api';
+  // Privy and linking logic
+  const isLoggedWithPrivy = accountMode === 'privy';
+  const isDifferentCanonical =
+    accountSummary?.['account-addr'] !==
+    accountSummary?.['canonical-account-addr'];
+  const hasLinkedAuthMethod = accountSummary?.['auth-methods']?.some(
+    (it) => it.label === 'Social login' || it.label === 'Passphrase',
+  );
+
+  const isAccountLinked =
+    isLoggedWithPrivy || isDifferentCanonical || hasLinkedAuthMethod;
 
   const { startListening } = useDeepLink();
   const { push } = useInAppNotify();
 
-  const getAccountId = async () => {
-    const accountId = await CCache.get<string>('cache-account-id');
-    if (accountId) {
-      setAccountId(accountId);
-      return;
+  const refreshAccount = async () => {
+    try {
+      const summary = await invoke<TAccountSummary>('get_account_summary');
+      dispatch({ type: 'set-account-summary', summary });
+    } catch (err) {
+      console.error('Failed to get account summary', err);
     }
     try {
-      const accountId = await invoke<string>('get_account_id');
-      setAccountId(accountId);
-      CCache.set('cache-account-id', accountId, IdsTimeToLive);
-    } catch {
-      setAccountId(null);
+      const mode = await invoke<TAccountMode>('get_account_mode');
+      dispatch({ type: 'set-account-mode', mode });
+    } catch (err) {
+      console.error('Failed to get account mode', err);
     }
   };
 
+  useEffect(() => {
+    refreshAccount();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
   const getDeviceId = async () => {
     const deviceId = await CCache.get<string>('cache-device-id');
     if (deviceId) {
@@ -88,19 +103,14 @@ function Account() {
   };
 
   useEffect(() => {
-    getAccountId();
     getDeviceId();
   }, []);
 
+  // When logged out, navigate to settings
   useEffect(() => {
     if (!account) navigate(routes.settings, { replace: true });
   }, [account, navigate]);
 
-  const refreshAccountMode = useCallback(async () => {
-    const mode = await invoke<TAccountMode>('get_account_mode');
-    dispatch({ type: 'set-account-mode', mode });
-  }, [dispatch]);
-
   const handleAccountLink = async () => {
     setIsAccountLinking(true);
 
@@ -121,7 +131,7 @@ function Account() {
       await invoke('store_deeplink_account', {
         callbackUrl: deeplinkUrl,
       });
-      await refreshAccountMode();
+      await refreshAccount();
     } catch (error) {
       console.error('Account login error: ', error);
       if (error instanceof Error && error.message === 'Login timeout') {
@@ -177,7 +187,7 @@ function Account() {
             trailingIcon: 'open_in_new',
             onClick: handleManageSubscription,
           },
-          ...(backendFlags.privy && linkable
+          ...(backendFlags.privy && isAccountLinked
             ? [
                 {
                   title: t('account.account-on-nym'),
@@ -194,7 +204,7 @@ function Account() {
 
       {backendFlags.privy && (
         <p className="text-sm text-iron dark:text-bombay">
-          {linkable
+          {isAccountLinked
             ? t('account.account-not-linked')
             : t('account.account-linked')}
         </p>
@@ -211,9 +221,10 @@ function Account() {
         </CardNewHeader>
         <CardNewBody className="pb-5">
           <CardNewCopyableRow
-            value={accountId ?? ''}
-            label={accountId ?? ''}
-            loading={!accountId}
+            // Displaying canonical account address, as this is NYM's default account address
+            value={accountSummary?.['canonical-account-addr'] ?? ''}
+            label={accountSummary?.['canonical-account-addr'] ?? ''}
+            loading={!accountSummary?.['canonical-account-addr']}
           />
         </CardNewBody>
       </CardNew>

nym-vpn-app/src/state/init.ts

@@ -15,6 +15,7 @@ import {
   StateDispatch,
   TAccountMode,
   TAccountState,
+  TAccountSummary,
   TTunnelState,
   ThemeMode,
   UiTheme,
@@ -81,6 +82,18 @@ export async function initFirstBatch(
     },
   };
 
+  const getAccountSummaryRq: TauriReq<
+    () => Promise<TAccountSummary | undefined>
+  > = {
+    name: 'getAccountSummaryRq',
+    request: () => invoke<TAccountSummary>('get_account_summary'),
+    onFulfilled: (summary) => {
+      if (summary) {
+        dispatch({ type: 'set-account-summary', summary });
+      }
+    },
+  };
+
   const getFeatureFlagsRq: TauriReq<() => Promise<FeatureFlags | undefined>> = {
     name: 'getFeatureFlagsRq',
     request: () => invoke<FeatureFlags>('feature_flags'),
@@ -214,6 +227,7 @@ export async function initFirstBatch(
       getStoredAccountRq,
       getAccountStateRq,
       getAccountModeRq,
+      getAccountSummaryRq,
       getFeatureFlagsRq,
       ...requests,
     ];

nym-vpn-app/src/types/app-state.ts

@@ -11,6 +11,7 @@ import {
   NetworkEnv,
   SelectedNode,
   TAccountMode,
+  TAccountSummary,
   ThemeMode,
   Tunnel,
   TunnelError,
@@ -57,6 +58,7 @@ export type AppState = {
   tunnelError?: TunnelError | null;
   accountState?: AccountState | null;
   accountMode?: TAccountMode | null;
+  accountSummary?: TAccountSummary | null;
   accountError?: AppError | null;
   accountSyncing: boolean;
   daemonStatus: DaemonStatus;