Changed the default assumption.

4 years ago · 61f9859e1d
parent 8c5e5a49ea
commit 61f9859e1d
2 changed files with 6 additions and 6 deletions
--- a/src/AutoConnect.h
+++ b/src/AutoConnect.h
@ -79,8 +79,8 @@ class AutoConnectConfig {
    ota(AC_OTA_EXTRA),
    auth(AC_AUTH_NONE),
    authScope(AC_AUTHSCOPE_AUX),
-    username(String(F(AUTOCONNECT_APID))),
-    password(String(F(AUTOCONNECT_PSK))),
+    username(String("")),
+    password(String("")),
    hostName(String("")),
    homeUri(AUTOCONNECT_HOMEURI),
    title(AUTOCONNECT_MENU_TITLE),
@ -120,8 +120,8 @@ class AutoConnectConfig {
    ota(AC_OTA_EXTRA),
    auth(AC_AUTH_NONE),
    authScope(AC_AUTHSCOPE_AUX),
-    username(String(F(AUTOCONNECT_APID))),
-    password(String(F(AUTOCONNECT_PSK))),
+    username(String("")),
+    password(String("")),
    hostName(String("")),
    homeUri(AUTOCONNECT_HOMEURI),
    title(AUTOCONNECT_MENU_TITLE),
--- a/src/AutoConnectPage.cpp
+++ b/src/AutoConnectPage.cpp
@ -1594,8 +1594,8 @@ void AutoConnect::_authentication(bool allow) {

  if (allow) {
    // Regiter authentication method
-    user = _apConfig.username.c_str();
-    password = _apConfig.password.c_str();
+    user = _apConfig.username.length() ? _apConfig.username.c_str() : _apConfig.apid.c_str();
+    password = _apConfig.password.length() ? _apConfig.password.c_str() : _apConfig.psk.c_str();
    fails = String(FPSTR(AutoConnect::_ELM_HTML_HEAD)) + String(F("</head><body>" AUTOCONNECT_TEXT_AUTHFAILED "</body></html>"));
    AC_DBG_DUMB(",%s+%s/%s", method == HTTPAuthMethod::BASIC_AUTH ? "BASIC" : "DIGEST", user, password);
  }