Use the same url for username/password and mTLS connection

Author: pennam

src/ArduinoIoTCloudTCP.cpp

@@ -114,11 +114,10 @@ ArduinoIoTCloudTCP::ArduinoIoTCloudTCP()
 int ArduinoIoTCloudTCP::begin(ConnectionHandler & connection, bool const enable_watchdog, String brokerAddress, uint16_t brokerPort)
 {
   _connection = &connection;
+  _brokerAddress = brokerAddress;
 #ifdef BOARD_HAS_SECRET_KEY
-  _brokerAddress = _password.length() ? DEFAULT_BROKER_ADDRESS_USER_PASS_AUTH : brokerAddress;
   _brokerPort = _password.length() ? DEFAULT_BROKER_PORT_USER_PASS_AUTH : brokerPort;
 #else
-  _brokerAddress = brokerAddress;
   _brokerPort = brokerPort;
 #endif
   _time_service.begin(&connection);

src/ArduinoIoTCloudTCP.h

@@ -53,15 +53,9 @@
 /******************************************************************************
    CONSTANTS
  ******************************************************************************/
-#if defined(BOARD_HAS_SECURE_ELEMENT)
-static char const DEFAULT_BROKER_ADDRESS_SECURE_AUTH[] = "mqtts-sa.iot.arduino.cc";
+static char const DEFAULT_BROKER_ADDRESS_SECURE_AUTH[] = "iot.arduino.cc";
 static uint16_t const DEFAULT_BROKER_PORT_SECURE_AUTH = 8883;
-#endif
-
-#if defined(BOARD_HAS_SECRET_KEY)
-static char const DEFAULT_BROKER_ADDRESS_USER_PASS_AUTH[] = "mqtts-up.iot.arduino.cc";
 static uint16_t const DEFAULT_BROKER_PORT_USER_PASS_AUTH = 8884;
-#endif
 
 /******************************************************************************
  * TYPEDEF