com.amanotes.gdk 0.2.17 → 0.2.18

package/CHANGELOG.md

@@ -1,7 +1,11 @@
 # Changelog
 
-## [0.2.17 - 2023-08-29]
+## [0.2.18 - 2023-09-11]
+### Add dev mode switch
+### Auto get SDK version
+### Add in-app purchase module, RevenueCat
 ### Support Unity 2019.4
+### Remove AmaPassport
 
 ## [0.2.14 - 2023-08-08]
 ### Support multiple embed remote config and load config by id

package/Editor/UserProfile.PostBuild.cs

@@ -0,0 +1,72 @@
+using System;
+using System.IO;
+using UnityEngine;
+
+#if UNITY_EDITOR && UNITY_IOS
+using UnityEditor;
+using UnityEditor.Callbacks;
+using UnityEditor.iOS.Xcode;
+#endif
+
+#if UNITY_IOS
+namespace Amanotes.Core
+{
+    internal static class UserProfilePostBuild
+    {
+        [PostProcessBuild(10000)]
+        public static void PostBuild(BuildTarget buildTarget, string pathToBuiltProject)
+        {
+            if (buildTarget != BuildTarget.iOS) return;
+            var entitlementFilePath = VerifyEntitlements(pathToBuiltProject);
+            AddKeychainSharing(pathToBuiltProject, entitlementFilePath);
+        }
+        
+        public static string VerifyEntitlements(string pathToBuiltProject)
+        {
+            Debug.Log("UserProfilePostBuild: VerifyEntitlements");
+            
+            var projPath = PBXProject.GetPBXProjectPath(pathToBuiltProject);
+            var proj = new PBXProject();
+            proj.ReadFromString(File.ReadAllText(projPath));
+            
+#if UNITY_2019_3_OR_NEWER
+            var appTargetId = proj.GetUnityMainTargetGuid();
+            var frameworkTargetId = proj.GetUnityFrameworkTargetGuid();
+#else
+            string targetName = PBXProject.GetUnityTargetName();
+            string appTargetId = proj.TargetGuidByName(targetName);
+            string frameworkTargetId = appTargetId; //No UnityFramework target, get main target instead            
+#endif
+            //Check present of entitlements
+            var localPath = proj.GetBuildPropertyForAnyConfig(appTargetId, "CODE_SIGN_ENTITLEMENTS") ?? "Entitlements.entitlements";
+            var fullPath = $"{pathToBuiltProject}/{localPath}";
+            
+            //Entitlements.entitlements
+            //Missing entitlement dismiss the auto enable Keychain Sharing            
+            if (!File.Exists(fullPath))
+            {
+                const string txtEntitlement = @"<?xml version=""1.0"" encoding=""UTF-8""?>
+<!DOCTYPE plist PUBLIC ""-//Apple//DTD PLIST 1.0//EN"" ""http://www.apple.com/DTDs/PropertyList-1.0.dtd"">
+<plist version = ""1.0"">
+<dict>
+</dict>
+</plist>";
+                File.WriteAllText(fullPath, txtEntitlement);
+            }
+            
+            proj.AddFileToBuild(appTargetId, proj.AddFile(fullPath, localPath));
+            proj.SetBuildProperty(appTargetId, "CODE_SIGN_ENTITLEMENTS", localPath);
+            return localPath;
+        }
+        public static void AddKeychainSharing(string pathToBuiltProject, string entitlementsLocalPath)
+        {
+            Debug.Log("UserProfilePostBuild: AddKeychainSharing");
+            var projPath = PBXProject.GetPBXProjectPath(pathToBuiltProject);
+            var capabilityManager = new ProjectCapabilityManager(projPath, entitlementsLocalPath, "Unity-iPhone");
+            capabilityManager.AddKeychainSharing(new string[] { "$(AppIdentifierPrefix)com.amanotes.shared" });
+            capabilityManager.WriteToFile();
+        }
+    }
+}
+
+#endif

