From 84bfee9770a6d037e6e46488a9a2ff12da480352 Mon Sep 17 00:00:00 2001
From: chenruilong <chenruilong@dcloud.io>
Date: Fri, 25 Nov 2022 15:30:56 +0800
Subject: [PATCH] =?UTF-8?q?fix(uni-id-co):=20=E4=BF=AE=E5=A4=8D=20?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=99=BB=E5=BD=95=E6=97=B6=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=9C=AA=E8=AE=BE=E7=BD=AE=E5=A4=B4=E5=83=8F=E7=9A=84=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uni-id-co/module/login/login-by-weixin.js | 44 +++++++++++--------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-weixin.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-weixin.js
index 58f9ac7..fb20db9 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-weixin.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/login/login-by-weixin.js
@@ -120,28 +120,34 @@ module.exports = async function (params = {}) {
       accessToken,
       openid
     })
-    // eslint-disable-next-line n/no-deprecated-api
-    const avatarPath = url.parse(avatar).pathname
-    const extName = avatarPath.indexOf('.') > -1 ? url.parse(avatar).pathname.split('.').pop() : 'jpg'
-    const cloudPath = `user/avatar/${openid.slice(-8) + Date.now()}-avatar.${extName}`
-    const getAvatarRes = await uniCloud.httpclient.request(avatar)
-    if (getAvatarRes.status >= 400) {
-      throw {
-        errCode: ERROR.GET_THIRD_PARTY_USER_INFO_FAILED
+
+    if (avatar) {
+      // eslint-disable-next-line n/no-deprecated-api
+      const avatarPath = url.parse(avatar).pathname
+      const extName = avatarPath.indexOf('.') > -1 ? url.parse(avatar).pathname.split('.').pop() : 'jpg'
+      const cloudPath = `user/avatar/${openid.slice(-8) + Date.now()}-avatar.${extName}`
+      const getAvatarRes = await uniCloud.httpclient.request(avatar)
+      if (getAvatarRes.status >= 400) {
+        throw {
+          errCode: ERROR.GET_THIRD_PARTY_USER_INFO_FAILED
+        }
+      }
+
+      const {
+        fileID
+      } = await uniCloud.uploadFile({
+        cloudPath,
+        fileContent: getAvatarRes.data
+      })
+
+      extraData.avatar_file = {
+        name: cloudPath,
+        extname: extName,
+        url: fileID
       }
     }
-    const {
-      fileID
-    } = await uniCloud.uploadFile({
-      cloudPath,
-      fileContent: getAvatarRes.data
-    })
+
     extraData.nickname = nickname
-    extraData.avatar_file = {
-      name: cloudPath,
-      extname: extName,
-      url: fileID
-    }
   }
   await saveWeixinUserKey.call(this, {
     openid,
-- 
GitLab