From ba12e8b3a6de8ac82101894abe7460b392fec42a Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 29 Jan 2018 16:09:50 +0100 Subject: Add ability to login with email --- server/lib/oauth-model.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'server/lib') diff --git a/server/lib/oauth-model.ts b/server/lib/oauth-model.ts index b3cc75590..3adcce7b0 100644 --- a/server/lib/oauth-model.ts +++ b/server/lib/oauth-model.ts @@ -25,10 +25,10 @@ function getRefreshToken (refreshToken: string) { return OAuthTokenModel.getByRefreshTokenAndPopulateClient(refreshToken) } -async function getUser (username: string, password: string) { - logger.debug('Getting User (username: ' + username + ', password: ******).') +async function getUser (usernameOrEmail: string, password: string) { + logger.debug('Getting User (username/email: ' + usernameOrEmail + ', password: ******).') - const user = await UserModel.getByUsername(username) + const user = await UserModel.loadByUsernameOrEmail(usernameOrEmail) if (!user) return null const passwordMatch = await user.isPasswordMatch(password) -- cgit v1.2.3