@blocklet/sdk 1.16.32-beta-20240919-083324-82550492 → 1.16.32-beta-20240924-105841-08174626

package/lib/config.js

@@ -63,7 +63,11 @@ if (appDataDir) {
     try {
         const configFile = path_1.default.join(appDataDir, constant_1.APP_CONFIG_FILE_PATH);
         if (fs_1.default.existsSync(configFile)) {
-            const config = JSON.parse(fs_1.default.readFileSync(configFile).toString());
+            let configRaw = fs_1.default.readFileSync(configFile).toString();
+            if (process.env.DOCKER_HOST_SERVER_DIR && process.env.DOCKER_CONTAINER_SERVER_DIR) {
+                configRaw = configRaw.replace(process.env.DOCKER_HOST_SERVER_DIR, process.env.DOCKER_CONTAINER_SERVER_DIR);
+            }
+            const config = JSON.parse(configRaw);
             appEnvFromDisk = config.env || {};
             componentsFromDisk = config.components;
         }

package/lib/middlewares/auth.js

@@ -43,7 +43,7 @@ const AuthMiddleware = ({ roles, permissions, kyc, methods, getClient = getServi
         const userDid = req.user?.did || req.headers['x-user-did'];
         const userRole = req.user?.role || req.headers['x-user-role'];
         const userKyc = req.user?.kyc || req.headers['x-user-kyc'];
-        const userMethod = req.user?.method || 'loginToken';
+        const userMethod = req.user?.method || '';
         if (!userDid) {
             res.status(401).json({ code: 'forbidden', error: 'not authorized' });
             return;

package/lib/middlewares/index.d.ts

@@ -67,6 +67,7 @@ declare const _default: {
     }) => void, req?: import("express").Request) => Promise<void>) => (req: import("express").Request, res: import("express").Response) => Promise<void>;
     csrf: typeof csrf;
     session: (options?: {
+        strictMode?: boolean;
         loginToken?: boolean;
         componentCall?: boolean;
         signedToken?: boolean;

package/lib/middlewares/session.d.ts

@@ -1,6 +1,7 @@
 import { NextFunction, Request, Response } from 'express';
 import { SessionUser } from '../util/login';
 type SessionOptions = {
+    strictMode?: boolean;
     loginToken?: boolean;
     componentCall?: boolean;
     signedToken?: boolean;

package/lib/middlewares/session.js

@@ -12,7 +12,7 @@ const wallet_1 = __importDefault(require("../wallet"));
 const sessionMiddleware = (options = {}) => {
     const wallet = (0, wallet_1.default)();
     const secret = mcrypto_1.Hasher.SHA3.hash256(Buffer.concat([wallet.secretKey, wallet.address].map((v) => Buffer.from(v))));
-    const { loginToken = true, componentCall = false, signedToken = '' } = options;
+    const { loginToken = true, componentCall = false, signedToken = '', strictMode = false } = options;
     return (req, res, next) => {
         // authenticate by login token
         if (loginToken) {
@@ -20,7 +20,12 @@ const sessionMiddleware = (options = {}) => {
             if (token) {
                 return jsonwebtoken_1.default.verify(token, secret, (err, decoded) => {
                     if (err) {
-                        res.status(401).json({ message: 'Unauthorized: Invalid login token' });
+                        if (strictMode) {
+                            res.status(401).json({ message: 'Unauthorized: Invalid login token' });
+                        }
+                        else {
+                            next();
+                        }
                     }
                     else {
                         const { did, role, fullName, provider = constant_1.LOGIN_PROVIDER.WALLET, walletOS, kyc = 0 } = decoded;
@@ -45,7 +50,10 @@ const sessionMiddleware = (options = {}) => {
                 // FIXME: @zhanghan please check this
                 const data = typeof req.body === 'undefined' ? {} : req.body;
                 if ((0, verify_sign_1.verify)(data, signature) === false) {
-                    return res.status(401).json({ error: 'Unauthorized: Invalid signature' });
+                    if (strictMode) {
+                        return res.status(401).json({ error: 'Unauthorized: Invalid signature' });
+                    }
+                    return next();
                 }
                 req.user = {
                     did: req.get('x-component-did'),
@@ -65,7 +73,10 @@ const sessionMiddleware = (options = {}) => {
             const token = req.query.__jwt || '';
             if (token) {
                 if ((0, jwt_1.verify)(token, secret) === false) {
-                    return res.status(401).json({ error: 'Unauthorized: Invalid signed token' });
+                    if (strictMode) {
+                        return res.status(401).json({ error: 'Unauthorized: Invalid signed token' });
+                    }
+                    return next();
                 }
                 req.user = {
                     did: wallet.address,

package/lib/util/app-info.js

@@ -13,10 +13,13 @@ const constant_1 = require("@abtnode/constant");
 const login_1 = require("./login");
 function getFederatedMasterAppInfo({ blocklet, sourceAppPid, version, groupPathPrefix, nodeInfo, }) {
     const { federated } = blocklet.settings;
+    if (!federated) {
+        return null;
+    }
     const master = federated.sites.find((x) => x.appPid === sourceAppPid);
     return {
         name: master.appName,
-        description: master.appescription || `Connect to ${master.appName}`,
+        description: master.appDescription || `Connect to ${master.appName}`,
         icon: (0, ufo_1.joinURL)(master.appUrl, constant_1.WELLKNOWN_SERVICE_PATH_PREFIX, `/blocklet/logo?v=${version}`),
         link: master.appUrl,
         updateSubEndpoint: true,
@@ -32,7 +35,7 @@ async function getAppInfo({ request, baseUrl, getBlocklet, getNodeInfo, }) {
         returnWallet: false,
     });
     const { version, name, description } = blockletInfo;
-    if (sourceAppPid) {
+    if (sourceAppPid && blocklet?.settings?.federated) {
         return getFederatedMasterAppInfo({
             blocklet,
             sourceAppPid,
@@ -60,7 +63,7 @@ async function getMemberAppInfo({ request, baseUrl, getBlocklet, getNodeInfo, })
         returnWallet: false,
     });
     const { version, name, description } = blockletInfo;
-    if (sourceAppPid && blocklet) {
+    if (sourceAppPid && blocklet?.settings?.federated) {
         return {
             name,
             description: description || `Connect to ${name}`,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.32-beta-20240919-083324-82550492",
+  "version": "1.16.32-beta-20240924-105841-08174626",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -27,15 +27,15 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/client": "1.16.32-beta-20240919-083324-82550492",
-    "@abtnode/constant": "1.16.32-beta-20240919-083324-82550492",
+    "@abtnode/client": "1.16.32-beta-20240924-105841-08174626",
+    "@abtnode/constant": "1.16.32-beta-20240924-105841-08174626",
     "@arcblock/did": "1.18.135",
     "@arcblock/did-auth": "1.18.135",
     "@arcblock/jwt": "1.18.135",
     "@arcblock/ws": "1.18.135",
-    "@blocklet/constant": "1.16.32-beta-20240919-083324-82550492",
-    "@blocklet/env": "1.16.32-beta-20240919-083324-82550492",
-    "@blocklet/meta": "1.16.32-beta-20240919-083324-82550492",
+    "@blocklet/constant": "1.16.32-beta-20240924-105841-08174626",
+    "@blocklet/env": "1.16.32-beta-20240924-105841-08174626",
+    "@blocklet/meta": "1.16.32-beta-20240924-105841-08174626",
     "@did-connect/authenticator": "^2.2.4",
     "@did-connect/handler": "^2.2.4",
     "@nedb/core": "^2.1.5",
@@ -76,5 +76,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
   },
-  "gitHead": "591bfa762d9fe1ca1edf30c2d02f8e4a03de4cf5"
+  "gitHead": "09da4510de3aeb2fd493ce22a5a913835725a13f"
 }