diff --git a/src/platforms/app-plus/service/api/plugin/oauth.js b/src/platforms/app-plus/service/api/plugin/oauth.js index 8fb526d5ca21f81505ab8847714f33c882657a60..14deb0086bc8ad7f98690e720842993a3e12ff27 100644 --- a/src/platforms/app-plus/service/api/plugin/oauth.js +++ b/src/platforms/app-plus/service/api/plugin/oauth.js @@ -18,14 +18,14 @@ const loginByService = (provider, callbackId) => { code: err.code, errMsg: 'login:fail:' + err.message }) - }, { scope: 'email' }) + }, provider === 'apple' ? { scope: 'email' } : {}) } // 先注销再登录 - // apple登录logout之后无法重新触发获取email,fullname - if (provider === 'apple') { - login() - } else { - loginServices[provider].logout(login, login) + // apple登录logout之后无法重新触发获取email,fullname + if (provider === 'apple') { + login() + } else { + loginServices[provider].logout(login, login) } } /** @@ -65,7 +65,7 @@ export function getUserInfo (params, callbackId) { errMsg: 'operateWXData:fail:请先调用 uni.login' }) } - loginService.getUserInfo(res => { + loginService.getUserInfo(res => { let userInfo if (provider === 'weixin') { const wechatUserInfo = loginService.userInfo @@ -79,38 +79,38 @@ export function getUserInfo (params, callbackId) { avatarUrl: wechatUserInfo.headimgurl, unionId: wechatUserInfo.unionid } - } else if (provider === 'apple') { - const appleInfo = loginService.appleInfo - userInfo = { - openId: appleInfo.user, - fullName: appleInfo.fullName, - email: appleInfo.email, - authorizationCode: appleInfo.authorizationCode, - identityToken: appleInfo.identityToken, - realUserStatus: appleInfo.realUserStatus - } + } else if (provider === 'apple') { + const appleInfo = loginService.appleInfo + userInfo = { + openId: appleInfo.user, + fullName: appleInfo.fullName, + email: appleInfo.email, + authorizationCode: appleInfo.authorizationCode, + identityToken: appleInfo.identityToken, + realUserStatus: appleInfo.realUserStatus + } } else { loginService.userInfo.openId = loginService.userInfo.openId || loginService.userInfo.openid || loginService.authResult.openid loginService.userInfo.nickName = loginService.userInfo.nickName || loginService.userInfo.nickname loginService.userInfo.avatarUrl = loginService.userInfo.avatarUrl || loginService.userInfo.avatarUrl || - loginService.userInfo.headimgurl + loginService.userInfo.headimgurl userInfo = loginService.userInfo - } - const result = { - errMsg: 'operateWXData:ok' - } - if (params.data && params.data.api_name === 'webapi_getuserinfo') { + } + const result = { + errMsg: 'operateWXData:ok' + } + if (params.data && params.data.api_name === 'webapi_getuserinfo') { result.data = { data: JSON.stringify(userInfo), rawData: '', signature: '', encryptedData: '', iv: '' - } - } else { - result.userInfo = userInfo - } + } + } else { + result.userInfo = userInfo + } invoke(callbackId, result) }, err => { invoke(callbackId, {