@abtnode/blocklet-services 1.16.8-beta-ca58a421 → 1.16.8-beta-0c0c5eb2

package/api/routes/user.js

@@ -12,6 +12,7 @@ const { getAvatarByUrl } = require('../libs/auth/utils');
 const { ApiError } = require('../util/error');
 const { loginWalletSchema, loginOAuthSchema } = require('../validators/login');
 const verifySig = require('../middlewares/verify-sig');
+const { getAvatarByEmail } = require('../libs/auth/utils');
 
 const PREFIX = WELLKNOWN_SERVICE_PATH_PREFIX;
 
@@ -45,18 +46,31 @@ async function checkUserEnable(user, { locale }) {
   }
 }
 
-async function composeProfileData({ avatar, fullName, email }, { node, req, teamDid }) {
+async function composeProfileData({ avatar, fullName, email }, { node, req, teamDid, isCreate = false }) {
   const profile = {};
+  let avatarLocal;
+  if (email) {
+    profile.email = email;
+    // 创建模式下，需要对 avatar 和 fullname 做一个 fallback，同时对 wallet 和 oauth 用户生效
+    if (isCreate) {
+      if (!avatar) {
+        avatarLocal = await getAvatarByEmail(email);
+      }
+      if (!fullName) {
+        profile.fullName = email;
+      }
+    }
+  }
   if (avatar) {
-    let avatarLocal = await getAvatarByUrl(avatar);
+    avatarLocal = await getAvatarByUrl(avatar);
+  }
+  if (avatarLocal) {
     const nodeInfo = await req.getNodeInfo();
     const { dataDir } = await getApplicationInfo({ node, nodeInfo, teamDid });
-    avatarLocal = await extractUserAvatar(avatar, { dataDir });
+    avatarLocal = await extractUserAvatar(avatarLocal, { dataDir });
     profile.avatar = avatarLocal;
   }
-  if (email) {
-    profile.email = email;
-  }
+
   if (fullName) {
     profile.fullName = fullName;
   }
@@ -92,20 +106,21 @@ async function loginWallet(
     },
   });
 
+  let profile;
   if (currentUser) {
     await checkUserEnable(currentUser, { locale });
+    profile = await composeProfileData({ avatar, email, fullName }, { node, req, teamDid });
   } else {
-    await checkNeedInvite(req, node, teamDid, componentId, locale);
+    await checkNeedInvite({ req, node, teamDid, componentId, locale });
+    profile = await composeProfileData({ avatar, email, fullName }, { node, req, teamDid, isCreate: true });
   }
 
-  const profile = await composeProfileData({ avatar, email, fullName }, { node, req, teamDid });
-
   const lastLoginIp = req.get('x-real-ip');
   const doc = await node.loginUser({
     teamDid,
     user: {
-      did: currentUser.did,
-      pk: currentUser.pk,
+      did: currentUser?.did || pk,
+      pk: currentUser?.pk || did,
       locale,
       lastLoginIp,
       connectedAccount: { provider, did, pk },
@@ -114,7 +129,6 @@ async function loginWallet(
   });
 
   // NOTICE: 使用 provider: wallet 登录的账号，其账号是由 wallet 产生的，所以不需要到链上 declare 了
-
   return doc;
 }
 
@@ -148,20 +162,22 @@ async function loginOAuth(
     },
   });
 
+  let profile;
   if (currentUser) {
     await checkUserEnable(currentUser, { locale });
+    profile = await composeProfileData({ avatar, email, fullName }, { node, req, teamDid });
   } else {
-    await checkNeedInvite(req, node, teamDid, componentId, locale);
+    await checkNeedInvite({ req, node, teamDid, componentId, locale });
+    profile = await composeProfileData({ avatar, email, fullName }, { node, req, teamDid, isCreate: true });
   }
