@abtnode/blocklet-services 1.16.19-beta-340de95d → 1.16.19-beta-7b2db880

package/api/routes/user-session.js

@@ -7,6 +7,7 @@ const defaults = require('lodash/defaults');
 const cloneDeep = require('lodash/cloneDeep');
 const pLimit = require('p-limit');
 const logger = require('@abtnode/logger')('blocklet-services:user-session');
+const { getSourceProvider } = require('@blocklet/meta/lib/did-utils');
 
 const ensureBlocklet = require('../middlewares/ensure-blocklet');
 const { getUserAvatarUrl } = require('../util/federated');
@@ -103,6 +104,9 @@ module.exports = {
           },
           sites: [],
         });
+        const sourceProvider = getSourceProvider(user);
+
+        const provider = sourceProvider || LOGIN_PROVIDER.WALLET;
 
         const memberSite = federated.sites.find((item) => item.appPid === appPid);
         const postUser = pick(user, ['did', 'pk', 'fullName', 'locale']);
@@ -121,7 +125,7 @@ module.exports = {
             user: postUser,
             passport: passportId ? { id: passportId } : undefined,
             walletOS: 'web',
-            provider: LOGIN_PROVIDER.WALLET,
+            provider,
           },
           site: memberSite,
         });

package/api/routes/user.js

@@ -175,6 +175,7 @@ async function loginOAuth(
     throw new ApiError(400, error.message);
   }
 
+  // FIXME: @zhanghan 如果有 sourceAppPid，则这里拿到的 userWallet 是不对的？
   const userWallet = fromAppDid(id, blockletWallet.secretKey);
   const userDid = userWallet.address;
   const userPk = userWallet.publicKey;

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

@@ -13,6 +13,7 @@ const { LOGIN_PROVIDER } = require('@blocklet/constant');
 const logger = require('@abtnode/logger')(require('../../../../package.json').name);
 
 const { createTokenFn, getDidConnectVersion } = require('../../../util');
