@abtnode/blocklet-services 1.8.35 → 1.8.36

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

@@ -31,7 +31,7 @@ const checkOwner = async ({ node, userDid, blocklet }) => {
 module.exports = function createRoutes(node, _authenticator, createSessionToken) {
   return {
     action: 'setup',
-    onConnect: async ({ req, userDid }) => {
+    onConnect: async ({ req, userDid, extraParams: { launchType } }) => {
       const [blocklet, info] = await Promise.all([req.getBlocklet(), req.getNodeInfo()]);
 
       const claims = {
@@ -45,7 +45,7 @@ module.exports = function createRoutes(node, _authenticator, createSessionToken)
         },
       };
 
-      const authMethod = getServerAuthMethod(info);
+      const authMethod = getServerAuthMethod(info, launchType);
       const serverClaims = await getSetupBlockletClaims(node, authMethod, blocklet);
 
       await checkOwner({ node, userDid, blocklet });
@@ -55,11 +55,11 @@ module.exports = function createRoutes(node, _authenticator, createSessionToken)
 
     // eslint-disable-next-line consistent-return
     onAuth: async ({ claims, userDid, userPk, updateSession, extraParams, req, baseUrl, challenge }) => {
-      const { locale } = extraParams;
+      const { locale, launchType } = extraParams;
       const [blocklet, info] = await Promise.all([req.getBlocklet(), req.getNodeInfo()]);
       const teamDid = blocklet.meta.did;
 
-      const authMethod = getServerAuthMethod(info);
+      const authMethod = getServerAuthMethod(info, launchType);
       await ensureBlockletPermission({ authMethod, node, userDid, claims, challenge, locale, blocklet });
 
       const user = await checkOwner({ node, userDid, blocklet });

package/api/util/index.js

@@ -125,9 +125,11 @@ const getRedirectUrl = ({ req, pagePath }) => {
   // 重定向时考虑 serverUrl 查询参数的处理
   const serverUrl = redirectUrlObj.searchParams.get('serverUrl');
   const fromLauncher = redirectUrlObj.searchParams.get('from_launcher');
+  const launchType = redirectUrlObj.searchParams.get('launch_type');
   redirectUrlObj.searchParams.delete('__start__');
   redirectUrlObj.searchParams.delete('serverUrl');
   redirectUrlObj.searchParams.delete('from_launcher');
+  redirectUrlObj.searchParams.delete('launch_type');
   const redirectUrl = `${redirectPrefix.replace(/\/+$/, '')}${redirectUrlObj.pathname}${redirectUrlObj.search}`;
 
   const url = new URL(`http://localhost${joinUrl(groupPrefix, WELLKNOWN_SERVICE_PATH_PREFIX, pagePath || '/')}`);
@@ -146,6 +148,10 @@ const getRedirectUrl = ({ req, pagePath }) => {
     url.searchParams.set('from_launcher', fromLauncher);
   }
 
+  if (launchType) {
+    url.searchParams.set('launch_type', launchType);
+  }
+
   return `${url.pathname}${url.search}`;
 };
 

package/build/asset-manifest.json

@@ -1,14 +1,14 @@
 {
   "files": {
     "main.css": "/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css",
-    "main.js": "/.blocklet/proxy/blocklet-service/static/js/main.70ee3f05.js",
+    "main.js": "/.blocklet/proxy/blocklet-service/static/js/main.f3dd83de.js",
     "static/js/560.0ddfdba6.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/560.0ddfdba6.chunk.js",
     "static/js/255.7bcbdc42.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/255.7bcbdc42.chunk.js",
     "static/js/371.14968348.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/371.14968348.chunk.js",
     "static/js/737.c1e203f5.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/737.c1e203f5.chunk.js",
-    "static/js/729.a9e88c56.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/729.a9e88c56.chunk.js",
+    "static/js/729.6e541d5f.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/729.6e541d5f.chunk.js",
     "static/js/868.1b9a25e5.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/868.1b9a25e5.chunk.js",
-    "static/js/722.e2544d5f.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/722.e2544d5f.chunk.js",
+    "static/js/722.897913c0.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/722.897913c0.chunk.js",
     "static/js/268.7f5de1e5.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/268.7f5de1e5.chunk.js",
     "static/js/605.ac2e53a5.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/605.ac2e53a5.chunk.js",
     "static/js/685.29570a26.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/685.29570a26.chunk.js",
@@ -36,14 +36,14 @@
     "router-template-styles/styles.css": "/.blocklet/proxy/blocklet-service/router-template-styles/styles.css",
     "index.html": "/.blocklet/proxy/blocklet-service/index.html",
     "main.632501d5.css.map": "/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css.map",
-    "main.70ee3f05.js.map": "/.blocklet/proxy/blocklet-service/static/js/main.70ee3f05.js.map",
+    "main.f3dd83de.js.map": "/.blocklet/proxy/blocklet-service/static/js/main.f3dd83de.js.map",
     "560.0ddfdba6.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/560.0ddfdba6.chunk.js.map",
     "255.7bcbdc42.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/255.7bcbdc42.chunk.js.map",
     "371.14968348.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/371.14968348.chunk.js.map",
     "737.c1e203f5.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/737.c1e203f5.chunk.js.map",
-    "729.a9e88c56.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/729.a9e88c56.chunk.js.map",
+    "729.6e541d5f.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/729.6e541d5f.chunk.js.map",
     "868.1b9a25e5.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/868.1b9a25e5.chunk.js.map",
-    "722.e2544d5f.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/722.e2544d5f.chunk.js.map",
+    "722.897913c0.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/722.897913c0.chunk.js.map",
     "268.7f5de1e5.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/268.7f5de1e5.chunk.js.map",
     "605.ac2e53a5.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/605.ac2e53a5.chunk.js.map",
     "685.29570a26.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/685.29570a26.chunk.js.map",
@@ -54,6 +54,6 @@
   },
   "entrypoints": [
     "static/css/main.632501d5.css",
-    "static/js/main.70ee3f05.js"
+    "static/js/main.f3dd83de.js"
   ]
 }

package/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="/.well-known/service/static/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><script src=".well-known/service/api/env"></script><script src="__blocklet__.js"></script><script defer="defer" src="/.blocklet/proxy/blocklet-service/static/js/main.70ee3f05.js"></script><link href="/.blocklet/proxy/blocklet-service/static/css/main.632501d5.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="shortcut icon" href="/.well-known/service/static/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><script src=".well-known/service/api/env"></script><script src="__blocklet__.js"></script><script defer="defer" src="/.blocklet/proxy/blocklet-service/static/js/main.f3dd83de.js"></script><link href="/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>