implementing domain selector

This commit is contained in:
Emily
2025-01-21 18:07:01 +01:00
parent 13e94cb0f0
commit 8922507a64
68 changed files with 273 additions and 79 deletions

View File

@@ -0,0 +1,14 @@
<script lang="ts" setup>
</script>
<template>
<div
class="w-full h-[4rem] border-solid border-[#D9D9E0] dark:border-[#202020] border-b-[1px] bg-lyx-lightmode-background dark:bg-lyx-background flex dark:shadow-[1px_0_10px_#000000]">
<div class="flex items-center px-10">
<SelectorDomainSelector></SelectorDomainSelector>
</div>
</div>
</template>

View File

@@ -1,6 +1,6 @@
<script lang="ts" setup> <script lang="ts" setup>
import CreateSnapshot from './dialog/CreateSnapshot.vue'; import CreateSnapshot from '../dialog/CreateSnapshot.vue';
export type Entry = { export type Entry = {
label: string, label: string,
@@ -139,7 +139,7 @@ const { data: maxProjects } = useFetch("/api/user/max_projects", {
<div class="flex items-center gap-2 w-full"> <div class="flex items-center gap-2 w-full">
<ProjectSelector></ProjectSelector> <SelectorProjectSelector></SelectorProjectSelector>
<div class="grow flex justify-end text-[1.4rem] mr-2 lg:hidden"> <div class="grow flex justify-end text-[1.4rem] mr-2 lg:hidden">
<i @click="close()" class="fas fa-close"></i> <i @click="close()" class="fas fa-close"></i>

View File

@@ -0,0 +1,53 @@
<script lang="ts" setup>
;
const { user } = useLoggedUser()
const { domainList, domain, setActiveDomain } = useDomain();
// function isProjectMine(owner?: string) {
// if (!owner) return false;
// if (!user.value) return false;
// if (!user.value.logged) return;
// return user.value.id == owner;
// }
function onChange(e: string) {
setActiveDomain(e);
}
</script>
<template>
<USelectMenu :uiMenu="{
select: 'bg-lyx-lightmode-widget-light !ring-lyx-lightmode-widget dark:!bg-lyx-widget-light !shadow-none focus:!ring-lyx-widget-lighter dark:!ring-lyx-widget-lighter',
base: '!bg-lyx-lightmode-widget dark:!bg-lyx-widget w-max',
option: {
base: 'hover:!bg-lyx-lightmode-widget-light dark:hover:!bg-lyx-widget-lighter cursor-pointer',
active: '!bg-lyx-lightmode-widget-light dark:!bg-lyx-widget-lighter'
}
}" class="w-full" v-if="domainList" @change="onChange" :value="domain" :options="domainList">
<template #option="{ option, active, selected }">
<div class="flex items-center gap-2">
<div>
<img class="h-5 bg-black rounded-full" :src="'/logo_32.png'" alt="Litlyx logo">
</div>
<div> {{ option }} </div>
</div>
</template>
<template #label>
<div class="flex items-center gap-2">
<div>
<img class="h-5 bg-black rounded-full" :src="'/logo_32.png'" alt="Litlyx logo">
</div>
<div>
{{ domain || '-' }}
</div>
</div>
</template>
</USelectMenu>
</template>

View File

@@ -0,0 +1,36 @@
const { token } = useAccessToken();
const { projectId } = useProject();
const domainsRequest = useFetch<{ _id: string }[]>('/api/domains/list', {
headers: computed(() => {
return {
'Authorization': `Bearer ${token.value}`,
'x-pid': projectId.value || ''
}
})
});
const domainList = computed(() => {
return domainsRequest.data.value?.map(e => e._id);
})
const activeDomain = ref<string>();
const domain = computed(() => {
if (activeDomain.value) return activeDomain.value;
if (!domainList.value) return;
if (domainList.value.length == 0) return;
activeDomain.value = domainList.value[0];
return domainList.value[0];
})
function setActiveDomain(domain: string) {
activeDomain.value = domain;
}
export function useDomain() {
return { domainList, domain, setActiveDomain }
}

View File

@@ -1,6 +1,6 @@
<script setup lang="ts"> <script setup lang="ts">
import type { Section } from '~/components/CVerticalNavigation.vue'; import type { Section } from '~/components/layout/VerticalNavigation.vue';
import { Lit } from 'litlyx-js'; import { Lit } from 'litlyx-js';
import { DialogFeedback } from '#components'; import { DialogFeedback } from '#components';
@@ -91,8 +91,8 @@ const { isOpen, close, open } = useMenu();
</div> </div>
<CVerticalNavigation :sections="sections"> <LayoutVerticalNavigation :sections="sections">
</CVerticalNavigation> </LayoutVerticalNavigation>
<div class="overflow-hidden w-full bg-lyx-lightmode-background dark:bg-lyx-background relative h-full"> <div class="overflow-hidden w-full bg-lyx-lightmode-background dark:bg-lyx-background relative h-full">
@@ -107,6 +107,8 @@ const { isOpen, close, open } = useMenu();
<DashboardDialogBarCard @click.stop="null" class="z-[36]"></DashboardDialogBarCard> <DashboardDialogBarCard @click.stop="null" class="z-[36]"></DashboardDialogBarCard>
</div> </div>
<LayoutTopNavigation></LayoutTopNavigation>
<slot></slot> <slot></slot>
</div> </div>
</div> </div>

View File

@@ -3,7 +3,7 @@ import { AiChatModel } from "@schema/ai/AiChatSchema";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event); const data = await getRequestDataOld(event);
if (!data) return; if (!data) return;
const { project_id } = data; const { project_id } = data;

View File

@@ -4,7 +4,7 @@ import type OpenAI from "openai";
import { getChartsInMessage } from "~/server/services/AiService"; import { getChartsInMessage } from "~/server/services/AiService";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event); const data = await getRequestDataOld(event);
if (!data) return; if (!data) return;
const isAdmin = data.user.user.roles.includes('ADMIN'); const isAdmin = data.user.user.roles.includes('ADMIN');

View File

@@ -2,7 +2,7 @@
import { AiChatModel } from "@schema/ai/AiChatSchema"; import { AiChatModel } from "@schema/ai/AiChatSchema";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event); const data = await getRequestDataOld(event);
if (!data) return; if (!data) return;
const { project_id } = data; const { project_id } = data;

