@abtnode/blocklet-services 1.8.62 → 1.8.63-beta-b71f5f80

package/api/routes/blocklet.js

@@ -68,22 +68,24 @@ module.exports = {
       cacheError
     );
 
-    server.get(
-      `${prefix}/blocklet/favicon`,
-      attachSendLogoContext({
-        onSendFallbackLogo,
-        onGetBlocklet: ({ req }) => {
-          return req.getBlocklet();
-        },
-      }),
-      ensureBlockletExist,
-      ensureCustomFavicon,
-      ensureCustomSquareLogo,
-      ensureBundleLogo,
-      ensureDefaultLogo,
-      fallbackLogo,
-      cacheError
-    );
+    ['/favicon.ico', `${prefix}/blocklet/favicon`].forEach((x) => {
+      server.get(
+        x,
+        attachSendLogoContext({
+          onSendFallbackLogo,
+          onGetBlocklet: ({ req }) => {
+            return req.getBlocklet();
+          },
+        }),
+        ensureBlockletExist,
+        ensureCustomFavicon,
+        ensureCustomSquareLogo,
+        ensureBundleLogo,
+        ensureDefaultLogo,
+        fallbackLogo,
+        cacheError
+      );
+    });
 
     server.get(
       `${prefix}/blocklet/logo-bundle/?**`,

package/api/services/auth/index.js

@@ -1,5 +1,6 @@
 /* eslint-disable arrow-parens */
 const get = require('lodash/get');
+const cookie = require('cookie');
 const minimatch = require('minimatch');
 const bearerToken = require('express-bearer-token');
 
@@ -34,7 +35,12 @@ const createSessionRoutes = require('./session');
 const createPassportRoutes = require('./passport');
 const { getRedirectUrl } = require('../../util');
 
-const getTokenFromWsConnect = (req) => {
+const getTokenFromWsConnect = (req, options) => {
+  const cookies = cookie.parse(req.headers.cookie || '');
+  if (cookies[options.sessionTokenKey]) {
+    return cookies[options.sessionTokenKey];
+  }
+
   const { searchParams } = new URL(req.url, `http://${req.headers.host || 'unknown'}`);
   return searchParams.get('token');
 };
@@ -173,7 +179,7 @@ const init = ({ node, options }) => {
   routes.createSessionRoutes = { init: (router, node) => createSessionRoutes.init(router, node, createSessionToken) };
 
   const ensureWsUser = async (req) => {
-    const token = getTokenFromWsConnect(req);
+    const token = getTokenFromWsConnect(req, options);
 
     // ignore some dev path in dev mode
     if (await isDevWsConnect(req)) {
@@ -185,7 +191,7 @@ const init = ({ node, options }) => {
 
   // auth middleware for websocket connect
   middlewares.ensureWsAuth = async (req, socket, head, next) => {
-    const token = getTokenFromWsConnect(req);
+    const token = getTokenFromWsConnect(req, options);
 
     // ignore some dev path in dev mode
     if (await isDevWsConnect(req)) {

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.59a1465e.js",
+    "main.js": "/.blocklet/proxy/blocklet-service/static/js/main.8609b4ff.js",
     "static/js/560.3efa5410.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/560.3efa5410.chunk.js",
     "static/js/255.d2001b91.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/255.d2001b91.chunk.js",
     "static/js/371.f9acea25.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/371.f9acea25.chunk.js",
     "static/js/737.a6089895.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/737.a6089895.chunk.js",
-    "static/js/906.f8540d1c.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/906.f8540d1c.chunk.js",
+    "static/js/906.3058a45b.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/906.3058a45b.chunk.js",
     "static/js/868.ffa052dc.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/868.ffa052dc.chunk.js",
-    "static/js/409.d234c0ae.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/409.d234c0ae.chunk.js",
+    "static/js/409.75f1dc24.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/409.75f1dc24.chunk.js",
     "static/js/682.c64ae291.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/682.c64ae291.chunk.js",
     "static/js/998.92ae1f72.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/998.92ae1f72.chunk.js",
     "static/js/437.d815f0c0.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/437.d815f0c0.chunk.js",
@@ -42,14 +42,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.59a1465e.js.map": "/.blocklet/proxy/blocklet-service/static/js/main.59a1465e.js.map",
+    "main.8609b4ff.js.map": "/.blocklet/proxy/blocklet-service/static/js/main.8609b4ff.js.map",
     "560.3efa5410.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/560.3efa5410.chunk.js.map",
     "255.d2001b91.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/255.d2001b91.chunk.js.map",
     "371.f9acea25.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/371.f9acea25.chunk.js.map",
     "737.a6089895.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/737.a6089895.chunk.js.map",
-    "906.f8540d1c.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/906.f8540d1c.chunk.js.map",
+    "906.3058a45b.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/906.3058a45b.chunk.js.map",
     "868.ffa052dc.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/868.ffa052dc.chunk.js.map",
-    "409.d234c0ae.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/409.d234c0ae.chunk.js.map",
+    "409.75f1dc24.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/409.75f1dc24.chunk.js.map",
     "682.c64ae291.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/682.c64ae291.chunk.js.map",
     "998.92ae1f72.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/998.92ae1f72.chunk.js.map",
     "437.d815f0c0.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/437.d815f0c0.chunk.js.map",
@@ -64,6 +64,6 @@
   },
   "entrypoints": [
     "static/css/main.632501d5.css",
-    "static/js/main.59a1465e.js"
+    "static/js/main.8609b4ff.js"
   ]
 }

package/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/.well-known/service/blocklet/favicon"/><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.59a1465e.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="icon" href="/.well-known/service/blocklet/favicon"/><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.8609b4ff.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>