[NXP] allow user to connect devices to open network (project-chip#42138)

* [NXP] allow user to connect devices to open network

Signed-off-by: Martin Girardot <[email protected]>

* Restyled by whitespace

* Restyled by clang-format

* [NXP] Fix PR comment

Signed-off-by: Martin Girardot <[email protected]>

---------

Signed-off-by: Martin Girardot <[email protected]>
Co-authored-by: Restyled.io <[email protected]>

Author: Martin-NXP

src/lib/shell/commands/WiFi.cpp

@@ -109,13 +109,22 @@ static CHIP_ERROR WiFiConnectHandler(int argc, char ** argv)
 
     VerifyOrReturnError(GetWiFiDriver() != nullptr, CHIP_ERROR_NOT_IMPLEMENTED);
 
-    /* Command accepts running with SSID and password as parameters */
-    VerifyOrReturnError((argc == 2), CHIP_ERROR_INVALID_ARGUMENT);
+    /* Command accepts running with SSID and password (optional) as parameters */
+    VerifyOrReturnError((argc == 1 || argc == 2), CHIP_ERROR_INVALID_ARGUMENT);
 
-    ByteSpan ssidSpan     = ByteSpan(Uint8::from_const_char(argv[0]), strlen(argv[0]));
-    ByteSpan passwordSpan = ByteSpan(Uint8::from_const_char(argv[1]), strlen(argv[1]));
-
-    VerifyOrReturnError(IsSpanUsable(ssidSpan) && IsSpanUsable(passwordSpan), CHIP_ERROR_INVALID_ARGUMENT);
+    ByteSpan ssidSpan = ByteSpan(Uint8::from_const_char(argv[0]), strlen(argv[0]));
+    VerifyOrReturnError(!ssidSpan.empty(), CHIP_ERROR_INVALID_ARGUMENT);
+    ByteSpan passwordSpan;
+    if (argc == 2)
+    {
+        passwordSpan = ByteSpan(Uint8::from_const_char(argv[1]), strlen(argv[1]));
+        VerifyOrReturnError(!passwordSpan.empty(), CHIP_ERROR_INVALID_ARGUMENT);
+    }
+    else
+    {
+        // If no password is provided, use an empty password
+        passwordSpan = ByteSpan();
+    }
 
     ChipLogProgress(Shell, "Adding/Updating network %s", argv[0]);
 
@@ -150,7 +159,7 @@ void RegisterWiFiCommands()
 {
     static constexpr Command subCommands[] = {
         { &WiFiModeHandler, "mode", "Get/Set wifi mode. Usage: wifi mode [disable|ap|sta]" },
-        { &WiFiConnectHandler, "connect", "Connect to AP. Usage: wifi connect <ssid> <psk>" },
+        { &WiFiConnectHandler, "connect", "Connect to AP. Usage: wifi connect <ssid> [<psk>]" },
         { &WiFiDisconnectHandler, "disconnect", "Disconnect device from AP. Usage: wifi disconnect" },
     };
 

src/platform/nxp/common/NetworkCommissioningWiFiDriver.cpp

@@ -80,7 +80,9 @@ CHIP_ERROR NXPWiFiDriver::Init(NetworkStatusChangeCallback * networkStatusChange
 
     err = PersistedStorage::KeyValueStoreMgr().Get(kWiFiCredentialsKeyName, mSavedNetwork.credentials,
                                                    sizeof(mSavedNetwork.credentials), &credentialsLen);
-    if (err != CHIP_NO_ERROR)
+    /* Password could be empty, do not return error if key not found,
+    password is written in flash before SSID, if SSID is present but not password, it is not an error */
+    if (err != CHIP_NO_ERROR && err != CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND)
     {
         ChipLogProgress(DeviceLayer, "WiFi network credentials not retrieved from persisted storage: %" CHIP_ERROR_FORMAT,
                         err.Format());
@@ -117,9 +119,9 @@ void NXPWiFiDriver::Shutdown()
 
 CHIP_ERROR NXPWiFiDriver::CommitConfiguration()
 {
-    ReturnErrorOnFailure(PersistedStorage::KeyValueStoreMgr().Put(kWiFiSSIDKeyName, mStagingNetwork.ssid, mStagingNetwork.ssidLen));
     ReturnErrorOnFailure(PersistedStorage::KeyValueStoreMgr().Put(kWiFiCredentialsKeyName, mStagingNetwork.credentials,
                                                                   mStagingNetwork.credentialsLen));
+    ReturnErrorOnFailure(PersistedStorage::KeyValueStoreMgr().Put(kWiFiSSIDKeyName, mStagingNetwork.ssid, mStagingNetwork.ssidLen));
     mSavedNetwork = mStagingNetwork;
 
     return CHIP_NO_ERROR;