View File

@@ -4,7 +4,7 @@ import { AiChatModel } from "@schema/ai/AiChatSchema";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event); const data = await getRequestDataOld(event);
if (!data) return; if (!data) return;
const { project_id } = data; const { project_id } = data;

View File

@@ -10,7 +10,7 @@ export async function getAiChatRemainings(project_id: string) {
} }
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event); const data = await getRequestDataOld(event);
if (!data) return; if (!data) return;
const { pid } = data; const { pid } = data;

View File

@@ -3,7 +3,7 @@ import { AiChatModel } from "@schema/ai/AiChatSchema";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event); const data = await getRequestDataOld(event);
if (!data) return; if (!data) return;
const { project_id } = data; const { project_id } = data;

View File

@@ -5,7 +5,7 @@ import { ProjectLimitModel } from "@schema/project/ProjectsLimits";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event); const data = await getRequestDataOld(event);
if (!data) return; if (!data) return;
const { pid } = data; const { pid } = data;

View File

@@ -1,11 +1,11 @@
import { VisitModel } from "@schema/metrics/VisitSchema"; import { VisitModel } from "@schema/metrics/VisitSchema";
import { Redis } from "~/server/services/CacheService"; import { Redis } from "~/server/services/CacheService";
import { getRequestData } from "~/server/utils/getRequestData"; import { getRequestDataOld } from "~/server/utils/getRequestData";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false }); const data = await getRequestDataOld(event, { requireSchema: false });
if (!data) return; if (!data) return;
const { pid, from, to, project_id, limit } = data; const { pid, from, to, project_id, limit } = data;

View File

@@ -1,11 +1,11 @@
import { Redis } from "~/server/services/CacheService"; import { Redis } from "~/server/services/CacheService";
import { getRequestData } from "~/server/utils/getRequestData"; import { getRequestDataOld } from "~/server/utils/getRequestData";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: true }); const data = await getRequestDataOld(event, { requireSchema: true });
if (!data) return; if (!data) return;
const { schemaName, pid, from, to, model, project_id } = data; const { schemaName, pid, from, to, model, project_id } = data;

