com.amanotes.gdk 0.1.19 → 0.1.21

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "com.amanotes.gdk",
-    "version": "0.1.19",
+    "version": "0.1.21",
     "displayName": "AmaGDK",
     "description": "Amanotes Game Development Kit",
     "unity": "2020.3",

package/Runtime/AmaPassport/AmaGDK.AmaPassport.cs

@@ -1,444 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using Amanotes.Core.Internal;
-using UnityEngine;
-using UnityEngine.Networking;
-using static Amanotes.Core.Internal.Logging;
-
-namespace Amanotes.Core.Internal
-{
-    [Serializable]
-    public class AmaPassportConfig
-    {
-        public string secretKey;
-        public bool enableAmaPassport;
-        public bool injectLocation;
-        public bool injectAdvertisingId;
-    }
-
-    public partial class ConfigAsset
-    {
-        public AmaPassportConfig amaPassport;
-    }
-}
-namespace Amanotes.Core
-{
-    public partial class AmaGDK //AmaPassport
-    {   
-        public partial class UserProfile
-        {
-            [SerializeField]
-            internal AmaPassportInfo amaPassport = new AmaPassportInfo();
-        }
-
-        [Serializable]
-        internal class AmaPassportInfo
-        {
-            [SerializeField] internal DeviceInfo device = new DeviceInfo();
-            [SerializeField] internal SocialInfo social = new SocialInfo();
-
-            public long expireTime;
-            public string accessToken = "";
-            public string refreshToken = "";
-
-            internal bool isTokenExpired()
-            {
-                if (DateTimeOffset.Now.ToUnixTimeMilliseconds() >= expireTime)
-                {
-                    accessToken = "";
-                    return true;
-                }
-                return false;
-            }
-        }
-
-
-        [Serializable]
-        internal class DeviceInfo
-        {
-            public string amaId = "";
-            public string amaDeviceId;
-
-            public string androidId;
-            public string deviceModel;
-            public string deviceName;
-            public int graphicsDeviceId;
-            public int graphicsDeviceVendorId;
-            public string operatingSystem;
-            public string processorType;
-            public int systemMemorySize;
-
-            public string firebaseUserPseudoId;
-            public string appsflyerId;
-            public string ironsourceId;
-
-            public string ipAddress;
-            public Location location = new Location();
-            public string country;
-            public string idfa;
-            public string gaid;
-            public string idfv;
-        }
-
-        [Serializable]
-        internal class Location
-        {
-            public string lat;
-            public string lon;
-        }
-
-        [Serializable]
-        internal class SocialInfo
-        {
-            public string socialToken;
-            public string socialPlatform;
-
-            internal bool hasLinkSocial
-            {
-                get { return !string.IsNullOrEmpty(socialPlatform); }
-            }
-        }
-
-        [Serializable]
-        internal class GeoDataRes
-        {
-            public string country;
-            public string lat;
-            public string lon;
-            public string query;
-        }
-
-        public partial class AmaPassport //Token
-        {
-            private const string API_URL = "https://passport.staging.amanotes.io/api/v3/";
-            private const string PASSPORT_URL = API_URL + "passport/";
-            private const string TOKEN_URL = API_URL + "token/";
-
-            private const string GET_AMA_ID_URL = PASSPORT_URL + "get-ama-id";
-            private const string SOCIAL_UNLINK_URL = PASSPORT_URL + "logout";
-            private const string INIT_URL = TOKEN_URL + "init";
-            private const string REFRESH_URL = TOKEN_URL + "refresh-token";
-            private const string AMA_DEVICE_ID_KEY = "ama_device_id";
-
-            [Serializable] class TokenData
-            {
-                public string expiresIn;
-                public string accessToken;
-                public string refreshToken;
-            }
-
-            [Serializable] class AmaIDData
-            {
-                public string amaId;
-                public string amaDeviceId;
-            }
-
-            static IEnumerator RequestTokenRoutine()
-            {
-                var appSecret = Config.amaPassport.secretKey;
-                var passport = User.amaPassport;
-                var isRefresh = !string.IsNullOrEmpty(passport.refreshToken);
-                
-                var request = new JsonWebRequest<TokenData>(
-                     isRefresh ? REFRESH_URL : INIT_URL,
-                    isRefresh   ? JsonUtils.KeyValueToJson("refreshToken", passport.refreshToken)
-                                : JsonUtils.KeyValueToJson("appSecret", appSecret)
-                );
-                
-                yield return _instance.StartCoroutine(request.Send());
-                
-                var data = request.data;
-                if (data == null){
-                    Debug.LogWarning("data should not be null!");
-                }
-
-                var expireTime = DateTimeOffset.Now.ToUnixTimeMilliseconds() + int.Parse(data.expiresIn);
-                Log("RequestTokenRoutine complete --> accessToken = " + data.accessToken);
-
-                // Update & save
-                passport.accessToken = data.accessToken;
-                passport.refreshToken = data.refreshToken;
-                passport.expireTime = expireTime;
-                User.Save();
-            }
-
-            static IEnumerator GetAmaIDRoutine()
-            {
-                var passport = User.amaPassport;
-                if (string.IsNullOrEmpty(passport.accessToken) || passport.isTokenExpired())
-                {
-                    yield return _instance.StartCoroutine(RequestTokenRoutine());
-                }
-
-                var requestData = new Dictionary<string, object>()
-                {
-                    {"amaId", passport.device.amaId},
-                    {"social", passport.social},
-                    {"ids", passport.device}
-                };
-
-                var request = new JsonWebRequest<AmaIDData>(
-                    GET_AMA_ID_URL,
-                    JsonUtils.DictionaryToJson(requestData),
-                    passport.accessToken
-                );
-
-                yield return _instance.StartCoroutine(request.Send());
-                var data = request.data;
-
-                Log("GetAmaIDRoutine complete --> amaId = " + data.amaId);
-                // Update & Save
-                passport.device.amaId = data.amaId;
-                OnGetAmaIdComplete?.Invoke(data.amaId);
-                User.Save();
-            }
-
-            static IEnumerator UnlinkSocialRoutine()
-            {
-                var amaPassport = User.amaPassport;
-                if (string.IsNullOrEmpty(amaPassport.accessToken) || amaPassport.isTokenExpired())
-                {
-                    yield return _instance.StartCoroutine(RequestTokenRoutine());
-                }
-
-                var social = amaPassport.social;
-                social.socialPlatform = string.Empty;
-                social.socialToken = string.Empty;
-
-                var request = new JsonWebRequest<AmaIDData>(
-                    SOCIAL_UNLINK_URL,
-                    JsonUtils.KeyValueToJson("ids", amaPassport.device),
-                    amaPassport.accessToken
-                );
-
-                yield return _instance.StartCoroutine(request.Send());
-                var data = request.data;
-
-                // Update & Save
-                Log("[Unlink] amaId: " + data.amaId);
-                amaPassport.device.amaId = data.amaId;
-                User.Save();
-            }
-            
-            // Internal static
-            private static void LinkSocialAccount(string platform, string token)
-            {
-                if (User.amaPassport.social.hasLinkSocial)
-                {
-                    LogWarning("Social has been linked");
-                    return;
-                }
-
-                if (string.IsNullOrEmpty(AmaId))
-                {
-                    OnGetAmaIdComplete += LinkSocialRequestAmaId;
-                    void LinkSocialRequestAmaId(string amaId)
-                    {
-                        OnGetAmaIdComplete -= LinkSocialRequestAmaId;
-                        if (string.IsNullOrEmpty(amaId))
-                        {
-                            LogWarning("Can not link social");
-                            return;
-                        }
-                        SendLinkSocial(platform, token);
-                    }
-                    RequestAmaID();
-                    return;
-                }
-
-                SendLinkSocial(platform, token);
-            }
-
-            private static void SendLinkSocial(string platform, string token)
-            {
-                SocialInfo social = User.amaPassport.social;
-                social.socialPlatform = platform;
-                social.socialToken = token;
-                _instance.StartCoroutine(GetAmaIDRoutine());
-            }
-
-            private static void DoRequestAmaID()
-            {
-                isInQueue = false;
-                _instance.StartCoroutine(GetAmaIDRoutine());
-            }
-        }
-
-        public partial class AmaPassport //Support
-        {
-
-            internal static void GetLocation(Action oncomplete)
-            {
-                _instance.StartCoroutine(GetIP(oncomplete));
-            }
-
-            private static IEnumerator GetIP(Action onComplete)
-            {
-                UnityWebRequest request = UnityWebRequest.Get("http://ip-api.com/json");
-                yield return request.SendWebRequest();
-                if (string.IsNullOrWhiteSpace(request.error))
-                {
-                    string json = request.downloadHandler.text.Trim();
-                    var geoData = JsonUtility.FromJson<GeoDataRes>(json);
-                    if (geoData == null)
-                    {
-                        onComplete?.Invoke();
-                        yield break;
-                    }
-                    DeviceInfo device = User.amaPassport.device;
-                    device.country = geoData.country;
-                    device.ipAddress = geoData.query;
-                    device.location = new Location() { lat = geoData.lat, lon = geoData.lon };
-                }
-                else
-                {
-                    LogWarning("Get location failed: " + request.error);
-                }
-                Log("Get GeoData completed");
-                onComplete?.Invoke();
-            }
-        }
-
-        public partial class AmaPassport // public APIs
-        {
-            static ActionQueue actionQueue;
-            public static Action<Action> GetAdvertisingIdHook;
-            public static Action<Action> GetLocationHook;
-            public static Action<Action> ATTHook;
-            public static Action<string> OnGetAmaIdComplete;
-            private static bool isInQueue = false;
-
-            public static string AmaId
-            {
-                get { return User.amaPassport.device.amaId; }
-            }
-
-            public static void LinkWithFacebook(string accessToken)
-            {
-                LinkSocialAccount("facebook", accessToken);
-            }
-
-            public static void LinkWithGoogle(string idToken)
-            {
-                LinkSocialAccount("google", idToken);
-            }
-
-            public static void LinkWithApple(string identityToken)
-            {
-                LinkSocialAccount("apple", identityToken);
-            }
-
-            public static void UnlinkSocialAccount()
-            {
-                if (!User.amaPassport.social.hasLinkSocial)
-                {
-                    LogWarning("Social has not linked");
-                    return;
-                }
-
-                if (string.IsNullOrEmpty(AmaId))
-                {
-                    LogWarning("No available AmaId to unlink");
-                    return;
-                }
-
-                _instance.StartCoroutine(UnlinkSocialRoutine());
-            }
-
-            public static void RequestAmaID()
-            {
-                var config = Config.amaPassport;
-                var device = User.amaPassport.device;
-
-                if (string.IsNullOrEmpty(config.secretKey))
-                {
-                    LogWarning($"Invalid secretKey: {config.secretKey}");
-                    return;
-                }
-
-                if (!config.enableAmaPassport)
-                {
-                    LogWarning("AmaPassport is disabled!");
-                    return;
-                }
-
-                if (!string.IsNullOrEmpty(device.amaId))
-                {
-                    Log($"AmaId is already exist: {device.amaId}");
-                    return;
-                }
-
-                GetDeviceInfo(DoRequestAmaID);
-            }
-
-            public static void DeletKeyChain()
-            {
-                KeyChain.DeleteKeyChain(AMA_DEVICE_ID_KEY);
-            }
-
-            static void GetDeviceInfo(Action getDeviceInfoComplete)
-            {
-                if (isInQueue)
-                {
-                    LogWarning("Request AmaId under process");
-                    return;
-                }
-                isInQueue = true;
-
-                var device = User.amaPassport.device;
-                device.androidId = SystemInfo.deviceUniqueIdentifier;
-                device.deviceModel = SystemInfo.deviceModel;
-                device.deviceName = SystemInfo.deviceName;
-                device.processorType = SystemInfo.processorType;
-                device.systemMemorySize = SystemInfo.systemMemorySize;
-                device.graphicsDeviceId = SystemInfo.graphicsDeviceID;
-                device.graphicsDeviceVendorId = SystemInfo.graphicsDeviceVendorID;
-                device.operatingSystem = SystemInfo.operatingSystem;
-
-                switch (Application.platform)
-                {
-                    case RuntimePlatform.IPhonePlayer:
-                        device.idfv = SystemInfo.deviceUniqueIdentifier;
-                        string v = KeyChain.GetKeyChain(AMA_DEVICE_ID_KEY);
-                        Debug.Log("AmaDeviceId 111: " + v);
-                        if (string.IsNullOrEmpty(v))
-                        {
-                            device.amaDeviceId = Guid.NewGuid().ToString();
-                            try
-                            {
-                                KeyChain.SetKeyChain(AMA_DEVICE_ID_KEY, device.amaDeviceId);
-                            }
-                            catch(Exception ex)
-                            {
-                                Debug.Log("AmaDeviceId Ex: " + ex);
-                            }
-                            Debug.Log("AmaDeviceId 222: " + device.amaDeviceId + ", " + KeyChain.GetKeyChain(AMA_DEVICE_ID_KEY));
-
-                        }
-                        else
-                        {
-                            device.amaDeviceId = v;
-                        }
-                        break;
-                    case RuntimePlatform.Android:
-                    default:
-                        device.androidId = SystemInfo.deviceUniqueIdentifier;
-                        if (string.IsNullOrEmpty(device.amaDeviceId))
-                        {
-                            device.amaDeviceId = Guid.NewGuid().ToString();
-                        }
-                        break;
-                }
-
-                var config = Config.amaPassport;
-                actionQueue = new ActionQueue(getDeviceInfoComplete);
-
-                actionQueue.EnqueueAction(ATTHook);
-                if (config.injectLocation) actionQueue.EnqueueAction(GetLocationHook ?? GetLocation);
-                if (config.injectAdvertisingId) actionQueue.EnqueueAction(GetAdvertisingIdHook ?? GetAdvertisingId);
-                actionQueue.StartQueue();
-            }
-        }
-    }
-}

