SHV API: event path + API key

quickevent/app/quickevent/CMakeLists.txt

@@ -128,8 +128,8 @@ add_executable(quickevent
 if(WITH_QE_SHVAPI)
 	target_compile_definitions(quickevent PRIVATE WITH_QE_SHVAPI)
 	target_sources(quickevent PRIVATE
-		plugins/Event/src/services/shvapi/client.cpp
-		plugins/Event/src/services/shvapi/clientwidget.cpp
+		plugins/Event/src/services/shvapi/shvclientservice.cpp plugins/Event/src/services/shvapi/shvclientservice.h
+		plugins/Event/src/services/shvapi/shvclientservicewidget.cpp plugins/Event/src/services/shvapi/shvclientservicewidget.h plugins/Event/src/services/shvapi/shvclientservicewidget.ui
 		plugins/Event/src/services/shvapi/shvnode.cpp
 		plugins/Event/src/services/shvapi/sqlapinode.cpp
 		plugins/Event/src/services/shvapi/nodes.cpp

quickevent/app/quickevent/plugins/Core/src/coreplugin.cpp

@@ -9,6 +9,7 @@
 
 #include <qf/core/sql/connection.h>
 #include <qf/core/log.h>
+#include <qf/core/utils/crypt.h>
 
 #include <QCoreApplication>
 #include <QProcess>
@@ -44,6 +45,20 @@ const QString CorePlugin::SETTINGS_PREFIX_APPLICATION_LOCALE_LANGUAGE()
 	return s;
 }
 
+namespace {
+qf::core::utils::Crypt s_crypt(qf::core::utils::Crypt::createGenerator(16808, 11, 2147483647));
+}
+
+QByteArray CorePlugin::encrypt(const QByteArray &data, int min_length)
+{
+	return s_crypt.encrypt(data, min_length);
+}
+
+QByteArray CorePlugin::decrypt(const QByteArray &data)
+{
+	return s_crypt.decrypt(data);
+}
+
 void CorePlugin::onInstalled()
 {
 	qff::MainWindow *fwk = qff::MainWindow::frameWork();

quickevent/app/quickevent/plugins/Core/src/coreplugin.h

@@ -23,6 +23,9 @@ class CorePlugin : public qf::qmlwidgets::framework::Plugin
 
 	static const QString SETTINGS_PREFIX_APPLICATION_LOCALE_LANGUAGE();
 
+	Q_REQUIRED_RESULT static QByteArray encrypt(const QByteArray &data, int min_length = 16);
+	Q_REQUIRED_RESULT static QByteArray decrypt(const QByteArray &data);
+
 	void onInstalled();	
 private:
 	SettingsDialog *m_settingsDialog = nullptr;

quickevent/app/quickevent/plugins/Event/src/connectionsettings.cpp

@@ -1,6 +1,7 @@
 #include "connectionsettings.h"
 
-#include <qf/core/utils/crypt.h>
+#include <plugins/Core/src/coreplugin.h>
+
 #include <qf/core/log.h>
 
 #include <QStandardPaths>
@@ -17,8 +18,6 @@ static const auto USER = QStringLiteral("user");
 static const auto PASSWORD = QStringLiteral("password");
 static const auto WORKING_DIR = QStringLiteral("workingDir");
 static const auto EVENT_NAME = QStringLiteral("eventName");
-
-qf::core::utils::Crypt s_crypt(qf::core::utils::Crypt::createGenerator(16808, 11, 2147483647));
 }
 
 ConnectionSettings::ConnectionSettings(QObject *parent)
@@ -55,7 +54,7 @@ void ConnectionSettings::setServerUser(const QString &s)
 
 void ConnectionSettings::setServerPassword(const QString &s)
 {
-	QByteArray ba = s_crypt.encrypt(s.toUtf8(), 32);
+	QByteArray ba = Core::CorePlugin::encrypt(s.toUtf8(), 32);
 	setValue(EVENT + '/' + DATA_STORAGE + '/' + SQL_SERVER + '/' + PASSWORD, QString::fromLatin1(ba));
 }
 
@@ -95,7 +94,7 @@ QString ConnectionSettings::serverUser()
 QString ConnectionSettings::serverPassword()
 {
 	QByteArray ba = value(EVENT + '/' + DATA_STORAGE + '/' + SQL_SERVER + '/' + PASSWORD).toString().toLatin1();
-	return QString::fromUtf8(s_crypt.decrypt(ba));
+	return QString::fromUtf8(Core::CorePlugin::decrypt(ba));
 }
 
 QString ConnectionSettings::singleWorkingDir()

quickevent/app/quickevent/plugins/Event/src/eventplugin.cpp

@@ -5,12 +5,13 @@
 #include "dbschema.h"
 #include "stagedocument.h"
 #include "stagewidget.h"
+#include "../../Core/src/coreplugin.h"
 #include "../../Core/src/widgets/appstatusbar.h"
 
 #include "services/serviceswidget.h"
 #include "services/emmaclient.h"
 #ifdef WITH_QE_SHVAPI
-#include "services/shvapi/client.h"
+#include "services/shvapi/shvclientservice.h"
 #endif
 
 #include <quickevent/core/og/timems.h>
@@ -52,6 +53,7 @@
 #include <QJsonParseError>
 #include <QJsonDocument>
 #include <QTimer>
+#include <QRandomGenerator>
 
 #include <regex>
 
@@ -378,7 +380,7 @@ void EventPlugin::onInstalled()
 	services::Service::addService(emma_client);
 
 #ifdef WITH_QE_SHVAPI
-	auto shvapi_client = new services::shvapi::Client(this);
+	auto shvapi_client = new services::shvapi::ShvClientService(this);
 	services::Service::addService(shvapi_client);
 #endif
 
@@ -501,6 +503,25 @@ QString EventPlugin::classNameById(int class_id)
 	return m_classNameCache.value(class_id);
 }
 
+QString EventPlugin::shvApiEventId() const
+{
+	return eventName() + "-" + QString::number(m_eventConfig->importId());
+}
+
+QString EventPlugin::createShvApiKey()
+{
+	QString key;
+	QList<char> cc;
+	for (auto i = 'a'; i <= 'z'; i++) { cc << i; }
+	for (auto i = 'A'; i <= 'Z'; i++) { cc << i; }
+	for (auto i = '0'; i <= '9'; i++) { cc << i; }
+	for (int i = 0; i < 16; i++) {
+		quint32 ix = QRandomGenerator::global()->generate() % cc.size();
+		key += cc[ix];
+	}
+	return key;
+}
+
 DbSchema *EventPlugin::dbSchema()
 {
 	return new DbSchema(this);

quickevent/app/quickevent/plugins/Event/src/eventplugin.h

@@ -93,6 +93,9 @@ class EventPlugin : public qf::qmlwidgets::framework::Plugin
 
 	Q_INVOKABLE QString classNameById(int class_id);
 
+	QString shvApiEventId() const;
+	static QString createShvApiKey();
+
 	DbSchema* dbSchema();
 	static int dbVersion();