AstralTransRocketries/node-minecraft-protocol
1
0
Fork 0
mirror of https://github.com/unmojang/node-minecraft-protocol.git synced 2025-09-28 21:52:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

added fallback for session to normal auth

Browse Source
This commit is contained in:
plexigras 2017-10-01 16:39:07 +02:00
parent 2a97df6abd
commit 1a77168574
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/client/auth.js
View File

@ -2,7 +2,7 @@ const yggdrasil = require('yggdrasil')({});
const UUID = require('uuid-1345'); const UUID = require('uuid-1345');
module.exports = function(client, options) { 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.accessToken = null;
options.haveCredentials = options.password != null || (clientToken != null && options.session != null); options.haveCredentials = options.password != null || (clientToken != null && options.session != null);
@ -26,7 +26,17 @@ module.exports = function(client, options) {
cb(null, options.session); cb(null, options.session);
else else
yggdrasil.refresh(options.session.accessToken, options.session.clientToken, function(err, data) { yggdrasil.refresh(options.session.accessToken, options.session.clientToken, function(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); cb(err, data);
}
}); });
}); });
} }