Editor/GuruJsonBuilder/GuruServiceJsonBuilder.cs

@@ -479,7 +479,7 @@ namespace Guru.Editor
                 arr = GetStringArray(line, 0, 7);
                 if(string.IsNullOrEmpty(arr[5])) arr[5] = "Store";
                 if(string.IsNullOrEmpty(arr[6])) arr[6] = "0";
-                iaps.Add(string.Join(",", arr).Replace("\r", ""));
+                iaps.Add(string.Join("," , arr));
                 index++;
             }
             settings.products = iaps.ToArray();

Runtime/Code/SDK/GuruSDK.Properties.cs

@@ -2,17 +2,9 @@ namespace Guru
 {
     public partial class GuruSDK
     {
-        // UID
-        public static string UID
-        {
-            get
-            {
-                if(Model != null && !string.IsNullOrEmpty(Model.UserId)) 
-                    return Model.UserId;
-                return IPMConfig.IPM_UID;
-            }
-        }
-        public static string UUID => IPMConfig.IPM_UUID ?? "";
+        
+        public static string UID => Model?.UserId ?? IPMConfig.IPM_UID;
+        public static string UUID => Model?.UserId ?? IPMConfig.IPM_UUID;
         public static string DeviceId => IPMConfig.IPM_DEVICE_ID ?? "";  // TODO: change it to _model member later.
         public static string PushToken => IPMConfig.IPM_PUSH_TOKEN ?? ""; // TODO: change it to _model member later.
         public static string AuthToken => IPMConfig.IPM_TOKEN ?? ""; // TODO: change it to _model member later.

Runtime/Code/SDK/GuruSDK.cs

@@ -180,7 +180,6 @@ namespace Guru
 
         private void OnUserAuthResult(bool success)
         {
-            
             if (success && string.IsNullOrEmpty(IPMConfig.IPM_UID))
             {
                 success = false;
@@ -189,7 +188,6 @@ namespace Guru
 
             if (success)
             {
-                Model.UserId = IPMConfig.IPM_UID;
                 if (GuruIAP.Instance != null)
                 {
                     GuruIAP.Instance.SetUID(UID);