Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 03:37:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

adding sending oculus ID including username

Browse source
This commit is contained in:
Wayne Chen 2019-01-14 17:57:23 -08:00
parent 7e674ba3c4
commit 2d16e71e74
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/ui/LoginDialog.cpp
View file

@ -126,7 +126,7 @@ void LoginDialog::login(const QString& username, const QString& password) const
void LoginDialog::loginThroughOculus() { void LoginDialog::loginThroughOculus() {
qDebug() << "Attempting to login through Oculus"; qDebug() << "Attempting to login through Oculus";
if (auto oculusPlatformPlugin = PluginManager::getInstance()->getOculusPlatformPlugin()) { if (auto oculusPlatformPlugin = PluginManager::getInstance()->getOculusPlatformPlugin()) {
oculusPlatformPlugin->requestNonceAndUserID([this] (QString nonce, QString userID) { oculusPlatformPlugin->requestNonceAndUserID([this] (QString nonce, QString userID, QString oculusID) {
DependencyManager::get<AccountManager>()->requestAccessTokenWithOculus(nonce, userID); DependencyManager::get<AccountManager>()->requestAccessTokenWithOculus(nonce, userID);
}); });
} }
@ -135,7 +135,7 @@ void LoginDialog::loginThroughOculus() {
void LoginDialog::linkOculus() { void LoginDialog::linkOculus() {
qDebug() << "Attempting to link Oculus account"; qDebug() << "Attempting to link Oculus account";
if (auto oculusPlatformPlugin = PluginManager::getInstance()->getOculusPlatformPlugin()) { 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()) { if (nonce.isEmpty() || userID.isEmpty()) {
emit handleLoginFailed(); emit handleLoginFailed();
return; return;
@ -162,7 +162,7 @@ void LoginDialog::linkOculus() {
void LoginDialog::createAccountFromOculus(QString username) { void LoginDialog::createAccountFromOculus(QString username) {
qDebug() << "Attempting to create account from Oculus info"; qDebug() << "Attempting to create account from Oculus info";
if (auto oculusPlatformPlugin = PluginManager::getInstance()->getOculusPlatformPlugin()) { 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()) { if (nonce.isEmpty() || userID.isEmpty()) {
emit handleLoginFailed(); emit handleLoginFailed();
return; return;
@ -178,6 +178,7 @@ void LoginDialog::createAccountFromOculus(QString username) {
QJsonObject payload; QJsonObject payload;
payload.insert("oculus_nonce", QJsonValue::fromVariant(QVariant(nonce))); payload.insert("oculus_nonce", QJsonValue::fromVariant(QVariant(nonce)));
payload.insert("oculus_user_id", QJsonValue::fromVariant(QVariant(userID))); payload.insert("oculus_user_id", QJsonValue::fromVariant(QVariant(userID)));
payload.insert("oculus_id", QJsonValue::fromVariant(QVariant(oculusID)));
if (!username.isEmpty()) { if (!username.isEmpty()) {
payload.insert("username", QJsonValue::fromVariant(QVariant(username))); payload.insert("username", QJsonValue::fromVariant(QVariant(username)));
} }

1
libraries/networking/src/AccountManager.cpp
View file

@ -587,7 +587,6 @@ void AccountManager::requestAccessTokenWithSteam(QByteArray authSessionTicket) {
} }
void AccountManager::requestAccessTokenWithOculus(const QString& nonce, const QString& userID) { void AccountManager::requestAccessTokenWithOculus(const QString& nonce, const QString& userID) {
qDebug() << nonce << ", " << userID;
QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance(); QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
QNetworkRequest request; QNetworkRequest request;

2
libraries/plugins/src/plugins/OculusPlatformPlugin.h
View file

@ -11,7 +11,7 @@
#include <functional> #include <functional>
using NonceUserIDCallback = std::function<void(QString, QString)>; using NonceUserIDCallback = std::function<void(QString, QString, QString)>;
class OculusPlatformPlugin { class OculusPlatformPlugin {
public: public:

2
plugins/oculus/src/OculusPlatformPlugin.cpp
View file

@ -96,7 +96,7 @@ void OculusAPIPlugin::handleOVREvents() {
} }
if (_nonceChanged) { if (_nonceChanged) {
_nonceUserIDCallback(_nonce, _user); _nonceUserIDCallback(_nonce, _user, QString::number(_userID));
_nonce = _user = ""; _nonce = _user = "";
_nonceChanged = false; _nonceChanged = false;
} }