View File

@@ -1,11 +1,11 @@
import { VisitModel } from "@schema/metrics/VisitSchema"; import { VisitModel } from "@schema/metrics/VisitSchema";
import { Redis } from "~/server/services/CacheService"; import { Redis } from "~/server/services/CacheService";
import { getRequestData } from "~/server/utils/getRequestData"; import { getRequestDataOld } from "~/server/utils/getRequestData";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false }); const data = await getRequestDataOld(event, { requireSchema: false });
if (!data) return; if (!data) return;
const { pid, from, to, project_id, limit } = data; const { pid, from, to, project_id, limit } = data;

View File

@@ -1,11 +1,11 @@
import { VisitModel } from "@schema/metrics/VisitSchema"; import { VisitModel } from "@schema/metrics/VisitSchema";
import { Redis } from "~/server/services/CacheService"; import { Redis } from "~/server/services/CacheService";
import { getRequestData } from "~/server/utils/getRequestData"; import { getRequestDataOld } from "~/server/utils/getRequestData";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false }); const data = await getRequestDataOld(event, { requireSchema: false });
if (!data) return; if (!data) return;
const { pid, from, to, project_id, limit } = data; const { pid, from, to, project_id, limit } = data;

View File

@@ -1,11 +1,11 @@
import { EventModel } from "@schema/metrics/EventSchema"; import { EventModel } from "@schema/metrics/EventSchema";
import { Redis } from "~/server/services/CacheService"; import { Redis } from "~/server/services/CacheService";
import { getRequestData } from "~/server/utils/getRequestData"; import { getRequestDataOld } from "~/server/utils/getRequestData";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false }); const data = await getRequestDataOld(event, { requireSchema: false });
if (!data) return; if (!data) return;
const { pid, from, to, project_id, limit } = data; const { pid, from, to, project_id, limit } = data;

View File

@@ -7,7 +7,7 @@ import { VisitModel } from "@schema/metrics/VisitSchema";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false }); const data = await getRequestDataOld(event, { requireSchema: false });
if (!data) return; if (!data) return;
const { project_id, from, to } = data; const { project_id, from, to } = data;

View File

@@ -7,7 +7,7 @@ import { PipelineStage } from "mongoose";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false }); const data = await getRequestDataOld(event, { requireSchema: false });
if (!data) return; if (!data) return;
const { project_id } = data; const { project_id } = data;

View File

@@ -5,7 +5,7 @@ import { Redis } from "~/server/services/CacheService";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event); const data = await getRequestDataOld(event);
if (!data) return; if (!data) return;
const { project_id } = data; const { project_id } = data;

View File

@@ -5,7 +5,7 @@ import { Redis } from "~/server/services/CacheService";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false }); const data = await getRequestDataOld(event, { requireSchema: false });
if (!data) return; if (!data) return;
const { project_id } = data; const { project_id } = data;

View File

@@ -3,7 +3,7 @@ import { SessionModel } from "@schema/metrics/SessionSchema";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false }); const data = await getRequestDataOld(event, { requireSchema: false });
if (!data) return; if (!data) return;
const { project_id } = data; const { project_id } = data;

View File

@@ -1,11 +1,11 @@
import { VisitModel } from "@schema/metrics/VisitSchema"; import { VisitModel } from "@schema/metrics/VisitSchema";
import { Redis } from "~/server/services/CacheService"; import { Redis } from "~/server/services/CacheService";
import { getRequestData } from "~/server/utils/getRequestData"; import { getRequestDataOld } from "~/server/utils/getRequestData";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false }); const data = await getRequestDataOld(event, { requireSchema: false });
if (!data) return; if (!data) return;
const { pid, from, to, project_id, limit } = data; const { pid, from, to, project_id, limit } = data;

View File

@@ -1,11 +1,11 @@
import { VisitModel } from "@schema/metrics/VisitSchema"; import { VisitModel } from "@schema/metrics/VisitSchema";
import { Redis } from "~/server/services/CacheService"; import { Redis } from "~/server/services/CacheService";
import { getRequestData } from "~/server/utils/getRequestData"; import { getRequestDataOld } from "~/server/utils/getRequestData";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false }); const data = await getRequestDataOld(event, { requireSchema: false });
if (!data) return; if (!data) return;
const { pid, from, to, project_id, limit } = data; const { pid, from, to, project_id, limit } = data;

View File

@@ -1,11 +1,11 @@
import { VisitModel } from "@schema/metrics/VisitSchema"; import { VisitModel } from "@schema/metrics/VisitSchema";
import { Redis } from "~/server/services/CacheService"; import { Redis } from "~/server/services/CacheService";
import { getRequestData } from "~/server/utils/getRequestData"; import { getRequestDataOld } from "~/server/utils/getRequestData";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false }); const data = await getRequestDataOld(event, { requireSchema: false });
if (!data) return; if (!data) return;
const { pid, from, to, project_id, limit } = data; const { pid, from, to, project_id, limit } = data;

View File

@@ -1,11 +1,11 @@
import { VisitModel } from "@schema/metrics/VisitSchema"; import { VisitModel } from "@schema/metrics/VisitSchema";
import { Redis } from "~/server/services/CacheService"; import { Redis } from "~/server/services/CacheService";
import { getRequestData } from "~/server/utils/getRequestData"; import { getRequestDataOld } from "~/server/utils/getRequestData";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false }); const data = await getRequestDataOld(event, { requireSchema: false });
if (!data) return; if (!data) return;
const { pid, from, to, project_id, limit } = data; const { pid, from, to, project_id, limit } = data;

View File

@@ -0,0 +1,18 @@
import { VisitModel } from "@schema/metrics/VisitSchema";
export default defineEventHandler(async event => {
const data = await getRequestData(event, ['GUEST', 'LIVEMODE']);
if (!data) return;
const { project_id } = data;
const result = await VisitModel.aggregate([
{ $match: { project_id, } },
{ $group: { _id: "$website" } },
]);
return result as { _id: string }[];
});

View File

@@ -2,7 +2,7 @@
import { FeedbackModel } from '@schema/FeedbackSchema'; import { FeedbackModel } from '@schema/FeedbackSchema';
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event); const data = await getRequestDataOld(event);
if (!data) return; if (!data) return;
const { text } = await readBody(event); const { text } = await readBody(event);

View File

@@ -18,7 +18,7 @@ export default defineEventHandler(async event => {
if (body.name.length < 3) return setResponseStatus(event, 400, 'name too short'); if (body.name.length < 3) return setResponseStatus(event, 400, 'name too short');
if (body.name.length > 32) return setResponseStatus(event, 400, 'name too long'); if (body.name.length > 32) return setResponseStatus(event, 400, 'name too long');
const data = await getRequestData(event, { allowGuests: false, allowLitlyx: false, }); const data = await getRequestDataOld(event, { allowGuests: false, allowLitlyx: false, });
if (!data) return; if (!data) return;
const { project_id } = data; const { project_id } = data;

View File

@@ -5,7 +5,7 @@ export default defineEventHandler(async event => {
const body = await readBody(event); const body = await readBody(event);
const data = await getRequestData(event, { allowGuests: false, allowLitlyx: false, }); const data = await getRequestDataOld(event, { allowGuests: false, allowLitlyx: false, });
if (!data) return; if (!data) return;
const { project_id } = data; const { project_id } = data;

View File

@@ -7,7 +7,7 @@ function cryptApiKeyName(apiSettings: TApiSettings): TApiSettings {
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { allowGuests: false, allowLitlyx: false, requireRange: false }); const data = await getRequestDataOld(event, { allowGuests: false, allowLitlyx: false, requireRange: false });
if (!data) return; if (!data) return;
const { project_id } = data; const { project_id } = data;

View File

@@ -2,7 +2,7 @@
import { OnboardingModel } from '@schema/OnboardingSchema'; import { OnboardingModel } from '@schema/OnboardingSchema';
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event); const data = await getRequestDataOld(event);
if (!data) return; if (!data) return;
const { job, analytics } = await readBody(event); const { job, analytics } = await readBody(event);

View File

@@ -5,7 +5,7 @@ import { OnboardingModel } from '@schema/OnboardingSchema';
const { SELFHOSTED } = useRuntimeConfig(); const { SELFHOSTED } = useRuntimeConfig();
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event); const data = await getRequestDataOld(event);
if (!data) return; if (!data) return;
const exist = await OnboardingModel.exists({ user_id: data.user.id }); const exist = await OnboardingModel.exists({ user_id: data.user.id });

View File

@@ -5,7 +5,7 @@ import StripeService from '~/server/services/StripeService';
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false, allowGuests: false, allowLitlyx: false }); const data = await getRequestDataOld(event, { requireSchema: false, allowGuests: false, allowLitlyx: false });
if (!data) return; if (!data) return;
const { project, pid } = data; const { project, pid } = data;

