@abtnode/auth 1.16.0 → 1.16.1-beta-cd775909

package/lib/auth.js

@@ -5,9 +5,9 @@ const joinUrl = require('url-join');
 const get = require('lodash/get');
 const { verifyPresentation, createCredentialList } = require('@arcblock/vc');
 const formatContext = require('@abtnode/util/lib/format-context');
+const getNodeWallet = require('@abtnode/util/lib/get-app-wallet');
 const Mcrypto = require('@ocap/mcrypto');
 const Client = require('@ocap/client');
-const { fromSecretKey, WalletType } = require('@ocap/wallet');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
 const {
   PASSPORT_STATUS,
@@ -284,22 +284,6 @@ const getPassportStatusEndpoint = ({ baseUrl, userDid, teamDid }) => {
   return joinUrl(baseUrl, `/api/passport/status?userDid=${userDid}&teamDid=${teamDid}`);
 };
 
-/**
- * Get wallet of abtnode from sk
- * @param {String} sk
- * @returns {Wallet}
- */
-const getNodeWallet = (sk) => {
-  const { types } = Mcrypto;
-  const type = WalletType({
-    role: types.RoleType.ROLE_APPLICATION,
-    pk: types.KeyType.ED25519,
-    hash: types.HashType.SHA3,
-  });
-
-  return fromSecretKey(sk, type);
-};
-
 const getRandomMessage = (len = 16) => {
   const hex = Mcrypto.getRandomBytes(len);
   return hex.replace(/^0x/, '').toUpperCase();
@@ -901,24 +885,33 @@ const getVCFromClaims = async ({ claims, challenge, trustedIssuers, vcTypes, loc
   };
 };
 
-const checkWalletVersion = ({ didwallet, locale = 'en' }) => {
+const checkWalletVersion = ({ didwallet, locale = 'en', expected = {} }) => {
   const { os, version } = didwallet;
 
-  const defaultExpected = '3.0.0';
+  const defaultExpected = '4.0.0';
 
-  const expected = {
-    android: defaultExpected,
-    ios: defaultExpected,
-    web: defaultExpected,
+  const expectedWallet = {
+    android: expected.android || defaultExpected,
+    ios: expected.ios || defaultExpected,
+    web: expected.web || defaultExpected,
   };
 
-  if (semver.lt(version, expected[os] || defaultExpected)) {
-    throw new Error(messages.lowVersion[locale]);
+  if (semver.lt(version, expectedWallet[os] || defaultExpected)) {
+    throw new Error(messages.lowVersion[locale || 'en']);
   }
 
   return true;
 };
 
+const checkWalletVersionForMigrateAppToV2 = (param) => {
+  param.expected = {
+    android: '4.11.15',
+    ios: '4.11.29',
+    web: '4.6.12',
+  };
+  return checkWalletVersion(param);
+};
+
 const getPassportStatus = async ({ node, teamDid, userDid, vcId, locale = 'en' }) => {
   const nodeInfo = await node.getNodeInfo();
   const {
@@ -1078,6 +1071,7 @@ module.exports = {
   getVCFromClaims,
   messages,
   checkWalletVersion,
+  checkWalletVersionForMigrateAppToV2,
   getPassportStatusEndpoint,
   getPassportStatus,
   validatePassportStatus,

package/lib/server.js

@@ -14,7 +14,8 @@ const { toTypeInfo, isFromPublicKey, DidType, isEthereumType } = require('@arcbl
 const urlFriendly = require('@blocklet/meta/lib/url-friendly').default;
 const getApplicationWallet = require('@blocklet/meta/lib/wallet');
 const { slugify } = require('transliteration');
-const { getChainInfo } = require('@blocklet/meta/lib/util');
+const { getBlockletChainInfo } = require('@blocklet/meta/lib/util');
+
 const getBlockletInfo = require('@blocklet/meta/lib/info');
 const formatContext = require('@abtnode/util/lib/format-context');
 const {
@@ -36,6 +37,7 @@ const {
   createAuthTokenByOwnershipNFT,
   createBlockletControllerAuthToken,
   checkWalletVersion,
+  checkWalletVersionForMigrateAppToV2,
 } = require('./auth');
 const {
   validatePassport,
@@ -330,6 +332,46 @@ const getAuthNFTClaim =
     return getOwnershipNFTClaim(node, locale);
   };
 
+const getAuthPrincipalForMigrateAppToV2 = (node) => async (param) => {
+  const {
+    extraParams: { locale, appDid },
+    context: { didwallet },
+  } = param;
+
+  checkWalletVersionForMigrateAppToV2({
+    didwallet,
+    local: locale,
+  });
+
+  if (!appDid) {
+    throw new Error('appDid is required in extraParams');
+  }
+
+  const blocklet = await node.getBlocklet({ did: appDid, attachRuntimeInfo: false });
+  if (!blocklet) {
+    throw new Error(messages.invalidBlocklet[locale]);
+  }
+
+  const info = await node.getNodeInfo();
+  const { wallet } = getBlockletInfo(blocklet, info.sk);
+  const type = DidType(wallet.type);
+
+  // get chain info
+  let chainInfo = getBlockletChainInfo(blocklet);
+  if (isEthereumType(type)) {
+    chainInfo.type = 'ethereum';
+    chainInfo.id = '1';
+  }
+  if (chainInfo.host === 'none') {
+    chainInfo = { host: MAIN_CHAIN_ENDPOINT, id: 'main', type: 'arcblock' };
+  }
+
+  return {
+    description: 'Please select account to continue',
+    chainInfo,
+  };
+};
+
 const getKeyPairClaim =
   (node, declare = true) =>
   async ({ extraParams: { locale, appDid, wt = 'default', title }, context: { didwallet } }) => {
@@ -358,11 +400,11 @@ const getKeyPairClaim =
       appName = name;
       migrateFrom = wallet.address;
       type = DidType(wallet.type);
-      chainInfo = getChainInfo(blocklet.configObj);
+      chainInfo = getBlockletChainInfo(blocklet);
     } else {
       type = DidType(wt);
       type.role = types.RoleType.ROLE_APPLICATION;
-      chainInfo = getChainInfo({});
+      chainInfo = getBlockletChainInfo();
     }
 
     const typeStr = DidType.toJSON(type);
@@ -376,8 +418,8 @@ const getKeyPairClaim =
       description: description[locale] || description.en,
       moniker: (urlFriendly(slugify(appName)) || 'application').toLowerCase(),
       declare: !!declare,
+      migrateFrom: declare ? migrateFrom : '',
       chainInfo,
-      migrateFrom,
       targetType: {
         role: typeStr.role?.split('_').pop()?.toLowerCase(),
         key: typeStr.pk?.toLowerCase(),
@@ -415,7 +457,7 @@ const getRotateKeyPairClaims = (node) => {
         // Try to use blocklet chain config if possible
         // Since migration happens on the chain the app holds some actual assets
         // We must ensure it happens on that chain
-        chainInfo = getChainInfo(blocklet.configObj);
+        chainInfo = getBlockletChainInfo(blocklet);
 
         // Fallback to main chain, since it is the default registry for all DID
         if (chainInfo.host === 'none') {
@@ -806,4 +848,5 @@ module.exports = {
   getAuthNFTClaim,
   getServerlessNFTClaim,
   getLauncherAppIdList,
+  getAuthPrincipalForMigrateAppToV2,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.0",
+  "version": "1.16.1-beta-cd775909",
   "description": "Simple lib to manage auth in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -20,14 +20,14 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.16.0",
-    "@abtnode/logger": "1.16.0",
-    "@abtnode/util": "1.16.0",
+    "@abtnode/constant": "1.16.1-beta-cd775909",
+    "@abtnode/logger": "1.16.1-beta-cd775909",
+    "@abtnode/util": "1.16.1-beta-cd775909",
     "@arcblock/did": "1.18.65",
     "@arcblock/jwt": "^1.18.65",
     "@arcblock/vc": "1.18.65",
-    "@blocklet/constant": "1.16.0",
-    "@blocklet/meta": "1.16.0",
+    "@blocklet/constant": "1.16.1-beta-cd775909",
+    "@blocklet/meta": "1.16.1-beta-cd775909",
     "@ocap/client": "1.18.65",
     "@ocap/mcrypto": "1.18.65",
     "@ocap/util": "1.18.65",
@@ -44,5 +44,5 @@
   "devDependencies": {
     "jest": "^27.5.1"
   },
-  "gitHead": "da461546c6db9c7d347689708af27654c17ac28e"
+  "gitHead": "9fd68e48cd87d5d8feafcf37dac1b586c1dccd8f"
 }