diff --git a/components/authenticator.js b/components/authenticator.js index 4462343..e30253c 100644 --- a/components/authenticator.js +++ b/components/authenticator.js @@ -3,8 +3,20 @@ const uuid = require('uuid/v1'); const api_url = "https://authserver.mojang.com"; -function login(username, password) { +function getAuth(username, password) { return new Promise(resolve => { + if(!password) { + const user = { + access_token: uuid(), + client_token: uuid(), + uuid: uuid(), + name: username, + user_object: JSON.stringify({}) + }; + + resolve(user); + } + const requestObject = { url: api_url + "/authenticate", json: { @@ -37,23 +49,6 @@ function login(username, password) { }); } -function offline(username) { - let user = { - access_token: uuid(), - client_token: uuid(), - uuid: uuid(), - name: username, - user_object: JSON.stringify({}) - }; - - return user; -} - - -module.exports = async function(_offline, username, password) { - if(_offline) { - return offline(username); - } - - return await login(username, password); +module.exports = async function(username, password) { + return await getAuth(username, password); }; \ No newline at end of file diff --git a/components/launcher.js b/components/launcher.js index bcd3909..adc2b99 100644 --- a/components/launcher.js +++ b/components/launcher.js @@ -1,6 +1,5 @@ const child = require('child_process'); const path = require('path'); -const ygg = require('./authenticator'); const handler = require('./handler'); const fs = require('fs'); const shelljs = require('shelljs'); @@ -9,8 +8,6 @@ const shelljs = require('shelljs'); module.exports = async function (options) { if (!fs.existsSync(options.root)) fs.mkdirSync(options.root); - options.authorization = await ygg(options.login.offline, options.login.username, options.login.password); - const versionFile = await handler.getVersion(options.version.number); const directory = path.join(options.root, 'versions', options.version.number); options.directory = directory;