@cloudbase/auth 3.3.1 → 3.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/auth",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "cloudbase javascript sdk auth componets",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -32,14 +32,14 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@cloudbase/adapter-wx_mp": "^1.3.1",
-    "@cloudbase/oauth": "3.3.1",
-    "@cloudbase/utilities": "3.3.1"
+    "@cloudbase/oauth": "3.3.2",
+    "@cloudbase/utilities": "3.3.2"
   },
   "devDependencies": {
-    "@cloudbase/types": "3.3.1",
+    "@cloudbase/types": "3.3.2",
     "@types/node": "^22.1.0",
     "terser-webpack-plugin": "^3.0.2",
     "webpack-bundle-analyzer": "^4.9.1"
   },
-  "gitHead": "47325e0441df3d283a99da62ce7d27ea042b69f8"
+  "gitHead": "129b3ef32376458210158ee295e1a1be8a1362bc"
 }

package/src/index.ts

@@ -967,7 +967,7 @@ class Auth extends AuthV1Compat {
         return { data: { session: null }, error: null }
       }
 
-      const { data: { user } = {} } = await this.getUser()
+      const { data: { user } = {} } = await this.getUser(false)
 
       return { data: { session: { ...credentials, user }, user }, error: null }
     } catch (error) {
@@ -986,7 +986,7 @@ class Auth extends AuthV1Compat {
       const credentials: Credentials = await this.oauthInstance.oauth2client.localCredentials.getCredentials()
       credentials.refresh_token = refresh_token || credentials.refresh_token
       const newTokens = await this.oauthInstance.oauth2client.refreshToken(credentials)
-      const { data: { user } = {} } = await this.getUser()
+      const { data: { user } = {} } = await this.getUser(false)
 
       return { data: { user, session: { ...newTokens, user } }, error: null }
     } catch (error) {
@@ -999,9 +999,9 @@ class Auth extends AuthV1Compat {
    * 如果存在现有会话，则获取当前用户详细信息
    * @returns Promise<GetUserRes>
    */
-  async getUser(): Promise<GetUserRes> {
+  async getUser(isRefresh = true): Promise<GetUserRes> {
     try {
-      const user = this.convertToUser(await this.getCurrentUser())
+      const user = this.convertToUser(await this.getCurrentUser(isRefresh))
       return { data: { user }, error: null }
     } catch (error) {
       return { data: {}, error: new AuthError(error, { method: 'getUser' }) }
@@ -1101,7 +1101,7 @@ class Auth extends AuthV1Compat {
 
               const {
                 data: { user },
-              } = await this.getUser()
+              } = await this.getUser(false)
               this.config.eventBus?.fire(EVENTS.AUTH_STATE_CHANGED, { event: AUTH_STATE_CHANGED_TYPE.USER_UPDATED })
 
               return { data: { user }, error: null }
@@ -1116,7 +1116,7 @@ class Auth extends AuthV1Compat {
       }
       const {
         data: { user },
-      } = await this.getUser()
+      } = await this.getUser(false)
       this.config.eventBus?.fire(EVENTS.AUTH_STATE_CHANGED, { event: AUTH_STATE_CHANGED_TYPE.USER_UPDATED })
 
       return { data: { user, ...extraRes }, error: null }
@@ -1201,7 +1201,7 @@ class Auth extends AuthV1Compat {
     try {
       const {
         data: { user },
-      } = await this.getUser()
+      } = await this.getUser(false)
 
       this.validateAtLeastOne(user, [['email', 'phone']], 'You must provide either an email or phone number')
       const userInfo = user.email ? { email: user.email } : { phone_number: this.formatPhone(user.phone) }
@@ -1644,7 +1644,19 @@ class Auth extends AuthV1Compat {
       `如果问题依然存在，建议到官方问答社区提问或寻找帮助：${COMMUNITY_SITE_URL}`,
     ],
   })
-  public async getCurrentUser(): Promise<(authModels.UserInfo & Partial<User>) | null> {
+  public async getCurrentUser(isRefresh = true): Promise<(authModels.UserInfo & Partial<User>) | null> {
+    try {
+      if (isRefresh) {
+        const loginState = await this.getLoginState()
+        if (loginState) {
+          // 每次都发请求获取最新用户信息，不走缓存
+          await loginState.user.refresh()
+        }
+      }
+    } catch (error) {
+      //
+    }
+
     const loginState = await this.getLoginState()
     if (loginState) {
       const userInfo = loginState.user.getLocalUserInfo() as authModels.UserInfo