OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Server: fix refreshing token that fails

pull/24/head
Chocobozzz 2016-11-01 18:16:47 +01:00
parent 2c8a2f7fcc
commit bf2fc85c83
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/lib/oauth-model.js
View File

@ -60,7 +60,7 @@ function getUser (username, password) {
}
function revokeToken (token) {
return OAuthToken.getByRefreshToken(token.refreshToken).then(function (tokenDB) {
return OAuthToken.getByRefreshTokenAndPopulateUser(token.refreshToken).then(function (tokenDB) {
if (tokenDB) tokenDB.remove()
/*
@ -72,6 +72,7 @@ function revokeToken (token) {
*/
const expiredToken = tokenDB
expiredToken.refreshTokenExpiresAt = new Date('2015-05-28T06:59:53.000Z')
return expiredToken
})
}

6
server/models/oauth-token.js
View File

@ -20,7 +20,7 @@ OAuthTokenSchema.path('user').required(true)
OAuthTokenSchema.statics = {
getByRefreshTokenAndPopulateClient,
getByTokenAndPopulateUser,
getByRefreshToken,
getByRefreshTokenAndPopulateUser,
removeByUserId
}
@ -51,8 +51,8 @@ function getByTokenAndPopulateUser (bearerToken) {
return this.findOne({ accessToken: bearerToken }).populate('user').exec()
}
function getByRefreshToken (refreshToken) {
return this.findOne({ refreshToken: refreshToken }).exec()
function getByRefreshTokenAndPopulateUser (refreshToken) {
return this.findOne({ refreshToken: refreshToken }).populate('user').exec()
}
function removeByUserId (userId, callback) {