@arcblock/did-connect-js 1.25.6 → 1.26.1

package/lib/authenticator/base.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-promise-executor-return */
 const Jwt = require('@arcblock/jwt');
-const { isValid } = require('@ocap/wallet');
+const { isValid, fromJSON } = require('@ocap/wallet');
 
 // eslint-disable-next-line
 const debug = require('debug')(`${require('../../package.json').name}:authenticator:base`);
@@ -16,9 +16,17 @@ class BaseAuthenticator {
     }
 
     if (isValid(wallet, canSign)) {
-      return { sk: wallet.secretKey, pk: wallet.publicKey, address: wallet.address };
+      // Full wallet object with methods - add pk/sk aliases for backward compatibility
+      if (!wallet.pk && wallet.publicKey) {
+        wallet.pk = wallet.publicKey;
+      }
+      if (!wallet.sk && wallet.secretKey) {
+        wallet.sk = wallet.secretKey;
+      }
+      return wallet;
     }
 
+    // Validate required fields for JSON wallet object
     if (canSign && !wallet.sk) {
       throw new Error('WalletAuthenticator cannot work without wallet.sk');
     }
@@ -29,7 +37,22 @@ class BaseAuthenticator {
       throw new Error('WalletAuthenticator cannot work without wallet.address');
     }
 
-    return wallet;
+    // If it's a plain JSON object with required fields, convert it to a full wallet object
+    // This ensures backward compatibility with code that uses toJSON()
+    try {
+      const fullWallet = fromJSON(wallet);
+      // Add pk/sk aliases for backward compatibility
+      if (!fullWallet.pk && fullWallet.publicKey) {
+        fullWallet.pk = fullWallet.publicKey;
+      }
+      if (!fullWallet.sk && fullWallet.secretKey) {
+        fullWallet.sk = fullWallet.secretKey;
+      }
+      return fullWallet;
+    } catch (err) {
+      // If fromJSON fails, return the original object for backward compatibility
+      return wallet;
+    }
   }
 
   /**

package/lib/authenticator/wallet.js

@@ -7,7 +7,6 @@ const random = require('lodash/random');
 const shuffle = require('lodash/shuffle');
 const isEqual = require('lodash/isEqual');
 const Client = require('@ocap/client');
-const Jwt = require('@arcblock/jwt');
 const RSA = require('@ocap/mcrypto/lib/crypter/rsa').default;
 const { toDid, toBase58, fromBase58 } = require('@ocap/util');
 const { fromAddress } = require('@ocap/wallet');
@@ -113,7 +112,7 @@ class WalletAuthenticator extends BaseAuthenticator {
   }) {
     super();
 
-    this.wallet = this._validateWallet(wallet);
+    this.wallet = this._validateWallet(wallet, false);
     this.appInfo = this._validateAppInfo(appInfo);
     this.memberAppInfo = this._validateAppInfo(memberAppInfo, true);
     this.chainInfo = chainInfo;
@@ -230,7 +229,7 @@ class WalletAuthenticator extends BaseAuthenticator {
 
     const result = {
       appPk: toBase58(wallet.pk),
-      authInfo: Jwt.sign(wallet.address, wallet.sk, payload, true, didwallet ? didwallet.jwt : undefined),
+      authInfo: await wallet.signJWT(payload, true, didwallet ? didwallet.jwt : undefined),
     };
 
     if (delegator) {
@@ -319,7 +318,7 @@ class WalletAuthenticator extends BaseAuthenticator {
     const version = context.didwallet ? context.didwallet.jwt : undefined;
     const result = {
       appPk: toBase58(wallet.pk),
-      authInfo: Jwt.sign(wallet.address, wallet.sk, payload, true, version),
+      authInfo: await wallet.signJWT(payload, true, version),
       sensitive: claimsInfo.every((x) => ['keyPair', 'encryptionKey'].includes(x.type)),
     };
 
@@ -400,8 +399,10 @@ class WalletAuthenticator extends BaseAuthenticator {
 
   async getWalletInfo(params) {
     if (typeof this.wallet === 'function') {
+      // No longer check wallet.secretKey, because we may have use cases (e.g. @arcblock/sdk)
+      // where there is no secretKey but we can still perform signing.
       const result = await this.tryWithTimeout(() => this.wallet(params));
-      return this._validateWallet(result, true);
+      return this._validateWallet(result, false);
     }
 
     return this.wallet;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@arcblock/did-connect-js",
   "description": "Helper function to setup DID Connect support on a node.js web server",
-  "version": "1.25.6",
+  "version": "1.26.1",
   "author": {
     "name": "wangshijun",
     "email": "shijun@arcblock.io",
@@ -24,13 +24,13 @@
     "lodash": "^4.17.21",
     "semver": "^7.6.3",
     "tweetnacl-sealedbox-js": "^1.2.0",
-    "@arcblock/did": "1.25.6",
-    "@arcblock/jwt": "1.25.6",
-    "@arcblock/validator": "1.25.6",
-    "@ocap/client": "1.25.6",
-    "@ocap/mcrypto": "1.25.6",
-    "@ocap/util": "1.25.6",
-    "@ocap/wallet": "1.25.6"
+    "@arcblock/did": "1.26.1",
+    "@arcblock/jwt": "1.26.1",
+    "@arcblock/validator": "1.26.1",
+    "@ocap/client": "1.26.1",
+    "@ocap/mcrypto": "1.26.1",
+    "@ocap/util": "1.26.1",
+    "@ocap/wallet": "1.26.1"
   },
   "devDependencies": {
     "@arcblock/did-agent-storage-memory": "^1.8.0",
@@ -40,7 +40,7 @@
     "remark-cli": "^10.0.1",
     "remark-preset-github": "^4.0.4",
     "tweetnacl": "^1.0.3",
-    "@ocap/e2e-test": "1.25.6"
+    "@ocap/e2e-test": "1.26.1"
   },
   "remarkConfig": {
     "plugins": [
@@ -52,7 +52,7 @@
       ]
     ]
   },
-  "homepage": "https://github.com/ArcBlock/blockchain/tree/master/did/did-connect",
+  "homepage": "https://www.arcblock.io/docs/did-connect-sdk",
   "keywords": [
     "blockchain",
     "arcblock",