Merge pull request #187 from Authing/feat-loginByCodeAndPhone

feat: login by code and phone

Author: zhaoyiming0803

examples/miniapp-wx/miniapp/miniprogram_npm/@authing/miniapp-jsencrypt/index.js

@@ -7,9 +7,9 @@ import { Authing } from '@authing/miniapp-wx'
 import { encryptFunction } from '@authing/miniapp-sm2encrypt'
 
 const authing = new Authing({
-  appId: '630ed3137dd6f2fd7001da24',
-  host: 'https://test-auth-zhaoyiming.authing.cn',
-  userPoolId: '62e221f85f5ac5cc47037a39',
+  appId: '63b4718d86ef2f8dd654c153',
+  host: 'https://core.authing.me',
+  userPoolId: '59f86b4832eb28071bdd9214',
   encryptFunction
 })
 
@@ -66,6 +66,22 @@ Page({
     console.log('authing.loginByPassword res: ', res)
   },
 
+  async loginByCodeAndPhone (e) {
+    const { code } = e.detail
+
+    authing.loginByCodeAndPhone({
+      extIdpConnidentifier: 'root-wx-miniapp-scan-login',
+      wechatMiniProgramCodeAndPhonePayload: {
+        wxPhoneInfo: {
+          code
+        }
+      },
+      options: {
+        scope: 'openid profile offline_access'
+      }
+    })
+  },
+
   async sendSms () {
     // 指定 channel 为 CHANNEL_LOGIN，发送登录所用的验证码
     const res = await authing.sendSms({

examples/miniapp-wx/miniapp/miniprogram_npm/@authing/miniapp-sm2encrypt/index.js

@@ -2,6 +2,7 @@
 <button bindtap="loginByPhone">loginByPhone</button>
 <button open-type="getPhoneNumber" bindgetphonenumber="getPhone">getPhone</button>
 <button bindtap="loginByPassword">loginByPassword</button>
+<button open-type="getPhoneNumber" bindgetphonenumber="loginByCodeAndPhone">loginByCodeAndPhone</button>
 
 <!-- 发送手机短信验证码 -->
 <button bindtap="sendSms">sendSms</button>

examples/miniapp-wx/miniapp/miniprogram_npm/@authing/miniapp-wx/index.js

@@ -18,7 +18,9 @@ import {
 	LoginByCodeOptions,
 	SDKResponse,
 	UpdateUserInfo,
-	SimpleResponseData
+	SimpleResponseData,
+	WxCodeAndPhoneLoginOptions,
+	LoginByCodeAndPhoneOptions
 } from './types'
 
 import { returnSuccess, returnError } from './helpers/return'
@@ -272,6 +274,43 @@ export class Authing {
 		return await this.login(_data, 'passCode')
 	}
 
+	/**
+	 * 仅限 Authing Cloud 小程序使用
+	 */
+	async loginByCodeAndPhone (data: LoginByCodeAndPhoneOptions): Promise<SDKResponse<LoginState>> {
+		const [, loginState] = await this.getLoginState()
+
+		if (loginState && loginState.expires_at > Date.now()) {
+			return returnSuccess(loginState)
+		}
+
+		const { extIdpConnidentifier, wechatMiniProgramCodeAndPhonePayload, options } = data
+
+		const code  = await this.resetWxLoginCode()
+
+		if (!code) {
+			return returnError({
+				message: 'get wx login code error'
+			})
+		}
+
+		const _data: WxCodeAndPhoneLoginOptions = {
+			connection: 'wechat_mini_program_code_and_phone',
+			extIdpConnidentifier,
+			wechatMiniProgramCodeAndPhonePayload: {
+				wxPhoneInfo: wechatMiniProgramCodeAndPhonePayload.wxPhoneInfo,
+				wxLoginInfo: {
+					encryptedData: wechatMiniProgramCodeAndPhonePayload?.wxLoginInfo?.encryptedData || '',
+					iv: wechatMiniProgramCodeAndPhonePayload?.wxLoginInfo?.iv || '',
+					code
+				}
+			},
+			options
+		}
+
+		return await this.login(_data, 'codeAndPhone')
+	}
+
 	async logout(): Promise<SDKResponse<boolean>> {
   	const [loginStateError, loginState] = await this.getLoginState()
 
@@ -332,12 +371,14 @@ export class Authing {
       | WxCodeLoginOptions
       | WxPhoneLoginOptions
       | PasswordLoginOptions
-      | PassCodeLoginOptions,
+      | PassCodeLoginOptions
+			| WxCodeAndPhoneLoginOptions,
 		type: string
 	): Promise<SDKResponse<LoginState>> {
 		const urlMap: Record<string, string> = {
 			code: '/api/v3/signin-by-mobile',
 			phone: '/api/v3/signin-by-mobile',
+			codeAndPhone: '/api/v3/signin-by-mobile',
 			password: '/api/v3/signin',
 			passCode: '/api/v3/signin'
 		}

examples/miniapp-wx/miniapp/miniprogram_npm/@authing/miniapp-wx/index.js.map

@@ -94,6 +94,36 @@ export interface WxPhoneLoginOptions {
   options?: LoginOptions
 }
 
+export interface LoginByCodeAndPhoneOptions {
+  extIdpConnidentifier: string
+  wechatMiniProgramCodeAndPhonePayload: {
+    wxLoginInfo?: {
+      encryptedData?: string
+      iv?: string
+    },
+    wxPhoneInfo: {
+      code: string
+    }
+  }
+  options?: LoginOptions
+}
+
+export interface WxCodeAndPhoneLoginOptions {
+  connection: 'wechat_mini_program_code_and_phone'
+  extIdpConnidentifier: string
+  wechatMiniProgramCodeAndPhonePayload: {
+    wxLoginInfo: {
+      encryptedData: string
+      iv: string
+      code: string
+    }
+    wxPhoneInfo: {
+      code: string
+    }
+  }
+  options?: LoginOptions
+}
+
 export interface PasswordLoginOptions {
   connection?: 'PASSWORD'
   passwordPayload: {