+const { getUserWithinFederated } = require('../../../util/federated');
 
 module.exports = function createRoutes(node, authenticator, createSessionToken) {
   return {
@@ -65,7 +66,9 @@ module.exports = function createRoutes(node, authenticator, createSessionToken)
       const statusEndpointBaseUrl = joinUrl(baseUrl, WELLKNOWN_SERVICE_PATH_PREFIX);
       const endpoint = baseUrl;
 
-      const { passport, response, role, profile } = await handleInvitationResponse({
+      await getUserWithinFederated({ sourceAppPid, teamDid, userDid, userPk }, { node, blocklet });
+
+      const { passport, response, role, profile, user } = await handleInvitationResponse({
         req,
         node,
         nodeInfo,
@@ -85,7 +88,7 @@ module.exports = function createRoutes(node, authenticator, createSessionToken)
       const createToken = createTokenFn(createSessionToken);
       const sessionConfig = blocklet.settings?.session || {};
       const { sessionToken, refreshToken } = createToken(
-        userDid,
+        user.did,
         {
           secret,
           passport,
@@ -102,7 +105,7 @@ module.exports = function createRoutes(node, authenticator, createSessionToken)
       const userSessionDoc = await node.upsertUserSession({
         teamDid,
         visitorId,
-        userDid,
+        userDid: user.did,
         appPid: teamDid,
         passportId: response.data.id,
         status: 'online',
@@ -111,7 +114,7 @@ module.exports = function createRoutes(node, authenticator, createSessionToken)
       });
       node.syncUserSession({
         teamDid,
-        userDid,
+        userDid: user.did,
         visitorId: userSessionDoc.visitorId,
         passportId: passport?.id,
         targetAppPid: sourceAppPid,
@@ -127,7 +130,7 @@ module.exports = function createRoutes(node, authenticator, createSessionToken)
         true
       );
       await updateSession({ passportId: response.data.id });
-      logger.info('invite.success', { userDid });
+      logger.info('invite.success', { userDid: user.did });
 
       return response;
     },

package/api/util/federated.js

@@ -115,6 +115,50 @@ function shouldSyncFederated(sourceAppPid, blocklet) {
   return false;
 }
 
+async function getUserWithinFederated({ userDid, userPk, teamDid, sourceAppPid }, { node, blocklet }) {
+  let currentUser = await node.getUser({
+    teamDid,
+    user: {
+      did: userDid,
+    },
+    options: {
+      enableConnectedAccount: true,
+    },
+  });
+  if (!currentUser && shouldSyncFederated(sourceAppPid, blocklet)) {
+    const masterSite = getFederatedMaster(blocklet);
+    const syncResults = await node.syncFederated({
+      did: teamDid,
+      data: {
+        users: [
+          {
+            did: userDid,
+            pk: userPk,
+            action: 'pullAccount',
+          },
+        ],
+      },
+      syncSites: [masterSite],
+    });
+    const resultItem = syncResults.find((x) => x.site.appPid === masterSite.appPid);
+    if (resultItem) {
+      const { result } = resultItem;
+      const [pullUser] = result?.users || [];
+      if (pullUser) {
+        pullUser.sourceAppPid = masterSite.appPid;
+        pullUser.connectedAccount = pullUser.connectedAccounts;
+        delete pullUser.connectedAccounts;
+        currentUser = await node.loginUser({
+          teamDid,
+          user: pullUser,
+        });
+      }
+    }
+  }
+
+  return currentUser;
+}
+
 module.exports = {
   isMaster,
   shouldSyncFederated,
@@ -124,4 +168,5 @@ module.exports = {
   migrateAuth0,
   getOAuthUserInfo,
   loginByMember,
+  getUserWithinFederated,
 };

package/api/validators/login.js

@@ -25,7 +25,7 @@ const loginUserWalletSchema = Joi.object({
   nonce: Joi.string().required(),
   visitorId: Joi.string().optional(),
   passportId: Joi.string().optional(),
-  sourceAppPid: Joi.DID().trim().optional(),
+  sourceAppPid: Joi.DID().trim().empty(null),
   locale: Joi.string().optional(),
 }).empty(null);
 

package/build/asset-manifest.json

@@ -1,19 +1,19 @@
 {
   "files": {
     "main.css": "/.well-known/service/static/static/css/main.7ea79dc8.css",
-    "main.js": "/.well-known/service/static/static/js/main.581a3a26.js",
+    "main.js": "/.well-known/service/static/static/js/main.09227d84.js",
     "static/js/9314.f0add972.chunk.js": "/.well-known/service/static/static/js/9314.f0add972.chunk.js",
     "static/js/6218.4f3036a7.chunk.js": "/.well-known/service/static/static/js/6218.4f3036a7.chunk.js",
-    "static/js/4076.f5369a1d.chunk.js": "/.well-known/service/static/static/js/4076.f5369a1d.chunk.js",
+    "static/js/4076.8055ce74.chunk.js": "/.well-known/service/static/static/js/4076.8055ce74.chunk.js",
     "static/js/6658.98f9956d.chunk.js": "/.well-known/service/static/static/js/6658.98f9956d.chunk.js",
     "static/js/3025.7c99c058.chunk.js": "/.well-known/service/static/static/js/3025.7c99c058.chunk.js",
     "static/js/7858.52930f63.chunk.js": "/.well-known/service/static/static/js/7858.52930f63.chunk.js",
     "static/js/4587.9a042d46.chunk.js": "/.well-known/service/static/static/js/4587.9a042d46.chunk.js",
     "static/js/779.73350f02.chunk.js": "/.well-known/service/static/static/js/779.73350f02.chunk.js",
-    "static/js/8622.ebd44812.chunk.js": "/.well-known/service/static/static/js/8622.ebd44812.chunk.js",
+    "static/js/8622.6aa0a4d4.chunk.js": "/.well-known/service/static/static/js/8622.6aa0a4d4.chunk.js",
     "static/js/1148.5ccba08e.chunk.js": "/.well-known/service/static/static/js/1148.5ccba08e.chunk.js",
-    "static/js/8944.939de854.chunk.js": "/.well-known/service/static/static/js/8944.939de854.chunk.js",
-    "static/js/5468.b54ce65b.chunk.js": "/.well-known/service/static/static/js/5468.b54ce65b.chunk.js",
+    "static/js/8944.5b8c231c.chunk.js": "/.well-known/service/static/static/js/8944.5b8c231c.chunk.js",
+    "static/js/5468.21a861b9.chunk.js": "/.well-known/service/static/static/js/5468.21a861b9.chunk.js",
     "static/js/9982.4f1ebb7f.chunk.js": "/.well-known/service/static/static/js/9982.4f1ebb7f.chunk.js",
     "static/js/1359.add26d23.chunk.js": "/.well-known/service/static/static/js/1359.add26d23.chunk.js",
     "static/js/6637.b2e35031.chunk.js": "/.well-known/service/static/static/js/6637.b2e35031.chunk.js",
@@ -21,7 +21,7 @@
     "static/js/4882.0435e418.chunk.js": "/.well-known/service/static/static/js/4882.0435e418.chunk.js",
     "static/js/5434.523d071d.chunk.js": "/.well-known/service/static/static/js/5434.523d071d.chunk.js",
     "static/css/5547.e016de4c.chunk.css": "/.well-known/service/static/static/css/5547.e016de4c.chunk.css",
-    "static/js/5547.570ded36.chunk.js": "/.well-known/service/static/static/js/5547.570ded36.chunk.js",
+    "static/js/5547.42b98889.chunk.js": "/.well-known/service/static/static/js/5547.42b98889.chunk.js",
     "static/js/3033.9fe46d7f.chunk.js": "/.well-known/service/static/static/js/3033.9fe46d7f.chunk.js",
     "static/js/3842.e1bb702b.chunk.js": "/.well-known/service/static/static/js/3842.e1bb702b.chunk.js",
     "static/js/3131.99541aca.chunk.js": "/.well-known/service/static/static/js/3131.99541aca.chunk.js",
@@ -43,7 +43,7 @@
     "static/js/3076.28658ffc.chunk.js": "/.well-known/service/static/static/js/3076.28658ffc.chunk.js",
     "static/js/5569.e4bfe697.chunk.js": "/.well-known/service/static/static/js/5569.e4bfe697.chunk.js",
     "static/js/2801.33d2f238.chunk.js": "/.well-known/service/static/static/js/2801.33d2f238.chunk.js",
-    "static/js/4461.3cd698bf.chunk.js": "/.well-known/service/static/static/js/4461.3cd698bf.chunk.js",
+    "static/js/4461.f9a883d3.chunk.js": "/.well-known/service/static/static/js/4461.f9a883d3.chunk.js",
     "static/js/5509.a196d497.chunk.js": "/.well-known/service/static/static/js/5509.a196d497.chunk.js",
     "static/js/5683.051a03c1.chunk.js": "/.well-known/service/static/static/js/5683.051a03c1.chunk.js",
     "static/js/7006.bb90b167.chunk.js": "/.well-known/service/static/static/js/7006.bb90b167.chunk.js",
@@ -92,7 +92,7 @@
     "static/js/9107.7f32925d.chunk.js": "/.well-known/service/static/static/js/9107.7f32925d.chunk.js",
     "static/css/3154.e954fcda.chunk.css": "/.well-known/service/static/static/css/3154.e954fcda.chunk.css",
     "static/js/8016.3ef64a2c.chunk.js": "/.well-known/service/static/static/js/8016.3ef64a2c.chunk.js",
-    "static/js/8181.6c2a7dcb.chunk.js": "/.well-known/service/static/static/js/8181.6c2a7dcb.chunk.js",
+    "static/js/8181.bc510ea3.chunk.js": "/.well-known/service/static/static/js/8181.bc510ea3.chunk.js",
     "static/js/9657.b03b88e5.chunk.js": "/.well-known/service/static/static/js/9657.b03b88e5.chunk.js",
     "static/js/468.bbc69bbf.chunk.js": "/.well-known/service/static/static/js/468.bbc69bbf.chunk.js",
     "static/media/ubuntu-mono-all-400-normal.woff": "/.well-known/service/static/static/media/ubuntu-mono-all-400-normal.c879328bc62e9c68268f.woff",
@@ -119,19 +119,19 @@
     "index.html": "/.well-known/service/static/index.html",
     "static/media/space-connected.svg": "/.well-known/service/static/static/media/space-connected.9a4e18fd2bc7d065191b0d241a131c28.svg",
     "main.7ea79dc8.css.map": "/.well-known/service/static/static/css/main.7ea79dc8.css.map",
-    "main.581a3a26.js.map": "/.well-known/service/static/static/js/main.581a3a26.js.map",
+    "main.09227d84.js.map": "/.well-known/service/static/static/js/main.09227d84.js.map",
     "9314.f0add972.chunk.js.map": "/.well-known/service/static/static/js/9314.f0add972.chunk.js.map",
     "6218.4f3036a7.chunk.js.map": "/.well-known/service/static/static/js/6218.4f3036a7.chunk.js.map",
-    "4076.f5369a1d.chunk.js.map": "/.well-known/service/static/static/js/4076.f5369a1d.chunk.js.map",
+    "4076.8055ce74.chunk.js.map": "/.well-known/service/static/static/js/4076.8055ce74.chunk.js.map",
     "6658.98f9956d.chunk.js.map": "/.well-known/service/static/static/js/6658.98f9956d.chunk.js.map",
     "3025.7c99c058.chunk.js.map": "/.well-known/service/static/static/js/3025.7c99c058.chunk.js.map",
     "7858.52930f63.chunk.js.map": "/.well-known/service/static/static/js/7858.52930f63.chunk.js.map",
     "4587.9a042d46.chunk.js.map": "/.well-known/service/static/static/js/4587.9a042d46.chunk.js.map",
     "779.73350f02.chunk.js.map": "/.well-known/service/static/static/js/779.73350f02.chunk.js.map",
-    "8622.ebd44812.chunk.js.map": "/.well-known/service/static/static/js/8622.ebd44812.chunk.js.map",
+    "8622.6aa0a4d4.chunk.js.map": "/.well-known/service/static/static/js/8622.6aa0a4d4.chunk.js.map",
     "1148.5ccba08e.chunk.js.map": "/.well-known/service/static/static/js/1148.5ccba08e.chunk.js.map",
-    "8944.939de854.chunk.js.map": "/.well-known/service/static/static/js/8944.939de854.chunk.js.map",
-    "5468.b54ce65b.chunk.js.map": "/.well-known/service/static/static/js/5468.b54ce65b.chunk.js.map",
+    "8944.5b8c231c.chunk.js.map": "/.well-known/service/static/static/js/8944.5b8c231c.chunk.js.map",
+    "5468.21a861b9.chunk.js.map": "/.well-known/service/static/static/js/5468.21a861b9.chunk.js.map",
     "9982.4f1ebb7f.chunk.js.map": "/.well-known/service/static/static/js/9982.4f1ebb7f.chunk.js.map",
     "1359.add26d23.chunk.js.map": "/.well-known/service/static/static/js/1359.add26d23.chunk.js.map",
     "6637.b2e35031.chunk.js.map": "/.well-known/service/static/static/js/6637.b2e35031.chunk.js.map",
@@ -139,7 +139,7 @@
     "4882.0435e418.chunk.js.map": "/.well-known/service/static/static/js/4882.0435e418.chunk.js.map",
     "5434.523d071d.chunk.js.map": "/.well-known/service/static/static/js/5434.523d071d.chunk.js.map",
     "5547.e016de4c.chunk.css.map": "/.well-known/service/static/static/css/5547.e016de4c.chunk.css.map",
-    "5547.570ded36.chunk.js.map": "/.well-known/service/static/static/js/5547.570ded36.chunk.js.map",
+    "5547.42b98889.chunk.js.map": "/.well-known/service/static/static/js/5547.42b98889.chunk.js.map",
     "3033.9fe46d7f.chunk.js.map": "/.well-known/service/static/static/js/3033.9fe46d7f.chunk.js.map",
     "3842.e1bb702b.chunk.js.map": "/.well-known/service/static/static/js/3842.e1bb702b.chunk.js.map",
     "3131.99541aca.chunk.js.map": "/.well-known/service/static/static/js/3131.99541aca.chunk.js.map",
@@ -161,7 +161,7 @@
     "3076.28658ffc.chunk.js.map": "/.well-known/service/static/static/js/3076.28658ffc.chunk.js.map",
     "5569.e4bfe697.chunk.js.map": "/.well-known/service/static/static/js/5569.e4bfe697.chunk.js.map",
     "2801.33d2f238.chunk.js.map": "/.well-known/service/static/static/js/2801.33d2f238.chunk.js.map",
-    "4461.3cd698bf.chunk.js.map": "/.well-known/service/static/static/js/4461.3cd698bf.chunk.js.map",
+    "4461.f9a883d3.chunk.js.map": "/.well-known/service/static/static/js/4461.f9a883d3.chunk.js.map",
     "5509.a196d497.chunk.js.map": "/.well-known/service/static/static/js/5509.a196d497.chunk.js.map",
     "5683.051a03c1.chunk.js.map": "/.well-known/service/static/static/js/5683.051a03c1.chunk.js.map",
     "7006.bb90b167.chunk.js.map": "/.well-known/service/static/static/js/7006.bb90b167.chunk.js.map",
@@ -210,12 +210,12 @@
     "9107.7f32925d.chunk.js.map": "/.well-known/service/static/static/js/9107.7f32925d.chunk.js.map",
     "3154.e954fcda.chunk.css.map": "/.well-known/service/static/static/css/3154.e954fcda.chunk.css.map",
     "8016.3ef64a2c.chunk.js.map": "/.well-known/service/static/static/js/8016.3ef64a2c.chunk.js.map",
-    "8181.6c2a7dcb.chunk.js.map": "/.well-known/service/static/static/js/8181.6c2a7dcb.chunk.js.map",
+    "8181.bc510ea3.chunk.js.map": "/.well-known/service/static/static/js/8181.bc510ea3.chunk.js.map",
     "9657.b03b88e5.chunk.js.map": "/.well-known/service/static/static/js/9657.b03b88e5.chunk.js.map",
     "468.bbc69bbf.chunk.js.map": "/.well-known/service/static/static/js/468.bbc69bbf.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.7ea79dc8.css",
-    "static/js/main.581a3a26.js"
+    "static/js/main.09227d84.js"
   ]
 }

package/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico?imageFilter=resize&w=32"/><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.581a3a26.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?imageFilter=resize&w=32"/><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.09227d84.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>