Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 19:30:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

more wip on oculus login

Browse source
This commit is contained in:
Wayne Chen 2019-01-09 19:23:07 -08:00
parent 0342a2de60
commit 49e58479d8
12 changed files with 204 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
interface/resources/qml/LoginDialog/CompleteProfileBody.qml
View file

@ -26,7 +26,8 @@ Item {
readonly property int fontSize: 15 readonly property int fontSize: 15
readonly property bool fontBold: true readonly property bool fontBold: true
readonly property bool withSteam: withSteam property bool withOculus: withOculus
property bool withSteam: withSteam
property string errorString: errorString property string errorString: errorString
QtObject { QtObject {
@ -143,7 +144,13 @@ Item {
fontBold: completeProfileBody.fontBold fontBold: completeProfileBody.fontBold
onClicked: { onClicked: {
loginErrorMessage.visible = false; loginErrorMessage.visible = false;
loginDialog.createAccountFromSteam(); console.log("withOculus: " + completeProfileBody.withOculus);
if (completeProfileBody.withOculus) {
console.log("creating account through oculus");
loginDialog.createAccountFromOculus();
} else if (completeProfileBody.withSteam) {
loginDialog.createAccountFromSteam();
}
} }
} }
} }
@ -180,7 +187,9 @@ Item {
onLinkActivated: { onLinkActivated: {
loginDialog.isLogIn = true; loginDialog.isLogIn = true;
bodyLoader.setSource("LinkAccountBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "errorString": "", "withSteam": true, "linkSteam": true }); bodyLoader.setSource("LinkAccountBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "errorString": "",
"withSteam": completeProfileBody.withSteam, "linkSteam": completeProfileBody.withSteam, "withOculus": completeProfileBody.withOculus,
"linkOculus": completeProfileBody.withOculus });
} }
Component.onCompleted: { Component.onCompleted: {
if (additionalTextMetrics.width > root.bannerWidth && root.isTablet) { if (additionalTextMetrics.width > root.bannerWidth && root.isTablet) {
@ -252,14 +261,19 @@ Item {
target: loginDialog target: loginDialog
onHandleCreateCompleted: { onHandleCreateCompleted: {
console.log("Create Succeeded") console.log("Create Succeeded")
if (completeProfileBody.withOculus) {
loginDialog.loginThroughSteam(); loginDialog.loginThroughOculus();
bodyLoader.setSource("LoggingInBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "withSteam": true, "linkSteam": false }); } else if (completeProfileBody.withSteam) {
loginDialog.loginThroughSteam();
}
bodyLoader.setSource("LoggingInBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "withSteam": completeProfileBody.withSteam, "linkSteam": false,
"withOculus": completeProfileBody.withOculus, "linkOculus": false });
} }
onHandleCreateFailed: { onHandleCreateFailed: {
console.log("Create Failed: " + error); console.log("Create Failed: " + error);
bodyLoader.setSource("UsernameCollisionBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader }); bodyLoader.setSource("UsernameCollisionBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "withSteam": completeProfileBody.withSteam,
"withOculus": completeProfileBody.withOculus });
} }
} }

27
interface/resources/qml/LoginDialog/LinkAccountBody.qml
View file

@ -69,7 +69,8 @@ Item {
function login() { function login() {
loginDialog.login(emailField.text, passwordField.text); loginDialog.login(emailField.text, passwordField.text);
bodyLoader.setSource("LoggingInBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "withSteam": linkAccountBody.withSteam, "withOculus": linkAccountBody.withOculus, "linkSteam": linkAccountBody.linkSteam }); bodyLoader.setSource("LoggingInBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "withSteam": linkAccountBody.withSteam,
"withOculus": linkAccountBody.withOculus, "linkSteam": linkAccountBody.linkSteam, "linkOculus": linkAccountBody.linkOculus });
} }
function init() { function init() {
@ -77,12 +78,12 @@ Item {
loginDialog.isLogIn = true; loginDialog.isLogIn = true;
loginErrorMessage.text = linkAccountBody.errorString; loginErrorMessage.text = linkAccountBody.errorString;
loginErrorMessage.visible = (linkAccountBody.errorString !== ""); loginErrorMessage.visible = (linkAccountBody.errorString !== "");
loginButton.text = !linkAccountBody.linkSteam ? "Log In" : "Link Account"; loginButton.text = (!linkAccountBody.linkSteam && !linkAccountBody.linkOculus) ? "Log In" : "Link Account";
loginButton.color = hifi.buttons.blue; loginButton.color = hifi.buttons.blue;
emailField.placeholderText = "Username or Email"; emailField.placeholderText = "Username or Email";
var savedUsername = Settings.getValue("keepMeLoggedIn/savedUsername", ""); var savedUsername = Settings.getValue("keepMeLoggedIn/savedUsername", "");
emailField.text = keepMeLoggedInCheckbox.checked ? savedUsername === "Unknown user" ? "" : savedUsername : ""; emailField.text = keepMeLoggedInCheckbox.checked ? savedUsername === "Unknown user" ? "" : savedUsername : "";
if (linkAccountBody.linkSteam) { if (linkAccountBody.linkSteam || linkAccountBody.linkOculus) {
steamInfoText.anchors.top = passwordField.bottom; steamInfoText.anchors.top = passwordField.bottom;
keepMeLoggedInCheckbox.anchors.top = steamInfoText.bottom; keepMeLoggedInCheckbox.anchors.top = steamInfoText.bottom;
loginButton.width = (passwordField.width - hifi.dimensions.contentSpacing.x) / 2; loginButton.width = (passwordField.width - hifi.dimensions.contentSpacing.x) / 2;
@ -286,13 +287,14 @@ Item {
fontSize: linkAccountBody.fontSize fontSize: linkAccountBody.fontSize
fontBold: linkAccountBody.fontBold fontBold: linkAccountBody.fontBold
color: hifi.buttons.noneBorderlessWhite; color: hifi.buttons.noneBorderlessWhite;
visible: linkAccountBody.linkSteam visible: linkAccountBody.linkSteam || linkAccountBody.linkOculus
anchors { anchors {
top: keepMeLoggedInCheckbox.bottom top: keepMeLoggedInCheckbox.bottom
topMargin: hifi.dimensions.contentSpacing.y topMargin: hifi.dimensions.contentSpacing.y
} }
onClicked: { onClicked: {
bodyLoader.setSource("CompleteProfileBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "withSteam": linkAccountBody.withSteam, "errorString": "" }); bodyLoader.setSource("CompleteProfileBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "withSteam": linkAccountBody.withSteam,
"withOculus": linkAccountBody.withOculus, "errorString": "" });
} }
} }
HifiControlsUit.Button { HifiControlsUit.Button {
@ -319,7 +321,7 @@ Item {
Text { Text {
id: steamInfoText id: steamInfoText
width: root.bannerWidth width: root.bannerWidth
visible: linkAccountBody.linkSteam visible: linkAccountBody.linkSteam || linkAccountBody.linkOculus
anchors { anchors {
top: loginButton.bottom top: loginButton.bottom
topMargin: hifi.dimensions.contentSpacing.y topMargin: hifi.dimensions.contentSpacing.y
@ -346,7 +348,7 @@ Item {
HifiStylesUit.ShortcutText { HifiStylesUit.ShortcutText {
id: cantAccessText id: cantAccessText
z: 10 z: 10
visible: !linkAccountBody.linkSteam visible: !linkAccountBody.linkSteam && !linkAccountBody.linkOculus
anchors { anchors {
top: loginButton.bottom top: loginButton.bottom
topMargin: hifi.dimensions.contentSpacing.y topMargin: hifi.dimensions.contentSpacing.y
@ -401,10 +403,10 @@ Item {
} }
bodyLoader.setSource("LoggingInBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, bodyLoader.setSource("LoggingInBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader,
"withSteam": linkAccountBody.withSteam, "withOculus": linkAccountBody.withOculus, "linkSteam": linkAccountBody.linkSteam }); "withSteam": linkAccountBody.withSteam, "withOculus": linkAccountBody.withOculus, "linkSteam": linkAccountBody.linkSteam, "linkOculus": linkAccountBody.linkOculus });
} }
Component.onCompleted: { Component.onCompleted: {
if (linkAccountBody.linkSteam) { if (linkAccountBody.linkSteam || linkAccountBody.linkOculus) {
continueButton.visible = false; continueButton.visible = false;
return; return;
} }
@ -467,7 +469,7 @@ Item {
onLinkActivated: { onLinkActivated: {
Tablet.playSound(TabletEnums.ButtonClick); Tablet.playSound(TabletEnums.ButtonClick);
bodyLoader.setSource("SignUpBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, bodyLoader.setSource("SignUpBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader,
"errorString": "", "linkSteam": linkAccountBody.linkSteam }); "errorString": "" });
} }
} }
} }
@ -491,7 +493,7 @@ Item {
fontFamily: linkAccountBody.fontFamily fontFamily: linkAccountBody.fontFamily
fontSize: linkAccountBody.fontSize fontSize: linkAccountBody.fontSize
fontBold: linkAccountBody.fontBold fontBold: linkAccountBody.fontBold
visible: loginDialog.getLoginDialogPoppedUp() && !linkAccountBody.linkSteam; visible: loginDialog.getLoginDialogPoppedUp() && !linkAccountBody.linkSteam && !linkAccountBody.linkOculus;
onClicked: { onClicked: {
if (loginDialog.getLoginDialogPoppedUp()) { if (loginDialog.getLoginDialogPoppedUp()) {
console.log("[ENCOURAGELOGINDIALOG]: user dismissed login screen") console.log("[ENCOURAGELOGINDIALOG]: user dismissed login screen")
@ -524,9 +526,6 @@ Item {
}); });
} }
} }
onLoginFailed: {
console.log("login failed");
}
} }
Component.onCompleted: { Component.onCompleted: {

38
interface/resources/qml/LoginDialog/LoggingInBody.qml
View file

@ -79,6 +79,12 @@ Item {
loggingInText.text = "Linking to Steam"; loggingInText.text = "Linking to Steam";
loggingInText.x = loggingInHeader.width/2 - loggingInTextMetrics.width/2 + loggingInGlyphTextMetrics.width/2; loggingInText.x = loggingInHeader.width/2 - loggingInTextMetrics.width/2 + loggingInGlyphTextMetrics.width/2;
loginDialog.linkSteam(); loginDialog.linkSteam();
} else if (loggingInBody.linkOculus) {
loggingInGlyph.text = hifi.glyphs.oculus;
loggingInGlyph.visible = true;
loggingInText.text = "Linking to Oculus";
loggingInText.x = loggingInHeader.width/2 - loggingInTextMetrics.width/2 + loggingInGlyphTextMetrics.width/2;
loginDialog.linkOculus();
} else if (loggingInBody.withSteam) { } else if (loggingInBody.withSteam) {
loggingInGlyph.visible = true; loggingInGlyph.visible = true;
loggingInText.text = "Logging in to Steam"; loggingInText.text = "Logging in to Steam";
@ -100,6 +106,10 @@ Item {
loggingInText.text = "Linking to Steam"; loggingInText.text = "Linking to Steam";
loginDialog.linkSteam(); loginDialog.linkSteam();
return; return;
} else if (loggingInBody.linkOculus) {
loggingInText.text = "Linking to Oculus";
loginDialog.linkOculus();
return;
} }
if (loggingInBody.withSteam) { if (loggingInBody.withSteam) {
// reset the flag. // reset the flag.
@ -236,11 +246,13 @@ Item {
onHandleLinkCompleted: { onHandleLinkCompleted: {
console.log("Link Succeeded"); console.log("Link Succeeded");
loggingInBody.linkSteam = false; loggingInBody.linkSteam = false;
loggingInBody.linkOculus = false;
loggingInBody.loadingSuccess(); loggingInBody.loadingSuccess();
} }
onHandleLinkFailed: { onHandleLinkFailed: {
console.log("Link Failed: " + error); console.log("Link Failed: " + error);
bodyLoader.setSource("LinkAccountBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "linkSteam": true, "errorString": error }); bodyLoader.setSource("LinkAccountBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "linkSteam": loggingInBody.linkSteam,
"linkOculus": loggingInBody.linkOculus, "errorString": error });
} }
onHandleLoginCompleted: { onHandleLoginCompleted: {
@ -251,24 +263,26 @@ Item {
onHandleLoginFailed: { onHandleLoginFailed: {
console.log("Login Failed") console.log("Login Failed")
loggingInSpinner.visible = false; loggingInSpinner.visible = false;
loggingInGlyph.visible = false;
var errorString = ""; var errorString = "";
if (loggingInBody.withOculus) { if (loggingInBody.linkOculus && loggingInBody.withOculus) {
loggingInGlyph.visible = false; errorString = "Username or password is incorrect.";
errorString = "Your Oculus authentication has failed. Please make sure you are logged into Oculus and try again."; bodyLoader.setSource("LinkAccountBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "withSteam": loggingInBody.withSteam,
bodyLoader.setSource("CompleteProfileBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "withSteam": false, "errorString": errorString }); "withOculus": loggingInBody.withOculus, "linkSteam": loggingInBody.linkSteam, "errorString": errorString });
} else if (loggingInBody.linkSteam && loggingInBody.withSteam) { } else if (loggingInBody.linkSteam && loggingInBody.withSteam) {
errorString = "Username or password is incorrect."; errorString = "Username or password is incorrect.";
bodyLoader.setSource("LinkAccountBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "withSteam": loggingInBody.withSteam, "linkSteam": loggingInBody.linkSteam, "errorString": errorString }); bodyLoader.setSource("LinkAccountBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "withSteam": loggingInBody.withSteam,
"withOculus": loggingInBody.withOculus, "linkSteam": loggingInBody.linkSteam, "errorString": errorString });
} else if (loggingInBody.withSteam) { } else if (loggingInBody.withSteam) {
loggingInGlyph.visible = false;
errorString = "Your Steam authentication has failed. Please make sure you are logged into Steam and try again."; errorString = "Your Steam authentication has failed. Please make sure you are logged into Steam and try again.";
bodyLoader.setSource("CompleteProfileBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "withSteam": loggingInBody.withSteam, "errorString": errorString }); bodyLoader.setSource("CompleteProfileBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "withSteam": loggingInBody.withSteam,
"withOculus": loggingInBody.withOculus, "errorString": errorString });
} else if (loggingInBody.withOculus) { } else if (loggingInBody.withOculus) {
loggingInGlyph.visible = false;
errorString = "Your Oculus authentication has failed. Please make sure you are logged into Oculus and try again." errorString = "Your Oculus authentication has failed. Please make sure you are logged into Oculus and try again."
bodyLoader.setSource("LinkAccountBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "errorString": errorString }); console.log("loggingInBody- withOculus: " + loggingInBody.withOculus);
} bodyLoader.setSource("CompleteProfileBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "withSteam": loggingInBody.withSteam,
else { "withOculus": loggingInBody.withOculus, "errorString": errorString });
} else {
errorString = "Username or password is incorrect."; errorString = "Username or password is incorrect.";
bodyLoader.setSource("LinkAccountBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "errorString": errorString }); bodyLoader.setSource("LinkAccountBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "errorString": errorString });
} }

3
interface/resources/qml/LoginDialog/SignUpBody.qml
View file

@ -37,7 +37,6 @@ Item {
onKeyboardRaisedChanged: d.resize(); onKeyboardRaisedChanged: d.resize();
property string errorString: errorString property string errorString: errorString
property bool linkSteam: linkSteam
property bool lostFocus: false property bool lostFocus: false
QtObject { QtObject {
@ -342,7 +341,7 @@ Item {
fontSize: signUpBody.fontSize fontSize: signUpBody.fontSize
fontBold: signUpBody.fontBold fontBold: signUpBody.fontBold
onClicked: { onClicked: {
bodyLoader.setSource("LinkAccountBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "linkSteam": signUpBody.linkSteam }); bodyLoader.setSource("LinkAccountBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "linkSteam": false });
} }
} }
HifiControlsUit.Button { HifiControlsUit.Button {

24
interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
View file

@ -26,6 +26,9 @@ Item {
readonly property int textFieldFontSize: 18 readonly property int textFieldFontSize: 18
readonly property bool fontBold: true readonly property bool fontBold: true
property bool withSteam: withSteam
property bool withOculus: withOculus
function create() { function create() {
mainTextContainer.visible = false mainTextContainer.visible = false
loginDialog.createAccountFromSteam(textField.text); loginDialog.createAccountFromSteam(textField.text);
@ -86,12 +89,19 @@ Item {
font.family: usernameCollisionBody.fontFamily font.family: usernameCollisionBody.fontFamily
font.pixelSize: usernameCollisionBody.fontSize font.pixelSize: usernameCollisionBody.fontSize
font.bold: usernameCollisionBody.fontBold font.bold: usernameCollisionBody.fontBold
text: qsTr("Your Steam username is not available."); text: qsTr("");
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
color: hifi.colors.redAccent color: hifi.colors.redAccent
lineHeight: 1 lineHeight: 1
lineHeightMode: Text.ProportionalHeight lineHeightMode: Text.ProportionalHeight
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
Component.onCompleted: {
if (usernameCollisionBody.withOculus) {
text = qsTr("Your Oculus username is not available.");
} else if (usernameCollisionBody.withSteam) {
text = qsTr("Your Steam username is not available.");
}
}
} }
@ -160,7 +170,8 @@ Item {
fontSize: usernameCollisionBody.fontSize fontSize: usernameCollisionBody.fontSize
fontBold: usernameCollisionBody.fontBold fontBold: usernameCollisionBody.fontBold
onClicked: { onClicked: {
bodyLoader.setSource("CompleteProfileBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "errorString": "" }); bodyLoader.setSource("CompleteProfileBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "withSteam": usernameCollisionBody.withSteam,
"withOculus": usernameCollisionBody.withOculus, "errorString": "" });
} }
} }
HifiControlsUit.Button { HifiControlsUit.Button {
@ -197,8 +208,13 @@ Item {
target: loginDialog target: loginDialog
onHandleCreateCompleted: { onHandleCreateCompleted: {
console.log("Create Succeeded"); console.log("Create Succeeded");
loginDialog.loginThroughSteam(); if (usernameCollisionBody.withOculus) {
bodyLoader.setSource("LoggingInBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "withSteam": true, "linkSteam": false }) loginDialog.loginThroughOculus();
} else if (usernameCollisionBody.withSteam) {
loginDialog.loginThroughSteam();
}
bodyLoader.setSource("LoggingInBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "withSteam": usernameCollisionBody.withSteam,
"withOculus": usernameCollisionBody.withOculus, "linkSteam": false, "linkOculus": false })
} }
onHandleCreateFailed: { onHandleCreateFailed: {
console.log("Create Failed: " + error) console.log("Create Failed: " + error)

8
interface/src/Application.cpp
View file

@ -4733,6 +4733,10 @@ void Application::idle() {
steamClient->runCallbacks(); steamClient->runCallbacks();
} }
if (auto oculusPlugin = PluginManager::getInstance()->getOculusPlatformPlugin()) {
oculusPlugin->handleOVREvents();
}
float secondsSinceLastUpdate = (float)_lastTimeUpdated.nsecsElapsed() / NSECS_PER_MSEC / MSECS_PER_SECOND; float secondsSinceLastUpdate = (float)_lastTimeUpdated.nsecsElapsed() / NSECS_PER_MSEC / MSECS_PER_SECOND;
_lastTimeUpdated.start(); _lastTimeUpdated.start();
@ -5948,10 +5952,6 @@ void Application::update(float deltaTime) {
} }
} }
if (auto oculusPlugin = PluginManager::getInstance()->getOculusPlatformPlugin()) {
oculusPlugin->handleOVREvents();
}
userInputMapper->setInputCalibrationData(calibrationData); userInputMapper->setInputCalibrationData(calibrationData);
userInputMapper->update(deltaTime); userInputMapper->update(deltaTime);

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

@ -46,6 +46,10 @@ LoginDialog::LoginDialog(QQuickItem *parent) : OffscreenQmlDialog(parent) {
this, &LoginDialog::handleLoginFailed); this, &LoginDialog::handleLoginFailed);
connect(qApp, &Application::loginDialogFocusEnabled, this, &LoginDialog::focusEnabled); connect(qApp, &Application::loginDialogFocusEnabled, this, &LoginDialog::focusEnabled);
connect(qApp, &Application::loginDialogFocusDisabled, this, &LoginDialog::focusDisabled); connect(qApp, &Application::loginDialogFocusDisabled, this, &LoginDialog::focusDisabled);
if (auto oculusPlatformPlugin = PluginManager::getInstance()->getOculusPlatformPlugin()) {
connect(oculusPlatformPlugin.get(), &OculusPlatformPlugin::loginReady, this, &LoginDialog::onLoginThroughOculusReady);
connect(oculusPlatformPlugin.get(), &OculusPlatformPlugin::linkAccountReady, this, &LoginDialog::onLinkOculusReady);
}
connect(this, SIGNAL(dismissedLoginDialog()), qApp, SLOT(onDismissedLoginDialog())); connect(this, SIGNAL(dismissedLoginDialog()), qApp, SLOT(onDismissedLoginDialog()));
#endif #endif
} }
@ -124,74 +128,29 @@ 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 oculusPlatform = PluginManager::getInstance()->getOculusPlatformPlugin()) { if (auto oculusPlatformPlugin = PluginManager::getInstance()->getOculusPlatformPlugin()) {
//oculusPlatform->requestTicket([this](QString nonce, QString userID) { oculusPlatformPlugin->requestNonceAndUserID(LoginState::LOGIN);
// if (nonce.isEmpty() || userID.isEmpty()) { connect(oculusPlatformPlugin.get(), &OculusPlatformPlugin::loginReady, this, [&] (QString nonce, QString userID) {
// emit handleLoginFailed(); onLoginThroughOculusReady(nonce, userID);
// return; });
// }
// DependencyManager::get<AccountManager>()->requestAccessTokenWithOculus(nonce, userID);
//});
} }
} }
void LoginDialog::linkOculus() { void LoginDialog::linkOculus() {
qDebug() << "Attempting to link Oculus account"; qDebug() << "Attempting to link Oculus account";
if (auto oculusPlatform = PluginManager::getInstance()->getOculusPlatformPlugin()) { if (auto oculusPlatformPlugin = PluginManager::getInstance()->getOculusPlatformPlugin()) {
//oculusPlatform->requestTicket([this](QString nonce, QString userID) { oculusPlatformPlugin->requestNonceAndUserID(LoginState::LINK_ACCOUNT);
// if (nonce.isEmpty() || userID.isEmpty()) {
// emit handleLoginFailed();
// return;
// }
// JSONCallbackParameters callbackParams;
// callbackParams.callbackReceiver = this;
// callbackParams.jsonCallbackMethod = "linkCompleted";
// callbackParams.errorCallbackMethod = "linkFailed";
// const QString LINK_OCULUS_PATH = "api/v1/user/oculus/link";
// QJsonObject payload;
// payload.insert("oculus_nonce", QJsonValue::fromVariant(QVariant(nonce)));
// payload.insert("oculus_user_id", QJsonValue::fromVariant(QVariant(userID)));
// auto accountManager = DependencyManager::get<AccountManager>();
// accountManager->sendRequest(LINK_OCULUS_PATH, AccountManagerAuth::Required,
// QNetworkAccessManager::PostOperation, callbackParams,
// QJsonDocument(payload).toJson());
//});
} }
} }
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 oculusPlatform = PluginManager::getInstance()->getOculusPlatformPlugin()) { if (auto oculusPlatformPlugin = PluginManager::getInstance()->getOculusPlatformPlugin()) {
//oculusPlatform->requestTicket([this, username](QString nonce, QString userID) { oculusPlatformPlugin->requestNonceAndUserID(LoginState::CREATE_ACCOUNT);
// if (nonce.isEmpty() || userID.isEmpty()) { connect(oculusPlatformPlugin.get(), &OculusPlatformPlugin::createAccountReady, this, [&] (QString nonce, QString userID) {
// emit handleLoginFailed(); onCreateAccountThroughOculusReady(nonce, userID, username);
// return; });
// }
// JSONCallbackParameters callbackParams;
// callbackParams.callbackReceiver = this;
// callbackParams.jsonCallbackMethod = "createCompleted";
// callbackParams.errorCallbackMethod = "createFailed";
// const QString CREATE_ACCOUNT_FROM_OCULUS_PATH = "api/v1/user/oculus/create";
// QJsonObject payload;
// payload.insert("oculus_nonce", QJsonValue::fromVariant(QVariant(nonce)));
// payload.insert("oculus_user_id", QJsonValue::fromVariant(QVariant(userID)));
// if (!username.isEmpty()) {
// payload.insert("username", QJsonValue::fromVariant(QVariant(username)));
// }
// auto accountManager = DependencyManager::get<AccountManager>();
// accountManager->sendRequest(CREATE_ACCOUNT_FROM_OCULUS_PATH, AccountManagerAuth::None,
// QNetworkAccessManager::PostOperation, callbackParams,
// QJsonDocument(payload).toJson());
//});
} }
} }
@ -317,6 +276,60 @@ bool LoginDialog::getLoginDialogPoppedUp() const {
return qApp->getLoginDialogPoppedUp(); return qApp->getLoginDialogPoppedUp();
} }
void LoginDialog::onLoginThroughOculusReady(QString nonce, QString userID) {
DependencyManager::get<AccountManager>()->requestAccessTokenWithOculus(nonce, userID);
}
void LoginDialog::onLinkOculusReady(QString nonce, QString userID) {
if (nonce.isEmpty() || userID.isEmpty()) {
emit handleLoginFailed();
return;
}
JSONCallbackParameters callbackParams;
callbackParams.callbackReceiver = this;
callbackParams.jsonCallbackMethod = "linkCompleted";
callbackParams.errorCallbackMethod = "linkFailed";
const QString LINK_OCULUS_PATH = "api/v1/user/oculus/link";
QJsonObject payload;
payload.insert("oculus_nonce", QJsonValue::fromVariant(QVariant(nonce)));
payload.insert("oculus_user_id", QJsonValue::fromVariant(QVariant(userID)));
auto accountManager = DependencyManager::get<AccountManager>();
accountManager->sendRequest(LINK_OCULUS_PATH, AccountManagerAuth::Required,
QNetworkAccessManager::PostOperation, callbackParams,
QJsonDocument(payload).toJson());
}
void LoginDialog::onCreateAccountThroughOculusReady(QString nonce, QString userID, QString username) {
if (nonce.isEmpty() || userID.isEmpty()) {
emit handleLoginFailed();
return;
}
JSONCallbackParameters callbackParams;
callbackParams.callbackReceiver = this;
callbackParams.jsonCallbackMethod = "createCompleted";
callbackParams.errorCallbackMethod = "createFailed";
const QString CREATE_ACCOUNT_FROM_OCULUS_PATH = "api/v1/user/oculus/create";
QJsonObject payload;
payload.insert("oculus_nonce", QJsonValue::fromVariant(QVariant(nonce)));
payload.insert("oculus_user_id", QJsonValue::fromVariant(QVariant(userID)));
if (!username.isEmpty()) {
payload.insert("username", QJsonValue::fromVariant(QVariant(username)));
}
auto accountManager = DependencyManager::get<AccountManager>();
accountManager->sendRequest(CREATE_ACCOUNT_FROM_OCULUS_PATH, AccountManagerAuth::None,
QNetworkAccessManager::PostOperation, callbackParams,
QJsonDocument(payload).toJson());
}
QString errorStringFromAPIObject(const QJsonValue& apiObject) { QString errorStringFromAPIObject(const QJsonValue& apiObject) {
if (apiObject.isArray()) { if (apiObject.isArray()) {
return apiObject.toArray()[0].toString(); return apiObject.toArray()[0].toString();

4
interface/src/ui/LoginDialog.h
View file

@ -83,6 +83,10 @@ protected slots:
Q_INVOKABLE bool getLoginDialogPoppedUp() const; Q_INVOKABLE bool getLoginDialogPoppedUp() const;
void onLoginThroughOculusReady(QString nonce, QString userID);
void onLinkOculusReady(QString nonce, QString userID);
void onCreateAccountThroughOculusReady(QString nonce, QString userID, QString username);
private: private:
bool getIsLogIn() const { return _isLogIn; } bool getIsLogIn() const { return _isLogIn; }
void setIsLogIn(const bool isLogIn) { _isLogIn = isLogIn; } void setIsLogIn(const bool isLogIn) { _isLogIn = isLogIn; }

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

@ -587,6 +587,7 @@ 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;

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

@ -12,6 +12,13 @@
#include <functional> #include <functional>
enum LoginState {
INVALID_STATE = 0,
LOGIN,
LINK_ACCOUNT,
CREATE_ACCOUNT
};
class OculusPlatformPlugin : public QObject { class OculusPlatformPlugin : public QObject {
Q_OBJECT Q_OBJECT
public: public:
@ -20,8 +27,12 @@ public:
virtual const QString getName() const = 0; virtual const QString getName() const = 0;
virtual void requestNonceAndUserID(LoginState state = LoginState::INVALID_STATE) = 0;
virtual void handleOVREvents() = 0; virtual void handleOVREvents() = 0;
signals: signals:
void nonceAndUserIDChanged(QString nonce, QString userID); void loginReady(QString nonce, QString userID);
void linkAccountReady(QString nonce, QString userID);
void createAccountReady(QString nonce, QString userID);
}; };

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

@ -24,6 +24,12 @@ OculusAPIPlugin::~OculusAPIPlugin() {
hifi::ovr::releaseRenderSession(_session); hifi::ovr::releaseRenderSession(_session);
} }
void OculusAPIPlugin::requestNonceAndUserID(LoginState loginState) {
_loginState = loginState;
ovr_User_GetUserProof();
ovr_User_GetLoggedInUser();
}
void OculusAPIPlugin::handleOVREvents() { void OculusAPIPlugin::handleOVREvents() {
#ifdef OCULUS_APP_ID #ifdef OCULUS_APP_ID
if (qApp->property(hifi::properties::OCULUS_STORE).toBool()) { if (qApp->property(hifi::properties::OCULUS_STORE).toBool()) {
@ -47,10 +53,13 @@ void OculusAPIPlugin::handleOVREvents() {
if (!ovr_Message_IsError(message)) { if (!ovr_Message_IsError(message)) {
qCDebug(oculusLog) << "Oculus Platform user retrieval succeeded"; qCDebug(oculusLog) << "Oculus Platform user retrieval succeeded";
ovrUserHandle user = ovr_Message_GetUser(message); ovrUserHandle user = ovr_Message_GetUser(message);
ovr_FreeMessage(message);
_user = ovr_User_GetOculusID(user); _user = ovr_User_GetOculusID(user);
// went all the way through the `requestNonceAndUserID()` pipeline successfully.
_nonceChanged = true;
} else { } else {
qCDebug(oculusLog) << "Oculus Platform user retrieval failed" << QString(ovr_Error_GetMessage(ovr_Message_GetError(message))); qCDebug(oculusLog) << "Oculus Platform user retrieval failed" << QString(ovr_Error_GetMessage(ovr_Message_GetError(message)));
// emit the signal so we don't hang for it anywhere else.
_nonceChanged = true;
_user = ""; _user = "";
} }
break; break;
@ -58,28 +67,42 @@ void OculusAPIPlugin::handleOVREvents() {
case ovrMessage_User_GetLoggedInUser: { case ovrMessage_User_GetLoggedInUser: {
if (!ovr_Message_IsError(message)) { if (!ovr_Message_IsError(message)) {
ovrUserHandle user = ovr_Message_GetUser(message); ovrUserHandle user = ovr_Message_GetUser(message);
ovr_FreeMessage(message);
_userID = ovr_User_GetID(user); _userID = ovr_User_GetID(user);
ovr_User_Get(_userID);
} else { } else {
qCDebug(oculusLog) << "Oculus Platform user ID retrieval failed" << QString(ovr_Error_GetMessage(ovr_Message_GetError(message))); qCDebug(oculusLog) << "Oculus Platform user ID retrieval failed" << QString(ovr_Error_GetMessage(ovr_Message_GetError(message)));
// emit the signal so we don't hang for it anywhere else.
_nonceChanged = true;
} }
break; break;
} }
case ovrMessage_User_GetUserProof: { case ovrMessage_User_GetUserProof: {
_nonceChanged = true;
if (!ovr_Message_IsError(message)) { if (!ovr_Message_IsError(message)) {
ovrUserProofHandle userProof = ovr_Message_GetUserProof(message); ovrUserProofHandle userProof = ovr_Message_GetUserProof(message);
_nonce = ovr_UserProof_GetNonce(userProof); _nonce = ovr_UserProof_GetNonce(userProof);
} else { } else {
qCDebug(oculusLog) << "Oculus Platform nonce retrieval failed" << QString(ovr_Error_GetMessage(ovr_Message_GetError(message))); qCDebug(oculusLog) << "Oculus Platform nonce retrieval failed" << QString(ovr_Error_GetMessage(ovr_Message_GetError(message)));
_nonce = ""; _nonce = "";
// emit the signal so we don't hang for it anywhere else.
_nonceChanged = true;
} }
break; break;
} }
} }
if (_nonceChanged) { if (_nonceChanged) {
emit nonceAndUserIDChanged(_nonce, _user); switch (_loginState) {
case LoginState::LOGIN:
emit loginReady(_nonce, _user);
break;
case LoginState::LINK_ACCOUNT:
emit linkAccountReady(_nonce, _user);
break;
case LoginState::CREATE_ACCOUNT:
emit createAccountReady(_nonce, _user);
break;
}
_loginState = LoginState::INVALID_STATE;
_nonce = _user = ""; _nonce = _user = "";
_nonceChanged = false; _nonceChanged = false;
} }

5
plugins/oculus/src/OculusPlatformPlugin.h
View file

@ -20,12 +20,15 @@ public:
virtual ~OculusAPIPlugin(); virtual ~OculusAPIPlugin();
const QString getName() const { return NAME; } const QString getName() const { return NAME; }
virtual void requestNonceAndUserID(LoginState loginState);
virtual void handleOVREvents(); virtual void handleOVREvents();
private: private:
static const char* NAME; static const char* NAME;
LoginState _loginState{ LoginState::INVALID_STATE };
QString _nonce; QString _nonce;
bool _nonceChanged; bool _nonceChanged{ false };
QString _user; QString _user;
ovrID _userID; ovrID _userID;
ovrSession _session{ nullptr }; ovrSession _session{ nullptr };