watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2025-12-08 05:12:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Use next-basics package.

Browse source
This commit is contained in:
Mike Cao 2022-08-28 20:20:54 -07:00
parent 1a6af8fc41
commit f4e0da481e
62 changed files with 255 additions and 373 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/session.js
View file

@ -1,4 +1,6 @@
import { isValidUuid, parseToken, uuid } from 'lib/crypto';
import { parseToken } from 'next-basics';
import { validate } from 'uuid';
import { uuid } from 'lib/crypto';
import redis from 'lib/redis';
import { getClientInfo, getJsonBody } from 'lib/request';
import { createSession, getSessionByUuid, getWebsiteByUuid } from 'queries';
@ -22,8 +24,8 @@ export async function getSession(req) {
const { website: website_uuid, hostname, screen, language } = payload;
if (!isValidUuid(website_uuid)) {
throw new Error(`Invalid website: ${website_uuid}`);
if (!validate(website_uuid)) {
return null;
}
let websiteId = null;
@ -52,7 +54,6 @@ export async function getSession(req) {
if (process.env.REDIS_URL) {
sessionCreated = (await redis.get(`session:${session_uuid}`)) !== null;
} else {
console.log('test');
session = await getSessionByUuid(session_uuid);
sessionCreated = !!session;
sessionId = session ? session.session_id : null;
@ -60,7 +61,6 @@ export async function getSession(req) {
if (!sessionCreated) {
try {
console.log('test2');
session = await createSession(websiteId, {
session_uuid,
hostname,