diff --git a/src/components/widgets/openweathermap/weather.jsx b/src/components/widgets/openweathermap/weather.jsx index 63b7b081..a2074353 100644 --- a/src/components/widgets/openweathermap/weather.jsx +++ b/src/components/widgets/openweathermap/weather.jsx @@ -4,9 +4,7 @@ import { BiError } from "react-icons/bi"; import Icon from "./icon"; export default function OpenWeatherMap({ options }) { - const { data, error } = useSWR( - `/api/widgets/openweathermap?lat=${options.latitude}&lon=${options.longitude}&apiKey=${options.apiKey}&duration=${options.cache}&units=${options.units}` - ); + const { data, error } = useSWR(`/api/widgets/openweathermap?${new URLSearchParams(options).toString()}`); if (error || data?.cod == 401) { return ( diff --git a/src/components/widgets/weather/weather.jsx b/src/components/widgets/weather/weather.jsx index 6fc365f0..87d03786 100644 --- a/src/components/widgets/weather/weather.jsx +++ b/src/components/widgets/weather/weather.jsx @@ -4,9 +4,8 @@ import { BiError } from "react-icons/bi"; import Icon from "./icon"; export default function WeatherApi({ options }) { - const { data, error } = useSWR( - `/api/widgets/weather?lat=${options.latitude}&lon=${options.longitude}&apiKey=${options.apiKey}&duration=${options.cache}` - ); + console.log(options); + const { data, error } = useSWR(`/api/widgets/weather?${new URLSearchParams(options).toString()}`); if (error) { return ( diff --git a/src/pages/api/widgets/openweathermap.js b/src/pages/api/widgets/openweathermap.js index 07dc9139..5a687725 100644 --- a/src/pages/api/widgets/openweathermap.js +++ b/src/pages/api/widgets/openweathermap.js @@ -1,9 +1,28 @@ import cachedFetch from "utils/cached-fetch"; +import { getSettings } from "utils/config"; export default async function handler(req, res) { - const { lat, lon, apiKey, duration, units } = req.query; + const { latitude, longitude, units, provider, cache } = req.query; + let { apiKey } = req.query; - const api_url = `https://api.openweathermap.org/data/2.5/weather?lat=${lat}&lon=${lon}&appid=${apiKey}&units=${units}`; + if (!apiKey && !provider) { + return res.status(400).json({ error: "Missing API key or provider" }); + } - res.send(await cachedFetch(api_url, duration)); + if (!apiKey && provider !== "openweathermap") { + return res.status(400).json({ error: "Invalid provider for endpoint" }); + } + + if (!apiKey && provider) { + const settings = await getSettings(); + apiKey = settings?.providers?.openweathermap; + } + + if (!apiKey) { + return res.status(400).json({ error: "Missing API key" }); + } + + const api_url = `https://api.openweathermap.org/data/2.5/weather?lat=${latitude}&lon=${longitude}&appid=${apiKey}&units=${units}`; + + res.send(await cachedFetch(api_url, cache)); } diff --git a/src/pages/api/widgets/weather.js b/src/pages/api/widgets/weather.js index 5d1af4b0..a7da1093 100644 --- a/src/pages/api/widgets/weather.js +++ b/src/pages/api/widgets/weather.js @@ -1,9 +1,28 @@ import cachedFetch from "utils/cached-fetch"; +import { getSettings } from "utils/config"; export default async function handler(req, res) { - const { lat, lon, apiKey, duration } = req.query; + const { latitude, longitude, provider, cache } = req.query; + let { apiKey } = req.query; - const api_url = `http://api.weatherapi.com/v1/current.json?q=${lat},${lon}&key=${apiKey}`; + if (!apiKey && !provider) { + return res.status(400).json({ error: "Missing API key or provider" }); + } - res.send(await cachedFetch(api_url, duration)); + if (!apiKey && provider !== "weatherapi") { + return res.status(400).json({ error: "Invalid provider for endpoint" }); + } + + if (!apiKey && provider) { + const settings = await getSettings(); + apiKey = settings?.providers?.weatherapi; + } + + if (!apiKey) { + return res.status(400).json({ error: "Missing API key" }); + } + + const api_url = `http://api.weatherapi.com/v1/current.json?q=${latitude},${longitude}&key=${apiKey}`; + + res.send(await cachedFetch(api_url, cache)); } diff --git a/src/skeleton/settings.yaml b/src/skeleton/settings.yaml new file mode 100644 index 00000000..5efd0e25 --- /dev/null +++ b/src/skeleton/settings.yaml @@ -0,0 +1,3 @@ +providers: + openweathermap: openweathermapapikey + weatherapi: weatherapiapikey diff --git a/src/utils/config.js b/src/utils/config.js index 758393ce..d00f3818 100644 --- a/src/utils/config.js +++ b/src/utils/config.js @@ -1,5 +1,8 @@ import { join } from "path"; import { existsSync, copyFile } from "fs"; +import { promises as fs } from "fs"; +import path from "path"; +import yaml from "js-yaml"; export default function checkAndCopyConfig(config) { const configYaml = join(process.cwd(), "config", config); @@ -14,3 +17,11 @@ export default function checkAndCopyConfig(config) { }); } } + +export async function getSettings() { + checkAndCopyConfig("settings.yaml"); + + const settingsYaml = path.join(process.cwd(), "config", "settings.yaml"); + const fileContents = await fs.readFile(settingsYaml, "utf8"); + return yaml.load(fileContents); +}