diff options
| author | Flam3rboy <34555296+Flam3rboy@users.noreply.github.com> | 2021-10-09 12:54:03 +0200 |
|---|---|---|
| committer | Flam3rboy <34555296+Flam3rboy@users.noreply.github.com> | 2021-10-09 12:54:03 +0200 |
| commit | d1844b65d147022d1c848d368f893af3c5603f77 (patch) | |
| tree | fd8b2b33b4290f143149e8766b020f27d69db4fe | |
| parent | :bug: fix password changing (diff) | |
| download | server-d1844b65d147022d1c848d368f893af3c5603f77.tar.xz | |
:sparkles: added guestsRequireInvite to config
| -rw-r--r-- | api/src/routes/auth/register.ts | 12 | ||||
| -rw-r--r-- | util/src/entities/Config.ts | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/api/src/routes/auth/register.ts b/api/src/routes/auth/register.ts index 9f3b46f1..4b08e78e 100644 --- a/api/src/routes/auth/register.ts +++ b/api/src/routes/auth/register.ts @@ -154,16 +154,18 @@ router.post("/", route({ body: "RegisterSchema" }), async (req: Request, res: Re }); } + if (!body.invite && (register.requireInvite || (register.guestsRequireInvite && !register.email))) { + // require invite to register -> e.g. for organizations to send invites to their employees + throw FieldErrors({ + email: { code: "INVITE_ONLY", message: req.t("auth:register.INVITE_ONLY") } + }); + } + const user = await User.register({ ...body, req }); if (body.invite) { // await to fail if the invite doesn't exist (necessary for requireInvite to work properly) (username only signups are possible) await Invite.joinGuild(user.id, body.invite); - } else if (register.requireInvite) { - // require invite to register -> e.g. for organizations to send invites to their employees - throw FieldErrors({ - email: { code: "INVITE_ONLY", message: req.t("auth:register.INVITE_ONLY") } - }); } return res.json({ token: await generateToken(user.id) }); diff --git a/util/src/entities/Config.ts b/util/src/entities/Config.ts index 921a12c2..813649ac 100644 --- a/util/src/entities/Config.ts +++ b/util/src/entities/Config.ts @@ -128,6 +128,7 @@ export interface ConfigValue { disabled: boolean; requireCaptcha: boolean; requireInvite: boolean; + guestsRequireInvite: boolean; allowNewRegistration: boolean; allowMultipleAccounts: boolean; blockProxies: boolean; @@ -277,6 +278,7 @@ export const DefaultConfigOptions: ConfigValue = { }, disabled: false, requireInvite: false, + guestsRequireInvite: true, requireCaptcha: true, allowNewRegistration: true, allowMultipleAccounts: true, |