package/{Runtime/AmaGDK.AmaPassport.cs.meta → Editor/UserProfile.PostBuild.cs.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e5fc9bbce48c14195aa4b37c41490127
+guid: e4f63439289984fda8282148559a37df
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

package/Editor/UserProfileDependencies.xml

@@ -0,0 +1,5 @@
+<dependencies>
+  <androidPackages>
+	<androidPackage spec="com.google.android.gms:play-services-ads-identifier:16.0.0" />
+  </androidPackages>
+</dependencies>

package/Editor/UserProfileDependencies.xml.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 568f31781310144d090ade76c01986af
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Packages/AmaGDKConfig.unitypackage.meta

@@ -1,7 +1,6 @@
 fileFormatVersion: 2
 guid: 2e8554872955c4ea4b211224790453e9
 DefaultImporter:
-CHANGELOG.md.meta
   externalObjects: {}
   userData: 
   assetBundleName: 

package/Packages/{AmaPassport.ATTSupport.unitypackage.meta → RevenueCatAdapter_v5.1.3.unitypackage.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 47655d13b4207494f8a47aa050f85025
+guid: ec14a271afdcc4c72b0d1305fbd9db8c
 DefaultImporter:
   externalObjects: {}
   userData: 

package/Runtime/AmaGDK.IAP.cs

@@ -21,6 +21,8 @@ namespace Amanotes.Core
 
             public static ISetupBuilder GetProducts()
             {
+                IAPExtension.isCleanUpConfig = false;
+                dicProducts.Clear();
                 var result = new SetupContext();
                 ExecuteInNextFrame(result.GetProducts);
                 return result;
@@ -53,7 +55,7 @@ namespace Amanotes.Core
 
             public static List<string> GetActiveSubscriptions()
             {
-                return IAPAdapter?.GetActiveSubscriptions();
+                return Adapter?.GetActiveSubscriptions();
             }
 
             public static List<string> GetPurchasedProductIds()
@@ -66,17 +68,22 @@ namespace Amanotes.Core
                 var purchasedProductIds = GetPurchasedProductIds();
                 return purchasedProductIds != null && purchasedProductIds.Contains(productId);
             }
+
+            public static HashSet<PurchaseRecord> GetPurchaseHistory()
+            {
+                return Adapter?.GetPurchaseHistory();
+            }
         }
 
         public partial class IAP //Internal
         {
-            internal static IIAPAdapter adapter;
+            private static IIAPAdapter _adapter;
             internal static readonly IAPData localData = new IAPData().LoadJsonFromFile();
-            internal static IIAPAdapter IAPAdapter
+            internal static IIAPAdapter Adapter
             {
                 get
                 {
-                    if (adapter != null) return adapter;
+                    if (_adapter != null) return _adapter;
                     LogWarning("[IAP] Adapter is not available.");
                     return null;
                 }
@@ -97,11 +104,11 @@ namespace Amanotes.Core
 
             internal static void Init()
             {
-                adapter = Adapter.GetSingleAdapter<IIAPAdapter>();
-                var adapterContext = adapter as AdapterContext;
+                _adapter = Internal.Adapter.GetSingleAdapter<IIAPAdapter>();
+                var adapterContext = _adapter as AdapterContext;
                 
                 if (adapterContext == null) return;
-                _adapterConfig = adapterContext?.GetAdapterConfig<IAPAdapterConfig>();
+                _adapterConfig = adapterContext.GetAdapterConfig<IAPAdapterConfig>();
 
                 if (!adapterContext.IsReady) return;
                 localData.Sync();
@@ -131,8 +138,8 @@ namespace Amanotes.Core
 
                 public void Sync()
                 {
-                    activeSubscriptionId = adapter.GetActiveSubscriptionId();
-                    purchasedProducts = adapter.GetPurchasedProducts();
+                    activeSubscriptionId = Adapter?.GetActiveSubscriptionId();
+                    purchasedProducts = Adapter?.GetPurchasedProducts();
                     this.SaveJsonToFile();
                 }
             }
@@ -155,15 +162,18 @@ namespace Amanotes.Core
         [HideInInspector] public string description;
         [HideInInspector] public float price;
         [HideInInspector] public string currencyCode;
+        [HideInInspector] public string priceString;
+        [HideInInspector] public string introPriceString;
+        [HideInInspector] public string introPricePeriod;
+        [HideInInspector] public int introPricePeriodNumberOfUnits;
+        [HideInInspector] public string introPricePeriodUnit;
         [HideInInspector] public string[] discountIds;
     }
 
     public class PurchaseSuccess
     {
-        public string productId;
-        public string transactionId;
-        public string receipt;
-        public string purchaseToken;
+        public string[] productIds;
+        public bool isSandbox;
     }
 
     public class PurchaseError
@@ -182,16 +192,58 @@ namespace Amanotes.Core
         }
     }
 
+    public class PurchaseRecord
+    {
+        public string productId;
+        public DateTime purchaseDate;
+
+        public PurchaseRecord(string productId, DateTime purchaseDate)
+        {
+            this.productId = productId;
+            this.purchaseDate = purchaseDate;
+        }
+    }
+    
+    public class PurchaseRecordEqualityComparer : IEqualityComparer<PurchaseRecord>
+    {
+        public bool Equals(PurchaseRecord x, PurchaseRecord y)
+        {
+            if (ReferenceEquals(x, y)) return true;
+            if (ReferenceEquals(x, null) || ReferenceEquals(y, null)) return false;
+            return x.productId == y.productId &&
+                   x.purchaseDate == y.purchaseDate;
+        }
+
+        public int GetHashCode(PurchaseRecord obj)
+        {
+            unchecked
+            {
+                int hashCode = obj.productId != null ? obj.productId.GetHashCode() : 0;
+                hashCode = (hashCode * 397) ^ obj.purchaseDate.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
     public static class IAPExtension
     {
         //GetProducts extensions
+        internal static bool isCleanUpConfig;
+
+        internal static void ClearOldProductConfig()
+        {
+            if (isCleanUpConfig) return;
+            AdapterConfig?.products.Clear();
+            isCleanUpConfig = true;
+        }
+        
         public static ISetupBuilder SetSubscriptions(this ISetupBuilder sc, params string[] subs)
         {
             if (sc == null) return null;
-
+            ClearOldProductConfig();
             foreach (var pId in subs)
             {
-                AdapterConfig?.products.Add(new ProductInfo() { id = pId, type = ProductType.Subscription });
+                AdapterConfig?.products.Add(new ProductInfo { id = pId, type = ProductType.Subscription });
             }
             return sc;
         }
@@ -199,10 +251,10 @@ namespace Amanotes.Core
         public static ISetupBuilder SetConsumables(this ISetupBuilder sc, params string[] cons)
         {
             if (sc == null) return null;
-
+            ClearOldProductConfig();
             foreach (var pId in cons)
             {
-                AdapterConfig?.products.Add(new ProductInfo() { id = pId, type = ProductType.Consumable });
+                AdapterConfig?.products.Add(new ProductInfo { id = pId, type = ProductType.Consumable });
             }
             return sc;
         }
@@ -210,10 +262,10 @@ namespace Amanotes.Core
         public static ISetupBuilder SetNonComsumables(this ISetupBuilder sc, params string[] nons)
         {
             if (sc == null) return null;
-
+            ClearOldProductConfig();
             foreach (var pId in nons)
             {
-                AdapterConfig?.products.Add(new ProductInfo() { id = pId, type = ProductType.NonConsumable });
+                AdapterConfig?.products.Add(new ProductInfo { id = pId, type = ProductType.NonConsumable });
             }
             return sc;
         }
@@ -339,20 +391,19 @@ namespace Amanotes.Core.Internal
         {
             try
             {
-                IAPAdapter?.GetProducts(lsProduct.ToArray(), type, (pList) =>
+                AmaGDK.IAP.Adapter?.GetProducts(lsProduct.ToArray(), type, (pList) =>
                 {
                     foreach (var pI in pList)
                     {
                         dicProducts.Add(pI.id, pI);    
                     }
                     ExecuteInNextFrame(GetNextProductsInQueue);
-                });
+                }, error => onFail?.Invoke(error));
             }
             catch (Exception e)
             {
                 LogWarning($"[IAP] Error on getting products of type <{type}>. Error detail:\n{e.Message}");
                 onFail?.Invoke(e.Message);
-                throw;
             }
         }
     }
@@ -378,7 +429,8 @@ namespace Amanotes.Core.Internal
             {
                 DoOnSuccess(new PurchaseSuccess
                 {
-                    productId = productId
+                    productIds = new[] { productId },
+                    isSandbox = true
                 });
                 return;
             }
@@ -386,16 +438,16 @@ namespace Amanotes.Core.Internal
 
             if (!string.IsNullOrWhiteSpace(discountId))
             {
-                IAPAdapter?.PurchaseDiscount(productId, dicProducts[productId].type, discountId, DoOnSuccess, DoOnFail);
+                AmaGDK.IAP.Adapter?.PurchaseDiscount(productId, dicProducts[productId].type, discountId, DoOnSuccess, DoOnFail);
                 return;
             }
 
-            IAPAdapter?.Purchase(productId, dicProducts[productId].type, DoOnSuccess, DoOnFail);
+            AmaGDK.IAP.Adapter?.Purchase(productId, dicProducts[productId].type, DoOnSuccess, DoOnFail);
         }
 
         public void RestorePurchase()
         {
-            IAPAdapter?.RestorePurchase(DoOnSuccess, DoOnFail);
+            AmaGDK.IAP.Adapter?.RestorePurchase(DoOnSuccess, DoOnFail);
         }
 
         void DoOnSuccess(PurchaseSuccess success)
@@ -412,12 +464,13 @@ namespace Amanotes.Core.Internal
 
     public interface IIAPAdapter
     {
-        void GetProducts(string[] productIds, ProductType productType, Action<ProductInfo[]> onComplete);
-        void Purchase(string productId, ProductType productType, Action<PurchaseSuccess> onSuccess, Action<PurchaseError> onFail);
-        void PurchaseDiscount(string productId, ProductType productType, string discountId, Action<PurchaseSuccess> onSuccess, Action<PurchaseError> onFail);
-        void RestorePurchase(Action<PurchaseSuccess> onSuccess, Action<PurchaseError> onFail);
+        void GetProducts(string[] productIds, ProductType productType, Action<ProductInfo[]> onSuccess = null, Action<string> onFail = null);
+        void Purchase(string productId, ProductType productType, Action<PurchaseSuccess> onSuccess = null, Action<PurchaseError> onFail = null);
+        void PurchaseDiscount(string productId, ProductType productType, string discountId, Action<PurchaseSuccess> onSuccess = null, Action<PurchaseError> onFail = null);
+        void RestorePurchase(Action<PurchaseSuccess> onSuccess = null, Action<PurchaseError> onFail = null);
         List<string> GetActiveSubscriptions();
         List<string> GetPurchasedProducts();
         string GetActiveSubscriptionId();
+        HashSet<PurchaseRecord> GetPurchaseHistory();
     }
 }

