a_adli/colouring-montreal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #617 from mz8i/feature/login-username-warn

Browse Source 
Warn of wrong username on login screen
This commit is contained in:
Maciej Ziarkowski 2020-07-01 01:12:51 +02:00 committed by GitHub
commit 2c9335c1eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
app/src/api/services/user.ts
View File

@ -54,40 +54,34 @@ async function createUser(user) {
} }
async function authUser(username: string, password: string) { async function authUser(username: string, password: string) {
try { const user = await db.oneOrNone(
const user = await db.one( `SELECT
`SELECT user_id,
user_id, (
( pass = crypt($2, pass)
pass = crypt($2, pass) ) AS auth_ok,
) AS auth_ok, is_blocked,
is_blocked, blocked_on,
blocked_on, blocked_reason
blocked_reason FROM users
FROM users WHERE
WHERE username = $1
username = $1 `, [
`, [ username,
username, password
password ]
] );
);
if (user && user.auth_ok) { if (user == undefined) {
if (user.is_blocked) { return { error: 'The username does not exist in the system' };
return { error: `Account temporarily blocked.${user.blocked_reason == undefined ? '' : ' Reason: '+user.blocked_reason}` }; } else if (user.auth_ok) {
} if (user.is_blocked) {
return { user_id: user.user_id }; return { error: `Account temporarily blocked.${user.blocked_reason == undefined ? '' : ' Reason: '+user.blocked_reason}` };
} else {
return { error: 'Username or password not recognised' };
} }
} catch(err) { return { user_id: user.user_id };
if (err instanceof errors.QueryResultError) { } else {
console.error(`Authentication failed for user ${username}`); console.error(`Authentication failed for user ${username}`);
return { error: 'Username or password not recognised' }; return { error: 'Username / password pair not recognised' };
}
console.error('Error:', err);
return { error: 'Database error' };
} }
} }