Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 09:18:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated login QML to handle domain logins.

Browse source
This commit is contained in:
Kasen IO 2020-07-23 22:14:21 -04:00
parent a5d0c80c87
commit d7c0493b7a
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,6 +45,11 @@ Item {
property bool lostFocus: false property bool lostFocus: false
readonly property bool loginDialogPoppedUp: loginDialog.getLoginDialogPoppedUp() readonly property bool loginDialogPoppedUp: loginDialog.getLoginDialogPoppedUp()
// TODO:
// readonly property bool isLoggingInToDomain: loginDialog.getDomainLoginRequested()
// readonly property bool domainAuthProvider: loginDialog.getDomainLoginAuthProvider()
readonly property bool isLoggingInToDomain: true
readonly property string domainAuthProvider: "https://example.com/oauth2"
QtObject { QtObject {
id: d id: d
@ -71,7 +76,12 @@ Item {
} }
function login() { function login() {
loginDialog.login(emailField.text, passwordField.text); if (!isLoggingInToDomain) {
loginDialog.login(emailField.text, passwordField.text);
} else {
loginDialog.loginDomain(emailField.text, passwordField.text, domainAuthProvider);
}
if (linkAccountBody.loginDialogPoppedUp) { if (linkAccountBody.loginDialogPoppedUp) {
var data; var data;
if (linkAccountBody.linkSteam) { if (linkAccountBody.linkSteam) {
@ -87,7 +97,7 @@ Item {
} }
bodyLoader.setSource("LoggingInBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "withSteam": linkAccountBody.withSteam, bodyLoader.setSource("LoggingInBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader, "withSteam": linkAccountBody.withSteam,
"withOculus": linkAccountBody.withOculus, "linkSteam": linkAccountBody.linkSteam, "linkOculus": linkAccountBody.linkOculus, "withOculus": linkAccountBody.withOculus, "linkSteam": linkAccountBody.linkSteam, "linkOculus": linkAccountBody.linkOculus,
"displayName":displayNameField.text }); "displayName":displayNameField.text, "isLoggingInToDomain": linkAccountBody.isLoggingInToDomain });
} }
function init() { function init() {
@ -99,6 +109,7 @@ Item {
errorContainer.height = (loginErrorMessageTextMetrics.width / displayNameField.width) * loginErrorMessageTextMetrics.height; errorContainer.height = (loginErrorMessageTextMetrics.width / displayNameField.width) * loginErrorMessageTextMetrics.height;
} }
loginButton.text = (!linkAccountBody.linkSteam && !linkAccountBody.linkOculus) ? "Log In" : "Link Account"; loginButton.text = (!linkAccountBody.linkSteam && !linkAccountBody.linkOculus) ? "Log In" : "Link Account";
loginButton.text = (!isLoggingInToDomain) ? "Log In" : "Log In to Domain";
loginButton.color = hifi.buttons.blue; loginButton.color = hifi.buttons.blue;
displayNameField.placeholderText = "Display Name (optional)"; displayNameField.placeholderText = "Display Name (optional)";
var savedDisplayName = Settings.getValue("Avatar/displayName", ""); var savedDisplayName = Settings.getValue("Avatar/displayName", "");
@ -393,7 +404,7 @@ Item {
HifiStylesUit.ShortcutText { HifiStylesUit.ShortcutText {
id: cantAccessText id: cantAccessText
z: 10 z: 10
visible: !linkAccountBody.linkSteam && !linkAccountBody.linkOculus visible: !linkAccountBody.linkSteam && !linkAccountBody.linkOculus && !linkAccountBody.isLoggingInToDomain
anchors { anchors {
top: loginButton.bottom top: loginButton.bottom
topMargin: hifi.dimensions.contentSpacing.y topMargin: hifi.dimensions.contentSpacing.y
@ -492,7 +503,7 @@ Item {
id: signUpContainer id: signUpContainer
width: loginContainer.width width: loginContainer.width
height: signUpTextMetrics.height height: signUpTextMetrics.height
visible: !linkAccountBody.linkSteam && !linkAccountBody.linkOculus visible: !linkAccountBody.linkSteam && !linkAccountBody.linkOculus && !linkAccountBody.isLoggingInToDomain
anchors { anchors {
left: loginContainer.left left: loginContainer.left
top: loginContainer.bottom top: loginContainer.bottom

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

@ -31,6 +31,7 @@ Item {
property bool linkSteam: linkSteam property bool linkSteam: linkSteam
property bool linkOculus: linkOculus property bool linkOculus: linkOculus
property bool createOculus: createOculus property bool createOculus: createOculus
property bool isLoggingInToDomain: isLoggingInToDomain
property string displayName: "" property string displayName: ""
readonly property bool loginDialogPoppedUp: loginDialog.getLoginDialogPoppedUp() readonly property bool loginDialogPoppedUp: loginDialog.getLoginDialogPoppedUp()
@ -106,6 +107,9 @@ Item {
loggingInGlyph.visible = true; loggingInGlyph.visible = true;
loggingInText.text = "Logging in to Oculus"; loggingInText.text = "Logging in to Oculus";
loggingInText.x = loggingInHeader.width/2 - loggingInTextMetrics.width/2 + loggingInGlyphTextMetrics.width/2; loggingInText.x = loggingInHeader.width/2 - loggingInTextMetrics.width/2 + loggingInGlyphTextMetrics.width/2;
} else if (loggingInBody.isLoggingInToDomain) {
loggingInText.text = "Logging in to Domain";
loggingInText.anchors.centerIn = loggingInHeader;
} else { } else {
loggingInText.text = "Logging in"; loggingInText.text = "Logging in";
loggingInText.anchors.centerIn = loggingInHeader; loggingInText.anchors.centerIn = loggingInHeader;