package/Runtime/AmaGDK.UserProfile.cs

@@ -13,12 +13,12 @@ namespace Amanotes.Core
             private const string FILE_NAME = nameof(UserProfile);
             [NonSerialized] internal bool _dirty;
 
-            public void Save()
+            private void Save()
             {
                 GDKFileUtils.Save(FILE_NAME, JsonUtility.ToJson(this));
             }
 
-            public UserProfile Load()
+            internal UserProfile Load()
             {
                 string json = GDKFileUtils.Load(FILE_NAME);
                 if (string.IsNullOrEmpty(json)) return this;
@@ -33,5 +33,98 @@ namespace Amanotes.Core
                 this.SaveJsonToFile();
             }
         }
+        
+        public partial class UserProfile
+        {
+            public string GAId => gaid;
+            public string IDFA => idfa;
+            public string IDFV => idfv;
+            public string AndroidId => androidId;
+            public string AmaDeviceId => amaDeviceId;
+            public string AppsFlyerId => appsFlyerId;
+            
+            [SerializeField]
+            private string gaid;
+            [SerializeField]
+            private string idfa;
+            [SerializeField]
+            private string idfv;
+            [SerializeField]
+            private string androidId;
+            [SerializeField]
+            private string amaDeviceId;
+            [SerializeField] 
+            private string appsFlyerId;
+            
+            private const string AMA_DEVICE_ID_KEY = "ama_device_id";
+
+            internal void InitUserProfile()
+            {
+                if (!IsAmaDeviceIdExist()) GetAdvertisingId();
+            }
+            
+            private bool IsAmaDeviceIdExist()
+            {
+                if (!string.IsNullOrEmpty(amaDeviceId))
+                {
+                    Logging.Log($"AmaDeviceId is already exist: {amaDeviceId}");
+                    return true;
+                }
+                return false;
+            }
+            
+            private void SetAdvertisingID(string id)
+            {
+                switch (Application.platform)
+                {
+                    case RuntimePlatform.IPhonePlayer:
+                        idfa = id;
+                        idfv = SystemInfo.deviceUniqueIdentifier;
+                        break;
+                    case RuntimePlatform.Android:
+                        gaid = id;
+                        androidId = SystemInfo.deviceUniqueIdentifier;
+                        break;
+                    default:
+                        Logging.LogWarning($"Unsupported platform: {Application.platform}");
+                        break;
+                }
+            }
+            private void GetAdvertisingId()
+            {
+                AdvertisingIdFetcher.RequestAdvertisingId(advertisingId =>
+                {
+                    SetAdvertisingID(advertisingId);                
+                    switch (Application.platform)
+                    {
+                        case RuntimePlatform.IPhonePlayer:
+                            string v = KeyChain.GetKeyChain(AMA_DEVICE_ID_KEY);
+                            if (string.IsNullOrEmpty(v))
+                            {
+                                v = Guid.NewGuid().ToString();
+                                KeyChain.SetKeyChain(AMA_DEVICE_ID_KEY, v);
+                            }
+                            amaDeviceId = v;
+                            break;
+                
+                        case RuntimePlatform.Android:
+                            string _amaDeviceId = PlayerPrefs.GetString(AMA_DEVICE_ID_KEY);
+                            if (string.IsNullOrEmpty(amaDeviceId))
+                            {
+                                _amaDeviceId = SystemInfo.deviceUniqueIdentifier;
+                                PlayerPrefs.SetString(AMA_DEVICE_ID_KEY, amaDeviceId);
+                            }
+                            amaDeviceId = _amaDeviceId;
+                            break;
+            
+                        default:
+                            Logging.LogWarning($"Not support ama_device_id on: {Application.platform}");
+                            break;
+                    }
+                    Logging.Log($"Generate AmaDeviceId completed: {amaDeviceId}");
+                    User.Save();
+                });
+            }
+        }
     }
 }

