GithubBackup/clawpanel
1
0
Fork 0
mirror of https://github.com/qingchencloud/clawpanel.git synced 2026-05-30 04:40:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(channels): stabilize default account selection

Browse Source
This commit is contained in:
晴天
2026-05-23 03:12:40 +08:00
parent 01dff38a97
commit b6a353d622
3 changed files with 124 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/dev-api.js
View File

@@ -2564,8 +2564,20 @@ const MESSAGING_CREDENTIAL_FIELDS = [
'password',
'signingSecret',
'token',
'tokenFile',
]
function hasConfiguredMessagingValue(value) {
if (typeof value === 'string') return value.trim().length > 0
if (normalizeSecretRef(value)) return true
return value !== undefined && value !== null
}
function channelRootHasMessagingCredential(root) {
if (!root || typeof root !== 'object' || Array.isArray(root)) return false
return MESSAGING_CREDENTIAL_FIELDS.some(key => hasConfiguredMessagingValue(root[key]))
}
function preserveMessagingCredentialRefs(entry, form, current) {
delete entry.__secretRefs
for (const key of MESSAGING_CREDENTIAL_FIELDS) {
@@ -3083,12 +3095,19 @@ function mergeMessagingAccountEntry(cfg, storageKey, accountId, entry) {
const root = existingRoot && typeof existingRoot === 'object' && !Array.isArray(existingRoot)
? existingRoot
: { enabled: true }
const accountsBefore = root.accounts && typeof root.accounts === 'object' && !Array.isArray(root.accounts)
? Object.keys(root.accounts).filter(Boolean)
: []
const shouldSetDefaultAccount = !String(root.defaultAccount || '').trim()
&& !channelRootHasMessagingCredential(root)
&& accountsBefore.length === 0
root.enabled = true
if (!root.accounts || typeof root.accounts !== 'object' || Array.isArray(root.accounts)) root.accounts = {}
const existingAccount = root.accounts[accountId]
root.accounts[accountId] = existingAccount && typeof existingAccount === 'object' && !Array.isArray(existingAccount)
? { ...existingAccount, ...entry }
: entry
if (shouldSetDefaultAccount) root.defaultAccount = accountId
cfg.channels[storageKey] = root
}