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

Pass haveCredentials/accessToken between client/caseCorrect and client/encrypt

Browse Source
This commit is contained in:
deathcap 2016-01-26 00:51:44 -08:00
parent 2f60088fdf
commit bf5ce9e569
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/client/caseCorrect.js
View File

@ -3,10 +3,10 @@ var UUID = require('uuid-1345');
module.exports = function(client, options) { module.exports = function(client, options) {
var clientToken = options.clientToken || UUID.v4().toString(); var clientToken = options.clientToken || UUID.v4().toString();
var accessToken; options.accessToken = null;
var haveCredentials = options.password != null || (clientToken != null && options.session != null); options.haveCredentials = options.password != null || (clientToken != null && options.session != null);
if(haveCredentials) { if(options.haveCredentials) {
// make a request to get the case-correct username before connecting. // make a request to get the case-correct username before connecting.
var cb = function(err, session) { var cb = function(err, session) {
if(err) { if(err) {
@ -14,7 +14,7 @@ module.exports = function(client, options) {
} else { } else {
client.session = session; client.session = session;
client.username = session.selectedProfile.name; client.username = session.selectedProfile.name;
accessToken = session.accessToken; options.accessToken = session.accessToken;
client.emit('session'); client.emit('session');
options.connect(client); options.connect(client);
} }

4
src/client/encrypt.js
View File

@ -16,7 +16,7 @@ module.exports = function(client, options) {
client.end(); client.end();
return; return;
} }
if(haveCredentials) { if(options.haveCredentials) {
joinServerRequest(onJoinServerResponse); joinServerRequest(onJoinServerResponse);
} else { } else {
if(packet.serverId != '-') { if(packet.serverId != '-') {
@ -35,7 +35,7 @@ module.exports = function(client, options) {
} }
function joinServerRequest(cb) { function joinServerRequest(cb) {
yggserver.join(accessToken, client.session.selectedProfile.id, yggserver.join(options.accessToken, client.session.selectedProfile.id,
packet.serverId, sharedSecret, packet.publicKey, cb); packet.serverId, sharedSecret, packet.publicKey, cb);
} }