expose identifiers

Author: dorin-ga

include/GameAnalytics/GameAnalytics.h

@@ -110,6 +110,9 @@ namespace gameanalytics
 
          static std::string getRemoteConfigsContentAsString();
 
+         static std::string getUserId();
+         static std::string getExternalUserId();
+
          static std::string getABTestingId();
          static std::string getABTestingVariantId();
 

source/gameanalytics/GAState.cpp

@@ -66,6 +66,11 @@ namespace gameanalytics
             return getInstance()._identifier;
         }
 
+        std::string GAState::getExternalUserId()
+        {
+            return getInstance()._externalUserId;
+        }
+
         bool GAState::isInitialized()
         {
             return getInstance()._initialized;
@@ -402,7 +407,7 @@ namespace gameanalytics
                 out["event_uuid"] = utilities::GAUtilities::generateUUID();
 
                 // User identifier
-                out["user_id"] = getInstance().getIdentifier();
+                out["user_id"] = getUserId();
 
                 // remote configs configurations
                 if(getInstance()._configurations.is_object() && !getInstance()._configurations.empty())

source/gameanalytics/GAState.h

@@ -141,6 +141,8 @@ namespace gameanalytics
                 static std::string getRemoteConfigsContentAsString();
                 static std::string getAbId();
                 static std::string getAbVariantId();
+                static std::string getUserId();
+                static std::string getExternalUserId();
 
                 static json getValidatedCustomFields();
                 static json getValidatedCustomFields(const json& withEventFields);
@@ -164,7 +166,6 @@ namespace gameanalytics
                 addErrorEvent(severity, msg);
             }
 
-            std::string getIdentifier();
             void  setDefaultUserId(std::string const& id);
             json& getSdkConfig();
             void  cacheIdentifier();

source/gameanalytics/GameAnalytics.cpp

@@ -475,7 +475,7 @@ namespace gameanalytics
             {
                 // Send to events
                 json fieldsJson = utilities::parseFields(fields);
-                events::GAEvents::addProgressionEvent(progressionStatus, progression01, progression02, progression03, score, false, fieldsJson, mergeFields);
+                events::GAEvents::addProgressionEvent(progressionStatus, progression01, progression02, progression03, score, true, fieldsJson, mergeFields);
             }
             catch(const json::exception& e)
             {
@@ -763,6 +763,16 @@ namespace gameanalytics
         return state::GAState::getRemoteConfigsContentAsString();
     }
 
+    std::string GameAnalytics::getUserId()
+    {
+        return state::GAState::getUserId();
+    }
+
+    std::string GameAnalytics::getExternalUserId()
+    {
+        return state::GAState::getExternalUserId();
+    }
+
     std::string GameAnalytics::getABTestingId()
     {
         return state::GAState::getAbId();