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

Removed session code.

Browse source
This commit is contained in:
Mike Cao 2020-08-20 19:17:27 -07:00
parent 343e59e6ff
commit 5cade59111
6 changed files with 47 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

68
lib/session.js
View file

@ -1,6 +1,6 @@
import { getWebsiteByUuid, getSessionByUuid, createSession } from 'lib/queries';
import { getClientInfo } from 'lib/request';
import { uuid, isValidId, parseToken } from 'lib/crypto';
import { uuid, isValidId } from 'lib/crypto';
export async function verifySession(req) {
const { payload } = req.body;
@ -9,50 +9,42 @@ export async function verifySession(req) {
throw new Error('Invalid request');
}
const { website: website_uuid, hostname, screen, language, session } = payload;
const { website: website_uuid, hostname, screen, language } = payload;
if (!isValidId(website_uuid)) {
throw new Error(`Invalid website: ${website_uuid}`);
}
const token = await parseToken(session);
const { userAgent, browser, os, ip, country, device } = await getClientInfo(req, payload);
if (!token || token.website_uuid !== website_uuid) {
const { userAgent, browser, os, ip, country, device } = await getClientInfo(req, payload);
const website = await getWebsiteByUuid(website_uuid);
const website = await getWebsiteByUuid(website_uuid);
if (!website) {
throw new Error(`Website not found: ${website_uuid}`);
}
const { website_id } = website;
const session_uuid = uuid(website_id, hostname, ip, userAgent, os);
let session = await getSessionByUuid(session_uuid);
if (!session) {
session = await createSession(website_id, {
session_uuid,
hostname,
browser,
os,
screen,
language,
country,
device,
});
}
const { session_id } = session;
return {
website_id,
website_uuid,
session_id,
session_uuid,
};
if (!website) {
throw new Error(`Website not found: ${website_uuid}`);
}
return token;
const { website_id } = website;
const session_uuid = uuid(website_id, hostname, ip, userAgent, os);
let session = await getSessionByUuid(session_uuid);
if (!session) {
session = await createSession(website_id, {
session_uuid,
hostname,
browser,
os,
screen,
language,
country,
device,
});
}
const { session_id } = session;
return {
website_id,
session_id,
};
}