@abtnode/blocklet-services 1.16.45-beta-20250610-112229-2eb0face → 1.16.45-beta-20250614-101901-d1700f8d

package/api/cache.js

@@ -1,5 +1,6 @@
 const { DBCache, getAbtNodeRedisAndSQLiteUrl } = require('@abtnode/db-cache');
 const nodemailer = require('nodemailer');
+const { LRUCache } = require('lru-cache');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
 const { fromJSON } = require('@ocap/wallet');
 
@@ -7,52 +8,57 @@ const CACHE_TTL = 60 * 60 * 1000;
 const SESSION_CACHE_DISABLED_USER_TTL = 86400 * 1000;
 const SECURITY_CONFIG_TTL = 86400 * 1000;
 
+const nonStandardCache = new LRUCache({
+  max: 100,
+  ttl: 60 * 60 * 1000, // cache for 1 hour
+});
+
 const cache = new DBCache(() => ({
-  ...getAbtNodeRedisAndSQLiteUrl(),
   prefix: 'services-base',
   ttl: CACHE_TTL,
+  ...getAbtNodeRedisAndSQLiteUrl(),
 }));
 
 const cacheNodeInfo = new DBCache(() => ({
-  ...getAbtNodeRedisAndSQLiteUrl(),
   prefix: 'services-node-state',
   ttl: CACHE_TTL,
+  ...getAbtNodeRedisAndSQLiteUrl(),
 }));
 
 const cacheBlocklet = new DBCache(() => ({
-  ...getAbtNodeRedisAndSQLiteUrl(),
   prefix: 'services-blocklet',
   ttl: CACHE_TTL,
+  ...getAbtNodeRedisAndSQLiteUrl(),
 }));
 
 const cacheBlockletInfo = new DBCache(() => ({
-  ...getAbtNodeRedisAndSQLiteUrl(),
   prefix: 'services-blocklet-info-v2',
   ttl: CACHE_TTL,
+  ...getAbtNodeRedisAndSQLiteUrl(),
 }));
 
 const cacheRule = new DBCache(() => ({
-  ...getAbtNodeRedisAndSQLiteUrl(),
   prefix: 'services-rule',
   ttl: CACHE_TTL,
+  ...getAbtNodeRedisAndSQLiteUrl(),
 }));
 
 const cacheNotificationConfig = new DBCache(() => ({
-  ...getAbtNodeRedisAndSQLiteUrl(),
   prefix: 'services-notification-config',
   ttl: CACHE_TTL,
+  ...getAbtNodeRedisAndSQLiteUrl(),
 }));
 
 const cacheSessionDisabledUser = new DBCache(() => ({
-  ...getAbtNodeRedisAndSQLiteUrl(),
   prefix: 'services-session-cache-disabled-user',
   ttl: SESSION_CACHE_DISABLED_USER_TTL,
+  ...getAbtNodeRedisAndSQLiteUrl(),
 }));
 
 const cacheSecurityConfig = new DBCache(() => ({
-  ...getAbtNodeRedisAndSQLiteUrl(),
   prefix: 'services-security-config',
   ttl: SECURITY_CONFIG_TTL,
+  ...getAbtNodeRedisAndSQLiteUrl(),
 }));
 
 cache.getNodeInfo = ({ node }) => {
@@ -65,14 +71,10 @@ cache.deleteNodeInfo = () => {
   cacheNodeInfo.del('base');
 };
 
-cache.getBlocklet = async ({ did, node, force, context }) => {
-  const blocklet = await cacheBlocklet.autoCache(force ? null : did, () => {
+cache.getBlocklet = ({ did, node, force, context }) => {
+  return cacheBlocklet.autoCache(force ? null : did, () => {
     return node.getBlocklet({ did, useCache: !force }, context);
   });
-  // if (!blocklet || !blocklet.did) {
-  //   return null;
-  // }
-  return blocklet;
 };
 
 cache.getBlockletInfo = async ({ did, node, context }) => {
@@ -116,14 +118,27 @@ cache.getTransport = ({ did, config, force }) => {
   if (!did) {
     return null;
   }
-  return cacheNotificationConfig.autoCache(force ? null : did, () => {
-    return nodemailer.createTransport({
-      host: config.host,
-      port: config.port,
-      secure: !!config.secure,
-      auth: { user: config.user, pass: config.password },
-    });
+
+  const cacheKey = did;
+
+  if (!force) {
+    const exist = nonStandardCache.get(cacheKey);
+    if (exist) {
+      return exist;
+    }
+  }
+
+  const transporter = nodemailer.createTransport({
+    host: config.host,
+    port: config.port,
+    secure: !!config.secure,
+    auth: { user: config.user, pass: config.password },
   });
+  if (transporter) {
+    nonStandardCache.set(cacheKey, transporter);
+  }
+
+  return transporter;
 };
 
 cache.getSecurityConfig = ({ did, url, force = false, getDataFn } = {}) => {

package/api/libs/connect/session.js

@@ -1,6 +1,5 @@
 // Holds shared logic for session-manager v1 and v2
 const get = require('lodash/get');
-const merge = require('lodash/merge');
 const { joinURL } = require('ufo');
 const formatContext = require('@abtnode/util/lib/format-context');
 const { extractUserAvatar, getAppAvatarUrl } = require('@abtnode/util/lib/user');
@@ -8,7 +7,6 @@ const {
   messages,
   validatePassportStatus,
   getPassportStatusEndpoint,
-  getApplicationInfo,
   verifyNFT,
   canSessionBeElevated,
 } = require('@abtnode/auth/lib/auth');
@@ -33,9 +31,7 @@ const {
 const { CustomError } = require('@blocklet/error');
 const { getKeyPairClaim, getAuthPrincipalForMigrateAppToV2 } = require('@abtnode/auth/lib/server');
 const { checkInvitedUserOnly } = require('@abtnode/auth/lib/oauth');
-const { fromAppDid } = require('@arcblock/did-ext');
 const { LOGIN_PROVIDER, BLOCKLET_APP_SPACE_REQUIREMENT, DID_SPACES } = require('@blocklet/constant');
-const createTranslator = require('@abtnode/util/lib/translate');
 const {
   getBlockletAppIdList,
   forEachBlockletSync,
@@ -50,16 +46,15 @@ const { PASSPORT_LOG_ACTION, PASSPORT_SOURCE, PASSPORT_STATUS } = require('@abtn
 const { getDeviceData } = require('@abtnode/util/lib/device');
 const { getVerifyAccessClaims } = require('@abtnode/auth/lib/server');
 const getOrigin = require('@abtnode/util/lib/get-origin');
+const { PASSPORT_VC_TYPES } = require('@abtnode/auth/lib/util/transfer-passport');
+const bindWallet = require('@abtnode/auth/lib/util/bind-wallet');
 
 const logger = require('../logger')('connect');
 const { createTokenFn, getDidConnectVersion } = require('../../util');
-const { transferPassport, PASSPORT_VC_TYPES } = require('../auth/utils');
-const { migrateAccount, declareAccount } = require('../../services/oauth/client');
 const { getKycClaims, verifyKycClaims, getPassportVc, getProfileItems } = require('../kyc');
 const { getTrustedIssuers, getFederatedTrustedIssuers } = require('../../util/blocklet-utils');
 const {
   getUserAvatarUrl,
-  migrateFederatedAccount,
   getFederatedMaster,
   shouldSyncFederated,
   getUserWithinFederated,
@@ -250,14 +245,14 @@ module.exports = {
      * }} param0
      * @returns
      */
-    onConnect: async ({ node, request, userDid, locale = 'en', passportId = '', action, baseUrl, inviter }) => {
+    onConnect: async ({ node, request, userDid, userPk, locale = 'en', passportId = '', action, baseUrl, inviter }) => {
       /**
        * @type {import('@abtnode/client').BlockletState}
        */
       const blocklet = await request.getBlocklet();
       const { accessPolicyConfig } = await request.getSecurityConfig({ id: SECURITY_RULE_DEFAULT_ID });
       const blockletInfo = await request.getBlockletInfo();
-      const { did: teamDid, wallet: blockletWallet } = blockletInfo;
+      const { did: teamDid } = blockletInfo;
       const sourceAppPid = getSourceAppPid(request);
 
       const profileItems = getProfileItems(blocklet.settings?.session, request.context.didwallet);
@@ -269,16 +264,7 @@ module.exports = {
         },
       };
 
-      const user = await node.getUser({
-        teamDid: blocklet.meta.did,
-        user: {
-          did: userDid,
-        },
-        options: {
-          enableConnectedAccount: true,
-          blockletSk: blockletWallet.secretKey,
-        },
-      });
+      const user = await getUserWithinFederated({ sourceAppPid, teamDid, userDid, userPk }, { node, blocklet });
 
       const isInvitedUserOnly = accessPolicyConfig
         ? await checkInvitedUserOnly(accessPolicyConfig, node, teamDid)
@@ -726,7 +712,7 @@ module.exports = {
           walletOS,
           emailVerified: updatedUser.emailVerified,
           phoneVerified: updatedUser.phoneVerified,
-          elevated: canSessionBeElevated(role, await request.getNodeInfo()),
+          elevated: canSessionBeElevated(role, blocklet?.settings),
         },
         { ...sessionConfig, didConnectVersion: getDidConnectVersion(request) }
       );
@@ -1120,7 +1106,7 @@ module.exports = {
           walletOS: request.context.didwallet.os,
           emailVerified: user.emailVerified,
           phoneVerified: user.phoneVerified,
-          elevated: canSessionBeElevated(role, await request.getNodeInfo()),
+          elevated: canSessionBeElevated(role, blocklet?.settings),
         },
         { ...sessionConfig, didConnectVersion: getDidConnectVersion(request) }
       );
@@ -1129,260 +1115,7 @@ module.exports = {
   },
 
   // 给 Auth0 绑定 DID Wallet 账户，基本流程与 login 一致，但在创建更新用户信息的逻辑不一样
-  bindWallet: {
-    authPrincipal: ({ email, locale, previousUserDid }) => {
-      const user = email || previousUserDid;
-
-      const message =
-        locale === 'zh' ? `将你的 DID Wallet 与账号 ${user} 绑定` : `Connect your DID Wallet with ${user}`;
-
-      return {
-        description: message,
-        supervised: true,
-      };
-    },
-    onConnect: async ({ node, request, userDid, locale, previousUserDid }) => {
-      const translations = {
-        en: {
-          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: '你的钱包账户 {did} 已经与其他账户绑定。',
-          alreadyBindWallet: '当前账户已经绑定过钱包账户 {did}。',
-          alreadyMainAccount: '你的钱包账户 {did} 已绑定过该应用，无法重复绑定，请切换或新建一个钱包账户再次尝试。',
-        },
-      };
-      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, { did: userDid }));
-      }
-
-      const oauthUser = await node.getUser({
-        teamDid,
-        user: {
-          did: previousUserDid,
-        },
-        options: {
-          enableConnectedAccount: true,
-        },
-      });
-      if (!oauthUser) {
-        throw new Error(t('notFound', locale, { email: oauthUser.email }));
-      }
-
-      const sourceProvider = oauthUser.sourceProvider || LOGIN_PROVIDER.WALLET;
-      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({
-        teamDid,
-        user: {
-          did: userDid,
-        },
-        options: {
-          enableConnectedAccount: true,
-        },
-      });
-
-      if (bindUser) {
-        const bindConnectedAccounts = bindUser.connectedAccounts || [];
-        if (bindConnectedAccounts.find((item) => item.provider === sourceProvider)) {
-          throw new Error(t('alreadyBindOAuth', locale, { email: oauthUser.email, did: userDid }));
-        }
-      }
-
-      const claims = {
-        profile: {
-          type: 'profile',
-          description: messages.description[locale],
-          items: ['fullName', 'avatar'],
-        },
-      };
-
-      // 至少需要一个 claim
-      if (oauthUser.avatar) {
-        delete claims.profile;
-      }
-      if (Object.keys(claims).length > 0) {
-        return claims;
-      }
-
-      return [];
-    },
-    onApprove: async ({ node, request, locale, userDid, userPk, claims, previousUserDid, baseUrl }) => {
-      const blocklet = await request.getBlocklet();
-      const sourceAppPid = getSourceAppPid(request);
-      const blockletInfo = await request.getBlockletInfo();
-      const { did: teamDid, wallet: blockletWallet } = blockletInfo;
-
-      const oauthUser = await node.getUser({ teamDid, user: { did: previousUserDid } });
-      const nodeInfo = await request.getNodeInfo();
-      // Check user approved
-      let bindUser = await node.getUser({
-        teamDid,
-        user: {
-          did: userDid,
-        },
-        options: {
-          enableConnectedAccount: true,
-        },
-      });
-      if (bindUser && !bindUser.approved) {
-        throw new Error(messages.notAllowedAppUser[locale]);
-      }
-
-      const { dataDir } = await getApplicationInfo({ node, nodeInfo, teamDid });
-
-      const profileOld = claims.find((x) => x.type === 'profile') || { avatar: null };
-      const avatar = await extractUserAvatar(oauthUser.avatar || profileOld.avatar, { dataDir });
-      const profile = {
-        fullName: oauthUser.fullName,
-        avatar,
-        email: oauthUser.email,
-      };
-
-      if (sourceAppPid) {
-        try {
-          await migrateFederatedAccount({
-            // 目前只允许未注册过的钱包绑定 auth0，所以直接传入钱包生成的 userDid 和 userPk
-            toUserDid: userDid,
-            toUserPk: userPk,
-            fromUserDid: previousUserDid,
-            blockletInfo,
-            blocklet,
-          });
-        } catch (error) {
-          logger.error('Failed to migrate federated account', {
-            error,
-            toUserDid: userDid,
-            fromUserDid: previousUserDid,
-          });
-
-          if (error?.response?.data) {
-            throw new Error(error.response.data);
-          }
-          throw error;
-        }
-      } else {
-        const connectedAccounts = oauthUser?.connectedAccounts || [];
-        const sourceProvider = oauthUser?.sourceProvider;
-        const oauthAccount = connectedAccounts.find((item) => item.provider === sourceProvider);
-        const userWallet = fromAppDid(oauthAccount.id, blockletWallet.secretKey);
-        await declareAccount({ wallet: userWallet, blocklet });
-        await migrateAccount({ wallet: userWallet, blocklet, user: { did: userDid, pk: userPk } });
-      }
-
-      // TODO: 获取当前登录使用的 passport（无法获取到 passport.id）
-      // 使用最近一次使用的 passport 来代替
-      const mergePassport = (oauthUser.passports || []).reduce((sum, cur) => {
-        return upsertToPassports(sum, cur);
-      }, bindUser?.passports || []);
-      const mergeProfile = merge(profile, {
-        email: bindUser?.email,
-        fullName: bindUser?.fullName,
-        avatar: bindUser?.avatar,
-        inviter: bindUser?.inviter,
-        generation: bindUser?.generation,
-        emailVerified: bindUser?.emailVerified,
-        phoneVerified: bindUser?.phoneVerified,
-      });
-      const currentTime = new Date().toISOString();
-
-      const connectedAccount = {
-        provider: LOGIN_PROVIDER.WALLET,
-        did: userDid,
-        pk: userPk,
-        lastLoginAt: currentTime,
-        firstLoginAt: currentTime,
-        userInfo: {
-          wallet: request.context.didwallet,
-        },
-      };
-
-      await node.updateUser({
-        teamDid,
-        user: {
-          did: oauthUser.did,
-          pk: oauthUser.pk,
-          ...mergeProfile,
-          lastLoginIp: getRequestIP(request),
-          connectedAccounts: [connectedAccount],
-          passports: mergePassport,
-        },
-      });
-      const masterSite = getFederatedMaster(blocklet);
-      // NOTICE: 采用异步来更新，不阻塞接口的正常响应
-      if (shouldSyncFederated(sourceAppPid, blocklet)) {
-        const syncUserData = {
-          did: oauthUser.did,
-          pk: oauthUser.pk,
-          ...mergeProfile,
-          connectedAccount: [connectedAccount],
-        };
-        if (syncUserData.avatar) {
-          syncUserData.avatar = getUserAvatarUrl(syncUserData.avatar, blocklet);
-        }
-        node.syncFederated({
-          did: teamDid,
-          data: {
-            users: [
-              {
-                ...syncUserData,
-                action: 'connectAccount',
-                sourceAppPid: sourceAppPid || masterSite.appPid,
-              },
-            ],
-          },
-        });
-      }
-
-      if (!bindUser) {
-        bindUser = {
-          ...oauthUser,
-          // 发送 passport 的对象要设置为 wallet-did
-          did: userDid,
-          pk: userPk,
-        };
-      }
-
-      // FIXME：@zhanghan 统一登录的 passport 相关问题后续统一处理
-      await transferPassport(oauthUser, bindUser, {
-        req: request,
-        node,
-        nodeInfo,
-        teamDid,
-        baseUrl,
-        revokePassport: true,
-      });
-
-      await node.createAuditLog(
-        {
-          action: 'connectAccount',
-          args: { teamDid, connectedAccount, provider: LOGIN_PROVIDER.WALLET, userDid: oauthUser.did },
-          context: formatContext(Object.assign(request, { user: oauthUser })),
-          result: bindUser,
-        },
-        node
-      );
-
-      return {
-        nextWorkflowData: {
-          userDid,
-        },
-      };
-    },
-  },
+  bindWallet,
 
   migrateToStructV2: {
     authPrincipal: false,

package/api/libs/kyc.js

@@ -8,10 +8,10 @@ const { Hasher } = require('@ocap/mcrypto');
 const { LOGIN_PROVIDER } = require('@blocklet/constant');
 const { messages, getVCFromClaims } = require('@abtnode/auth/lib/auth');
 const { getPassportClaimUrl, getKycAcquireUrl } = require('@abtnode/auth/lib/passport');
+const { PASSPORT_VC_TYPES } = require('@abtnode/auth/lib/util/transfer-passport');
 const logger = require('@abtnode/logger')('@abtnode/blocklet-services/kyc');
 
 const { getTrustedIssuers } = require('../util/blocklet-utils');
-const { PASSPORT_VC_TYPES } = require('./auth/utils');
 const { api } = require('./api');
 
 const getPassportVc = async ({ claims, challenge, locale, trustedIssuers, types = PASSPORT_VC_TYPES }) => {

package/api/middlewares/proxy-to-daemon.js

@@ -5,7 +5,7 @@ const { AUTH_CERT_TYPE, WELLKNOWN_SERVICE_PATH_PREFIX } = require('@abtnode/cons
 const { BLOCKLET_TENANT_MODES } = require('@blocklet/constant');
 
 const proxyToDaemon = ({ proxy, node }) => {
-  const getToken = async (did, tenantMode, user) =>
+  const getToken = async (did, tenantMode, user, settings) =>
     jwt.sign(
       {
         type: AUTH_CERT_TYPE.BLOCKLET_USER,
@@ -16,6 +16,7 @@ const proxyToDaemon = ({ proxy, node }) => {
         elevated: user.elevated,
         kyc: user.kyc,
         provider: user.provider,
+        esh: settings?.enableSessionHardening, // ensureBlockletSettings.enableSessionHardening, 方便 proxy gql 中获取 blocklet SessionHardening
       },
       await node.getSessionSecret(),
       { expiresIn: '1h' }
@@ -26,10 +27,13 @@ const proxyToDaemon = ({ proxy, node }) => {
     // did returned ty req.getBlockletDid() is blocklet.meta.did
     // the blocklet.meta.did is always the same as appPid in structV2 application
     const did = req.getBlockletDid();
+    const blocklet = await req.getBlocklet();
+
     const token = await getToken(
       did,
       req.tenantMode || BLOCKLET_TENANT_MODES.SINGLE,
-      pick(req.user, ['did', 'role', 'elevated', 'kyc', 'provider'])
+      pick(req.user, ['did', 'role', 'elevated', 'kyc', 'provider']),
+      blocklet?.settings
     );
 
     req.headers.source = 'blocklet-service';

package/api/routes/blocklet.js

@@ -41,12 +41,12 @@ const {
   ROLES,
   USER_AVATAR_URL_PREFIX,
   WELLKNOWN_BLOCKLET_HEALTH_PATH,
+  PASSPORT_SOURCE,
+  PASSPORT_LOG_ACTION,
+  PASSPORT_ISSUE_ACTION,
 } = require('@abtnode/constant');
-const { PASSPORT_SOURCE, PASSPORT_LOG_ACTION, PASSPORT_ISSUE_ACTION } = require('@abtnode/constant');
-
 const { createDownloadLogStream } = require('@abtnode/core/lib/util/log');
-
-const { BlockletStatus } = require('@blocklet/constant');
+const { BlockletStatus, BLOCKLET_INTERFACE_TYPE_WEB } = require('@blocklet/constant');
 
 const logger = require('../libs/logger')();
 const { checkAdminPermission } = require('../middlewares/check-permission');
@@ -394,17 +394,37 @@ module.exports = {
       }
 
       const components = {};
+      let webInterfaceCount = 0;
       forEachComponentV2Sync(blocklet, (component) => {
         components[component.meta.did] = {
           running: component.status === BlockletStatus.running,
         };
+
+        const hasWebInterface = (component.meta?.interfaces || []).some((x) => x.type === BLOCKLET_INTERFACE_TYPE_WEB);
+        if (hasWebInterface) {
+          webInterfaceCount++;
+        }
       });
 
       if (blocklet.status !== BlockletStatus.running) {
         return res.status(503).json({ message: 'not running', components });
       }
 
-      return res.json({ message: 'ok', components });
+      const siteRuleCount = blocklet.site?.rules?.length || 0;
+      let healthy = true;
+      if (webInterfaceCount > 0 && siteRuleCount <= 0) {
+        healthy = false;
+      }
+
+      return res.json({
+        message: 'ok',
+        components,
+        routing: {
+          webInterfaceCount,
+          siteRuleCount,
+          running: healthy,
+        },
+      });
     });
 
     server.get(`${WELLKNOWN_BLOCKLET_HEALTH_PATH}/:componentId`, cors({ origin: true }), async (req, res) => {

package/api/routes/dns-resolver.js

@@ -5,9 +5,9 @@ const { WELLKNOWN_SERVICE_PATH_PREFIX } = require('@abtnode/constant');
 module.exports = {
   init(app) {
     const cache = new DBCache(() => ({
-      ...getAbtNodeRedisAndSQLiteUrl(),
       prefix: 'services-dns-resolver',
       ttl: 5 * 60 * 1000,
+      ...getAbtNodeRedisAndSQLiteUrl(),
     }));
 
     app.get(`${WELLKNOWN_SERVICE_PATH_PREFIX}/api/dns-resolve/`, async (req, res) => {

package/api/routes/env.js

@@ -29,6 +29,7 @@ module.exports = {
         `https://${getDidDomainForBlocklet({ did: info.did })}${serverPort}`,
         info.routing?.adminPath || '/'
       );
+      const isSessionHardeningEnabled = blocklet?.settings?.enableSessionHardening;
 
       res.send(`window.env = {
   did: "${blockletInfo.did}",
@@ -46,7 +47,7 @@ module.exports = {
   serverEndpoint: "${serverEndpoint}",
   serverVersion: "${info.version}",
   mode: "${info.mode}",
-  enableSessionHardening: ${info.enableSessionHardening || false},
+  enableSessionHardening: ${isSessionHardeningEnabled || false},
   ownerNft: ${JSON.stringify(info.ownerNft || '')},
   launcher: ${JSON.stringify(info.launcher || '')},
   runtimeConfig: {

package/api/routes/oauth/client.js

@@ -14,6 +14,8 @@ const { CustomError } = require('@blocklet/error');
 const { LOGIN_PROVIDER } = require('@blocklet/constant');
 const { withHttps, withTrailingSlash } = require('ufo');
 const { getLastUsedPassport } = require('@abtnode/auth/lib/passport');
+const { getAvatarByEmail, getAvatarByUrl } = require('@abtnode/util/lib/user');
+const { transferPassport } = require('@abtnode/auth/lib/util/transfer-passport');
 
 const logger = require('../../libs/logger')('oauth:client');
 const { OauthClient } = require('../../libs/auth');
@@ -22,7 +24,6 @@ const OAuthAuth0Legacy = require('../../libs/auth/adapters/auth0-legacy');
 const OAuthGithub = require('../../libs/auth/adapters/github');
 const OAuthGoogle = require('../../libs/auth/adapters/google');
 const OAuthApple = require('../../libs/auth/adapters/apple');
-const { getAvatarByEmail, transferPassport, getAvatarByUrl } = require('../../libs/auth/utils');
 const initJwt = require('../../libs/jwt');
 const { sendToUser } = require('../../libs/notification');
 const { createTokenFn, getDidConnectVersion, redirectWithoutCache } = require('../../util');

package/api/routes/user.js

@@ -26,13 +26,12 @@ const createTranslator = require('@abtnode/util/lib/translate');
 const { getDeviceData } = require('@abtnode/util/lib/device');
 const { Op } = require('sequelize');
 const getOrigin = require('@abtnode/util/lib/get-origin');
+const { getAvatarByEmail, getAvatarByUrl } = require('@abtnode/util/lib/user');
 
 const { createTokenFn, getDidConnectVersion } = require('../util');
 const initJwt = require('../libs/jwt');
-const { getAvatarByUrl } = require('../libs/auth/utils');
 const { loginWalletSchema, loginOAuthSchema, loginUserWalletSchema, checkUserSchema } = require('../validators/login');
 const verifySig = require('../middlewares/verify-sig');
-const { getAvatarByEmail } = require('../libs/auth/utils');
 const logger = require('../libs/logger')('user');
 const ensureBlocklet = require('../middlewares/ensure-blocklet');
 const checkUser = require('../middlewares/check-user');