ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bump json api version

Browse Source
This commit is contained in:
Michael Zanetti 2017-09-24 22:16:09 +02:00
parent d796a0fc23
commit 53b804d0f3
5 changed files with 131 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libguh-core/cloudmanager.cpp
View File

@ -20,6 +20,8 @@
#include "cloudmanager.h" #include "cloudmanager.h"
#include "guhcore.h" #include "guhcore.h"
#include "awsconnector.h"
#include "janusconnector.h"
#include <QNetworkSession> #include <QNetworkSession>
#include <QNetworkConfigurationManager> #include <QNetworkConfigurationManager>

6
libguh-core/cloudmanager.h
View File

@ -21,14 +21,14 @@
#ifndef CLOUDMANAGER_H #ifndef CLOUDMANAGER_H
#define CLOUDMANAGER_H #define CLOUDMANAGER_H
#include "awsconnector.h"
#include "janusconnector.h"
#include <QObject> #include <QObject>
#include <QTimer> #include <QTimer>
#include <QNetworkSession> #include <QNetworkSession>
#include <QUuid> #include <QUuid>
class JanusConnector;
class AWSConnector;
class CloudManager : public QObject class CloudManager : public QObject
{ {
Q_OBJECT Q_OBJECT

228
libguh-core/libguh-core.pro
View File

@ -17,118 +17,118 @@ DEFINES += MBEDTLS_NEW_HEADERS
# icons for the webserver # icons for the webserver
RESOURCES += $$top_srcdir/icons.qrc RESOURCES += $$top_srcdir/icons.qrc
HEADERS += $$top_srcdir/libguh-core/guhcore.h \ HEADERS += guhcore.h \
$$top_srcdir/libguh-core/tcpserver.h \ tcpserver.h \
$$top_srcdir/libguh-core/mocktcpserver.h \ mocktcpserver.h \
$$top_srcdir/libguh-core/ruleengine.h \ ruleengine.h \
$$top_srcdir/libguh-core/rule.h \ rule.h \
$$top_srcdir/libguh-core/stateevaluator.h \ stateevaluator.h \
$$top_srcdir/libguh-core/webserver.h \ webserver.h \
$$top_srcdir/libguh-core/transportinterface.h \ transportinterface.h \
$$top_srcdir/libguh-core/servermanager.h \ servermanager.h \
$$top_srcdir/libguh-core/httprequest.h \ httprequest.h \
$$top_srcdir/libguh-core/websocketserver.h \ websocketserver.h \
$$top_srcdir/libguh-core/httpreply.h \ httpreply.h \
$$top_srcdir/libguh-core/guhconfiguration.h \ guhconfiguration.h \
$$top_srcdir/libguh-core/bluetoothserver.h \ bluetoothserver.h \
$$top_srcdir/libguh-core/jsonrpc/jsonrpcserver.h \ jsonrpc/jsonrpcserver.h \
$$top_srcdir/libguh-core/jsonrpc/jsonhandler.h \ jsonrpc/jsonhandler.h \
$$top_srcdir/libguh-core/jsonrpc/devicehandler.h \ jsonrpc/devicehandler.h \
$$top_srcdir/libguh-core/jsonrpc/jsontypes.h \ jsonrpc/jsontypes.h \
$$top_srcdir/libguh-core/jsonrpc/ruleshandler.h \ jsonrpc/ruleshandler.h \
$$top_srcdir/libguh-core/jsonrpc/actionhandler.h \ jsonrpc/actionhandler.h \
$$top_srcdir/libguh-core/jsonrpc/eventhandler.h \ jsonrpc/eventhandler.h \
$$top_srcdir/libguh-core/jsonrpc/statehandler.h \ jsonrpc/statehandler.h \
$$top_srcdir/libguh-core/jsonrpc/logginghandler.h \ jsonrpc/logginghandler.h \
$$top_srcdir/libguh-core/jsonrpc/configurationhandler.h \ jsonrpc/configurationhandler.h \
$$top_srcdir/libguh-core/jsonrpc/networkmanagerhandler.h \ jsonrpc/networkmanagerhandler.h \
$$top_srcdir/libguh-core/logging/logging.h \ logging/logging.h \
$$top_srcdir/libguh-core/logging/logengine.h \ logging/logengine.h \
$$top_srcdir/libguh-core/logging/logfilter.h \ logging/logfilter.h \
$$top_srcdir/libguh-core/logging/logentry.h \ logging/logentry.h \
$$top_srcdir/libguh-core/rest/restserver.h \ logging/logvaluetool.h \
$$top_srcdir/libguh-core/rest/restresource.h \ rest/restserver.h \
$$top_srcdir/libguh-core/rest/devicesresource.h \ rest/restresource.h \
$$top_srcdir/libguh-core/rest/deviceclassesresource.h \ rest/devicesresource.h \
$$top_srcdir/libguh-core/rest/vendorsresource.h \ rest/deviceclassesresource.h \
$$top_srcdir/libguh-core/rest/logsresource.h \ rest/vendorsresource.h \
$$top_srcdir/libguh-core/rest/pluginsresource.h \ rest/logsresource.h \
$$top_srcdir/libguh-core/rest/rulesresource.h \ rest/pluginsresource.h \
$$top_srcdir/libguh-core/time/timedescriptor.h \ rest/rulesresource.h \
$$top_srcdir/libguh-core/time/calendaritem.h \ time/timedescriptor.h \
$$top_srcdir/libguh-core/time/repeatingoption.h \ time/calendaritem.h \
$$top_srcdir/libguh-core/time/timeeventitem.h \ time/repeatingoption.h \
$$top_srcdir/libguh-core/time/timemanager.h \ time/timeeventitem.h \
$$top_srcdir/libguh-core/networkmanager/dbus-interfaces.h \ time/timemanager.h \
$$top_srcdir/libguh-core/networkmanager/networkmanager.h \ networkmanager/dbus-interfaces.h \
$$top_srcdir/libguh-core/networkmanager/networkdevice.h \ networkmanager/networkmanager.h \
$$top_srcdir/libguh-core/networkmanager/wirelessaccesspoint.h \ networkmanager/networkdevice.h \
$$top_srcdir/libguh-core/networkmanager/wirelessnetworkdevice.h \ networkmanager/wirelessaccesspoint.h \
$$top_srcdir/libguh-core/networkmanager/networksettings.h \ networkmanager/wirelessnetworkdevice.h \
$$top_srcdir/libguh-core/networkmanager/networkconnection.h \ networkmanager/networksettings.h \
$$top_srcdir/libguh-core/networkmanager/wirednetworkdevice.h \ networkmanager/networkconnection.h \
$$top_srcdir/libguh-core/usermanager.h \ networkmanager/wirednetworkdevice.h \
$$top_srcdir/libguh-core/tokeninfo.h \ usermanager.h \
$$top_srcdir/libguh-core/certificategenerator.h \ tokeninfo.h \
$$top_srcdir/libguh-core/logging/logvaluetool.h certificategenerator.h \
$$top_srcdir/libguh-core/awsconnector.h \ awsconnector.h \
$$top_srcdir/libguh-core/cloudconnector.h \ cloudmanager.h \
$$top_srcdir/libguh-core/MbedTLS/MbedTLSConnection.hpp \ MbedTLS/MbedTLSConnection.hpp \
$$top_srcdir/libguh-core/janusconnector.h \ janusconnector.h \
SOURCES += $$top_srcdir/libguh-core/guhcore.cpp \ SOURCES += guhcore.cpp \
$$top_srcdir/libguh-core/tcpserver.cpp \ tcpserver.cpp \
$$top_srcdir/libguh-core/mocktcpserver.cpp \ mocktcpserver.cpp \
$$top_srcdir/libguh-core/ruleengine.cpp \ ruleengine.cpp \
$$top_srcdir/libguh-core/rule.cpp \ rule.cpp \
$$top_srcdir/libguh-core/stateevaluator.cpp \ stateevaluator.cpp \
$$top_srcdir/libguh-core/webserver.cpp \ webserver.cpp \
$$top_srcdir/libguh-core/transportinterface.cpp \ transportinterface.cpp \
$$top_srcdir/libguh-core/servermanager.cpp \ servermanager.cpp \
$$top_srcdir/libguh-core/httprequest.cpp \ httprequest.cpp \
$$top_srcdir/libguh-core/websocketserver.cpp \ websocketserver.cpp \
$$top_srcdir/libguh-core/httpreply.cpp \ httpreply.cpp \
$$top_srcdir/libguh-core/guhconfiguration.cpp \ guhconfiguration.cpp \
$$top_srcdir/libguh-core/bluetoothserver.cpp \ bluetoothserver.cpp \
$$top_srcdir/libguh-core/jsonrpc/jsonrpcserver.cpp \ jsonrpc/jsonrpcserver.cpp \
$$top_srcdir/libguh-core/jsonrpc/jsonhandler.cpp \ jsonrpc/jsonhandler.cpp \
$$top_srcdir/libguh-core/jsonrpc/devicehandler.cpp \ jsonrpc/devicehandler.cpp \
$$top_srcdir/libguh-core/jsonrpc/jsontypes.cpp \ jsonrpc/jsontypes.cpp \
$$top_srcdir/libguh-core/jsonrpc/ruleshandler.cpp \ jsonrpc/ruleshandler.cpp \
$$top_srcdir/libguh-core/jsonrpc/actionhandler.cpp \ jsonrpc/actionhandler.cpp \
$$top_srcdir/libguh-core/jsonrpc/eventhandler.cpp \ jsonrpc/eventhandler.cpp \
$$top_srcdir/libguh-core/jsonrpc/statehandler.cpp \ jsonrpc/statehandler.cpp \
$$top_srcdir/libguh-core/jsonrpc/logginghandler.cpp \ jsonrpc/logginghandler.cpp \
$$top_srcdir/libguh-core/jsonrpc/configurationhandler.cpp \ jsonrpc/configurationhandler.cpp \
$$top_srcdir/libguh-core/jsonrpc/networkmanagerhandler.cpp \ jsonrpc/networkmanagerhandler.cpp \
$$top_srcdir/libguh-core/logging/logengine.cpp \ logging/logengine.cpp \
$$top_srcdir/libguh-core/logging/logfilter.cpp \ logging/logfilter.cpp \
$$top_srcdir/libguh-core/logging/logentry.cpp \ logging/logentry.cpp \
$$top_srcdir/libguh-core/rest/restserver.cpp \ logging/logvaluetool.cpp \
$$top_srcdir/libguh-core/rest/restresource.cpp \ rest/restserver.cpp \
$$top_srcdir/libguh-core/rest/devicesresource.cpp \ rest/restresource.cpp \
$$top_srcdir/libguh-core/rest/deviceclassesresource.cpp \ rest/devicesresource.cpp \
$$top_srcdir/libguh-core/rest/vendorsresource.cpp \ rest/deviceclassesresource.cpp \
$$top_srcdir/libguh-core/rest/logsresource.cpp \ rest/vendorsresource.cpp \
$$top_srcdir/libguh-core/rest/pluginsresource.cpp \ rest/logsresource.cpp \
$$top_srcdir/libguh-core/rest/rulesresource.cpp \ rest/pluginsresource.cpp \
$$top_srcdir/libguh-core/time/timedescriptor.cpp \ rest/rulesresource.cpp \
$$top_srcdir/libguh-core/time/calendaritem.cpp \ time/timedescriptor.cpp \
$$top_srcdir/libguh-core/time/repeatingoption.cpp \ time/calendaritem.cpp \
$$top_srcdir/libguh-core/time/timeeventitem.cpp \ time/repeatingoption.cpp \
$$top_srcdir/libguh-core/time/timemanager.cpp \ time/timeeventitem.cpp \
$$top_srcdir/libguh-core/networkmanager/networkmanager.cpp \ time/timemanager.cpp \
$$top_srcdir/libguh-core/networkmanager/networkdevice.cpp \ networkmanager/networkmanager.cpp \
$$top_srcdir/libguh-core/networkmanager/wirelessaccesspoint.cpp \ networkmanager/networkdevice.cpp \
$$top_srcdir/libguh-core/networkmanager/wirelessnetworkdevice.cpp \ networkmanager/wirelessaccesspoint.cpp \
$$top_srcdir/libguh-core/networkmanager/networksettings.cpp \ networkmanager/wirelessnetworkdevice.cpp \
$$top_srcdir/libguh-core/networkmanager/networkconnection.cpp \ networkmanager/networksettings.cpp \
$$top_srcdir/libguh-core/networkmanager/wirednetworkdevice.cpp \ networkmanager/networkconnection.cpp \
$$top_srcdir/libguh-core/usermanager.cpp \ networkmanager/wirednetworkdevice.cpp \
$$top_srcdir/libguh-core/tokeninfo.cpp \ usermanager.cpp \
$$top_srcdir/libguh-core/certificategenerator.cpp \ tokeninfo.cpp \
$$top_srcdir/libguh-core/logging/logvaluetool.cpp certificategenerator.cpp \
$$top_srcdir/libguh-core/awsconnector.cpp \ awsconnector.cpp \
$$top_srcdir/libguh-core/cloudconnector.cpp \ cloudmanager.cpp \
$$top_srcdir/libguh-core/MbedTLS/MbedTLSConnection.cpp \ MbedTLS/MbedTLSConnection.cpp \
$$top_srcdir/libguh-core/janusconnector.cpp \ janusconnector.cpp \

11
tests/auto/api.json
View File

@ -455,6 +455,17 @@
"enabled": "Bool" "enabled": "Bool"
} }
}, },
"JSONRPC.SetupRemoteAccess": {
"description": "Setup the remote connection by providing AWS token information",
"params": {
"authToken": "String",
"cognitoId": "String",
"idToken": "String"
},
"returns": {
"status": "Int"
}
},
"JSONRPC.Tokens": { "JSONRPC.Tokens": {
"description": "Return a list of if TokenInfo objects all the tokens for the current user.", "description": "Return a list of if TokenInfo objects all the tokens for the current user.",
"params": { "params": {

2
tests/auto/autotests.pri
View File

@ -7,7 +7,7 @@ INCLUDEPATH += $$top_srcdir/libguh \
$$top_srcdir/tests/auto/ $$top_srcdir/tests/auto/
LIBS += -L$$top_builddir/libguh/ -lguh -L$$top_builddir/plugins/mock/ \ LIBS += -L$$top_builddir/libguh/ -lguh -L$$top_builddir/plugins/mock/ \
-L$$top_builddir/libguh-core/ -lguh-core -lssl -lcrypto -L$$top_builddir/libguh-core/ -lguh-core -lssl -lcrypto -laws-iot-sdk-cpp -lmbedtls -lmbedx509 -lmbedcrypto
SOURCES += ../guhtestbase.cpp \ SOURCES += ../guhtestbase.cpp \