KayFaraday
/
Zaimki
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#54 user accounts - test login

This commit is contained in:
Avris 2020-10-15 18:50:05 +02:00
parent 816986cdee
commit 7ac9348396
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/user.js
View File

@ -53,6 +53,12 @@ const init = async (db, usernameOrEmail) => {
let user = undefined; let user = undefined;
const isEmail = usernameOrEmail.indexOf('@') > -1; const isEmail = usernameOrEmail.indexOf('@') > -1;
let isTest = false;
if (process.env.NODE_ENV === 'development' && usernameOrEmail.endsWith('+')) {
isTest = true;
usernameOrEmail = usernameOrEmail.substring(0, usernameOrEmail.length - 1);
}
if (isEmail) { if (isEmail) {
user = await db.get(SQL`SELECT * FROM users WHERE email = ${usernameOrEmail}`); user = await db.get(SQL`SELECT * FROM users WHERE email = ${usernameOrEmail}`);
@ -67,16 +73,18 @@ const init = async (db, usernameOrEmail) => {
const payload = { const payload = {
username: isEmail ? (user ? user.username : null) : usernameOrEmail, username: isEmail ? (user ? user.username : null) : usernameOrEmail,
email: isEmail ? usernameOrEmail : user.email, email: isEmail ? usernameOrEmail : user.email,
code: makeId(6, '0123456789'), code: isTest ? '999999' : makeId(6, '0123456789'),
} }
const codeKey = await saveAuthenticator(db, 'email', user, payload, 15); const codeKey = await saveAuthenticator(db, 'email', user, payload, 15);
mailer( if (!isTest) {
payload.email, mailer(
`[${translations.title}] ${translations.user.login.email.subject.replace('%code%', payload.code)}`, payload.email,
translations.user.login.email.content.replace('%code%', payload.code), `[${translations.title}] ${translations.user.login.email.subject.replace('%code%', payload.code)}`,
) translations.user.login.email.content.replace('%code%', payload.code),
)
}
return { return {
token: jwt.sign({...payload, code: null, codeKey}, '15m'), token: jwt.sign({...payload, code: null, codeKey}, '15m'),
@ -103,6 +111,7 @@ const validate = async (db, user, code) => {
const defaultUsername = async (db, email) => { const defaultUsername = async (db, email) => {
const base = email.substring(0, email.indexOf('@')) const base = email.substring(0, email.indexOf('@'))
.padEnd(4, '0') .padEnd(4, '0')
.substring(0, 12)
.replace(/[^A-Za-z0-9._-]/g, '_'); .replace(/[^A-Za-z0-9._-]/g, '_');
let c = 0; let c = 0;