41f7579bd5
Fix newly introduced null pointer in AuthenticationService.
56 lines
2.0 KiB
C++
56 lines
2.0 KiB
C++
#include <ESP8266React.h>
|
|
|
|
ESP8266React::ESP8266React(AsyncWebServer* server, FS* fs):
|
|
_securitySettingsService(server, fs),
|
|
_wifiSettingsService(server, fs, &_securitySettingsService),
|
|
_apSettingsService(server, fs, &_securitySettingsService),
|
|
_ntpSettingsService(server, fs, &_securitySettingsService),
|
|
_otaSettingsService(server, fs, &_securitySettingsService),
|
|
_authenticationService(server, &_securitySettingsService),
|
|
_wifiScanner(server, &_securitySettingsService),
|
|
_wifiStatus(server, &_securitySettingsService),
|
|
_ntpStatus(server, &_securitySettingsService),
|
|
_apStatus(server, &_securitySettingsService),
|
|
_systemStatus(server, &_securitySettingsService) {
|
|
// Serve static resources from /www/
|
|
server->serveStatic("/js/", SPIFFS, "/www/js/");
|
|
server->serveStatic("/css/", SPIFFS, "/www/css/");
|
|
server->serveStatic("/fonts/", SPIFFS, "/www/fonts/");
|
|
server->serveStatic("/app/", SPIFFS, "/www/app/");
|
|
server->serveStatic("/favicon.ico", SPIFFS, "/www/favicon.ico");
|
|
|
|
// Serving all other get requests with "/www/index.htm"
|
|
// OPTIONS get a straight up 200 response
|
|
server->onNotFound([](AsyncWebServerRequest *request) {
|
|
if (request->method() == HTTP_GET) {
|
|
request->send(SPIFFS, "/www/index.html");
|
|
} else if (request->method() == HTTP_OPTIONS) {
|
|
request->send(200);
|
|
} else {
|
|
request->send(404);
|
|
}
|
|
});
|
|
|
|
// Disable CORS if required
|
|
#if defined(ENABLE_CORS)
|
|
DefaultHeaders::Instance().addHeader("Access-Control-Allow-Origin", CORS_ORIGIN);
|
|
DefaultHeaders::Instance().addHeader("Access-Control-Allow-Headers", "Accept, Content-Type, Authorization");
|
|
DefaultHeaders::Instance().addHeader("Access-Control-Allow-Credentials", "true");
|
|
#endif
|
|
}
|
|
|
|
void ESP8266React::begin() {
|
|
_securitySettingsService.begin();
|
|
_wifiSettingsService.begin();
|
|
_apSettingsService.begin();
|
|
_ntpSettingsService.begin();
|
|
_otaSettingsService.begin();
|
|
}
|
|
|
|
void ESP8266React::loop() {
|
|
_wifiSettingsService.loop();
|
|
_apSettingsService.loop();
|
|
_ntpSettingsService.loop();
|
|
_otaSettingsService.loop();
|
|
}
|