X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=server%2Flib%2Foauth-model.ts;h=3adcce7b0e1d4f25c01c784b2041c2340dcec364;hb=ba12e8b3a6de8ac82101894abe7460b392fec42a;hp=b3cc75590724775fbb57245f1bb78bf146f61d32;hpb=61c04fa9b3566b769b260e414fe59df77cd77031;p=oweals%2Fpeertube.git

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)