- The first part

- Added CodeDocs config file for customization
- Fixing LGTM alerts
- LGTM bug fixed again
- added token option to hyperion-remote
- fix DBManager::getDB()
- next bugfix
- correct broken signal from SettingManager to Hyperion
- Token list is created after the schema is fetched

Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com>

src/hyperiond/CMakeLists.txt

@@ -21,9 +21,11 @@ target_link_libraries(hyperiond
 		webserver
 		bonjour
 		ssdp
+		database
 		python
 		resources
 		${PYTHON_LIBRARIES}
+		Qt5::Widgets
 )
 
 if (ENABLE_AMLOGIC)
@@ -68,8 +70,6 @@ if (ENABLE_QT)
 	target_link_libraries(hyperiond	qt-grabber)
 endif ()
 
-target_link_libraries(hyperiond Qt5::Widgets)
-
 install ( TARGETS hyperiond DESTINATION "share/hyperion/bin/" COMPONENT "${PLATFORM}" )
 install ( DIRECTORY ${CMAKE_SOURCE_DIR}/bin/service DESTINATION "share/hyperion/" COMPONENT  "${PLATFORM}" )
 install ( FILES ${CMAKE_SOURCE_DIR}/effects/readme.txt DESTINATION "share/hyperion/effects" COMPONENT  "${PLATFORM}" )

src/hyperiond/hyperiond.cpp

@@ -40,6 +40,12 @@
 // settings
 #include <hyperion/SettingsManager.h>
 
+// AuthManager
+#include <hyperion/AuthManager.h>
+
+// NetOrigin checks
+#include <utils/NetOrigin.h>
+
 // Init Python
 #include <python/PythonInit.h>
 
@@ -51,7 +57,9 @@ HyperionDaemon* HyperionDaemon::daemon = nullptr;
 HyperionDaemon::HyperionDaemon(QString configFile, const QString rootPath, QObject *parent, const bool& logLvlOverwrite)
 	: QObject(parent)
 	, _log(Logger::getInstance("DAEMON"))
+	, _authManager(new AuthManager(rootPath, this))
 	, _bonjourBrowserWrapper(new BonjourBrowserWrapper())
+	, _netOrigin(new NetOrigin(this))
 	, _pyInit(new PythonInit())
 	, _webserver(nullptr)
 	, _jsonServer(nullptr)
@@ -88,6 +96,14 @@ HyperionDaemon::HyperionDaemon(QString configFile, const QString rootPath, QObje
 	EffectFileHandler* efh = new EffectFileHandler(rootPath, getSetting(settings::EFFECTS), this);
 	connect(this, &HyperionDaemon::settingsChanged, efh, &EffectFileHandler::handleSettingsUpdate);
 
+	// connect and apply settings for AuthManager
+	connect(this, &HyperionDaemon::settingsChanged, _authManager, &AuthManager::handleSettingsUpdate);
+	_authManager->handleSettingsUpdate(settings::NETWORK, _settingsManager->getSetting(settings::NETWORK));
+
+	// connect and apply settings for NetOrigin
+	connect(this, &HyperionDaemon::settingsChanged, _netOrigin, &NetOrigin::handleSettingsUpdate);
+	_netOrigin->handleSettingsUpdate(settings::NETWORK, _settingsManager->getSetting(settings::NETWORK));
+
 	// spawn all Hyperion instances before network services
 	_hyperion = Hyperion::initInstance(this, 0, configFile, rootPath);
 

src/hyperiond/hyperiond.h

@@ -63,6 +63,8 @@ class PythonInit;
 class SSDPHandler;
 class FlatBufferServer;
 class ProtoServer;
+class AuthManager;
+class NetOrigin;
 
 class HyperionDaemon : public QObject
 {
@@ -131,7 +133,9 @@ private:
 	void createGrabberQt(const QJsonObject & grabberConfig);
 
 	Logger*                    _log;
+	AuthManager*               _authManager;
 	BonjourBrowserWrapper*     _bonjourBrowserWrapper;
+	NetOrigin*                 _netOrigin;
 	PythonInit*                _pyInit;
 	WebServer*                 _webserver;
 	JsonServer*                _jsonServer;
@@ -158,8 +162,8 @@ private:
 	int                        _grabber_ge2d_mode;
 	QString                    _grabber_device;
 
-	QString _prevType;
+	QString                    _prevType;
 
-	VideoMode _currVideoMode;
-	SettingsManager*  _settingsManager;
+	VideoMode                  _currVideoMode;
+	SettingsManager*           _settingsManager;
 };