@abtnode/core 1.16.15-beta-04d1e821 → 1.16.15-beta-e3a24907

package/lib/api/team.js

@@ -481,29 +481,34 @@ class TeamAPI extends EventEmitter {
       throw new Error('User is not exist', { userDid, teamDid });
     }
 
-    let { avatar } = profile;
-    if (avatar.startsWith(USER_AVATAR_URL_PREFIX)) {
-      // pass
-    } else if (isUrl(avatar)) {
-      try {
-        avatar = await getAvatarByUrl(avatar);
-        avatar = await extractUserAvatar(avatar, { dataDirs: this.dataDirs });
-      } catch {
-        logger.error('Failed to convert external avatar', { teamDid, userDid, avatar });
-        throw new Error('Failed to convert external avatar');
-      }
-    } else {
-      // 仅当 avatar 是 base64 时，对 avatar 进行处理
-      const regex = /^data:image\/(\w+);base64,/;
-      const match = regex.exec(avatar);
-      if (match) {
-        avatar = await extractUserAvatar(avatar, { dataDirs: this.dataDirs });
+    const mergeData = { ...profile };
+
+    if (mergeData.avatar) {
+      if (mergeData.avatar.startsWith(USER_AVATAR_URL_PREFIX)) {
+        // pass
+      } else if (isUrl(mergeData.avatar)) {
+        try {
+          mergeData.avatar = await getAvatarByUrl(mergeData.avatar);
+          const blocklet = await getBlocklet({ did: teamDid, states: this.states, dataDirs: this.dataDirs });
+          mergeData.avatar = await extractUserAvatar(mergeData.avatar, { dataDir: blocklet.env.dataDir });
+        } catch {
+          logger.error('Failed to convert external avatar', { teamDid, userDid, avatar: mergeData.avatar });
+          throw new Error('Failed to convert external avatar');
+        }
       } else {
-        logger.error('Profile avatar is invalid', { teamDid, userDid, profile });
-        throw new Error('Profile avatar is invalid');
+        // 仅当 avatar 是 base64 时，对 avatar 进行处理
+        const regex = /^data:image\/(\w+);base64,/;
+        const match = regex.exec(mergeData.avatar);
+        if (match) {
+          const blocklet = await getBlocklet({ did: teamDid, states: this.states, dataDirs: this.dataDirs });
+          mergeData.avatar = await extractUserAvatar(mergeData.avatar, { dataDir: blocklet.env.dataDir });
+        } else {
+          logger.error('Profile avatar is invalid', { teamDid, userDid, profile });
+          throw new Error('Profile avatar is invalid');
+        }
       }
     }
-    const doc = await state.updateUser(userDid, { ...profile, avatar });
+    const doc = await state.updateUser(userDid, mergeData);
     logger.info('User switch-profile successfully', { teamDid, userDid });
     this.emit(EVENTS.USER_UPDATED, { teamDid, user: doc });
     return doc;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.15-beta-04d1e821",
+  "version": "1.16.15-beta-e3a24907",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,19 +19,19 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.15-beta-04d1e821",
-    "@abtnode/auth": "1.16.15-beta-04d1e821",
-    "@abtnode/certificate-manager": "1.16.15-beta-04d1e821",
-    "@abtnode/constant": "1.16.15-beta-04d1e821",
-    "@abtnode/cron": "1.16.15-beta-04d1e821",
-    "@abtnode/logger": "1.16.15-beta-04d1e821",
-    "@abtnode/models": "1.16.15-beta-04d1e821",
-    "@abtnode/queue": "1.16.15-beta-04d1e821",
-    "@abtnode/rbac": "1.16.15-beta-04d1e821",
-    "@abtnode/router-provider": "1.16.15-beta-04d1e821",
-    "@abtnode/static-server": "1.16.15-beta-04d1e821",
-    "@abtnode/timemachine": "1.16.15-beta-04d1e821",
-    "@abtnode/util": "1.16.15-beta-04d1e821",
+    "@abtnode/analytics": "1.16.15-beta-e3a24907",
+    "@abtnode/auth": "1.16.15-beta-e3a24907",
+    "@abtnode/certificate-manager": "1.16.15-beta-e3a24907",
+    "@abtnode/constant": "1.16.15-beta-e3a24907",
+    "@abtnode/cron": "1.16.15-beta-e3a24907",
+    "@abtnode/logger": "1.16.15-beta-e3a24907",
+    "@abtnode/models": "1.16.15-beta-e3a24907",
+    "@abtnode/queue": "1.16.15-beta-e3a24907",
+    "@abtnode/rbac": "1.16.15-beta-e3a24907",
+    "@abtnode/router-provider": "1.16.15-beta-e3a24907",
+    "@abtnode/static-server": "1.16.15-beta-e3a24907",
+    "@abtnode/timemachine": "1.16.15-beta-e3a24907",
+    "@abtnode/util": "1.16.15-beta-e3a24907",
     "@arcblock/did": "1.18.89",
     "@arcblock/did-auth": "1.18.89",
     "@arcblock/did-ext": "^1.18.89",
@@ -42,10 +42,10 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.89",
     "@arcblock/vc": "1.18.89",
-    "@blocklet/constant": "1.16.15-beta-04d1e821",
-    "@blocklet/meta": "1.16.15-beta-04d1e821",
-    "@blocklet/resolver": "1.16.15-beta-04d1e821",
-    "@blocklet/sdk": "1.16.15-beta-04d1e821",
+    "@blocklet/constant": "1.16.15-beta-e3a24907",
+    "@blocklet/meta": "1.16.15-beta-e3a24907",
+    "@blocklet/resolver": "1.16.15-beta-e3a24907",
+    "@blocklet/sdk": "1.16.15-beta-e3a24907",
     "@did-space/client": "^0.2.141",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.89",
@@ -98,5 +98,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "42e1523e5b92a3a57d9083ae29455df429afb0f6"
+  "gitHead": "b87c810902571b8cdb8f12ef497286b1549888e9"
 }