View File

@@ -4,7 +4,7 @@ import StripeService from '~/server/services/StripeService';
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false, allowGuests: false, allowLitlyx: false }); const data = await getRequestDataOld(event, { requireSchema: false, allowGuests: false, allowLitlyx: false });
if (!data) return; if (!data) return;
const { project, pid } = data; const { project, pid } = data;

View File

@@ -3,7 +3,7 @@ import StripeService from '~/server/services/StripeService';
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false, allowLitlyx: false }); const data = await getRequestDataOld(event, { requireSchema: false, allowLitlyx: false });
if (!data) return; if (!data) return;
const { project } = data; const { project } = data;

View File

@@ -12,7 +12,7 @@ export type InvoiceData = {
} }
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false, allowLitlyx: false }); const data = await getRequestDataOld(event, { requireSchema: false, allowLitlyx: false });
if (!data) return; if (!data) return;
const { project, pid } = data; const { project, pid } = data;

View File

@@ -23,7 +23,7 @@ function getPlanToActivate(current_plan_id: number) {
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false, allowGuests: false, allowLitlyx: false }); const data = await getRequestDataOld(event, { requireSchema: false, allowGuests: false, allowLitlyx: false });
if (!data) return; if (!data) return;
const { project, pid, user } = data; const { project, pid, user } = data;

View File

@@ -4,7 +4,7 @@ import StripeService from '~/server/services/StripeService';
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false, allowLitlyx: false }); const data = await getRequestDataOld(event, { requireSchema: false, allowLitlyx: false });
if (!data) return; if (!data) return;
const { project } = data; const { project } = data;

View File

@@ -2,7 +2,7 @@ import { AppsumoCodeTryModel } from "@schema/appsumo/AppsumoCodeTrySchema";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false, allowGuests: false, allowLitlyx: false }); const data = await getRequestDataOld(event, { requireSchema: false, allowGuests: false, allowLitlyx: false });
if (!data) return; if (!data) return;
const { pid } = data; const { pid } = data;

View File

@@ -1,7 +1,7 @@
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false, allowGuests: false, allowLitlyx: false }); const data = await getRequestDataOld(event, { requireSchema: false, allowGuests: false, allowLitlyx: false });
if (!data) return; if (!data) return;
const { project } = data; const { project } = data;

View File

@@ -8,7 +8,7 @@ import { AiChatModel } from "@schema/ai/AiChatSchema";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false, allowGuests: false, allowLitlyx: false }); const data = await getRequestDataOld(event, { requireSchema: false, allowGuests: false, allowLitlyx: false });
if (!data) return; if (!data) return;
const { project, user, project_id } = data; const { project, user, project_id } = data;

View File

@@ -3,7 +3,7 @@ import { VisitModel } from "@schema/metrics/VisitSchema";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { const data = await getRequestDataOld(event, {
requireSchema: false, requireSchema: false,
allowLitlyx: false, allowLitlyx: false,
requireSlice: false requireSlice: false

View File

@@ -60,7 +60,7 @@ const { SELFHOSTED } = useRuntimeConfig();
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false }); const data = await getRequestDataOld(event, { requireSchema: false });
if (!data) return; if (!data) return;
const { project, project_id, user } = data; const { project, project_id, user } = data;

View File

@@ -81,7 +81,7 @@ function createPdf(data: PDFGenerationData) {
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false, allowGuests: true, requireRange: false }); const data = await getRequestDataOld(event, { requireSchema: false, allowGuests: true, requireRange: false });
if (!data) return; if (!data) return;
const userData = getRequestUser(event); const userData = getRequestUser(event);

View File