package/Runtime/AmaPassport/AmaGDK.AmaPassport.cs.meta

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

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

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

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

@@ -1,32 +0,0 @@
-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/AmaPassport/Plugins/Android/AdvertisingIdFetcher.cs

@@ -1,96 +0,0 @@
-using System;
-using UnityEngine;
-using static Amanotes.Core.Internal.Logging;
-
-namespace Amanotes.Core
-{
-    public partial class AmaGDK //AmaPassport
-    {
-        public partial class AmaPassport //AdvertisingId
-        {
-            internal static void GetAdvertisingId(Action oncomplete)
-            {
-                AdvertisingIdFetcher.RequestAdvertisingId(advertisingId =>
-                {
-                    var device = User.amaPassport.device;
-                    switch (Application.platform)
-                    {
-                        case RuntimePlatform.IPhonePlayer:
-                            device.idfa = advertisingId;
-                            device.idfv = SystemInfo.deviceUniqueIdentifier;
-                            var v = KeyChain.GetKeyChain(AMA_DEVICE_ID_KEY);
-                            if (string.IsNullOrEmpty(v))
-                            {
-                                v = Guid.NewGuid().ToString();
-                                KeyChain.SetKeyChain(AMA_DEVICE_ID_KEY, v);
-                            }
-                            device.amaDeviceId = v;
-                            break;
-                        
-                        case RuntimePlatform.Android:
-                            device.gaid = advertisingId;
-                            device.androidId = SystemInfo.deviceUniqueIdentifier;
-                            break;
-                        
-                        default:
-                            LogWarning("Unsupported platform: " + Application.platform);
-                            break;
-                    }
-                    
-                    oncomplete?.Invoke();
-                });
-            }
-        }
-
-        private 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/AmaPassport/Plugins/Android/AdvertisingIdFetcher.cs.meta

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

package/Runtime/AmaPassport/Plugins/Android/AdvertisingIdFetcher.java

@@ -1,79 +0,0 @@
-
-package com.miniit.android;
-
-import com.unity3d.player.UnityPlayer;
-
-import android.content.Context;
-import android.os.AsyncTask;
-//import androidx.ads.identifier.AdvertisingIdClient;
-//import androidx.ads.identifier.AdvertisingIdInfo;
-import com.google.android.gms.ads.identifier.AdvertisingIdClient;
-import java.lang.Exception;
-
-public class AdvertisingIdFetcher
-{
-	private AdvertisingIdCallback callback;
-	
-	public void requestAdvertisingId(AdvertisingIdCallback callback)
-	{
-		if (callback == null)
-			return;
-		
-		Context context = UnityPlayer.currentActivity.getApplicationContext();
-		
-		// if (!AdvertisingIdClient.isAdvertisingIdProviderAvailable(context))
-		// {
-			// callback.onResult("");
-			// return;
-		// }
-
-		this.callback = callback;
-		
-		new GetAdIdTask(context).execute();
-	}
-	
-	private class GetAdIdTask extends AsyncTask<String, Integer, String>
-	{
-		private Context context;
-		
-		public GetAdIdTask(Context context)
-		{
-			super();
-			this.context = context;
-		}
-		
-		@Override
-		protected String doInBackground(String... strings)
-		{
-			// if (!AdvertisingIdClient.isAdvertisingIdProviderAvailable(context))
-				// return "";
-			
-			AdvertisingIdClient.Info adInfo;
-			adInfo = null;
-			try
-			{
-				adInfo = AdvertisingIdClient.getAdvertisingIdInfo(context);
-				if (adInfo.isLimitAdTrackingEnabled()) // check if user has opted out of tracking
-				{
-					return "";
-				}
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-			
-			if (adInfo != null)
-				return adInfo.getId();
-			
-			return "";
-		}
-
-		@Override
-		protected void onPostExecute(String adid)
-		{
-			if (callback != null)
-				callback.onResult(adid);
-		}
-	}
-}