3c46d8a412
This makes the account system much more modular and makes it treat errors as something recoverable, unless they come directly from the MSA refresh token becoming invalid.
38 lines
1.8 KiB
C++
38 lines
1.8 KiB
C++
#include "MSA.h"
|
|
|
|
#include "minecraft/auth/steps/MSAStep.h"
|
|
#include "minecraft/auth/steps/XboxUserStep.h"
|
|
#include "minecraft/auth/steps/XboxAuthorizationStep.h"
|
|
#include "minecraft/auth/steps/LauncherLoginStep.h"
|
|
#include "minecraft/auth/steps/XboxProfileStep.h"
|
|
#include "minecraft/auth/steps/EntitlementsStep.h"
|
|
#include "minecraft/auth/steps/MinecraftProfileStep.h"
|
|
#include "minecraft/auth/steps/GetSkinStep.h"
|
|
|
|
MSASilent::MSASilent(AccountData* data, QObject* parent) : AuthFlow(data, parent) {
|
|
m_steps.append(new MSAStep(m_data, MSAStep::Action::Refresh));
|
|
m_steps.append(new XboxUserStep(m_data));
|
|
m_steps.append(new XboxAuthorizationStep(m_data, &m_data->xboxApiToken, "http://xboxlive.com", "Xbox"));
|
|
m_steps.append(new XboxAuthorizationStep(m_data, &m_data->mojangservicesToken, "rp://api.minecraftservices.com/", "Mojang"));
|
|
m_steps.append(new LauncherLoginStep(m_data));
|
|
m_steps.append(new XboxProfileStep(m_data));
|
|
m_steps.append(new EntitlementsStep(m_data));
|
|
m_steps.append(new MinecraftProfileStep(m_data));
|
|
m_steps.append(new GetSkinStep(m_data));
|
|
}
|
|
|
|
MSAInteractive::MSAInteractive(
|
|
AccountData* data,
|
|
QObject* parent
|
|
) : AuthFlow(data, parent) {
|
|
m_steps.append(new MSAStep(m_data, MSAStep::Action::Login));
|
|
m_steps.append(new XboxUserStep(m_data));
|
|
m_steps.append(new XboxAuthorizationStep(m_data, &m_data->xboxApiToken, "http://xboxlive.com", "Xbox"));
|
|
m_steps.append(new XboxAuthorizationStep(m_data, &m_data->mojangservicesToken, "rp://api.minecraftservices.com/", "Mojang"));
|
|
m_steps.append(new LauncherLoginStep(m_data));
|
|
m_steps.append(new XboxProfileStep(m_data));
|
|
m_steps.append(new EntitlementsStep(m_data));
|
|
m_steps.append(new MinecraftProfileStep(m_data));
|
|
m_steps.append(new GetSkinStep(m_data));
|
|
}
|