A login view

7 files changed, 43 insertions, 9 deletions

diff --git a/framework/src/accounts/accountfactory.cpp b/framework/src/accounts/accountfactory.cpp
index f1c4e29c..9726a2e0 100644
--- a/framework/src/accounts/accountfactory.cpp
+++ b/framework/src/accounts/accountfactory.cpp
@@ -64,6 +64,7 @@ void AccountFactory::loadPackage()
     if (!package.isValid()) {
         qWarning() << "Failed to load account package: " << "org.kube.accounts." + mAccountType;
         mUiPath.clear();
+        mLoginUi.clear();
         mName.clear();
         mIcon.clear();
         emit accountLoaded();
@@ -71,6 +72,7 @@ void AccountFactory::loadPackage()
     }
     Q_ASSERT(package.isValid());
     mUiPath = package.filePath("mainscript");
+    mLoginUi = package.filePath("ui", "Login.qml");
     mName = package.metadata().name();
     mIcon = package.metadata().iconName();
     emit accountLoaded();
diff --git a/framework/src/accounts/accountfactory.h b/framework/src/accounts/accountfactory.h
index b57854e5..21747df5 100644
--- a/framework/src/accounts/accountfactory.h
+++ b/framework/src/accounts/accountfactory.h
@@ -33,6 +33,7 @@ class AccountFactory : public QObject
     Q_PROPERTY(QString name MEMBER mName READ name NOTIFY accountLoaded);
     Q_PROPERTY(QString icon MEMBER mIcon NOTIFY accountLoaded);
     Q_PROPERTY(QString uiPath MEMBER mUiPath NOTIFY accountLoaded);
+    Q_PROPERTY(QString loginUi MEMBER mLoginUi NOTIFY accountLoaded);
 public:
     explicit AccountFactory(QObject *parent = Q_NULLPTR);
 
@@ -49,5 +50,6 @@ private:
     QString mName;
     QString mIcon;
     QString mUiPath;
+    QString mLoginUi;
     QByteArray mAccountType;
 };
diff --git a/framework/src/domain/settings/accountsettings.cpp b/framework/src/domain/settings/accountsettings.cpp
index 09cdf279..c174adfe 100644
--- a/framework/src/domain/settings/accountsettings.cpp
+++ b/framework/src/domain/settings/accountsettings.cpp
@@ -292,7 +292,7 @@ void AccountSettings::saveImapResource()
             {"server", mImapServer},
             {"username", mImapUsername}
         });
-    Kube::Keyring{mAccountIdentifier}.storePassword(mImapIdentifier, mImapPassword);
+    Kube::AccountKeyring{mAccountIdentifier}.storePassword(mImapIdentifier, mImapPassword);
 }
 
 void AccountSettings::saveCardDavResource()
@@ -301,7 +301,7 @@ void AccountSettings::saveCardDavResource()
             {"server", mCardDavServer},
             {"username", mCardDavUsername}
         });
-    Kube::Keyring{mAccountIdentifier}.storePassword(mCardDavIdentifier, mCardDavPassword);
+    Kube::AccountKeyring{mAccountIdentifier}.storePassword(mCardDavIdentifier, mCardDavPassword);
 }
 
 void AccountSettings::saveMaildirResource()
@@ -317,7 +317,7 @@ void AccountSettings::saveMailtransportResource()
             {"server", mSmtpServer},
             {"username", mSmtpUsername}
         });
-    Kube::Keyring{mAccountIdentifier}.storePassword(mMailtransportIdentifier, mSmtpPassword);
+    Kube::AccountKeyring{mAccountIdentifier}.storePassword(mMailtransportIdentifier, mSmtpPassword);
 }
 
 void AccountSettings::saveIdentity()
diff --git a/framework/src/frameworkplugin.cpp b/framework/src/frameworkplugin.cpp
index b8cad45d..1e1a169e 100644
--- a/framework/src/frameworkplugin.cpp
+++ b/framework/src/frameworkplugin.cpp
@@ -38,6 +38,7 @@
 #include "clipboardproxy.h"
 #include "webengineprofile.h"
 #include "startupcheck.h"
