Merge remote-tracking branch 'origin/dev' into dev

2022-09-05 15:36:10 -07:00
parent 13cf286874 42bdfccdf4
commit b829d84fc1
2 changed files with 4 additions and 2 deletions
--- a/lib/redis.js
+++ b/lib/redis.js
@@ -19,6 +19,8 @@ function getClient() {
    global[REDIS] = redis;
  }

+  log('Redis initialized');
+
  return redis;
 }

--- a/lib/session.js
+++ b/lib/session.js
@@ -37,8 +37,8 @@ export async function getSession(req) {

  // Check database if redis does not have
  if (!websiteId) {
-    const { website_id } = await getWebsiteByUuid(website_uuid);
-    websiteId = website_id;
+    const website = await getWebsiteByUuid(website_uuid);
+    websiteId = website ? website.website_id : null;
  }

  if (!websiteId || websiteId === DELETED) {