diff --git a/libguh-core/cloudmanager.cpp b/libguh-core/cloudmanager.cpp index a4af9024..3e804ef3 100644 --- a/libguh-core/cloudmanager.cpp +++ b/libguh-core/cloudmanager.cpp @@ -20,6 +20,8 @@ #include "cloudmanager.h" #include "guhcore.h" +#include "awsconnector.h" +#include "janusconnector.h" #include #include diff --git a/libguh-core/cloudmanager.h b/libguh-core/cloudmanager.h index 2af30f78..55b91b47 100644 --- a/libguh-core/cloudmanager.h +++ b/libguh-core/cloudmanager.h @@ -21,14 +21,14 @@ #ifndef CLOUDMANAGER_H #define CLOUDMANAGER_H -#include "awsconnector.h" -#include "janusconnector.h" - #include #include #include #include +class JanusConnector; +class AWSConnector; + class CloudManager : public QObject { Q_OBJECT diff --git a/libguh-core/libguh-core.pro b/libguh-core/libguh-core.pro index f5a687d3..dedb7959 100644 --- a/libguh-core/libguh-core.pro +++ b/libguh-core/libguh-core.pro @@ -17,118 +17,118 @@ DEFINES += MBEDTLS_NEW_HEADERS # icons for the webserver RESOURCES += $$top_srcdir/icons.qrc -HEADERS += $$top_srcdir/libguh-core/guhcore.h \ - $$top_srcdir/libguh-core/tcpserver.h \ - $$top_srcdir/libguh-core/mocktcpserver.h \ - $$top_srcdir/libguh-core/ruleengine.h \ - $$top_srcdir/libguh-core/rule.h \ - $$top_srcdir/libguh-core/stateevaluator.h \ - $$top_srcdir/libguh-core/webserver.h \ - $$top_srcdir/libguh-core/transportinterface.h \ - $$top_srcdir/libguh-core/servermanager.h \ - $$top_srcdir/libguh-core/httprequest.h \ - $$top_srcdir/libguh-core/websocketserver.h \ - $$top_srcdir/libguh-core/httpreply.h \ - $$top_srcdir/libguh-core/guhconfiguration.h \ - $$top_srcdir/libguh-core/bluetoothserver.h \ - $$top_srcdir/libguh-core/jsonrpc/jsonrpcserver.h \ - $$top_srcdir/libguh-core/jsonrpc/jsonhandler.h \ - $$top_srcdir/libguh-core/jsonrpc/devicehandler.h \ - $$top_srcdir/libguh-core/jsonrpc/jsontypes.h \ - $$top_srcdir/libguh-core/jsonrpc/ruleshandler.h \ - $$top_srcdir/libguh-core/jsonrpc/actionhandler.h \ - $$top_srcdir/libguh-core/jsonrpc/eventhandler.h \ - $$top_srcdir/libguh-core/jsonrpc/statehandler.h \ - $$top_srcdir/libguh-core/jsonrpc/logginghandler.h \ - $$top_srcdir/libguh-core/jsonrpc/configurationhandler.h \ - $$top_srcdir/libguh-core/jsonrpc/networkmanagerhandler.h \ - $$top_srcdir/libguh-core/logging/logging.h \ - $$top_srcdir/libguh-core/logging/logengine.h \ - $$top_srcdir/libguh-core/logging/logfilter.h \ - $$top_srcdir/libguh-core/logging/logentry.h \ - $$top_srcdir/libguh-core/rest/restserver.h \ - $$top_srcdir/libguh-core/rest/restresource.h \ - $$top_srcdir/libguh-core/rest/devicesresource.h \ - $$top_srcdir/libguh-core/rest/deviceclassesresource.h \ - $$top_srcdir/libguh-core/rest/vendorsresource.h \ - $$top_srcdir/libguh-core/rest/logsresource.h \ - $$top_srcdir/libguh-core/rest/pluginsresource.h \ - $$top_srcdir/libguh-core/rest/rulesresource.h \ - $$top_srcdir/libguh-core/time/timedescriptor.h \ - $$top_srcdir/libguh-core/time/calendaritem.h \ - $$top_srcdir/libguh-core/time/repeatingoption.h \ - $$top_srcdir/libguh-core/time/timeeventitem.h \ - $$top_srcdir/libguh-core/time/timemanager.h \ - $$top_srcdir/libguh-core/networkmanager/dbus-interfaces.h \ - $$top_srcdir/libguh-core/networkmanager/networkmanager.h \ - $$top_srcdir/libguh-core/networkmanager/networkdevice.h \ - $$top_srcdir/libguh-core/networkmanager/wirelessaccesspoint.h \ - $$top_srcdir/libguh-core/networkmanager/wirelessnetworkdevice.h \ - $$top_srcdir/libguh-core/networkmanager/networksettings.h \ - $$top_srcdir/libguh-core/networkmanager/networkconnection.h \ - $$top_srcdir/libguh-core/networkmanager/wirednetworkdevice.h \ - $$top_srcdir/libguh-core/usermanager.h \ - $$top_srcdir/libguh-core/tokeninfo.h \ - $$top_srcdir/libguh-core/certificategenerator.h \ - $$top_srcdir/libguh-core/logging/logvaluetool.h - $$top_srcdir/libguh-core/awsconnector.h \ - $$top_srcdir/libguh-core/cloudconnector.h \ - $$top_srcdir/libguh-core/MbedTLS/MbedTLSConnection.hpp \ - $$top_srcdir/libguh-core/janusconnector.h \ +HEADERS += guhcore.h \ + tcpserver.h \ + mocktcpserver.h \ + ruleengine.h \ + rule.h \ + stateevaluator.h \ + webserver.h \ + transportinterface.h \ + servermanager.h \ + httprequest.h \ + websocketserver.h \ + httpreply.h \ + guhconfiguration.h \ + bluetoothserver.h \ + jsonrpc/jsonrpcserver.h \ + jsonrpc/jsonhandler.h \ + jsonrpc/devicehandler.h \ + jsonrpc/jsontypes.h \ + jsonrpc/ruleshandler.h \ + jsonrpc/actionhandler.h \ + jsonrpc/eventhandler.h \ + jsonrpc/statehandler.h \ + jsonrpc/logginghandler.h \ + jsonrpc/configurationhandler.h \ + jsonrpc/networkmanagerhandler.h \ + logging/logging.h \ + logging/logengine.h \ + logging/logfilter.h \ + logging/logentry.h \ + logging/logvaluetool.h \ + rest/restserver.h \ + rest/restresource.h \ + rest/devicesresource.h \ + rest/deviceclassesresource.h \ + rest/vendorsresource.h \ + rest/logsresource.h \ + rest/pluginsresource.h \ + rest/rulesresource.h \ + time/timedescriptor.h \ + time/calendaritem.h \ + time/repeatingoption.h \ + time/timeeventitem.h \ + time/timemanager.h \ + networkmanager/dbus-interfaces.h \ + networkmanager/networkmanager.h \ + networkmanager/networkdevice.h \ + networkmanager/wirelessaccesspoint.h \ + networkmanager/wirelessnetworkdevice.h \ + networkmanager/networksettings.h \ + networkmanager/networkconnection.h \ + networkmanager/wirednetworkdevice.h \ + usermanager.h \ + tokeninfo.h \ + certificategenerator.h \ + awsconnector.h \ + cloudmanager.h \ + MbedTLS/MbedTLSConnection.hpp \ + janusconnector.h \ -SOURCES += $$top_srcdir/libguh-core/guhcore.cpp \ - $$top_srcdir/libguh-core/tcpserver.cpp \ - $$top_srcdir/libguh-core/mocktcpserver.cpp \ - $$top_srcdir/libguh-core/ruleengine.cpp \ - $$top_srcdir/libguh-core/rule.cpp \ - $$top_srcdir/libguh-core/stateevaluator.cpp \ - $$top_srcdir/libguh-core/webserver.cpp \ - $$top_srcdir/libguh-core/transportinterface.cpp \ - $$top_srcdir/libguh-core/servermanager.cpp \ - $$top_srcdir/libguh-core/httprequest.cpp \ - $$top_srcdir/libguh-core/websocketserver.cpp \ - $$top_srcdir/libguh-core/httpreply.cpp \ - $$top_srcdir/libguh-core/guhconfiguration.cpp \ - $$top_srcdir/libguh-core/bluetoothserver.cpp \ - $$top_srcdir/libguh-core/jsonrpc/jsonrpcserver.cpp \ - $$top_srcdir/libguh-core/jsonrpc/jsonhandler.cpp \ - $$top_srcdir/libguh-core/jsonrpc/devicehandler.cpp \ - $$top_srcdir/libguh-core/jsonrpc/jsontypes.cpp \ - $$top_srcdir/libguh-core/jsonrpc/ruleshandler.cpp \ - $$top_srcdir/libguh-core/jsonrpc/actionhandler.cpp \ - $$top_srcdir/libguh-core/jsonrpc/eventhandler.cpp \ - $$top_srcdir/libguh-core/jsonrpc/statehandler.cpp \ - $$top_srcdir/libguh-core/jsonrpc/logginghandler.cpp \ - $$top_srcdir/libguh-core/jsonrpc/configurationhandler.cpp \ - $$top_srcdir/libguh-core/jsonrpc/networkmanagerhandler.cpp \ - $$top_srcdir/libguh-core/logging/logengine.cpp \ - $$top_srcdir/libguh-core/logging/logfilter.cpp \ - $$top_srcdir/libguh-core/logging/logentry.cpp \ - $$top_srcdir/libguh-core/rest/restserver.cpp \ - $$top_srcdir/libguh-core/rest/restresource.cpp \ - $$top_srcdir/libguh-core/rest/devicesresource.cpp \ - $$top_srcdir/libguh-core/rest/deviceclassesresource.cpp \ - $$top_srcdir/libguh-core/rest/vendorsresource.cpp \ - $$top_srcdir/libguh-core/rest/logsresource.cpp \ - $$top_srcdir/libguh-core/rest/pluginsresource.cpp \ - $$top_srcdir/libguh-core/rest/rulesresource.cpp \ - $$top_srcdir/libguh-core/time/timedescriptor.cpp \ - $$top_srcdir/libguh-core/time/calendaritem.cpp \ - $$top_srcdir/libguh-core/time/repeatingoption.cpp \ - $$top_srcdir/libguh-core/time/timeeventitem.cpp \ - $$top_srcdir/libguh-core/time/timemanager.cpp \ - $$top_srcdir/libguh-core/networkmanager/networkmanager.cpp \ - $$top_srcdir/libguh-core/networkmanager/networkdevice.cpp \ - $$top_srcdir/libguh-core/networkmanager/wirelessaccesspoint.cpp \ - $$top_srcdir/libguh-core/networkmanager/wirelessnetworkdevice.cpp \ - $$top_srcdir/libguh-core/networkmanager/networksettings.cpp \ - $$top_srcdir/libguh-core/networkmanager/networkconnection.cpp \ - $$top_srcdir/libguh-core/networkmanager/wirednetworkdevice.cpp \ - $$top_srcdir/libguh-core/usermanager.cpp \ - $$top_srcdir/libguh-core/tokeninfo.cpp \ - $$top_srcdir/libguh-core/certificategenerator.cpp \ - $$top_srcdir/libguh-core/logging/logvaluetool.cpp - $$top_srcdir/libguh-core/awsconnector.cpp \ - $$top_srcdir/libguh-core/cloudconnector.cpp \ - $$top_srcdir/libguh-core/MbedTLS/MbedTLSConnection.cpp \ - $$top_srcdir/libguh-core/janusconnector.cpp \ +SOURCES += guhcore.cpp \ + tcpserver.cpp \ + mocktcpserver.cpp \ + ruleengine.cpp \ + rule.cpp \ + stateevaluator.cpp \ + webserver.cpp \ + transportinterface.cpp \ + servermanager.cpp \ + httprequest.cpp \ + websocketserver.cpp \ + httpreply.cpp \ + guhconfiguration.cpp \ + bluetoothserver.cpp \ + jsonrpc/jsonrpcserver.cpp \ + jsonrpc/jsonhandler.cpp \ + jsonrpc/devicehandler.cpp \ + jsonrpc/jsontypes.cpp \ + jsonrpc/ruleshandler.cpp \ + jsonrpc/actionhandler.cpp \ + jsonrpc/eventhandler.cpp \ + jsonrpc/statehandler.cpp \ + jsonrpc/logginghandler.cpp \ + jsonrpc/configurationhandler.cpp \ + jsonrpc/networkmanagerhandler.cpp \ + logging/logengine.cpp \ + logging/logfilter.cpp \ + logging/logentry.cpp \ + logging/logvaluetool.cpp \ + rest/restserver.cpp \ + rest/restresource.cpp \ + rest/devicesresource.cpp \ + rest/deviceclassesresource.cpp \ + rest/vendorsresource.cpp \ + rest/logsresource.cpp \ + rest/pluginsresource.cpp \ + rest/rulesresource.cpp \ + time/timedescriptor.cpp \ + time/calendaritem.cpp \ + time/repeatingoption.cpp \ + time/timeeventitem.cpp \ + time/timemanager.cpp \ + networkmanager/networkmanager.cpp \ + networkmanager/networkdevice.cpp \ + networkmanager/wirelessaccesspoint.cpp \ + networkmanager/wirelessnetworkdevice.cpp \ + networkmanager/networksettings.cpp \ + networkmanager/networkconnection.cpp \ + networkmanager/wirednetworkdevice.cpp \ + usermanager.cpp \ + tokeninfo.cpp \ + certificategenerator.cpp \ + awsconnector.cpp \ + cloudmanager.cpp \ + MbedTLS/MbedTLSConnection.cpp \ + janusconnector.cpp \ diff --git a/tests/auto/api.json b/tests/auto/api.json index c1640888..c95c6d10 100644 --- a/tests/auto/api.json +++ b/tests/auto/api.json @@ -455,6 +455,17 @@ "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": { "description": "Return a list of if TokenInfo objects all the tokens for the current user.", "params": { diff --git a/tests/auto/autotests.pri b/tests/auto/autotests.pri index 317669a4..c998199d 100644 --- a/tests/auto/autotests.pri +++ b/tests/auto/autotests.pri @@ -7,7 +7,7 @@ INCLUDEPATH += $$top_srcdir/libguh \ $$top_srcdir/tests/auto/ 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 \