package/Runtime/AmaGDK.cs

@@ -14,7 +14,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.14";
+        public const string VERSION = "0.2.18";
 
         internal static AmaGDK _instance;
         internal static Status _status = Status.None;
@@ -106,7 +106,7 @@ namespace Amanotes.Core
             }
 
             // Init modules (Adapter managers)
-            AmaPassport.Init();
+            User.InitUserProfile();
             Analytics.Init();
             Ads.Init();
             IAP.Init();

package/Runtime/UserProfile/Plugins/Android/AdvertisingIdCallback.java

@@ -0,0 +1,7 @@
+
+package com.miniit.android;
+
+public interface AdvertisingIdCallback
+{
+    public void onResult(String adid);
+}

package/Runtime/UserProfile/Plugins/Android/AdvertisingIdCallback.java.meta

@@ -0,0 +1,32 @@
+fileFormatVersion: 2
+guid: b20a41b7f3c814bbd905559d73f7d253
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/UserProfile/Plugins/Android/AdvertisingIdFetcher.cs

@@ -0,0 +1,57 @@
+using System;
+using UnityEngine;
+using static Amanotes.Core.Internal.Logging;
+
+namespace Amanotes.Core
+{
+    internal class AdvertisingIdFetcher
+    {
+        public static void RequestAdvertisingId(Action<string> callback)
+        {
+            new AdvertisingIdFetcher().DoRequestAdvertisingId(callback);
+        }
+
+        private Action<string> mCallback;
+
+        private void DoRequestAdvertisingId(Action<string> callback)
+        {
+            mCallback = callback;
+
+#if UNITY_EDITOR
+            OnAdvertisingIdReceived("0000-0000-0000-0000");
+#elif UNITY_ANDROID && UNITY_2020_1_OR_NEWER
+			var fetcher = new AndroidJavaObject("com.miniit.android.AdvertisingIdFetcher");
+			fetcher.Call("requestAdvertisingId", new AdvertisingIdPluginCallback(OnAdvertisingIdReceived));
+#else
+			Application.RequestAdvertisingIdentifierAsync(OnAdvertisingIdReceived);
+#endif
+        }
+
+        private void OnAdvertisingIdReceived(string advertisingId)
+        {
+            mCallback?.Invoke(advertisingId);
+        }
+
+        private void OnAdvertisingIdReceived(string advertisingId, bool trackingEnabled, string errorMsg)
+        {
+            mCallback?.Invoke(advertisingId);
+        }
+    }
+
+#if UNITY_ANDROID && UNITY_2020_1_OR_NEWER
+        public class AdvertisingIdPluginCallback : AndroidJavaProxy
+        {
+            private Action<string> mCallback;
+
+            public AdvertisingIdPluginCallback(Action<string> callback) : base("com.miniit.android.AdvertisingIdCallback")
+            {
+                mCallback = callback;
+            }
+
+            public void onResult(string adid)
+            {
+                mCallback?.Invoke(adid);
+            }
+        }
+#endif
+}

package/Runtime/UserProfile/Plugins/Android/AdvertisingIdFetcher.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c5087255689cb4759b97b4acc6948b43
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: