0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(accounts): save client id in MSAStep

Browse Source
This commit is contained in:
Sefa Eyeoglu 2022-02-18 12:27:34 +01:00
parent 9c71f364d2
commit 14717396eb
No known key found for this signature in database
GPG Key ID: C10411294912A422
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
launcher/minecraft/auth/steps/MSAStep.cpp
View File

@ -12,9 +12,10 @@ using OAuth2 = Katabasis::DeviceFlow;
using Activity = Katabasis::Activity; using Activity = Katabasis::Activity;
MSAStep::MSAStep(AccountData* data, Action action) : AuthStep(data), m_action(action) { MSAStep::MSAStep(AccountData* data, Action action) : AuthStep(data), m_action(action) {
m_clientId = APPLICATION->getMSAClientID();
OAuth2::Options opts; OAuth2::Options opts;
opts.scope = "XboxLive.signin offline_access"; opts.scope = "XboxLive.signin offline_access";
opts.clientIdentifier = APPLICATION->getMSAClientID(); opts.clientIdentifier = m_clientId;
opts.authorizationUrl = "https://login.microsoftonline.com/consumers/oauth2/v2.0/devicecode"; opts.authorizationUrl = "https://login.microsoftonline.com/consumers/oauth2/v2.0/devicecode";
opts.accessTokenUrl = "https://login.microsoftonline.com/consumers/oauth2/v2.0/token"; opts.accessTokenUrl = "https://login.microsoftonline.com/consumers/oauth2/v2.0/token";
@ -57,6 +58,7 @@ void MSAStep::perform() {
m_oauth2->setExtraRequestParams(extraOpts); m_oauth2->setExtraRequestParams(extraOpts);
*m_data = AccountData(); *m_data = AccountData();
m_data->msaClientID = m_clientId;
m_oauth2->login(); m_oauth2->login();
return; return;
} }

1
launcher/minecraft/auth/steps/MSAStep.h
View File

@ -29,4 +29,5 @@ private slots:
private: private:
Katabasis::DeviceFlow *m_oauth2 = nullptr; Katabasis::DeviceFlow *m_oauth2 = nullptr;
Action m_action; Action m_action;
QString m_clientId;
}; };