summary refs log tree commit diff
path: root/api
diff options
context:
space:
mode:
authorSamuel <34555296+Flam3rboy@users.noreply.github.com>2021-12-05 20:13:40 +0100
committerGitHub <noreply@github.com>2021-12-05 20:13:40 +0100
commit0a26b7baf24e33aecf789716a2ff3891d7185bdf (patch)
tree86bd65265bbd238237ae6b4e74f07d792d892875 /api
parentMerge pull request #530 from erkinalp/patch-3 (diff)
parentMinor API work (diff)
downloadserver-0a26b7baf24e33aecf789716a2ff3891d7185bdf.tar.xz
Merge pull request #536 from Thesourtimes/master
Diffstat (limited to 'api')
-rw-r--r--api/src/middlewares/Authentication.ts8
-rw-r--r--api/src/routes/invites/index.ts7
2 files changed, 14 insertions, 1 deletions
diff --git a/api/src/middlewares/Authentication.ts b/api/src/middlewares/Authentication.ts

index 8fbdd2b7..20ba42d8 100644 --- a/api/src/middlewares/Authentication.ts +++ b/api/src/middlewares/Authentication.ts
@@ -3,17 +3,25 @@ import { HTTPError } from "lambert-server"; import { checkToken, Config, Rights } from "@fosscord/util"; export const NO_AUTHORIZATION_ROUTES = [ + //Authentication routes "/auth/login", "/auth/register", + "/auth/location-metadata", + //Routes with a seperate auth system "/webhooks/", + //Public information endpoints "/ping", "/gateway", "/experiments", + //Public kubernetes integration "/-/readyz", "/-/healthz", + //Client nalytics "/science", "/track", + //Public policy pages "/policies/instance", + //Asset delivery /\/guilds\/\d+\/widget\.(json|png)/ ]; diff --git a/api/src/routes/invites/index.ts b/api/src/routes/invites/index.ts
index 185311bc..c327a63e 100644 --- a/api/src/routes/invites/index.ts +++ b/api/src/routes/invites/index.ts
@@ -1,5 +1,5 @@ import { Router, Request, Response } from "express"; -import { emitEvent, getPermission, Guild, Invite, InviteDeleteEvent, Member, PublicInviteRelation } from "@fosscord/util"; +import { emitEvent, getPermission, Guild, Invite, InviteDeleteEvent, User, PublicInviteRelation } from "@fosscord/util"; import { route } from "@fosscord/api"; import { HTTPError } from "lambert-server"; @@ -15,6 +15,11 @@ router.get("/:code", route({}), async (req: Request, res: Response) => { router.post("/:code", route({}), async (req: Request, res: Response) => { const { code } = req.params; + const { features } = await Guild.findOneOrFail({where: { code }}); + const { public_flags } = await User.findOneOrFail({ id: req.user_id }); + + if(features.includes("INTERNAL_EMPLOYEE_ONLY") && (public_flags & 1) !== 1) throw new HTTPError("You are not allowed to join this guild.", 401) + const invite = await Invite.joinGuild(req.user_id, code); res.json(invite);