+#include "keyring.h"
 
 #include <QtQml>
 
@@ -55,6 +56,13 @@ static QObject *webengineprofile_singletontype_provider(QQmlEngine *engine, QJSE
     return new WebEngineProfile;
 }
 
+static QObject *keyring_singletontype_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+    return new Kube::Keyring;
+}
+
 void FrameworkPlugin::registerTypes (const char *uri)
 {
     qmlRegisterType<FolderListModel>(uri, 1, 0, "FolderListModel");
@@ -80,4 +88,5 @@ void FrameworkPlugin::registerTypes (const char *uri)
     qmlRegisterType<ClipboardProxy>(uri, 1, 0, "Clipboard");
     qmlRegisterType<StartupCheck>(uri, 1, 0, "StartupCheck");
     qmlRegisterSingletonType<WebEngineProfile>(uri, 1, 0, "WebEngineProfile", webengineprofile_singletontype_provider);
+    qmlRegisterSingletonType<Kube::Keyring>(uri, 1, 0, "Keyring", keyring_singletontype_provider);
 }
diff --git a/framework/src/keyring.cpp b/framework/src/keyring.cpp
index 759d0c4c..e3fdb1cb 100644
--- a/framework/src/keyring.cpp
+++ b/framework/src/keyring.cpp
@@ -23,20 +23,31 @@
 
 using namespace Kube;
 
-Keyring::Keyring(const QByteArray &accountId, QObject *parent)
+Keyring::Keyring()
+    : QObject()
+{
+
+}
+
+bool Keyring::isUnlocked(const QByteArray &accountId)
+{
+    return false;
+}
+
+AccountKeyring::AccountKeyring(const QByteArray &accountId, QObject *parent)
     : QObject(parent),
     mAccountIdentifier(accountId)
 {
 }
 
-void Keyring::storePassword(const QByteArray &resourceId, const QString &password)
+void AccountKeyring::storePassword(const QByteArray &resourceId, const QString &password)
 {
     QSettings settings{mAccountIdentifier + ".keyring", QSettings::IniFormat};
     settings.setValue(resourceId, password);
     Sink::SecretStore::instance().insert(resourceId, password);
 }
 
-void Keyring::unlock()
+void AccountKeyring::unlock()
 {
     QSettings settings{mAccountIdentifier + ".keyring", QSettings::IniFormat};
     for (const auto &resourceId : settings.allKeys()) {
diff --git a/framework/src/keyring.h b/framework/src/keyring.h
index ee9c3577..ce4e137d 100644
--- a/framework/src/keyring.h
+++ b/framework/src/keyring.h
@@ -24,12 +24,22 @@ namespace Kube {
 class Keyring : public QObject {
     Q_OBJECT
 public:
-    Keyring(const QByteArray &accountId, QObject *parent = nullptr);
+    Keyring();
+    Q_INVOKABLE bool isUnlocked(const QByteArray &accountId);
+
+private:
+    Q_DISABLE_COPY(Keyring);
+};
+
+class AccountKeyring : public QObject {
+    Q_OBJECT
+public:
+    AccountKeyring(const QByteArray &accountId, QObject *parent = nullptr);
     void storePassword(const QByteArray &resourceId, const QString &password);
     void unlock();
 
 private:
-    Q_DISABLE_COPY(Keyring);
+    Q_DISABLE_COPY(AccountKeyring);
 
     QByteArray mAccountIdentifier;
 };
diff --git a/framework/src/sinkfabric.cpp b/framework/src/sinkfabric.cpp
index 954186bb..87b243e0 100644
--- a/framework/src/sinkfabric.cpp
+++ b/framework/src/sinkfabric.cpp
@@ -135,7 +135,7 @@ public:
         }
         if (id == "unlockKeyring") {
             auto accountId = message["accountId"].value<QByteArray>();
-            Kube::Keyring{accountId}.unlock();
+            Kube::AccountKeyring{accountId}.unlock();
         }
     }