From 8f5bf13a632a66b225f9939de672658c0a035246 Mon Sep 17 00:00:00 2001
From: wangyaqi <wangyaqi988@163.com>
Date: Tue, 29 Nov 2022 17:03:23 +0800
Subject: [PATCH] fix: check token response error

---
 .../uni-id-co/lib/utils/logout.js             | 96 ++++++++++---------
 1 file changed, 49 insertions(+), 47 deletions(-)

diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/logout.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/logout.js
index 1490cb8..89d7b59 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/logout.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/logout.js
@@ -1,47 +1,49 @@
-const {
-  dbCmd,
-  LOG_TYPE,
-  deviceCollection,
-  userCollection
-} = require('../../common/constants')
-
-async function logout () {
-  const {
-    uniIdToken,
-    deviceId
-  } = this.getUniversalClientInfo()
-  const {
-    uid
-  } = await this.uniIdCommon.checkToken(
-    uniIdToken,
-    {
-      autoRefresh: false
-    }
-  )
-
-  // 删除token
-  await userCollection.doc(uid).update({
-    token: dbCmd.pull(uniIdToken)
-  })
-
-  // 仅当device表的device_id和user_id均对应时才进行更新
-  await deviceCollection.where({
-    device_id: deviceId,
-    user_id: uid
-  }).update({
-    token_expired: 0
-  })
-  await this.middleware.uniIdLog({
-    data: {
-      user_id: uid
-    },
-    type: LOG_TYPE.LOGOUT
-  })
-  return {
-    errCode: 0
-  }
-}
-
-module.exports = {
-  logout
-}
+const {
+  dbCmd,
+  LOG_TYPE,
+  deviceCollection,
+  userCollection
+} = require('../../common/constants')
+
+async function logout () {
+  const {
+    uniIdToken,
+    deviceId
+  } = this.getUniversalClientInfo()
+  const payload = await this.uniIdCommon.checkToken(
+    uniIdToken,
+    {
+      autoRefresh: false
+    }
+  )
+  if (payload.errCode) {
+    throw payload
+  }
+  const uid = payload.uid
+
+  // 删除token
+  await userCollection.doc(uid).update({
+    token: dbCmd.pull(uniIdToken)
+  })
+
+  // 仅当device表的device_id和user_id均对应时才进行更新
+  await deviceCollection.where({
+    device_id: deviceId,
+    user_id: uid
+  }).update({
+    token_expired: 0
+  })
+  await this.middleware.uniIdLog({
+    data: {
+      user_id: uid
+    },
+    type: LOG_TYPE.LOGOUT
+  })
+  return {
+    errCode: 0
+  }
+}
+
+module.exports = {
+  logout
+}
-- 
GitLab