Merge pull request #2188 from fishyu-mushroom/main

fix: resolve authentication errors for newly connected assets after org asset ID change

Author: fishyu-mushroom

src/main/index.ts

@@ -2531,8 +2531,9 @@ ipcMain.handle('key-chain-local-update', async (_, data) => {
 
 ipcMain.handle('chaterm-connect-asset-info', async (_, data) => {
   try {
-    const { uuid } = data
-    const result = chatermDbService.connectAssetInfo(uuid)
+    const { uuid, organizationUuid, ip } = data
+    const fallback = organizationUuid || ip ? { organizationUuid, ip } : undefined
+    const result = chatermDbService.connectAssetInfo(uuid, fallback)
     return result
   } catch (error) {
     logger.error('Chaterm get asset info failed', { error: error })

src/main/storage/database.ts

@@ -6,7 +6,7 @@ import { setCurrentUserId } from './db/connection'
 export { ChatermDatabaseService, autoCompleteDatabaseService, setCurrentUserId }
 
 // Export connection asset information for agent Task connection usage
-export async function connectAssetInfo(uuid: string): Promise<any> {
+export async function connectAssetInfo(uuid: string, fallback?: { organizationUuid?: string; ip?: string }): Promise<any> {
   const service = await ChatermDatabaseService.getInstance()
-  return service.connectAssetInfo(uuid)
+  return service.connectAssetInfo(uuid, fallback)
 }

src/main/storage/db/chaterm.service.ts

@@ -240,8 +240,8 @@ export class ChatermDatabaseService {
   getKeyChainList(): any {
     return getKeyChainListLogic(this.db)
   }
-  connectAssetInfo(uuid: string): any {
-    return connectAssetInfoLogic(this.db, uuid)
+  connectAssetInfo(uuid: string, fallback?: { organizationUuid?: string; ip?: string }): any {
+    return connectAssetInfoLogic(this.db, uuid, fallback)
   }
   // @Get user host list (limited)
   getUserHosts(search: string, limit: number = 50): any {

src/main/storage/db/chaterm/assets.organization.ts

@@ -56,7 +56,7 @@ function buildBastionParentTitle(label: string | null | undefined, host: string)
   return name
 }
 
-export function connectAssetInfoLogic(db: Database.Database, uuid: string): any {
+export function connectAssetInfoLogic(db: Database.Database, uuid: string, fallback?: { organizationUuid?: string; ip?: string }): any {
   try {
     const stmt = db.prepare(`
         SELECT uuid, asset_ip, asset_type, auth_type, port, username, password, key_chain_id, need_proxy, proxy_name
@@ -89,6 +89,26 @@ export function connectAssetInfoLogic(db: Database.Database, uuid: string): any
       ;(result as any).host = (result as any).asset_ip
     }
 
+    // Fallback: uuid stale after asset refresh — look up by organizationUuid + host
+    if (!result && fallback?.organizationUuid && fallback?.ip) {
+      const fallbackStmt = db.prepare(`
+        SELECT oa.hostname, oa.host, oa.bastion_comment as comment, a.asset_ip, oa.organization_uuid, oa.uuid, oa.jump_server_type,
+              a.asset_type, a.auth_type, a.port, a.username, a.password, a.key_chain_id, a.need_proxy, a.proxy_name
+        FROM t_organization_assets oa
+        JOIN t_assets a ON oa.organization_uuid = a.uuid
+        WHERE oa.organization_uuid = ? AND oa.host = ?
+        LIMIT 1
+      `)
+      result = fallbackStmt.get(fallback.organizationUuid, fallback.ip)
+      if (result) {
+        if ((result as any).jump_server_type) {
+          sshType = (result as any).jump_server_type
+        } else {
+          sshType = extractBastionType((result as any).asset_type || 'organization')
+        }
+      }
+    }
+
     if (!result) {
       return null
     }

src/preload/index.d.ts

@@ -398,7 +398,7 @@ interface ApiType {
   deleteKeyChain: (data: { id: number }) => Promise<any>
   getKeyChainInfo: (data: { id: number }) => Promise<any>
   updateKeyChain: (data: { form: any }) => Promise<any>
-  connectAssetInfo: (data: { uuid: string }) => Promise<any>
+  connectAssetInfo: (data: { uuid: string; organizationUuid?: string; ip?: string }) => Promise<any>
   openBrowserWindow: (url: string) => Promise<void>
   connect: (connectionInfo: any) => Promise<any>
   forkSession: (params: { sourceConnectionId: string; newConnectionId: string; host: string; port: number; username: string }) => Promise<any>

src/preload/index.ts

@@ -640,7 +640,7 @@ const updateKeyChain = async (data: { form: Record<string, unknown> }) => {
   }
 }
 
-const connectAssetInfo = async (data: { uuid: string }) => {
+const connectAssetInfo = async (data: { uuid: string; organizationUuid?: string; ip?: string }) => {
   try {
     const result = await ipcRenderer.invoke('chaterm-connect-asset-info', data)
     return result

src/renderer/src/views/components/Ssh/sshConnect.vue

@@ -1515,7 +1515,15 @@ const connectSSH = async (_opts?: { isAutoReconnect?: boolean }) => {
 
     try {
       const skipAssetLookup = shouldSkipAssetLookup(props.connectData)
-      const assetInfo = skipAssetLookup ? null : await api.connectAssetInfo({ uuid: props.connectData.uuid })
+      const orgId = props.serverInfo?.organizationId
+      const fallbackOrgUuid = orgId && orgId !== 'personal' ? orgId : undefined
+      const assetInfo = skipAssetLookup
+        ? null
+        : await api.connectAssetInfo({
+            uuid: props.connectData.uuid,
+            organizationUuid: fallbackOrgUuid,
+            ip: props.connectData.ip || props.connectData.host
+          })
       const password = ref('')
       const privateKey = ref('')
       const passphrase = ref('')