@abtnode/blocklet-services 1.16.14-beta-359fefce → 1.16.14-beta-811ed435

package/api/libs/connect/session.js

@@ -332,7 +332,13 @@ module.exports = {
 
       const now = new Date().toISOString();
       const connectedNft = nftState
-        ? { provider: 'nft', did: nftState.address, owner: nftState.owner, firstLoginAt: now, lastLoginAt: now }
+        ? {
+            provider: LOGIN_PROVIDER.NFT,
+            did: nftState.address,
+            owner: nftState.owner,
+            firstLoginAt: now,
+            lastLoginAt: now,
+          }
         : null;
 
       let fullName = user?.fullName;
@@ -340,13 +346,13 @@ module.exports = {
       const passportForLog = passport || { name: 'Guest', role: 'guest' };
 
       const masterSite = getFederatedMaster(blocklet);
-      let connectAccount = { provider, did: realDid, pk: realPk };
+      let connectAccount = { provider, did: userDid, pk: userPk };
 
       let updatedUser;
       if (user) {
         // Update user
         if (masterSite && provider === LOGIN_PROVIDER.FEDERATED) {
-          connectAccount = { provider, did: realDid, pk: realPk, id: masterSite.appPid };
+          connectAccount = { provider, did: userDid, pk: userPk, id: masterSite.appPid };
         }
         updatedUser = await node.loginUser({
           teamDid,
@@ -374,7 +380,7 @@ module.exports = {
         fullName = profile.fullName;
 
         if (masterSite && provider === LOGIN_PROVIDER.FEDERATED) {
-          connectAccount = { provider, did: realDid, pk: realPk, id: masterSite.appPid };
+          connectAccount = { provider, did: userDid, pk: userPk, id: masterSite.appPid };
         }
 
         updatedUser = await node.loginUser({

package/api/routes/federated.js

@@ -447,6 +447,8 @@ module.exports = {
           passport: targetPassport,
           role: targetPassport?.role || 'guest',
           fullName: newUser.fullName,
+          // 这里是 member 登录了 master 的账号，对于 master 来说，其实还是使用 wallet 来登录的
+          provider: LOGIN_PROVIDER.WALLET,
         },
         {
           ...sessionConfig,

package/api/routes/oauth.js

@@ -13,6 +13,7 @@ const sortBy = require('lodash/sortBy');
 const joinUrl = require('url-join');
 const { getWalletDid } = require('@blocklet/meta/lib/did-utils');
 const formatContext = require('@abtnode/util/lib/format-context');
+const { LOGIN_PROVIDER } = require('@blocklet/constant');
 const logger = require('@abtnode/logger')('blocklet-services:oauth');
 
 const { AuthenticationClient } = require('../libs/auth/adapters/auth0');
@@ -162,6 +163,7 @@ async function login(req, node, options) {
       passport,
       role: passport.role,
       fullName,
+      provider,
     },
     { ...sessionConfig, didConnectVersion: getDidConnectVersion(req) }
   );
@@ -175,7 +177,7 @@ async function login(req, node, options) {
 }
 
 async function invite(req, node, options) {
-  const { locale, inviteId, token, baseUrl, provider = 'auth0' } = req.body;
+  const { locale, inviteId, token, baseUrl, provider = LOGIN_PROVIDER.AUTH0 } = req.body;
   const blocklet = await req.getBlocklet();
   const authClient = getAuthClient(blocklet, provider);
 
@@ -279,7 +281,7 @@ async function invite(req, node, options) {
 
   const { sessionToken, refreshToken } = createToken(
     userDid,
-    { secret, passport, role, fullName: profile.fullName },
+    { secret, passport, role, fullName: profile.fullName, provider },
     { ...sessionConfig, didConnectVersion: getDidConnectVersion(req) }
   );
 
@@ -314,7 +316,7 @@ async function bind(req, node, options) {
 
   // NOTICE: 这里获得的 did 是当前登录用户的永久 did，无需再去查询 connectedAccount
   const bindUser = await node.getUser({ teamDid, user: { did: userDid } });
-  if (bindUser.sourceProvider !== 'wallet') {
+  if (bindUser.sourceProvider !== LOGIN_PROVIDER.WALLET) {
     throw new ApiError(400, t('oauthCantBindOauth', locale));
   }
 
@@ -446,7 +448,7 @@ module.exports = {
     });
 
     server.post(`${prefix}/switch`, async (req, res) => {
-      const userDid = req.user.did;
+      const { did: userDid, provider } = req.user;
       const { passportId } = req.body;
       const blocklet = await req.getBlocklet();
       const { did: teamDid, secret } = await req.getBlockletInfo();
@@ -468,7 +470,7 @@ module.exports = {
       const sessionConfig = blocklet.settings?.session || {};
       const { sessionToken, refreshToken } = createToken(
         userDid,
-        { secret, passport, role: passport.role, fullName: user?.fullName },
+        { secret, passport, role: passport.role, fullName: user?.fullName, provider },
         { ...sessionConfig, didConnectVersion: getDidConnectVersion(req) }
       );
 

package/api/routes/user.js

@@ -5,6 +5,7 @@ const { extractUserAvatar } = require('@abtnode/util/lib/user');
 const formatContext = require('@abtnode/util/lib/format-context');
 const logger = require('@abtnode/logger')('blocklet-services:user');
 const { isFromPublicKey } = require('@arcblock/did');
+const { LOGIN_PROVIDER } = require('@blocklet/constant');
 
 const { generateTranslate } = require('../libs/translate');
 const { isInvitedUserOnly, createTokenFn, getDidConnectVersion } = require('../util');
@@ -89,7 +90,7 @@ async function composeProfileData({ avatar, fullName, email }, { node, req, team
 }
 
 async function loginWallet({ did, pk, avatar, email, fullName }, { node, req, locale, componentId, teamDid }) {
-  const provider = 'wallet';
+  const provider = LOGIN_PROVIDER.WALLET;
   const { error } = loginWalletSchema.validate({
     provider,
     did,
@@ -200,7 +201,7 @@ async function loginOAuth(
 }
 
 async function login(req, node, options) {
-  const { provider = 'wallet', did, pk, avatar, email, fullName, id, locale = 'en' } = req.body;
+  const { provider = LOGIN_PROVIDER.WALLET, did, pk, avatar, email, fullName, id, locale = 'en' } = req.body;
 
   const componentId = req.get('x-blocklet-component-id');
   if (!componentId) {
@@ -210,7 +211,7 @@ async function login(req, node, options) {
   const blocklet = await req.getBlocklet();
 
   let doc;
-  if (provider === 'wallet') {
+  if (provider === LOGIN_PROVIDER.WALLET) {
     doc = await loginWallet({ did, pk, avatar, email, fullName }, { node, req, locale, componentId, teamDid });
   } else {
     doc = await loginOAuth(
@@ -243,6 +244,7 @@ async function login(req, node, options) {
       passport,
       role: passport.role,
       fullName: doc.fullName,
+      provider,
     },
     { ...sessionConfig, didConnectVersion: getDidConnectVersion(req) }
   );

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

@@ -8,6 +8,7 @@ const {
   beforeInvitationRequest,
 } = require('@abtnode/auth/lib/auth');
 const { NODE_SERVICES, WELLKNOWN_SERVICE_PATH_PREFIX } = require('@abtnode/constant');
+const { LOGIN_PROVIDER } = require('@blocklet/constant');
 const logger = require('@abtnode/logger')(require('../../../../package.json').name);
 
 const { createTokenFn, getDidConnectVersion } = require('../../../util');
@@ -81,7 +82,7 @@ module.exports = function createRoutes(node, authenticator, createSessionToken)
       const sessionConfig = blocklet.settings?.session || {};
       const { sessionToken, refreshToken } = createToken(
         userDid,
-        { secret, passport, role, fullName: profile.fullName },
+        { secret, passport, role, fullName: profile.fullName, provider: LOGIN_PROVIDER.WALLET },
         { ...sessionConfig, didConnectVersion: getDidConnectVersion(req) }
       );
       await updateSession({ sessionToken, refreshToken }, true);

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

@@ -17,6 +17,7 @@ const {
 const getBlockletWallet = require('@blocklet/meta/lib/wallet');
 const { getBlockletChainInfo, isInProgress } = require('@blocklet/meta/lib/util');
 const { ROLES } = require('@abtnode/constant');
+const { LOGIN_PROVIDER } = require('@blocklet/constant');
 const logger = require('@abtnode/logger')('blocklet-service:transfer-blocklet-owner');
 
 const { createTokenFn, getDidConnectVersion } = require('../../../util');
@@ -251,7 +252,7 @@ module.exports = function createRoutes(node, _, createSessionToken) {
             locale,
             lastLoginIp: get(req, 'headers[x-real-ip]') || '',
             passports: [passport],
-            connectedAccounts: [{ provider: 'wallet', did: userDid, pk: userPk }],
+            connectedAccounts: [{ provider: LOGIN_PROVIDER.WALLET, did: userDid, pk: userPk }],
             ...profile,
             avatar,
           },
@@ -277,7 +278,7 @@ module.exports = function createRoutes(node, _, createSessionToken) {
             passport,
             lastLoginIp: get(req, 'headers[x-real-ip]') || '',
             connectedAccount: {
-              provider: 'wallet',
+              provider: LOGIN_PROVIDER.WALLET,
               did: userDid,
               pk: userPk,
             },
@@ -368,7 +369,7 @@ module.exports = function createRoutes(node, _, createSessionToken) {
       const sessionConfig = blocklet.settings?.session || {};
       const { sessionToken, refreshToken } = createToken(
         userDid,
-        { secret, passport: vc, role, fullName: profile.fullName },
+        { secret, passport: vc, role, fullName: profile.fullName, provider: LOGIN_PROVIDER.WALLET },
         { ...sessionConfig, didConnectVersion: getDidConnectVersion(req) }
       );
       await updateSession({ sessionToken, refreshToken }, true);

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

@@ -4,6 +4,7 @@ const { messages } = require('@abtnode/auth/lib/auth');
 const { extractUserAvatar } = require('@abtnode/util/lib/user');
 const formatContext = require('@abtnode/util/lib/format-context');
 const verifySignature = require('@abtnode/auth/lib/util/verify-signature');
+const { LOGIN_PROVIDER } = require('@blocklet/constant');
 
 const logger = require('@abtnode/logger')(require('../../../../package.json').name);
 
@@ -92,7 +93,7 @@ module.exports = function createRoutes(node, _authenticator, createSessionToken)
                 baseUrl,
               },
               connectedAccount: {
-                provider: 'wallet',
+                provider: LOGIN_PROVIDER.WALLET,
                 did: userDid,
                 pk: userPk,
               },

package/api/util/federated.js

@@ -1,5 +1,6 @@
 const joinUrl = require('url-join');
 const { USER_AVATAR_URL_PREFIX, WELLKNOWN_SERVICE_PATH_PREFIX, USER_AVATAR_PATH_PREFIX } = require('@abtnode/constant');
+const { LOGIN_PROVIDER } = require('@blocklet/constant');
 
 function getFederatedMaster(blocklet) {
   const { sites } = blocklet?.settings?.federated || {};
@@ -23,7 +24,7 @@ function getUserAvatarUrl(avatar, blocklet) {
 }
 
 function getProvider(request, extraParams = {}) {
-  let provider = 'wallet';
+  let provider = LOGIN_PROVIDER.WALLET;
   // 1. 优先读取当前登录用户的 provider
   ({ provider } = request.user || {});
   if (!provider) {

package/api/validators/login.js

@@ -1,7 +1,8 @@
 const { Joi } = require('@arcblock/validator');
+const { LOGIN_PROVIDER } = require('@blocklet/constant');
 
 const loginWalletSchema = Joi.object({
-  provider: 'wallet',
+  provider: LOGIN_PROVIDER.WALLET,
   did: Joi.DID().trim().required(),
   pk: Joi.string().required(),
   email: Joi.string().optional(),
@@ -10,7 +11,7 @@ const loginWalletSchema = Joi.object({
 }).empty(null);
 
 const loginOAuthSchema = Joi.object({
-  provider: Joi.string().allow('auth0'),
+  provider: Joi.string().allow(LOGIN_PROVIDER.AUTH0),
   id: Joi.string().required(),
   email: Joi.string().required(),
   avatar: Joi.string().optional(),

package/build/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "/.well-known/service/static/static/css/main.7ea79dc8.css",
-    "main.js": "/.well-known/service/static/static/js/main.a71506d8.js",
+    "main.js": "/.well-known/service/static/static/js/main.4cd8cbc4.js",
     "static/js/4716.a1240199.chunk.js": "/.well-known/service/static/static/js/4716.a1240199.chunk.js",
     "static/js/4359.5ed52fe3.chunk.js": "/.well-known/service/static/static/js/4359.5ed52fe3.chunk.js",
     "static/js/1255.0e8a8a45.chunk.js": "/.well-known/service/static/static/js/1255.0e8a8a45.chunk.js",
@@ -22,7 +22,7 @@
     "static/js/5176.68fd3fde.chunk.js": "/.well-known/service/static/static/js/5176.68fd3fde.chunk.js",
     "static/js/2139.341406d2.chunk.js": "/.well-known/service/static/static/js/2139.341406d2.chunk.js",
     "static/js/5052.91c69c75.chunk.js": "/.well-known/service/static/static/js/5052.91c69c75.chunk.js",
-    "static/js/8395.5bd41151.chunk.js": "/.well-known/service/static/static/js/8395.5bd41151.chunk.js",
+    "static/js/8395.b1ffb35e.chunk.js": "/.well-known/service/static/static/js/8395.b1ffb35e.chunk.js",
     "static/js/5233.faabaae9.chunk.js": "/.well-known/service/static/static/js/5233.faabaae9.chunk.js",
     "static/css/4603.dce369d5.chunk.css": "/.well-known/service/static/static/css/4603.dce369d5.chunk.css",
     "static/js/4603.7a55b2c4.chunk.js": "/.well-known/service/static/static/js/4603.7a55b2c4.chunk.js",
@@ -84,7 +84,7 @@
     "router-template-styles/styles.css": "/.well-known/service/static/router-template-styles/styles.css",
     "index.html": "/.well-known/service/static/index.html",
     "main.7ea79dc8.css.map": "/.well-known/service/static/static/css/main.7ea79dc8.css.map",
-    "main.a71506d8.js.map": "/.well-known/service/static/static/js/main.a71506d8.js.map",
+    "main.4cd8cbc4.js.map": "/.well-known/service/static/static/js/main.4cd8cbc4.js.map",
     "4716.a1240199.chunk.js.map": "/.well-known/service/static/static/js/4716.a1240199.chunk.js.map",
     "4359.5ed52fe3.chunk.js.map": "/.well-known/service/static/static/js/4359.5ed52fe3.chunk.js.map",
     "1255.0e8a8a45.chunk.js.map": "/.well-known/service/static/static/js/1255.0e8a8a45.chunk.js.map",
@@ -105,7 +105,7 @@
     "5176.68fd3fde.chunk.js.map": "/.well-known/service/static/static/js/5176.68fd3fde.chunk.js.map",
     "2139.341406d2.chunk.js.map": "/.well-known/service/static/static/js/2139.341406d2.chunk.js.map",
     "5052.91c69c75.chunk.js.map": "/.well-known/service/static/static/js/5052.91c69c75.chunk.js.map",
-    "8395.5bd41151.chunk.js.map": "/.well-known/service/static/static/js/8395.5bd41151.chunk.js.map",
+    "8395.b1ffb35e.chunk.js.map": "/.well-known/service/static/static/js/8395.b1ffb35e.chunk.js.map",
     "5233.faabaae9.chunk.js.map": "/.well-known/service/static/static/js/5233.faabaae9.chunk.js.map",
     "4603.dce369d5.chunk.css.map": "/.well-known/service/static/static/css/4603.dce369d5.chunk.css.map",
     "4603.7a55b2c4.chunk.js.map": "/.well-known/service/static/static/js/4603.7a55b2c4.chunk.js.map",
@@ -147,6 +147,6 @@
   },
   "entrypoints": [
     "static/css/main.7ea79dc8.css",
-    "static/js/main.a71506d8.js"
+    "static/js/main.4cd8cbc4.js"
   ]
 }

package/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"/><meta name="theme-color" content="#000000"/><title>Blocklet Service</title><link rel="manifest" href="/.well-known/service/manifest.json"/><script src="/.well-known/service/api/env"></script><script src="/__blocklet__.js"></script><script defer="defer" src="/.well-known/service/static/static/js/main.a71506d8.js"></script><link href="/.well-known/service/static/static/css/main.7ea79dc8.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"/><meta name="theme-color" content="#000000"/><title>Blocklet Service</title><link rel="manifest" href="/.well-known/service/manifest.json"/><script src="/.well-known/service/api/env"></script><script src="/__blocklet__.js"></script><script defer="defer" src="/.well-known/service/static/static/js/main.4cd8cbc4.js"></script><link href="/.well-known/service/static/static/css/main.7ea79dc8.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>