diff --git a/interface/src/ui/LoginDialog.cpp b/interface/src/ui/LoginDialog.cpp index 32e7ffe1c6..32ea4c07d3 100644 --- a/interface/src/ui/LoginDialog.cpp +++ b/interface/src/ui/LoginDialog.cpp @@ -126,7 +126,7 @@ void LoginDialog::login(const QString& username, const QString& password) const void LoginDialog::loginThroughOculus() { qDebug() << "Attempting to login through Oculus"; if (auto oculusPlatformPlugin = PluginManager::getInstance()->getOculusPlatformPlugin()) { - oculusPlatformPlugin->requestNonceAndUserID([this] (QString nonce, QString userID) { + oculusPlatformPlugin->requestNonceAndUserID([this] (QString nonce, QString userID, QString oculusID) { DependencyManager::get()->requestAccessTokenWithOculus(nonce, userID); }); } @@ -135,7 +135,7 @@ void LoginDialog::loginThroughOculus() { void LoginDialog::linkOculus() { qDebug() << "Attempting to link Oculus account"; if (auto oculusPlatformPlugin = PluginManager::getInstance()->getOculusPlatformPlugin()) { - oculusPlatformPlugin->requestNonceAndUserID([this] (QString nonce, QString userID) { + oculusPlatformPlugin->requestNonceAndUserID([this] (QString nonce, QString userID, QString oculusID) { if (nonce.isEmpty() || userID.isEmpty()) { emit handleLoginFailed(); return; @@ -162,7 +162,7 @@ void LoginDialog::linkOculus() { void LoginDialog::createAccountFromOculus(QString username) { qDebug() << "Attempting to create account from Oculus info"; if (auto oculusPlatformPlugin = PluginManager::getInstance()->getOculusPlatformPlugin()) { - oculusPlatformPlugin->requestNonceAndUserID([this, username] (QString nonce, QString userID) { + oculusPlatformPlugin->requestNonceAndUserID([this, username] (QString nonce, QString userID, QString oculusID) { if (nonce.isEmpty() || userID.isEmpty()) { emit handleLoginFailed(); return; @@ -178,6 +178,7 @@ void LoginDialog::createAccountFromOculus(QString username) { QJsonObject payload; payload.insert("oculus_nonce", QJsonValue::fromVariant(QVariant(nonce))); payload.insert("oculus_user_id", QJsonValue::fromVariant(QVariant(userID))); + payload.insert("oculus_id", QJsonValue::fromVariant(QVariant(oculusID))); if (!username.isEmpty()) { payload.insert("username", QJsonValue::fromVariant(QVariant(username))); } diff --git a/libraries/networking/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp index 2c7018d23a..38d286d131 100644 --- a/libraries/networking/src/AccountManager.cpp +++ b/libraries/networking/src/AccountManager.cpp @@ -587,7 +587,6 @@ void AccountManager::requestAccessTokenWithSteam(QByteArray authSessionTicket) { } void AccountManager::requestAccessTokenWithOculus(const QString& nonce, const QString& userID) { - qDebug() << nonce << ", " << userID; QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance(); QNetworkRequest request; diff --git a/libraries/plugins/src/plugins/OculusPlatformPlugin.h b/libraries/plugins/src/plugins/OculusPlatformPlugin.h index 7a99ce6890..1eeb27c6cc 100644 --- a/libraries/plugins/src/plugins/OculusPlatformPlugin.h +++ b/libraries/plugins/src/plugins/OculusPlatformPlugin.h @@ -11,7 +11,7 @@ #include -using NonceUserIDCallback = std::function; +using NonceUserIDCallback = std::function; class OculusPlatformPlugin { public: diff --git a/plugins/oculus/src/OculusPlatformPlugin.cpp b/plugins/oculus/src/OculusPlatformPlugin.cpp index 49ff4e094d..35cf8ae394 100644 --- a/plugins/oculus/src/OculusPlatformPlugin.cpp +++ b/plugins/oculus/src/OculusPlatformPlugin.cpp @@ -96,7 +96,7 @@ void OculusAPIPlugin::handleOVREvents() { } if (_nonceChanged) { - _nonceUserIDCallback(_nonce, _user); + _nonceUserIDCallback(_nonce, _user, QString::number(_userID)); _nonce = _user = ""; _nonceChanged = false; }