提交 39a9cb15 编写于 作者: D DCloud_LXH

feat: uni.login support appleInfo returned

上级 30c18fde
...@@ -24,7 +24,8 @@ function getService (provider) { ...@@ -24,7 +24,8 @@ function getService (provider) {
export function login (params, callbackId, plus = true) { export function login (params, callbackId, plus = true) {
const provider = params.provider || 'weixin' const provider = params.provider || 'weixin'
const errorCallback = warpErrorCallback(callbackId, 'login', plus) const errorCallback = warpErrorCallback(callbackId, 'login', plus)
const authOptions = provider === 'apple' const isAppleLogin = provider === 'apple'
const authOptions = isAppleLogin
? { scope: 'email' } ? { scope: 'email' }
: params.univerifyStyle : params.univerifyStyle
? { univerifyStyle: univerifyButtonsClickHandling(params.univerifyStyle, errorCallback) } ? { univerifyStyle: univerifyButtonsClickHandling(params.univerifyStyle, errorCallback) }
...@@ -45,16 +46,18 @@ export function login (params, callbackId, plus = true) { ...@@ -45,16 +46,18 @@ export function login (params, callbackId, plus = true) {
} }
service.login(res => { service.login(res => {
const authResult = res.target.authResult const authResult = res.target.authResult
const appleInfo = res.target.appleInfo
_invoke(callbackId, { _invoke(callbackId, {
code: authResult.code, code: authResult.code,
authResult: authResult, authResult: authResult,
appleInfo,
errMsg: 'login:ok' errMsg: 'login:ok'
}) })
}, errorCallback, authOptions) }, errorCallback, authOptions)
} }
// 先注销再登录 // 先注销再登录
// apple登录logout之后无法重新触发获取email,fullname;一键登录无logout // apple登录logout之后无法重新触发获取email,fullname;一键登录无logout
if (provider === 'apple' || provider === 'univerify') { if (isAppleLogin || provider === 'univerify') {
login() login()
} else { } else {
service.logout(login, login) service.logout(login, login)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册