Merge pull request #12116 from dback2/deleteAccount_renameGS_addAS

Merge Account & GlobalServices follow-up

interface/src/Application.cpp

@@ -157,7 +157,7 @@
 #include "scripting/AssetMappingsScriptingInterface.h"
 #include "scripting/ClipboardScriptingInterface.h"
 #include "scripting/DesktopScriptingInterface.h"
-#include "scripting/GlobalServicesScriptingInterface.h"
+#include "scripting/AccountServicesScriptingInterface.h"
 #include "scripting/HMDScriptingInterface.h"
 #include "scripting/MenuScriptingInterface.h"
 #include "scripting/SettingsScriptingInterface.h"
@@ -2376,9 +2376,11 @@ void Application::initializeUi() {
     surfaceContext->setContextProperty("SoundCache", DependencyManager::get<SoundCache>().data());
     surfaceContext->setContextProperty("InputConfiguration", DependencyManager::get<InputConfiguration>().data());
 
-    surfaceContext->setContextProperty("Account", GlobalServicesScriptingInterface::getInstance());
+    surfaceContext->setContextProperty("Account", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
+    surfaceContext->setContextProperty("GlobalServices", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
+    surfaceContext->setContextProperty("AccountServices", AccountServicesScriptingInterface::getInstance());
+
     surfaceContext->setContextProperty("DialogsManager", _dialogsManagerScriptingInterface);
-    surfaceContext->setContextProperty("GlobalServices", GlobalServicesScriptingInterface::getInstance());
     surfaceContext->setContextProperty("FaceTracker", DependencyManager::get<DdeFaceTracker>().data());
     surfaceContext->setContextProperty("AvatarManager", DependencyManager::get<AvatarManager>().data());
     surfaceContext->setContextProperty("UndoStack", &_undoStackScriptingInterface);
@@ -5775,10 +5777,11 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointe
     scriptEngine->registerGlobalObject("ModelCache", DependencyManager::get<ModelCache>().data());
     scriptEngine->registerGlobalObject("SoundCache", DependencyManager::get<SoundCache>().data());
 
-    scriptEngine->registerGlobalObject("Account", GlobalServicesScriptingInterface::getInstance());
     scriptEngine->registerGlobalObject("DialogsManager", _dialogsManagerScriptingInterface);
 
-    scriptEngine->registerGlobalObject("GlobalServices", GlobalServicesScriptingInterface::getInstance());
+    scriptEngine->registerGlobalObject("Account", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
+    scriptEngine->registerGlobalObject("GlobalServices", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
+    scriptEngine->registerGlobalObject("AccountServices", AccountServicesScriptingInterface::getInstance());
     qScriptRegisterMetaType(scriptEngine.data(), DownloadInfoResultToScriptValue, DownloadInfoResultFromScriptValue);
 
     scriptEngine->registerGlobalObject("FaceTracker", DependencyManager::get<DdeFaceTracker>().data());

interface/src/scripting/AccountScriptingInterface.cpp

@@ -1,36 +0,0 @@
-//
-//  AccountScriptingInterface.cpp
-//  interface/src/scripting
-//
-//  Created by Stojce Slavkovski on 6/07/14.
-//  Copyright 2014 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#include "AccountManager.h"
-
-#include "AccountScriptingInterface.h"
-#include "GlobalServicesScriptingInterface.h"
-
-AccountScriptingInterface* AccountScriptingInterface::getInstance() {
-    static AccountScriptingInterface sharedInstance;
-    return &sharedInstance;
-}
-
-bool AccountScriptingInterface::isLoggedIn() {
-    return GlobalServicesScriptingInterface::getInstance()->isLoggedIn();
-}
-
-void AccountScriptingInterface::logOut() {
-    GlobalServicesScriptingInterface::getInstance()->logOut();
-}
-
-bool AccountScriptingInterface::loggedIn() const {
-    return GlobalServicesScriptingInterface::getInstance()->loggedIn();
-}
-
-QString AccountScriptingInterface::getUsername() {
-    return GlobalServicesScriptingInterface::getInstance()->getUsername();
-}

interface/src/scripting/AccountScriptingInterface.h

@@ -1,60 +0,0 @@
-//
-//  AccountScriptingInterface.h
-//  interface/src/scripting
-//
-//  Created by Stojce Slavkovski on 6/07/14.
-//  Copyright 2014 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#ifndef hifi_AccountScriptingInterface_h
-#define hifi_AccountScriptingInterface_h
-
-#include <QObject>
-
-class AccountScriptingInterface : public QObject {
-    Q_OBJECT
-
-    /**jsdoc
-     * @namespace Account
-     * @property username {String} username if user is logged in, otherwise it returns "Unknown user"
-     */
-    Q_PROPERTY(QString username READ getUsername)
-    Q_PROPERTY(bool loggedIn READ loggedIn)
-
-signals:
-
-    /**jsdoc
-     * Triggered when username has changed.
-     * @function Account.usernameChanged
-     * @return {Signal}
-     */
-    void usernameChanged();
-    void loggedInChanged(bool loggedIn);
-
-public slots:
-    static AccountScriptingInterface* getInstance();
-
-    /**jsdoc
-     * Returns the username for the currently logged in High Fidelity metaverse account.
-     * @function Account.getUsername
-     * @return {string} username if user is logged in, otherwise it returns "Unknown user"
-     */
-    QString getUsername();
-
-    /**jsdoc
-     * Determine if the user is logged into the High Fidleity metaverse.
-     * @function Account.isLoggedIn
-     * @return {bool} true when user is logged into the High Fidelity metaverse.
-     */
-    bool isLoggedIn();
-    void logOut();
-
-public:
-    AccountScriptingInterface(QObject* parent = nullptr) {}
-    bool loggedIn() const;
-};
-
-#endif // hifi_AccountScriptingInterface_h

interface/src/scripting/AccountServicesScriptingInterface.cpp

@@ -1,5 +1,5 @@
 //
-//  GlobalServicesScriptingInterface.cpp
+//  AccountServicesScriptingInterface.cpp
 //  interface/src/scripting
 //
 //  Created by Thijs Wenker on 9/10/14.
@@ -14,41 +14,41 @@
 #include "DiscoverabilityManager.h"
 #include "ResourceCache.h"
 
-#include "GlobalServicesScriptingInterface.h"
+#include "AccountServicesScriptingInterface.h"
 
-GlobalServicesScriptingInterface::GlobalServicesScriptingInterface() {
+AccountServicesScriptingInterface::AccountServicesScriptingInterface() {
     auto accountManager = DependencyManager::get<AccountManager>();
-    connect(accountManager.data(), &AccountManager::usernameChanged, this, &GlobalServicesScriptingInterface::onUsernameChanged);
+    connect(accountManager.data(), &AccountManager::usernameChanged, this, &AccountServicesScriptingInterface::onUsernameChanged);
-    connect(accountManager.data(), &AccountManager::logoutComplete, this, &GlobalServicesScriptingInterface::loggedOut);
+    connect(accountManager.data(), &AccountManager::logoutComplete, this, &AccountServicesScriptingInterface::loggedOut);
-    connect(accountManager.data(), &AccountManager::loginComplete, this, &GlobalServicesScriptingInterface::connected);
+    connect(accountManager.data(), &AccountManager::loginComplete, this, &AccountServicesScriptingInterface::connected);
 
     _downloading = false;
     QTimer* checkDownloadTimer = new QTimer(this);
-    connect(checkDownloadTimer, &QTimer::timeout, this, &GlobalServicesScriptingInterface::checkDownloadInfo);
+    connect(checkDownloadTimer, &QTimer::timeout, this, &AccountServicesScriptingInterface::checkDownloadInfo);
     const int CHECK_DOWNLOAD_INTERVAL = MSECS_PER_SECOND / 2;
     checkDownloadTimer->start(CHECK_DOWNLOAD_INTERVAL);
 
     auto discoverabilityManager = DependencyManager::get<DiscoverabilityManager>();
     connect(discoverabilityManager.data(), &DiscoverabilityManager::discoverabilityModeChanged,
-            this, &GlobalServicesScriptingInterface::discoverabilityModeChanged);
+            this, &AccountServicesScriptingInterface::discoverabilityModeChanged);
 
     _loggedIn = isLoggedIn();
     emit loggedInChanged(_loggedIn);
 }
 
-GlobalServicesScriptingInterface::~GlobalServicesScriptingInterface() {
+AccountServicesScriptingInterface::~AccountServicesScriptingInterface() {
     auto accountManager = DependencyManager::get<AccountManager>();
-    disconnect(accountManager.data(), &AccountManager::usernameChanged, this, &GlobalServicesScriptingInterface::onUsernameChanged);
+    disconnect(accountManager.data(), &AccountManager::usernameChanged, this, &AccountServicesScriptingInterface::onUsernameChanged);
-    disconnect(accountManager.data(), &AccountManager::logoutComplete, this, &GlobalServicesScriptingInterface::loggedOut);
+    disconnect(accountManager.data(), &AccountManager::logoutComplete, this, &AccountServicesScriptingInterface::loggedOut);
-    disconnect(accountManager.data(), &AccountManager::loginComplete, this, &GlobalServicesScriptingInterface::connected);
+    disconnect(accountManager.data(), &AccountManager::loginComplete, this, &AccountServicesScriptingInterface::connected);
 }
 
-GlobalServicesScriptingInterface* GlobalServicesScriptingInterface::getInstance() {
+AccountServicesScriptingInterface* AccountServicesScriptingInterface::getInstance() {
-    static GlobalServicesScriptingInterface sharedInstance;
+    static AccountServicesScriptingInterface sharedInstance;
     return &sharedInstance;
 }
 
-const QString GlobalServicesScriptingInterface::getUsername() const {
+const QString AccountServicesScriptingInterface::getUsername() const {
     auto accountManager = DependencyManager::get<AccountManager>();
     if (accountManager->isLoggedIn()) {
         return accountManager->getAccountInfo().getUsername();
@@ -57,31 +57,31 @@ const QString GlobalServicesScriptingInterface::getUsername() const {
     }
 }
 
-bool GlobalServicesScriptingInterface::isLoggedIn() {
+bool AccountServicesScriptingInterface::isLoggedIn() {
     auto accountManager = DependencyManager::get<AccountManager>();
     return accountManager->isLoggedIn();
 }
 
-bool GlobalServicesScriptingInterface::checkAndSignalForAccessToken() {
+bool AccountServicesScriptingInterface::checkAndSignalForAccessToken() {
     auto accountManager = DependencyManager::get<AccountManager>();
     return accountManager->checkAndSignalForAccessToken();
 }
 
-void GlobalServicesScriptingInterface::logOut() {
+void AccountServicesScriptingInterface::logOut() {
     auto accountManager = DependencyManager::get<AccountManager>();
     return accountManager->logout();
 }
 
-void GlobalServicesScriptingInterface::loggedOut() {
+void AccountServicesScriptingInterface::loggedOut() {
-    emit GlobalServicesScriptingInterface::disconnected(QString("logout"));
+    emit AccountServicesScriptingInterface::disconnected(QString("logout"));
 }
 
-QString GlobalServicesScriptingInterface::getFindableBy() const {
+QString AccountServicesScriptingInterface::getFindableBy() const {
     auto discoverabilityManager = DependencyManager::get<DiscoverabilityManager>();
     return DiscoverabilityManager::findableByString(discoverabilityManager->getDiscoverabilityMode());
 }
 
-void GlobalServicesScriptingInterface::setFindableBy(const QString& discoverabilityMode) {
+void AccountServicesScriptingInterface::setFindableBy(const QString& discoverabilityMode) {
     auto discoverabilityManager = DependencyManager::get<DiscoverabilityManager>();
     if (discoverabilityMode.toLower() == "none") {
         discoverabilityManager->setDiscoverabilityMode(Discoverability::None);
@@ -96,11 +96,11 @@ void GlobalServicesScriptingInterface::setFindableBy(const QString& discoverabil
     }
 }
 
-void GlobalServicesScriptingInterface::discoverabilityModeChanged(Discoverability::Mode discoverabilityMode) {
+void AccountServicesScriptingInterface::discoverabilityModeChanged(Discoverability::Mode discoverabilityMode) {
     emit findableByChanged(DiscoverabilityManager::findableByString(discoverabilityMode));
 }
 
-void GlobalServicesScriptingInterface::onUsernameChanged(const QString& username) {
+void AccountServicesScriptingInterface::onUsernameChanged(const QString& username) {
     _loggedIn = (username != QString());
     emit myUsernameChanged(username);
     emit loggedInChanged(_loggedIn);
@@ -135,7 +135,7 @@ void DownloadInfoResultFromScriptValue(const QScriptValue& object, DownloadInfoR
     result.pending = object.property("pending").toVariant().toFloat();
 }
 
-DownloadInfoResult GlobalServicesScriptingInterface::getDownloadInfo() {
+DownloadInfoResult AccountServicesScriptingInterface::getDownloadInfo() {
     DownloadInfoResult result;
     foreach(const auto& resource, ResourceCache::getLoadingRequests()) {
         result.downloading.append(resource->getProgress() * 100.0f);
@@ -144,7 +144,7 @@ DownloadInfoResult GlobalServicesScriptingInterface::getDownloadInfo() {
     return result;
 }
 
-void GlobalServicesScriptingInterface::checkDownloadInfo() {
+void AccountServicesScriptingInterface::checkDownloadInfo() {
     DownloadInfoResult downloadInfo = getDownloadInfo();
     bool downloading = downloadInfo.downloading.count() > 0 || downloadInfo.pending > 0;
 
@@ -155,7 +155,7 @@ void GlobalServicesScriptingInterface::checkDownloadInfo() {
     }
 }
 
-void GlobalServicesScriptingInterface::updateDownloadInfo() {
+void AccountServicesScriptingInterface::updateDownloadInfo() {
     emit downloadInfoChanged(getDownloadInfo());
 }
 

interface/src/scripting/AccountServicesScriptingInterface.h

@@ -1,5 +1,5 @@
 //
-//  GlobalServicesScriptingInterface.h
+//  AccountServicesScriptingInterface.h
 //  interface/src/scripting
 //
 //  Created by Thijs Wenker on 9/10/14.
@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef hifi_GlobalServicesScriptingInterface_h
+#ifndef hifi_AccountServicesScriptingInterface_h
-#define hifi_GlobalServicesScriptingInterface_h
+#define hifi_AccountServicesScriptingInterface_h
 
 #include <QObject>
 #include <QScriptContext>
@@ -32,7 +32,7 @@ Q_DECLARE_METATYPE(DownloadInfoResult)
 QScriptValue DownloadInfoResultToScriptValue(QScriptEngine* engine, const DownloadInfoResult& result);
 void DownloadInfoResultFromScriptValue(const QScriptValue& object, DownloadInfoResult& result);
 
-class GlobalServicesScriptingInterface : public QObject {
+class AccountServicesScriptingInterface : public QObject {
     Q_OBJECT
     
     Q_PROPERTY(QString username READ getUsername NOTIFY myUsernameChanged)
@@ -41,7 +41,7 @@ class GlobalServicesScriptingInterface : public QObject {
     Q_PROPERTY(QUrl metaverseServerURL READ getMetaverseServerURL)
     
 public:
-    static GlobalServicesScriptingInterface* getInstance();
+    static AccountServicesScriptingInterface* getInstance();
 
     const QString getUsername() const;
     bool loggedIn() const { return _loggedIn; }
@@ -74,11 +74,11 @@ signals:
     void loggedInChanged(bool loggedIn);
 
 private:
-    GlobalServicesScriptingInterface();
+    AccountServicesScriptingInterface();
-    ~GlobalServicesScriptingInterface();
+    ~AccountServicesScriptingInterface();
     
     bool _downloading;
     bool _loggedIn{ false };
 };
 
-#endif // hifi_GlobalServicesScriptingInterface_h
+#endif // hifi_AccountServicesScriptingInterface_h

interface/src/ui/overlays/Web3DOverlay.cpp

@@ -50,7 +50,7 @@
 #include "ui/DomainConnectionModel.h"
 #include "ui/AvatarInputs.h"
 #include "avatar/AvatarManager.h"
-#include "scripting/GlobalServicesScriptingInterface.h"
+#include "scripting/AccountServicesScriptingInterface.h"
 #include <plugins/InputConfiguration.h>
 #include "ui/Snapshot.h"
 #include "SoundCache.h"
@@ -192,7 +192,10 @@ void Web3DOverlay::setupQmlSurface() {
 
         _webSurface->getSurfaceContext()->setContextProperty("offscreenFlags", flags);
         _webSurface->getSurfaceContext()->setContextProperty("AddressManager", DependencyManager::get<AddressManager>().data());
-        _webSurface->getSurfaceContext()->setContextProperty("Account", GlobalServicesScriptingInterface::getInstance());
+
+        _webSurface->getSurfaceContext()->setContextProperty("Account", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
+        _webSurface->getSurfaceContext()->setContextProperty("GlobalServices", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
+        _webSurface->getSurfaceContext()->setContextProperty("AccountServices", AccountServicesScriptingInterface::getInstance());
 
         // in Qt 5.10.0 there is already an "Audio" object in the QML context
         // though I failed to find it (from QtMultimedia??). So..  let it be "AudioScriptingInterface"
@@ -208,7 +211,6 @@ void Web3DOverlay::setupQmlSurface() {
         _webSurface->getSurfaceContext()->setContextProperty("OctreeStats", DependencyManager::get<OctreeStatsProvider>().data());
         _webSurface->getSurfaceContext()->setContextProperty("DCModel", DependencyManager::get<DomainConnectionModel>().data());
         _webSurface->getSurfaceContext()->setContextProperty("AvatarInputs", AvatarInputs::getInstance());
-        _webSurface->getSurfaceContext()->setContextProperty("GlobalServices", GlobalServicesScriptingInterface::getInstance());
         _webSurface->getSurfaceContext()->setContextProperty("AvatarList", DependencyManager::get<AvatarManager>().data());
         _webSurface->getSurfaceContext()->setContextProperty("DialogsManager", DialogsManagerScriptingInterface::getInstance());
         _webSurface->getSurfaceContext()->setContextProperty("InputConfiguration", DependencyManager::get<InputConfiguration>().data());