fix: refresh account info before refresh character info

enpitsuLin · Apr 22, 2024 · 945b9f4 · 945b9f4
1 parent 560137b
commit 945b9f4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -39,12 +39,10 @@ async function refreshAccount({ accountMapping, account, token }: { token: strin
   const credData = accountMapping[account.id]
   if (!credData)
     throw new Error(`unexpected error: ID ${account.id} has no its credData`)
-  const valid = await API.skland.checkAccessToken(credData)
-  if (!valid) {
-    const authorizeCode = await API.hypergrayph.grantAuthorizeCode(token)
-    const { userId, ...credData } = await API.skland.generateCredByCode(authorizeCode)
-    accountMapping[userId] = credData
-  }
+
+  const authorizeCode = await API.hypergrayph.grantAuthorizeCode(token)
+  const { userId, ...newCredData } = await API.skland.generateCredByCode(authorizeCode)
+  accountMapping[userId] = newCredData
   const { user, gameStatus } = await API.skland.getUserInfo(credData)
   const binding = await API.skland.getPlayerBinding(credData)
   account.gameStatus = gameStatus

diff --git a/src/utils/proxy-service.ts b/src/utils/proxy-service.ts
@@ -19,9 +19,8 @@ class AccountService {
     const accounts = await accountsStorage.getValue()
     const currentAccountId = await currentAccountStorage.getValue()
     const account = accounts.find(account => account.id === currentAccountId)
-
     if (account)
-      await refreshCharacterInfo()
+      await logInOrRefreshAccount(account.token)
   }
 
   async createRefreshInfoAlarm() {