@@ -6,7 +6,7 @@ export default defineEventHandler(async event => {
const data = await getRequestData(event); const data = await getRequestDataOld(event);
if (!data) return; if (!data) return;
const { project_id } = data; const { project_id } = data;

View File

@@ -5,7 +5,7 @@ import { UserModel } from "@schema/UserSchema";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false, allowGuests: false, allowLitlyx: false }); const data = await getRequestDataOld(event, { requireSchema: false, allowGuests: false, allowLitlyx: false });
if (!data) return; if (!data) return;
const { project_id } = data; const { project_id } = data;

View File

@@ -5,7 +5,7 @@ import { UserModel } from "@schema/UserSchema";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false, allowGuests: false, allowLitlyx: false }); const data = await getRequestDataOld(event, { requireSchema: false, allowGuests: false, allowLitlyx: false });
if (!data) return; if (!data) return;
const { project_id } = data; const { project_id } = data;

View File

@@ -4,7 +4,7 @@ import { TeamMemberModel } from "@schema/TeamMemberSchema";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false, allowGuests: false, allowLitlyx: false }); const data = await getRequestDataOld(event, { requireSchema: false, allowGuests: false, allowLitlyx: false });
if (!data) return; if (!data) return;
const { project_id, user } = data; const { project_id, user } = data;

View File

@@ -5,7 +5,7 @@ import { UserModel } from "@schema/UserSchema";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false }); const data = await getRequestDataOld(event, { requireSchema: false });
if (!data) return; if (!data) return;
const { project_id, project, user } = data; const { project_id, project, user } = data;

View File

@@ -3,7 +3,7 @@ import StripeService from '~/server/services/StripeService';
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false, allowLitlyx: false }); const data = await getRequestDataOld(event, { requireSchema: false, allowLitlyx: false });
if (!data) return; if (!data) return;
const { project, project_id } = data; const { project, project_id } = data;

View File

@@ -3,7 +3,7 @@ import { ProjectSnapshotModel, TProjectSnapshot } from "@schema/project/ProjectS
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false, allowLitlyx: false }); const data = await getRequestDataOld(event, { requireSchema: false, allowLitlyx: false });
if (!data) return; if (!data) return;
const { project_id } = data; const { project_id } = data;

View File

@@ -15,7 +15,7 @@ export type SecutityReport = (TSecurityDomainEntry | TSecurityVisitEntry | TSecu
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false }); const data = await getRequestDataOld(event, { requireSchema: false });
if (!data) return; if (!data) return;
const { project_id } = data; const { project_id } = data;

View File

@@ -3,11 +3,11 @@ import { EventModel } from "@schema/metrics/EventSchema";
import { SessionModel } from "@schema/metrics/SessionSchema"; import { SessionModel } from "@schema/metrics/SessionSchema";
import { VisitModel } from "@schema/metrics/VisitSchema"; import { VisitModel } from "@schema/metrics/VisitSchema";
import { Types } from "mongoose"; import { Types } from "mongoose";
import { getRequestData } from "~/server/utils/getRequestData"; import { getRequestDataOld } from "~/server/utils/getRequestData";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false }); const data = await getRequestDataOld(event, { requireSchema: false });
if (!data) return; if (!data) return;
const { project_id } = data; const { project_id } = data;

View File

@@ -3,11 +3,11 @@ import { EventModel } from "@schema/metrics/EventSchema";
import { SessionModel } from "@schema/metrics/SessionSchema"; import { SessionModel } from "@schema/metrics/SessionSchema";
import { VisitModel } from "@schema/metrics/VisitSchema"; import { VisitModel } from "@schema/metrics/VisitSchema";
import { Types } from "mongoose"; import { Types } from "mongoose";
import { getRequestData } from "~/server/utils/getRequestData"; import { getRequestDataOld } from "~/server/utils/getRequestData";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false }); const data = await getRequestDataOld(event, { requireSchema: false });
if (!data) return; if (!data) return;
const { project_id } = data; const { project_id } = data;

View File

