@abtnode/blocklet-services 1.16.19-beta-beb58af7 → 1.16.19-beta-626e4d43

package/api/index.js

@@ -268,6 +268,7 @@ module.exports = function createServer(node, serverOptions = {}) {
   createConnectRelayRoutes.init(server, node, options, wsRouter);
   authRoutes.attachDidAuthHandlers(server);
   authRoutes.createPassportRoutes.init(server, node);
+  authRoutes.createCommonRoutes.init(server, node);
 
   // API: gql
   [

package/api/middlewares/check-running.js

@@ -1,6 +1,7 @@
 const { BlockletStatus } = require('@blocklet/constant');
 const getBlockletMaintenanceTemplate = require('@abtnode/router-templates/lib/blocklet-maintenance');
 const { findComponentByIdV2 } = require('@blocklet/meta/lib/util');
+const logger = require('@abtnode/logger')(require('../../package.json').name);
 
 const { shouldGotoStartPage, getRedirectUrl } = require('../util');
 
@@ -21,9 +22,10 @@ const checkRunning = async (req, res, next) => {
     ].includes(component.status)
   ) {
     if (shouldGotoStartPage(req, component)) {
-      // FIXME: @wangshijun how to validate this token or generate token here?
       if (req.query.setupToken) {
-        res.cookie('login_token', req.query.setupToken, { maxAge: 24 * 60 * 60 * 1000 });
+        await req.attachSetupToken({ res, token: req.query.setupToken }).catch((error) => {
+          logger.error('attach login token failed when redirecting to starting page', { error }); // 不阻跳转
+        });
       }
       if (app.settings.initialized) {
         res.redirect(getRedirectUrl({ req, pagePath: '/start' }));

package/api/services/auth/index.js

@@ -14,6 +14,7 @@ const {
 const { BLOCKLET_MODES } = require('@blocklet/constant');
 const { setUserInfoHeaders } = require('@abtnode/auth/lib/auth');
 const { getRolesFromAuthConfig } = require('@blocklet/meta/lib/util');
+const logger = require('@abtnode/logger')(require('../../../package.json').name);
 
 const initJwt = require('../../libs/jwt');
 const initAuth = require('../../libs/connect/v1');
@@ -38,7 +39,7 @@ const createReceiveTransferAppOwnerRoutes = require('./connect/receive-transfer-
 const createSessionRoutes = require('./session');
 const createPassportRoutes = require('./passport');
 const { getRedirectUrl, shouldIgnoreUrl } = require('../../util');
-const { sessionCacheDisabledUser } = require('../../cache');
+const { PREFIXES } = require('../../util/constants');
 
 const getTokenFromWsConnect = (req, options) => {
   const cookies = cookie.parse(req.headers.cookie || '');
@@ -62,27 +63,6 @@ const REASON_404 = 'Not Found';
 const init = ({ node, options }) => {
   const { createSessionToken, verifySessionToken } = initJwt(node, options);
 
-  /**
-   * set user info to req.user
-   */
-  const ensureUser = async ({ req, token } = {}) => {
-    try {
-      if (token) {
-        const teamDid = req.getBlockletDid();
-        const { secret } = await req.getBlockletInfo();
-        const opt = {
-          checkFromDb: (decoded) => sessionCacheDisabledUser.get(decoded?.did),
-          teamDid,
-        };
-
-        const user = await verifySessionToken(token, secret, opt);
-        req.user = user;
-      }
-    } catch {
-      // Do nothing
-    }
-  };
-
   /**
    * @typedef {object} CheckAuthRes
    * @property {boolean} blocked
@@ -227,7 +207,7 @@ const init = ({ node, options }) => {
   // set user info to req.user and req.headers
   middlewares.userInfo = async (req, res, next) => {
     const { token } = req;
-    await ensureUser({ req, token });
+    await req.ensureUser({ token });
 
     setUserInfoHeaders(req);
 
@@ -265,11 +245,25 @@ const init = ({ node, options }) => {
       createSessionRoutes.init(router, node, createSessionToken, {
         ...options,
         middlewares,
-        ensureUser,
         createSessionToken,
         verifySessionToken,
       }),
   };
+  routes.createCommonRoutes = {
+    init: (router) => {
+      PREFIXES.forEach((prefix) => {
+        router.get(`${prefix}/redirect-with-login`, async (req, res) => {
+          if (req.query.setupToken) {
+            await req.attachSetupToken({ res, token: req.query.setupToken }).catch((error) => {
+              logger.error('attach login token failed when redirecting with login', { error }); // 不阻塞跳转
+            });
+          }
+
+          res.redirect('/');
+        });
+      });
+    },
+  };
 
   const ensureWsUser = async (req) => {
     const token = getTokenFromWsConnect(req, options);
@@ -279,7 +273,7 @@ const init = ({ node, options }) => {
       return;
     }
 
-    await ensureUser({ req, token });
+    await req.ensureUser({ token });
   };
 
   // auth middleware for websocket connect
@@ -292,7 +286,7 @@ const init = ({ node, options }) => {
       return;
     }
 
-    await ensureUser({ req, token });
+    await req.ensureUser({ token });
 
     setUserInfoHeaders(req);
 

package/api/services/auth/session.js

@@ -20,14 +20,13 @@ module.exports = {
     const {
       verifySessionToken,
       middlewares: { sessionBearerToken, refreshBearerToken },
-      ensureUser,
     } = options;
     const createToken = createTokenFn(createSessionToken);
 
     PREFIXES.forEach((prefix) => {
       const handleSession = async (req, res) => {
         const { token } = req;
-        await ensureUser({ req, token });
+        await req.ensureUser({ token });
 
         if (!req.user) {
           res.json({ user: null });
@@ -74,7 +73,7 @@ module.exports = {
       const extraApi = `${prefix}/api/user/extra`;
       const checkUser = async (req, res, next) => {
         const { token } = req;
-        await ensureUser({ req, token });
+        await req.ensureUser({ token });
         if (!req.user) {
           res.status(403).json(null);
         } else {

package/api/util/attach-shared-utils.js

@@ -8,6 +8,7 @@ const cache = require('../cache');
 const formatContext = require('./format-context');
 const getDynamicServiceConfig = require('./get-dynamic-service-config');
 const getStaticServiceConfig = require('./get-static-service-config');
+const initJwt = require('../libs/jwt');
 
 module.exports = ({ node, req, options }) => {
   req.getBlockletDid = () => req.headers['x-blocklet-did'] || get(options, 'blockletDid', '');
@@ -98,6 +99,37 @@ module.exports = ({ node, req, options }) => {
     return cache.getBlockletInfo({ did, node });
   };
 
+  const { verifySessionToken } = initJwt(node, options);
+
+  /**
+   * set user info to req.user
+   */
+  req.ensureUser = async ({ token } = {}) => {
+    try {
+      if (token) {
+        const teamDid = req.getBlockletDid();
+        const { secret } = await req.getBlockletInfo();
+        const opt = {
+          checkFromDb: (decoded) => cache.sessionCacheDisabledUser.get(decoded?.did),
+          teamDid,
+        };
+
+        const user = await verifySessionToken(token, secret, opt);
+        req.user = user;
+      }
+    } catch {
+      // Do nothing
+    }
+  };
+
+  req.attachSetupToken = async ({ res, token }) => {
+    await req.ensureUser({ token });
+
+    if (req.user) {
+      res.cookie('login_token', token, { maxAge: 24 * 60 * 60 * 1000 });
+    }
+  };
+
   req.cache = cache;
 };
 

package/build/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "/.well-known/service/static/static/css/main.7ea79dc8.css",
-    "main.js": "/.well-known/service/static/static/js/main.41cd395e.js",
+    "main.js": "/.well-known/service/static/static/js/main.6fc39419.js",
     "static/js/6218.4f3036a7.chunk.js": "/.well-known/service/static/static/js/6218.4f3036a7.chunk.js",
     "static/js/4076.8055ce74.chunk.js": "/.well-known/service/static/static/js/4076.8055ce74.chunk.js",
     "static/js/6658.98f9956d.chunk.js": "/.well-known/service/static/static/js/6658.98f9956d.chunk.js",
@@ -11,7 +11,7 @@
     "static/js/779.cbad02fa.chunk.js": "/.well-known/service/static/static/js/779.cbad02fa.chunk.js",
     "static/js/8622.03f917b3.chunk.js": "/.well-known/service/static/static/js/8622.03f917b3.chunk.js",
     "static/js/1148.d3c53aea.chunk.js": "/.well-known/service/static/static/js/1148.d3c53aea.chunk.js",
-    "static/js/8944.d4773634.chunk.js": "/.well-known/service/static/static/js/8944.d4773634.chunk.js",
+    "static/js/8944.f4f91564.chunk.js": "/.well-known/service/static/static/js/8944.f4f91564.chunk.js",
     "static/js/5468.21a861b9.chunk.js": "/.well-known/service/static/static/js/5468.21a861b9.chunk.js",
     "static/js/9982.4f1ebb7f.chunk.js": "/.well-known/service/static/static/js/9982.4f1ebb7f.chunk.js",
     "static/js/1359.add26d23.chunk.js": "/.well-known/service/static/static/js/1359.add26d23.chunk.js",
@@ -21,12 +21,12 @@
     "static/js/4882.0435e418.chunk.js": "/.well-known/service/static/static/js/4882.0435e418.chunk.js",
     "static/js/5434.523d071d.chunk.js": "/.well-known/service/static/static/js/5434.523d071d.chunk.js",
     "static/js/3033.f950a32b.chunk.js": "/.well-known/service/static/static/js/3033.f950a32b.chunk.js",
-    "static/js/3842.9917fe86.chunk.js": "/.well-known/service/static/static/js/3842.9917fe86.chunk.js",
-    "static/js/3131.477fef7e.chunk.js": "/.well-known/service/static/static/js/3131.477fef7e.chunk.js",
-    "static/js/5785.5636e84e.chunk.js": "/.well-known/service/static/static/js/5785.5636e84e.chunk.js",
-    "static/js/8983.f509aca0.chunk.js": "/.well-known/service/static/static/js/8983.f509aca0.chunk.js",
-    "static/js/9900.2dea9cda.chunk.js": "/.well-known/service/static/static/js/9900.2dea9cda.chunk.js",
-    "static/js/8283.f3a42d0f.chunk.js": "/.well-known/service/static/static/js/8283.f3a42d0f.chunk.js",
+    "static/js/3842.780dc9e9.chunk.js": "/.well-known/service/static/static/js/3842.780dc9e9.chunk.js",
+    "static/js/3131.b2bb8f6c.chunk.js": "/.well-known/service/static/static/js/3131.b2bb8f6c.chunk.js",
+    "static/js/5785.38eedf8e.chunk.js": "/.well-known/service/static/static/js/5785.38eedf8e.chunk.js",
+    "static/js/8983.020df395.chunk.js": "/.well-known/service/static/static/js/8983.020df395.chunk.js",
+    "static/js/9900.26718c8f.chunk.js": "/.well-known/service/static/static/js/9900.26718c8f.chunk.js",
+    "static/js/8283.20452732.chunk.js": "/.well-known/service/static/static/js/8283.20452732.chunk.js",
     "static/js/6326.2816fb2f.chunk.js": "/.well-known/service/static/static/js/6326.2816fb2f.chunk.js",
     "static/js/2653.980158ea.chunk.js": "/.well-known/service/static/static/js/2653.980158ea.chunk.js",
     "static/js/3593.b9a1a7f5.chunk.js": "/.well-known/service/static/static/js/3593.b9a1a7f5.chunk.js",
@@ -38,7 +38,7 @@
     "static/js/356.df75c406.chunk.js": "/.well-known/service/static/static/js/356.df75c406.chunk.js",
     "static/js/4023.8c5c7db4.chunk.js": "/.well-known/service/static/static/js/4023.8c5c7db4.chunk.js",
     "static/js/8792.13a6919f.chunk.js": "/.well-known/service/static/static/js/8792.13a6919f.chunk.js",
-    "static/js/1946.383ddc49.chunk.js": "/.well-known/service/static/static/js/1946.383ddc49.chunk.js",
+    "static/js/1946.b8762af5.chunk.js": "/.well-known/service/static/static/js/1946.b8762af5.chunk.js",
     "static/js/5569.e4bfe697.chunk.js": "/.well-known/service/static/static/js/5569.e4bfe697.chunk.js",
     "static/css/5547.75913953.chunk.css": "/.well-known/service/static/static/css/5547.75913953.chunk.css",
     "static/js/5547.1bea60f5.chunk.js": "/.well-known/service/static/static/js/5547.1bea60f5.chunk.js",
@@ -121,7 +121,7 @@
     "index.html": "/.well-known/service/static/index.html",
     "static/media/space-connected.svg": "/.well-known/service/static/static/media/space-connected.9a4e18fd2bc7d065191b0d241a131c28.svg",
     "main.7ea79dc8.css.map": "/.well-known/service/static/static/css/main.7ea79dc8.css.map",
-    "main.41cd395e.js.map": "/.well-known/service/static/static/js/main.41cd395e.js.map",
+    "main.6fc39419.js.map": "/.well-known/service/static/static/js/main.6fc39419.js.map",
     "6218.4f3036a7.chunk.js.map": "/.well-known/service/static/static/js/6218.4f3036a7.chunk.js.map",
     "4076.8055ce74.chunk.js.map": "/.well-known/service/static/static/js/4076.8055ce74.chunk.js.map",
     "6658.98f9956d.chunk.js.map": "/.well-known/service/static/static/js/6658.98f9956d.chunk.js.map",
@@ -131,7 +131,7 @@
     "779.cbad02fa.chunk.js.map": "/.well-known/service/static/static/js/779.cbad02fa.chunk.js.map",
     "8622.03f917b3.chunk.js.map": "/.well-known/service/static/static/js/8622.03f917b3.chunk.js.map",
     "1148.d3c53aea.chunk.js.map": "/.well-known/service/static/static/js/1148.d3c53aea.chunk.js.map",
-    "8944.d4773634.chunk.js.map": "/.well-known/service/static/static/js/8944.d4773634.chunk.js.map",
+    "8944.f4f91564.chunk.js.map": "/.well-known/service/static/static/js/8944.f4f91564.chunk.js.map",
     "5468.21a861b9.chunk.js.map": "/.well-known/service/static/static/js/5468.21a861b9.chunk.js.map",
     "9982.4f1ebb7f.chunk.js.map": "/.well-known/service/static/static/js/9982.4f1ebb7f.chunk.js.map",
     "1359.add26d23.chunk.js.map": "/.well-known/service/static/static/js/1359.add26d23.chunk.js.map",
@@ -141,12 +141,12 @@
     "4882.0435e418.chunk.js.map": "/.well-known/service/static/static/js/4882.0435e418.chunk.js.map",
     "5434.523d071d.chunk.js.map": "/.well-known/service/static/static/js/5434.523d071d.chunk.js.map",
     "3033.f950a32b.chunk.js.map": "/.well-known/service/static/static/js/3033.f950a32b.chunk.js.map",
-    "3842.9917fe86.chunk.js.map": "/.well-known/service/static/static/js/3842.9917fe86.chunk.js.map",
-    "3131.477fef7e.chunk.js.map": "/.well-known/service/static/static/js/3131.477fef7e.chunk.js.map",
-    "5785.5636e84e.chunk.js.map": "/.well-known/service/static/static/js/5785.5636e84e.chunk.js.map",
-    "8983.f509aca0.chunk.js.map": "/.well-known/service/static/static/js/8983.f509aca0.chunk.js.map",
-    "9900.2dea9cda.chunk.js.map": "/.well-known/service/static/static/js/9900.2dea9cda.chunk.js.map",
-    "8283.f3a42d0f.chunk.js.map": "/.well-known/service/static/static/js/8283.f3a42d0f.chunk.js.map",
+    "3842.780dc9e9.chunk.js.map": "/.well-known/service/static/static/js/3842.780dc9e9.chunk.js.map",
+    "3131.b2bb8f6c.chunk.js.map": "/.well-known/service/static/static/js/3131.b2bb8f6c.chunk.js.map",
+    "5785.38eedf8e.chunk.js.map": "/.well-known/service/static/static/js/5785.38eedf8e.chunk.js.map",
+    "8983.020df395.chunk.js.map": "/.well-known/service/static/static/js/8983.020df395.chunk.js.map",
+    "9900.26718c8f.chunk.js.map": "/.well-known/service/static/static/js/9900.26718c8f.chunk.js.map",
+    "8283.20452732.chunk.js.map": "/.well-known/service/static/static/js/8283.20452732.chunk.js.map",
     "6326.2816fb2f.chunk.js.map": "/.well-known/service/static/static/js/6326.2816fb2f.chunk.js.map",
     "2653.980158ea.chunk.js.map": "/.well-known/service/static/static/js/2653.980158ea.chunk.js.map",
     "3593.b9a1a7f5.chunk.js.map": "/.well-known/service/static/static/js/3593.b9a1a7f5.chunk.js.map",
@@ -158,7 +158,7 @@
     "356.df75c406.chunk.js.map": "/.well-known/service/static/static/js/356.df75c406.chunk.js.map",
     "4023.8c5c7db4.chunk.js.map": "/.well-known/service/static/static/js/4023.8c5c7db4.chunk.js.map",
     "8792.13a6919f.chunk.js.map": "/.well-known/service/static/static/js/8792.13a6919f.chunk.js.map",
-    "1946.383ddc49.chunk.js.map": "/.well-known/service/static/static/js/1946.383ddc49.chunk.js.map",
+    "1946.b8762af5.chunk.js.map": "/.well-known/service/static/static/js/1946.b8762af5.chunk.js.map",
     "5569.e4bfe697.chunk.js.map": "/.well-known/service/static/static/js/5569.e4bfe697.chunk.js.map",
     "5547.75913953.chunk.css.map": "/.well-known/service/static/static/css/5547.75913953.chunk.css.map",
     "5547.1bea60f5.chunk.js.map": "/.well-known/service/static/static/js/5547.1bea60f5.chunk.js.map",
@@ -220,6 +220,6 @@
   },
   "entrypoints": [
     "static/css/main.7ea79dc8.css",
-    "static/js/main.41cd395e.js"
+    "static/js/main.6fc39419.js"
   ]
 }

package/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico?imageFilter=resize&w=32"/><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><style>body{margin:0;padding:0}</style><script defer="defer" src="/.well-known/service/static/static/js/main.41cd395e.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?imageFilter=resize&w=32"/><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><style>body{margin:0;padding:0}</style><script defer="defer" src="/.well-known/service/static/static/js/main.6fc39419.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>