Skip to content
GitLab
Commit 6a410c62 authored by Martin Straka's avatar Martin Straka
Browse files

Isds actions based on asynchronous qml input dialogue

parent 6c3e7848
Expand all Hide whitespace changes
Inline Side-by-side
qml/dialogues/InputDialogue.qml
View file @ 6a410c62
......@@ -34,21 +34,26 @@ import QtQuick.Controls 2.1
Dialog {
id: root
signal finished(string userName,string accountName, string pwd)
signal finished(string isdsAction, string pwdType, string userName, string pwd)
property int minimumInputSize: parent.width / 2
property int maximumInputSize: parent.width / 2
property string dIsdsAction
property string dPwdType
property string dUserName
property string dAccountName
function openInputDialog(userName, accountName, title, text, hidePwd) {
function openInputDialog(isdsAction, pwdType, userName, title, text, placeholderText, hidePwd) {
dIsdsAction = isdsAction
dPwdType = pwdType
dUserName = userName
dAccountName = accountName
root.title = title
roottext.text = text
rootpwd.clear()
rootpwd.placeholderText = title
rootpwd.placeholderText = placeholderText
rootpwd.echoMode = (hidePwd) ? TextInput.Password : TextInput.Normal
if (pwdType == "totp" || pwdType == "hotp") {
rootpwd.inputMethodHints = Qt.ImhDigitsOnly
}
root.open()
}
......@@ -84,5 +89,5 @@ Dialog {
}
} // ColumnLayout
onAccepted: finished(dUserName, dAccountName, rootpwd.text.toString())
onAccepted: finished(dIsdsAction, dPwdType, dUserName, rootpwd.text.toString())
}
qml/main.qml
View file @ 6a410c62
......@@ -115,12 +115,12 @@ ApplicationWindow {
InputDialogue {
id: inputDialog
onFinished: {
isds.returnInputDialogText(userName, accountName, pwd)
isds.returnInputDialogText(isdsAction, pwdType, userName, pwd)
}
Connections {
target: isds
onOpenDialogRequest: {
inputDialog.openInputDialog(userName, accountName, title, text, hidePwd)
inputDialog.openInputDialog(isdsAction, pwdType, userName, title, text, placeholderText, hidePwd)
}
}
}
......
qml/pages/PageAccountDetail.qml
View file @ 6a410c62
......@@ -66,7 +66,13 @@ Component {
MouseArea {
anchors.fill: parent
onClicked: {
isds.getAccountInfo(userName, false)
isds.doIsdsAction("getAccountInfo", userName)
}
}
Connections {
target: isds
onRunGetAccountInfoSig: {
isds.getAccountInfo(userName)
}
}
}
......
qml/pages/PageAccountList.qml
View file @ 6a410c62
......@@ -110,7 +110,7 @@ Component {
anchors.fill: parent
onClicked: {
statusBarText.text = ""
isds.syncAllAccounts(accountModel)
isds.doIsdsAction("syncAllAccounts", "")
}
}
}
......@@ -260,7 +260,15 @@ Component {
MouseArea {
anchors.fill: parent
onClicked: {
isds.syncOneAccount(accountModel, rUserName)
isds.doIsdsAction("syncOneAccount", rUserName)
}
}
Connections {
target: isds
onRunSyncOneAccountSig: {
if (rUserName == userName) {
isds.syncOneAccount(accountModel, userName)
}
}
}
}
......
qml/pages/PageMenuMessage.qml
View file @ 6a410c62
......@@ -160,7 +160,7 @@ Component {
anchors.fill: parent
onClicked: {
if (index == 0) {
isds.downloadMessage(messageModel, userName, msgType, msgId)
isds.doIsdsAction("downloadMessage", userName)
} else if (index == 1) {
messages.markMessageAsLocallyRead(messageModel, userName, msgId, true)
} else if (index == 2) {
......@@ -186,5 +186,11 @@ Component {
delegate: messageMenuComponent
}
}
Connections {
target: isds
onRunDownloadMessageSig: {
isds.downloadMessage(messageModel, userName, msgType, msgId)
}
}
}
}
qml/pages/PageMenuMessageDetail.qml
View file @ 6a410c62
......@@ -151,7 +151,7 @@ Component {
anchors.fill: parent
onClicked: {
if (index == 0) {
isds.downloadMessage(messageModel, userName, msgType, msgId)
isds.doIsdsAction("downloadMessage", userName)
} else if (index == 1) {
files.sendAttachmentsWithEmailFromDb(userName, msgId)
} else if (index == 2) {
......
qml/pages/PageMessageDetail.qml
View file @ 6a410c62
......@@ -201,7 +201,7 @@ Component {
anchors.fill: parent
onClicked: {
if (fromLocalDb) {
isds.downloadMessage(messageModel, userName, msgType, zfoId)
isds.doIsdsAction("downloadMessage", userName)
}
}
}
......@@ -394,7 +394,7 @@ Component {
if (downloadStart) {
downloadStart = false
if (fromLocalDb) {
isds.downloadMessage(messageModel, userName, msgType, zfoId)
isds.doIsdsAction("downloadMessage", userName)
}
}
}
......@@ -416,7 +416,7 @@ Component {
anchors.fill: parent
onClicked: {
if (fromLocalDb) {
isds.downloadMessage(messageModel, userName, msgType, zfoId)
isds.doIsdsAction("downloadMessage", userName)
}
}
}
......@@ -433,5 +433,13 @@ Component {
wrapMode: Text.WordWrap
text: ""
} // Text
Connections {
target: isds
onRunDownloadMessageSig: {
if (fromLocalDb) {
isds.downloadMessage(messageModel, userName, msgType, zfoId)
}
}
}
}
}
qml/pages/PageMessageList.qml
View file @ 6a410c62
......@@ -215,9 +215,9 @@ Component {
if (downloadStart) {
downloadStart = false
if (msgType == MessageType.TYPE_RECEIVED) {
isds.syncSingleAccountReceived(accountModel, messageModel, userName)
isds.doIsdsAction("syncSingleAccountReceived", userName)
} else if (msgType == MessageType.TYPE_SENT) {
isds.syncSingleAccountSent(accountModel, messageModel, userName)
isds.doIsdsAction("syncSingleAccountSent", userName)
}
}
}
......@@ -234,6 +234,18 @@ Component {
messages.fillMessageList(messageModel, userName, msgType)
}
}
Connections {
target: isds
onRunSyncSingleAccountReceivedSig: {
isds.syncSingleAccountReceived(accountModel, messageModel, userName)
}
}
Connections {
target: isds
onRunSyncSingleAccountSentSig: {
isds.syncSingleAccountSent(accountModel, messageModel, userName)
}
}
}
}
}
qml/pages/PageSettingsAccount.qml
View file @ 6a410c62
......@@ -78,7 +78,8 @@ Item {
passwordTextField.text.toString(),
testAccount.checked, rememberPassword.checked,
useLS.checked, certPathLabelId.text.toString())) {
isds.getAccountInfo(userNameTextField.text.toString(), true)
/* TODO - remove the function or make it asynchronous */
isds.getAccountInfo(userNameTextField.text.toString())
}
} else {
if (accounts.updateAccount(accountModel, sLoginMethod,
......
src/net/isds_const.h
View file @ 6a410c62
......@@ -84,6 +84,11 @@
#define OTP_TYPE_HOTP "HOTP"
#define OTP_NO_OTP "noOTP"
/* PASSWORD TYPE */
#define PWD_PWD "pwd"
#define PWD_CERT "cert"
#define PWD_HOTP "hotp"
#define PWD_TOTP "totp"
/*!
* @brief Maximum length of message list to be downloaded.
......
src/net/isds_wrapper.cpp
View file @ 6a410c62
This diff is collapsed.
src/net/isds_wrapper.h
View file @ 6a410c62
......@@ -47,104 +47,109 @@ public:
~IsdsWrapper(void);
/*!
* @brief Download message list of all accounts.
* @brief Change ISDS login password.
*
* @param[in,out] acntModelVariant QVariant holding account model
* to be altered.
* @param[in] userName Account username string.
* @param[in] accountName Account name.
*/
Q_INVOKABLE
void syncAllAccounts(const QVariant &acntModelVariant);
bool changePassword(const QString &userName,
const QString &accountName);
/*!
* @brief Download message list of one account.
* @brief Do an isds action from QML.
*
* @param[in,out] acntModelVariant QVariant holding account model
* to be altered.
* @param[in] userName Account username string.
* @param[in] isdsAction Isds action identificator.
* @param[in] userName Account user name.
*/
Q_INVOKABLE
void syncOneAccount(const QVariant &acntModelVariant,
const QString &userName);
void doIsdsAction(const QString &isdsAction, const QString &userName);
/*!
* @brief Download received message list.
* @brief Downloads complete message.
*
* @param[in,out] acntModelVariant QVariant holding account model
* to be altered.
* @param[in,out] msgModelVariant QVariant holding message model
* to be altered.
* @param[in] userName Account username string.
* @param[in] messageType Message orientation.
* @param[in] msgId Message ID.
*/
Q_INVOKABLE
void syncSingleAccountReceived(const QVariant &acntModelVariant,
const QVariant &msgModelVariant, const QString &userName);
void downloadMessage(const QVariant &msgModelVariant,
const QString &userName, enum Messages::MessageType messageType,
qint64 msgId);
/*!
* @brief Download list of sent messages.
* @brief Download account info.
*
* @param[in,out] acntModelVariant QVariant holding account model
* to be altered.
* @param[in,out] msgModelVariant QVariant holding message model
* to be altered.
* @param[in] userName Account username string.
* @param[in] userName Account username string.
*/
Q_INVOKABLE
void syncSingleAccountSent(const QVariant &acntModelVariant,
const QVariant &msgModelVariant, const QString &userName);
void getAccountInfo(const QString &userName);
/*!
* @brief Download account info.
* @brief Downloads delivery info.
*
* @param[in] userName Account username string.
* @param[in] isFirstLogin Set on True if it is first login
* into databox (when add account to Datovka).
* @param[in] msgId Message ID.
*/
Q_INVOKABLE
void getAccountInfo(const QString &userName, bool isFirstLogin);
void getDeliveryInfo(const QString &userName, qint64 msgId);
/*!
* @brief Downloads complete message.
* @brief Password string from QML input dialog.
*
* @param[in,out] msgModelVariant QVariant holding message model
* to be altered.
* @param[in] userName Account username string.
* @param[in] messageType Message orientation.
* @param[in] msgId Message ID.
* @param[in] isdsAction ISDS Action string.
* @param[in] pwdType Password type string.
* @param[in] userName Account username string.
* @param[in] accountName Account name string.
* @param[in] pwd Password or OTP code.
*/
Q_INVOKABLE
void downloadMessage(const QVariant &msgModelVariant,
const QString &userName, enum Messages::MessageType messageType,
qint64 msgId);
void returnInputDialogText(const QString &isdsAction,
const QString &pwdType, const QString &userName, const QString &pwd);
/*!
* @brief Downloads delivery info.
* @brief Download message list of one account.
*
* @param[in] userName Account username string.
* @param[in] msgId Message ID.
* @param[in,out] acntModelVariant QVariant holding account model
* to be altered.
* @param[in] userName Account username string.
*/
Q_INVOKABLE
void getDeliveryInfo(const QString &userName, qint64 msgId);
void syncOneAccount(const QVariant &acntModelVariant,
const QString &userName);
/*!
* @brief Change ISDS login password.
* @brief Download received message list.
*
* @param[in] userName Account username string.
* @param[in] accountName Account name.
* @param[in,out] acntModelVariant QVariant holding account model
* to be altered.
* @param[in,out] msgModelVariant QVariant holding message model
* to be altered.
* @param[in] userName Account username string.
*/
Q_INVOKABLE
bool changePassword(const QString &userName,
const QString &accountName);
void syncSingleAccountReceived(const QVariant &acntModelVariant,
const QVariant &msgModelVariant, const QString &userName);
/*!
* @brief Password string from QML input dialog.
* @brief Download list of sent messages.
*
* @param[in] userName Account username string.
* @param[in] accountName Account name string.
* @param[in] pwd Password or OTP code.
* @param[in,out] acntModelVariant QVariant holding account model
* to be altered.
* @param[in,out] msgModelVariant QVariant holding message model
* to be altered.
* @param[in] userName Account username string.
*/
Q_INVOKABLE
void returnInputDialogText(const QString &userName,
const QString &accountName, const QString &pwd);
void syncSingleAccountSent(const QVariant &acntModelVariant,
const QVariant &msgModelVariant, const QString &userName);
/*!
* @brief Logout and close all active OTP connections, clear cookies.
*/
void closeAllOtpConnections(void);
/*!
* @brief Test if user is connected to databox via OTP.
......@@ -162,24 +167,22 @@ public:
*/
bool isdsLogoutOTP(const QString &userName);
/*!
* @brief Logout and close all active OTP connections, clear cookies.
*/
void closeAllOtpConnections(void);
signals:
/*!
* @brief Send open QML input dialog request to QML.
*
* @param[in] isdsAction ISDS Action string.
* @param[in] pwdType Password type string.
* @param[in] userName Account username string.
* @param[in] accountName Account name string.
* @param[in] title Dialogue title.
* @param[in] text Dialogue text.
* @param[in] placeholderText Dialogue placeholder text.
* @param[in] hidePwd True means the password will be hidden.
*/
void openDialogRequest(QString userName, QString accountName,
QString title, QString text, bool hidePwd);
void openDialogRequest(const QString &isdsAction,
const QString &pwdType, QString userName, QString title,
QString text, QString placeholderText, bool hidePwd);
/*!
* @brief Set new statusbar text and active busy indicator to QML.
......@@ -212,6 +215,55 @@ signals:
*/
void downloadAccountInfoFinishedSig(QString userName, bool isLogged);
/*!
* @brief Run change password isds action from QML.
*
* @param[in] userName Account user name string.
*/
void runChangePasswordSig(QString userName);
/*!
* @brief Run download mesasge isds action from QML.
*
* @param[in] userName Account user name string.
*/
void runDownloadMessageSig(QString userName);
/*!
* @brief Run download account info action from QML.
*
* @param[in] userName Account user name string.
*/
void runGetAccountInfoSig(QString userName);
/*!
* @brief Run sync all accounts action from QML.
*
* @param[in] userName Account user name string.
*/
void runSyncAllAccountsSig(QString userName);
/*!
* @brief Run sync one account action from QML.
*
* @param[in] userName Account user name string.
*/
void runSyncOneAccountSig(QString userName);
/*!
* @brief Run sync received message list action from QML.
*
* @param[in] userName Account user name string.
*/
void runSyncSingleAccountReceivedSig(QString userName);
/*!
* @brief Run sync sent message list action from QML.
*
* @param[in] userName Account user name string.
*/
void runSyncSingleAccountSentSig(QString userName);
public slots:
/*!
......@@ -270,17 +322,12 @@ public slots:
private:
/*!
* @brief Download received or sent message list of one account.
* @brief Do login action.
*
* @param[in,out] acntModelVariant QVariant holding account model
* to be altered.
* @param[in,out] msgModelVariant QVariant holding message model
* to be altered.
* @param[in] userName Account username string.
* @param[in] isdsAction Isds action identificator.
* @param[in] userName Account username string.
*/
void syncSingleAccount(const QVariant &acntModelVariant,
const QVariant &msgModelVariant, const QString &userName,
enum Messages::MessageType msgDirect);
void doLoginAction(const QString &isdsAction, const QString &userName);
/*!
* @brief Downloads complete message.
......@@ -295,13 +342,14 @@ private:
qint64 msgId);
/*!
* @brief Show notification dialog when any login problem was occurred.
* @brief Check if account isds context has all required login data.
*
* @param[in] isdsAction Isds action identificator.
* @param[in] userName Account username string.
* @param[in] errTxt Error message from ISDS or XML layer.
* @return true if login method has all required login data.
*/
void showLoginProblemDialog(const QString &userName,
const QString &errTxt);
bool hasCtxAllLoginData(const QString &isdsAction,
const QString &userName);
/*!
* @brief Check if new password is valid for ISDS.
......@@ -315,10 +363,9 @@ private:
* @brief Test if user is connected to databox.
*
* @param[in] userName Account username string.
* @param[out] errText Error description if something fails.
* @return true if user is connected.
* @return true if user is connected/login to databox.
*/
bool isLoggedToIsds(const QString &userName, QString &errText);
bool isLoggedToIsds(const QString &userName);
/*!
* @brief Login to ISDS.
......@@ -326,7 +373,45 @@ private:
* @param[in,out] ctx Account isds context structure.
* @return true if login success.
*/
bool loginToIsds(IsdsSession::IsdsContext &ctx);
bool loginToIsds(IsdsSession::IsdsContext &ctx,
const QString &isdsAction);
/*!
* @brief Run second TOTP login phase with SMS code.
*
* @param[in] ctx Account isds context structure.
* @param[in] isdsAction Isds action identificator.
* @return true if login success.
*/
bool runSecondTOTPLoginPhase(IsdsSession::IsdsContext &ctx,
const QString &isdsAction);
/*!
* @brief Show notification dialog when any login problem was occurred.
*
* @param[in] userName Account username string.
* @param[in] errTxt Error message from ISDS or XML layer.
*/
void showLoginProblemDialog(const QString &userName,
const QString &errTxt);
/*!
* @brief Sync all account at one time.
*/
void syncAllAccounts(void);
/*!
* @brief Download received or sent message list of one account.
*
* @param[in,out] acntModelVariant QVariant holding account model
* to be altered.
* @param[in,out] msgModelVariant QVariant holding message model
* to be altered.
* @param[in] userName Account username string.
*/
void syncSingleAccount(const QVariant &acntModelVariant,
const QVariant &msgModelVariant, const QString &userName,
enum Messages::MessageType msgDirect);
/*!
* @brief Instance of DbWrapper class (db_wrapper.h).
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment