Dekescordes/spacebar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/fosscord/fosscord-api

Browse Source
This commit is contained in:
Flam3rboy 2021-08-11 19:45:09 +02:00
commit a2cb5668f6
39 changed files with 110 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
locales/af/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "E-Mail or Phone not found",
"INVALID_PASSWORD": "Invalid Password"
"INVALID_PASSWORD": "Invalid Password",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "New user registration is disabled",

3
locales/ar/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "البريد الإلكتروني أو الهاتف غير موجود",
"INVALID_PASSWORD": "كلمة المرور غير صالحة"
"INVALID_PASSWORD": "كلمة المرور غير صالحة",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "تم تعطيل تسجيل المستخدم الجديد",

3
locales/be/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "Дадзены адрас электроннай пошты ці тэлефон не знойдзены",
"INVALID_PASSWORD": "Няправільны пароль"
"INVALID_PASSWORD": "Няправільны пароль",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "Рэгістрацыя новага карыстальніка адключана",

3
locales/bg/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "Невалиден имейл адрес или телефонен номер",
"INVALID_PASSWORD": "Невалидна парола"
"INVALID_PASSWORD": "Невалидна парола",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "Регистрацията на нов потребител е деактивирана",

3
locales/ca/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "E-Mail or Phone not found",
"INVALID_PASSWORD": "Invalid Password"
"INVALID_PASSWORD": "Invalid Password",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "New user registration is disabled",

3
locales/cs/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "E-Mail nebo telefon nenalezen",
"INVALID_PASSWORD": "Neplatné heslo"
"INVALID_PASSWORD": "Neplatné heslo",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "Registrace nového uživatele je zakázána",

3
locales/da/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "E-mail eller telefon ikke fundet",
"INVALID_PASSWORD": "Ugyldig Adgangskode"
"INVALID_PASSWORD": "Ugyldig Adgangskode",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "Ny brugerregistrering er deaktiveret",

3
locales/de/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "E-Mail oder Telefonnummer nicht gefunden",
"INVALID_PASSWORD": "Ungültiges Passwort"
"INVALID_PASSWORD": "Ungültiges Passwort",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "Die Registrierung ist deaktiviert",

3
locales/el/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "Το e-mail ή το τηλέφωνο δεν βρέθηκε",
"INVALID_PASSWORD": "Μη Έγκυρος Κωδικός"
"INVALID_PASSWORD": "Μη Έγκυρος Κωδικός",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "Η εγγραφή νέου χρήστη είναι απενεργοποιημένη",

3
locales/en/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "E-Mail or Phone not found",
"INVALID_PASSWORD": "Invalid Password"
"INVALID_PASSWORD": "Invalid Password",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "New user registration is disabled",

3
locales/eo/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "E-Mail aŭ Telefonnumero ne trovis",
"INVALID_PASSWORD": "Pasfrazo ne validas"
"INVALID_PASSWORD": "Pasfrazo ne validas",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "Nova uzanta reĝistro estas malebligita",

3
locales/es/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "E-Mail o teléfono no encontrado",
"INVALID_PASSWORD": "Contraseña Incorrecta"
"INVALID_PASSWORD": "Contraseña Incorrecta",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "El registro de un nuevo usuario no se encuentra habilitado",

3
locales/fi/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "Sähköpostia tai puhelinta ei löydy",
"INVALID_PASSWORD": "Virheellinen Salasana"
"INVALID_PASSWORD": "Virheellinen Salasana",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "Uuden käyttäjän rekisteröinti pois käytöstä",

3
locales/fr/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "E-Mail ou Téléphone introuvable",
"INVALID_PASSWORD": "Mot de passe invalide"
"INVALID_PASSWORD": "Mot de passe invalide",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "L'inscription aux nouveaux utilisateurs est désactivée",

3
locales/he/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "E-Mail or Phone not found",
"INVALID_PASSWORD": "Invalid Password"
"INVALID_PASSWORD": "Invalid Password",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "New user registration is disabled",

3
locales/hi/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "ईमेल या फ़ोन नहीं मिला",
"INVALID_PASSWORD": "अमान्य पासवर्ड"
"INVALID_PASSWORD": "अमान्य पासवर्ड",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "नया उपयोगकर्ता पंजीकरण अक्षम है",

3
locales/hr/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "Email ili broj mobitela nije pronađen",
"INVALID_PASSWORD": "Pogrešna lozinka"
"INVALID_PASSWORD": "Pogrešna lozinka",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "Registracija novog korisnika je onemogućena",

3
locales/hu/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "Nincs ilyen E-Mail vagy Telefon",
"INVALID_PASSWORD": "Érvénytelen jelszó"
"INVALID_PASSWORD": "Érvénytelen jelszó",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "Új felhasználók regisztrációja nem engedélyezett",

3
locales/id/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "E-Mail or Phone not found",
"INVALID_PASSWORD": "Invalid Password"
"INVALID_PASSWORD": "Invalid Password",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "New user registration is disabled",

3
locales/it/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "E-Mail o numero di telefono non trovato",
"INVALID_PASSWORD": "Password Non Valida"
"INVALID_PASSWORD": "Password Non Valida",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "La registrazione di nuovi utenti è disabilitata",

3
locales/ja/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "メールまたは電話が見つかりません",
"INVALID_PASSWORD": "無効なパスワード"
"INVALID_PASSWORD": "無効なパスワード",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "新しいユーザー登録は無効です",

3
locales/ko/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "이메일 또는 전화번호를 찾을 수 없습니다",
"INVALID_PASSWORD": "비밀번호가 틀렸습니다"
"INVALID_PASSWORD": "비밀번호가 틀렸습니다",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "신규 사용자의 등록이 비활성화되었습니다",

3
locales/lt/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "El. Paštas ar telefonas nerastas",
"INVALID_PASSWORD": "Neteisingas slaptažodis"
"INVALID_PASSWORD": "Neteisingas slaptažodis",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "Naujų vartotojų registracija išjungta",

3
locales/nl/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "E-mailadres of telefoon niet gevonden",
"INVALID_PASSWORD": "Ongeldig wachtwoord"
"INVALID_PASSWORD": "Ongeldig wachtwoord",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "Registratie voor nieuwe gebruikers is uitgeschakeld",

3
locales/no/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "Fant ikke e-postadresse eller telefon",
"INVALID_PASSWORD": "Ugyldig passord"
"INVALID_PASSWORD": "Ugyldig passord",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "Ny brukerregistrering er deaktivert",

3
locales/pl/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "E-mail lub telefon nie znaleziony",
"INVALID_PASSWORD": "Nieprawidłowe hasło"
"INVALID_PASSWORD": "Nieprawidłowe hasło",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "Rejestracja nowego użytkownika jest wyłączona",

5
locales/pt/auth.json
View File

@ -1,12 +1,13 @@
{
"login": {
"INVALID_LOGIN": "E-mail ou Telefone não encontrado",
"INVALID_PASSWORD": "Senha inválida"
"INVALID_PASSWORD": "Senha inválida",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "Registro de novos usuários está desativado",
"INVITE_ONLY": "Você deve ser convidado para registrar",
"EMAIL_INVALID": "Invalid Email",
"EMAIL_INVALID": "E-mail inválido",
"EMAIL_ALREADY_REGISTERED": "E-mail já está registrado",
"DATE_OF_BIRTH_UNDERAGE": "Você precisa ter {{years}} anos ou mais",
"CONSENT_REQUIRED": "Você precisa aceitar os Termos de Serviço e a Política de Privacidade.",

3
locales/ro/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "E-mailul sau telefonul nu au fost găsite",
"INVALID_PASSWORD": "Parolă nevalidă"
"INVALID_PASSWORD": "Parolă nevalidă",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "Înregistrarea noului utilizator este dezactivată",

3
locales/ru/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "Данный адрес электронной почты или телефон не найден",
"INVALID_PASSWORD": "Неверный пароль"
"INVALID_PASSWORD": "Неверный пароль",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "Регистрация нового пользователя отключена",

3
locales/sk/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "E-mail alebo telefón nebol nájdený",
"INVALID_PASSWORD": "Neplatné Heslo"
"INVALID_PASSWORD": "Neplatné Heslo",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "Registrácia nového používateľa je zakázaná",

3
locales/sr/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "E-Mail or Phone not found",
"INVALID_PASSWORD": "Invalid Password"
"INVALID_PASSWORD": "Invalid Password",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "New user registration is disabled",

3
locales/sv/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "E-post eller telefon hittades inte",
"INVALID_PASSWORD": "Ogiltigt lösenord"
"INVALID_PASSWORD": "Ogiltigt lösenord",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "Registrering av nya användare är inaktiverat",

3
locales/tr/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "Eposta veya Telefon Numarası bulunamadı",
"INVALID_PASSWORD": "Geçersiz Şifre"
"INVALID_PASSWORD": "Geçersiz Şifre",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "Yeni kullanıcı alımı devre dışı bırakıldı",

3
locales/uk/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "E-Mail або телефон не знайдено",
"INVALID_PASSWORD": "Невірний пароль"
"INVALID_PASSWORD": "Невірний пароль",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "Реєстрація нового користувача вимкнута",

3
locales/ur/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "E-Mail or Phone not found",
"INVALID_PASSWORD": "Invalid Password"
"INVALID_PASSWORD": "Invalid Password",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "New user registration is disabled",

3
locales/vi/auth.json
View File

@ -1,7 +1,8 @@
{
"login": {
"INVALID_LOGIN": "E-mail hoặc số điện thoại không tồn tại",
"INVALID_PASSWORD": "Sai mật khẩu"
"INVALID_PASSWORD": "Sai mật khẩu",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "Hệ thống hiện không cho phép tài khoản mới",

19
locales/zh/auth.json
View File

@ -1,15 +1,16 @@
{
"login": {
"INVALID_LOGIN": "找不到电子邮件或电话",
"INVALID_PASSWORD": "无效密码"
"INVALID_LOGIN": "找不到電子郵件或電話",
"INVALID_PASSWORD": "無效的密碼",
"ACCOUNT_DISABLED": "This account is disabled"
},
"register": {
"REGISTRATION_DISABLED": "新用户注册已禁用",
"INVITE_ONLY": "您必须被邀请注册",
"EMAIL_INVALID": "Invalid Email",
"EMAIL_ALREADY_REGISTERED": "电子邮件已注册",
"DATE_OF_BIRTH_UNDERAGE": "您需要有 {{years}} 岁以上",
"CONSENT_REQUIRED": "您必须同意服务条款和隐私政策。",
"USERNAME_TOO_MANY_USERS": "用户名太多，请尝试另一个"
"REGISTRATION_DISABLED": "新用戶註冊已禁用",
"INVITE_ONLY": "必須邀請您才能註冊",
"EMAIL_INVALID": "無效電子郵件",
"EMAIL_ALREADY_REGISTERED": "該電郵地址已註冊",
"DATE_OF_BIRTH_UNDERAGE": "您必須年滿 {{years}} 歲",
"CONSENT_REQUIRED": "您必須同意服務條款和隱私政策。",
"USERNAME_TOO_MANY_USERS": "此用戶名太多，請嘗試使用其他用戶名"
}
}

20
src/routes/auth/login.ts
View File

@ -9,7 +9,8 @@ import RateLimit from "../../middlewares/RateLimit";
const router: Router = Router();
export default router;
// TODO: check if user is deleted/restricted
// TODO: check if user is deleted --> prohibit login
router.post(
"/",
RateLimit({ count: 5, window: 60, onlyIp: true }),
@ -22,7 +23,7 @@ router.post(
$gift_code_sku_id: String
}),
async (req: Request, res: Response) => {
const { login, password, captcha_key } = req.body;
const { login, password, captcha_key, undelete } = req.body;
const email = adjustEmail(login);
const query: any[] = [{ phone: login }];
if (email) query.push({ email });
@ -62,6 +63,13 @@ router.post(
throw FieldErrors({ login: { message: req.t("auth:login.INVALID_LOGIN"), code: "INVALID_LOGIN" } });
});
if (user.disabled && undelete) {
// undelete refers to un'disable' here
await UserModel.updateOne({ id: req.user_id }, { disabled: false }).exec();
} else 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) {
@ -100,14 +108,14 @@ export async function generateToken(id: string) {
/**
* 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"}}
*/

16
src/routes/users/@me/disable.ts
View File

@ -1,10 +1,20 @@
import { UserModel } from "@fosscord/server-util";
import { Router, Response, Request } from "express";
import bcrypt from "bcrypt";
const router = Router();
router.post("/", (req: Request, res: Response) => {
// TODO:
res.sendStatus(204);
router.post("/", async (req: Request, res: Response) => {
const user = await UserModel.findOne({ id: req.user_id }).exec(); //User object
let correctpass = await bcrypt.compare(req.body.password, user!.user_data.hash); //Not sure if user typed right password :/
if (correctpass) {
await UserModel.updateOne({ id: req.user_id }, { disabled: true }).exec();
res.sendStatus(204);
} else {
res.status(400).json({ message: "Password does not match", code: 50018 });
}
});
export default router;