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

Offline mode can be used even when online.

Browse Source 
Allow the user to pick a player name for offline mode.
Big auth refactor. Now using session objects instead of the accounts themselves.
Sessions only last for one instance start and hold all the auth and player data.
This commit is contained in:
Petr Mrázek
2014-01-27 03:00:49 +01:00
parent d7113de3bd
commit ffbc5bb62c
27 changed files with 417 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
logic/auth/MojangAccount.h
View File

@ -23,6 +23,7 @@
#include <QMap>
#include <memory>
#include "AuthSession.h"
class Task;
class YggdrasilTask;
@ -45,17 +46,10 @@ struct AccountProfile
bool legacy;
};
struct User
{
QString id;
QMultiMap<QString,QString> properties;
};
enum AccountStatus
{
NotVerified,
Verified,
Online
Verified
};
/**
@ -84,7 +78,7 @@ public: /* construction */
QJsonObject saveToJson() const;
public: /* manipulation */
/**
/**
* Sets the currently selected profile to the profile with the given ID string.
* If profileId is not in the list of available profiles, the function will simply return
* false.
@ -95,12 +89,9 @@ public: /* manipulation */
* Attempt to login. Empty password means we use the token.
* If the attempt fails because we already are performing some task, it returns false.
*/
std::shared_ptr<YggdrasilTask> login(QString password = QString());
std::shared_ptr<YggdrasilTask> login(AuthSessionPtr session,
QString password = QString());
void downgrade()
{
m_online = false;
}
public: /* queries */
const QString &username() const
{
@ -122,19 +113,11 @@ public: /* queries */
return m_profiles;
}
const User & user()
const User &user()
{
return m_user;
}
//! Get the session ID required for legacy Minecraft versions
QString sessionId() const
{
if (m_currentProfile != -1 && !m_accessToken.isEmpty())
return "token:" + m_accessToken + ":" + m_profiles[m_currentProfile].id;
return "-";
}
//! Returns the currently selected profile (if none, returns nullptr)
const AccountProfile *currentProfile() const;
@ -169,16 +152,17 @@ protected: /* variables */
// the user structure, whatever it is.
User m_user;
// true when the account is verified
bool m_online = false;
// current task we are executing here
std::shared_ptr<YggdrasilTask> m_currentTask;
private slots:
private
slots:
void authSucceeded();
void authFailed(QString reason);
private:
void fillSession(AuthSessionPtr session);
public:
friend class YggdrasilTask;
friend class AuthenticateTask;