@cloudbase/auth 3.1.4 → 3.1.5

package/src/index.ts

@@ -59,6 +59,7 @@ import {
   UpdateUserReq,
   UpdateUserWithVerificationRes,
   VerifyOAuthReq,
+  VerifyOAuthRes,
   VerifyOtpReq,
 } from './type'
 
@@ -1565,7 +1566,7 @@ class Auth {
    * @param params
    * @returns Promise<SignInRes>
    */
-  async verifyOAuth(params?: VerifyOAuthReq): Promise<SignInRes | LinkIdentityRes> {
+  async verifyOAuth(params?: VerifyOAuthReq): Promise<VerifyOAuthRes> {
     const data: any = {}
     try {
       // 回调至 provider_redirect_uri 地址（url query中携带 授权code，state等参数），此时检查 state 是否符合预期（如 自己设置的 wx_open)
@@ -1597,7 +1598,7 @@ class Auth {
         provider_code: code, // 第三方平台跳转回页面时，url param 中携带的 code 参数
       })
 
-      let res: SignInRes | LinkIdentityRes
+      let res: VerifyOAuthRes
 
       if (cacheData.type === OAUTH_TYPE.BIND_IDENTITY) {
         res = await this.oauthInstance.authApi.toBindIdentity({ provider_token: token, provider, fireEvent: true })
@@ -1612,7 +1613,7 @@ class Auth {
       const localSearch = new URLSearchParams(location?.search)
       localSearch.delete('code')
       localSearch.delete('state')
-      addUrlSearch(
+      res.data.redirectUrl = addUrlSearch(
         cacheData?.search === undefined ? `?${localSearch.toString()}` : cacheData?.search,
         cacheData?.hash || location.hash,
       )

package/src/type.ts

@@ -304,3 +304,14 @@ export interface ResetPasswordForOldReq {
   old_password: string // 旧密码
   new_password: string // 新密码
 }
+
+export interface VerifyOAuthRes {
+  data: {
+    user?: User // 用户信息
+    session?: Session // 会话信息
+    redirectUrl?: string // 跳转URL，跳转第三方授权之前的URL或用户调用 signInWithOAuth 时传入的redirectTo
+    provider?: string // 绑定的身份源标识
+    type?: (typeof OAUTH_TYPE)[keyof typeof OAUTH_TYPE] // 类型（可选），默认为'sign_in', sign_in: 登录，bind_identity: 绑定身份
+  }
+  error: AuthError | null // 错误信息，成功时为null
+}

package/src/utils.ts

@@ -31,7 +31,7 @@ export function removeBrowserSession(key: string) {
   }
 }
 
-export function addUrlSearch(search: Location['search'], hash?: Location['hash']) {
+export function addUrlSearch(search: Location['search'], hash?: Location['hash']): string {
   if (search === undefined) return
 
   // 1. 解析当前 URL
@@ -44,6 +44,8 @@ export function addUrlSearch(search: Location['search'], hash?: Location['hash']
 
   // 3. 更新地址栏（保留哈希值）
   window.history.replaceState({}, '', url.href)
+
+  return url.href
 }
 
 /**