Showing the changes to interface/src/scripting/AccountScriptingInterface.cpp (1 of 4 files). Show all
Unified · Split
| @@ -12,47 +12,25 @@ · 11 unmodified lines | ||
| 12 | 12 | #include "AccountManager.h" |
| 13 | 13 | |
| 14 | 14 | #include "AccountScriptingInterface.h" |
| 15 | +#include "GlobalServicesScriptingInterface.h" | |
| 15 | 16 | |
| 16 | 17 | AccountScriptingInterface* AccountScriptingInterface::getInstance() { |
| 17 | 18 | static AccountScriptingInterface sharedInstance; |
| 18 | − auto accountManager = DependencyManager::get<AccountManager>(); | |
| 19 | − QObject::connect(accountManager.data(), &AccountManager::profileChanged, | |
| 20 | − &sharedInstance, &AccountScriptingInterface::usernameChanged); | |
| 21 | − QObject::connect(accountManager.data(), &AccountManager::usernameChanged, | |
| 22 | − &sharedInstance, &AccountScriptingInterface::onUsernameChanged); | |
| 23 | 19 | return &sharedInstance; |
| 24 | 20 | } |
| 25 | 21 | |
| 26 | 22 | bool AccountScriptingInterface::isLoggedIn() { |
| 27 | − auto accountManager = DependencyManager::get<AccountManager>(); | |
| 28 | − return accountManager->isLoggedIn(); | |
| 29 | −} | |
| 30 | − | |
| 31 | −bool AccountScriptingInterface::checkAndSignalForAccessToken() { | |
| 32 | − auto accountManager = DependencyManager::get<AccountManager>(); | |
| 33 | − return accountManager->checkAndSignalForAccessToken(); | |
| 23 | + return GlobalServicesScriptingInterface::getInstance()->isLoggedIn(); | |
| 34 | 24 | } |
| 35 | 25 | |
| 36 | 26 | void AccountScriptingInterface::logOut() { |
| 37 | − auto accountManager = DependencyManager::get<AccountManager>(); | |
| 38 | − return accountManager->logout(); | |
| 39 | −} | |
| 40 | − | |
| 41 | −AccountScriptingInterface::AccountScriptingInterface(QObject *parent): QObject(parent) { | |
| 42 | − m_loggedIn = isLoggedIn(); | |
| 43 | − emit loggedInChanged(m_loggedIn); | |
| 27 | + GlobalServicesScriptingInterface::getInstance()->logOut(); | |
| 44 | 28 | } |
| 45 | 29 | |
| 46 | −void AccountScriptingInterface::onUsernameChanged(QString username) { | |
| 47 | − m_loggedIn = (username != QString()); | |
| 48 | − emit loggedInChanged(m_loggedIn); | |
| 30 | +bool AccountScriptingInterface::loggedIn() const { | |
| 31 | + return GlobalServicesScriptingInterface::getInstance()->loggedIn(); | |
| 49 | 32 | } |
| 50 | 33 | |
| 51 | 34 | QString AccountScriptingInterface::getUsername() { |
| 52 | − auto accountManager = DependencyManager::get<AccountManager>(); | |
| 53 | − if (accountManager->isLoggedIn()) { | |
| 54 | − return accountManager->getAccountInfo().getUsername(); | |
| 55 | − } else { | |
| 56 | − return "Unknown user"; | |
| 57 | − } | |
| 35 | + return GlobalServicesScriptingInterface::getInstance()->getUsername(); | |
| 58 | 36 | } |