watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 04:37:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Refactor components and styles.

Browse source
This commit is contained in:
Mike Cao 2020-08-03 18:12:28 -07:00
parent c5599f1e20
commit a2db27894f
16 changed files with 189 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/db.js
View file

@ -39,11 +39,12 @@ export async function runQuery(query) {
});
}
export async function getWebsite(website_uuid) {
export async function getWebsite({ website_id, website_uuid }) {
return runQuery(
prisma.website.findOne({
where: {
website_uuid,
...(website_id && { website_id }),
...(website_uuid && { website_uuid }),
},
}),
);
@ -77,11 +78,12 @@ export async function createSession(website_id, data) {
);
}
export async function getSession(session_uuid) {
export async function getSession({ session_id, session_uuid }) {
return runQuery(
prisma.session.findOne({
where: {
session_uuid,
...(session_id && { session_id }),
...(session_uuid && { session_uuid }),
},
}),
);

4
lib/session.js
View file

@ -18,13 +18,13 @@ export default async req => {
const country = await getCountry(req, ip);
if (website_uuid) {
const website = await getWebsite(website_uuid);
const website = await getWebsite({ website_uuid });
if (website) {
const { website_id } = website;
const session_uuid = uuid(website_id, hostname, ip, userAgent, os);
let session = await getSession(session_uuid);
let session = await getSession({ session_uuid });
if (!session) {
session = await createSession(website_id, {