@abtnode/blocklet-services 1.16.14-beta-dd4f6a50 → 1.16.14-beta-3127f514

package/api/index.js

@@ -152,10 +152,11 @@ module.exports = function createServer(node, serverOptions = {}) {
     cache.sessionCacheDisabledUser.set(user?.did);
   });
 
-  [BlockletInternalEvents.componentsUpdated, BlockletInternalEvents.appConfigChanged].forEach((name) => {
-    eventHub.on(name, (data) => {
+  Object.keys(BlockletInternalEvents).forEach((key) => {
+    const event = BlockletInternalEvents[key];
+    eventHub.on(event, (data) => {
       const { appDid } = data;
-      notificationService.sendToApp.exec({ event: name, appDid, data });
+      notificationService.sendToApp.exec({ event, appDid, data });
     });
   });
 

package/api/middlewares/verify-federated-call.js

@@ -23,7 +23,7 @@ function verifyFederatedCall({ isMaster = false } = { isMaster: false }) {
     }
 
     if (!verify(data, validSite.pk)) {
-      res.status(403).send('Invalid signature');
+      res.status(403).send('Invalid signature during federated call');
       return;
     }
 

package/api/routes/federated.js

@@ -51,8 +51,8 @@ module.exports = {
         const nodeInfo = await req.getNodeInfo();
         const blockletInfo = await req.getBlockletInfo();
         const masterSite = {
-          appId: blockletInfo.wallet.address,
-          appPid: blockletInfo.permanentWallet.address,
+          appId: blocklet.appDid,
+          appPid: blocklet.appPid,
           aliasDid: (blocklet.migratedFrom || []).map((item) => item.appDid),
           appName: blockletInfo.name,
           appDescription: blockletInfo.description,
@@ -246,8 +246,8 @@ module.exports = {
         let data;
         const { onlyWriteCookie = false } = req.body;
 
+        const { blocklet } = req;
         if (!onlyWriteCookie) {
-          const { blocklet } = req;
           const { permanentWallet } = await req.getBlockletInfo();
           const teamDid = blocklet.appPid;
           const federatedSites = blocklet.settings?.federated?.sites || [];
@@ -286,13 +286,14 @@ module.exports = {
             }));
           } catch {
             res.status(500).send('Generate token error');
+            return;
           }
         }
 
+        const cacheTtl = blocklet.settings?.session?.cacheTtl || 60 * 60;
         res.cookie('login_token', req.token, {
-          // HACK: 目前 sessionToken 的有效期就是 1h
-          maxAge: 60 * 60 * 1000,
-          expires: new Date(Date.now() + 60 * 60 * 1000),
+          maxAge: cacheTtl * 1000,
+          expires: new Date(Date.now() + cacheTtl * 1000),
           sameSite: 'none',
           secure: true,
         });

package/api/routes/oauth.js

@@ -414,7 +414,7 @@ module.exports = {
         'name'
       ).map((x) => {
         return {
-          ...x,
+          ...pick(x, ['id', 'name', 'title', 'role']),
           display: createPassportSvg({
             title: x.title,
             issuer: x.issuer.name,

package/api/services/auth/session.js

@@ -1,6 +1,12 @@
 const nocache = require('nocache');
 const joinUrl = require('url-join');
-const { WELLKNOWN_SERVICE_PATH_PREFIX, USER_AVATAR_URL_PREFIX, USER_AVATAR_PATH_PREFIX } = require('@abtnode/constant');
+const pick = require('lodash/pick');
+const {
+  WELLKNOWN_SERVICE_PATH_PREFIX,
+  USER_AVATAR_URL_PREFIX,
+  USER_AVATAR_PATH_PREFIX,
+  PASSPORT_STATUS,
+} = require('@abtnode/constant');
 const { LOGIN_PROVIDER } = require('@blocklet/constant');
 
 const { PREFIXES } = require('../../util/constants');
@@ -46,6 +52,10 @@ module.exports = {
           }
         }
 
+        user.passports = (user.passports || [])
+          .filter((x) => x.status === PASSPORT_STATUS.VALID)
+          .map((x) => pick(x, ['id', 'name', 'title', 'role']));
+
         res.json({ user, provider: req.user.provider || LOGIN_PROVIDER.WALLET });
       };
 

package/build/asset-manifest.json

@@ -1,20 +1,20 @@
 {
   "files": {
     "main.css": "/.well-known/service/static/static/css/main.7ea79dc8.css",
-    "main.js": "/.well-known/service/static/static/js/main.0757731a.js",
+    "main.js": "/.well-known/service/static/static/js/main.80037e65.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.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",
+    "static/js/868.60de5f6d.chunk.js": "/.well-known/service/static/static/js/868.60de5f6d.chunk.js",
     "static/js/4547.b26ceabb.chunk.js": "/.well-known/service/static/static/js/4547.b26ceabb.chunk.js",
-    "static/js/652.d534b309.chunk.js": "/.well-known/service/static/static/js/652.d534b309.chunk.js",
+    "static/js/652.5b3e92c7.chunk.js": "/.well-known/service/static/static/js/652.5b3e92c7.chunk.js",
     "static/js/4682.81053e18.chunk.js": "/.well-known/service/static/static/js/4682.81053e18.chunk.js",
     "static/js/6711.a62d0bcd.chunk.js": "/.well-known/service/static/static/js/6711.a62d0bcd.chunk.js",
     "static/js/8437.e4b47fc3.chunk.js": "/.well-known/service/static/static/js/8437.e4b47fc3.chunk.js",
-    "static/js/9409.9ba09610.chunk.js": "/.well-known/service/static/static/js/9409.9ba09610.chunk.js",
+    "static/js/9409.ce15e157.chunk.js": "/.well-known/service/static/static/js/9409.ce15e157.chunk.js",
     "static/js/8341.09d10e93.chunk.js": "/.well-known/service/static/static/js/8341.09d10e93.chunk.js",
     "static/js/5491.f227b5b4.chunk.js": "/.well-known/service/static/static/js/5491.f227b5b4.chunk.js",
     "static/js/1980.dba23d65.chunk.js": "/.well-known/service/static/static/js/1980.dba23d65.chunk.js",
@@ -22,26 +22,24 @@
     "static/js/5176.68fd3fde.chunk.js": "/.well-known/service/static/static/js/5176.68fd3fde.chunk.js",
     "static/js/2139.341406d2.chunk.js": "/.well-known/service/static/static/js/2139.341406d2.chunk.js",
     "static/js/5052.91c69c75.chunk.js": "/.well-known/service/static/static/js/5052.91c69c75.chunk.js",
-    "static/js/8395.40dc877e.chunk.js": "/.well-known/service/static/static/js/8395.40dc877e.chunk.js",
+    "static/js/8395.756a4612.chunk.js": "/.well-known/service/static/static/js/8395.756a4612.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.c6657383.chunk.js": "/.well-known/service/static/static/js/4603.c6657383.chunk.js",
-    "static/js/5050.538edf89.chunk.js": "/.well-known/service/static/static/js/5050.538edf89.chunk.js",
+    "static/js/4603.a370c797.chunk.js": "/.well-known/service/static/static/js/4603.a370c797.chunk.js",
+    "static/js/5050.f1d720d2.chunk.js": "/.well-known/service/static/static/js/5050.f1d720d2.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",
-    "static/js/766.5dd16d47.chunk.js": "/.well-known/service/static/static/js/766.5dd16d47.chunk.js",
-    "static/js/5430.8114614c.chunk.js": "/.well-known/service/static/static/js/5430.8114614c.chunk.js",
-    "static/js/3800.faac00ca.chunk.js": "/.well-known/service/static/static/js/3800.faac00ca.chunk.js",
-    "static/js/1832.4cd8a983.chunk.js": "/.well-known/service/static/static/js/1832.4cd8a983.chunk.js",
-    "static/js/3042.c9fe1ced.chunk.js": "/.well-known/service/static/static/js/3042.c9fe1ced.chunk.js",
-    "static/js/3162.6bbe08fc.chunk.js": "/.well-known/service/static/static/js/3162.6bbe08fc.chunk.js",
+    "static/js/766.43f63b49.chunk.js": "/.well-known/service/static/static/js/766.43f63b49.chunk.js",
+    "static/js/5430.6aa38ea1.chunk.js": "/.well-known/service/static/static/js/5430.6aa38ea1.chunk.js",
+    "static/js/3800.b792d5c0.chunk.js": "/.well-known/service/static/static/js/3800.b792d5c0.chunk.js",
+    "static/js/1832.3ac49edc.chunk.js": "/.well-known/service/static/static/js/1832.3ac49edc.chunk.js",
     "static/js/655.cdee65b4.chunk.js": "/.well-known/service/static/static/js/655.cdee65b4.chunk.js",
     "static/js/576.d7d4814e.chunk.js": "/.well-known/service/static/static/js/576.d7d4814e.chunk.js",
     "static/js/2631.54f86f84.chunk.js": "/.well-known/service/static/static/js/2631.54f86f84.chunk.js",
     "static/js/6315.59e078f6.chunk.js": "/.well-known/service/static/static/js/6315.59e078f6.chunk.js",
     "static/js/4651.0a58cbc3.chunk.js": "/.well-known/service/static/static/js/4651.0a58cbc3.chunk.js",
     "static/js/4319.e99b5af9.chunk.js": "/.well-known/service/static/static/js/4319.e99b5af9.chunk.js",
-    "static/js/445.6da52f3e.chunk.js": "/.well-known/service/static/static/js/445.6da52f3e.chunk.js",
+    "static/js/445.aabc2c68.chunk.js": "/.well-known/service/static/static/js/445.aabc2c68.chunk.js",
     "static/js/7518.5b02f3ba.chunk.js": "/.well-known/service/static/static/js/7518.5b02f3ba.chunk.js",
     "static/js/8669.814198b8.chunk.js": "/.well-known/service/static/static/js/8669.814198b8.chunk.js",
     "static/js/7291.5553195e.chunk.js": "/.well-known/service/static/static/js/7291.5553195e.chunk.js",
@@ -49,10 +47,10 @@
     "static/js/3242.5dea77f3.chunk.js": "/.well-known/service/static/static/js/3242.5dea77f3.chunk.js",
     "static/js/4492.97b0d4f6.chunk.js": "/.well-known/service/static/static/js/4492.97b0d4f6.chunk.js",
     "static/css/2130.b9437a64.chunk.css": "/.well-known/service/static/static/css/2130.b9437a64.chunk.css",
-    "static/js/2130.59fef4ad.chunk.js": "/.well-known/service/static/static/js/2130.59fef4ad.chunk.js",
+    "static/js/2130.c9c0f36b.chunk.js": "/.well-known/service/static/static/js/2130.c9c0f36b.chunk.js",
     "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/1237.a18e319d.chunk.js": "/.well-known/service/static/static/js/1237.a18e319d.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",
@@ -86,20 +84,20 @@
     "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.0757731a.js.map": "/.well-known/service/static/static/js/main.0757731a.js.map",
+    "main.80037e65.js.map": "/.well-known/service/static/static/js/main.80037e65.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.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",
+    "868.60de5f6d.chunk.js.map": "/.well-known/service/static/static/js/868.60de5f6d.chunk.js.map",
     "4547.b26ceabb.chunk.js.map": "/.well-known/service/static/static/js/4547.b26ceabb.chunk.js.map",
-    "652.d534b309.chunk.js.map": "/.well-known/service/static/static/js/652.d534b309.chunk.js.map",
+    "652.5b3e92c7.chunk.js.map": "/.well-known/service/static/static/js/652.5b3e92c7.chunk.js.map",
     "4682.81053e18.chunk.js.map": "/.well-known/service/static/static/js/4682.81053e18.chunk.js.map",
     "6711.a62d0bcd.chunk.js.map": "/.well-known/service/static/static/js/6711.a62d0bcd.chunk.js.map",
     "8437.e4b47fc3.chunk.js.map": "/.well-known/service/static/static/js/8437.e4b47fc3.chunk.js.map",
-    "9409.9ba09610.chunk.js.map": "/.well-known/service/static/static/js/9409.9ba09610.chunk.js.map",
+    "9409.ce15e157.chunk.js.map": "/.well-known/service/static/static/js/9409.ce15e157.chunk.js.map",
     "8341.09d10e93.chunk.js.map": "/.well-known/service/static/static/js/8341.09d10e93.chunk.js.map",
     "5491.f227b5b4.chunk.js.map": "/.well-known/service/static/static/js/5491.f227b5b4.chunk.js.map",
     "1980.dba23d65.chunk.js.map": "/.well-known/service/static/static/js/1980.dba23d65.chunk.js.map",
@@ -107,26 +105,24 @@
     "5176.68fd3fde.chunk.js.map": "/.well-known/service/static/static/js/5176.68fd3fde.chunk.js.map",
     "2139.341406d2.chunk.js.map": "/.well-known/service/static/static/js/2139.341406d2.chunk.js.map",
     "5052.91c69c75.chunk.js.map": "/.well-known/service/static/static/js/5052.91c69c75.chunk.js.map",
-    "8395.40dc877e.chunk.js.map": "/.well-known/service/static/static/js/8395.40dc877e.chunk.js.map",
+    "8395.756a4612.chunk.js.map": "/.well-known/service/static/static/js/8395.756a4612.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.c6657383.chunk.js.map": "/.well-known/service/static/static/js/4603.c6657383.chunk.js.map",
-    "5050.538edf89.chunk.js.map": "/.well-known/service/static/static/js/5050.538edf89.chunk.js.map",
+    "4603.a370c797.chunk.js.map": "/.well-known/service/static/static/js/4603.a370c797.chunk.js.map",
+    "5050.f1d720d2.chunk.js.map": "/.well-known/service/static/static/js/5050.f1d720d2.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",
-    "766.5dd16d47.chunk.js.map": "/.well-known/service/static/static/js/766.5dd16d47.chunk.js.map",
-    "5430.8114614c.chunk.js.map": "/.well-known/service/static/static/js/5430.8114614c.chunk.js.map",
-    "3800.faac00ca.chunk.js.map": "/.well-known/service/static/static/js/3800.faac00ca.chunk.js.map",
-    "1832.4cd8a983.chunk.js.map": "/.well-known/service/static/static/js/1832.4cd8a983.chunk.js.map",
-    "3042.c9fe1ced.chunk.js.map": "/.well-known/service/static/static/js/3042.c9fe1ced.chunk.js.map",
-    "3162.6bbe08fc.chunk.js.map": "/.well-known/service/static/static/js/3162.6bbe08fc.chunk.js.map",
+    "766.43f63b49.chunk.js.map": "/.well-known/service/static/static/js/766.43f63b49.chunk.js.map",
+    "5430.6aa38ea1.chunk.js.map": "/.well-known/service/static/static/js/5430.6aa38ea1.chunk.js.map",
+    "3800.b792d5c0.chunk.js.map": "/.well-known/service/static/static/js/3800.b792d5c0.chunk.js.map",
+    "1832.3ac49edc.chunk.js.map": "/.well-known/service/static/static/js/1832.3ac49edc.chunk.js.map",
     "655.cdee65b4.chunk.js.map": "/.well-known/service/static/static/js/655.cdee65b4.chunk.js.map",
     "576.d7d4814e.chunk.js.map": "/.well-known/service/static/static/js/576.d7d4814e.chunk.js.map",
     "2631.54f86f84.chunk.js.map": "/.well-known/service/static/static/js/2631.54f86f84.chunk.js.map",
     "6315.59e078f6.chunk.js.map": "/.well-known/service/static/static/js/6315.59e078f6.chunk.js.map",
     "4651.0a58cbc3.chunk.js.map": "/.well-known/service/static/static/js/4651.0a58cbc3.chunk.js.map",
     "4319.e99b5af9.chunk.js.map": "/.well-known/service/static/static/js/4319.e99b5af9.chunk.js.map",
-    "445.6da52f3e.chunk.js.map": "/.well-known/service/static/static/js/445.6da52f3e.chunk.js.map",
+    "445.aabc2c68.chunk.js.map": "/.well-known/service/static/static/js/445.aabc2c68.chunk.js.map",
     "7518.5b02f3ba.chunk.js.map": "/.well-known/service/static/static/js/7518.5b02f3ba.chunk.js.map",
     "8669.814198b8.chunk.js.map": "/.well-known/service/static/static/js/8669.814198b8.chunk.js.map",
     "7291.5553195e.chunk.js.map": "/.well-known/service/static/static/js/7291.5553195e.chunk.js.map",
@@ -134,10 +130,10 @@
     "3242.5dea77f3.chunk.js.map": "/.well-known/service/static/static/js/3242.5dea77f3.chunk.js.map",
     "4492.97b0d4f6.chunk.js.map": "/.well-known/service/static/static/js/4492.97b0d4f6.chunk.js.map",
     "2130.b9437a64.chunk.css.map": "/.well-known/service/static/static/css/2130.b9437a64.chunk.css.map",
-    "2130.59fef4ad.chunk.js.map": "/.well-known/service/static/static/js/2130.59fef4ad.chunk.js.map",
+    "2130.c9c0f36b.chunk.js.map": "/.well-known/service/static/static/js/2130.c9c0f36b.chunk.js.map",
     "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",
+    "1237.a18e319d.chunk.js.map": "/.well-known/service/static/static/js/1237.a18e319d.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",
@@ -151,6 +147,6 @@
   },
   "entrypoints": [
     "static/css/main.7ea79dc8.css",
-    "static/js/main.0757731a.js"
+    "static/js/main.80037e65.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.0757731a.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.80037e65.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>