From 160f3153cffb110f5b52e244485ccbc2c15b002c Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Wed, 20 Sep 2017 10:52:30 +0200
Subject: Fixed tests with secretstore

---
 common/genericresource.cpp |  5 +++++
 common/genericresource.h   |  1 +
 common/inspector.cpp       | 13 ++++++++++---
 common/inspector.h         |  6 ++++++
 common/secretstore.cpp     |  6 ++++++
 common/secretstore.h       |  3 +++
 6 files changed, 31 insertions(+), 3 deletions(-)

(limited to 'common')

diff --git a/common/genericresource.cpp b/common/genericresource.cpp
index b6a8f62..00d7d0c 100644
--- a/common/genericresource.cpp
+++ b/common/genericresource.cpp
@@ -21,6 +21,7 @@
 
 #include "pipeline.h"
 #include "synchronizer.h"
+#include "inspector.h"
 #include "commandprocessor.h"
 #include "definitions.h"
 #include "storage.h"
@@ -50,6 +51,9 @@ void GenericResource::setSecret(const QString &s)
     if (mSynchronizer) {
         mSynchronizer->setSecret(s);
     }
+    if (mInspector) {
+        mInspector->setSecret(s);
+    }
 }
 
 void GenericResource::setupPreprocessors(const QByteArray &type, const QVector<Sink::Preprocessor *> &preprocessors)
@@ -68,6 +72,7 @@ void GenericResource::setupSynchronizer(const QSharedPointer<Synchronizer> &sync
 
 void GenericResource::setupInspector(const QSharedPointer<Inspector> &inspector)
 {
+    mInspector = inspector;
     mProcessor->setInspector(inspector);
 }
 
diff --git a/common/genericresource.h b/common/genericresource.h
index 4e86b75..edcd7d2 100644
--- a/common/genericresource.h
+++ b/common/genericresource.h
@@ -70,6 +70,7 @@ private:
     QSharedPointer<Pipeline> mPipeline;
     QSharedPointer<CommandProcessor> mProcessor;
     QSharedPointer<Synchronizer> mSynchronizer;
+    QSharedPointer<Inspector> mInspector;
     int mError;
     qint64 mClientLowerBoundRevision;
 };
diff --git a/common/inspector.cpp b/common/inspector.cpp
index 78053a2..0e7a61f 100644
--- a/common/inspector.cpp
+++ b/common/inspector.cpp
@@ -30,10 +30,7 @@ using namespace Sink;
 Inspector::Inspector(const ResourceContext &context)
     : QObject(),
     mResourceContext(context)
-    // mEntityStore(Storage::EntityStore::Ptr::create(mResourceContext)),
-    // mSyncStorage(Sink::storageLocation(), mResourceContext.instanceId() + ".synchronization", Sink::Storage::DataStore::DataStore::ReadWrite)
 {
-    // SinkTrace() << "Starting synchronizer: " << mResourceContext.resourceType << mResourceContext.instanceId();
 }
 
 Inspector::~Inspector()
@@ -41,6 +38,16 @@ Inspector::~Inspector()
 
 }
 
+void Inspector::setSecret(const QString &s)
+{
+    mSecret = s;
+}
+
+QString Inspector::secret() const
+{
+    return mSecret;
+}
+
 KAsync::Job<void> Inspector::processCommand(void const *command, size_t size)
 {
     flatbuffers::Verifier verifier((const uint8_t *)command, size);
diff --git a/common/inspector.h b/common/inspector.h
index 5ee995e..a1f7c53 100644
--- a/common/inspector.h
+++ b/common/inspector.h
@@ -41,13 +41,19 @@ public:
 
     KAsync::Job<void> processCommand(void const *command, size_t size);
 
+    void setSecret(const QString &s);
+
 signals:
     void notify(Notification);
 
 protected:
+    QString secret() const;
     virtual KAsync::Job<void> inspect(int inspectionType, const QByteArray &inspectionId, const QByteArray &domainType, const QByteArray &entityId, const QByteArray &property, const QVariant &expectedValue);
 
     Sink::ResourceContext mResourceContext;
+
+private:
+    QString mSecret;
 };
 
 }
diff --git a/common/secretstore.cpp b/common/secretstore.cpp
index 39d5206..27704fa 100644
--- a/common/secretstore.cpp
+++ b/common/secretstore.cpp
@@ -29,6 +29,12 @@ using namespace Sink;
 
 QMutex SecretStore::sMutex;
 
+SecretStore::SecretStore()
+    : QObject()
+{
+
+}
+
 SecretStore &SecretStore::instance()
 {
     static SecretStore s;
diff --git a/common/secretstore.h b/common/secretstore.h
index 04fdaba..119003a 100644
--- a/common/secretstore.h
+++ b/common/secretstore.h
@@ -42,6 +42,9 @@ Q_SIGNALS:
     void secretAvailable(const QByteArray &resourceId);
 
 private:
+    Q_DISABLE_COPY(SecretStore);
+    SecretStore();
+
     QMap<QByteArray, QString> mCache;
     static QMutex sMutex;
 };
-- 
cgit v1.2.3