diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lang/zh-hans.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lang/zh-hans.js index a42f06dba630fe1bd5d803b028d41f8bb0f83577..3c69c9ff19f8e0311e092fe22e1b9068b8493f1f 100644 --- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lang/zh-hans.js +++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lang/zh-hans.js @@ -4,6 +4,8 @@ const word = { } const sentence = { + 'uni-id-token-expired': '登录状态失效,token已过期', + 'uni-id-check-token-failed': 'token校验未通过', 'uni-id-account-exists': '此账号已注册', 'uni-id-account-not-exists': '此账号未注册', 'uni-id-account-not-exists-in-current-app': '此账号未在该应用注册', diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/login.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/login.js index 6f863bce2c5169501379166081fd372e29f9c9c8..00beec9d4a1c0ca78c8d2a2f29b96022a8bb3cc0 100644 --- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/login.js +++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/login.js @@ -194,12 +194,18 @@ async function postLogin (params = {}) { last_login_ip: clientIP, ...extraData } + const createTokenRes = await this.uniIdCommon.createToken({ + uid + }) + const { + errCode, token, tokenExpired - } = await this.uniIdCommon.createToken({ - uid - }) + } = createTokenRes + if (errCode) { + throw createTokenRes + } if (uniIdToken) { try { diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/register.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/register.js index 24eec342d80451c5d0989b1fa47d992abcd84cde..a500b84da7d1f5c76ae873b0f24161d95ab23a4d 100644 --- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/register.js +++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/register.js @@ -157,7 +157,7 @@ async function postRegister (params = {}) { if (uniIdToken) { try { await logout.call(this) - } catch (error) {} + } catch (error) { } } const beforeRegister = this.hooks.beforeRegister @@ -173,12 +173,19 @@ async function postRegister (params = {}) { id: uid } = await userCollection.add(userRecord) + const createTokenRes = await this.uniIdCommon.createToken({ + uid + }) + const { + errCode, token, tokenExpired - } = await this.uniIdCommon.createToken({ - uid - }) + } = createTokenRes + + if (errCode) { + throw createTokenRes + } await this.middleware.uniIdLog({ data: { diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/refresh-token.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/refresh-token.js index 4b0d0a879ccb1529860d25d9a4a940f91c15a4d9..b12f1f0698efcdf9e389a133229d2c53ee907167 100644 --- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/refresh-token.js +++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/refresh-token.js @@ -3,12 +3,17 @@ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#refresh-token */ module.exports = async function () { + const refreshTokenRes = await this.uniIdCommon.refreshToken({ + token: this.getUniversalUniIdToken() + }) const { + errCode, token, tokenExpired - } = await this.uniIdCommon.refreshToken({ - token: this.getUniversalUniIdToken() - }) + } = refreshTokenRes + if (errCode) { + throw refreshTokenRes + } return { errCode: 0, newToken: {