ambiser
/
umami
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "break CH fetch" 

This reverts commit 5dd395918f.
pull/1554/head
Brian Cao 2022-10-06 13:29:55 -07:00
parent f53ea06c23
commit 0e10470c02
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/session.js
View File

@ -2,6 +2,7 @@ import { uuid } from 'lib/crypto';
import redis, { DELETED } from 'lib/redis'; import redis, { DELETED } from 'lib/redis';
import { getClientInfo, getJsonBody } from 'lib/request'; import { getClientInfo, getJsonBody } from 'lib/request';
import { parseToken } from 'next-basics'; import { parseToken } from 'next-basics';
import { getWebsiteByUuid } from 'queries';
import { validate } from 'uuid'; import { validate } from 'uuid';
export async function getSession(req) { export async function getSession(req) {
@ -35,16 +36,14 @@ export async function getSession(req) {
websiteId = Number(await redis.client.get(`website:${website_uuid}`)); websiteId = Number(await redis.client.get(`website:${website_uuid}`));
} }
// // Check database if does not exists in Redis // Check database if does not exists in Redis
// if (!websiteId) { if (!websiteId) {
// const website = await getWebsiteByUuid(website_uuid); const website = await getWebsiteByUuid(website_uuid);
// websiteId = website ? website.website_id : null; websiteId = website ? website.website_id : null;
// } }
if (!websiteId || websiteId === DELETED) { if (!websiteId || websiteId === DELETED) {
throw new Error( throw new Error(`Website not found: ${website_uuid}`);
`Website not found: ${website_uuid} : ${process.env.REDIS_URL} : ${process.env.CLICKHOUSE_URL}`,
);
} }
const { userAgent, browser, os, ip, country, device } = await getClientInfo(req, payload); const { userAgent, browser, os, ip, country, device } = await getClientInfo(req, payload);