diff --git a/src/pages/api/check.ts b/src/pages/api/check.ts index 460ad12..0652606 100644 --- a/src/pages/api/check.ts +++ b/src/pages/api/check.ts @@ -1,22 +1,15 @@ -import type {NextApiRequest, NextApiResponse} from 'next'; -import {env} from '@/env/server.mjs'; +import type { NextApiRequest, NextApiResponse } from 'next'; +import { unauthorized } from '@/utils/helpers'; type StatusData = { status: ResponseStatus }; -type ResponseStatus = - | 'unauthorized' - | 'success'; - +type ResponseStatus = 'unauthorized' | 'success'; export default async function handler( - req: NextApiRequest, - res: NextApiResponse + req: NextApiRequest, + res: NextApiResponse ) { - if (req.query.key != env.API_KEY) { - // auth failed - res.status(401).json({ status: 'unauthorized' }); - return; - } + if (unauthorized(req, res)) return; - res.status(200).json({ status: 'success'}); + res.status(200).json({ status: 'success' }); } diff --git a/src/pages/api/config.ts b/src/pages/api/config.ts index aa07bfc..19a9d12 100644 --- a/src/pages/api/config.ts +++ b/src/pages/api/config.ts @@ -1,7 +1,7 @@ import type { NextApiRequest, NextApiResponse } from 'next'; -import { env } from '@/env/server.mjs'; import { fetchConfiguration, setConfiguration } from '@/db'; import { Configuration, ConfigurationSchema } from '@/timing'; +import { unauthorized } from '@/utils/helpers'; type StatusData = { status: ResponseStatus }; @@ -11,11 +11,7 @@ export default async function handler( req: NextApiRequest, res: NextApiResponse ) { - if (req.query.key != env.API_KEY) { - // auth failed - res.status(401).json({ status: 'unauthorized' }); - return; - } + if (unauthorized(req, res)) return; if (req.method == 'GET') { try { diff --git a/src/pages/api/cron.ts b/src/pages/api/cron.ts index 073ebe7..892455f 100644 --- a/src/pages/api/cron.ts +++ b/src/pages/api/cron.ts @@ -1,7 +1,6 @@ import { getMatchingTime } from '@/timing'; import type { NextApiRequest, NextApiResponse } from 'next'; import { getDistance } from '@/location'; -import { env } from '@/env/server.mjs'; import monitorAsync from '@/monitor'; import { sendNotification } from '@/notify'; import { @@ -32,11 +31,6 @@ type ResponseStatus = | 'notified' | 'error'; -const center = { - latitude: env.CENTER_LATITUDE, - longitude: env.CENTER_LONGITUDE -}; - export default async function handler( req: NextApiRequest, res: NextApiResponse<(ResponseData & StatusData) | StatusData>