@abtnode/blocklet-services 1.16.41-beta-20250318-012955-51b0ae39 → 1.16.41-beta-20250319-034744-5c62f533

package/api/libs/connect/session.js

@@ -51,7 +51,7 @@ const logger = require('../logger')('connect');
 const { createTokenFn, getDidConnectVersion } = require('../../util');
 const { transferPassport, PASSPORT_VC_TYPES } = require('../auth/utils');
 const { migrateAccount, declareAccount } = require('../../services/oauth');
-const { getKycClaims, verifyKycClaims, getPassportVc, isProfileUrlSupported, getProfileItems } = require('../kyc');
+const { getKycClaims, verifyKycClaims, getPassportVc, getProfileItems } = require('../kyc');
 const { getTrustedIssuers, getFederatedTrustedIssuers } = require('../../util/blocklet-utils');
 const {
   getUserAvatarUrl,
@@ -146,10 +146,26 @@ const validateRole = async ({ role, securityConfig, locale, node, teamDid }) =>
   }
 };
 
-const checkAppOwner = ({ role, blocklet, userDid, locale = 'en' }) => {
-  if (role === ROLES.OWNER && blocklet.settings.initialized && userDid !== blocklet.settings.owner.did) {
-    throw new Error(messages.notAppOwner[locale]);
+const checkAppOwner = async ({ node, role, blocklet, userDid, locale = 'en' }) => {
+  if (role !== ROLES.OWNER) {
+    return;
+  }
+
+  if (!blocklet.settings.initialized) {
+    return;
   }
+
+  // Blocklet owner may have migrated from managed to external
+  const user = await node.getUser({
+    teamDid: blocklet.meta.did,
+    user: { did: blocklet.settings.owner.did },
+    options: { enableConnectedAccount: true },
+  });
+  if (user.connectedAccounts.some((x) => x.did === userDid)) {
+    return;
+  }
+
+  throw new Error(messages.notAppOwner[locale]);
 };
 
 /**
@@ -282,10 +298,7 @@ module.exports = {
       }
 
       if (user) {
-        // profile url 存在或者 不可以使用 profile，那么就不需要出示 profile 了
-        if (user.url || !isProfileUrlSupported(request.context.didwallet)) {
-          delete claims.profile;
-        }
+        delete claims.profile;
 
         // HACK: 确保用户在尝试登录时，就将 avatar 进行一次 fix (base64 -> bn-url)
         if (user.avatar) {
@@ -458,8 +471,7 @@ module.exports = {
       // Get role
       const role = await getRoleFromVC({ vc, node, locale, blocklet, teamDid, sourceAppPid });
       await validateRole({ role, securityConfig: accessPolicyConfig, locale, node, teamDid });
-
-      checkAppOwner({ role, blocklet, userDid, locale });
+      await checkAppOwner({ node, role, blocklet, userDid, locale });
 
       if (blocklet.settings?.purpose !== 'e2e') {
         // do not allow non-exist user to login as owner/admin
@@ -974,8 +986,7 @@ module.exports = {
       // Get role
       const role = await getRoleFromVC({ vc, node, locale, blocklet, teamDid, sourceAppPid });
       await validateRole({ role, securityConfig: accessPolicyConfig, locale, node, teamDid });
-
-      checkAppOwner({ role, blocklet, userDid, locale });
+      await checkAppOwner({ node, role, blocklet, userDid, locale });
 
       // Recreate passport with correct role
       passport = vc ? createUserPassport(vc, { role }) : null;

package/api/libs/open-graph/index.js

@@ -18,7 +18,7 @@ const { getTemplate } = require('./template');
 const { getCacheFilePath } = require('../image');
 const emoji = require('./emoji');
 
-const TEMPLATES = ['default', 'section', 'cover'];
+const TEMPLATES = ['default', 'section', 'cover', 'banner'];
 const MAX_TITLE_LENGTH = 128;
 const MAX_DESCRIPTION_LENGTH = 512;
 const MAX_IMAGE_SIZE = 5 * 1024 * 1024;
@@ -69,7 +69,11 @@ const schema = Joi.object({
   // customize logo
   logo: Joi.string()
     .uri({ scheme: ['https'] })
-    .optional(),
+    .when('template', {
+      is: 'banner',
+      then: Joi.required(),
+      otherwise: Joi.optional().default(''),
+    }),
   logoRounded: Joi.string().allow('0', '1').optional(),
 
   // custom emoji
@@ -110,13 +114,19 @@ const getOgImage = ({ input, info, cacheDir, format, tmpDir }) => {
   }
 
   value.logoRounded = value.logoRounded === '1';
-  value.background = joinURL(
-    info.appUrl,
-    WELLKNOWN_SERVICE_PATH_PREFIX,
-    `/blocklet/og-image?imageFilter=resize&w=1200&h=630&hash=${info.ogImageHash || ''}`
-  );
+  if (value.template === 'banner') {
+    value.background = joinURL(info.appUrl, WELLKNOWN_SERVICE_PATH_PREFIX, '/static/images/banner.png');
+  } else {
+    value.background = joinURL(
+      info.appUrl,
+      WELLKNOWN_SERVICE_PATH_PREFIX,
+      `/blocklet/og-image?imageFilter=resize&w=1200&h=630&hash=${info.ogImageHash || ''}`
+    );
+  }
 
-  const params = { ...value, width: 1200, height: 630, color, format };
+  const width = value.template === 'banner' ? 1280 : 1200;
+  const height = value.template === 'banner' ? 441 : 630;
+  const params = { ...value, width, height, color, format };
   const cacheKey = md5(stringify(params));
   const nocache = input.nocache === '1';
   const destPath = getCacheFilePath(cacheDir, `${cacheKey}.${format}`);
@@ -166,7 +176,7 @@ const convertExternalImage = (url, dest, height) => {
         },
         (res) => {
           if (res.statusCode && res.statusCode >= 400) {
-            reject(new CustomError(400, `unexpected external image status: ${res.statusCode}`));
+            reject(new CustomError(400, `unexpected external image status: ${res.statusCode} ${url}`));
             return;
           }
 
@@ -207,8 +217,8 @@ const convertExternalImage = (url, dest, height) => {
   });
 };
 
-const getCachedExternalImage = (cacheKey, port = process.env.ABT_NODE_SERVICE_PORT) => {
-  return `http://127.0.0.1:${port}/open-graph/${cacheKey.slice(0, 2)}/${cacheKey.slice(2)}.png`;
+const getCachedExternalImage = (cacheKey) => {
+  return `http://127.0.0.1:${process.env.ABT_NODE_SERVICE_PORT}/open-graph/${cacheKey.slice(0, 2)}/${cacheKey.slice(2)}.png`;
 };
 
 const cacheTasks = {};

package/api/libs/open-graph/template.js

@@ -83,9 +83,9 @@ const getSectionTemplate = (
   { width, height, logo, logoRounded, background, color, title, description, section },
   fn
 ) => {
-  return fn` <div
+  return fn`<div
     style="
-    width: ${width};
+    width: ${width}px;
     height: ${height}px;
     background-image: url(${background});
     background-size: cover;
@@ -200,6 +200,43 @@ const getCoverTemplate = ({ width, height, logo, logoRounded, color, title, desc
   </div>`;
 };
 
+const getBannerTemplate = ({ width, height, color, logo, logoRounded, background, title }, fn) => {
+  const textColor = getTextColor(color.start);
+  return fn`<div
+    style="
+    width: ${width}px;
+    height: ${height}px;
+    background-image: url(${background});
+    background-size: cover;
+    background-position: center;
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+    position: relative;
+  "
+  >
+    <img
+      src="${logo}"
+      height="150"
+      width="150"
+      style="height: 150px; width: 150px; ${logoRounded ? 'border-radius: 50%;' : ''} margin-right: 48px"
+    />
+    <h2
+      style="
+      font-size: 72px;
+      color: ${textColor};
+      font-weight: 500;
+      font-family: Arial, sans-serif;
+      text-align: left;
+      line-clamp: 1;
+    "
+    >
+      ${title}
+    </h2>
+  </div>`;
+};
+
 const getTemplate = async (params) => {
   // eslint-disable-next-line import/no-unresolved
   const { html } = await import('satori-html');
@@ -214,6 +251,9 @@ const getTemplate = async (params) => {
   if (params.template === 'cover') {
     return getCoverTemplate(params, fn);
   }
+  if (params.template === 'banner') {
+    return getBannerTemplate(params, fn);
+  }
 
   throw new Error('Invalid open graph template');
 };

package/api/routes/user.js

@@ -443,6 +443,15 @@ const webhookSetSchema = Joi.object({
   url: Joi.string().uri().required(),
 });
 
+const addressSchema = Joi.object({
+  country: Joi.string().trim().allow('').max(50).optional(),
+  province: Joi.string().trim().allow('').max(50).optional(),
+  city: Joi.string().trim().allow('').max(50).optional(),
+  postalCode: Joi.string().allow('').trim().max(20).optional(),
+  line1: Joi.string().allow('').trim().max(200).optional(),
+  line2: Joi.string().allow('').trim().max(200).optional(),
+});
+
 const profileSetSchema = Joi.object({
   locale: Joi.string().optional(),
   email: Joi.string().email().optional(),
@@ -456,9 +465,9 @@ const profileSetSchema = Joi.object({
       phoneNumber: Joi.string().optional(),
       country: Joi.string().optional(),
     }).optional(),
-    bio: Joi.string().max(200).optional(),
-    timezone: Joi.string().optional(),
-    location: Joi.string().optional(),
+    bio: Joi.string().allow('').max(200).optional(),
+    timezone: Joi.string().allow('').optional(),
+    location: Joi.string().allow('').optional(),
     status: Joi.object({
       label: Joi.string().optional(),
       icon: Joi.string().optional(),
@@ -480,6 +489,7 @@ const profileSetSchema = Joi.object({
       )
       .optional(),
   }).optional(),
+  address: addressSchema.optional(),
 });
 
 const spaceGatewaySchema = Joi.object({
@@ -836,18 +846,38 @@ module.exports = {
         }
 
         const { blocklet } = req;
-        const { metadata } = value;
-        const _metadata = omit(metadata, ['email']);
+        const { metadata, address } = value;
         const teamDid = blocklet.appPid;
+
+        // 构建更新对象，只包含有值的字段
+        const updateData = {
+          did: req.user.did,
+          ...omitBy(value, (x) => !x),
+        };
+
+        // 只有当 metadata 存在时才添加到更新对象中
+        if (metadata) {
+          const _metadata = omit(metadata, ['email']);
+          updateData.metadata = _metadata;
+
+          // 处理 email 和 phone
+          if (metadata.email) {
+            updateData.email = metadata.email;
+          }
+
+          if (metadata.phone?.phoneNumber) {
+            updateData.phone = metadata.phone.phoneNumber;
+          }
+        }
+
+        // 只有当 address 存在时才添加到更新对象中
+        if (address) {
+          updateData.address = address;
+        }
+
         const user = await node.updateUser({
           teamDid,
-          user: {
-            did: req.user.did,
-            ...omitBy(value, (x) => !x),
-            metadata: _metadata,
-            ...(metadata?.email ? { email: metadata.email } : {}),
-            ...(metadata?.phone?.phoneNumber ? { phone: metadata.phone.phoneNumber } : {}),
-          },
+          user: updateData,
         });
         if (!user || !user?.approved) {
           res.status(404).send({ error: 'User not found' });
@@ -868,6 +898,7 @@ module.exports = {
             'emailVerified',
             'phoneVerified',
             'metadata',
+            'address',
           ])
         );
       }
@@ -925,7 +956,14 @@ module.exports = {
       if (user.avatar) {
         user.avatar = getUserAvatarUrl(user.avatar, blocklet);
       }
-      res.json(pick(user, ['avatar', 'did', 'fullName', 'sourceAppPid', 'createdAt', 'email', 'phone', 'metadata']));
+      let returnFields = ['avatar', 'did', 'fullName', 'sourceAppPid', 'createdAt', 'email', 'phone', 'metadata'];
+
+      // 如果是自己查询，可以返回 address
+      const reqUser = req.user;
+      if (reqUser?.did === user.did) {
+        returnFields = returnFields.concat(['address']);
+      }
+      res.json(pick(user, returnFields));
     });
 
     // 支持用户更新 DID Space 信息

package/api/services/auth/connect/receive-transfer-app-owner.js

@@ -362,12 +362,24 @@ module.exports = function createRoutes(node, _, createSessionToken) {
 
       // restart blocklet (not use queue)
       node
-        .stopBlocklet({ did: appPid })
+        .stopBlocklet({ did: appPid, updateStatus: false })
         .then(() => {
-          return node.startBlocklet({ did: appPid });
+          return node.startBlocklet({ did: appPid, checkHealthImmediately: true, throwOnError: true, atomic: true });
+        })
+        .then((doc) => {
+          logger.info('restart blocklet success after transfer ownership', { appPid });
+          return node.createAuditLog(
+            {
+              action: 'restartBlocklet',
+              args: { did: appPid },
+              context: formatContext(req),
+              result: doc,
+            },
+            node
+          );
         })
         .catch((error) => {
-          logger.error('restart blocklet failed', { appPid, error });
+          logger.error('restart blocklet failed after transfer ownership', { appPid, error });
         });
 
       await sleep(3000);

package/api/services/auth/connect/rotate-key-pair.js

@@ -5,6 +5,6 @@ module.exports = function createRoutes(node) {
     action: 'rotate-key-pair',
     authPrincipal: false,
     claims: getRotateKeyPairClaims(node),
-    onAuth: createRotateKeyPairHandler(node, 'session'),
+    onAuth: createRotateKeyPairHandler(node),
   };
 };

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

@@ -192,7 +192,7 @@ module.exports = ({ node, req, options }) => {
     await req.ensureUser({ token });
 
     if (req.user) {
-      res.cookie('login_token', token, { maxAge: 60 * 60 * 1000 });
+      res.cookie('login_token', token, { maxAge: 24 * 60 * 60 * 1000, secure: true, sameSite: 'lax' });
     }
   };
 

package/dist/assets/{ArrowDropDown-qWbq0JMo.js → ArrowDropDown-ydRfHJ2x.js}

@@ -1 +1 @@
-import{a1 as e,j as t}from"./vendor-mui-core-O22FPGM4.js";import{r as a}from"./vendor-ux-did-connect-4bCiyPYS.js";var r={},o=e;Object.defineProperty(r,"__esModule",{value:!0});var u=r.default=void 0,i=o(a()),p=t;u=r.default=(0,i.default)((0,p.jsx)("path",{d:"m7 10 5 5 5-5z"}),"ArrowDropDown");export{u as d};
+import{a1 as e,j as t}from"./vendor-mui-core-O22FPGM4.js";import{r as a}from"./vendor-ux-did-connect-D75Zatzm.js";var r={},o=e;Object.defineProperty(r,"__esModule",{value:!0});var u=r.default=void 0,i=o(a()),p=t;u=r.default=(0,i.default)((0,p.jsx)("path",{d:"m7 10 5 5 5-5z"}),"ArrowDropDown");export{u as d};

package/dist/assets/{CheckCircle-B3DI9-8u.js → CheckCircle-DgSwRUf8.js}

@@ -1 +1 @@
-import{a1 as r,j as t}from"./vendor-mui-core-O22FPGM4.js";import{r as a}from"./vendor-ux-did-connect-4bCiyPYS.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var u=e.default=void 0,i=o(a()),l=t;u=e.default=(0,i.default)((0,l.jsx)("path",{d:"M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m-2 15-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8z"}),"CheckCircle");export{u as d};
+import{a1 as r,j as t}from"./vendor-mui-core-O22FPGM4.js";import{r as a}from"./vendor-ux-did-connect-D75Zatzm.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var u=e.default=void 0,i=o(a()),l=t;u=e.default=(0,i.default)((0,l.jsx)("path",{d:"M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m-2 15-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8z"}),"CheckCircle");export{u as d};

package/dist/assets/{ChevronLeft-QmS7XZ0_.js → ChevronLeft-CqDoHwdJ.js}

@@ -1 +1 @@
-import{a1 as r,j as t}from"./vendor-mui-core-O22FPGM4.js";import{r as a}from"./vendor-ux-did-connect-4bCiyPYS.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var u=e.default=void 0,f=o(a()),i=t;u=e.default=(0,f.default)((0,i.jsx)("path",{d:"M15.41 7.41 14 6l-6 6 6 6 1.41-1.41L10.83 12z"}),"ChevronLeft");export{u as d};
+import{a1 as r,j as t}from"./vendor-mui-core-O22FPGM4.js";import{r as a}from"./vendor-ux-did-connect-D75Zatzm.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var u=e.default=void 0,f=o(a()),i=t;u=e.default=(0,f.default)((0,i.jsx)("path",{d:"M15.41 7.41 14 6l-6 6 6 6 1.41-1.41L10.83 12z"}),"ChevronLeft");export{u as d};

package/dist/assets/{ChevronRight-C-wVLPcS.js → ChevronRight-Bpkf9aqI.js}

@@ -1 +1 @@
-import{a1 as r,j as t}from"./vendor-mui-core-O22FPGM4.js";import{r as a}from"./vendor-ux-did-connect-4bCiyPYS.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var u=e.default=void 0,i=o(a()),v=t;u=e.default=(0,i.default)((0,v.jsx)("path",{d:"M10 6 8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"}),"ChevronRight");export{u as d};
+import{a1 as r,j as t}from"./vendor-mui-core-O22FPGM4.js";import{r as a}from"./vendor-ux-did-connect-D75Zatzm.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var u=e.default=void 0,i=o(a()),v=t;u=e.default=(0,i.default)((0,v.jsx)("path",{d:"M10 6 8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"}),"ChevronRight");export{u as d};

package/dist/assets/{DeleteOutline-DMkWy6Ct.js → DeleteOutline-D4DYIaUj.js}

@@ -1 +1 @@
-import{a1 as t,j as r}from"./vendor-mui-core-O22FPGM4.js";import{r as a}from"./vendor-ux-did-connect-4bCiyPYS.js";var e={},u=t;Object.defineProperty(e,"__esModule",{value:!0});var o=e.default=void 0,i=u(a()),l=r;o=e.default=(0,i.default)((0,l.jsx)("path",{d:"M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6zM8 9h8v10H8zm7.5-5-1-1h-5l-1 1H5v2h14V4z"}),"DeleteOutline");export{o as d};
+import{a1 as t,j as r}from"./vendor-mui-core-O22FPGM4.js";import{r as a}from"./vendor-ux-did-connect-D75Zatzm.js";var e={},u=t;Object.defineProperty(e,"__esModule",{value:!0});var o=e.default=void 0,i=u(a()),l=r;o=e.default=(0,i.default)((0,l.jsx)("path",{d:"M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6zM8 9h8v10H8zm7.5-5-1-1h-5l-1 1H5v2h14V4z"}),"DeleteOutline");export{o as d};

package/dist/assets/{Done-DMtnp3P-.js → Done-B8c93MpP.js}

@@ -1 +1 @@
-import{a1 as r,j as t}from"./vendor-mui-core-O22FPGM4.js";import{r as a}from"./vendor-ux-did-connect-4bCiyPYS.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var u=e.default=void 0,i=o(a()),l=t;u=e.default=(0,i.default)((0,l.jsx)("path",{d:"M9 16.2 4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4z"}),"Done");export{u as d};
+import{a1 as r,j as t}from"./vendor-mui-core-O22FPGM4.js";import{r as a}from"./vendor-ux-did-connect-D75Zatzm.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var u=e.default=void 0,i=o(a()),l=t;u=e.default=(0,i.default)((0,l.jsx)("path",{d:"M9 16.2 4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4z"}),"Done");export{u as d};

package/dist/assets/{Download-BBNJo00y.js → Download-DANYdeZR.js}

@@ -1 +1 @@
-import{a1 as r,j as a}from"./vendor-mui-core-O22FPGM4.js";import{r as t}from"./vendor-ux-did-connect-4bCiyPYS.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var u=e.default=void 0,d=o(t()),i=a;u=e.default=(0,d.default)((0,i.jsx)("path",{d:"M5 20h14v-2H5zM19 9h-4V3H9v6H5l7 7z"}),"Download");export{u as d};
+import{a1 as r,j as a}from"./vendor-mui-core-O22FPGM4.js";import{r as t}from"./vendor-ux-did-connect-D75Zatzm.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var u=e.default=void 0,d=o(t()),i=a;u=e.default=(0,d.default)((0,i.jsx)("path",{d:"M5 20h14v-2H5zM19 9h-4V3H9v6H5l7 7z"}),"Download");export{u as d};

package/dist/assets/{Error-H665t4TD.js → Error-wKO1hXtU.js}

@@ -1 +1 @@
-import{a1 as e,j as t}from"./vendor-mui-core-O22FPGM4.js";import{r as a}from"./vendor-ux-did-connect-4bCiyPYS.js";var r={},o=e;Object.defineProperty(r,"__esModule",{value:!0});var u=r.default=void 0,i=o(a()),s=t;u=r.default=(0,i.default)((0,s.jsx)("path",{d:"M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m1 15h-2v-2h2zm0-4h-2V7h2z"}),"Error");export{u as d};
+import{a1 as e,j as t}from"./vendor-mui-core-O22FPGM4.js";import{r as a}from"./vendor-ux-did-connect-D75Zatzm.js";var r={},o=e;Object.defineProperty(r,"__esModule",{value:!0});var u=r.default=void 0,i=o(a()),s=t;u=r.default=(0,i.default)((0,s.jsx)("path",{d:"M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m1 15h-2v-2h2zm0-4h-2V7h2z"}),"Error");export{u as d};

package/dist/assets/{ExpandLess-DBi9UnX8.js → ExpandLess-BqrBuxL9.js}

@@ -1 +1 @@
-import{a1 as r,j as a}from"./vendor-mui-core-O22FPGM4.js";import{r as t}from"./vendor-ux-did-connect-4bCiyPYS.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var s=e.default=void 0,u=o(t()),d=a;s=e.default=(0,u.default)((0,d.jsx)("path",{d:"m12 8-6 6 1.41 1.41L12 10.83l4.59 4.58L18 14z"}),"ExpandLess");export{s as d};
+import{a1 as r,j as a}from"./vendor-mui-core-O22FPGM4.js";import{r as t}from"./vendor-ux-did-connect-D75Zatzm.js";var e={},o=r;Object.defineProperty(e,"__esModule",{value:!0});var s=e.default=void 0,u=o(t()),d=a;s=e.default=(0,u.default)((0,d.jsx)("path",{d:"m12 8-6 6 1.41 1.41L12 10.83l4.59 4.58L18 14z"}),"ExpandLess");export{s as d};