@abtnode/blocklet-services 1.16.14-beta-dc99d0a2 → 1.16.14-beta-a90ba909

package/api/libs/connect/session.js

@@ -47,15 +47,14 @@ const { isInvitedUserOnly, createTokenFn, getDidConnectVersion } = require('../.
 const { transferPassport } = require('../auth/utils');
 const { generateTranslate } = require('../translate');
 const { migrateAccount, declareAccount } = require('../../services/oauth');
-const { getTrustedIssuers, getLoginProvider } = require('../../util/blocklet-utils');
+const { getTrustedIssuers, getLoginProvider, getFederatedTrustedIssuers } = require('../../util/blocklet-utils');
 const { getFederatedMaster, getUserAvatarUrl } = require('../../util/federated');
 const { api } = require('../api');
 
 const vcTypes = [VC_TYPE_GENERAL_PASSPORT, VC_TYPE_NODE_PASSPORT];
 
-const getPassportVc = async ({ blocklet, claims, challenge, locale }) => {
-  const trustedPassports = (blocklet.trustedPassports || []).map((x) => x.issuerDid);
-  const trustedIssuers = [...getBlockletAppIdList(blocklet), ...trustedPassports].filter(Boolean);
+const getPassportVc = async ({ blocklet, claims, challenge, locale, provider }) => {
+  const trustedIssuers = await getTrustedIssuers(blocklet, { provider });
   const { vc } = await getVCFromClaims({
     claims,
     challenge,
@@ -67,7 +66,7 @@ const getPassportVc = async ({ blocklet, claims, challenge, locale }) => {
   return vc;
 };
 
-const getRoleFromVC = async ({ vc, node, locale, blocklet, teamDid }) => {
+const getRoleFromVC = async ({ vc, node, locale, blocklet, teamDid, provider }) => {
   let role = ROLES.GUEST;
   if (vc) {
     await validatePassport(get(vc, 'credentialSubject.passport'));
@@ -76,8 +75,12 @@ const getRoleFromVC = async ({ vc, node, locale, blocklet, teamDid }) => {
     if (expectedIssuers.includes(actualIssuer)) {
       role = getRoleFromLocalPassport(get(vc, 'credentialSubject.passport'));
     } else {
+      // MEMO: 如果是 federated，需要将 actualIssuer 做一个转换
+      const actualIssuerList =
+        provider === LOGIN_PROVIDER.FEDERATED ? await getFederatedTrustedIssuers(blocklet) : [actualIssuer];
       // map external passport to local role
-      const { mappings = [] } = (blocklet.trustedPassports || []).find((x) => x.issuerDid === actualIssuer) || {};
+      const { mappings = [] } =
+        (blocklet.trustedPassports || []).find((x) => actualIssuerList.includes(x.issuerDid)) || {};
       role = await getRoleFromExternalPassport({
         passport: get(vc, 'credentialSubject.passport'),
         node,
@@ -156,7 +159,7 @@ module.exports = {
       if (action === 'login') {
         const [invitedUserOnly] = config ? await isInvitedUserOnly(config, node, teamDid) : [false];
 
-        const trustedIssuers = getTrustedIssuers(blocklet, { provider });
+        const trustedIssuers = await getTrustedIssuers(blocklet, { provider });
         claims.verifiableCredential = {
           type: 'verifiableCredential',
           description: messages.requestPassport[locale],
@@ -242,9 +245,11 @@ module.exports = {
       let defaultTtlPolicy = 'never';
       let issuePassport = false;
 
+      const provider = getLoginProvider(request);
+
       // Get passport vc
       if (action === 'login') {
-        vc = await getPassportVc({ blocklet, claims, challenge, locale });
+        vc = await getPassportVc({ blocklet, claims, challenge, locale, provider });
         [invitedUserOnly, defaultRole, issuePassport] = await isInvitedUserOnly(authConfig, node, teamDid);
         if (invitedUserOnly && !vc) {
           throw new Error(messages.missingCredentialClaim[locale]);
@@ -317,7 +322,7 @@ module.exports = {
       }
 
       // Get role
-      const role = await getRoleFromVC({ vc, node, locale, blocklet, teamDid });
+      const role = await getRoleFromVC({ vc, node, locale, blocklet, teamDid, provider });
       await validateRole({ role, authConfig, locale, node, teamDid });
 
       checkAppOwner({ role, blocklet, userDid, locale });
@@ -333,10 +338,16 @@ module.exports = {
       let fullName = user?.fullName;
       // Update profile
       const passportForLog = passport || { name: 'Guest', role: 'guest' };
-      const provider = getLoginProvider(request);
+
+      const masterSite = getFederatedMaster(blocklet);
+      let connectAccount = { provider, did: realDid, pk: realPk };
+
       let updatedUser;
       if (user) {
         // Update user
+        if (masterSite && provider === LOGIN_PROVIDER.FEDERATED) {
+          connectAccount = { provider, did: realDid, pk: realPk, id: masterSite.appPid };
+        }
         updatedUser = await node.loginUser({
           teamDid,
           user: {
@@ -345,7 +356,7 @@ module.exports = {
             locale,
             passport,
             lastLoginIp: get(request, 'headers[x-real-ip]') || '',
-            connectedAccount: [{ provider, did: realDid }, connectedNft],
+            connectedAccount: [connectAccount, connectedNft],
           },
         });
         await node.createAuditLog(
@@ -362,6 +373,10 @@ module.exports = {
         const profile = claims.find((x) => x.type === 'profile');
         fullName = profile.fullName;
 
+        if (masterSite && provider === LOGIN_PROVIDER.FEDERATED) {
+          connectAccount = { provider, did: realDid, pk: realPk, id: masterSite.appPid };
+        }
+
         updatedUser = await node.loginUser({
           teamDid,
           user: {
@@ -374,14 +389,7 @@ module.exports = {
             locale,
             passport,
             lastLoginIp: get(request, 'headers[x-real-ip]') || '',
-            connectedAccount: [
-              {
-                provider,
-                did: realDid,
-                pk: realPk,
-              },
-              connectedNft,
-            ],
+            connectedAccount: [connectAccount, connectedNft],
           },
         });
         await node.createAuditLog(
@@ -422,12 +430,12 @@ module.exports = {
         await node.setBlockletInitialized({ did: teamDid, owner: { did: realDid, pk: realPk } });
       }
 
-      const { permanentWallet } = await request.getBlockletInfo();
+      const { permanentWallet } = blockletInfo;
 
-      const masterSite = getFederatedMaster(blocklet);
       let federatedSessionToken;
       let federatedRefreshToken;
-      if (masterSite) {
+      // member 使用 deferated login 时，总是会让 Master 自动登录
+      if (masterSite && provider === LOGIN_PROVIDER.FEDERATED) {
         const postUser = pick(updatedUser, ['did', 'pk', 'fullName', 'locale']);
         postUser.lastLoginAt = get(request, 'headers[x-real-ip]') || '';
 
@@ -444,7 +452,6 @@ module.exports = {
             signer: permanentWallet.address,
             data: signV2(permanentWallet.address, permanentWallet.secretKey, {
               user: postUser,
-              appId: blocklet.did,
               passport,
             }),
           }
@@ -593,7 +600,7 @@ module.exports = {
 
       const blocklet = await request.getBlocklet();
       const provider = getLoginProvider(request);
-      const trustedIssuers = getTrustedIssuers(blocklet, { provider });
+      const trustedIssuers = await getTrustedIssuers(blocklet, { provider });
 
       return {
         verifiableCredential: {
@@ -646,6 +653,7 @@ module.exports = {
         claims: [verifiableCredential],
         challenge,
         locale,
+        provider,
       });
 
       // Validate passport required
@@ -661,7 +669,7 @@ module.exports = {
       }
 
       // Get role
-      const role = await getRoleFromVC({ vc, node, locale, blocklet, teamDid });
+      const role = await getRoleFromVC({ vc, node, locale, blocklet, teamDid, provider });
       await validateRole({ role, authConfig, locale, node, teamDid });
 
       checkAppOwner({ role, blocklet, userDid, locale });

package/api/middlewares/check-federated-cors-call.js

@@ -4,6 +4,7 @@ function checkFederatedCorsCall() {
     const { blocklet } = req;
     const federated = blocklet.settings.federated || {};
     const sites = federated?.sites || [];
+    // TODO: @zhanghan 增加 aliasAppUrl 判断
     if (sites.find((item) => item.appUrl === caller && item.status === 'approved')) {
       next();
       return;

package/api/routes/federated.js

@@ -3,12 +3,16 @@ const { signV2 } = require('@arcblock/jwt');
 const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
 const cloneDeep = require('lodash/cloneDeep');
 const get = require('lodash/get');
+const pLimit = require('p-limit');
+const pRetry = require('p-retry');
 
 const cors = require('cors');
 const { LOGIN_PROVIDER } = require('@blocklet/constant');
-const pick = require('lodash/pick');
 const { getAvatarByUrl, extractUserAvatar } = require('@abtnode/util/lib/user');
 const { getApplicationInfo } = require('@abtnode/auth/lib/auth');
+const pick = require('lodash/pick');
+const defaults = require('lodash/defaults');
+const remove = require('lodash/remove');
 
 const { api } = require('../libs/api');
 const initJwt = require('../libs/jwt');
@@ -21,6 +25,7 @@ const { getUserAvatarUrl } = require('../util/federated');
 const PREFIX = WELLKNOWN_SERVICE_PATH_PREFIX;
 
 const prefix = `${PREFIX}/api/federated`;
+const limitSync = pLimit(1);
 
 module.exports = {
   preInit(server) {
@@ -31,18 +36,24 @@ module.exports = {
   init(server, node, options) {
     // step 1 申请加入(member 向 master 申请)
     server.post(`${prefix}/join`, ensureBlocklet(), async (req, res) => {
+      // master blocklet
       const { blocklet } = req;
       const { site } = req.body;
 
-      const federated = cloneDeep(blocklet.settings.federated || {});
-      let sites = federated?.sites || [];
-      if (sites.length === 0) {
+      const federated = defaults(cloneDeep(blocklet.settings.federated || {}), {
+        config: {
+          appId: blocklet.appDid,
+          appPid: blocklet.appPid,
+        },
+        sites: [],
+      });
+      if (federated.sites.length === 0) {
         const nodeInfo = await req.getNodeInfo();
         const blockletInfo = await req.getBlockletInfo();
         const masterSite = {
           appId: blockletInfo.wallet.address,
           appPid: blockletInfo.permanentWallet.address,
-          migratedFrom: blocklet.migratedFrom || [],
+          aliasDid: (blocklet.migratedFrom || []).map((item) => item.appDid),
           appName: blockletInfo.name,
           appDescription: blockletInfo.description,
           appUrl: blockletInfo.appUrl,
@@ -51,24 +62,17 @@ module.exports = {
             normalizePathPrefix(`${WELLKNOWN_SERVICE_PATH_PREFIX}/blocklet/logo`) ||
             '/',
           appLogoRect: blocklet.environmentObj.BLOCKLET_APP_LOGO_RECT,
-          did: blockletInfo.did,
+          did: blockletInfo.permanentWallet.address,
           pk: blockletInfo.permanentWallet.publicKey,
           serverId: nodeInfo.did,
           serverVersion: nodeInfo.version,
           version: blocklet.meta.version,
         };
-        sites = [masterSite];
+        federated.sites = [masterSite];
       }
 
-      let masterConfig = federated.config;
-      if (!masterConfig) {
-        masterConfig = {
-          appId: blocklet.appDid,
-          appPid: blocklet.appPid || blocklet.appDid,
-        };
-      }
       if (site) {
-        sites.push({
+        federated.sites.push({
           ...site,
           appliedAt: new Date(),
           status: 'pending',
@@ -78,36 +82,81 @@ module.exports = {
       // member 申请后，将 member 展示在列表中
       // 更新的是自己
       await node.setFederated({
-        did: blocklet.appDid,
-        config: {
-          config: masterConfig,
-          sites,
-        },
+        did: blocklet.appPid,
+        config: federated,
       });
 
       // 将新增的数据返回给 member
       res.json({
-        sites,
+        sites: federated.sites,
       });
     });
 
+    // member 向 master 请求退出统一登录
+    server.post(`${prefix}/quit`, ensureBlocklet(), verifyFederatedCall(), async (req, res) => {
+      const { blocklet } = req;
+      const { memberPid } = req.body.verifyData;
+
+      const federated = defaults(cloneDeep(blocklet.settings.federated || {}), {
+        config: {
+          appId: blocklet.appDid,
+          appPid: blocklet.appPid,
+        },
+        sites: [],
+      });
+
+      remove(federated.sites, (item) => item.appPid === memberPid);
+
+      const { permanentWallet } = await req.getBlockletInfo();
+      const postData = {
+        signer: permanentWallet.address,
+        data: signV2(permanentWallet.address, permanentWallet.secretKey, { sites: federated.sites }),
+      };
+
+      const waitingList = federated.sites
+        .filter((item) => item.appId !== federated.config.appId)
+        .map((item) => {
+          return limitSync(() =>
+            pRetry(() => api.post(`${item.appUrl}/${WELLKNOWN_SERVICE_PATH_PREFIX}/api/federated/sync`, postData), {
+              retries: 3,
+            })
+          );
+        });
+      await Promise.all(waitingList);
+
+      await node.setFederated({
+        did: blocklet.appPid,
+        config: federated,
+      });
+
+      res.json({});
+    });
+
     // step 2 审批(master 申批 member)
     // core/state/lib/blocklet/manager/disk.js -> auditFederatedLogin
+    // audit-res 接受 master 的处理结果同步，保存 delegation
     server.post(`${prefix}/audit-res`, ensureBlocklet(), verifyFederatedCall(), async (req, res) => {
       const { blocklet } = req;
-      const { delegation, roles, appId, status } = req.body.verifyData;
-      const federated = cloneDeep(blocklet.settings.federated || {});
+      const { delegation, roles, masterPid, status } = req.body.verifyData;
+      const federated = defaults(cloneDeep(blocklet.settings.federated || {}), {
+        config: {
+          appId: blocklet.appDid,
+          appPid: blocklet.appPid,
+          isMaster: false,
+        },
+        sites: [],
+      });
       federated.config.delegation = delegation;
       if (status === 'approved') {
         const trustedPassports = blocklet.trustedPassports || [];
-        const hasTrustedPassport = trustedPassports.find((item) => item.issuerDid === appId);
+        const hasTrustedPassport = trustedPassports.find((item) => item.issuerDid === masterPid);
         if (!hasTrustedPassport) {
           await node.configTrustedPassports({
-            teamDid: blocklet.meta.did,
+            teamDid: blocklet.appPid,
             trustedPassports: [
               ...trustedPassports,
               {
-                issuerDid: appId,
+                issuerDid: masterPid,
                 remark: 'Generated on join federated login',
                 mappings: roles.map((item) => {
                   return {
@@ -122,7 +171,7 @@ module.exports = {
       }
 
       await node.setFederated({
-        did: blocklet.meta.did,
+        did: blocklet.appPid,
         config: federated,
       });
       res.json(federated);
@@ -136,7 +185,7 @@ module.exports = {
       const federated = cloneDeep(blocklet.settings.federated || {});
       federated.sites = sites;
       await node.setFederated({
-        did: blocklet.meta.did,
+        did: blocklet.appPid,
         config: federated,
       });
       res.json(federated);
@@ -151,7 +200,7 @@ module.exports = {
       async (req, res) => {
         const { blocklet } = req;
 
-        const teamDid = blocklet.meta.did;
+        const teamDid = blocklet.appPid;
         let user = null;
         if (req.user) {
           user = { ...req.user };
@@ -168,8 +217,8 @@ module.exports = {
         }
         const blockletInfo = await req.getBlockletInfo();
         const site = {
-          appId: blockletInfo.wallet.address,
-          appPid: blockletInfo.permanentWallet.address,
+          appId: blocklet.appDid,
+          appPid: blocklet.appPid,
           appName: blockletInfo.name,
           appDescription: blockletInfo.description,
           appUrl: blockletInfo.appUrl,
@@ -178,7 +227,6 @@ module.exports = {
             normalizePathPrefix(`${WELLKNOWN_SERVICE_PATH_PREFIX}/blocklet/logo`) ||
             '/',
           appLogoRect: blocklet.environmentObj.BLOCKLET_APP_LOGO_RECT,
-          did: blockletInfo.did,
         };
         res.json({ user, site });
       }
@@ -201,8 +249,9 @@ module.exports = {
         if (!onlyWriteCookie) {
           const { blocklet } = req;
           const { permanentWallet } = await req.getBlockletInfo();
-          const teamDid = blocklet.meta.did;
+          const teamDid = blocklet.appPid;
           const federatedSites = blocklet.settings?.federated?.sites || [];
+          // TODO: @zhanghan 增加 aliasAppUrl 判断
           const loginSite = federatedSites.find((item) => item.appUrl === req.headers.origin);
 
           const currentUser = await node.getUser({
@@ -229,7 +278,7 @@ module.exports = {
             ({ data } = await api.post(`${loginSite.appUrl}${prefix}/token`, {
               signer: permanentWallet.address,
               data: signV2(permanentWallet.address, permanentWallet.secretKey, {
-                appId: teamDid,
+                masterPid: teamDid,
                 role: req.user.role,
                 user,
                 passport: req.user.passport,
@@ -253,16 +302,17 @@ module.exports = {
 
     // step 6 发放自动登录 token(master 向 member 发起生成 token 请求)
     server.post(`${prefix}/token`, ensureBlocklet(), verifyFederatedCall(), async (req, res) => {
-      const { user, appId, role, passport } = req.body.verifyData;
+      const { user, masterPid, role, passport } = req.body.verifyData;
       const { createSessionToken } = initJwt(node, options);
       const createToken = createTokenFn(createSessionToken);
       const { secret } = await req.getBlockletInfo();
       const { blocklet } = req;
-      const teamDid = blocklet.meta.did;
+      const teamDid = blocklet.appPid;
 
       const sessionConfig = blocklet.settings?.session || {};
       const trustedPassports = blocklet.trustedPassports || [];
-      const masterPassport = trustedPassports.find((item) => item.issuerDid === appId);
+      // HACK: 这里只对比 pid，因为自动生成的数据只有 master-site 的 pid
+      const masterPassport = trustedPassports.find((item) => item.issuerDid === masterPid);
       const findMapping = masterPassport ? masterPassport.mappings.find((item) => item.from.passport === role) : null;
       const targetPassport = findMapping
         ? {
@@ -292,7 +342,7 @@ module.exports = {
           // passport: findMapping ? targetPassport : null,
           connectedAccount: {
             provider: LOGIN_PROVIDER.FEDERATED,
-            id: appId,
+            id: masterPid,
             did: user.did,
             pk: user.pk,
           },
@@ -329,14 +379,15 @@ module.exports = {
     );
 
     // member 主动调起 master 登录（实现登录 member 时，自动登录 master）
+    // member 传递过来的 user.did 和 user.pk 均为 master-site 与钱包生成的
 
     server.post(`${prefix}/loginByMember`, ensureBlocklet(), verifyFederatedCall(), async (req, res) => {
-      const { user, appId, passport } = req.body.verifyData;
+      const { user, passport } = req.body.verifyData;
       const { createSessionToken } = initJwt(node, options);
       const createToken = createTokenFn(createSessionToken);
       const { secret } = await req.getBlockletInfo();
       const { blocklet } = req;
-      const teamDid = blocklet.meta.did;
+      const teamDid = blocklet.appPid;
 
       const sessionConfig = blocklet.settings?.session || {};
       const prevUser = await node.getUser({
@@ -348,15 +399,27 @@ module.exports = {
       const targetPassport = passport?.id ? (prevUser?.passports || []).find((item) => item.id === passport.id) : null;
 
       // HACK: 用户在 master 中存在时，不更新任何用户信息；不存在时，将新增一个用户
-      const filterUserInfo = prevUser ? pick(user, ['did', 'pk']) : user;
-      const doc = await node.loginUser({
+      const filterUserInfo = prevUser ? {} : user;
+      if (filterUserInfo.avatar) {
+        let avatar = await getAvatarByUrl(filterUserInfo.avatar);
+        const nodeInfo = await req.getNodeInfo();
+
+        const { dataDir } = await getApplicationInfo({ node, nodeInfo, teamDid });
+        avatar = await extractUserAvatar(avatar, { dataDir });
+        filterUserInfo.avatar = avatar;
+      }
+      const realDid = prevUser?.did || user.did;
+      const realPk = prevUser?.pk || user.pk;
+      const newUser = await node.loginUser({
         teamDid,
         user: {
           ...filterUserInfo,
+          did: realDid,
+          pk: realPk,
           passport: targetPassport,
           connectedAccount: {
+            // member 在使用 federated login 时，本质还是使用 wallet 来登录的，所以对 master-site 来说，登录的 provider 就是 wallet
             provider: LOGIN_PROVIDER.WALLET,
-            id: appId,
             did: user.did,
             pk: user.pk,
           },
@@ -364,12 +427,12 @@ module.exports = {
       });
 
       const { sessionToken, refreshToken } = createToken(
-        doc.did,
+        user.did,
         {
           secret,
           passport: targetPassport,
           role: targetPassport?.role || 'guest',
-          fullName: doc.fullName,
+          fullName: newUser.fullName,
         },
         {
           ...sessionConfig,

package/api/util/blocklet-utils.js

@@ -1,13 +1,42 @@
 const { LOGIN_PROVIDER } = require('@blocklet/constant');
 const { getBlockletAppIdList } = require('@blocklet/meta/lib/util');
+const pick = require('lodash/pick');
+const logger = require('@abtnode/logger')(require('../../package.json').name);
 
 const { getFederatedMaster } = require('./federated');
+const { api } = require('../libs/api');
 
-function getTrustedIssuers(blocklet, { provider = LOGIN_PROVIDER.WALLET } = {}) {
+async function getFederatedTrustedIssuers(blocklet) {
+  const masterSite = getFederatedMaster(blocklet);
+  const id = masterSite?.appId;
+  const pid = masterSite?.appPid;
+  const appUrl = masterSite?.appUrl;
+  // 使用 masterSite.appPid 作为兜底方案
+  const issuers = [id, pid];
+  try {
+    if (appUrl) {
+      const { data } = await api.get(`${appUrl}/__blocklet__.js`, {
+        params: { type: 'json' },
+      });
+      const { appId, appPid, alsoKnownAs = [] } = data;
+      issuers.push(appId);
+      issuers.push(appPid);
+      issuers.push(...alsoKnownAs);
+    }
+  } catch (error) {
+    logger.error('Failed to fetch master __blocklet__.js', {
+      error,
+      masterSite: pick(masterSite, ['appId', 'appPid', 'appName', 'appDescription', 'appUrl']),
+    });
+  }
+  return [...new Set(issuers.filter(Boolean))];
+}
+
+async function getTrustedIssuers(blocklet, { provider = LOGIN_PROVIDER.WALLET } = {}) {
   if (provider === LOGIN_PROVIDER.FEDERATED) {
-    const masterSite = getFederatedMaster(blocklet);
-    const pid = masterSite?.appPid;
-    return pid ? [pid] : [];
+    const federatedTrustedIssuers = await getFederatedTrustedIssuers(blocklet);
+
+    return federatedTrustedIssuers;
   }
 
   const trustedPassports = (blocklet.trustedPassports || []).map((x) => x.issuerDid);
@@ -28,4 +57,5 @@ function getLoginProvider(request) {
 module.exports = {
   getLoginProvider,
   getTrustedIssuers,
+  getFederatedTrustedIssuers,
 };

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.3b4d58d1.js",
+    "main.js": "/.well-known/service/static/static/js/main.adfe46cb.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,19 +22,19 @@
     "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.e5aa519c.chunk.js": "/.well-known/service/static/static/js/8395.e5aa519c.chunk.js",
+    "static/js/8395.40dc877e.chunk.js": "/.well-known/service/static/static/js/8395.40dc877e.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.ee59facc.chunk.js": "/.well-known/service/static/static/js/4603.ee59facc.chunk.js",
+    "static/js/4603.c6657383.chunk.js": "/.well-known/service/static/static/js/4603.c6657383.chunk.js",
     "static/js/5050.538edf89.chunk.js": "/.well-known/service/static/static/js/5050.538edf89.chunk.js",
     "static/css/780.e3db6e49.chunk.css": "/.well-known/service/static/static/css/780.e3db6e49.chunk.css",
     "static/js/780.32bf1f5b.chunk.js": "/.well-known/service/static/static/js/780.32bf1f5b.chunk.js",
     "static/js/766.5dd16d47.chunk.js": "/.well-known/service/static/static/js/766.5dd16d47.chunk.js",
-    "static/js/5430.8114614c.chunk.js": "/.well-known/service/static/static/js/5430.8114614c.chunk.js",
+    "static/js/5430.090296e0.chunk.js": "/.well-known/service/static/static/js/5430.090296e0.chunk.js",
     "static/js/3800.faac00ca.chunk.js": "/.well-known/service/static/static/js/3800.faac00ca.chunk.js",
     "static/js/1832.4cd8a983.chunk.js": "/.well-known/service/static/static/js/1832.4cd8a983.chunk.js",
-    "static/js/3042.c9fe1ced.chunk.js": "/.well-known/service/static/static/js/3042.c9fe1ced.chunk.js",
-    "static/js/3162.6bbe08fc.chunk.js": "/.well-known/service/static/static/js/3162.6bbe08fc.chunk.js",
+    "static/js/3042.0066bb3c.chunk.js": "/.well-known/service/static/static/js/3042.0066bb3c.chunk.js",
+    "static/js/3162.834ccffb.chunk.js": "/.well-known/service/static/static/js/3162.834ccffb.chunk.js",
     "static/js/655.cdee65b4.chunk.js": "/.well-known/service/static/static/js/655.cdee65b4.chunk.js",
     "static/js/576.d7d4814e.chunk.js": "/.well-known/service/static/static/js/576.d7d4814e.chunk.js",
     "static/js/2631.54f86f84.chunk.js": "/.well-known/service/static/static/js/2631.54f86f84.chunk.js",
@@ -52,7 +52,7 @@
     "static/js/2130.59fef4ad.chunk.js": "/.well-known/service/static/static/js/2130.59fef4ad.chunk.js",
     "static/js/5711.aa17ef28.chunk.js": "/.well-known/service/static/static/js/5711.aa17ef28.chunk.js",
     "static/js/7345.4b4f8941.chunk.js": "/.well-known/service/static/static/js/7345.4b4f8941.chunk.js",
-    "static/js/1237.1d0b8f1e.chunk.js": "/.well-known/service/static/static/js/1237.1d0b8f1e.chunk.js",
+    "static/js/1237.1018f6da.chunk.js": "/.well-known/service/static/static/js/1237.1018f6da.chunk.js",
     "static/js/8031.9944bf3c.chunk.js": "/.well-known/service/static/static/js/8031.9944bf3c.chunk.js",
     "static/js/3963.2e06f9bc.chunk.js": "/.well-known/service/static/static/js/3963.2e06f9bc.chunk.js",
     "static/js/6891.6c7018ab.chunk.js": "/.well-known/service/static/static/js/6891.6c7018ab.chunk.js",
@@ -86,7 +86,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.3b4d58d1.js.map": "/.well-known/service/static/static/js/main.3b4d58d1.js.map",
+    "main.adfe46cb.js.map": "/.well-known/service/static/static/js/main.adfe46cb.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",
@@ -107,19 +107,19 @@
     "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.e5aa519c.chunk.js.map": "/.well-known/service/static/static/js/8395.e5aa519c.chunk.js.map",
+    "8395.40dc877e.chunk.js.map": "/.well-known/service/static/static/js/8395.40dc877e.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.ee59facc.chunk.js.map": "/.well-known/service/static/static/js/4603.ee59facc.chunk.js.map",
+    "4603.c6657383.chunk.js.map": "/.well-known/service/static/static/js/4603.c6657383.chunk.js.map",
     "5050.538edf89.chunk.js.map": "/.well-known/service/static/static/js/5050.538edf89.chunk.js.map",
     "780.e3db6e49.chunk.css.map": "/.well-known/service/static/static/css/780.e3db6e49.chunk.css.map",
     "780.32bf1f5b.chunk.js.map": "/.well-known/service/static/static/js/780.32bf1f5b.chunk.js.map",
     "766.5dd16d47.chunk.js.map": "/.well-known/service/static/static/js/766.5dd16d47.chunk.js.map",
-    "5430.8114614c.chunk.js.map": "/.well-known/service/static/static/js/5430.8114614c.chunk.js.map",
+    "5430.090296e0.chunk.js.map": "/.well-known/service/static/static/js/5430.090296e0.chunk.js.map",
     "3800.faac00ca.chunk.js.map": "/.well-known/service/static/static/js/3800.faac00ca.chunk.js.map",
     "1832.4cd8a983.chunk.js.map": "/.well-known/service/static/static/js/1832.4cd8a983.chunk.js.map",
-    "3042.c9fe1ced.chunk.js.map": "/.well-known/service/static/static/js/3042.c9fe1ced.chunk.js.map",
-    "3162.6bbe08fc.chunk.js.map": "/.well-known/service/static/static/js/3162.6bbe08fc.chunk.js.map",
+    "3042.0066bb3c.chunk.js.map": "/.well-known/service/static/static/js/3042.0066bb3c.chunk.js.map",
+    "3162.834ccffb.chunk.js.map": "/.well-known/service/static/static/js/3162.834ccffb.chunk.js.map",
     "655.cdee65b4.chunk.js.map": "/.well-known/service/static/static/js/655.cdee65b4.chunk.js.map",
     "576.d7d4814e.chunk.js.map": "/.well-known/service/static/static/js/576.d7d4814e.chunk.js.map",
     "2631.54f86f84.chunk.js.map": "/.well-known/service/static/static/js/2631.54f86f84.chunk.js.map",
@@ -137,7 +137,7 @@
     "2130.59fef4ad.chunk.js.map": "/.well-known/service/static/static/js/2130.59fef4ad.chunk.js.map",
     "5711.aa17ef28.chunk.js.map": "/.well-known/service/static/static/js/5711.aa17ef28.chunk.js.map",
     "7345.4b4f8941.chunk.js.map": "/.well-known/service/static/static/js/7345.4b4f8941.chunk.js.map",
-    "1237.1d0b8f1e.chunk.js.map": "/.well-known/service/static/static/js/1237.1d0b8f1e.chunk.js.map",
+    "1237.1018f6da.chunk.js.map": "/.well-known/service/static/static/js/1237.1018f6da.chunk.js.map",
     "8031.9944bf3c.chunk.js.map": "/.well-known/service/static/static/js/8031.9944bf3c.chunk.js.map",
     "3963.2e06f9bc.chunk.js.map": "/.well-known/service/static/static/js/3963.2e06f9bc.chunk.js.map",
     "6891.6c7018ab.chunk.js.map": "/.well-known/service/static/static/js/6891.6c7018ab.chunk.js.map",
@@ -151,6 +151,6 @@
   },
   "entrypoints": [
     "static/css/main.7ea79dc8.css",
-    "static/js/main.3b4d58d1.js"
+    "static/js/main.adfe46cb.js"
   ]
 }