experimenting with some refactoring

Author: rjwats

src/APSettingsService.cpp renamed to lib/framework/APSettingsService.cpp

@@ -1,6 +1,6 @@
 #include <APSettingsService.h>
 
-APSettingsService::APSettingsService(AsyncWebServer* server, FS* fs, SecurityManager* securityManager) : AdminSettingsService(server, fs, securityManager, AP_SETTINGS_SERVICE_PATH, AP_SETTINGS_FILE) {
+APSettingsService::APSettingsService(FS* fs, SecurityManager* securityManager) : AdminSettingsService(fs, securityManager, AP_SETTINGS_SERVICE_PATH, AP_SETTINGS_FILE) {
   onConfigUpdated();
 }
 

src/APSettingsService.h renamed to lib/framework/APSettingsService.h

@@ -23,7 +23,7 @@ class APSettingsService : public AdminSettingsService {
 
   public:
 
-    APSettingsService(AsyncWebServer* server, FS* fs, SecurityManager* securityManager);
+    APSettingsService(FS* fs, SecurityManager* securityManager);
     ~APSettingsService();
 
     void loop();

src/APStatus.cpp renamed to lib/framework/APStatus.cpp

@@ -1,7 +1,9 @@
 #include <APStatus.h>
 
-APStatus::APStatus(AsyncWebServer *server, SecurityManager* securityManager) : _server(server), _securityManager(securityManager) {
-  _server->on(AP_STATUS_SERVICE_PATH, HTTP_GET, 
+APStatus::APStatus(SecurityManager* securityManager) :_securityManager(securityManager) {}
+
+void APStatus::init(AsyncWebServer *server){
+  server->on(AP_STATUS_SERVICE_PATH, HTTP_GET, 
     _securityManager->wrapRequest(std::bind(&APStatus::apStatus, this, std::placeholders::_1), AuthenticationPredicates::IS_AUTHENTICATED)
   );
 }

src/APStatus.h renamed to lib/framework/APStatus.h

@@ -22,11 +22,11 @@ class APStatus {
 
   public:
 
-    APStatus(AsyncWebServer *server, SecurityManager* securityManager);
+    APStatus(SecurityManager* securityManager);
+    void init(AsyncWebServer *server);
 
   private:
-
-    AsyncWebServer* _server;
+  
     SecurityManager* _securityManager;
 
     void apStatus(AsyncWebServerRequest *request);

src/ArduinoJsonJWT.cpp renamed to lib/framework/ArduinoJsonJWT.cpp

@@ -1,18 +1,19 @@
 #include <AuthenticationService.h>
 
-AuthenticationService::AuthenticationService(AsyncWebServer* server, SecurityManager* securityManager):
-  _server(server), _securityManager(securityManager) {    
-  server->on(VERIFY_AUTHORIZATION_PATH, HTTP_GET, std::bind(&AuthenticationService::verifyAuthorization, this, std::placeholders::_1));
-
+AuthenticationService::AuthenticationService(SecurityManager* securityManager) : _securityManager(securityManager) {
   _signInHandler.setUri(SIGN_IN_PATH);
   _signInHandler.setMethod(HTTP_POST);
   _signInHandler.setMaxContentLength(MAX_AUTHENTICATION_SIZE);
   _signInHandler.onRequest(std::bind(&AuthenticationService::signIn, this, std::placeholders::_1, std::placeholders::_2));
-  server->addHandler(&_signInHandler);
 }
 
 AuthenticationService::~AuthenticationService() {}
 
+void AuthenticationService::init(AsyncWebServer* server) {
+  server->on(VERIFY_AUTHORIZATION_PATH, HTTP_GET, std::bind(&AuthenticationService::verifyAuthorization, this, std::placeholders::_1));
+  server->addHandler(&_signInHandler);
+}
+
 /**
  * Verifys that the request supplied a valid JWT.
  */

src/ArduinoJsonJWT.h renamed to lib/framework/ArduinoJsonJWT.h

@@ -15,9 +15,11 @@ class AuthenticationService  {
 
   public:
 
-    AuthenticationService(AsyncWebServer* server, SecurityManager* securityManager) ;
+    AuthenticationService(SecurityManager* securityManager);
     ~AuthenticationService();
 
+    void init(AsyncWebServer* server);
+
   private:
     // server instance 
     AsyncWebServer* _server;