From 075f16caac5236cb04c98ae7b3a989766d764bb3 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 11 Jul 2017 17:04:57 +0200 Subject: Remove "function" in favor of () => {} --- server/models/oauth/oauth-token.ts | 39 ++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) (limited to 'server/models/oauth/oauth-token.ts') diff --git a/server/models/oauth/oauth-token.ts b/server/models/oauth/oauth-token.ts index a0a13aab7..5c3781394 100644 --- a/server/models/oauth/oauth-token.ts +++ b/server/models/oauth/oauth-token.ts @@ -98,24 +98,27 @@ getByRefreshTokenAndPopulateClient = function (refreshToken: string) { include: [ OAuthToken['sequelize'].models.OAuthClient ] } - return OAuthToken.findOne(query).then(function (token) { - if (!token) return null - - const tokenInfos: OAuthTokenInfo = { - refreshToken: token.refreshToken, - refreshTokenExpiresAt: token.refreshTokenExpiresAt, - client: { - id: token['client'].id - }, - user: { - id: token['user'] + return OAuthToken.findOne(query) + .then(token => { + if (!token) return null + + const tokenInfos: OAuthTokenInfo = { + refreshToken: token.refreshToken, + refreshTokenExpiresAt: token.refreshTokenExpiresAt, + client: { + id: token['client'].id + }, + user: { + id: token['user'] + } } - } - return tokenInfos - }).catch(function (err) { - logger.info('getRefreshToken error.', err) - }) + return tokenInfos + }) + .catch(err => { + logger.info('getRefreshToken error.', err) + throw err + }) } getByTokenAndPopulateUser = function (bearerToken: string) { @@ -126,7 +129,7 @@ getByTokenAndPopulateUser = function (bearerToken: string) { include: [ OAuthToken['sequelize'].models.User ] } - return OAuthToken.findOne(query).then(function (token) { + return OAuthToken.findOne(query).then(token => { if (token) token['user'] = token.User return token @@ -141,7 +144,7 @@ getByRefreshTokenAndPopulateUser = function (refreshToken: string) { include: [ OAuthToken['sequelize'].models.User ] } - return OAuthToken.findOne(query).then(function (token) { + return OAuthToken.findOne(query).then(token => { token['user'] = token.User return token -- cgit v1.2.3