@abtnode/blocklet-services 1.16.11-beta-0ae58a71 → 1.16.11-beta-f74663ac

package/api/index.js

@@ -13,7 +13,7 @@ const minimatch = require('minimatch');
 
 const { getAccessLogStream } = require('@abtnode/logger');
 const { WELLKNOWN_SERVICE_PATH_PREFIX, NODE_SERVICES_PREFIX, EVENTS } = require('@abtnode/constant');
-const { BlockletEvents } = require('@blocklet/constant');
+const { BlockletEvents, BlockletInternalEvents } = require('@blocklet/constant');
 const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
 const createInvite = require('@abtnode/auth/lib/invitation');
 const eventHub =
@@ -145,6 +145,13 @@ module.exports = function createServer(node, serverOptions = {}) {
     cache.del(cache.keyFns.node());
   });
 
+  [BlockletInternalEvents.componentsUpdated, BlockletInternalEvents.appConfigChanged].forEach((name) => {
+    eventHub.on(name, (data) => {
+      const { appDid } = data;
+      notificationService.sendToApp.exec({ event: name, appDid, data });
+    });
+  });
+
   // Http server
   const server = express();
 
@@ -308,7 +315,7 @@ module.exports = function createServer(node, serverOptions = {}) {
   // Simple websocket router like http router
   const httpServer = http.createServer(server);
   server.listen = httpServer.listen.bind(httpServer);
-  httpServer.on('upgrade', async (req, socket, head) => {
+  httpServer.on('upgrade', (req, socket, head) => {
     attachSharedUtils({ node, req, options });
 
     // find matched handler registered by each service
@@ -410,6 +417,8 @@ module.exports = function createServer(node, serverOptions = {}) {
 
   BlockletEventsNotifier.init({ node, notificationService });
 
+  server.sendToApp = ({ event, appDid, data }) => notificationService.sendToApp.exec({ event, appDid, data });
+
   return server;
 };
 

package/api/libs/auth/adapters/auth0/management-client.js

@@ -12,7 +12,7 @@ class ManagementClient {
     });
   }
 
-  async getClient(...args) {
+  getClient(...args) {
     return this.instance.getClient(...args);
   }
 

package/api/libs/auth/utils.js

@@ -1,10 +1,7 @@
-const md5 = require('md5');
-const axios = require('axios');
-const logger = require('@abtnode/auth/lib/logger');
 const { getPassportStatusEndpoint, getApplicationInfo } = require('@abtnode/auth/lib/auth');
 const { createPassportVC } = require('@abtnode/auth/lib/passport');
 const { VC_TYPE_NODE_PASSPORT, PASSPORT_STATUS } = require('@abtnode/constant');
-const { parseUserAvatar } = require('@abtnode/util/lib/user');
+const { parseUserAvatar, getAvatarByEmail, getAvatarByUrl } = require('@abtnode/util/lib/user');
 const { getBlockletAppIdList } = require('@blocklet/meta/lib/util');
 const pick = require('lodash/pick');
 const uniq = require('lodash/uniq');
@@ -12,41 +9,6 @@ const uniqBy = require('lodash/uniqBy');
 
 const { sendToUser } = require('../notification');
 
-function getEmailHash(email = '') {
-  const cleanEmail = email.trim().toLowerCase();
-  return md5(cleanEmail);
-}
-
-async function getAvatarByUrl(url, options = {}) {
-  const { verbose = true } = options || {};
-  try {
-    const { data } = await axios.get(url, {
-      responseType: 'arraybuffer',
-    });
-    const base64Content = Buffer.from(data, 'binary').toString('base64');
-
-    return `data:image/png;base64,${base64Content}`;
-  } catch (error) {
-    if (verbose) {
-      logger.error(`Fetch avatar failed: ${url}`, { error });
-      return null;
-    }
-    throw error;
-  }
-}
-
-async function getAvatarByEmail(email = '') {
-  try {
-    const emailHash = getEmailHash(email);
-    const gravatarUrl = `https://www.gravatar.com/avatar/${emailHash}`;
-    const avatarBase64 = await getAvatarByUrl(gravatarUrl, { verbose: false });
-    return avatarBase64;
-  } catch (error) {
-    logger.error(`Fetch gravatar failed: ${email}`, { error });
-    return null;
-  }
-}
-
 // FIXME: @zhanghan 转移通行证目前只能颁发新的，会导致用户数据中产生多余的通行证
 async function transferPassport(fromUser, toUser, { req, teamDid, node, nodeInfo }) {
   if (!fromUser || !toUser) {
@@ -129,7 +91,6 @@ async function transferPassport(fromUser, toUser, { req, teamDid, node, nodeInfo
 }
 
 module.exports = {
-  getEmailHash,
   getAvatarByUrl,
   getAvatarByEmail,
   transferPassport,

package/api/libs/connect/session.js

@@ -637,7 +637,7 @@ module.exports = {
 
   // 基本流程与 login 一致，但在创建更新用户信息的逻辑不一样
   bindWallet: {
-    authPrincipal: async ({ email, locale, previousUserDid }) => {
+    authPrincipal: ({ email, locale, previousUserDid }) => {
       const user = email || previousUserDid;
 
       const message = locale === 'zh' ? `将你的 DID 钱包与账号 ${user} 绑定` : `Connect your DID Wallet with ${user}`;

package/api/libs/jwt.js

@@ -14,7 +14,7 @@ const getUser = async (node, teamDid, userDid) => {
 const initJwt = (node, options) => {
   const ttl = options.sessionTtl || '7d';
 
-  const createSessionToken = async (did, { role, secret, passport }) =>
+  const createSessionToken = (did, { role, secret, passport }) =>
     createAuthToken({
       did,
       passport,

package/api/middlewares/check-admin-permission.js

@@ -1,6 +1,6 @@
 const { ROLES } = require('@abtnode/constant');
 
-module.exports = async (req, res, next) => {
+module.exports = (req, res, next) => {
   if (!req.user) {
     res.status(401).json({ code: 'forbidden', error: 'not authorized' });
     return;

package/api/middlewares/check-running.js

@@ -1,20 +1,31 @@
 const { BlockletStatus } = require('@blocklet/constant');
 const getBlockletMaintenanceTemplate = require('@abtnode/router-templates/lib/blocklet-maintenance');
+const { findComponentByIdV2 } = require('@blocklet/meta/lib/util');
 
 const { shouldGotoStartPage, getRedirectUrl } = require('../util');
 
 const checkRunning = async (req, res, next) => {
-  const blocklet = await req.getBlocklet();
+  const app = await req.getBlocklet();
+  const componentId = req.getBlockletComponentId();
+  let component = findComponentByIdV2(app, componentId);
+
+  // for backward compatibility
+  component = component || app;
+
   if (
     ![
       BlockletStatus.running,
       // Waiting, Downloading should be allowed because blocklet is currently being upgrading
       BlockletStatus.waiting,
       BlockletStatus.downloading,
-    ].includes(blocklet.status)
+    ].includes(component.status)
   ) {
-    if (shouldGotoStartPage(req, blocklet)) {
-      if (blocklet.settings.initialized) {
+    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 });
+      }
+      if (app.settings.initialized) {
         res.redirect(getRedirectUrl({ req, pagePath: '/start' }));
       } else {
         res.redirect(getRedirectUrl({ req, pagePath: '/setup' }));
@@ -28,11 +39,18 @@ const checkRunning = async (req, res, next) => {
     if (req.accepts(['html', 'json']) === 'json') {
       res.json({ code: 'error', error: 'blocklet is under maintenance' });
     } else {
-      res.send(getBlockletMaintenanceTemplate(blocklet, nodeInfo));
+      res.send(getBlockletMaintenanceTemplate(app, nodeInfo, component));
     }
     return;
   }
 
+  const url = new URL(`http://localhost${req.url}`);
+  if (url.searchParams.get('__start__')) {
+    url.searchParams.delete('__start__');
+    res.redirect(`${url.pathname}${url.search}`);
+    return;
+  }
+
   next();
 };
 

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

@@ -37,7 +37,7 @@ const proxyToDaemon = ({ proxy, pathname, sessionSecret }) => {
     return token;
   };
 
-  return async (req, res) => {
+  return (req, res) => {
     req.url = `${pathname}?${qs.stringify(req.query)}`;
     // did returned ty req.getBlockletDid() is blocklet.meta.did
     // the blocklet.meta.did is always the same as appPid in structV2 application

package/api/routes/blocklet.js

@@ -1,10 +1,12 @@
 /* eslint-disable no-console */
 const fs = require('fs');
 const cloneDeep = require('lodash/cloneDeep');
-const joinUrl = require('url-join');
 const dayjs = require('dayjs');
 const JWT = require('@arcblock/jwt');
+const joinUrl = require('url-join');
 const handleInstanceInStore = require('@abtnode/core/lib/util/public-to-store');
+const { getPassportStatusEndpoint } = require('@abtnode/auth/lib/auth');
+const { createPassportVC, createPassport, createUserPassport } = require('@abtnode/auth/lib/passport');
 
 const formatContext = require('@abtnode/util/lib/format-context');
 const { parseUserAvatar, getAvatarFile } = require('@abtnode/util/lib/user');
@@ -19,18 +21,15 @@ const {
   cacheError,
 } = require('@abtnode/util/lib/logo-middleware');
 const formatName = require('@abtnode/util/lib/format-name');
-const { fixBlockletStatus, wipeSensitiveData, findComponentById } = require('@blocklet/meta/lib/util');
-const { WELLKNOWN_SERVICE_PATH_PREFIX, USER_AVATAR_PATH_PREFIX } = require('@abtnode/constant');
+const {
+  fixBlockletStatus,
+  wipeSensitiveData,
+  findComponentByIdV2,
+  forEachComponentV2Sync,
+} = require('@blocklet/meta/lib/util');
+const { WELLKNOWN_SERVICE_PATH_PREFIX, USER_AVATAR_PATH_PREFIX, ROLES } = require('@abtnode/constant');
 const logger = require('@abtnode/logger')(require('../../package.json').name);
 
-const { getPassportStatusEndpoint } = require('@abtnode/auth/lib/auth');
-
-const {
-  createPassportVC,
-  createPassport,
-  upsertToPassports,
-  createUserPassport,
-} = require('@abtnode/auth/lib/passport');
 const { createDownloadLogStream } = require('@abtnode/util/lib/log');
 
 const { BlockletStatus } = require('@blocklet/constant');
@@ -94,7 +93,7 @@ module.exports = {
         onGetBlocklet: async ({ req }) => {
           const blocklet = await req.getBlocklet();
           const dids = req.url.split('?')[0].replace(`${prefix}/blocklet/logo-bundle`, '').split('/').filter(Boolean);
-          const component = findComponentById(blocklet, [blocklet.meta.did].concat(dids));
+          const component = findComponentByIdV2(blocklet, [blocklet.meta.did].concat(dids));
           return component;
         },
       }),
@@ -137,7 +136,7 @@ module.exports = {
       const blocklet = await req.getBlocklet({ useCache: false });
 
       const { fromSetup } = req.body;
-      const { did: userDid, role } = req.user;
+      const { did: userDid } = req.user;
 
       // eslint-disable-next-line no-unreachable
 
@@ -176,8 +175,7 @@ module.exports = {
         const user = await node.getUser({ teamDid, user: { did: userDid } });
         user.avatar = await parseUserAvatar(user.avatar, { dataDir: blocklet.env.dataDir });
 
-        const { pk, locale = 'en', extra = {} } = user;
-        const { baseUrl } = extra;
+        const { pk, locale = 'en' } = user;
 
         await node.setBlockletInitialized({ did: blocklet.meta.did, owner: { did: userDid, pk } });
 
@@ -193,52 +191,57 @@ module.exports = {
           }
         }
 
-        // create vc
-        const vc = createPassportVC({
-          issuerName: name,
-          issuerWallet: wallet,
-          ownerDid: userDid,
-          passport: await createPassport({
-            name: role,
-            node,
-            teamDid,
-            locale,
-            endpoint: baseUrl,
-          }),
-          endpoint: getPassportStatusEndpoint({
-            baseUrl: joinUrl(baseUrl, WELLKNOWN_SERVICE_PATH_PREFIX),
-            userDid,
-            teamDid,
-          }),
-          ownerProfile: user,
-          preferredColor: passportColor,
-        });
-
-        // write passport to db
-        const passport = createUserPassport(vc, { role });
-        const result = await node.updateUser({
-          teamDid,
-          user: {
-            did: userDid,
-            pk,
-            passports: upsertToPassports(user.passports || [], passport),
-          },
-        });
-        await node.createAuditLog(
-          {
-            action: 'updateUser',
-            args: { teamDid, passport, reason: 'setup blocklet' },
-            context: formatContext(req),
-            result,
-          },
-          node
-        );
-
         // send notification to wallet
         const receiver = userDid;
         const token = JWT.sign(wallet.address, wallet.secretKey);
 
-        if (!blocklet.settings.owner) {
+        // send passport to wallet if no passport for this user
+        const role = ROLES.OWNER;
+        const hasOwnerPassport = (user.passports || []).some((x) => x.name === role);
+        if (hasOwnerPassport === false) {
+          const appUrl = blocklet.environments.find((item) => item.key === 'BLOCKLET_APP_URL').value;
+
+          // create vc
+          const vc = createPassportVC({
+            issuerName: name,
+            issuerWallet: wallet,
+            ownerDid: userDid,
+            passport: await createPassport({
+              name: role,
+              node,
+              teamDid,
+              locale,
+              endpoint: appUrl,
+            }),
+            endpoint: getPassportStatusEndpoint({
+              baseUrl: joinUrl(appUrl, WELLKNOWN_SERVICE_PATH_PREFIX),
+              userDid,
+              teamDid,
+            }),
+            ownerProfile: user,
+            preferredColor: passportColor,
+            expirationDate: undefined,
+          });
+
+          // write passport to db
+          const passport = createUserPassport(vc, { role });
+          const result = await node.updateUser({
+            teamDid,
+            user: {
+              did: userDid,
+              passports: [passport],
+            },
+          });
+          await node.createAuditLog(
+            {
+              action: 'updateUser',
+              args: { teamDid, passport, reason: 'setup blocklet' },
+              context: formatContext(req),
+              result,
+            },
+            node
+          );
+
           // send owner vc
           const notificationText = {
             title: {
@@ -261,7 +264,7 @@ module.exports = {
                   type: 'vc',
                   data: {
                     credential: vc,
-                    tag: role,
+                    tag: ROLES.OWNER,
                   },
                 },
               ],
@@ -320,10 +323,43 @@ module.exports = {
     server.get(`${prefix}/health`, async (req, res) => {
       const blocklet = await req.getBlocklet();
 
+      if (!blocklet) {
+        return res.status(404).json({ message: 'blocklet not found' });
+      }
+
       if (blocklet.status !== BlockletStatus.running) {
         return res.status(503).json({ message: 'not running' });
       }
 
+      const components = {};
+      forEachComponentV2Sync(blocklet, (component) => {
+        components[component.meta.did] = {
+          running: component.status === BlockletStatus.running,
+        };
+      });
+
+      return res.json({ message: 'ok', components });
+    });
+
+    server.get(`${prefix}/health/:componentId`, async (req, res) => {
+      const { componentId } = req.params;
+
+      const blocklet = await req.getBlocklet();
+
+      if (!blocklet) {
+        return res.status(404).json({ message: 'blocklet not found' });
+      }
+
+      const component = findComponentByIdV2(blocklet, componentId);
+
+      if (!component) {
+        return res.status(404).json({ message: 'component not found' });
+      }
+
+      if (component.status !== BlockletStatus.running) {
+        return res.status(503).json({ message: 'not running' });
+      }
+
       return res.json({ message: 'ok' });
     });
 

package/api/routes/dns-resolver.js

@@ -9,7 +9,7 @@ module.exports = {
       maxAge: 5 * 60 * 1000, // cache for 5 minute
     });
 
-    app.get(`${WELLKNOWN_SERVICE_PATH_PREFIX}/api/dns-resolve/`, async (req, res) => {
+    app.get(`${WELLKNOWN_SERVICE_PATH_PREFIX}/api/dns-resolve/`, (req, res) => {
       const { hostname } = req.query;
 
       if (!hostname) {
@@ -24,7 +24,7 @@ module.exports = {
         return;
       }
 
-      dns.lookup(hostname, async (err, address) => {
+      dns.lookup(hostname, (err, address) => {
         if (err) {
           cache.del(hostname);
           res.json({ address: null, error: err.message });

package/api/routes/user.js

@@ -4,6 +4,7 @@ const { fromAppDid } = require('@arcblock/did-ext');
 const { extractUserAvatar } = require('@abtnode/util/lib/user');
 const formatContext = require('@abtnode/util/lib/format-context');
 const logger = require('@abtnode/logger')('blocklet-services:user');
+const { isFromPublicKey } = require('@arcblock/did');
 
 const { generateTranslate } = require('../libs/translate');
 const { isInvitedUserOnly } = require('../util');
@@ -14,6 +15,14 @@ const { loginWalletSchema, loginOAuthSchema } = require('../validators/login');
 const verifySig = require('../middlewares/verify-sig');
 const { getAvatarByEmail } = require('../libs/auth/utils');
 
+const validateUser = (user) => {
+  try {
+    return user && user.did && user.pk && isFromPublicKey(user.did, user.pk);
+  } catch (e) {
+    return false;
+  }
+};
+
 const PREFIX = WELLKNOWN_SERVICE_PATH_PREFIX;
 
 const prefix = `${PREFIX}/user`;
@@ -22,11 +31,13 @@ const translations = {
     needInviteToLogin: '你需要被邀请才可以登录此应用',
     notAllowed: '你没有权限登录该节点',
     needComponentId: '缺少登录参数: componentId',
+    userInfoError: '登录用户信息有误',
   },
   en: {
     needInviteToLogin: 'You need to be invited to sign in to this app',
     notAllowed: 'You are not allowed to login to this node',
     needComponentId: 'componentId is required when login user',
+    userInfoError: 'Login user info is invalid',
   },
 };
 
@@ -40,7 +51,7 @@ async function checkNeedInvite({ req, node, teamDid, componentId, locale }) {
   }
 }
 
-async function checkUserEnable(user, { locale }) {
+function checkUserEnable(user, { locale }) {
   if (!user.approved) {
     throw new ApiError(403, t('notAllowed', locale));
   }
@@ -62,7 +73,7 @@ async function composeProfileData({ avatar, fullName, email }, { node, req, team
     }
   }
   if (avatar) {
-    avatarLocal = await getAvatarByUrl(avatar);
+    avatarLocal = avatar.startsWith('data:') ? avatar : await getAvatarByUrl(avatar);
   }
   if (avatarLocal) {
     const nodeInfo = await req.getNodeInfo();
@@ -77,10 +88,7 @@ async function composeProfileData({ avatar, fullName, email }, { node, req, team
   return profile;
 }
 
-async function loginWallet(
-  { did, pk, avatar, email, fullName },
-  { node, req, locale, componentId, teamDid, blockletWallet }
-) {
+async function loginWallet({ did, pk, avatar, email, fullName }, { node, req, locale, componentId, teamDid }) {
   const provider = 'wallet';
   const { error } = loginWalletSchema.validate({
     provider,
@@ -101,8 +109,6 @@ async function loginWallet(
     },
     options: {
       enableConnectedAccount: true,
-      enableNormalize: true,
-      blockletSk: blockletWallet.secretKey,
     },
   });
 
@@ -116,17 +122,21 @@ async function loginWallet(
   }
 
   const lastLoginIp = req.get('x-real-ip');
-  const doc = await node.loginUser({
+  const loginParams = {
     teamDid,
     user: {
-      did: currentUser?.did || pk,
-      pk: currentUser?.pk || did,
+      did: currentUser?.did || did,
+      pk: currentUser?.pk || pk,
       locale,
       lastLoginIp,
       connectedAccount: { provider, did, pk },
       ...profile,
     },
-  });
+  };
+  if (!validateUser(loginParams.user) || !validateUser(loginParams.user.connectedAccount)) {
+    throw new ApiError(400, t('userInfoError', locale));
+  }
+  const doc = await node.loginUser(loginParams);
 
   // NOTICE: 使用 provider: wallet 登录的账号，其账号是由 wallet 产生的，所以不需要到链上 declare 了
   return doc;
@@ -157,8 +167,6 @@ async function loginOAuth(
     },
     options: {
       enableConnectedAccount: true,
-      enableNormalize: true,
-      blockletSk: blockletWallet.secretKey,
     },
   });
 
@@ -173,7 +181,7 @@ async function loginOAuth(
 
   const lastLoginIp = req.get('x-real-ip');
 
-  const doc = await node.loginUser({
+  const loginParams = {
     teamDid,
     user: {
       did: currentUser?.did || userDid,
@@ -183,7 +191,11 @@ async function loginOAuth(
       connectedAccount: { provider, id, did: userDid, pk: userPk },
       ...profile,
     },
-  });
+  };
+  if (!validateUser(loginParams.user) || !validateUser(loginParams.user.connectedAccount)) {
+    throw new ApiError(400, t('userInfoError', locale));
+  }
+  const doc = await node.loginUser(loginParams);
   return doc;
 }
 
@@ -198,10 +210,7 @@ async function login(req, node, options) {
 
   let doc;
   if (provider === 'wallet') {
-    doc = await loginWallet(
-      { did, pk, avatar, email, fullName },
-      { node, req, locale, componentId, teamDid, blockletWallet }
-    );
+    doc = await loginWallet({ did, pk, avatar, email, fullName }, { node, req, locale, componentId, teamDid });
   } else {
     doc = await loginOAuth(
       { provider, id, avatar, email, fullName },

package/api/services/auth/connect/bind-wallet.js

@@ -9,11 +9,11 @@ module.exports = function createRoutes(node, authenticator, createSessionToken)
     action: 'bind-wallet',
     authPrincipal: false,
     claims: {
-      authPrincipal: async ({ extraParams: { locale, previousUserDid, email } }) => {
+      authPrincipal: ({ extraParams: { locale, previousUserDid, email } }) => {
         return authPrincipal({ locale, previousUserDid, email });
       },
     },
-    onConnect: async ({ req, userDid, extraParams: { locale, passportId = '', componentId, previousUserDid } }) => {
+    onConnect: ({ req, userDid, extraParams: { locale, passportId = '', componentId, previousUserDid } }) => {
       return onConnect({
         node,
         request: req,

package/api/services/auth/connect/exchange-passport.js

@@ -17,7 +17,7 @@ module.exports = function createRoutes(node, authenticator, createSessionToken)
       }
     },
 
-    onConnect: async ({ req, userDid, extraParams: { locale, passportId = '', componentId } }) => {
+    onConnect: ({ req, userDid, extraParams: { locale, passportId = '', componentId } }) => {
       return onConnect({ node, request: req, userDid, locale, passportId, componentId, action: 'exchangePassport' });
     },
 

package/api/services/auth/connect/login.js

@@ -7,7 +7,7 @@ const { onConnect, onApprove } = login;
 module.exports = function createRoutes(node, authenticator, createSessionToken) {
   return {
     action: 'login',
-    onConnect: async ({ req, userDid, extraParams: { locale, passportId = '', componentId }, baseUrl }) => {
+    onConnect: ({ req, userDid, extraParams: { locale, passportId = '', componentId }, baseUrl }) => {
       return onConnect({ node, request: req, userDid, locale, passportId, componentId, action: 'login', baseUrl });
     },
 

package/api/services/auth/connect/pre-setup.js

@@ -9,7 +9,7 @@ module.exports = function createRoutes() {
     action: 'pre-setup',
     authPrincipal: false,
     claims: getAppDidOwnerClaims(),
-    onAuth: async ({ claims, userDid, userPk, extraParams: { locale } }) => {
+    onAuth: ({ claims, userDid, userPk, extraParams: { locale } }) => {
       const claim = claims.find((x) => x.type === 'signature');
       verifySignature(claim, userDid, userPk, locale);
       logger.info('pre-setup.connect.success', { userDid });

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

@@ -131,7 +131,7 @@ module.exports = function createRoutes(node, _, createSessionToken) {
 
           return getKeyPairClaim(node, { title: blocklet.meta.title, declare: false })(opts);
         },
-        profile: async ({ extraParams: { locale = 'en' } }) => {
+        profile: ({ extraParams: { locale = 'en' } }) => {
           return {
             fields: ['fullName', 'email', 'avatar'],
             description: messages.requestProfile[locale],

package/api/services/auth/connect/switch-passport.js

@@ -5,7 +5,7 @@ const { onConnect, onApprove } = switchPassport;
 module.exports = function createRoutes(node, authenticator, createSessionToken) {
   return {
     action: 'switch-passport',
-    onConnect: async ({ req, userDid, baseUrl, extraParams: { locale, connectedDid } }) => {
+    onConnect: ({ req, userDid, baseUrl, extraParams: { locale, connectedDid } }) => {
       return onConnect({
         node,
         request: req,

package/api/services/auth/connect/switch-profile.js

@@ -15,7 +15,7 @@ module.exports = function createRoutes(node) {
       });
     },
 
-    onAuth: async ({ req, claims, userDid, extraParams: { locale } }) => {
+    onAuth: ({ req, claims, userDid, extraParams: { locale } }) => {
       const profile = claims.find((x) => x.type === 'profile');
       return onApprove({
         node,