summaryrefslogtreecommitdiffstats
path: root/logic
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-10-11 16:13:01 +0200
committerPetr Mrázek <peterix@gmail.com>2013-10-11 16:13:01 +0200
commitf8b4c2c0b25f89017db2702b60d47df7376b32e6 (patch)
tree0415568ad3081da755027091ba254f157606f06d /logic
parenta9ceea27cccc7c59be2e5b19e29431e6c0a6b335 (diff)
downloadMultiMC-f8b4c2c0b25f89017db2702b60d47df7376b32e6.tar
MultiMC-f8b4c2c0b25f89017db2702b60d47df7376b32e6.tar.gz
MultiMC-f8b4c2c0b25f89017db2702b60d47df7376b32e6.tar.lz
MultiMC-f8b4c2c0b25f89017db2702b60d47df7376b32e6.tar.xz
MultiMC-f8b4c2c0b25f89017db2702b60d47df7376b32e6.zip
Fix auth for 13w41a
Diffstat (limited to 'logic')
-rw-r--r--logic/OneSixInstance.cpp1
-rw-r--r--logic/net/LoginTask.cpp2
-rw-r--r--logic/net/LoginTask.h3
3 files changed, 4 insertions, 2 deletions
diff --git a/logic/OneSixInstance.cpp b/logic/OneSixInstance.cpp
index 853bcc48..d80f6b37 100644
--- a/logic/OneSixInstance.cpp
+++ b/logic/OneSixInstance.cpp
@@ -60,6 +60,7 @@ QStringList OneSixInstance::processMinecraftArgs(LoginResponse response)
// yggdrasil!
token_mapping["auth_username"] = response.username;
token_mapping["auth_session"] = response.session_id;
+ token_mapping["auth_access_token"] = response.access_token;
token_mapping["auth_player_name"] = response.player_name;
token_mapping["auth_uuid"] = response.player_id;
diff --git a/logic/net/LoginTask.cpp b/logic/net/LoginTask.cpp
index 5de8efa9..90aac74a 100644
--- a/logic/net/LoginTask.cpp
+++ b/logic/net/LoginTask.cpp
@@ -264,6 +264,6 @@ void LoginTask::parseYggdrasilReply(QByteArray data)
};
*/
- result = {uInfo.username, sessionID, playerName, playerID};
+ result = {uInfo.username, sessionID, playerName, playerID, accessToken};
emitSucceeded();
}
diff --git a/logic/net/LoginTask.h b/logic/net/LoginTask.h
index ba87142d..daea18af 100644
--- a/logic/net/LoginTask.h
+++ b/logic/net/LoginTask.h
@@ -27,9 +27,10 @@ struct UserInfo
struct LoginResponse
{
QString username;
- QString session_id;
+ QString session_id; // session id is a combination of player id and the access token
QString player_name;
QString player_id;
+ QString access_token;
};
class QNetworkReply;