@@ -1,10 +1,10 @@
import { VisitModel } from "@schema/metrics/VisitSchema"; import { VisitModel } from "@schema/metrics/VisitSchema";
import { getRequestData } from "~/server/utils/getRequestData"; import { getRequestDataOld } from "~/server/utils/getRequestData";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false }); const data = await getRequestDataOld(event, { requireSchema: false });
if (!data) return; if (!data) return;
const { project_id } = data; const { project_id } = data;

View File

@@ -1,10 +1,10 @@
import { VisitModel } from "@schema/metrics/VisitSchema"; import { VisitModel } from "@schema/metrics/VisitSchema";
import { getRequestData } from "~/server/utils/getRequestData"; import { getRequestDataOld } from "~/server/utils/getRequestData";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false }); const data = await getRequestDataOld(event, { requireSchema: false });
if (!data) return; if (!data) return;
const { project_id } = data; const { project_id } = data;

View File

@@ -3,7 +3,7 @@ import { ProjectSnapshotModel } from "@schema/project/ProjectSnapshot";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false, allowGuests: true, requireRange: false }); const data = await getRequestDataOld(event, { requireSchema: false, allowGuests: true, requireRange: false });
if (!data) return; if (!data) return;
const body = await readBody(event); const body = await readBody(event);

View File

@@ -4,7 +4,7 @@ import { ProjectSnapshotModel } from "@schema/project/ProjectSnapshot";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false, allowGuests: false, requireRange: false }); const data = await getRequestDataOld(event, { requireSchema: false, allowGuests: false, requireRange: false });
if (!data) return; if (!data) return;
const body = await readBody(event); const body = await readBody(event);

View File

@@ -9,7 +9,7 @@ import { checkSliceValidity } from "~/server/services/TimelineService";
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false, requireSlice: true }); const data = await getRequestDataOld(event, { requireSchema: false, requireSlice: true });
if (!data) return; if (!data) return;
const { pid, from, to, slice, project_id } = data; const { pid, from, to, slice, project_id } = data;

View File

@@ -4,7 +4,7 @@ import { executeTimelineAggregation, fillAndMergeTimelineAggregationV2 } from "~
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false, requireSlice: true }); const data = await getRequestDataOld(event, { requireSchema: false, requireSlice: true });
if (!data) return; if (!data) return;
const { pid, from, to, slice, project_id, timeOffset } = data; const { pid, from, to, slice, project_id, timeOffset } = data;

View File

@@ -4,7 +4,7 @@ import { executeAdvancedTimelineAggregation } from "~/server/services/TimelineSe
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false, requireSlice: true }); const data = await getRequestDataOld(event, { requireSchema: false, requireSlice: true });
if (!data) return; if (!data) return;
const { from, to, slice, project_id, timeOffset } = data; const { from, to, slice, project_id, timeOffset } = data;

View File

@@ -4,7 +4,7 @@ import { executeTimelineAggregation, fillAndMergeTimelineAggregationV2 } from "~
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false, requireSlice: true }); const data = await getRequestDataOld(event, { requireSchema: false, requireSlice: true });
if (!data) return; if (!data) return;
const { pid, from, to, slice, project_id, timeOffset } = data; const { pid, from, to, slice, project_id, timeOffset } = data;

View File

@@ -4,7 +4,7 @@ import { executeAdvancedTimelineAggregation, fillAndMergeTimelineAggregationV2 }
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false, requireSlice: true }); const data = await getRequestDataOld(event, { requireSchema: false, requireSlice: true });
if (!data) return; if (!data) return;
const { pid, from, to, slice, project_id, timeOffset } = data; const { pid, from, to, slice, project_id, timeOffset } = data;

View File

