diff --git a/api/src/routes/auth/login.ts b/api/src/routes/auth/login.ts
new file mode 100644
index 00000000..c3661608
--- /dev/null
+++ b/api/src/routes/auth/login.ts
@@ -0,0 +1,113 @@
+import { Request, Response, Router } from "express";
+import { check, FieldErrors, Length } from "../../util/instanceOf";
+import bcrypt from "bcrypt";
+import jwt from "jsonwebtoken";
+import { Config, UserModel } from "@fosscord/server-util";
+import { adjustEmail } from "./register";
+import RateLimit from "../../middlewares/RateLimit";
+
+const router: Router = Router();
+export default router;
+
+// TODO: check if user is deleted --> prohibit login
+
+router.post(
+ "/",
+ check({
+ login: new Length(String, 2, 100), // email or telephone
+ password: new Length(String, 8, 72),
+ $undelete: Boolean,
+ $captcha_key: String,
+ $login_source: String,
+ $gift_code_sku_id: String
+ }),
+ async (req: Request, res: Response) => {
+ const { login, password, captcha_key, undelete } = req.body;
+ const email = adjustEmail(login);
+ const query: any[] = [{ phone: login }];
+ if (email) query.push({ email });
+
+ // TODO: Rewrite this to have the proper config syntax on the new method
+
+ const config = Config.get();
+
+ if (config.login.requireCaptcha && config.security.captcha.enabled) {
+ if (!captcha_key) {
+ const { sitekey, service } = config.security.captcha;
+ return res.status(400).json({
+ captcha_key: ["captcha-required"],
+ captcha_sitekey: sitekey,
+ captcha_service: service
+ });
+ }
+
+ // TODO: check captcha
+ }
+
+ const user = await UserModel.findOne(
+ { $or: query },
+ { user_data: { hash: true }, id: true, disabled: true, deleted: true, user_settings: { locale: true, theme: true } }
+ )
+ .exec()
+ .catch((e) => {
+ throw FieldErrors({ login: { message: req.t("auth:login.INVALID_LOGIN"), code: "INVALID_LOGIN" } });
+ });
+
+ if (undelete) {
+ // undelete refers to un'disable' here
+ if (user.disabled) await UserModel.updateOne({ id: user.id }, { disabled: false }).exec();
+ if (user.deleted) await UserModel.updateOne({ id: user.id }, { deleted: false }).exec();
+ } else {
+ if (user.deleted) return res.status(400).json({ message: "This account is scheduled for deletion.", code: 20011 });
+ if (user.disabled) return res.status(400).json({ message: req.t("auth:login.ACCOUNT_DISABLED"), code: 20013 });
+ }
+
+ // the salt is saved in the password refer to bcrypt docs
+ const same_password = await bcrypt.compare(password, user.user_data.hash || "");
+ if (!same_password) {
+ throw FieldErrors({ password: { message: req.t("auth:login.INVALID_PASSWORD"), code: "INVALID_PASSWORD" } });
+ }
+
+ const token = await generateToken(user.id);
+
+ // Notice this will have a different token structure, than discord
+ // Discord header is just the user id as string, which is not possible with npm-jsonwebtoken package
+ // https://user-images.githubusercontent.com/6506416/81051916-dd8c9900-8ec2-11ea-8794-daf12d6f31f0.png
+
+ res.json({ token, user_settings: user.user_settings });
+ }
+);
+
+export async function generateToken(id: string) {
+ const iat = Math.floor(Date.now() / 1000);
+ const algorithm = "HS256";
+
+ return new Promise((res, rej) => {
+ jwt.sign(
+ { id: id, iat },
+ Config.get().security.jwtSecret,
+ {
+ algorithm
+ },
+ (err, token) => {
+ if (err) return rej(err);
+ return res(token);
+ }
+ );
+ });
+}
+
+/**
+ * POST /auth/login
+ * @argument { login: "email@gmail.com", password: "cleartextpassword", undelete: false, captcha_key: null, login_source: null, gift_code_sku_id: null, }
+
+ * MFA required:
+ * @returns {"token": null, "mfa": true, "sms": true, "ticket": "SOME TICKET JWT TOKEN"}
+
+ * Captcha required:
+ * @returns {"captcha_key": ["captcha-required"], "captcha_sitekey": null, "captcha_service": "recaptcha"}
+
+ * Sucess:
+ * @returns {"token": "USERTOKEN", "user_settings": {"locale": "en", "theme": "dark"}}
+
+ */
diff --git a/api/src/routes/auth/register.ts b/api/src/routes/auth/register.ts
new file mode 100644
index 00000000..66a1fc8d
--- /dev/null
+++ b/api/src/routes/auth/register.ts
@@ -0,0 +1,309 @@
+import { Request, Response, Router } from "express";
+import { trimSpecial, User, Snowflake, UserModel, Config } from "@fosscord/server-util";
+import bcrypt from "bcrypt";
+import { check, Email, EMAIL_REGEX, FieldErrors, Length } from "../../util/instanceOf";
+import "missing-native-js-functions";
+import { generateToken } from "./login";
+import { getIpAdress, IPAnalysis, isProxy } from "../../util/ipAddress";
+import { HTTPError } from "lambert-server";
+import RateLimit from "../../middlewares/RateLimit";
+
+const router: Router = Router();
+
+router.post(
+ "/",
+ check({
+ username: new Length(String, 2, 32),
+ // TODO: check min password length in config
+ // prevent Denial of Service with max length of 72 chars
+ password: new Length(String, 8, 72),
+ consent: Boolean,
+ $email: new Length(Email, 5, 100),
+ $fingerprint: String,
+ $invite: String,
+ $date_of_birth: Date, // "2000-04-03"
+ $gift_code_sku_id: String,
+ $captcha_key: String
+ }),
+ async (req: Request, res: Response) => {
+ const {
+ email,
+ username,
+ password,
+ consent,
+ fingerprint,
+ invite,
+ date_of_birth,
+ gift_code_sku_id, // ? what is this
+ captcha_key
+ } = req.body;
+
+ // get register Config
+ const { register, security } = Config.get();
+ const ip = getIpAdress(req);
+
+ if (register.blockProxies) {
+ if (isProxy(await IPAnalysis(ip))) {
+ console.log(`proxy ${ip} blocked from registration`);
+ throw new HTTPError("Your IP is blocked from registration");
+ }
+ }
+
+ console.log("register", req.body.email, req.body.username, ip);
+ // TODO: automatically join invite
+ // TODO: gift_code_sku_id?
+ // TODO: check password strength
+
+ // adjusted_email will be slightly modified version of the user supplied email -> e.g. protection against GMail Trick
+ let adjusted_email: string | null = adjustEmail(email);
+
+ // adjusted_password will be the hash of the password
+ let adjusted_password: string = "";
+
+ // trim special uf8 control characters -> Backspace, Newline, ...
+ let adjusted_username: string = trimSpecial(username);
+
+ // discriminator will be randomly generated
+ let discriminator = "";
+
+ // check if registration is allowed
+ if (!register.allowNewRegistration) {
+ throw FieldErrors({
+ email: { code: "REGISTRATION_DISABLED", message: req.t("auth:register.REGISTRATION_DISABLED") }
+ });
+ }
+
+ // check if the user agreed to the Terms of Service
+ if (!consent) {
+ throw FieldErrors({
+ consent: { code: "CONSENT_REQUIRED", message: req.t("auth:register.CONSENT_REQUIRED") }
+ });
+ }
+
+ // require invite to register -> e.g. for organizations to send invites to their employees
+ if (register.requireInvite && !invite) {
+ throw FieldErrors({
+ email: { code: "INVITE_ONLY", message: req.t("auth:register.INVITE_ONLY") }
+ });
+ }
+
+ if (email) {
+ // replace all dots and chars after +, if its a gmail.com email
+ if (!adjusted_email) throw FieldErrors({ email: { code: "INVALID_EMAIL", message: req.t("auth:register.INVALID_EMAIL") } });
+
+ // check if there is already an account with this email
+ const exists = await UserModel.findOne({ email: adjusted_email })
+ .exec()
+ .catch((e) => {});
+
+ if (exists) {
+ throw FieldErrors({
+ email: {
+ code: "EMAIL_ALREADY_REGISTERED",
+ message: req.t("auth:register.EMAIL_ALREADY_REGISTERED")
+ }
+ });
+ }
+ } else if (register.email.necessary) {
+ throw FieldErrors({
+ email: { code: "BASE_TYPE_REQUIRED", message: req.t("common:field.BASE_TYPE_REQUIRED") }
+ });
+ }
+
+ if (register.dateOfBirth.necessary && !date_of_birth) {
+ throw FieldErrors({
+ date_of_birth: { code: "BASE_TYPE_REQUIRED", message: req.t("common:field.BASE_TYPE_REQUIRED") }
+ });
+ } else if (register.dateOfBirth.minimum) {
+ const minimum = new Date();
+ minimum.setFullYear(minimum.getFullYear() - register.dateOfBirth.minimum);
+
+ // higher is younger
+ if (date_of_birth > minimum) {
+ throw FieldErrors({
+ date_of_birth: {
+ code: "DATE_OF_BIRTH_UNDERAGE",
+ message: req.t("auth:register.DATE_OF_BIRTH_UNDERAGE", { years: register.dateOfBirth.minimum })
+ }
+ });
+ }
+ }
+
+ if (!register.allowMultipleAccounts) {
+ // TODO: check if fingerprint was eligible generated
+ const exists = await UserModel.findOne({ fingerprints: fingerprint })
+ .exec()
+ .catch((e) => {});
+
+ if (exists) {
+ throw FieldErrors({
+ email: {
+ code: "EMAIL_ALREADY_REGISTERED",
+ message: req.t("auth:register.EMAIL_ALREADY_REGISTERED")
+ }
+ });
+ }
+ }
+
+ if (register.requireCaptcha && security.captcha.enabled) {
+ if (!captcha_key) {
+ const { sitekey, service } = security.captcha;
+ return res.status(400).json({
+ captcha_key: ["captcha-required"],
+ captcha_sitekey: sitekey,
+ captcha_service: service
+ });
+ }
+
+ // TODO: check captcha
+ }
+
+ // the salt is saved in the password refer to bcrypt docs
+ adjusted_password = await bcrypt.hash(password, 12);
+
+ let exists;
+ // randomly generates a discriminator between 1 and 9999 and checks max five times if it already exists
+ // if it all five times already exists, abort with USERNAME_TOO_MANY_USERS error
+ // else just continue
+ // TODO: is there any better way to generate a random discriminator only once, without checking if it already exists in the mongodb database?
+ for (let tries = 0; tries < 5; tries++) {
+ discriminator = Math.randomIntBetween(1, 9999).toString().padStart(4, "0");
+ try {
+ exists = await UserModel.findOne({ discriminator, username: adjusted_username }, "id").exec();
+ } catch (error) {
+ // doesn't exist -> break
+ break;
+ }
+ }
+
+ if (exists) {
+ throw FieldErrors({
+ username: {
+ code: "USERNAME_TOO_MANY_USERS",
+ message: req.t("auth:register.USERNAME_TOO_MANY_USERS")
+ }
+ });
+ }
+
+ // TODO: save date_of_birth
+ // appearently discord doesn't save the date of birth and just calculate if nsfw is allowed
+ // if nsfw_allowed is null/undefined it'll require date_of_birth to set it to true/false
+
+ const user: User = {
+ id: Snowflake.generate(),
+ created_at: new Date(),
+ username: adjusted_username,
+ discriminator,
+ avatar: null,
+ accent_color: null,
+ banner: null,
+ bot: false,
+ system: false,
+ desktop: false,
+ mobile: false,
+ premium: true,
+ premium_type: 2,
+ phone: null,
+ bio: "",
+ mfa_enabled: false,
+ verified: false,
+ disabled: false,
+ deleted: false,
+ presence: {
+ activities: [],
+ client_status: {
+ desktop: undefined,
+ mobile: undefined,
+ web: undefined
+ },
+ status: "offline"
+ },
+ email: adjusted_email,
+ nsfw_allowed: true, // TODO: depending on age
+ public_flags: 0n,
+ flags: 0n, // TODO: generate default flags
+ guilds: [],
+ user_data: {
+ hash: adjusted_password,
+ valid_tokens_since: new Date(),
+ relationships: [],
+ connected_accounts: [],
+ fingerprints: []
+ },
+ user_settings: {
+ afk_timeout: 300,
+ allow_accessibility_detection: true,
+ animate_emoji: true,
+ animate_stickers: 0,
+ contact_sync_enabled: false,
+ convert_emoticons: false,
+ custom_status: {
+ emoji_id: null,
+ emoji_name: null,
+ expires_at: null,
+ text: null
+ },
+ default_guilds_restricted: false,
+ detect_platform_accounts: true,
+ developer_mode: false,
+ disable_games_tab: false,
+ enable_tts_command: true,
+ explicit_content_filter: 0,
+ friend_source_flags: { all: true },
+ gateway_connected: false,
+ gif_auto_play: true,
+ guild_folders: [],
+ guild_positions: [],
+ inline_attachment_media: true,
+ inline_embed_media: true,
+ locale: req.language,
+ message_display_compact: false,
+ native_phone_integration_enabled: true,
+ render_embeds: true,
+ render_reactions: true,
+ restricted_guilds: [],
+ show_current_game: true,
+ status: "offline",
+ stream_notifications_enabled: true,
+ theme: "dark",
+ timezone_offset: 0
+ // timezone_offset: // TODO: timezone from request
+ }
+ };
+
+ // insert user into database
+ await new UserModel(user).save();
+
+ return res.json({ token: await generateToken(user.id) });
+ }
+);
+
+export function adjustEmail(email: string): string | null {
+ // body parser already checked if it is a valid email
+ const parts = <RegExpMatchArray>email.match(EMAIL_REGEX);
+ // @ts-ignore
+ if (!parts || parts.length < 5) return undefined;
+ const domain = parts[5];
+ const user = parts[1];
+
+ // TODO: check accounts with uncommon email domains
+ if (domain === "gmail.com" || domain === "googlemail.com") {
+ // replace .dots and +alternatives -> Gmail Dot Trick https://support.google.com/mail/answer/7436150 and https://generator.email/blog/gmail-generator
+ return user.replace(/[.]|(\+.*)/g, "") + "@gmail.com";
+ }
+
+ return email;
+}
+
+export default router;
+
+/**
+ * POST /auth/register
+ * @argument { "fingerprint":"805826570869932034.wR8vi8lGlFBJerErO9LG5NViJFw", "email":"qo8etzvaf@gmail.com", "username":"qp39gr98", "password":"wtp9gep9gw", "invite":null, "consent":true, "date_of_birth":"2000-04-04", "gift_code_sku_id":null, "captcha_key":null}
+ *
+ * Field Error
+ * @returns { "code": 50035, "errors": { "consent": { "_errors": [{ "code": "CONSENT_REQUIRED", "message": "You must agree to Discord's Terms of Service and Privacy Policy." }]}}, "message": "Invalid Form Body"}
+ *
+ * Success 201:
+ * @returns {token: "OMITTED"}
+ */
|