Parker2991/node-minecraft-protocol
1
0
Fork 0
mirror of https://github.com/PrismarineJS/node-minecraft-protocol.git synced 2025-05-31 23:33:47 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request from plexigras/add-auth-session-fallback

Browse source 
added fallback for session to normal auth
This commit is contained in:
Romain Beaumont 2017-10-26 23:40:24 +02:00 • committed by GitHub
commit 233eff1358
1 changed files with 12 additions and 2 deletions

14
src/client/auth.js
View file

@ -2,7 +2,7 @@ const yggdrasil = require('yggdrasil')({});
const UUID = require('uuid-1345');
module.exports = function(client, options) {
const clientToken = options.clientToken || UUID.v4().toString();
const clientToken = options.clientToken || (options.session && options.session.clientToken) || UUID.v4().toString();
options.accessToken = null;
options.haveCredentials = options.password != null || (clientToken != null && options.session != null);
@ -26,7 +26,17 @@ module.exports = function(client, options) {
cb(null, options.session);
else
yggdrasil.refresh(options.session.accessToken, options.session.clientToken, function(err, data) {
cb(err, data);
if (!err) {
cb(null, data);
} else if (options.username && options.password) {
yggdrasil.auth({
user: options.username,
pass: options.password,
token: clientToken
}, cb);
} else {
cb(err, data);
}
});
});
}