@abtnode/blocklet-services 1.16.16-beta-740ea329 → 1.16.16-beta-301539f6

package/api/index.js

@@ -182,7 +182,7 @@ module.exports = function createServer(node, serverOptions = {}) {
   server.use(
     bodyParser.json({
       // We have to set a larger hard limit since
-      limit: '2mb',
+      limit: '8mb',
 
       // https://flaviocopes.com/express-get-raw-body/
       // Side effects: this will double the memory consumption

package/api/libs/auth/utils.js

@@ -6,6 +6,7 @@ const { getBlockletAppIdList } = require('@blocklet/meta/lib/util');
 const pick = require('lodash/pick');
 const uniq = require('lodash/uniq');
 const uniqBy = require('lodash/uniqBy');
+const { LOGIN_PROVIDER } = require('@blocklet/constant');
 
 const { sendToUser } = require('../notification');
 
@@ -125,7 +126,7 @@ async function transferPassport(fromUser, toUser, { req, teamDid, node, nodeInfo
     const revokePendingList = waitPassportList
       .filter((item) => item.id)
       .map((item) => {
-        if (fromUser.sourceProvider === 'auth0') {
+        if (fromUser.sourceProvider === LOGIN_PROVIDER.AUTH0) {
           return node.removeUserPassport({ teamDid, userDid: fromUser.did, passportId: item.id });
         }
         return node.revokeUserPassport({ teamDid, userDid: fromUser.did, passportId: item.id });

package/api/libs/connect/session.js

@@ -36,12 +36,11 @@ const { getKeyPairClaim, getAuthPrincipalForMigrateAppToV2 } = require('@abtnode
 const merge = require('lodash/merge');
 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');
-const { getLoginProvider } = require('@blocklet/sdk/lib/util/login');
+const { getSourceAppPid, getLoginProvider } = require('@blocklet/sdk/lib/util/login');
 
 const logger = require('@abtnode/logger')(require('../../../package.json').name);
 
@@ -49,13 +48,12 @@ const { isInvitedUserOnly, createTokenFn, getDidConnectVersion } = require('../.
 const { transferPassport } = require('../auth/utils');
 const { migrateAccount, declareAccount } = require('../../services/oauth');
 const { getTrustedIssuers, getFederatedTrustedIssuers } = require('../../util/blocklet-utils');
-const { getFederatedMaster, getUserAvatarUrl } = require('../../util/federated');
-const { api } = require('../api');
+const { getUserAvatarUrl, migrateAuth0, getFederatedMaster } = require('../../util/federated');
 
 const vcTypes = [VC_TYPE_GENERAL_PASSPORT, VC_TYPE_NODE_PASSPORT];
 
-const getPassportVc = async ({ blocklet, claims, challenge, locale, provider }) => {
-  const trustedIssuers = await getTrustedIssuers(blocklet, { provider });
+const getPassportVc = async ({ blocklet, claims, challenge, locale, sourceAppPid }) => {
+  const trustedIssuers = await getTrustedIssuers(blocklet, { sourceAppPid });
   const { vc } = await getVCFromClaims({
     claims,
     challenge,
@@ -67,7 +65,7 @@ const getPassportVc = async ({ blocklet, claims, challenge, locale, provider })
   return vc;
 };
 
-const getRoleFromVC = async ({ vc, node, locale, blocklet, teamDid, provider }) => {
+const getRoleFromVC = async ({ vc, node, locale, blocklet, teamDid, sourceAppPid }) => {
   let role = ROLES.GUEST;
   if (vc) {
     await validatePassport(get(vc, 'credentialSubject.passport'));
@@ -77,8 +75,7 @@ const getRoleFromVC = async ({ vc, node, locale, blocklet, teamDid, provider })
       role = getRoleFromLocalPassport(get(vc, 'credentialSubject.passport'));
     } else {
       // MEMO: 如果是 federated，需要将 actualIssuer 做一个转换
-      const actualIssuerList =
-        provider === LOGIN_PROVIDER.FEDERATED ? await getFederatedTrustedIssuers(blocklet) : [actualIssuer];
+      const actualIssuerList = sourceAppPid ? await getFederatedTrustedIssuers(blocklet) : [actualIssuer];
       // map external passport to local role
       const { mappings = [] } =
         (blocklet.trustedPassports || []).find((x) => actualIssuerList.includes(x.issuerDid)) || {};
@@ -146,7 +143,7 @@ module.exports = {
       const blocklet = await request.getBlocklet();
       const config = await request.getServiceConfig(NODE_SERVICES.AUTH, { componentId });
       const { did: teamDid, wallet: blockletWallet } = await request.getBlockletInfo();
-      const provider = getLoginProvider(request);
+      const sourceAppPid = getSourceAppPid(request);
 
       const profileFields = get(config, 'profileFields');
 
@@ -160,7 +157,7 @@ module.exports = {
       if (action === 'login') {
         const [invitedUserOnly] = config ? await isInvitedUserOnly(config, node, teamDid) : [false];
 
-        const trustedIssuers = await getTrustedIssuers(blocklet, { provider });
+        const trustedIssuers = await getTrustedIssuers(blocklet, { sourceAppPid });
         claims.verifiableCredential = {
           type: 'verifiableCredential',
           description: messages.requestPassport[locale],
@@ -246,11 +243,13 @@ module.exports = {
       let defaultTtlPolicy = 'never';
       let issuePassport = false;
 
+      const sourceAppPid = getSourceAppPid(request);
       const provider = getLoginProvider(request);
+      const masterSite = getFederatedMaster(blocklet);
 
       // Get passport vc
       if (action === 'login') {
-        vc = await getPassportVc({ blocklet, claims, challenge, locale, provider });
+        vc = await getPassportVc({ blocklet, claims, challenge, locale, sourceAppPid });
         [invitedUserOnly, defaultRole, issuePassport] = await isInvitedUserOnly(authConfig, node, teamDid);
         if (invitedUserOnly && !vc) {
           throw new Error(messages.missingCredentialClaim[locale]);
@@ -323,7 +322,7 @@ module.exports = {
       }
 
       // Get role
-      const role = await getRoleFromVC({ vc, node, locale, blocklet, teamDid, provider });
+      const role = await getRoleFromVC({ vc, node, locale, blocklet, teamDid, sourceAppPid });
       await validateRole({ role, authConfig, locale, node, teamDid });
 
       checkAppOwner({ role, blocklet, userDid, locale });
@@ -346,15 +345,10 @@ module.exports = {
       // Update profile
       const passportForLog = passport || { name: 'Guest', role: 'guest' };
 
-      const masterSite = getFederatedMaster(blocklet);
-      let connectAccount = { provider, did: userDid, pk: userPk };
+      const connectAccount = { provider, did: userDid, pk: userPk };
 
       let updatedUser;
       if (user) {
-        // Update user
-        if (masterSite && provider === LOGIN_PROVIDER.FEDERATED) {
-          connectAccount = { provider, did: userDid, pk: userPk, id: masterSite.appPid };
-        }
         updatedUser = await node.loginUser({
           teamDid,
           user: {
@@ -362,6 +356,7 @@ module.exports = {
             pk: user.pk,
             locale,
             passport,
+            sourceAppPid,
             lastLoginIp: get(request, 'headers[x-real-ip]') || '',
             connectedAccount: [connectAccount, connectedNft],
           },
@@ -369,7 +364,7 @@ module.exports = {
         await node.createAuditLog(
           {
             action,
-            args: { teamDid, userDid: realDid, passport: passportForLog, provider },
+            args: { teamDid, userDid: realDid, passport: passportForLog, provider, sourceAppPid },
             context: formatContext(Object.assign(request, { user: updatedUser })),
             result: updatedUser,
           },
@@ -380,10 +375,6 @@ module.exports = {
         const profile = claims.find((x) => x.type === 'profile');
         fullName = profile.fullName;
 
-        if (masterSite && provider === LOGIN_PROVIDER.FEDERATED) {
-          connectAccount = { provider, did: userDid, pk: userPk, id: masterSite.appPid };
-        }
-
         updatedUser = await node.loginUser({
           teamDid,
           user: {
@@ -395,6 +386,7 @@ module.exports = {
             pk: realPk,
             locale,
             passport,
+            sourceAppPid,
             lastLoginIp: get(request, 'headers[x-real-ip]') || '',
             connectedAccount: [connectAccount, connectedNft],
           },
@@ -402,7 +394,13 @@ module.exports = {
         await node.createAuditLog(
           {
             action: 'addUser',
-            args: { teamDid, userDid: realDid, reason: `first login as ${passportForLog.role}` },
+            args: {
+              teamDid,
+              userDid: realDid,
+              sourceAppPid,
+              provider,
+              reason: `first login as ${passportForLog.role}`,
+            },
             context: formatContext(Object.assign(request, { user: updatedUser })),
             result: updatedUser,
           },
@@ -410,9 +408,33 @@ module.exports = {
         );
       }
 
+      // NOTICE: 采用异步来更新，不阻塞接口的正常响应
+      if (sourceAppPid || masterSite.appPid === blocklet.appPid) {
+        node.syncFederated({
+          did: teamDid,
+          data: {
+            users: [
+              {
+                did: updatedUser.did,
+                pk: updatedUser.pk,
+                fullName: updatedUser.fullName,
+                email: updatedUser.email || '',
+                avatar: getUserAvatarUrl(updatedUser.avatar, blocklet),
+                connectedAccount: [connectAccount, connectedNft],
+                action: 'connectAccount',
+                sourceAppPid: sourceAppPid || masterSite.appPid,
+              },
+            ],
+          },
+        });
+      }
+
       // Generate new session token that client can save to localStorage
       const createToken = createTokenFn(createSessionToken);
       const sessionConfig = blocklet.settings?.session || {};
+
+      // request.context.store.connectedWallet
+      const walletOS = request.context.didwallet.os;
       const { sessionToken, refreshToken } = createToken(
         realDid,
         {
@@ -422,6 +444,7 @@ module.exports = {
           fullName,
           // NOTE: token 中存储当前的 login provider
           provider,
+          walletOS,
         },
         { ...sessionConfig, didConnectVersion: getDidConnectVersion(request) }
       );
@@ -437,36 +460,6 @@ module.exports = {
         await node.setBlockletInitialized({ did: teamDid, owner: { did: realDid, pk: realPk } });
       }
 
-      const { permanentWallet } = blockletInfo;
-
-      let federatedSessionToken;
-      let federatedRefreshToken;
-      // member 使用 deferated login 时，总是会让 Master 自动登录
-      if (masterSite && provider === LOGIN_PROVIDER.FEDERATED) {
-        const postUser = pick(updatedUser, ['did', 'pk', 'fullName', 'locale']);
-        postUser.lastLoginAt = get(request, 'headers[x-real-ip]') || '';
-
-        if (updatedUser.email) {
-          postUser.email = updatedUser.email;
-        }
-        if (updatedUser.avatar) {
-          postUser.avatar = getUserAvatarUrl(updatedUser.avatar, blocklet);
-        }
-
-        const { data } = await api.post(
-          joinUrl(masterSite.appUrl, WELLKNOWN_SERVICE_PATH_PREFIX, '/api/federated/loginByMember'),
-          {
-            signer: permanentWallet.address,
-            data: signV2(permanentWallet.address, permanentWallet.secretKey, {
-              user: postUser,
-              passport,
-            }),
-          }
-        );
-        federatedSessionToken = data.sessionToken;
-        federatedRefreshToken = data.refreshToken;
-      }
-
       // issue passport for the first login user in a invite-only team
       if (issuePassport) {
         return {
@@ -475,8 +468,6 @@ module.exports = {
           data: vc,
           sessionToken,
           refreshToken,
-          federatedSessionToken,
-          federatedRefreshToken,
           nextWorkflowData: {
             userDid: realDid,
           },
@@ -486,8 +477,6 @@ module.exports = {
       return {
         sessionToken,
         refreshToken,
-        federatedSessionToken,
-        federatedRefreshToken,
         nextWorkflowData: {
           userDid: realDid,
         },
@@ -574,6 +563,28 @@ module.exports = {
         },
         node
       );
+
+      const syncUserData = pick(doc, ['did', 'pk', 'fullName', 'avatar', 'email']);
+      if (syncUserData.avatar) {
+        syncUserData.avatar = getUserAvatarUrl(syncUserData.avatar, blocklet);
+      }
+      const sourceAppPid = getSourceAppPid(request);
+      const masterSite = getFederatedMaster(blocklet);
+      // NOTICE: 采用异步来更新，不阻塞接口的正常响应
+      if (sourceAppPid || masterSite.appPid === blocklet.appPid) {
+        node.syncFederated({
+          did: teamDid,
+          data: {
+            users: [
+              {
+                ...syncUserData,
+                action: 'switchProfile',
+                sourceAppPid: sourceAppPid || masterSite.appPid,
+              },
+            ],
+          },
+        });
+      }
     },
   },
 
@@ -606,8 +617,8 @@ module.exports = {
       const [invitedUserOnly] = await isInvitedUserOnly(config, node, teamDid);
 
       const blocklet = await request.getBlocklet();
-      const provider = getLoginProvider(request);
-      const trustedIssuers = await getTrustedIssuers(blocklet, { provider });
+      const sourceAppPid = getSourceAppPid(request);
+      const trustedIssuers = await getTrustedIssuers(blocklet, { sourceAppPid });
 
       return {
         verifiableCredential: {
@@ -629,6 +640,7 @@ module.exports = {
       userDid,
       createSessionToken,
       componentId,
+      sourceAppPid,
       provider,
     }) => {
       const blocklet = await request.getBlocklet();
@@ -660,7 +672,7 @@ module.exports = {
         claims: [verifiableCredential],
         challenge,
         locale,
-        provider,
+        sourceAppPid,
       });
 
       // Validate passport required
@@ -676,7 +688,7 @@ module.exports = {
       }
 
       // Get role
-      const role = await getRoleFromVC({ vc, node, locale, blocklet, teamDid, provider });
+      const role = await getRoleFromVC({ vc, node, locale, blocklet, teamDid, sourceAppPid });
       await validateRole({ role, authConfig, locale, node, teamDid });
 
       checkAppOwner({ role, blocklet, userDid, locale });
@@ -701,7 +713,7 @@ module.exports = {
       await node.createAuditLog(
         {
           action: 'switchPassport',
-          args: { teamDid, userDid, passport: passportForLog, provider },
+          args: { teamDid, userDid, passport: passportForLog, sourceAppPid },
           context: formatContext(Object.assign(request, { user })),
           result: {},
         },
@@ -713,7 +725,15 @@ module.exports = {
       const sessionConfig = blocklet.settings?.session || {};
       const { sessionToken, refreshToken } = createToken(
         userDid,
-        { secret, passport, role, fullName: user.fullName, provider },
+        {
+          secret,
+          passport,
+          role,
+          fullName: user.fullName,
+          provider,
+          // request.context.store.connectedWallet
+          walletOS: request.context.didwallet.os,
+        },
         { ...sessionConfig, didConnectVersion: getDidConnectVersion(request) }
       );
       return { sessionToken, refreshToken };
@@ -815,7 +835,9 @@ module.exports = {
     },
     onApprove: async ({ node, request, locale, userDid, userPk, claims, previousUserDid, baseUrl }) => {
       const blocklet = await request.getBlocklet();
-      const { did: teamDid, wallet: blockletWallet } = await request.getBlockletInfo();
+      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();
@@ -875,6 +897,31 @@ module.exports = {
           passports: mergePassport,
         },
       });
+      const masterSite = getFederatedMaster(blocklet);
+      // NOTICE: 采用异步来更新，不阻塞接口的正常响应
+      if (sourceAppPid || masterSite.appPid === blocklet.appPid) {
+        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 = {
@@ -885,6 +932,7 @@ module.exports = {
         };
       }
 
+      // FIXME：@zhanghan 统一登录的 passport 相关问题后续统一处理
       await transferPassport(oauthUser, bindUser, {
         req: request,
         node,
@@ -894,12 +942,23 @@ module.exports = {
         revokePassport: true,
       });
 
-      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: bindUser });
+      if (sourceAppPid) {
+        await migrateAuth0({
+          // 目前只允许未注册过的钱包绑定 auth0，所以直接传入钱包生成的 userDid 和 userPk
+          toUserDid: userDid,
+          toUserPk: userPk,
+          fromUserDid: previousUserDid,
+          blockletInfo,
+          blocklet,
+        });
+      } 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: bindUser });
+      }
 
       await node.createAuditLog(
         {

package/api/libs/connect/shared.js

@@ -2,28 +2,49 @@ const get = require('lodash/get');
 const joinUrl = require('url-join');
 const { getConnectAppUrl, getChainInfo } = require('@blocklet/meta/lib/util');
 const { WELLKNOWN_SERVICE_PATH_PREFIX } = require('@abtnode/constant');
-const { LOGIN_PROVIDER } = require('@blocklet/constant');
-const { getLoginProvider } = require('@blocklet/sdk/lib/util/login');
+const { getSourceAppPid } = require('@blocklet/sdk/lib/util/login');
+
+function getFederatedMasterAppInfo({ blocklet, sourceAppPid, baseUrl, version, request, groupPathPrefix, nodeInfo }) {
+  const { federated } = blocklet.settings;
+  const master = federated.sites.find((x) => x.appPid === sourceAppPid);
+  // 对于 ux 来说，要展示的始终是 pid，所以这个给 agentDid 的赋值也需要是 pid
+  // federated 登录模式下，需要告知原有的 blocklet-did
+  const agentDid = blocklet.appPid;
+
+  return {
+    name: master.appName,
+    description: master.appescription || `Connect to ${master.appName}`,
+    icon: joinUrl(master.appUrl, WELLKNOWN_SERVICE_PATH_PREFIX, `/blocklet/logo?v=${version}`),
+    link: getConnectAppUrl({ request, baseUrl }),
+    updateSubEndpoint: true,
+    subscriptionEndpoint: joinUrl(groupPathPrefix, WELLKNOWN_SERVICE_PATH_PREFIX, 'websocket'),
+    nodeDid: nodeInfo.did,
+    agentDid,
+  };
+}
 
 module.exports = {
-  appInfo: async ({ request, baseUrl, extraParams }) => {
+  appInfo: async ({ request, baseUrl }) => {
     const groupPathPrefix = request.headers['x-group-path-prefix'] || '/';
 
-    const [blocklet, meta, info] = await Promise.all([
-      request.getBlocklet(),
-      request.getBlockletInfo(),
-      request.getNodeInfo(),
-    ]);
-    // 对于 ux 来说， 要展示的始终是 pid，所以这个给 agentDid 的赋值也需要是 pid
-    let agentDid;
-    const provider = getLoginProvider(request, extraParams);
-    // federated 登录模式下，需要告知原有的 blocklet-did
-    if (provider === LOGIN_PROVIDER.FEDERATED) {
-      agentDid = blocklet.appPid;
-    }
+    const [blocklet, info] = await Promise.all([request.getBlocklet(), request.getNodeInfo()]);
+
+    const sourceAppPid = getSourceAppPid(request);
 
     const version = get(blocklet, 'meta.version', '');
 
+    if (sourceAppPid) {
+      return getFederatedMasterAppInfo({
+        blocklet,
+        sourceAppPid,
+        baseUrl,
+        version,
+        groupPathPrefix,
+        request,
+        nodeInfo: info,
+      });
+    }
+    const meta = await request.getBlockletInfo();
     return {
       name: meta.name,
       description: meta.description || `Connect to ${meta.name}`,
@@ -33,7 +54,6 @@ module.exports = {
       subscriptionEndpoint: joinUrl(groupPathPrefix, WELLKNOWN_SERVICE_PATH_PREFIX, 'websocket'),
       nodeDid: info.did,
       // NOTE: publisher 是 WalletAuthenticator 中自动添加的
-      agentDid,
     };
   },
 

package/api/libs/connect/v1.js

@@ -10,8 +10,7 @@ const { sendToUser, sendToRelay } = require('@blocklet/sdk/lib/util/send-notific
 const { WELLKNOWN_SERVICE_PATH_PREFIX, NODE_SERVICES_PREFIX } = require('@abtnode/constant');
 const DynamicStorage = require('@abtnode/connect-storage');
 const { fromPublicKey } = require('@ocap/wallet');
-const { LOGIN_PROVIDER } = require('@blocklet/constant');
-const { getLoginProvider } = require('@blocklet/sdk/lib/util/login');
+const { getSourceAppPid } = require('@blocklet/sdk/lib/util/login');
 
 const cache = require('../../cache');
 const { appInfo, chainInfo } = require('./shared');
@@ -24,11 +23,11 @@ module.exports = (node, opts) => {
       const { wallet } = await request.getBlockletInfo();
       return wallet.toJSON();
     },
-    delegator: async ({ request, extraParams }) => {
-      const provider = getLoginProvider(request, extraParams);
+    delegator: async ({ request }) => {
+      const sourceAppPid = getSourceAppPid(request);
 
       const blocklet = await request.getBlocklet();
-      if (provider === LOGIN_PROVIDER.FEDERATED) {
+      if (sourceAppPid) {
         const pk = get(blocklet, 'settings.federated.sites[0].pk');
 
         // NOTE: 这里的 type 参数必须保持跟生成 blocklet 时使用的是一致的
@@ -39,7 +38,6 @@ module.exports = (node, opts) => {
           address: types.EncodingType.BASE58,
         };
         const delegator = fromPublicKey(pk, type);
-        delegator.provider = LOGIN_PROVIDER.FEDERATED;
         return delegator;
       }
 
@@ -49,10 +47,10 @@ module.exports = (node, opts) => {
       }
       return null;
     },
-    delegation: async ({ request, extraParams }) => {
+    delegation: async ({ request }) => {
       const { wallet: delegatee, permanentWallet: delegator } = await request.getBlockletInfo();
-      const provider = getLoginProvider(request, extraParams);
-      if (provider === LOGIN_PROVIDER.FEDERATED) {
+      const sourceAppPid = getSourceAppPid(request);
+      if (sourceAppPid) {
         const blocklet = await request.getBlocklet();
         const delegation = get(blocklet, 'settings.federated.config.delegation');
         return delegation;

package/api/libs/jwt.js

@@ -18,7 +18,7 @@ const initJwt = (node, options) => {
 
   const createSessionToken = (
     did,
-    { role, secret, passport, expiresIn, tokenType, fullName, provider = LOGIN_PROVIDER.WALLET }
+    { role, secret, passport, expiresIn, tokenType, fullName, provider = LOGIN_PROVIDER.WALLET, walletOS }
   ) =>
     createAuthToken({
       did,
@@ -29,6 +29,7 @@ const initJwt = (node, options) => {
       tokenType,
       fullName,
       provider,
+      walletOS,
     });
 
   const verifySessionToken = (token, secret, { checkFromDb, teamDid, checkToken } = {}) =>
@@ -47,7 +48,7 @@ const initJwt = (node, options) => {
           }
         }
 
-        const { did, role, passport, fullName, provider = LOGIN_PROVIDER.WALLET } = decoded;
+        const { did, role, passport, fullName, provider = LOGIN_PROVIDER.WALLET, walletOS } = decoded;
         let user;
         if (!did) {
           return reject(new Error('Invalid jwt token: invalid did'));
@@ -75,8 +76,9 @@ const initJwt = (node, options) => {
           user.role = role;
           user.passport = passport;
           user.provider = provider;
+          user.walletOS = walletOS;
         } else {
-          user = { did, role, passport, fullName, provider };
+          user = { did, role, passport, fullName, provider, walletOS };
         }
 
         return resolve(user);