@abtnode/blocklet-services 1.16.14-beta-d802cd3c → 1.16.14-beta-dc99d0a2

package/api/cache.js

@@ -108,7 +108,7 @@ cache.getTransport = ({ did, config, force }) => {
   const transporter = nodemailer.createTransport({
     host: config.host,
     port: config.port,
-    secure: false,
+    secure: !!config.secure,
     auth: { user: config.user, pass: config.password },
   });
   if (transporter) {

package/api/libs/connect/session.js

@@ -615,6 +615,7 @@ module.exports = {
       userDid,
       createSessionToken,
       componentId,
+      provider,
     }) => {
       const blocklet = await request.getBlocklet();
       const { name, did: teamDid, secret } = await request.getBlockletInfo();
@@ -685,7 +686,7 @@ module.exports = {
       await node.createAuditLog(
         {
           action: 'switchPassport',
-          args: { teamDid, userDid, passport: passportForLog, provider: LOGIN_PROVIDER.WALLET },
+          args: { teamDid, userDid, passport: passportForLog, provider },
           context: formatContext(Object.assign(request, { user })),
           result: {},
         },
@@ -697,7 +698,7 @@ module.exports = {
       const sessionConfig = blocklet.settings?.session || {};
       const { sessionToken, refreshToken } = createToken(
         userDid,
-        { secret, passport, role, fullName: user.fullName },
+        { secret, passport, role, fullName: user.fullName, provider },
         { ...sessionConfig, didConnectVersion: getDidConnectVersion(request) }
       );
       return { sessionToken, refreshToken };

package/api/libs/email.js

@@ -69,11 +69,12 @@ async function sendEmail(receiver, notification, { teamDid, node, locale }) {
     })
   );
   const emailData = {
-    from: emailConfig.from,
+    from: emailConfig.user,
     to: receiver,
     title: notification.title,
     subject,
     html,
+    replyTo: emailConfig.from,
   };
   const transporter = cache.getTransport({ did: teamDid, config: emailConfig });
   await transporter.sendMail(emailData);

package/api/libs/jwt.js

@@ -74,6 +74,7 @@ const initJwt = (node, options) => {
 
           user.role = role;
           user.passport = passport;
+          user.provider = provider;
         } else {
           user = { did, role, passport, fullName, provider };
         }

package/api/routes/federated.js

@@ -7,6 +7,8 @@ const get = require('lodash/get');
 const cors = require('cors');
 const { LOGIN_PROVIDER } = require('@blocklet/constant');
 const pick = require('lodash/pick');
+const { getAvatarByUrl, extractUserAvatar } = require('@abtnode/util/lib/user');
+const { getApplicationInfo } = require('@abtnode/auth/lib/auth');
 
 const { api } = require('../libs/api');
 const initJwt = require('../libs/jwt');
@@ -269,10 +271,23 @@ module.exports = {
             id: passport?.id || '',
           }
         : { role: 'guest', name: 'Guest' };
+      let { avatar } = user || {};
+      if (avatar) {
+        try {
+          avatar = await getAvatarByUrl(user.avatar);
+          const nodeInfo = await req.getNodeInfo();
+
+          const { dataDir } = await getApplicationInfo({ node, nodeInfo, teamDid });
+          avatar = await extractUserAvatar(avatar, { dataDir });
+        } catch (err) {
+          console.error(err.response.status);
+        }
+      }
       const doc = await node.loginUser({
         teamDid,
         user: {
           ...user,
+          avatar,
           // HACK: @zhanghan 这里会将 passport 插入到当前用户的 passport 列表中，federated 登录不应该插入 passport
           // passport: findMapping ? targetPassport : null,
           connectedAccount: {
@@ -331,10 +346,13 @@ module.exports = {
       });
       // HACK: member 调用 master 时，将 passport 的 role 还原为 master 中原有的 role
       const targetPassport = passport?.id ? (prevUser?.passports || []).find((item) => item.id === passport.id) : null;
+
+      // HACK: 用户在 master 中存在时，不更新任何用户信息；不存在时，将新增一个用户
+      const filterUserInfo = prevUser ? pick(user, ['did', 'pk']) : user;
       const doc = await node.loginUser({
         teamDid,
         user: {
-          ...user,
+          ...filterUserInfo,
           passport: targetPassport,
           connectedAccount: {
             provider: LOGIN_PROVIDER.WALLET,

package/api/routes/oauth.js

@@ -386,6 +386,9 @@ module.exports = {
       res.send(oauthConfig);
     });
     server.get(`${prefix}/passports`, async (req, res) => {
+      if (!req.user) {
+        res.status(401).send('Unauthorized');
+      }
       const userDid = req.user.did;
       const blocklet = await req.getBlockletInfo();
       const nodeInfo = await req.getNodeInfo();

package/api/services/auth/connect/switch-passport.js

@@ -1,11 +1,13 @@
 const { switchPassport } = require('../../../libs/connect/session');
+const { getLoginProvider } = require('../../../util/blocklet-utils');
 
 const { onConnect, onApprove } = switchPassport;
 
 module.exports = function createRoutes(node, authenticator, createSessionToken) {
   return {
     action: 'switch-passport',
-    onConnect: ({ req, userDid, baseUrl, extraParams: { locale, connectedDid } }) => {
+    onConnect: ({ userDid, baseUrl, extraParams: { locale, connectedDid }, req, request }) => {
+      const provider = getLoginProvider(request);
       return onConnect({
         node,
         request: req,
@@ -13,10 +15,12 @@ module.exports = function createRoutes(node, authenticator, createSessionToken)
         userDid,
         previousUserDid: connectedDid,
         baseUrl,
+        provider,
       });
     },
 
-    onAuth: async ({ claims, challenge, userDid, updateSession, extraParams, req }) => {
+    onAuth: async ({ claims, challenge, userDid, updateSession, extraParams, req, request }) => {
+      const provider = getLoginProvider(request);
       const { sessionToken, refreshToken } = await onApprove({
         node,
         request: req,
@@ -25,6 +29,7 @@ module.exports = function createRoutes(node, authenticator, createSessionToken)
         verifiableCredential: claims.find((x) => x.type === 'verifiableCredential'),
         userDid,
         createSessionToken,
+        provider,
       });
 
       await updateSession({ sessionToken, refreshToken }, true);

package/api/services/auth/session.js

@@ -1,7 +1,5 @@
 const nocache = require('nocache');
 const joinUrl = require('url-join');
-const SealedBox = require('tweetnacl-sealedbox-js');
-const { decodeEncryptionKey } = require('@abtnode/util/lib/security');
 const { WELLKNOWN_SERVICE_PATH_PREFIX, USER_AVATAR_URL_PREFIX, USER_AVATAR_PATH_PREFIX } = require('@abtnode/constant');
 const { LOGIN_PROVIDER } = require('@blocklet/constant');
 
@@ -48,38 +46,7 @@ module.exports = {
           }
         }
 
-        const encKey = '_ek_';
-        let nextToken = '';
-        let nextRefreshToken = '';
-        if (req.query[encKey]) {
-          try {
-            const { secret } = await req.getBlockletInfo();
-            const encryptionKey = decodeEncryptionKey(req.query[encKey]);
-            const sessionConfig = blocklet.settings?.session || {};
-            const { sessionToken, refreshToken } = createToken(
-              user.did,
-              {
-                secret,
-                passport: req.user.passport,
-                role: req.user.role,
-                fullName: user.fullName,
-                provider: req.user.provider || LOGIN_PROVIDER.WALLET,
-              },
-              { ...sessionConfig, didConnectVersion: getDidConnectVersion(req) }
-            );
-            nextToken = JSON.stringify(sessionToken);
-            nextToken = Buffer.from(SealedBox.seal(Buffer.from(nextToken), encryptionKey)).toString('base64');
-
-            nextRefreshToken = JSON.stringify(refreshToken);
-            nextRefreshToken = Buffer.from(SealedBox.seal(Buffer.from(nextRefreshToken), encryptionKey)).toString(
-              'base64'
-            );
-          } catch {
-            // Do nothing
-          }
-        }
-
-        res.json({ user, nextToken, nextRefreshToken, provider: req.user.provider || LOGIN_PROVIDER.WALLET });
+        res.json({ user, provider: req.user.provider || LOGIN_PROVIDER.WALLET });
       };
 
       const sessionApi = `${prefix}/api/did/session`;
@@ -100,6 +67,7 @@ module.exports = {
               did: userDid,
               role,
               passport,
+              provider = LOGIN_PROVIDER.WALLET,
             } = await verifySessionToken(token, secret, {
               checkFromDb: true,
               teamDid,
@@ -132,11 +100,17 @@ module.exports = {
             const sessionConfig = blocklet.settings?.session || {};
             const { sessionToken, refreshToken } = createToken(
               userDid,
-              { secret, passport, role, fullName: user.fullName },
+              {
+                secret,
+                passport,
+                role,
+                fullName: user.fullName,
+                provider,
+              },
               { ...sessionConfig, didConnectVersion: getDidConnectVersion(req) }
             );
 
-            res.json({ user, nextToken: sessionToken, nextRefreshToken: refreshToken });
+            res.json({ user, nextToken: sessionToken, nextRefreshToken: refreshToken, provider });
           } catch (err) {
             res.status(400).send(err.message);
           }

package/api/services/notification/blocklet-events-notifier.js

@@ -105,8 +105,12 @@ const messages = {
         zh: '组件已停止运行',
       },
       body: {
-        en: `${getComponentNamesWithVersion(data)} stopped successfully for ${data.meta.title}.`,
-        zh: `${data.meta.title} 中的组件 ${getComponentNamesWithVersion(data)} 已停止运行`,
+        en: `${
+          data?.componentDids?.length ? getComponentNamesWithVersion(data) : 'All components'
+        } stopped successfully for ${data.meta.title}.`,
+        zh: `${data.meta.title}${
+          data?.componentDids?.length ? `中的组件 ${getComponentNamesWithVersion(data)}` : ''
+        } 已停止运行`,
       },
     };
   },

package/api/util/blocklet-utils.js

@@ -16,6 +16,10 @@ function getTrustedIssuers(blocklet, { provider = LOGIN_PROVIDER.WALLET } = {})
 }
 
 function getLoginProvider(request) {
+  const { user } = request;
+  if (user?.provider) {
+    return user.provider;
+  }
   const { store } = request?.context || {};
   const { provider } = store?.extraParams || {};
   return provider || LOGIN_PROVIDER.WALLET;

package/build/asset-manifest.json

@@ -1,11 +1,11 @@
 {
   "files": {
     "main.css": "/.well-known/service/static/static/css/main.7ea79dc8.css",
-    "main.js": "/.well-known/service/static/static/js/main.0357601e.js",
+    "main.js": "/.well-known/service/static/static/js/main.3b4d58d1.js",
     "static/js/4716.a1240199.chunk.js": "/.well-known/service/static/static/js/4716.a1240199.chunk.js",
     "static/js/4359.5ed52fe3.chunk.js": "/.well-known/service/static/static/js/4359.5ed52fe3.chunk.js",
     "static/js/1255.0e8a8a45.chunk.js": "/.well-known/service/static/static/js/1255.0e8a8a45.chunk.js",
-    "static/js/7371.da3c5cc3.chunk.js": "/.well-known/service/static/static/js/7371.da3c5cc3.chunk.js",
+    "static/js/7371.e9ccd135.chunk.js": "/.well-known/service/static/static/js/7371.e9ccd135.chunk.js",
     "static/js/6737.4f37dd4a.chunk.js": "/.well-known/service/static/static/js/6737.4f37dd4a.chunk.js",
     "static/js/3953.e3e51520.chunk.js": "/.well-known/service/static/static/js/3953.e3e51520.chunk.js",
     "static/js/868.aa2a1c4d.chunk.js": "/.well-known/service/static/static/js/868.aa2a1c4d.chunk.js",
@@ -25,7 +25,7 @@
     "static/js/8395.e5aa519c.chunk.js": "/.well-known/service/static/static/js/8395.e5aa519c.chunk.js",
     "static/js/5233.faabaae9.chunk.js": "/.well-known/service/static/static/js/5233.faabaae9.chunk.js",
     "static/css/4603.dce369d5.chunk.css": "/.well-known/service/static/static/css/4603.dce369d5.chunk.css",
-    "static/js/4603.f6b8d272.chunk.js": "/.well-known/service/static/static/js/4603.f6b8d272.chunk.js",
+    "static/js/4603.ee59facc.chunk.js": "/.well-known/service/static/static/js/4603.ee59facc.chunk.js",
     "static/js/5050.538edf89.chunk.js": "/.well-known/service/static/static/js/5050.538edf89.chunk.js",
     "static/css/780.e3db6e49.chunk.css": "/.well-known/service/static/static/css/780.e3db6e49.chunk.css",
     "static/js/780.32bf1f5b.chunk.js": "/.well-known/service/static/static/js/780.32bf1f5b.chunk.js",
@@ -53,7 +53,7 @@
     "static/js/5711.aa17ef28.chunk.js": "/.well-known/service/static/static/js/5711.aa17ef28.chunk.js",
     "static/js/7345.4b4f8941.chunk.js": "/.well-known/service/static/static/js/7345.4b4f8941.chunk.js",
     "static/js/1237.1d0b8f1e.chunk.js": "/.well-known/service/static/static/js/1237.1d0b8f1e.chunk.js",
-    "static/js/8031.d9af3d84.chunk.js": "/.well-known/service/static/static/js/8031.d9af3d84.chunk.js",
+    "static/js/8031.9944bf3c.chunk.js": "/.well-known/service/static/static/js/8031.9944bf3c.chunk.js",
     "static/js/3963.2e06f9bc.chunk.js": "/.well-known/service/static/static/js/3963.2e06f9bc.chunk.js",
     "static/js/6891.6c7018ab.chunk.js": "/.well-known/service/static/static/js/6891.6c7018ab.chunk.js",
     "static/js/982.11dc355f.chunk.js": "/.well-known/service/static/static/js/982.11dc355f.chunk.js",
@@ -78,7 +78,6 @@
     "static/media/ubuntu-mono-cyrillic-ext-400-normal.woff2": "/.well-known/service/static/static/media/ubuntu-mono-cyrillic-ext-400-normal.eda1c4946b1f7bf58386.woff2",
     "static/media/ubuntu-mono-cyrillic-400-normal.woff2": "/.well-known/service/static/static/media/ubuntu-mono-cyrillic-400-normal.c367f416832eb8f1b846.woff2",
     "static/media/studio.svg": "/.well-known/service/static/static/media/studio.f849ff5763d19a78ada7fdeea249f819.svg",
-    "static/media/index.cjs": "/.well-known/service/static/static/media/index.20414a3fa1e6c5498a67.cjs",
     "static/media/ubuntu-mono-greek-400-normal.woff2": "/.well-known/service/static/static/media/ubuntu-mono-greek-400-normal.22f3bfc91f79c342bdf4.woff2",
     "static/media/ubuntu-mono-greek-ext-400-normal.woff2": "/.well-known/service/static/static/media/ubuntu-mono-greek-ext-400-normal.b3459900ea8a25d1f7c2.woff2",
     "router-template-styles/fonts/lato-latin-ext-400-normal.woff2": "/.well-known/service/static/router-template-styles/fonts/lato-latin-ext-400-normal.woff2",
@@ -87,11 +86,11 @@
     "router-template-styles/styles.css": "/.well-known/service/static/router-template-styles/styles.css",
     "index.html": "/.well-known/service/static/index.html",
     "main.7ea79dc8.css.map": "/.well-known/service/static/static/css/main.7ea79dc8.css.map",
-    "main.0357601e.js.map": "/.well-known/service/static/static/js/main.0357601e.js.map",
+    "main.3b4d58d1.js.map": "/.well-known/service/static/static/js/main.3b4d58d1.js.map",
     "4716.a1240199.chunk.js.map": "/.well-known/service/static/static/js/4716.a1240199.chunk.js.map",
     "4359.5ed52fe3.chunk.js.map": "/.well-known/service/static/static/js/4359.5ed52fe3.chunk.js.map",
     "1255.0e8a8a45.chunk.js.map": "/.well-known/service/static/static/js/1255.0e8a8a45.chunk.js.map",
-    "7371.da3c5cc3.chunk.js.map": "/.well-known/service/static/static/js/7371.da3c5cc3.chunk.js.map",
+    "7371.e9ccd135.chunk.js.map": "/.well-known/service/static/static/js/7371.e9ccd135.chunk.js.map",
     "6737.4f37dd4a.chunk.js.map": "/.well-known/service/static/static/js/6737.4f37dd4a.chunk.js.map",
     "3953.e3e51520.chunk.js.map": "/.well-known/service/static/static/js/3953.e3e51520.chunk.js.map",
     "868.aa2a1c4d.chunk.js.map": "/.well-known/service/static/static/js/868.aa2a1c4d.chunk.js.map",
@@ -111,7 +110,7 @@
     "8395.e5aa519c.chunk.js.map": "/.well-known/service/static/static/js/8395.e5aa519c.chunk.js.map",
     "5233.faabaae9.chunk.js.map": "/.well-known/service/static/static/js/5233.faabaae9.chunk.js.map",
     "4603.dce369d5.chunk.css.map": "/.well-known/service/static/static/css/4603.dce369d5.chunk.css.map",
-    "4603.f6b8d272.chunk.js.map": "/.well-known/service/static/static/js/4603.f6b8d272.chunk.js.map",
+    "4603.ee59facc.chunk.js.map": "/.well-known/service/static/static/js/4603.ee59facc.chunk.js.map",
     "5050.538edf89.chunk.js.map": "/.well-known/service/static/static/js/5050.538edf89.chunk.js.map",
     "780.e3db6e49.chunk.css.map": "/.well-known/service/static/static/css/780.e3db6e49.chunk.css.map",
     "780.32bf1f5b.chunk.js.map": "/.well-known/service/static/static/js/780.32bf1f5b.chunk.js.map",
@@ -139,7 +138,7 @@
     "5711.aa17ef28.chunk.js.map": "/.well-known/service/static/static/js/5711.aa17ef28.chunk.js.map",
     "7345.4b4f8941.chunk.js.map": "/.well-known/service/static/static/js/7345.4b4f8941.chunk.js.map",
     "1237.1d0b8f1e.chunk.js.map": "/.well-known/service/static/static/js/1237.1d0b8f1e.chunk.js.map",
-    "8031.d9af3d84.chunk.js.map": "/.well-known/service/static/static/js/8031.d9af3d84.chunk.js.map",
+    "8031.9944bf3c.chunk.js.map": "/.well-known/service/static/static/js/8031.9944bf3c.chunk.js.map",
     "3963.2e06f9bc.chunk.js.map": "/.well-known/service/static/static/js/3963.2e06f9bc.chunk.js.map",
     "6891.6c7018ab.chunk.js.map": "/.well-known/service/static/static/js/6891.6c7018ab.chunk.js.map",
     "982.11dc355f.chunk.js.map": "/.well-known/service/static/static/js/982.11dc355f.chunk.js.map",
@@ -152,6 +151,6 @@
   },
   "entrypoints": [
     "static/css/main.7ea79dc8.css",
-    "static/js/main.0357601e.js"
+    "static/js/main.3b4d58d1.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><link rel="manifest" href="/.well-known/service/manifest.json"/><script src="/.well-known/service/api/env"></script><script src="/__blocklet__.js"></script><script defer="defer" src="/.well-known/service/static/static/js/main.0357601e.js"></script><link href="/.well-known/service/static/static/css/main.7ea79dc8.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><link rel="manifest" href="/.well-known/service/manifest.json"/><script src="/.well-known/service/api/env"></script><script src="/__blocklet__.js"></script><script defer="defer" src="/.well-known/service/static/static/js/main.3b4d58d1.js"></script><link href="/.well-known/service/static/static/css/main.7ea79dc8.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>