@@ -4,7 +4,7 @@ import { executeTimelineAggregation, fillAndMergeTimelineAggregationV2 } from "~
export default defineEventHandler(async event => { export default defineEventHandler(async event => {
const data = await getRequestData(event, { requireSchema: false, requireSlice: true }); const data = await getRequestDataOld(event, { requireSchema: false, requireSlice: true });
if (!data) return; if (!data) return;
const { pid, from, to, slice, project_id, timeOffset } = data; const { pid, from, to, slice, project_id, timeOffset } = data;

View File

@@ -32,6 +32,8 @@ export type GetRequestDataOptions = {
/** @default false */ requireOffset?: boolean, /** @default false */ requireOffset?: boolean,
} }
export type RequestDataScope = 'GUEST' | 'SCHEMA' | 'LIVEMODE' | 'SLICE' | 'RANGE' | 'OFFSET';
async function hasAccessToProject(user_id: string, project: TProject) { async function hasAccessToProject(user_id: string, project: TProject) {
if (!project) return [false, 'NONE']; if (!project) return [false, 'NONE'];
const owner = project.owner.toString(); const owner = project.owner.toString();
@@ -42,8 +44,77 @@ async function hasAccessToProject(user_id: string, project: TProject) {
return [false, 'NONE']; return [false, 'NONE'];
} }
export async function getRequestData(event: H3Event<EventHandlerRequest>, required_scopes: RequestDataScope[] = []) {
export async function getRequestData(event: H3Event<EventHandlerRequest>, options?: GetRequestDataOptions) { const requireSchema = required_scopes.includes('SCHEMA');
const allowGuests = required_scopes.includes('GUEST');
const allowLitlyx = required_scopes.includes('LIVEMODE');
const requireSlice = required_scopes.includes('SLICE');
const requireRange = required_scopes.includes('RANGE');
const requireOffset = required_scopes.includes('OFFSET');
const pid = getHeader(event, 'x-pid');
if (!pid) return setResponseStatus(event, 400, 'x-pid is required');
const slice = getHeader(event, 'x-slice') as Slice;
if (!slice && requireSlice) return setResponseStatus(event, 400, 'x-slice is required');
const from = getRequestHeader(event, 'x-from');
const to = getRequestHeader(event, 'x-to');
if (requireRange) {
if (!from || !to) return setResponseStatus(event, 400, 'x-from and x-to are required');
}
const offsetRaw = getRequestHeader(event, 'x-time-offset');
const offset = parseInt(offsetRaw?.toString() as string);
if (requireOffset) {
if (offset === null || offset === undefined || isNaN(offset)) return setResponseStatus(event, 400, 'x-time-offset is required');
}
let model: Model<any> = undefined as any;
const schemaName = getRequestHeader(event, 'x-schema');
if (requireSchema) {
if (!schemaName) return setResponseStatus(event, 400, 'x-schema is required');
if (!Object.keys(allowedModels).includes(schemaName)) return setResponseStatus(event, 400, 'x-schema value is not valid');
const allowedModel = allowedModels[schemaName as TModelName];
model = allowedModel.model;
}
const limitHeader = getRequestHeader(event, 'x-limit');
const limitNumber = parseInt(limitHeader as string);
const limit = isNaN(limitNumber) ? 10 : limitNumber;
const user = getRequestUser(event);
if (!user || !user.logged) return setResponseStatus(event, 403, 'you must be logged');
const project_id = new Types.ObjectId(pid);
const project = await ProjectModel.findById(project_id);
if (!project) return setResponseStatus(event, 400, 'project not found');
if (pid !== LITLYX_PROJECT_ID) {
const [hasAccess, role] = await hasAccessToProject(user.id, project);
if (!hasAccess) return setResponseStatus(event, 400, 'no access to project');
if (role === 'GUEST' && !allowGuests) return setResponseStatus(event, 403, 'only owner can access this');
} else {
if (!allowLitlyx) return setResponseStatus(event, 400, 'no access to project');
}
return {
from: from as string,
to: to as string,
pid, project_id, project, user, limit, slice, schemaName, model, timeOffset: offset
}
}
/**
* @deprecated - use getRequestData instead
*/
export async function getRequestDataOld(event: H3Event<EventHandlerRequest>, options?: GetRequestDataOptions) {
const requireSchema = options?.requireSchema || false; const requireSchema = options?.requireSchema || false;
const allowGuests = options?.allowGuests || true; const allowGuests = options?.allowGuests || true;

View File

@@ -33,7 +33,7 @@ const VisitSchema = new Schema<TVisit>({
flowHash: { type: String }, flowHash: { type: String },
device: { type: String }, device: { type: String },
website: { type: String, required: true }, website: { type: String, required: true, index: true },
page: { type: String, required: true }, page: { type: String, required: true },
referrer: { type: String, required: true }, referrer: { type: String, required: true },
created_at: { type: Date, default: () => Date.now() }, created_at: { type: Date, default: () => Date.now() },