@abtnode/blocklet-services 1.16.14-beta-c308dc3b → 1.16.14-beta-963cb583

package/api/libs/connect/session.js

@@ -38,6 +38,7 @@ const { fromAppDid } = require('@arcblock/did-ext');
 const { LOGIN_PROVIDER } = require('@blocklet/constant');
 const { signV2 } = require('@arcblock/jwt');
 const pick = require('lodash/pick');
+const createTranslator = require('@abtnode/util/lib/translate');
 
 const { getRolesFromAuthConfig, getBlockletAppIdList } = require('@blocklet/meta/lib/util');
 
@@ -45,7 +46,6 @@ const logger = require('@abtnode/logger')(require('../../../package.json').name)
 
 const { isInvitedUserOnly, createTokenFn, getDidConnectVersion } = require('../../util');
 const { transferPassport } = require('../auth/utils');
-const { generateTranslate } = require('../translate');
 const { migrateAccount, declareAccount } = require('../../services/oauth');
 const { getTrustedIssuers, getLoginProvider, getFederatedTrustedIssuers } = require('../../util/blocklet-utils');
 const { getFederatedMaster, getUserAvatarUrl } = require('../../util/federated');
@@ -719,7 +719,7 @@ module.exports = {
     },
   },
 
-  // 基本流程与 login 一致，但在创建更新用户信息的逻辑不一样
+  // 给 Auth0 绑定 DID Wallet 账户，基本流程与 login 一致，但在创建更新用户信息的逻辑不一样
   bindWallet: {
     authPrincipal: ({ email, locale, previousUserDid }) => {
       const user = email || previousUserDid;
@@ -734,24 +734,25 @@ module.exports = {
     onConnect: async ({ node, request, userDid, locale, componentId, previousUserDid }) => {
       const translations = {
         en: {
-          notFound: "Can't get bind account information",
-          alreadyBindOAuth: 'already bind with another account',
-          alreadyBindWallet: 'Current account is already bind a wallet account',
-          alreadyMainAccount: 'Current account is already a main account',
+          notFound: "Couldn't find account information.",
+          alreadyBindOAuth: 'Your wallet account ({did}) is already bond to another email.',
+          alreadyBindWallet: 'Your email is already bond to another wallet account {did}.',
+          alreadyMainAccount:
+            'Your wallet account is already bond to this app. You cannot bind it again. Please use another wallet account or create a new one to try again.',
         },
         zh: {
-          notFound: '获取绑定账户信息失败',
-          alreadyBindOAuth: '已绑定 OAuth 账户',
-          alreadyBindWallet: '该账户已绑定 Wallet 账户',
-          alreadyMainAccount: '已给该账户分配一个主账户',
+          notFound: '无法获取账户信息。',
+          alreadyBindOAuth: '你的钱包账户 {did} 已经与其他账户绑定。',
+          alreadyBindWallet: '当前账户已经绑定过钱包账户 {did}。',
+          alreadyMainAccount: '你的钱包账户 {did} 已绑定过该应用，无法重复绑定，请切换或新建一个钱包账户再次尝试。',
         },
       };
-      const t = generateTranslate({ translations });
+      const t = createTranslator({ translations });
       const { did: teamDid } = await request.getBlockletInfo();
 
       const walletUser = await node.getUser({ teamDid, user: { did: userDid } });
       if (walletUser) {
-        throw new Error(t('alreadyMainAccount', locale));
+        throw new Error(t('alreadyMainAccount', locale, { did: userDid }));
       }
 
       const config = await request.getServiceConfig(NODE_SERVICES.AUTH, { componentId });
@@ -764,14 +765,15 @@ module.exports = {
           enableConnectedAccount: true,
         },
       });
-
       if (!oauthUser) {
-        throw new Error(t('notFound', locale));
+        throw new Error(t('notFound', locale, { email: oauthUser.email }));
       }
-      const oauthConnectedAccounts = oauthUser.connectedAccounts || [];
+
       const sourceProvider = oauthUser.sourceProvider || LOGIN_PROVIDER.WALLET;
-      if (oauthConnectedAccounts.find((item) => item.provider === LOGIN_PROVIDER.WALLET)) {
-        throw new Error(t('alreadyBindWallet', locale));
+      const oauthConnectedAccounts = oauthUser.connectedAccounts || [];
+      const exist = oauthConnectedAccounts.find((item) => item.provider === LOGIN_PROVIDER.WALLET);
+      if (exist) {
+        throw new Error(t('alreadyBindWallet', locale, { email: oauthUser.email, did: exist.did }));
       }
 
       const bindUser = await node.getUser({
@@ -787,7 +789,7 @@ module.exports = {
       if (bindUser) {
         const bindConnectedAccounts = bindUser.connectedAccounts || [];
         if (bindConnectedAccounts.find((item) => item.provider === sourceProvider)) {
-          throw new Error(`${oauthUser.email} ${t('alreadyBindOAuth', locale)}`);
+          throw new Error(t('alreadyBindOAuth', locale, { email: oauthUser.email, did: userDid }));
         }
       }
 

package/api/libs/image.js

@@ -3,6 +3,7 @@
 const fs = require('fs-extra');
 const path = require('path');
 const sharp = require('sharp');
+const toLower = require('lodash/toLower');
 const { Joi } = require('@arcblock/validator');
 const stringify = require('json-stable-stringify');
 const md5 = require('@abtnode/util/lib/md5');
@@ -12,8 +13,9 @@ const logger = require('@abtnode/logger')('@abtnode/blocklet-services/image');
 
 const errorImage = path.resolve(__dirname, './error.svg');
 
-const FORMATS = ['png', 'jpeg', 'webp', 'avif', 'heif'];
+const FORMATS = ['png', 'gif', 'jpeg', 'webp', 'avif', 'heif'];
 const OPERATIONS = ['convert', 'resize', 'crop'];
+const MODES = ['cover', 'contain', 'fill', 'inside', 'outside'];
 const QUALITIES = {
   png: 100,
   jpeg: 80,
@@ -24,6 +26,7 @@ const QUALITIES = {
 
 const EXTENSIONS = {
   png: 'png',
+  gif: 'gif',
   jpeg: 'jpeg',
   jpg: 'jpeg',
   webp: 'webp',
@@ -33,6 +36,7 @@ const EXTENSIONS = {
 
 const schema = Joi.object({
   imageFilter: Joi.string()
+    .lowercase()
     .valid(...OPERATIONS)
     .required(),
 
@@ -68,6 +72,7 @@ const schema = Joi.object({
 
   // image format
   f: Joi.string()
+    .lowercase()
     .valid(...FORMATS)
     .when('imageFilter', {
       is: 'convert',
@@ -76,7 +81,11 @@ const schema = Joi.object({
     }),
 
   // resize positions
-  m: Joi.string().valid('cover', 'contain', 'fill', 'inside', 'outside').optional().default('inside'),
+  m: Joi.string()
+    .lowercase()
+    .valid(...MODES)
+    .optional()
+    .default('inside'),
 
   // crop positions
   t: Joi.number().integer().min(0).max(2048).optional().default(0),
@@ -88,7 +97,7 @@ const schema = Joi.object({
   .options({ stripUnknown: true, allowUnknown: true, noDefaults: false });
 
 const isImageAccepted = (req) => {
-  const extension = path.extname(req.path).slice(1);
+  const extension = toLower(path.extname(req.path).slice(1));
   return FORMATS.includes(EXTENSIONS[extension]) && FORMATS.some((x) => req.accepts(`image/${x}`));
 };
 
@@ -116,7 +125,7 @@ const processAndRespond = (req, res, cacheDir, getSrc) => {
   }
 
   const params = req.imageFilter;
-  const extension = path.extname(req.path).slice(1);
+  const extension = toLower(path.extname(req.path).slice(1));
   if (!extension && !params.f) {
     res.status(400).send('Image filter failed: either extension or format must be specified');
     return;
@@ -132,7 +141,7 @@ const processAndRespond = (req, res, cacheDir, getSrc) => {
 
   // do the convert
   tasks[cacheKey] ??= getSrc(req)
-    .then(([src, ext]) => processImage(src, ext, destPath, params))
+    .then(([src, ext]) => processImage(src, toLower(ext), destPath, params))
     .finally(() => {
       setTimeout(() => {
         delete tasks[cacheKey];
@@ -184,7 +193,7 @@ const processImage = (src, extension, dest, params) => {
       dimensions.height = height;
     }
 
-    const pipeline = sharp().timeout({ seconds: 8 });
+    const pipeline = sharp({ animated: true }).timeout({ seconds: 8 });
     if (rotate) {
       pipeline.rotate(rotate);
     }
@@ -240,4 +249,5 @@ module.exports = {
   processAndRespond,
   processImage,
   EXTENSIONS,
+  MODES,
 };

package/api/routes/oauth.js

@@ -13,6 +13,7 @@ const sortBy = require('lodash/sortBy');
 const joinUrl = require('url-join');
 const { getWalletDid } = require('@blocklet/meta/lib/did-utils');
 const formatContext = require('@abtnode/util/lib/format-context');
+const createTranslator = require('@abtnode/util/lib/translate');
 const { LOGIN_PROVIDER } = require('@blocklet/constant');
 const logger = require('@abtnode/logger')('blocklet-services:oauth');
 
@@ -20,7 +21,6 @@ const { AuthenticationClient } = require('../libs/auth/adapters/auth0');
 const { getAvatarByEmail, transferPassport, getAvatarByUrl } = require('../libs/auth/utils');
 const initJwt = require('../libs/jwt');
 const { sendToUser } = require('../libs/notification');
-const { generateTranslate } = require('../libs/translate');
 const { isInvitedUserOnly, createTokenFn, getDidConnectVersion } = require('../util');
 const { ApiError } = require('../util/error');
 
@@ -31,19 +31,22 @@ const prefix = `${PREFIX}/oauth`;
 const translations = {
   zh: {
     needInviteToLogin: '你需要被邀请才可以登录此应用',
-    alreadyMainAccount: '已给该账户分配一个主账户',
+    alreadyMainAccount: '当前邮箱已经绑定过该应用，不过你可以先以此邮箱登陆，然后再绑定钱包账户',
+    alreadyBindWallet: '当前邮箱已经绑定过钱包账户 {did}。',
     oauthCantBeOwner: '第三方登录的账户不能成为应用的拥有者',
     oauthCantBindOauth: '第三方登录的账户无法绑定另一个第三方登录的账户',
   },
   en: {
-    needInviteToLogin: 'You need to be invited to sign in to this app',
-    alreadyMainAccount: 'Current account is already a main account',
+    needInviteToLogin: 'You need to be invited to login in to this app',
+    alreadyMainAccount:
+      'Your email has already logged in to the app, so binding cannot be completed. However, you can first log in with this email and then bind your wallet account.',
+    alreadyBindWallet: 'Your account is already bond to wallet account {did}, so binding can not be completed.',
     oauthCantBeOwner: "Can't login oauth account as owner",
-    oauthCantBindOauth: "Current account can't bind a third party account",
+    oauthCantBindOauth: "Current account can't bind to a third party account",
   },
 };
 
-const t = generateTranslate({ translations });
+const t = createTranslator({ translations });
 
 function getAuthClient(blocklet, provider) {
   const oauthConfig = blocklet?.settings?.oauth || {};
@@ -293,6 +296,7 @@ async function invite(req, node, options) {
   return { sessionToken, refreshToken };
 }
 
+// 给 DID Wallet 绑定 Auth0 的流程
 // eslint-disable-next-line no-unused-vars
 async function bind(req, node, options) {
   const { token, locale = 'en', provider } = req.body;
@@ -311,7 +315,11 @@ async function bind(req, node, options) {
     },
   });
   if (oauthUser) {
-    throw new ApiError(400, t('alreadyMainAccount', locale));
+    if (oauthUser.sourceProvider === LOGIN_PROVIDER.AUTH0) {
+      throw new ApiError(400, t('alreadyMainAccount', locale, { email: userInfo.email }));
+    }
+
+    throw new ApiError(400, t('alreadyBindWallet', locale, { email: userInfo.email, did: oauthUser.did }));
   }
 
   // NOTICE: 这里获得的 did 是当前登录用户的永久 did，无需再去查询 connectedAccount

package/api/routes/user.js

@@ -3,11 +3,11 @@ const { getApplicationInfo } = require('@abtnode/auth/lib/auth');
 const { fromAppDid } = require('@arcblock/did-ext');
 const { extractUserAvatar } = require('@abtnode/util/lib/user');
 const formatContext = require('@abtnode/util/lib/format-context');
+const createTranslator = require('@abtnode/util/lib/translate');
 const logger = require('@abtnode/logger')('blocklet-services:user');
 const { isFromPublicKey } = require('@arcblock/did');
 const { LOGIN_PROVIDER } = require('@blocklet/constant');
 
-const { generateTranslate } = require('../libs/translate');
 const { isInvitedUserOnly, createTokenFn, getDidConnectVersion } = require('../util');
 const initJwt = require('../libs/jwt');
 const { getAvatarByUrl } = require('../libs/auth/utils');
@@ -42,7 +42,7 @@ const translations = {
   },
 };
 
-const t = generateTranslate({ translations });
+const t = createTranslator({ translations });
 
 async function checkNeedInvite({ req, node, teamDid, componentId, locale }) {
   const config = await req.getServiceConfig(NODE_SERVICES.AUTH, { componentId });