@abtnode/auth 1.16.45-beta-20250701-122807-92b03aba → 1.16.45-beta-20250702-072658-6f6c82be

package/lib/bind-wallet.js

@@ -1,7 +1,7 @@
 const { onConnect, onApprove, authPrincipal } = require('./util/bind-wallet');
 const logger = require('./logger');
 
-const createBindWalletRoute = ({ node }) => ({
+const createBindWalletRoute = ({ node, isService = true }) => ({
   action: 'bind-wallet',
   authPrincipal: false,
   claims: {
@@ -9,7 +9,7 @@ const createBindWalletRoute = ({ node }) => ({
       return authPrincipal({ locale, previousUserDid, email });
     },
   },
-  onConnect: ({ req, userDid, extraParams: { locale, passportId = '', componentId, previousUserDid, isService } }) => {
+  onConnect: ({ req, userDid, extraParams: { locale, passportId = '', componentId, previousUserDid } }) => {
     return onConnect({
       node,
       request: req,
@@ -26,7 +26,7 @@ const createBindWalletRoute = ({ node }) => ({
     claims,
     userDid,
     userPk,
-    extraParams: { locale, previousUserDid, skipMigrateAccount, isService },
+    extraParams: { locale, previousUserDid, skipMigrateAccount },
     req,
     baseUrl,
   }) => {
@@ -42,7 +42,7 @@ const createBindWalletRoute = ({ node }) => ({
         previousUserDid,
         skipMigrateAccount:
           typeof skipMigrateAccount === 'boolean' ? skipMigrateAccount : skipMigrateAccount === 'true',
-        isService: typeof isService === 'boolean' ? isService : isService === 'true',
+        isService,
       });
 
       if (result.nextWorkflowData && skipMigrateAccount) {

package/lib/util/bind-wallet.js

@@ -25,7 +25,7 @@ module.exports = {
       supervised: true,
     };
   },
-  onConnect: async ({ node, request, userDid, locale, previousUserDid, isService }) => {
+  onConnect: async ({ node, request, userDid, locale, previousUserDid, isService = true }) => {
     const translations = {
       en: {
         notFound: "Couldn't find account information.",
@@ -42,6 +42,8 @@ module.exports = {
       },
     };
     const t = createTranslator({ translations });
+    const blockletInfo = await request.getBlockletInfo();
+    const nodeInfo = await node.getNodeInfo();
     const { did: teamDid } = isService ? await request.getBlockletInfo() : await node.getNodeInfo();
 
     const walletUser = await node.getUser({ teamDid, user: { did: userDid } });
@@ -59,7 +61,16 @@ module.exports = {
       },
     });
     if (!oauthUser) {
-      throw new Error(t('notFound', locale, { email: oauthUser.email }));
+      logger.error('bind-wallet failed: oauthUser not found', {
+        bindToUser: userDid,
+        currentUser: previousUserDid,
+        isService,
+        locale,
+        teamDid,
+        blocklet: blockletInfo.did,
+        node: nodeInfo.did,
+      });
+      throw new Error(t('notFound', locale));
     }
 
     const sourceProvider = oauthUser.sourceProvider || LOGIN_PROVIDER.WALLET;
@@ -82,7 +93,7 @@ module.exports = {
     if (bindUser) {
       const bindConnectedAccounts = bindUser.connectedAccounts || [];
       if (bindConnectedAccounts.find((item) => item.provider === sourceProvider)) {
-        throw new Error(t('alreadyBindOAuth', locale, { email: oauthUser.email, did: userDid }));
+        throw new Error(t('alreadyBindOAuth', locale, { did: userDid }));
       }
     }
 
@@ -114,7 +125,7 @@ module.exports = {
     previousUserDid,
     baseUrl,
     skipMigrateAccount = false,
-    isService = false,
+    isService = true,
   }) => {
     // 在这里要对 server 还是 service 进行区分
     const nodeInfo = await node.getNodeInfo();

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.45-beta-20250701-122807-92b03aba",
+  "version": "1.16.45-beta-20250702-072658-6f6c82be",
   "description": "Simple lib to manage auth in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -20,9 +20,9 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.45-beta-20250701-122807-92b03aba",
-    "@abtnode/logger": "1.16.45-beta-20250701-122807-92b03aba",
-    "@abtnode/util": "1.16.45-beta-20250701-122807-92b03aba",
+    "@abtnode/constant": "1.16.45-beta-20250702-072658-6f6c82be",
+    "@abtnode/logger": "1.16.45-beta-20250702-072658-6f6c82be",
+    "@abtnode/util": "1.16.45-beta-20250702-072658-6f6c82be",
     "@arcblock/did": "1.20.14",
     "@arcblock/did-auth": "1.20.14",
     "@arcblock/did-ext": "1.20.14",
@@ -31,10 +31,10 @@
     "@arcblock/nft-display": "^2.13.70",
     "@arcblock/validator": "1.20.14",
     "@arcblock/vc": "1.20.14",
-    "@blocklet/constant": "1.16.45-beta-20250701-122807-92b03aba",
+    "@blocklet/constant": "1.16.45-beta-20250702-072658-6f6c82be",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.45-beta-20250701-122807-92b03aba",
-    "@blocklet/sdk": "1.16.45-beta-20250701-122807-92b03aba",
+    "@blocklet/meta": "1.16.45-beta-20250702-072658-6f6c82be",
+    "@blocklet/sdk": "1.16.45-beta-20250702-072658-6f6c82be",
     "@ocap/client": "1.20.14",
     "@ocap/mcrypto": "1.20.14",
     "@ocap/util": "1.20.14",
@@ -56,5 +56,5 @@
   "devDependencies": {
     "jest": "^29.7.0"
   },
-  "gitHead": "f4fc6b6a7d37bd24a2e2493fbad46045cbb7ea81"
+  "gitHead": "e2b7203766cce76f547833530ac0eb463752162c"
 }