@abtnode/auth 1.16.0-beta-b16cb035 → 1.16.0-beta-8ee536d7

package/lib/server.js

@@ -5,8 +5,9 @@ const last = require('lodash/last');
 const { isNFTExpired, isNFTConsumed } = require('@abtnode/util/lib/nft');
 const Client = require('@ocap/client');
 const { fromPublicKey } = require('@ocap/wallet');
+const { types } = require('@ocap/mcrypto');
 const { fromBase58, toAddress, toHex } = require('@ocap/util');
-const { toTypeInfo, isFromPublicKey } = require('@arcblock/did');
+const { toTypeInfo, isFromPublicKey, DidType, isEthereumType } = require('@arcblock/did');
 const urlFriendly = require('@blocklet/meta/lib/url-friendly').default;
 const getApplicationWallet = require('@blocklet/meta/lib/wallet');
 const { slugify } = require('transliteration');
@@ -292,7 +293,7 @@ const getAuthNFTClaim =
 
 const getKeyPairClaim =
   (node, declare = true) =>
-  async ({ extraParams: { locale, appDid, title }, context: { didwallet } }) => {
+  async ({ extraParams: { locale, appDid, wt = 'default', title }, context: { didwallet } }) => {
     checkWalletVersion({ didwallet, locale });
 
     const description = {
@@ -303,6 +304,9 @@ const getKeyPairClaim =
     let appName = title;
     let migrateFrom = '';
 
+    let type;
+    let chainInfo;
+
     // We are rotating a key-pair for existing application
     if (appDid) {
       const blocklet = await node.getBlocklet({ did: appDid, attachRuntimeInfo: false });
@@ -314,21 +318,36 @@ const getKeyPairClaim =
       const { name, wallet } = getBlockletInfo(blocklet, info.sk);
       appName = name;
       migrateFrom = wallet.address;
+      type = DidType(wallet.type);
+      chainInfo = getChainInfo(blocklet.configObj);
+    } else {
+      type = DidType(wt);
+      type.role = types.RoleType.ROLE_APPLICATION;
+      chainInfo = getChainInfo({});
     }
 
-    return {
+    const typeStr = DidType.toJSON(type);
+    if (isEthereumType(type)) {
+      chainInfo.type = 'ethereum';
+      chainInfo.id = '1';
+    }
+
+    const result = {
       mfa: !process.env.DID_CONNECT_MFA_DISABLED,
       description: description[locale] || description.en,
       moniker: (urlFriendly(slugify(appName)) || 'application').toLowerCase(),
       declare: !!declare,
+      chainInfo,
       migrateFrom,
       targetType: {
-        role: 'application',
-        hash: 'sha3',
-        key: 'ed25519',
-        encoding: 'base58',
+        role: typeStr.role?.split('_').pop()?.toLowerCase(),
+        key: typeStr.pk?.toLowerCase(),
+        hash: typeStr.hash?.toLowerCase(),
+        encoding: typeStr.address?.toLowerCase(),
       },
     };
+
+    return result;
   };
 
 const getRotateKeyPairClaims = (node) => {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.0-beta-b16cb035",
+  "version": "1.16.0-beta-8ee536d7",
   "description": "Simple lib to manage auth in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -20,18 +20,18 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.16.0-beta-b16cb035",
-    "@abtnode/logger": "1.16.0-beta-b16cb035",
-    "@abtnode/util": "1.16.0-beta-b16cb035",
-    "@arcblock/did": "1.18.59",
-    "@arcblock/jwt": "^1.18.59",
-    "@arcblock/vc": "1.18.59",
-    "@blocklet/constant": "1.16.0-beta-b16cb035",
-    "@blocklet/meta": "1.16.0-beta-b16cb035",
-    "@ocap/client": "1.18.59",
-    "@ocap/mcrypto": "1.18.59",
-    "@ocap/util": "1.18.59",
-    "@ocap/wallet": "1.18.59",
+    "@abtnode/constant": "1.16.0-beta-8ee536d7",
+    "@abtnode/logger": "1.16.0-beta-8ee536d7",
+    "@abtnode/util": "1.16.0-beta-8ee536d7",
+    "@arcblock/did": "1.18.62",
+    "@arcblock/jwt": "^1.18.62",
+    "@arcblock/vc": "1.18.62",
+    "@blocklet/constant": "1.16.0-beta-8ee536d7",
+    "@blocklet/meta": "1.16.0-beta-8ee536d7",
+    "@ocap/client": "1.18.62",
+    "@ocap/mcrypto": "1.18.62",
+    "@ocap/util": "1.18.62",
+    "@ocap/wallet": "1.18.62",
     "axios": "^0.27.2",
     "joi": "17.7.0",
     "jsonwebtoken": "^9.0.0",
@@ -43,5 +43,5 @@
   "devDependencies": {
     "jest": "^27.5.1"
   },
-  "gitHead": "138bd91aee5a35b28c2de4e1e924c44932efaf3a"
+  "gitHead": "57d0c45be311a5fbc1c0fffa2814b62c1a3ee34c"
 }