@abtnode/blocklet-services 1.16.6-beta-4ea1eb90 → 1.16.6-beta-eaa4d39d

package/api/libs/connect/session.js

@@ -43,7 +43,7 @@ const logger = require('@abtnode/logger')(require('../../../package.json').name)
 const { isInvitedUserOnly } = require('../../util');
 const { transferPassport } = require('../auth/utils');
 const { generateTranslate } = require('../translate');
-const { getRawUser, mergeUserData, migrateAccount, normalizeUser } = require('../../services/oauth');
+const { mergeUserData, migrateAccount } = require('../../services/oauth');
 
 const vcTypes = [VC_TYPE_GENERAL_PASSPORT, VC_TYPE_NODE_PASSPORT];
 
@@ -135,7 +135,7 @@ module.exports = {
     onConnect: async ({ node, request, userDid, locale, passportId = '', componentId, action }) => {
       const blocklet = await request.getBlocklet();
       const config = await request.getServiceConfig(NODE_SERVICES.AUTH, { componentId });
-      const { did: teamDid } = await request.getBlockletInfo();
+      const { did: teamDid, wallet: blockletWallet } = await request.getBlockletInfo();
 
       const profileFields = get(config, 'profileFields');
 
@@ -172,13 +172,16 @@ module.exports = {
         };
       }
 
-      let user = await getRawUser(blocklet.meta.did, userDid, {
-        getUser: node.getUser,
-        getUsers: node.getUsers,
-      });
-      user = await normalizeUser(teamDid, user, {
-        updateUser: node.updateUser,
-        getBlockletInfo: request.getBlockletInfo,
+      const user = await node.getUser({
+        teamDid: blocklet.meta.did,
+        user: {
+          did: userDid,
+        },
+        options: {
+          enableConnectedAccout: true,
+          enableNormalize: true,
+          blockletSk: blockletWallet.secretKey,
+        },
       });
       if (user) {
         delete claims.profile;
@@ -201,16 +204,19 @@ module.exports = {
       action,
     }) => {
       const blocklet = await request.getBlocklet();
-      const { wallet, name, passportColor, did: teamDid } = await request.getBlockletInfo();
+      const { wallet, name, passportColor, did: teamDid, wallet: blockletWallet } = await request.getBlockletInfo();
 
       // Check user approved
-      let user = await getRawUser(teamDid, userDid, {
-        getUser: node.getUser,
-        getUsers: node.getUsers,
-      });
-      user = await normalizeUser(teamDid, user, {
-        updateUser: node.updateUser,
-        getBlockletInfo: request.getBlockletInfo,
+      const user = await node.getUser({
+        teamDid,
+        user: {
+          did: userDid,
+        },
+        options: {
+          enableConnectedAccout: true,
+          enableNormalize: true,
+          blockletSk: blockletWallet.secretKey,
+        },
       });
       if (user && !user.approved) {
         throw new Error(messages.notAllowed[locale]);
@@ -303,14 +309,16 @@ module.exports = {
       const passportForLog = passport || { name: 'Guest', role: 'guest' };
       if (user) {
         // Update user
-        const doc = await node.updateUser({
+        const doc = await node.loginUser({
           teamDid,
-          user: mergeUserData(user, {
+          user: {
+            did: user.did,
+            pk: user.pk,
             locale,
-            lastUsedPassport: passport,
+            passport,
             lastLoginIp: get(request, 'headers[x-real-ip]') || '',
-            connectedAccount: [{ provider: 'wallet', did: realDid }, connectedNft].filter(Boolean),
-          }),
+            connectedAccount: [{ provider: 'wallet', did: realDid }, connectedNft],
+          },
         });
         await node.createAuditLog(
           {
@@ -325,7 +333,7 @@ module.exports = {
         // Create user
         const profile = claims.find((x) => x.type === 'profile');
 
-        const doc = await node.addUser({
+        const doc = await node.loginUser({
           teamDid,
           user: {
             ...profile,
@@ -334,25 +342,17 @@ module.exports = {
             }),
             did: realDid,
             pk: realPk,
-            approved: true,
             locale,
-            passports: [passport].filter(Boolean),
-            firstLoginAt: now,
-            lastLoginAt: now,
+            passport,
             lastLoginIp: get(request, 'headers[x-real-ip]') || '',
-            extraConfigs: {
-              sourceProvider: 'wallet',
-              connectedAccounts: [
-                {
-                  provider: 'wallet',
-                  did: realDid,
-                  pk: realPk,
-                  firstLoginAt: now,
-                  lastLoginAt: now,
-                },
-                connectedNft,
-              ].filter(Boolean),
-            },
+            connectedAccount: [
+              {
+                provider: 'wallet',
+                did: realDid,
+                pk: realPk,
+              },
+              connectedNft,
+            ],
           },
         });
         await node.createAuditLog(
@@ -413,14 +413,17 @@ module.exports = {
         throw new Error(messages.actionForbidden[locale]);
       }
 
-      const { did: teamDid } = await request.getBlockletInfo();
-      let user = await getRawUser(teamDid, userDid, {
-        getUser: node.getUser,
-        getUsers: node.getUsers,
-      });
-      user = await normalizeUser(teamDid, user, {
-        updateUser: node.updateUser,
-        getBlockletInfo: request.getBlockletInfo,
+      const { did: teamDid, wallet: blockletWallet } = await request.getBlockletInfo();
+      const user = await node.getUser({
+        teamDid,
+        user: {
+          did: userDid,
+        },
+        options: {
+          enableConnectedAccout: true,
+          enableNormalize: true,
+          blockletSk: blockletWallet.secretKey,
+        },
       });
 
       if (!user) {
@@ -440,16 +443,19 @@ module.exports = {
     },
     onApprove: async ({ node, request, locale, profile, userDid }) => {
       const blocklet = await request.getBlocklet();
-      const teamDid = blocklet.meta.did;
+      const { did: teamDid, blocklet: blockletWallet } = await request.getBlockletInfo();
 
       // check user approved
-      let user = await getRawUser(teamDid, userDid, {
-        getUser: node.getUser,
-        getUsers: node.getUsers,
-      });
-      user = await normalizeUser(teamDid, user, {
-        updateUser: node.updateUser,
-        getBlockletInfo: request.getBlockletInfo,
+      const user = await node.getUser({
+        teamDid,
+        user: {
+          did: userDid,
+        },
+        options: {
+          enableConnectedAccout: true,
+          enableNormalize: true,
+          blockletSk: blockletWallet.secretKey,
+        },
       });
       if (!user) {
         throw new Error(messages.userNotFound[locale]);
@@ -488,15 +494,18 @@ module.exports = {
         throw new Error(messages.userMismatch[locale]);
       }
 
-      const { did: teamDid } = await request.getBlockletInfo();
+      const { did: teamDid, wallet: blockletWallet } = await request.getBlockletInfo();
 
-      let user = await getRawUser(teamDid, userDid, {
-        getUser: node.getUser,
-        getUsers: node.getUsers,
-      });
-      user = await normalizeUser(teamDid, user, {
-        updateUser: node.updateUser,
-        getBlockletInfo: request.getBlockletInfo,
+      const user = await node.getUser({
+        teamDid,
+        user: {
+          did: userDid,
+        },
+        options: {
+          enableConnectedAccout: true,
+          enableNormalize: true,
+          blockletSk: blockletWallet.secretKey,
+        },
       });
 
       if (!user) {
@@ -534,16 +543,19 @@ module.exports = {
       componentId,
     }) => {
       const blocklet = await request.getBlocklet();
-      const { name, did: teamDid } = await request.getBlockletInfo();
+      const { name, did: teamDid, wallet: blockletWallet } = await request.getBlockletInfo();
 
       // Validate user
-      let user = await getRawUser(teamDid, userDid, {
-        getUser: node.getUser,
-        getUsers: node.getUsers,
-      });
-      user = await normalizeUser(teamDid, user, {
-        updateUser: node.updateUser,
-        getBlockletInfo: request.getBlockletInfo,
+      const user = await node.getUser({
+        teamDid,
+        user: {
+          did: userDid,
+        },
+        options: {
+          enableConnectedAccout: true,
+          enableNormalize: true,
+          blockletSk: blockletWallet.secretKey,
+        },
       });
       if (!user) {
         throw new Error(messages.userNotFound[locale]);
@@ -616,7 +628,17 @@ module.exports = {
 
   // 基本流程与 login 一致，但在创建更新用户信息的逻辑不一样
   bindWallet: {
-    onConnect: async ({ node, request, userDid, locale, passportId = '', componentId, previousUserDid }) => {
+    authPrincipal: async ({ email, locale, previousUserDid }) => {
+      const user = email || previousUserDid;
+
+      const message = locale === 'zh' ? `将你的 DID 钱包与账号 ${user} 绑定` : `Connect your DID Wallet with ${user}`;
+
+      return {
+        description: message,
+        supervised: true,
+      };
+    },
+    onConnect: async ({ node, request, userDid, locale, componentId, previousUserDid }) => {
       const translations = {
         en: {
           notFound: "Can't get bind account information",
@@ -632,7 +654,7 @@ module.exports = {
         },
       };
       const t = generateTranslate({ translations });
-      const { did: teamDid } = await request.getBlockletInfo();
+      const { did: teamDid, wallet: blockletWallet } = await request.getBlockletInfo();
 
       const walletUser = await node.getUser({ teamDid, user: { did: userDid } });
       if (walletUser) {
@@ -640,13 +662,16 @@ module.exports = {
       }
 
       const config = await request.getServiceConfig(NODE_SERVICES.AUTH, { componentId });
-      let oauthUser = await getRawUser(teamDid, previousUserDid, {
-        getUser: node.getUser,
-        getUsers: node.getUsers,
-      });
-      oauthUser = await normalizeUser(teamDid, oauthUser, {
-        updateUser: node.updateUser,
-        getBlockletInfo: request.getBlockletInfo,
+      const oauthUser = await node.getUser({
+        teamDid,
+        user: {
+          did: previousUserDid,
+        },
+        options: {
+          enableConnectedAccout: true,
+          enableNormalize: true,
+          blockletSk: blockletWallet.secretKey,
+        },
       });
 
       if (!oauthUser) {
@@ -658,13 +683,16 @@ module.exports = {
         throw new Error(t('alreadyBindWallet', locale));
       }
 
-      let bindUser = await getRawUser(teamDid, userDid, {
-        getUser: node.getUser,
-        getUsers: node.getUsers,
-      });
-      bindUser = await normalizeUser(teamDid, bindUser, {
-        updateUser: node.updateUser,
-        getBlockletInfo: request.getBlockletInfo,
+      const bindUser = await node.getUser({
+        teamDid,
+        user: {
+          did: userDid,
+        },
+        options: {
+          enableConnectedAccout: true,
+          enableNormalize: true,
+          blockletSk: blockletWallet.secretKey,
+        },
       });
 
       if (bindUser) {
@@ -684,15 +712,14 @@ module.exports = {
       };
 
       // 至少需要一个 claim
-      // if (oauthUser.avatar) {
-      //   delete claims.profile;
-      // }
-
-      if (passportId) {
-        claims.verifiableCredential.target = passportId;
+      if (oauthUser.avatar) {
+        delete claims.profile;
+      }
+      if (Object.keys(claims).length > 0) {
+        return claims;
       }
 
-      return claims;
+      return [];
     },
     onApprove: async ({ node, request, locale, userDid, userPk, claims, previousUserDid }) => {
       const blocklet = await request.getBlocklet();
@@ -701,13 +728,16 @@ module.exports = {
       const oauthUser = await node.getUser({ teamDid, user: { did: previousUserDid } });
       const nodeInfo = await request.getNodeInfo();
       // Check user approved
-      let bindUser = await getRawUser(teamDid, userDid, {
-        getUser: node.getUser,
-        getUsers: node.getUsers,
-      });
-      bindUser = await normalizeUser(teamDid, bindUser, {
-        updateUser: node.updateUser,
-        getBlockletInfo: request.getBlockletInfo,
+      let bindUser = await node.getUser({
+        teamDid,
+        user: {
+          did: userDid,
+        },
+        options: {
+          enableConnectedAccout: true,
+          enableNormalize: true,
+          blockletSk: blockletWallet.secretKey,
+        },
       });
       if (bindUser && !bindUser.approved) {
         throw new Error(messages.notAllowed[locale]);

package/api/routes/oauth.js

@@ -18,7 +18,7 @@ const { getAvatarByEmail, transferPassport } = require('../libs/auth/utils');
 const initJwt = require('../libs/jwt');
 const { sendToUser } = require('../libs/notification');
 const { generateTranslate } = require('../libs/translate');
-const { getRawUser, mergeUserData, declareAccount, migrateAccount, normalizeUser } = require('../services/oauth');
+const { mergeUserData, declareAccount, migrateAccount } = require('../services/oauth');
 const { isInvitedUserOnly } = require('../util');
 
 const PREFIX = WELLKNOWN_SERVICE_PATH_PREFIX;
@@ -28,11 +28,18 @@ const prefix = `${PREFIX}/oauth`;
 const translations = {
   zh: {
     needInviteToLogin: '你需要被邀请才可以登录此应用',
+    alreadyMainAccount: '已给该账户分配一个主账户',
+    oauthCantBeOwner: '第三方登录的账户不能成为应用的拥有者',
+    oauthCantBindOauth: '第三方登录的账户无法绑定另一个第三方登录的账户',
   },
   en: {
     needInviteToLogin: 'You need to be invited to sign in to this app',
+    alreadyMainAccount: 'Current account is already a main account',
+    oauthCantBeOwner: "Can't login oauth account as owner",
+    oauthCantBindOauth: "Current account can't bind a third party account",
   },
 };
+
 const t = generateTranslate({ translations });
 
 function getAuthClient(blocklet, provider) {
@@ -49,13 +56,13 @@ function getAuthClient(blocklet, provider) {
 
 async function login(req, node, options) {
   const blocklet = await req.getBlocklet();
+  const { token, locale = 'en', provider, componentId } = req.body;
+
   if (!blocklet.settings?.owner) {
-    throw new Error('Cant login oauth account as owner');
+    throw new Error(t('oauthCantBeOwner', locale));
   }
-  const { token, locale = 'en', provider, componentId } = req.body;
   const authClient = getAuthClient(blocklet, provider);
 
-  const currentTime = new Date().toISOString();
   const { did: teamDid, wallet: blockletWallet } = await req.getBlockletInfo();
   const config = await req.getServiceConfig(NODE_SERVICES.AUTH, { componentId });
   const nodeInfo = await req.getNodeInfo();
@@ -67,10 +74,16 @@ async function login(req, node, options) {
   const userPk = userWallet.publicKey;
   const lastLoginIp = get(req, 'headers[x-real-ip]') || '';
   let passport = { name: 'Guest', role: 'guest' };
-  let currentUser = await getRawUser(teamDid, userDid, { getUser: node.getUser, getUsers: node.getUsers });
-  currentUser = await normalizeUser(teamDid, currentUser, {
-    updateUser: node.updateUser,
-    getBlockletInfo: req.getBlockletInfo,
+  let currentUser = await node.getUser({
+    teamDid,
+    user: {
+      did: userDid,
+    },
+    options: {
+      enableConnectedAccout: true,
+      enableNormalize: true,
+      blockletSk: blockletWallet.secretKey,
+    },
   });
   // 当前账户已存在，更新账户信息
   if (currentUser) {
@@ -80,14 +93,14 @@ async function login(req, node, options) {
     if (lastUsedPassport) {
       passport = pick(lastUsedPassport, ['id', 'name', 'role']);
     }
-    await node.updateUser({
+    await node.loginUser({
       teamDid,
-      user: mergeUserData(currentUser, {
+      user: {
         locale,
         lastLoginIp,
-        lastUsedPassport,
+        passport: lastUsedPassport,
         connectedAccount: { provider, did: userDid },
-      }),
+      },
     });
   } else {
     currentUser = {
@@ -100,21 +113,14 @@ async function login(req, node, options) {
     if (invitedUserOnly) {
       throw new Error(t('needInviteToLogin', locale));
     }
-    await node.addUser({
+    await node.loginUser({
       teamDid,
       user: {
-        extraConfigs: {
-          sourceProvider: provider,
-          connectedAccounts: [
-            {
-              provider,
-              id: oauthInfo.sub,
-              did: userDid,
-              pk: userPk,
-              lastLoginAt: currentTime,
-              firstLoginAt: currentTime,
-            },
-          ],
+        connectedAccount: {
+          provider,
+          id: oauthInfo.sub,
+          did: userDid,
+          pk: userPk,
         },
         did: userDid,
         pk: userPk,
@@ -122,11 +128,6 @@ async function login(req, node, options) {
         email: oauthInfo.email,
         avatar,
         locale,
-        type: 'profile',
-        approved: true,
-        passports: [],
-        firstLoginAt: currentTime,
-        lastLoginAt: currentTime,
         lastLoginIp,
       },
     });
@@ -155,13 +156,16 @@ async function invite(req, node, options) {
   let userPk = userWallet.publicKey;
 
   let profile;
-  let currentUser = await getRawUser(teamDid, userDid, {
-    getUser: node.getUser,
-    getUsers: node.getUsers,
-  });
-  currentUser = await normalizeUser(teamDid, currentUser, {
-    updateUser: node.updateUser,
-    getBlockletInfo: req.getBlockletInfo,
+  const currentUser = await node.getUser({
+    teamDid,
+    user: {
+      did: userDid,
+    },
+    options: {
+      enableConnectedAccout: true,
+      enableNormalize: true,
+      blockletSk: blockletWallet.secretKey,
+    },
   });
   const { dataDir, name: applicationName } = await getApplicationInfo({ node, nodeInfo, teamDid });
   if (currentUser) {
@@ -199,6 +203,7 @@ async function invite(req, node, options) {
     userDid,
     userPk,
     locale,
+    provider,
   });
 
   if (currentUser) {
@@ -225,28 +230,18 @@ async function invite(req, node, options) {
       );
     }
   } else {
-    await node.updateUser({
+    await node.loginUser({
       teamDid,
-      user: mergeUserData(
-        {
-          did: userDid,
-          pk: userPk,
-          extraConfigs: {
-            sourceProvider: provider,
-          },
-        },
-        {
+      user: {
+        did: userDid,
+        pk: userPk,
+        connectedAccount: {
           provider,
-          connectedAccount: {
-            provider,
-            id: oauthInfo.sub,
-            did: userWallet.address,
-            pk: userWallet.publicKey,
-            firstLoginAt: new Date().toISOString(),
-            lastLoginAt: new Date().toISOString(),
-          },
-        }
-      ),
+          id: oauthInfo.sub,
+          did: userWallet.address,
+          pk: userWallet.publicKey,
+        },
+      },
     });
     await declareAccount({ wallet: userWallet, moniker: oauthInfo.nickname, blocklet });
   }
@@ -269,17 +264,14 @@ async function bind(req, node, options) {
   const userWallet = fromAppDid(userInfo.sub, blockletWallet.secretKey, types.RoleType.ROLE_ACCOUNT);
   let oauthUser = await node.getUser({ teamDid, user: { did: userWallet.address } });
   if (oauthUser) {
-    if (oauthUser.extraConfigs?.bindDid) {
-      throw new Error('OAuth account is already bind to another wallet account');
-    }
-    throw new Error('OAuth account is already a main account');
+    throw new Error(t('alreadyMainAccount', locale));
   }
 
-  // NOTICE: 这里获得的 userDid 已经是登录返回的 rawUserDid 了，无需再 getRawUser
+  // NOTICE: 这里获得的 userDid 已经是登录返回的 userDid 了，无需再去查询 connectedAccount
   const bindUser = await node.getUser({ teamDid, user: { did: userDid } });
 
   if (bindUser.extraConfigs?.sourceProvider !== 'wallet') {
-    throw new Error("OAuth account can't bind to a oauth account");
+    throw new Error('oauthCantBindOauth', locale);
   }
 
   const mergePassport = (oauthUser?.passports || []).reduce((sum, cur) => {

package/api/services/auth/connect/bind-wallet.js

@@ -2,11 +2,17 @@ const logger = require('@abtnode/logger')(require('../../../../package.json').na
 
 const { bindWallet } = require('../../../libs/connect/session');
 
-const { onConnect, onApprove } = bindWallet;
+const { onConnect, onApprove, authPrincipal } = bindWallet;
 
 module.exports = function createRoutes(node, authenticator, createSessionToken) {
   return {
     action: 'bind-wallet',
+    authPrincipal: false,
+    claims: {
+      authPrincipal: async ({ extraParams: { locale, previousUserDid } }) => {
+        return authPrincipal({ locale, previousUserDid });
+      },
+    },
     onConnect: async ({ req, userDid, extraParams: { locale, passportId = '', componentId, previousUserDid } }) => {
       return onConnect({
         node,

package/api/services/auth/connect/receive-transfer-app-owner.js

@@ -243,8 +243,6 @@ module.exports = function createRoutes(node, _, createSessionToken) {
         dataDir,
       });
 
-      const now = new Date().toISOString();
-
       if (user) {
         const doc = await node.updateUser({
           teamDid: appPid,
@@ -270,30 +268,20 @@ module.exports = function createRoutes(node, _, createSessionToken) {
           node
         );
       } else {
-        const doc = await node.addUser({
+        const doc = await node.loginUser({
           teamDid: appPid,
           user: {
             ...profile,
             avatar,
             did: userDid,
             pk: userPk,
-            approved: true,
             locale,
-            passports: [passport],
-            firstLoginAt: now,
-            lastLoginAt: now,
+            passport,
             lastLoginIp: get(req, 'headers[x-real-ip]') || '',
-            extraConfigs: {
-              sourceProvider: 'wallet',
-              connectedAccounts: [
-                {
-                  provider: 'wallet',
-                  did: userDid,
-                  pk: userPk,
-                  lastLoginAt: now,
-                  firstLoginAt: now,
-                },
-              ],
+            connectedAccount: {
+              provider: 'wallet',
+              did: userDid,
+              pk: userPk,
             },
           },
         });

package/api/services/auth/connect/setup.js

@@ -75,7 +75,7 @@ module.exports = function createRoutes(node, _authenticator, createSessionToken)
           // Create user
           const profile = claims.find((x) => x.type === 'profile');
 
-          const doc = await node.addUser({
+          const doc = await node.loginUser({
             teamDid,
             user: {
               ...profile,
@@ -84,15 +84,16 @@ module.exports = function createRoutes(node, _authenticator, createSessionToken)
               }),
               did: userDid,
               pk: userPk,
-              approved: true,
               locale,
-              passports: [],
-              firstLoginAt: new Date().toISOString(),
-              lastLoginAt: new Date().toISOString(),
               lastLoginIp: get(req, 'headers[x-real-ip]') || '',
               extra: {
                 baseUrl,
               },
+              connectedAccount: {
+                provider: 'wallet',
+                did: userDid,
+                pk: userPk,
+              },
             },
           });
           await node.createAuditLog(

package/api/services/dashboard/index.js

@@ -12,6 +12,7 @@ const logger = require('@abtnode/logger')(`${require('../../../package.json').na
 function createWebsocketServer(node, ensureWsUser) {
   const wsServer = new WsServer({
     broadcastEventName: '@abtnode/blocklet-services:dashboard',
+    heartbeatTimeout: 60 * 1000 * 5,
 
     logger,