@abtnode/blocklet-services 1.16.0-beta-1f8bf936 → 1.16.0-beta-58020de5

package/api/libs/auth/utils.js

@@ -30,6 +30,7 @@ async function getAvatarByEmail(email = '') {
   }
 }
 
+// FIXME: @zhanghan 转移通行证目前只能颁发新的，会导致用户数据中产生多余的通行证
 async function transferPassport(fromUser, toUser, { req, teamDid, node, nodeInfo }) {
   const {
     name: issuerName,

package/api/libs/connect/session.js

@@ -33,7 +33,7 @@ const {
 } = require('@abtnode/auth/lib/passport');
 const { getKeyPairClaim } = require('@abtnode/auth/lib/server');
 const sortBy = require('lodash/sortBy');
-const head = require('lodash/head');
+const last = require('lodash/last');
 
 const { getRolesFromAuthConfig, getBlockletAppIdList } = require('@blocklet/meta/lib/util');
 
@@ -41,6 +41,7 @@ const logger = require('@abtnode/logger')(require('../../../package.json').name)
 
 const { isInvitedUserOnly } = require('../../util');
 const { transferPassport } = require('../auth/utils');
+const { generateTranslate } = require('../translate');
 
 const vcTypes = [VC_TYPE_GENERAL_PASSPORT, VC_TYPE_NODE_PASSPORT];
 
@@ -222,7 +223,7 @@ module.exports = {
       // Get user passport from vc
       let passport = vc ? createUserPassport(vc) : null;
       if (user && passport && isUserPassportRevoked(user, passport)) {
-        throw new Error(messages.passportRevoked[locale](name));
+        throw new Error(messages.passportRevoked[locale](passport.title, name));
       }
 
       // Get role
@@ -469,7 +470,7 @@ module.exports = {
       // Get user passport from vc
       let passport = vc ? createUserPassport(vc) : null;
       if (passport && isUserPassportRevoked(user, passport)) {
-        throw new Error(messages.passportRevoked[locale](name));
+        throw new Error(messages.passportRevoked[locale](passport.title, name));
       }
 
       // Get role
@@ -483,6 +484,7 @@ module.exports = {
         teamDid,
         user: {
           did: user.did,
+          pk: user.pk,
           passports: upsertToPassports(
             user.passports || [],
             passport && { ...passport, lastLoginAt: new Date().toISOString() }
@@ -525,6 +527,7 @@ module.exports = {
           alreadyBind: '该账户已绑定 OAuth 账户',
         },
       };
+      const t = generateTranslate({ translations });
       const blocklet = await request.getBlocklet();
       const config = await request.getServiceConfig(NODE_SERVICES.AUTH, { componentId });
       const { did: teamDid } = await request.getBlockletInfo();
@@ -532,17 +535,17 @@ module.exports = {
       const bindUser = await node.getUser({ teamDid: blocklet.meta.did, user: { did: userDid } });
 
       if (!oauthUser) {
-        throw new Error(translations[locale].notFound);
+        throw new Error(t('notFound'));
       }
       if (oauthUser.source !== USER_TYPE.DERIVED) {
-        throw new Error(translations[locale].notDerivedAccount);
+        throw new Error(t('notDerivedAccount'));
       }
       if (bindUser) {
         if (bindUser.source === USER_TYPE.DERIVED) {
-          throw new Error(translations[locale].notWalletAccount);
+          throw new Error(t('notWalletAccount'));
         }
         if (bindUser.derivedAccount) {
-          throw new Error(translations[locale].alreadyBind);
+          throw new Error(t('alreadyBind'));
         }
       }
 
@@ -590,7 +593,7 @@ module.exports = {
       // TODO: 获取当前登录使用的 passport（无法获取到 passport.id）
       // 使用最近一次使用的 passport 来代替
       const validPassports = oauthUser.passports.filter((item) => item.status === 'valid');
-      const lastUsedPassport = head(sortBy(validPassports, 'lastLoginAt'));
+      const lastUsedPassport = last(sortBy(validPassports, 'lastLoginAt'));
       const passport = lastUsedPassport || { name: 'Guest', role: 'guest' };
       if (bindUser) {
         const mergePassport = (oauthUser.passports || []).reduce((sum, cur) => {
@@ -612,6 +615,7 @@ module.exports = {
                 lastLoginAt: oauthUser.lastLoginAt,
               },
             ],
+            source: USER_TYPE.WALLET,
             did: userDid,
             pk: userPk,
             locale,
@@ -659,12 +663,13 @@ module.exports = {
         });
         bindUser = doc;
         // remove derived account (updateUser use did as key, so did can't be update)
-        await node.removeUser({
-          teamDid,
-          user: {
-            did: previousUserDid,
-          },
-        });
+        // FIXME: @zhanghan 将来是否需要移除 derived account
+        // await node.removeUser({
+        //   teamDid,
+        //   user: {
+        //     did: previousUserDid,
+        //   },
+        // });
         // TODO: @zhanghan 需要增加 auditLog
       }
 

package/api/libs/translate.js

@@ -0,0 +1,12 @@
+const get = require('lodash/get');
+
+function generateTranslate({ translations, defaultLocale = 'en' }) {
+  const languages = Object.keys(translations);
+
+  return (key, _locale = defaultLocale) => {
+    const locale = languages.includes(_locale) ? _locale : defaultLocale;
+    return get(translations[locale], key, key);
+  };
+}
+
+module.exports = { generateTranslate };

package/api/routes/blocklet.js

@@ -140,20 +140,34 @@ module.exports = {
       const { did: userDid, role } = req.user;
 
       // eslint-disable-next-line no-unreachable
-      const doc = await node.startBlocklet({
-        did: blocklet.meta.did,
-        checkHealthImmediately: true,
-        throwOnError: true,
-      });
-      await node.createAuditLog(
-        {
-          action: 'startBlocklet',
-          args: { did: blocklet.meta.did },
-          context: formatContext(req),
-          result: doc,
-        },
-        node
-      );
+
+      let startError;
+      let doc;
+      try {
+        doc = await node.startBlocklet({
+          did: blocklet.meta.did,
+          checkHealthImmediately: true,
+          throwOnError: true,
+        });
+      } catch (error) {
+        startError = error;
+      }
+
+      if (!startError) {
+        try {
+          await node.createAuditLog(
+            {
+              action: 'startBlocklet',
+              args: { did: blocklet.meta.did },
+              context: formatContext(req),
+              result: doc,
+            },
+            node
+          );
+        } catch (error) {
+          logger.error('create start-blocklet audit log failed', { error });
+        }
+      }
 
       if (fromSetup) {
         const teamDid = blocklet.meta.did;
@@ -169,7 +183,7 @@ module.exports = {
         // 调用 store 管理公开实例
         // 如果一个 blocklet 没有设置 公开实例，启动成功后不应给 store 发请求
         const { publicToStore } = blocklet.settings;
-        if (publicToStore) {
+        if (publicToStore && !startError) {
           try {
             await handleInstanceInStore(blocklet, { userDid, publicToStore });
           } catch (error) {
@@ -219,35 +233,80 @@ module.exports = {
           node
         );
 
-        // send vc to wallet
+        // send notification to wallet
         const receiver = userDid;
         const token = JWT.sign(wallet.address, wallet.secretKey);
-        const data = {
-          sender: { token, appDid: wallet.address },
-          receiver,
-          notification: {
+
+        if (!blocklet.settings.owner) {
+          // send owner vc
+          const notificationText = {
             title: {
-              en: 'Up and Running',
-              zh: '启动并运行',
+              en: 'You have become the application owner',
+              zh: '你已成为应用所有者',
             }[locale],
             body: {
-              en: 'The application is up and running successfully',
-              zh: '应用程序已启动并成功运行',
+              en: 'You have become the application owner',
+              zh: '你已成为应用所有者',
             }[locale],
-            attachments: [
-              {
-                type: 'vc',
-                data: {
-                  credential: vc,
-                  tag: role,
+          };
+
+          const data = {
+            sender: { token, appDid: wallet.address },
+            receiver,
+            notification: {
+              ...notificationText,
+              attachments: [
+                {
+                  type: 'vc',
+                  data: {
+                    credential: vc,
+                    tag: role,
+                  },
                 },
-              },
-            ],
+              ],
+            },
+          };
+          server.emit('sendToUser', data);
+        }
+
+        // send message
+        const notificationText = startError
+          ? {
+              title: {
+                en: 'Application start failed',
+                zh: '应用启动失败',
+              }[locale],
+              body: {
+                en: `Application start failed: ${startError.message}`,
+                zh: `应用启动失败: ${startError.message}`,
+              }[locale],
+            }
+          : {
+              title: {
+                en: 'Up and Running',
+                zh: '启动并运行',
+              }[locale],
+              body: {
+                en: 'The application is up and running successfully',
+                zh: '应用程序已启动并成功运行',
+              }[locale],
+            };
+
+        // send vc to wallet
+        const data = {
+          sender: { token, appDid: wallet.address },
+          receiver,
+          notification: {
+            ...notificationText,
           },
         };
         server.emit('sendToUser', data);
       }
 
+      if (startError) {
+        throw startError;
+      }
+
       return res.json(polishBlocklet(doc));
     });
 

package/api/routes/oauth.js

@@ -5,7 +5,7 @@ const { parseUserAvatar, extractUserAvatar } = require('@abtnode/util/lib/user-a
 const { types } = require('@arcblock/did');
 const { fromAppDid } = require('@arcblock/did-ext');
 const get = require('lodash/get');
-const head = require('lodash/head');
+const last = require('lodash/last');
 const pick = require('lodash/pick');
 const sortBy = require('lodash/sortBy');
 const joinUrl = require('url-join');
@@ -15,12 +15,23 @@ const { getAvatarByEmail, transferPassport } = require('../libs/auth/utils');
 const { getUser } = require('../libs/jwt');
 const initJwt = require('../libs/jwt');
 const { sendToUser } = require('../libs/notification');
+const { generateTranslate } = require('../libs/translate');
 const { isInvitedUserOnly } = require('../util');
 
 const PREFIX = WELLKNOWN_SERVICE_PATH_PREFIX;
 
 const prefix = `${PREFIX}/oauth`;
 
+const translations = {
+  zh: {
+    needInviteToLogin: '你需要被邀请才可以登录此应用',
+  },
+  en: {
+    needInviteToLogin: 'You need to be invited to sign in to this app',
+  },
+};
+const t = generateTranslate({ translations });
+
 async function getDerivedUser(derivedDid, { node, teamDid }) {
   const { users } = await node.getUsers({
     teamDid,
@@ -47,6 +58,8 @@ async function login(req, node, options) {
   });
   const { did: teamDid, wallet: blockletWallet } = await req.getBlockletInfo();
   const config = await req.getServiceConfig(NODE_SERVICES.AUTH, { componentId });
+  const nodeInfo = await req.getNodeInfo();
+  const { dataDir } = await getApplicationInfo({ node, nodeInfo, teamDid });
   const [invitedUserOnly] = await isInvitedUserOnly(config, node, teamDid);
   const userInfo = await authClient.getProfile(token);
   const userWallet = fromAppDid(userInfo.sub, blockletWallet.secretKey, types.RoleType.ROLE_ACCOUNT);
@@ -56,7 +69,7 @@ async function login(req, node, options) {
   // 当前 oauth 账户已经绑定了 wallet 账户
   if (currentUser) {
     const validPassports = currentUser.passports.filter((item) => item.status === 'valid');
-    const lastUsedPassport = head(sortBy(validPassports, 'lastLoginAt'));
+    const lastUsedPassport = last(sortBy(validPassports, 'lastLoginAt'));
     if (lastUsedPassport) {
       passport = pick(lastUsedPassport, ['id', 'name', 'role']);
     }
@@ -81,12 +94,13 @@ async function login(req, node, options) {
     currentUser = {
       did: userWallet.address,
     };
-    const avatar = await getAvatarByEmail(userInfo.email);
+    let avatar = await getAvatarByEmail(userInfo.email);
+    avatar = await extractUserAvatar(avatar, { dataDir });
     const currentUserInfo = await getUser(node, teamDid, userDid);
     // 当前 oauth 账户不存在，自动添加一个新用户
     if (!currentUserInfo) {
       if (invitedUserOnly) {
-        throw new Error('Need invited to login');
+        throw new Error(t('needInviteToLogin', locale));
       }
       await node.addUser({
         teamDid,
@@ -110,7 +124,7 @@ async function login(req, node, options) {
       });
     } else {
       const validPassports = currentUserInfo.passports.filter((item) => item.status === 'valid');
-      const lastUsedPassport = head(sortBy(validPassports, 'lastLoginAt'));
+      const lastUsedPassport = last(sortBy(validPassports, 'lastLoginAt'));
       if (lastUsedPassport) {
         passport = pick(lastUsedPassport, ['id', 'name', 'role']);
       }
@@ -225,6 +239,7 @@ async function invite(req, node, options) {
       teamDid,
       user: {
         did: bindUser.did,
+        pk: bindUser.pk,
         connectedAccounts: [
           {
             provider: 'auth0',
@@ -239,6 +254,7 @@ async function invite(req, node, options) {
       teamDid,
       user: {
         did: userDid,
+        pk: userPk,
         connectedAccounts: [
           {
             provider: 'auth0',
@@ -286,6 +302,7 @@ module.exports = {
         teamDid,
         user: {
           did: userDid,
+          pk: bindUser.pk,
           locale,
           source: USER_TYPE.WALLET,
           derivedAccount: {

package/build/asset-manifest.json

@@ -1,14 +1,14 @@
 {
   "files": {
     "main.css": "/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css",
-    "main.js": "/.blocklet/proxy/blocklet-service/static/js/main.918ec6ce.js",
+    "main.js": "/.blocklet/proxy/blocklet-service/static/js/main.73c39561.js",
     "static/js/716.e1534c42.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/716.e1534c42.chunk.js",
     "static/js/255.279b1bca.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/255.279b1bca.chunk.js",
-    "static/js/371.575d3b08.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/371.575d3b08.chunk.js",
-    "static/js/737.14f154ca.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/737.14f154ca.chunk.js",
+    "static/js/371.88127b62.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/371.88127b62.chunk.js",
+    "static/js/737.ed53dec5.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/737.ed53dec5.chunk.js",
     "static/js/460.3026a774.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/460.3026a774.chunk.js",
     "static/js/868.f2fac071.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/868.f2fac071.chunk.js",
-    "static/js/343.d41f9df4.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/343.d41f9df4.chunk.js",
+    "static/js/343.087cec35.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/343.087cec35.chunk.js",
     "static/js/682.c64ae291.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/682.c64ae291.chunk.js",
     "static/js/711.6c22b7c7.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/711.6c22b7c7.chunk.js",
     "static/js/437.d815f0c0.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/437.d815f0c0.chunk.js",
@@ -42,14 +42,14 @@
     "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.918ec6ce.js.map": "/.blocklet/proxy/blocklet-service/static/js/main.918ec6ce.js.map",
+    "main.73c39561.js.map": "/.blocklet/proxy/blocklet-service/static/js/main.73c39561.js.map",
     "716.e1534c42.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/716.e1534c42.chunk.js.map",
     "255.279b1bca.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/255.279b1bca.chunk.js.map",
-    "371.575d3b08.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/371.575d3b08.chunk.js.map",
-    "737.14f154ca.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/737.14f154ca.chunk.js.map",
+    "371.88127b62.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/371.88127b62.chunk.js.map",
+    "737.ed53dec5.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/737.ed53dec5.chunk.js.map",
     "460.3026a774.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/460.3026a774.chunk.js.map",
     "868.f2fac071.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/868.f2fac071.chunk.js.map",
-    "343.d41f9df4.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/343.d41f9df4.chunk.js.map",
+    "343.087cec35.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/343.087cec35.chunk.js.map",
     "682.c64ae291.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/682.c64ae291.chunk.js.map",
     "711.6c22b7c7.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/711.6c22b7c7.chunk.js.map",
     "437.d815f0c0.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/437.d815f0c0.chunk.js.map",
@@ -64,6 +64,6 @@
   },
   "entrypoints": [
     "static/css/main.632501d5.css",
-    "static/js/main.918ec6ce.js"
+    "static/js/main.73c39561.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.918ec6ce.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.73c39561.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>