CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE introduce the concept of secrets static library

Browse Source
This commit is contained in:
Petr Mrázek
2021-08-27 22:35:17 +02:00
parent 34a5459dce
commit b2c1100b1c
10 changed files with 39 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
launcher/minecraft/auth/MinecraftAccount.cpp
View File

@ -245,7 +245,12 @@ void MinecraftAccount::authFailed(QString reason)
emit changed();
if (session)
{
session->status = AuthSession::RequiresPassword;
if(data.type == AccountType::MSA) {
session->status = AuthSession::RequiresOAuth;
}
else {
session->status = AuthSession::RequiresPassword;
}
session->auth_server_online = true;
fillSession(session);
}

9
launcher/minecraft/auth/flows/AuthContext.cpp
View File

@ -17,7 +17,10 @@
#include "AuthContext.h"
#include "katabasis/Globals.h"
#include "katabasis/Requestor.h"
#include "BuildConfig.h"
#ifdef EMBED_SECRETS
#include "Secrets.h"
#endif
using OAuth2 = Katabasis::OAuth2;
using Requestor = Katabasis::Requestor;
@ -49,12 +52,13 @@ void AuthContext::finishActivity() {
}
void AuthContext::initMSA() {
#ifdef EMBED_SECRETS
if(m_oauth2) {
return;
}
Katabasis::OAuth2::Options opts;
opts.scope = "XboxLive.signin offline_access";
opts.clientIdentifier = BuildConfig.MSA_CLIENT_ID;
opts.clientIdentifier = Secrets::getMSAClientID('-');
opts.authorizationUrl = "https://login.microsoftonline.com/consumers/oauth2/v2.0/devicecode";
opts.accessTokenUrl = "https://login.microsoftonline.com/consumers/oauth2/v2.0/token";
opts.listenerPorts = {28562, 28563, 28564, 28565, 28566};
@ -66,6 +70,7 @@ void AuthContext::initMSA() {
connect(m_oauth2, &OAuth2::linkingSucceeded, this, &AuthContext::onOAuthLinkingSucceeded);
connect(m_oauth2, &OAuth2::showVerificationUriAndCode, this, &AuthContext::showVerificationUriAndCode);
connect(m_oauth2, &OAuth2::activityChanged, this, &AuthContext::onOAuthActivityChanged);
#endif
}
void AuthContext::initMojang() {