IntenseWebs/PeerTube
3
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2024-11-25 18:20:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Server: Use ES6 promise for mongoose/node-oatuh2-server

Browse Source
This commit is contained in:
Chocobozzz 2016-07-27 21:15:07 +02:00
parent f24c4e4462
commit 32bb415602
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/initializers/database.js
View File

@ -23,6 +23,7 @@ const database = {
}
function connect () {
mongoose.Promise = global.Promise
mongoose.connect('mongodb://' + host + ':' + port + '/' + dbname)
mongoose.connection.on('error', function () {
throw new Error('Mongodb connection error.')

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

@ -62,7 +62,7 @@ function revokeToken (token) {
}
function saveToken (token, client, user) {
logger.debug('Saving token for client ' + client.id + ' and user ' + user.id + '.')
logger.debug('Saving token ' + token.accessToken + ' for client ' + client.id + ' and user ' + user.id + '.')
const tokenObj = new OAuthToken({
accessToken: token.accessToken,
@ -73,13 +73,12 @@ function saveToken (token, client, user) {
user: user.id
})
return tokenObj.save(function (err, tokenCreated) {
if (err) throw err // node-oauth2-server library uses Promise.try
return tokenObj.save().then(function (tokenCreated) {
tokenCreated.client = client
tokenCreated.user = user
return tokenCreated
}).catch(function (err) {
throw err
})
}

2
server/models/oauth-client.js
View File

@ -29,5 +29,5 @@ function loadFirstClient (callback) {
}
function getByIdAndSecret (id, clientSecret) {
return this.findOne({ _id: id, clientSecret: clientSecret })
return this.findOne({ _id: id, clientSecret: clientSecret }).exec()
}

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

@ -28,7 +28,7 @@ mongoose.model('OAuthToken', OAuthTokenSchema)
// ---------------------------------------------------------------------------
function getByRefreshTokenAndPopulateClient (refreshToken) {
return this.findOne({ refreshToken: refreshToken }).populate('client').then(function (token) {
return this.findOne({ refreshToken: refreshToken }).populate('client').exec().then(function (token) {
if (!token) return token
const tokenInfos = {
@ -47,9 +47,9 @@ function getByRefreshTokenAndPopulateClient (refreshToken) {
}
function getByTokenAndPopulateUser (bearerToken) {
return this.findOne({ accessToken: bearerToken }).populate('user')
return this.findOne({ accessToken: bearerToken }).populate('user').exec()
}
function getByRefreshToken (refreshToken) {
return this.findOne({ refreshToken: refreshToken })
return this.findOne({ refreshToken: refreshToken }).exec()
}