@cloudbase/auth 3.1.1 → 3.1.3-alpha.0

package/src/index.ts

@@ -754,65 +754,6 @@ class Auth {
     return this.createLoginState()
   }
 
-  /**
-   * 小程序手机号授权登录，目前只支持全托管手机号授权登录
-   * @returns {Promise<LoginState>}
-   * @memberof Auth
-   */
-  // @catchErrorsDecorator({
-  //   title: '小程序手机号授权登录失败',
-  //   messages: [
-  //     '请确认以下各项：',
-  //     '  1 - 当前环境是否开启了小程序手机号授权登录',
-  //     '  2 - 调用 auth().signInWithPhoneAuth() 的语法或参数是否正确',
-  //     `如果问题依然存在，建议到官方问答社区提问或寻找帮助：${COMMUNITY_SITE_URL}`,
-  //   ],
-  // })
-  // public async signInWithPhoneAuth({ phoneCode = '' }): Promise<LoginState> {
-  //   if (!adapterForWxMp.isMatch()) {
-  //     throw Error('wx api undefined')
-  //   }
-  //   const wxInfo = wx.getAccountInfoSync().miniProgram
-  //   const providerInfo = {
-  //     provider_params: { provider_code_type: 'phone' },
-  //     provider_id: wxInfo.appId,
-  //   }
-
-  //   const { code } = await wx.login()
-  //   ;(providerInfo as any).provider_code = code
-
-  //   try {
-  //     let providerToken = await this.oauthInstance.authApi.grantProviderToken(providerInfo)
-  //     if (providerToken.error_code) {
-  //       throw providerToken
-  //     }
-
-  //     providerToken = await this.oauthInstance.authApi.patchProviderToken({
-  //       provider_token: providerToken.provider_token,
-  //       provider_id: wxInfo.appId,
-  //       provider_params: {
-  //         code: phoneCode,
-  //         provider_code_type: 'phone',
-  //       },
-  //     })
-  //     if (providerToken.error_code) {
-  //       throw providerToken
-  //     }
-
-  //     const signInRes = await this.oauthInstance.authApi.signInWithProvider({
-  //       provider_token: providerToken.provider_token,
-  //     })
-
-  //     if ((signInRes as any)?.error_code) {
-  //       throw signInRes
-  //     }
-  //   } catch (error) {
-  //     throw error
-  //   }
-
-  //   return this.createLoginState()
-  // }
-
   /**
    * 小程序短信验证码登陆
    * @returns {Promise<LoginState>}
@@ -2414,17 +2355,17 @@ class Auth {
   }
 
   /**
-   * 小程序手机号授权登录，目前只支持全托管手机号授权登录
+   * 小程序手机号授权登录
    * @param params
    * @returns Promise<SignInRes>
    */
-  async signInWithPhoneAuth({ phoneCode = '' }): Promise<SignInRes> {
+  async signInWithPhoneAuth({ phoneCode = '', useWxCloud = false }): Promise<SignInRes> {
     if (!adapterForWxMp.isMatch()) {
       return { data: {}, error: new AuthError({ message: 'wx api undefined' }) }
     }
     const wxInfo = wx.getAccountInfoSync().miniProgram
     const providerInfo = {
-      provider_params: { provider_code_type: 'phone' },
+      provider_params: { provider_code_type: 'phone', code: phoneCode, appid: wxInfo.appId },
       provider_id: wxInfo.appId,
     }
 
@@ -2432,26 +2373,14 @@ class Auth {
     ;(providerInfo as any).provider_code = code
 
     try {
-      let providerToken = await this.oauthInstance.authApi.grantProviderToken(providerInfo)
-      if (providerToken.error_code) {
-        throw providerToken
-      }
-
-      providerToken = await this.oauthInstance.authApi.patchProviderToken({
-        provider_token: providerToken.provider_token,
-        provider_id: wxInfo.appId,
-        provider_params: {
-          code: phoneCode,
-          provider_code_type: 'phone',
-        },
-      })
+      const providerToken = await this.oauthInstance.authApi.grantProviderToken(providerInfo, useWxCloud)
       if (providerToken.error_code) {
         throw providerToken
       }
 
       const signInRes = await this.oauthInstance.authApi.signInWithProvider({
         provider_token: providerToken.provider_token,
-      })
+      }, useWxCloud)
 
       if ((signInRes as any)?.error_code) {
         throw signInRes