diff options
author | Andrew <forkk@forkk.net> | 2013-12-15 15:01:34 -0600 |
---|---|---|
committer | Andrew <forkk@forkk.net> | 2013-12-15 15:01:34 -0600 |
commit | 9d8006b597aead06f1d51dacbdb346ebab3d5e8f (patch) | |
tree | 1f99ca1da321be32930198e3d72b2fc9d3bf53de /logic/auth/flows/RefreshTask.cpp | |
parent | 0ee8f90d40f5b3ddb177286c9066a4e59748c681 (diff) | |
parent | b0e8037feb5b9d48defe6b8263d068f87bdb141c (diff) | |
download | MultiMC-9d8006b597aead06f1d51dacbdb346ebab3d5e8f.tar MultiMC-9d8006b597aead06f1d51dacbdb346ebab3d5e8f.tar.gz MultiMC-9d8006b597aead06f1d51dacbdb346ebab3d5e8f.tar.lz MultiMC-9d8006b597aead06f1d51dacbdb346ebab3d5e8f.tar.xz MultiMC-9d8006b597aead06f1d51dacbdb346ebab3d5e8f.zip |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news
Conflicts:
CMakeLists.txt
Diffstat (limited to 'logic/auth/flows/RefreshTask.cpp')
-rw-r--r-- | logic/auth/flows/RefreshTask.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/logic/auth/flows/RefreshTask.cpp b/logic/auth/flows/RefreshTask.cpp index 16feac6e..5f68ccc7 100644 --- a/logic/auth/flows/RefreshTask.cpp +++ b/logic/auth/flows/RefreshTask.cpp @@ -112,20 +112,21 @@ bool RefreshTask::processResponse(QJsonObject responseData) // this is what the vanilla launcher passes to the userProperties launch param if (responseData.contains("user")) { + User u; auto obj = responseData.value("user").toObject(); - auto userId = obj.value("id").toString(); + u.id = obj.value("id").toString(); auto propArray = obj.value("properties").toArray(); - QLOG_DEBUG() << "User ID: " << userId; - QLOG_DEBUG() << "User Properties: "; for (auto prop : propArray) { auto propTuple = prop.toObject(); auto name = propTuple.value("name").toString(); auto value = propTuple.value("value").toString(); - QLOG_DEBUG() << name << " : " << value; + u.properties.insert(name, value); } + m_account->m_user = u; } + // We've made it through the minefield of possible errors. Return true to indicate that // we've succeeded. QLOG_DEBUG() << "Finished reading refresh response."; |