2 files changed, 25 insertions, 0 deletions
diff --git a/NorthstarDLL/masterserver/masterserver.cpp b/NorthstarDLL/masterserver/masterserver.cpp
index c2bbdfd8..64f172c9 100644
--- a/NorthstarDLL/masterserver/masterserver.cpp
+++ b/NorthstarDLL/masterserver/masterserver.cpp
@@ -95,6 +95,10 @@ void MasterServerManager::AuthenticateOriginWithMasterServer(const char* uid, co
 	std::string uidStr(uid);
 	std::string tokenStr(originToken);
 
+	m_bOriginAuthWithMasterServerSuccessful = false;
+	m_sOriginAuthWithMasterServerErrorCode = "";
+	m_sOriginAuthWithMasterServerErrorMessage = "";
+
 	std::thread requestThread(
 		[this, uidStr, tokenStr]()
 		{
@@ -142,9 +146,26 @@ void MasterServerManager::AuthenticateOriginWithMasterServer(const char* uid, co
 						originAuthInfo["token"].GetString(),
 						sizeof(m_sOwnClientAuthToken) - 1);
 					spdlog::info("Northstar origin authentication completed successfully!");
+					m_bOriginAuthWithMasterServerSuccessful = true;
 				}
 				else
+				{
 					spdlog::error("Northstar origin authentication failed");
+
+					if (originAuthInfo.HasMember("error") && originAuthInfo["error"].IsObject())
+					{
+
+						if (originAuthInfo["error"].HasMember("enum") && originAuthInfo["error"]["enum"].IsString())
+						{
+							m_sOriginAuthWithMasterServerErrorCode = originAuthInfo["error"]["enum"].GetString();
+						}
+
+						if (originAuthInfo["error"].HasMember("msg") && originAuthInfo["error"]["msg"].IsString())
+						{
+							m_sOriginAuthWithMasterServerErrorMessage = originAuthInfo["error"]["msg"].GetString();
+						}
+					}
+				}
 			}
 			else
 			{
diff --git a/NorthstarDLL/masterserver/masterserver.h b/NorthstarDLL/masterserver/masterserver.h
index e87b31a2..c4fa56c2 100644
--- a/NorthstarDLL/masterserver/masterserver.h
+++ b/NorthstarDLL/masterserver/masterserver.h
@@ -96,6 +96,10 @@ class MasterServerManager
 	bool m_bOriginAuthWithMasterServerDone = false;
 	bool m_bOriginAuthWithMasterServerInProgress = false;
 
+	bool m_bOriginAuthWithMasterServerSuccessful = false;
+	std::string m_sOriginAuthWithMasterServerErrorCode = "";
+	std::string m_sOriginAuthWithMasterServerErrorMessage = "";
+
 	bool m_bSavingPersistentData = false;
 
 	bool m_bScriptRequestingServerList = false;