-  const profile = await composeProfileData({ avatar, email, fullName }, { node, req, teamDid });
 
   const lastLoginIp = req.get('x-real-ip');
 
   const doc = await node.loginUser({
     teamDid,
     user: {
-      did: currentUser.did,
-      pk: currentUser.pk,
+      did: currentUser?.did || userDid,
+      pk: currentUser?.pk || userPk,
       locale,
       lastLoginIp,
       connectedAccount: { provider, id, did: userDid, pk: userPk },

package/api/validators/login.js

@@ -4,17 +4,17 @@ const loginWalletSchema = Joi.object({
   provider: 'wallet',
   did: Joi.DID().trim().required(),
   pk: Joi.string().required(),
-  avatar: Joi.string().optional(),
   email: Joi.string().optional(),
+  avatar: Joi.string().optional(),
   fullName: Joi.string().optional(),
 }).empty(null);
 
 const loginOAuthSchema = Joi.object({
   provider: Joi.string().allow('auth0'),
   id: Joi.string().required(),
-  avatar: Joi.string().required(),
   email: Joi.string().required(),
-  fullName: Joi.string().required(),
+  avatar: Joi.string().optional(),
+  fullName: Joi.string().optional(),
 }).empty(null);
 
 exports.loginWalletSchema = loginWalletSchema;

package/build/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css",
-    "main.js": "/.blocklet/proxy/blocklet-service/static/js/main.255c0179.js",
+    "main.js": "/.blocklet/proxy/blocklet-service/static/js/main.0006cb61.js",
     "static/js/716.0d2a2d32.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/716.0d2a2d32.chunk.js",
     "static/js/359.c47779c2.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/359.c47779c2.chunk.js",
     "static/js/255.279b1bca.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/255.279b1bca.chunk.js",
@@ -10,7 +10,7 @@
     "static/js/460.4763afe0.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/460.4763afe0.chunk.js",
     "static/js/868.ac8df3a0.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/868.ac8df3a0.chunk.js",
     "static/js/547.03d5d719.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/547.03d5d719.chunk.js",
-    "static/js/343.9ca4b069.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/343.9ca4b069.chunk.js",
+    "static/js/343.0b145b64.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/343.0b145b64.chunk.js",
     "static/js/682.a8bf723a.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/682.a8bf723a.chunk.js",
     "static/js/711.56427a24.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/711.56427a24.chunk.js",
     "static/js/437.075e8453.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/437.075e8453.chunk.js",
@@ -45,7 +45,7 @@
     "router-template-styles/styles.css": "/.blocklet/proxy/blocklet-service/router-template-styles/styles.css",
     "index.html": "/.blocklet/proxy/blocklet-service/index.html",
     "main.632501d5.css.map": "/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css.map",
-    "main.255c0179.js.map": "/.blocklet/proxy/blocklet-service/static/js/main.255c0179.js.map",
+    "main.0006cb61.js.map": "/.blocklet/proxy/blocklet-service/static/js/main.0006cb61.js.map",
     "716.0d2a2d32.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/716.0d2a2d32.chunk.js.map",
     "359.c47779c2.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/359.c47779c2.chunk.js.map",
     "255.279b1bca.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/255.279b1bca.chunk.js.map",
@@ -54,7 +54,7 @@
     "460.4763afe0.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/460.4763afe0.chunk.js.map",
     "868.ac8df3a0.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/868.ac8df3a0.chunk.js.map",
     "547.03d5d719.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/547.03d5d719.chunk.js.map",
-    "343.9ca4b069.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/343.9ca4b069.chunk.js.map",
+    "343.0b145b64.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/343.0b145b64.chunk.js.map",
     "682.a8bf723a.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/682.a8bf723a.chunk.js.map",
     "711.56427a24.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/711.56427a24.chunk.js.map",
     "437.075e8453.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/437.075e8453.chunk.js.map",
@@ -70,6 +70,6 @@
   },
   "entrypoints": [
     "static/css/main.632501d5.css",
-    "static/js/main.255c0179.js"
+    "static/js/main.0006cb61.js"
   ]
 }

package/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"/><meta name="theme-color" content="#000000"/><title>Blocklet Service</title><script src=".well-known/service/api/env"></script><script src="/__blocklet__.js"></script><script defer="defer" src="/.blocklet/proxy/blocklet-service/static/js/main.255c0179.js"></script><link href="/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"/><meta name="theme-color" content="#000000"/><title>Blocklet Service</title><script src=".well-known/service/api/env"></script><script src="/__blocklet__.js"></script><script defer="defer" src="/.blocklet/proxy/blocklet-service/static/js/main.0006cb61.js"></script><link href="/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>