mirror of
https://github.com/kremalicious/umami.git
synced 2024-06-30 13:41:50 +02:00
Merge pull request #1065 from mikecao/dev
Added CORS to website API endpoints.
This commit is contained in:
commit
493f5a5cf1
|
@ -34,7 +34,7 @@ export default async (req, res) => {
|
||||||
return badRequest(res, 'Account already exists');
|
return badRequest(res, 'Account already exists');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
console.log('------------------\n', data);
|
|
||||||
const updated = await updateAccount(user_id, data);
|
const updated = await updateAccount(user_id, data);
|
||||||
|
|
||||||
return ok(res, updated);
|
return ok(res, updated);
|
||||||
|
|
|
@ -1,9 +1,12 @@
|
||||||
import { getActiveVisitors } from 'lib/queries';
|
import { getActiveVisitors } from 'lib/queries';
|
||||||
import { methodNotAllowed, ok, unauthorized } from 'lib/response';
|
import { methodNotAllowed, ok, unauthorized } from 'lib/response';
|
||||||
import { allowQuery } from 'lib/auth';
|
import { allowQuery } from 'lib/auth';
|
||||||
|
import { useCors } from 'lib/middleware';
|
||||||
|
|
||||||
export default async (req, res) => {
|
export default async (req, res) => {
|
||||||
if (req.method === 'GET') {
|
if (req.method === 'GET') {
|
||||||
|
await useCors(req, res);
|
||||||
|
|
||||||
if (!(await allowQuery(req))) {
|
if (!(await allowQuery(req))) {
|
||||||
return unauthorized(res);
|
return unauthorized(res);
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,11 +2,14 @@ import moment from 'moment-timezone';
|
||||||
import { getEventMetrics } from 'lib/queries';
|
import { getEventMetrics } from 'lib/queries';
|
||||||
import { ok, badRequest, methodNotAllowed, unauthorized } from 'lib/response';
|
import { ok, badRequest, methodNotAllowed, unauthorized } from 'lib/response';
|
||||||
import { allowQuery } from 'lib/auth';
|
import { allowQuery } from 'lib/auth';
|
||||||
|
import { useCors } from 'lib/middleware';
|
||||||
|
|
||||||
const unitTypes = ['year', 'month', 'hour', 'day'];
|
const unitTypes = ['year', 'month', 'hour', 'day'];
|
||||||
|
|
||||||
export default async (req, res) => {
|
export default async (req, res) => {
|
||||||
if (req.method === 'GET') {
|
if (req.method === 'GET') {
|
||||||
|
await useCors(req, res);
|
||||||
|
|
||||||
if (!(await allowQuery(req))) {
|
if (!(await allowQuery(req))) {
|
||||||
return unauthorized(res);
|
return unauthorized(res);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
import { deleteWebsite, getWebsiteById } from 'lib/queries';
|
import { deleteWebsite, getWebsiteById } from 'lib/queries';
|
||||||
import { methodNotAllowed, ok, unauthorized } from 'lib/response';
|
import { methodNotAllowed, ok, unauthorized } from 'lib/response';
|
||||||
import { allowQuery } from 'lib/auth';
|
import { allowQuery } from 'lib/auth';
|
||||||
|
import { useCors } from 'lib/middleware';
|
||||||
|
|
||||||
export default async (req, res) => {
|
export default async (req, res) => {
|
||||||
const { id } = req.query;
|
const { id } = req.query;
|
||||||
|
@ -8,6 +9,8 @@ export default async (req, res) => {
|
||||||
const websiteId = +id;
|
const websiteId = +id;
|
||||||
|
|
||||||
if (req.method === 'GET') {
|
if (req.method === 'GET') {
|
||||||
|
await useCors(req, res);
|
||||||
|
|
||||||
if (!(await allowQuery(req))) {
|
if (!(await allowQuery(req))) {
|
||||||
return unauthorized(res);
|
return unauthorized(res);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
import { getPageviewMetrics, getSessionMetrics, getWebsiteById } from 'lib/queries';
|
import { getPageviewMetrics, getSessionMetrics, getWebsiteById } from 'lib/queries';
|
||||||
import { ok, methodNotAllowed, unauthorized, badRequest } from 'lib/response';
|
import { ok, methodNotAllowed, unauthorized, badRequest } from 'lib/response';
|
||||||
import { allowQuery } from 'lib/auth';
|
import { allowQuery } from 'lib/auth';
|
||||||
|
import { useCors } from 'lib/middleware';
|
||||||
|
|
||||||
const sessionColumns = ['browser', 'os', 'device', 'country', 'language'];
|
const sessionColumns = ['browser', 'os', 'device', 'country', 'language'];
|
||||||
const pageviewColumns = ['url', 'referrer'];
|
const pageviewColumns = ['url', 'referrer'];
|
||||||
|
@ -26,6 +27,8 @@ function getColumn(type) {
|
||||||
|
|
||||||
export default async (req, res) => {
|
export default async (req, res) => {
|
||||||
if (req.method === 'GET') {
|
if (req.method === 'GET') {
|
||||||
|
await useCors(req, res);
|
||||||
|
|
||||||
if (!(await allowQuery(req))) {
|
if (!(await allowQuery(req))) {
|
||||||
return unauthorized(res);
|
return unauthorized(res);
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,11 +2,14 @@ import moment from 'moment-timezone';
|
||||||
import { getPageviewStats } from 'lib/queries';
|
import { getPageviewStats } from 'lib/queries';
|
||||||
import { ok, badRequest, methodNotAllowed, unauthorized } from 'lib/response';
|
import { ok, badRequest, methodNotAllowed, unauthorized } from 'lib/response';
|
||||||
import { allowQuery } from 'lib/auth';
|
import { allowQuery } from 'lib/auth';
|
||||||
|
import { useCors } from 'lib/middleware';
|
||||||
|
|
||||||
const unitTypes = ['year', 'month', 'hour', 'day'];
|
const unitTypes = ['year', 'month', 'hour', 'day'];
|
||||||
|
|
||||||
export default async (req, res) => {
|
export default async (req, res) => {
|
||||||
if (req.method === 'GET') {
|
if (req.method === 'GET') {
|
||||||
|
await useCors(req, res);
|
||||||
|
|
||||||
if (!(await allowQuery(req))) {
|
if (!(await allowQuery(req))) {
|
||||||
return unauthorized(res);
|
return unauthorized(res);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +1,12 @@
|
||||||
import { getWebsiteStats } from 'lib/queries';
|
import { getWebsiteStats } from 'lib/queries';
|
||||||
import { methodNotAllowed, ok, unauthorized } from 'lib/response';
|
import { methodNotAllowed, ok, unauthorized } from 'lib/response';
|
||||||
import { allowQuery } from 'lib/auth';
|
import { allowQuery } from 'lib/auth';
|
||||||
|
import { useCors } from 'lib/middleware';
|
||||||
|
|
||||||
export default async (req, res) => {
|
export default async (req, res) => {
|
||||||
if (req.method === 'GET') {
|
if (req.method === 'GET') {
|
||||||
|
await useCors(req, res);
|
||||||
|
|
||||||
if (!(await allowQuery(req))) {
|
if (!(await allowQuery(req))) {
|
||||||
return unauthorized(res);
|
return unauthorized(res);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user