@abtnode/core 1.16.6-beta-4ea1eb90 → 1.16.6-beta-7c9b42cc

package/lib/api/team.js

@@ -110,6 +110,42 @@ class TeamAPI extends EventEmitter {
 
   // User && Invitation
 
+  async loginUser({ teamDid, user }) {
+    const state = await this.getUserState(teamDid);
+    const nodeInfo = await this.node.read();
+
+    if (user.role === ROLES.OWNER) {
+      if (teamDid !== nodeInfo.did) {
+        throw new Error('Cannot add user of owner role');
+      }
+
+      if (await state.count({ role: ROLES.OWNER })) {
+        throw new Error('The owner already exists');
+      }
+    }
+
+    const { _action, ...doc } = await state.login(user);
+    if (_action === 'update') {
+      logger.info('user updated successfully', { teamDid, userDid: user.did });
+      this.emit(EVENTS.USER_UPDATED, { teamDid, user: doc });
+    } else if (_action === 'add') {
+      if (teamDid === nodeInfo.did && nodeInfo.nodeOwner && user.did !== nodeInfo.nodeOwner.did) {
+        await this.notification.create({
+          title: 'New member join',
+          description: `User with Name (${user.fullName}) and DID (${user.did}) has joined this server`,
+          entityType: 'node',
+          action: '/team/members',
+          entityId: user.did,
+          severity: 'success',
+        });
+      }
+
+      logger.info('user added successfully', { teamDid, userDid: user.did, userPk: user.pk, userName: user.fullName });
+      this.emit(EVENTS.USER_ADDED, { teamDid, user: doc });
+    }
+    return doc;
+  }
+
   async addUser({ teamDid, user }) {
     const state = await this.getUserState(teamDid);
 
@@ -239,10 +275,10 @@ class TeamAPI extends EventEmitter {
     return res;
   }
 
-  async getUser({ teamDid, user }) {
+  async getUser({ teamDid, user, options = {} }) {
     const state = await this.getUserState(teamDid);
 
-    return state.getUser(user.did);
+    return state.getUser(user.did, options);
   }
 
   async getOwner({ teamDid }) {

package/lib/blocklet/manager/disk.js

@@ -103,6 +103,7 @@ const {
   getBlockletKnownAs,
   updateBlockletFallbackLogo,
   ensureAppLogo,
+  getBlockletDidDomainList,
 } = require('../../util/blocklet');
 const states = require('../../states');
 const BaseBlockletManager = require('./base');
@@ -110,7 +111,6 @@ const { get: getEngine } = require('./engine');
 const blockletPm2Events = require('./pm2-events');
 const runMigrationScripts = require('../migration');
 const hooks = require('../hooks');
-const { getDidDomainForBlocklet } = require('../../util/get-domain-for-blocklet');
 const handleInstanceInStore = require('../../util/public-to-store');
 const { BlockletRuntimeMonitor } = require('../../monitor/blocklet-runtime-monitor');
 const getHistoryList = require('../../monitor/get-history-list');
@@ -1095,10 +1095,6 @@ class BlockletManager extends BaseBlockletManager {
       this.emit(BlockletEvents.spaceConnected, blocklet);
     }
 
-    if (willAppDidChange && !skipDidDocument) {
-      await this._updateDidDocument(blocklet);
-    }
-
     // update blocklet meta
     if (blocklet.structVersion && !childDids.length) {
       const changedTitle = newConfigs.find((x) => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_NAME)?.value;
@@ -1124,7 +1120,13 @@ class BlockletManager extends BaseBlockletManager {
 
     // response
     const newState = await this.getBlocklet(rootDid);
+
+    if (willAppDidChange && !skipDidDocument) {
+      await this._updateDidDocument(newState);
+    }
+
     this.emit(BlockletEvents.updated, newState);
+
     return newState;
   }
 
@@ -2276,12 +2278,12 @@ class BlockletManager extends BaseBlockletManager {
       const nodeInfo = await states.node.read();
       const { wallet } = getBlockletInfo(blocklet, nodeInfo.sk);
       didDocument
-        .disableDNS({ wallet, didRegistryUrl: nodeInfo.didRegistry })
+        .disableBlockletDNS({ appPid: blocklet.appPid, wallet, didRegistryUrl: nodeInfo.didRegistry })
         .then(() => {
-          logger.info(`disabled blocklet ${blocklet.appDid} dns`);
+          logger.info(`disabled blocklet ${blocklet.appPid} dns`);
         })
         .catch((err) => {
-          logger.error(`disable blocklet ${blocklet.appDid} dns failed`, { error: err });
+          logger.error(`disable blocklet ${blocklet.appPid} dns failed`, { error: err });
         });
     }
 
@@ -2547,32 +2549,24 @@ class BlockletManager extends BaseBlockletManager {
   async _updateDidDocument(blocklet) {
     const nodeInfo = await states.node.read();
 
-    const { wallet } = getBlockletInfo(
-      {
-        meta: blocklet.meta,
-        environments: [BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SK, BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_WALLET_TYPE]
-          .map((key) => ({ key, value: blocklet.configObj[key] }))
-          .filter((x) => x.value),
-      },
-      nodeInfo.sk
-    );
-    const didDomain = getDidDomainForBlocklet({ appPid: blocklet.appPid, didDomain: nodeInfo.didDomain });
-
     const domainAliases = (get(blocklet, 'site.domainAliases') || []).filter(
       (item) => !item.value.endsWith(nodeInfo.didDomain) && !item.value.endsWith('did.staging.arcblock.io') // did.staging.arcblock.io 是旧 did domain, 但主要存在于比较旧的节点中, 需要做兼容
     );
 
-    domainAliases.push({ value: didDomain, isProtected: true });
+    const didDomainList = getBlockletDidDomainList(blocklet, nodeInfo);
+    domainAliases.push(...didDomainList);
 
     //  先更新 routing rule db 中的 domain aliases, 这一步的目的是为了后面用
     await states.site.updateDomainAliasList(blocklet.site.id, domainAliases);
 
     this.emit(BlockletEvents.appDidChanged, blocklet);
 
+    const { wallet } = getBlockletInfo(blocklet, nodeInfo.sk);
+    const alsoKnownAs = getBlockletKnownAs(blocklet);
     await didDocument.updateBlockletDocument({
       wallet,
       appPid: blocklet.appPid,
-      alsoKnownAs: getBlockletKnownAs(blocklet),
+      alsoKnownAs,
       daemonDidDomain: util.getServerDidDomain(nodeInfo),
       didRegistryUrl: nodeInfo.didRegistry,
       domain: nodeInfo.didDomain,

package/lib/index.js

@@ -303,6 +303,7 @@ function ABTNode(options) {
     getNodeUsers: () => teamAPI.getUsers({ teamDid: options.nodeDid }),
     getNodeUser: (user) => teamAPI.getUser({ teamDid: options.nodeDid, user }),
     addUser: teamAPI.addUser.bind(teamAPI),
+    loginUser: teamAPI.loginUser.bind(teamAPI),
     removeUser: teamAPI.removeUser.bind(teamAPI),
     updateUser: teamAPI.updateUser.bind(teamAPI),
     updateUserApproval: teamAPI.updateUserApproval.bind(teamAPI),

package/lib/router/helper.js

@@ -61,13 +61,13 @@ const {
   isGatewayCacheEnabled,
   isBlockletSite,
 } = require('../util');
-const { getIpDnsDomainForBlocklet, getDidDomainForBlocklet } = require('../util/get-domain-for-blocklet');
+const { getIpDnsDomainForBlocklet } = require('../util/get-domain-for-blocklet');
 const { getFromCache: getAccessibleExternalNodeIp } = require('../util/get-accessible-external-node-ip');
 
 const Router = require('./index');
 const states = require('../states');
 const { getBlockletDomainGroupName, getDidFromDomainGroupName } = require('../util/router');
-const { getBlockletKnownAs } = require('../util/blocklet');
+const { getBlockletKnownAs, getBlockletDidDomainList } = require('../util/blocklet');
 
 const isServiceFeDevelopment = process.env.ABT_NODE_SERVICE_FE_PORT;
 
@@ -839,13 +839,10 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
       });
 
     if (!existSite) {
-      const domainAliases = [];
-
-      const didDomain = getDidDomainForBlocklet({ appPid: blocklet.appPid, didDomain: nodeInfo.didDomain });
-      const ipEchoDnsDomain = getIpDnsDomainForBlocklet(blocklet);
+      const domainAliases = getBlockletDidDomainList(blocklet, nodeInfo);
 
       // let didDomain in front of ipEchoDnsDomain
-      domainAliases.push({ value: didDomain, isProtected: true }, { value: ipEchoDnsDomain, isProtected: true });
+      domainAliases.push({ value: getIpDnsDomainForBlocklet(blocklet), isProtected: true });
 
       await routerManager.addRoutingSite(
         {

package/lib/states/user.js

@@ -1,11 +1,17 @@
 const pickBy = require('lodash/pickBy');
 const escapeStringRegexp = require('escape-string-regexp');
-
+const pick = require('lodash/pick');
+const cloneDeep = require('lodash/cloneDeep');
 const logger = require('@abtnode/logger')('@abtnode/core:states:user');
 const { isValid } = require('@arcblock/did');
 const { PASSPORT_STATUS } = require('@abtnode/constant');
+const { upsertToPassports } = require('@abtnode/auth/lib/passport');
+const { fromAppDid } = require('@arcblock/did-ext');
+const { types } = require('@arcblock/did');
+
 const BaseState = require('./base');
 const { validateOwner } = require('../util');
+const { loginSchema } = require('../validators/user');
 
 const isNullOrUndefined = (x) => x === undefined || x === null;
 
@@ -39,15 +45,25 @@ const isNullOrUndefined = (x) => x === undefined || x === null;
  * WalletAccount
  * @typedef {Object} WalletAccount
  * @property {'wallet'} provider
- * @property {string} did - did for auth0 account
- * @property {string} pk - pk for auth0 account
+ * @property {string} did - did for wallet account
+ * @property {string} pk - pk for wallet account
+ * @property {string} lastLoginAt - Last login time new Date().toISOString()
+ * @property {string} firstLoginAt - First login time new Date().toISOString()
+ */
+
+/**
+ * NFTAccount
+ * @typedef {Object} NFTAccount
+ * @property {'nft'} provider
+ * @property {string} did - did for nft account
+ * @property {string} owner - owner for nft account
  * @property {string} lastLoginAt - Last login time new Date().toISOString()
  * @property {string} firstLoginAt - First login time new Date().toISOString()
  */
 
 /**
  * ConnectedAccount
- * @typedef {(Auth0Account|WalletAccount)} ConnectedAccount
+ * @typedef {(Auth0Account|WalletAccount|NFTAccount)} ConnectedAccount
  */
 
 /**
@@ -59,7 +75,6 @@ const isNullOrUndefined = (x) => x === undefined || x === null;
  * @property {string} avatar - url of user's avatar, eg: bn://avatar/7f8848569405f8cdf8b1b2788ebf7d0f.jpg
  * @property {string} did - user's did -> 实际上变为 uid, 是不可变的；真正的 wallet-did 转移到 extraConfigs 中去了
  * @property {string} pk - user's publicKey
- * @property {('owner'|'admin'|'member'|'guest'|string)} role - user's role
  * @property {UserPassport[]} passports - user's passport list
  * @property {boolean} approved - enable user to login
  * @property {string} locale - locale
@@ -72,8 +87,36 @@ const isNullOrUndefined = (x) => x === undefined || x === null;
  * @property {string} lastLoginIp - lastLoginIp
  * @property {Date} createdAt - createdAt
  * @property {Date} updatedAt - updatedAt
+ * @property {('owner'|'admin'|'member'|'guest'|string)} role - user's role deprecated
  */
 
+function updateConnectedAccount(connectedAccounts = [], connectedAccount = {}) {
+  const now = new Date().toISOString();
+  const filterAccounts = connectedAccounts.filter(Boolean);
+  const updated = cloneDeep(filterAccounts);
+  const updates = Array.isArray(connectedAccount) ? connectedAccount : [connectedAccount];
+  updates.filter(Boolean).forEach((x) => {
+    if (x.provider && x.did) {
+      const findAccountIndex = updated.findIndex((item) => item.provider === x.provider && item.did === x.did);
+      if (findAccountIndex > -1) {
+        updated[findAccountIndex] = {
+          ...filterAccounts[findAccountIndex],
+          ...x,
+          lastLoginAt: now,
+        };
+      } else {
+        updated.push({
+          ...x,
+          firstLoginAt: now,
+          lastLoginAt: now,
+        });
+      }
+    }
+  });
+
+  return updated;
+}
+
 class User extends BaseState {
   constructor(baseDir, config = {}) {
     super(baseDir, { filename: 'user.db', ...config });
@@ -296,14 +339,124 @@ class User extends BaseState {
     return this.find(queryParam);
   }
 
+  /**
+   * user 版本标准化，统一将 user 转换为最新的结构，结构参考 core/state/lib/states/user.js L12-L75
+   */
+  // 1: 没有 extraConfigs 字段
+  // 2: 有 source 和 extraConfigs 字段，oauth 账号的 extraConfigs 中包含 sourceId 和 sourceProvider 字段
+  // 3: 只有 extraConfigs 字段，且 extraConfigs.connectedAccounts 中包含 extraConfigs.sourceProvider 的 account
+  async normalize(user, { blockletSk }) {
+    if (!user) {
+      return user;
+    }
+    let version = 1;
+    if (user.extraConfigs) {
+      version = 2;
+
+      const connectedAccounts = user.extraConfigs?.connectedAccounts || [];
+      const sourceProvider = user.extraConfigs?.sourceProvider || '';
+      if (connectedAccounts.some((item) => item.provider === sourceProvider)) {
+        version = 3;
+      }
+    }
+
+    const versionMap = {
+      1: async () => {
+        const connectedAccounts = [
+          {
+            provider: 'wallet',
+            did: user.did,
+            pk: user.pk,
+            firstLoginAt: user.firstLoginAt,
+            lastLoginAt: user.lastLoginAt,
+          },
+        ];
+        const sourceProvider = 'wallet';
+        const updatedUser = await this.update({
+          did: user.did,
+          pk: user.pk,
+          extraConfigs: {
+            sourceProvider,
+            connectedAccounts,
+          },
+        });
+        return updatedUser;
+      },
+      2: async () => {
+        // eslint-disable-next-line prefer-const
+        let { sourceId, sourceProvider, connectedAccounts = [] } = user.extraConfigs || {};
+        if (sourceId && sourceProvider) {
+          connectedAccounts = [
+            {
+              provider: sourceProvider,
+              id: sourceId,
+              did: user.did,
+              pk: user.pk,
+              firstLoginAt: user.firstLoginAt,
+              lastLoginAt: user.lastLoginAt,
+            },
+          ];
+        } else {
+          sourceProvider = 'wallet';
+          connectedAccounts.forEach((account) => {
+            if (account.id && blockletSk) {
+              const accountWallet = fromAppDid(account.id, blockletSk, types.RoleType.ROLE_ACCOUNT);
+              account.did = accountWallet.address;
+              account.pk = accountWallet.publicKey;
+              account.firstLoginAt = account.firstLoginAt || new Date().toISOString();
+              account.lastLoginAt = account.lastLoginAt || new Date().toISOString();
+            }
+          });
+          connectedAccounts.unshift({
+            provider: 'wallet',
+            did: user.did,
+            pk: user.pk,
+            firstLoginAt: user.firstLoginAt,
+            lastLoginAt: user.lastLoginAt,
+          });
+        }
+        const updatedUser = await this.update({
+          did: user.did,
+          pk: user.pk,
+          extraConfigs: {
+            sourceProvider,
+            connectedAccounts,
+          },
+          source: undefined,
+        });
+        return updatedUser;
+      },
+      3: () => {
+        return user;
+      },
+    };
+    return versionMap[version]();
+  }
+
   /**
    * get user by did
    * @param {string} did user's did
    * @returns {BlockletUser}
    */
-  async getUser(did) {
-    const doc = await this.findOne({ did });
-    return doc;
+  async getUser(did, { enableConnectedAccout = false, enableNormalize = false, blockletSk } = {}) {
+    let user = await this.findOne({ did });
+    if (enableConnectedAccout) {
+      if (!user) {
+        user = await this.findOne({
+          'extraConfigs.connectedAccounts.did': did,
+        });
+      } else if (user.extraConfig?.bindDid) {
+        // @deprecated 已经不存在 bindDid 字段
+        ({ user } = await this.findOne({ did: user.extraConfig.bindDid }));
+      }
+    }
+    if (enableNormalize) {
+      if (!blockletSk) {
+        throw new Error('Normalize user must provide blockletSk params');
+      }
+      return this.normalize(user, { blockletSk });
+    }
+    return user;
   }
 
   /**
@@ -335,6 +488,82 @@ class User extends BaseState {
 
     return doc;
   }
+
+  /**
+   * 用户登录
+   * @param {Object} user
+   * @param {string} user.did
+   * @param {string} user.pk
+   * @param {ConnectedAccount} user.connectedAccount
+   * @param {passport} user.passport
+   * @param {string} user.fullName - user profile's name
+   * @param {string} user.avatar - url of user's avatar, eg: bn://avatar/7f8848569405f8cdf8b1b2788ebf7d0f.jpg
+   * @param {string} user.locale - locale
+   * @param {Object} [user.extra] - extra data of user
+   * @param {string} user.lastLoginIp - lastLoginIp
+   * @param {('owner'|'admin'|'member'|'guest'|string)} user.role - deprecated user's role
+   */
+  async login(_user) {
+    const { error, value: user } = loginSchema.validate(_user);
+    if (error) {
+      throw new Error(error);
+    }
+
+    let updatedUser;
+    let action = '';
+    const now = new Date().toISOString();
+    const oldUser = await this.getUser(user.did, {
+      enableConnectedAccout: true,
+    });
+    const cloneData = cloneDeep(user);
+    const passports = upsertToPassports(
+      oldUser?.passports || [],
+      cloneData.passport && {
+        ...cloneData.passport,
+        lastLoginAt: now,
+      }
+    );
+    const mergeData = {
+      ...pick(cloneData, ['type', 'fullName', 'email', 'avatar', 'role', 'locale', 'extra', 'lastLoginIp', 'remark']),
+      did: user.did,
+      pk: user.pk,
+      passports,
+      lastLoginAt: now,
+      extraConfigs: {
+        sourceProvider: 'wallet',
+        connectedAccounts: [],
+      },
+    };
+
+    if (oldUser) {
+      // update
+      action = 'update';
+      const extraConfigs = {
+        sourceProvider: oldUser?.extraConfigs?.sourceProvider || 'wallet',
+        connectedAccounts: updateConnectedAccount(
+          oldUser?.extraConfigs?.connectedAccounts || [],
+          cloneData.connectedAccount
+        ),
+      };
+      mergeData.extraConfigs = extraConfigs;
+      updatedUser = await this.update(mergeData);
+    } else {
+      // insert
+      action = 'add';
+      mergeData.firstLoginAt = now;
+      mergeData.approved = true;
+      const connectedAccount = Array.isArray(cloneData.connectedAccount)
+        ? cloneData.connectedAccount.filter(Boolean)[0]
+        : cloneData.connectedAccount;
+
+      mergeData.extraConfigs = {
+        sourceProvider: connectedAccount.provider,
+        connectedAccounts: updateConnectedAccount([], cloneData.connectedAccount),
+      };
+      updatedUser = await this.add(mergeData);
+    }
+    return { ...updatedUser, _action: action };
+  }
 }
 
 module.exports = User;

package/lib/util/blocklet.js

@@ -8,6 +8,8 @@ const os = require('os');
 const pRetry = require('p-retry');
 const tar = require('tar');
 const get = require('lodash/get');
+const uniq = require('lodash/uniq');
+const toLower = require('lodash/toLower');
 const isEmpty = require('lodash/isEmpty');
 const streamToPromise = require('stream-to-promise');
 const { Throttle } = require('stream-throttle');
@@ -21,7 +23,7 @@ const { stableStringify } = require('@arcblock/vc');
 const { chainInfo: chainInfoSchema } = require('@arcblock/did-auth/lib/schema');
 
 const { fromSecretKey } = require('@ocap/wallet');
-const { toHex, toBase58, isHex, toDid } = require('@ocap/util');
+const { toHex, toBase58, isHex, toDid, toAddress } = require('@ocap/util');
 const { isValid: isValidDid, isEthereumDid } = require('@arcblock/did');
 const logger = require('@abtnode/logger')('@abtnode/core:util:blocklet');
 const pm2 = require('@abtnode/util/lib/async-pm2');
@@ -296,19 +298,19 @@ const getAppSystemEnvironments = (blocklet, nodeInfo) => {
    * 2. 如果没有，再拼接
    */
 
-  let appUrl = '';
-
+  const pidDomain = getDidDomainForBlocklet({ appPid, didDomain: nodeInfo.didDomain });
   const domainAliases = get(blocklet, 'site.domainAliases') || [];
-  const didDomainAlias = domainAliases.find(
-    (item) => item.value.endsWith(nodeInfo.didDomain) || item.value.endsWith('did.staging.arcblock.io') // did.staging.arcblock.io 是旧 did domain, 但主要存在于比较旧的节点中, 需要做兼容
-  );
 
-  if (didDomainAlias) {
-    appUrl = prettyURL(didDomainAlias.value, true);
-  } else {
-    appUrl = `https://${getDidDomainForBlocklet({ appPid, didDomain: nodeInfo.didDomain })}`;
+  let didDomain = domainAliases.find((item) => toLower(item.value) === toLower(pidDomain));
+
+  if (!didDomain) {
+    didDomain = domainAliases.find(
+      (item) => item.value.endsWith(nodeInfo.didDomain) || item.value.endsWith('did.staging.arcblock.io') // did.staging.arcblock.io 是旧 did domain, 但主要存在于比较旧的节点中, 需要做兼容
+    );
   }
 
+  const appUrl = didDomain ? prettyURL(didDomain.value, true) : `https://${pidDomain}`;
+
   return {
     BLOCKLET_DID: did, // BLOCKLET_DID is always same as BLOCKLET_APP_PID in structV2 application
     BLOCKLET_APP_SK: appSk,
@@ -1922,6 +1924,21 @@ const ensureAppLogo = async (blocklet, blockletsDir) => {
   }
 };
 
+const getBlockletDidDomainList = (blocklet, nodeInfo) => {
+  const domainAliases = [];
+  const alsoKnownAs = getBlockletKnownAs(blocklet);
+
+  const dids = [blocklet.appPid, blocklet.appDid, ...alsoKnownAs].filter(Boolean).map((did) => toAddress(did));
+
+  uniq(dids).forEach((did) => {
+    const domain = getDidDomainForBlocklet({ appPid: did, didDomain: nodeInfo.didDomain });
+
+    domainAliases.push({ value: domain, isProtected: true });
+  });
+
+  return domainAliases;
+};
+
 module.exports = {
   updateBlockletFallbackLogo,
   consumeServerlessNFT,
@@ -1980,4 +1997,5 @@ module.exports = {
   getBlockletKnownAs,
   getFixedBundleSource,
   ensureAppLogo,
+  getBlockletDidDomainList,
 };

package/lib/validators/user.js

@@ -0,0 +1,44 @@
+const JOI = require('joi');
+const { didExtension } = require('@blocklet/meta/lib/extension');
+
+const Joi = JOI.extend(didExtension);
+
+// TODO: @zhanghan 这里目前仅包含必填的字段，后续需要增加其他字段
+const passportSchema = Joi.object({
+  id: Joi.string().required(),
+  role: Joi.string().required(),
+  name: Joi.string().required(),
+})
+  .unknown()
+  .empty(null);
+
+// TODO: @zhanghan 这里目前仅包含必填的字段，后续需要增加其他字段
+const connectedAccountSchema = Joi.object({
+  provider: Joi.string().required(),
+  did: Joi.DID().trim().required(),
+  pk: Joi.string().optional(),
+  id: Joi.string().optional(),
+  firstLoginAt: Joi.string().optional(),
+  lastLoginAt: Joi.string().optional(),
+})
+  .unknown()
+  .empty(null);
+
+const loginSchema = Joi.object({
+  did: Joi.DID().trim().required(),
+  pk: Joi.string().required(),
+  fullName: Joi.string().empty(''),
+  avatar: Joi.string().empty(''),
+  email: Joi.string().empty(''),
+  role: Joi.string().empty(''),
+  locale: Joi.string().empty(''),
+  extra: Joi.object(),
+  remark: Joi.string().empty(''),
+  lastLoginIp: Joi.string().empty(''),
+  passport: passportSchema.optional(),
+  connectedAccount: Joi.alternatives()
+    .try(connectedAccountSchema.required(), Joi.array().items(connectedAccountSchema).min(1).sparse(true))
+    .required(),
+}).unknown();
+
+exports.loginSchema = loginSchema;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.6-beta-4ea1eb90",
+  "version": "1.16.6-beta-7c9b42cc",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,35 +19,36 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.16.6-beta-4ea1eb90",
-    "@abtnode/certificate-manager": "1.16.6-beta-4ea1eb90",
-    "@abtnode/constant": "1.16.6-beta-4ea1eb90",
-    "@abtnode/cron": "1.16.6-beta-4ea1eb90",
-    "@abtnode/db": "1.16.6-beta-4ea1eb90",
-    "@abtnode/logger": "1.16.6-beta-4ea1eb90",
-    "@abtnode/queue": "1.16.6-beta-4ea1eb90",
-    "@abtnode/rbac": "1.16.6-beta-4ea1eb90",
-    "@abtnode/router-provider": "1.16.6-beta-4ea1eb90",
-    "@abtnode/static-server": "1.16.6-beta-4ea1eb90",
-    "@abtnode/timemachine": "1.16.6-beta-4ea1eb90",
-    "@abtnode/util": "1.16.6-beta-4ea1eb90",
-    "@arcblock/did": "1.18.72",
-    "@arcblock/did-auth": "1.18.72",
+    "@abtnode/auth": "1.16.6-beta-7c9b42cc",
+    "@abtnode/certificate-manager": "1.16.6-beta-7c9b42cc",
+    "@abtnode/constant": "1.16.6-beta-7c9b42cc",
+    "@abtnode/cron": "1.16.6-beta-7c9b42cc",
+    "@abtnode/db": "1.16.6-beta-7c9b42cc",
+    "@abtnode/logger": "1.16.6-beta-7c9b42cc",
+    "@abtnode/queue": "1.16.6-beta-7c9b42cc",
+    "@abtnode/rbac": "1.16.6-beta-7c9b42cc",
+    "@abtnode/router-provider": "1.16.6-beta-7c9b42cc",
+    "@abtnode/static-server": "1.16.6-beta-7c9b42cc",
+    "@abtnode/timemachine": "1.16.6-beta-7c9b42cc",
+    "@abtnode/util": "1.16.6-beta-7c9b42cc",
+    "@arcblock/did": "1.18.75",
+    "@arcblock/did-auth": "1.18.75",
+    "@arcblock/did-ext": "^1.18.75",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/did-util": "1.18.72",
-    "@arcblock/event-hub": "1.18.72",
-    "@arcblock/jwt": "^1.18.72",
+    "@arcblock/did-util": "1.18.75",
+    "@arcblock/event-hub": "1.18.75",
+    "@arcblock/jwt": "^1.18.75",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "1.18.72",
-    "@blocklet/constant": "1.16.6-beta-4ea1eb90",
-    "@blocklet/meta": "1.16.6-beta-4ea1eb90",
-    "@blocklet/sdk": "1.16.6-beta-4ea1eb90",
+    "@arcblock/vc": "1.18.75",
+    "@blocklet/constant": "1.16.6-beta-7c9b42cc",
+    "@blocklet/meta": "1.16.6-beta-7c9b42cc",
+    "@blocklet/sdk": "1.16.6-beta-7c9b42cc",
     "@did-space/client": "^0.2.80",
     "@fidm/x509": "^1.2.1",
-    "@ocap/client": "1.18.72",
-    "@ocap/mcrypto": "1.18.72",
-    "@ocap/util": "1.18.72",
-    "@ocap/wallet": "1.18.72",
+    "@ocap/client": "1.18.75",
+    "@ocap/mcrypto": "1.18.75",
+    "@ocap/util": "1.18.75",
+    "@ocap/wallet": "1.18.75",
     "@slack/webhook": "^5.0.4",
     "archiver": "^5.3.1",
     "axios": "^0.27.2",
@@ -97,5 +98,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "0f0f63b552a88343a3f8e0d434b47c3bca6a75b9"
+  "gitHead": "113a82e948a779a050f1b06f5667c43c96315054"
 }