diff options
author | Flam3rboy <34555296+Flam3rboy@users.noreply.github.com> | 2021-08-13 20:53:50 +0200 |
---|---|---|
committer | Flam3rboy <34555296+Flam3rboy@users.noreply.github.com> | 2021-08-13 20:53:50 +0200 |
commit | 49da9769439b1618e178928e889cdf583e0e973b (patch) | |
tree | ab7ce3d433d5c6a624f329217bd0fcc2f336e78d /api/src/middlewares | |
parent | :pencil: updated links to fosscord-server (diff) | |
download | server-49da9769439b1618e178928e889cdf583e0e973b.tar.xz |
:bug: fix api middleware
Diffstat (limited to 'api/src/middlewares')
-rw-r--r-- | api/src/middlewares/Authentication.ts | 6 | ||||
-rw-r--r-- | api/src/middlewares/Translation.ts | 28 |
2 files changed, 30 insertions, 4 deletions
diff --git a/api/src/middlewares/Authentication.ts b/api/src/middlewares/Authentication.ts index 00cd9ea7..9bd2fcb7 100644 --- a/api/src/middlewares/Authentication.ts +++ b/api/src/middlewares/Authentication.ts @@ -28,10 +28,8 @@ declare global { export async function Authentication(req: Request, res: Response, next: NextFunction) { if (req.method === "OPTIONS") return res.sendStatus(204); - if (!req.url.startsWith("/api")) return next(); - const apiPath = req.url.replace(API_PREFIX, ""); - if (apiPath.startsWith("/invites") && req.method === "GET") return next(); // @ts-ignore - if (NO_AUTHORIZATION_ROUTES.some((x) => apiPath.startsWith(x) || x.test?.(req.url))) return next(); + if (req.url.startsWith("/invites") && req.method === "GET") return next(); // @ts-ignore + if (NO_AUTHORIZATION_ROUTES.some((x) => req.url.startsWith(x) || x.test?.(req.url))) return next(); if (!req.headers.authorization) return next(new HTTPError("Missing Authorization Header", 401)); try { diff --git a/api/src/middlewares/Translation.ts b/api/src/middlewares/Translation.ts new file mode 100644 index 00000000..edc14707 --- /dev/null +++ b/api/src/middlewares/Translation.ts @@ -0,0 +1,28 @@ +import fs from "fs"; +import path from "path"; +import i18next from "i18next"; +import i18nextMiddleware from "i18next-http-middleware"; +import i18nextBackend from "i18next-node-fs-backend"; +import { Router } from "express"; + +export async function initTranslation(router: Router) { + const languages = fs.readdirSync(path.join(__dirname, "..", "..", "locales")); + const namespaces = fs.readdirSync(path.join(__dirname, "..", "..", "locales", "en")); + const ns = namespaces.filter((x) => x.endsWith(".json")).map((x) => x.slice(0, x.length - 5)); + + await i18next + .use(i18nextBackend) + .use(i18nextMiddleware.LanguageDetector) + .init({ + preload: languages, + // debug: true, + fallbackLng: "en", + ns, + backend: { + loadPath: __dirname + "/../locales/{{lng}}/{{ns}}.json" + }, + load: "all" + }); + + router.use(i18nextMiddleware.handle(i18next, {})); +} |