Merge branch 'dev' of https://github.com/umami-software/umami into feat/um-376-retention-report

pages/api/auth/login.ts

@@ -7,6 +7,7 @@ import {
   checkPassword,
   createSecureToken,
   methodNotAllowed,
+  forbidden,
 } from 'next-basics';
 import redis from '@umami/redis-client';
 import { getUserByUsername } from 'queries';
@@ -30,6 +31,10 @@ export default async (
   req: NextApiRequestQueryBody<any, LoginRequestBody>,
   res: NextApiResponse<LoginResponse>,
 ) => {
+  if (process.env.DISABLE_LOGIN) {
+    return forbidden(res);
+  }
+
   if (req.method === 'POST') {
     const { username, password } = req.body;
 

pages/api/reports/insights.ts

@@ -11,7 +11,7 @@ export interface InsightsRequestBody {
     startDate: string;
     endDate: string;
   };
-  fields: string[];
+  fields: { name: string; type: string; value: string }[];
   filters: string[];
   groups: string[];
 }

pages/api/websites/[id]/metrics.ts

@@ -46,6 +46,7 @@ export default async (
     country,
     region,
     city,
+    language,
   } = req.query;
 
   if (req.method === 'GET') {
@@ -55,20 +56,27 @@ export default async (
 
     const { startDate, endDate } = await parseDateRangeQuery(req);
 
+    const filters = {
+      url,
+      referrer,
+      title,
+      query,
+      event,
+      os,
+      browser,
+      device,
+      country,
+      region,
+      city,
+      language,
+    };
+
+    filters[type] = undefined;
+
+    const column = FILTER_COLUMNS[type] || type;
+
     if (SESSION_COLUMNS.includes(type)) {
-      const column = FILTER_COLUMNS[type] || type;
-      const filters = {
-        os,
-        browser,
-        device,
-        country,
-        region,
-        city,
-      };
-
-      filters[type] = undefined;
-
-      let data = await getSessionMetrics(websiteId, {
+      const data = await getSessionMetrics(websiteId, {
         startDate,
         endDate,
         column,
@@ -88,30 +96,13 @@ export default async (
           }
         }
 
-        data = Object.values(combined);
+        return ok(res, Object.values(combined));
       }
 
       return ok(res, data);
     }
 
     if (EVENT_COLUMNS.includes(type)) {
-      const column = FILTER_COLUMNS[type] || type;
-      const filters = {
-        url,
-        referrer,
-        title,
-        query,
-        event,
-        os,
-        browser,
-        device,
-        country,
-        region,
-        city,
-      };
-
-      filters[type] = undefined;
-
       const data = await getPageviewMetrics(websiteId, {
         startDate,
         endDate,

pages/api/websites/[id]/pageviews.ts

@@ -6,6 +6,7 @@ import { canViewWebsite } from 'lib/auth';
 import { useAuth, useCors } from 'lib/middleware';
 import { getPageviewStats } from 'queries';
 import { parseDateRangeQuery } from 'lib/query';
+import { getSessionStats } from '../../../../queries/analytics/sessions/getSessionStats';
 
 export interface WebsitePageviewRequestQuery {
   id: string;
@@ -62,7 +63,6 @@ export default async (
         endDate,
         timezone,
         unit,
-        count: '*',
         filters: {
           url,
           referrer,
@@ -75,14 +75,14 @@ export default async (
           city,
         },
       }),
-      getPageviewStats(websiteId, {
+      getSessionStats(websiteId, {
         startDate,
         endDate,
         timezone,
         unit,
-        count: 'distinct website_event.',
         filters: {
           url,
+          referrer,
           title,
           os,
           browser,