[SDK 646] Added new public method to change device id (#29)

* device Id change with and without merge.

* Change log added.

* PR Changes

* PR Changes

* code styling

* Change lod entry added
changing device id logic updated

Co-authored-by: ArtursKadikis <[email protected]>

Author: ZahidZafar

CHANGELOG.md

@@ -3,6 +3,8 @@
 * ! Minor breaking change ! Default automatic session update duration changed to 60 seconds.
 * Added a call to change the automatic session update duration.
 * Fixed a bug where session duration was reported wrong.
+* Fixed bug when changing device id with server merge.
+* Fixed bug when device id was changed without server merge. Previously the new session was started with the old device ID and not the new one.
 * Fixed a bug that was a typo ('COUNTLY_CUSTOM_HTTP' instead of 'COUNTLY_USE_CUSTOM_HTTP') in the cmake file that cause the SDK to be misconfigured. 
 * Fixed a bug that caused POST requests to fail on Windows.
 

include/countly.hpp

@@ -217,6 +217,10 @@ class Countly {
 
 	HTTPResponse sendHTTP(std::string path, std::string data);
 
+	void _changeDeviceIdWithMerge(const std::string& value);
+
+	void _changeDeviceIdWithoutMerge(const std::string& value);
+
 	std::chrono::system_clock::duration getSessionDuration(std::chrono::system_clock::time_point now);
 
 	std::chrono::system_clock::duration getSessionDuration();

src/countly.cpp

@@ -149,46 +149,89 @@ void Countly::setLocation(double lattitude, double longitude) {
 	session_params["location"] = location_stream.str();
 }
 
+#pragma region Device Id
 void Countly::setDeviceID(const std::string& value, bool same_user) {
 	mutex.lock();
-	if (session_params.find("device_id") == session_params.end() || (session_params["device_id"].is_string() && session_params["device_id"].get<std::string>() == value)) {
+	log(Countly::LogLevel::INFO, "[Countly][changeDeviceIdWithMerge] setDeviceID = '" + value + "'");
+
+	//Checking old and new devices ids are same
+	if (session_params.contains("device_id") && session_params["device_id"].get<std::string>() == value) {
+		log(Countly::LogLevel::DEBUG, "[Countly][setDeviceID] new device id and old device id are same.");
+		mutex.unlock();
+		return;
+	}
+
+	if (!session_params.contains("device_id")) {
 		session_params["device_id"] = value;
+		log(Countly::LogLevel::DEBUG, "[Countly][setDeviceID] no device was set, setting device id");
 		mutex.unlock();
 		return;
 	}
 
+	//If code does reach here without sdk init, it will throw an exception.
+	mutex.unlock();
 	if (same_user) {
-		session_params["old_device_id"] = session_params["device_id"];
+		_changeDeviceIdWithMerge(value);
+	}
+	else {
+		_changeDeviceIdWithoutMerge(value);
+	}
+}
+
+/* Change device ID with merge after SDK has been initialized.*/
+void Countly::_changeDeviceIdWithMerge(const std::string& value) {
+	mutex.lock();
+	log(Countly::LogLevel::DEBUG, "[Countly][changeDeviceIdWithMerge] deviceId = '" + value + "'");
+
+	session_params["old_device_id"] = session_params["device_id"];
+	session_params["device_id"] = value;
+
+	const std::chrono::system_clock::time_point now = Countly::getTimestamp();
+	const auto timestamp = std::chrono::duration_cast<std::chrono::seconds>(now.time_since_epoch());
+	std::map<std::string, std::string> data = {
+	{"app_key", session_params["app_key"].get<std::string>()},
+	{"device_id", session_params["device_id"].get<std::string>()},
+	{"old_device_id", session_params["old_device_id"].get<std::string>()},
+	{"timestamp", std::to_string(timestamp.count())},
+	};
+	sendHTTP("/i", Countly::serializeForm(data));
+
+	session_params.erase("old_device_id");
+	mutex.unlock();
+}
+
+/* Change device ID without merge after SDK has been initialized.*/
+void Countly::_changeDeviceIdWithoutMerge(const std::string& value) {
+	log(Countly::LogLevel::DEBUG, "[Countly][changeDeviceIdWithoutMerge] deviceId = '" + value + "'");
+
+	//send all event to server and end current session of old user
+	flushEvents();
+	if (began_session) {
+		endSession();
+		mutex.lock();
 		session_params["device_id"] = value;
-		if (began_session) {
-			mutex.unlock();
-			endSession();
-			beginSession();
-			mutex.lock();
-		}
-		session_params.erase("old_device_id");
-	} else {
-		if (began_session) {
-			mutex.unlock();
-			flushEvents();
-			endSession();
-			beginSession();
-			mutex.lock();
-		}
+		mutex.unlock();
+		beginSession();
+	}
+	else {
+		mutex.lock();
 		session_params["device_id"] = value;
+		mutex.unlock();
 	}
-	mutex.unlock();
 }
+#pragma endregion Device Id
 
 void Countly::start(const std::string& app_key, const std::string& host, int port, bool start_thread) {
 	mutex.lock();
 	log(Countly::LogLevel::INFO, "[Countly][start]");
 	this->host = host;
 	if (host.find("http://") == 0) {
 		use_https = false;
-	} else if (host.find("https://") == 0) {
+	}
+	else if (host.find("https://") == 0) {
 		use_https = true;
-	} else {
+	}
+	else {
 		use_https = false;
 		this->host.insert(0, "http://");
 	}