ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Completely rework login job

Browse Source 
Now .well-know is obsolete and also error message are correctly
displayed
This commit is contained in:
Carl Schwan
2020-12-03 00:34:10 +01:00
parent 8355ceeeb0
commit 21cd37c21e
3 changed files with 35 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
imports/NeoChat/Page/LoginPage.qml
View File

@@ -23,7 +23,6 @@ Kirigami.ScrollablePage {
padding: Kirigami.Units.smallSpacing
contentItem: Kirigami.InlineMessage {
id: inlineMessage
type: Kirigami.MessageType.Error
visible: false
showCloseButton: true
}
@@ -74,7 +73,8 @@ Kirigami.ScrollablePage {
Connections {
target: Controller
onErrorOccured: {
if (detail.length !== 0) {
inlineMessage.type = Kirigami.MessageType.Error;
if (detail && detail.length !== 0) {
inlineMessage.text = i18n("%1: %2", error, detail);
} else {
inlineMessage.text = error;
@@ -85,6 +85,9 @@ Kirigami.ScrollablePage {
}
function doLogin() {
inlineMessage.text = i18n("Loading, this might take up to 10 seconds.");
inlineMessage.type = Kirigami.MessageType.Information
inlineMessage.visible = true;
if (accessTokenField.text.length > 0) {
Controller.loginWithAccessToken(serverField.text.trim(), usernameField.text.trim(), accessTokenField.text, deviceNameField.text.trim());
} else {