NOISSUE introduce the concept of secrets static library

1 files changed, 7 insertions, 2 deletions

diff --git a/launcher/minecraft/auth/flows/AuthContext.cpp b/launcher/minecraft/auth/flows/AuthContext.cpp
index ed8acd40..9ae99453 100644
--- a/launcher/minecraft/auth/flows/AuthContext.cpp
+++ b/launcher/minecraft/auth/flows/AuthContext.cpp
@@ -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() {