com.taptap.sdk.login 4.3.4 → 4.3.10-alpha.4

package/Mobile/Editor/NativeDependencies.xml

@@ -5,7 +5,7 @@
     <repositories>
       <repository>https://repo.maven.apache.org/maven2</repository>
     </repositories>
-    <androidPackage spec="com.taptap.sdk:tap-login-unity:4.3.4"/>
+    <androidPackage spec="com.taptap.sdk:tap-login-unity:4.3.10"/>
   </androidPackages>
 
   <!-- iOS Cocoapod dependencies can be specified by each iosPod element. -->
@@ -14,7 +14,7 @@
       <source>https://github.com/CocoaPods/Specs.git</source>
     </sources>
     <iosPod name="Kingfisher" version="~> 6.0" bitcodeEnabled="false" addToAllTargets="false"/>
-    <iosPod name="TapTapLoginSDK" version="~> 4.3.2" bitcodeEnabled="false" addToAllTargets="false"/>
+    <iosPod name="TapTapLoginSDK" version="~> 4.3.10" bitcodeEnabled="false" addToAllTargets="false"/>
   </iosPods>
 </dependencies>
 

package/Runtime/Internal/Init/LoginInitTask.cs

@@ -7,12 +7,12 @@ namespace TapSDK.Login.Internal.Init {
     public class LoginInitTask : IInitTask {
         public int Order => 11;
 
-        public void Init(TapTapSDKCoreOptions coreOption, TapTapSDKBaseOption[] otherOptions)
+        public void Init(TapTapSdkOptions coreOption, TapTapSdkBaseOptions[] otherOptions)
         {
             TapTapLoginManager.Instance.Init(coreOption.clientId, coreOption.region);
         }
 
-        public void Init(TapTapSDKCoreOptions coreOption)
+        public void Init(TapTapSdkOptions coreOption)
         {
             TapTapLoginManager.Instance.Init(coreOption.clientId, coreOption.region);
         }

package/Runtime/Public/TapTapLogin.cs

@@ -6,6 +6,9 @@ namespace TapSDK.Login
 {
     public class TapTapLogin
     {
+
+        public static readonly string Version = "4.3.10-alpha.4";
+
         public const string TAP_LOGIN_SCOPE_BASIC_INFO = "basic_info";
         public const string TAP_LOGIN_SCOPE_PUBLIC_PROFILE = "public_profile";
         public const string TAP_LOGIN_SCOPE_EMAIL = "email";

package/Runtime/Public/TapTapSdk.cs

@@ -9,7 +9,7 @@ namespace TapSDK.Login.Internal
     public static class TapTapSdk
     {
         // todo 
-        public const string Version = "1.2.0";
+        public const string Version = "4.3.10-alpha.4";
 
         public static string ClientId { get; private set; }
 

package/Standalone/Runtime/Internal/Tracker/TapLoginTracker.cs

@@ -0,0 +1,104 @@
+using System;
+using System.Collections.Generic;
+using Newtonsoft.Json;
+using TapSDK.Core.Standalone.Internal.Openlog;
+
+namespace TapSDK.Login.Standalone.Internal
+{
+    internal class TapLoginTracker
+    {
+
+        private const string ACTION_INIT = "init";
+        private const string ACTION_START = "start";
+        private const string ACTION_SUCCESS = "success";
+        private const string ACTION_FAIL = "fail";
+        private const string ACTION_CANCEL = "cancel";
+
+        private static TapLoginTracker instance;
+
+        private TapOpenlogStandalone openlog;
+
+        private TapLoginTracker()
+        {
+            openlog = new TapOpenlogStandalone("TapLogin", TapTapLogin.Version);
+        }
+
+        public static TapLoginTracker Instance
+        {
+            get
+            {
+                if (instance == null)
+                {
+                    instance = new TapLoginTracker();
+                }
+                return instance;
+            }
+        }
+
+        internal void TrackInit()
+        {
+            ReportLog(ACTION_INIT);
+        }
+
+        internal void TrackStart(string funcNace, string seesionId)
+        {
+            Dictionary<string, string> parameters = new Dictionary<string, string>
+            {
+                { "func_name", funcNace },
+                { "seesion_id", seesionId },
+            };
+            ReportLog(ACTION_START, new Dictionary<string, string>()
+            {
+                { "args", JsonConvert.SerializeObject(parameters) }
+            });
+        }
+
+        internal void TrackSuccess(string funcNace, string seesionId, string loginType)
+        {
+            Dictionary<string, string> parameters = new Dictionary<string, string>
+            {
+                { "func_name", funcNace },
+                { "seesion_id", seesionId },
+                { "login_type", loginType }
+            };
+            ReportLog(ACTION_SUCCESS, new Dictionary<string, string>()
+            {
+                { "args", JsonConvert.SerializeObject(parameters) }
+            });
+        }
+
+        internal void TrackCancel(string funcNace, string seesionId)
+        {
+            Dictionary<string, string> parameters = new Dictionary<string, string>
+            {
+                { "func_name", funcNace },
+                { "seesion_id", seesionId },
+            };
+            ReportLog(ACTION_CANCEL, new Dictionary<string, string>()
+            {
+                { "args", JsonConvert.SerializeObject(parameters) }
+            });
+        }
+
+        internal void TrackFailure(string funcNace, string seesionId, string loginType, int errorCode = -1, string errorMessage = null)
+        {
+            Dictionary<string, string> parameters = new Dictionary<string, string>
+            {
+                { "func_name", funcNace },
+                { "seesion_id", seesionId },
+                { "error_code", errorCode.ToString() },
+                { "error_msg", errorMessage },
+                { "login_type", loginType }
+            };
+            ReportLog(ACTION_FAIL, new Dictionary<string, string>()
+            {
+                { "args", JsonConvert.SerializeObject(parameters) }
+            });
+        }
+
+        private void ReportLog(string action, Dictionary<string, string> parameters = null)
+        {
+            openlog.LogBusiness(action, parameters);
+        }
+    }
+}

package/Standalone/Runtime/Internal/Tracker/TapLoginTracker.cs.meta

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

package/Standalone/Runtime/Internal/Tracker.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b2f7525f31d3a4d8ab6c1128fbdfa0e7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Standalone/Runtime/Internal2/AccountManager.cs

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 using TapSDK.Core;
+using TapSDK.Core.Standalone.Internal.Openlog;
 
 namespace TapSDK.Login.Internal
 {
@@ -10,7 +11,7 @@ namespace TapSDK.Login.Internal
         private static readonly string _accessToken = "taptapsdk_accesstoken";
         private static readonly string _profile = "taptapsdk_profile";
         private static readonly string _account = "taptapsdk_account";
-        
+
         private static AccountManager _instance;
 
         private AccountManager()
@@ -42,6 +43,7 @@ namespace TapSDK.Login.Internal
             set
             {
                 _tapAccount = value;
+                TapOpenlogStandalone.openid = value?.openId ?? "";
                 if (value == null)
                 {
                     DataStorage.SaveString(_account, null);
@@ -67,7 +69,7 @@ namespace TapSDK.Login.Internal
                 {
                     return;
                 }
-            
+
                 var profileStr = DataStorage.LoadString(_profile);
                 if (string.IsNullOrEmpty(profileStr))
                 {

package/Standalone/Runtime/Internal2/TapLoginStandaloneImpl.cs

@@ -6,6 +6,7 @@ using TapSDK.Core;
 using TapSDK.Core.Internal.Utils;
 using TapSDK.Login.Internal.Http;
 using TapSDK.Login.Standalone;
+using TapSDK.Login.Standalone.Internal;
 using UnityEngine;
 
 namespace TapSDK.Login.Internal
@@ -36,10 +37,14 @@ namespace TapSDK.Login.Internal
             TapTapSdk.SDKInitialize(clientId, regionType == TapTapRegionType.CN);
             AccountManager.Instance.Init();
             CheckAndRefreshToken();
+            TapLoginTracker.Instance.TrackInit();
         }
 
         public Task<TapTapAccount> Login(string[] scopes)
         {
+            string sessionId = Guid.NewGuid().ToString();
+            TapLoginTracker.Instance.TrackStart("loginWithScopes", sessionId);
+
             if (!scopes.Contains(TapTapLogin.TAP_LOGIN_SCOPE_PUBLIC_PROFILE))
             {
                 scopes = scopes.Append(TapTapLogin.TAP_LOGIN_SCOPE_PUBLIC_PROFILE).ToArray();
@@ -55,8 +60,9 @@ namespace TapSDK.Login.Internal
             LoginPanelController.OpenParams openParams = new LoginPanelController.OpenParams {
                 ClientId = TapTapSdk.ClientId,
                 Scopes = scopes,
-                OnAuth = async tokenData => {
+                OnAuth = async (tokenData, loginType) => {
                     if (tokenData == null) {
+                        TapLoginTracker.Instance.TrackFailure("loginWithScopes", sessionId, loginType, (int) TapErrorCode.ERROR_CODE_UNDEFINED, "UnKnow Error");
                         tcs.TrySetException(new TapException((int) TapErrorCode.ERROR_CODE_UNDEFINED, "UnKnow Error"));
                     } else {
                         // 将 TokenData 转化为 AccessToken
@@ -70,6 +76,7 @@ namespace TapSDK.Login.Internal
                         ProfileData profileData = await LoginService.GetProfile(TapTapSdk.ClientId, refreshToken);
                         if (profileData != null)
                         {
+                            TapLoginTracker.Instance.TrackSuccess("loginWithScopes", sessionId, loginType);
                             AccountManager.Instance.Account = new TapTapAccount(
                                 refreshToken, profileData.OpenId, profileData.UnionId, profileData.Name, profileData.Avatar,
                                 profileData.Email);
@@ -77,14 +84,17 @@ namespace TapSDK.Login.Internal
                         }
                         else
                         {
+                            TapLoginTracker.Instance.TrackFailure("loginWithScopes", sessionId, loginType, (int) TapErrorCode.ERROR_CODE_UNDEFINED, "UnKnow Error");
                             tcs.TrySetException(new TapException((int) TapErrorCode.ERROR_CODE_UNDEFINED, "UnKnow Error"));
                         }
                     }
                 },
-                OnError = e => {
+                OnError = (e, loginType) => {
+                    TapLoginTracker.Instance.TrackFailure("loginWithScopes", sessionId, loginType, e.Code, e.Message);
                     tcs.TrySetException(e);
                 },
                 OnClose = () => {
+                    TapLoginTracker.Instance.TrackCancel("loginWithScopes", sessionId);
                     tcs.TrySetCanceled();
                 }
             };
@@ -98,7 +108,7 @@ namespace TapSDK.Login.Internal
             LoginPanelController.OpenParams openParams = new LoginPanelController.OpenParams {
                 ClientId = TapTapSdk.ClientId,
                 Scopes = new HashSet<string>(scopes).ToArray(),
-                OnAuth = tokenData => {
+                OnAuth = (tokenData, loginType) => {
                     if (tokenData == null) {
                         tcs.TrySetException(new TapException((int) TapErrorCode.ERROR_CODE_UNDEFINED, "UnKnow Error"));
                     } else {
@@ -113,7 +123,7 @@ namespace TapSDK.Login.Internal
                         tcs.TrySetResult(accessToken);
                     }
                 },
-                OnError = e => {
+                OnError = (e, loginType) => {
                     tcs.TrySetException(e);
                 },
                 OnClose = () => {

package/Standalone/Runtime/Internal2/UI/LoginPanelController.cs

@@ -16,8 +16,8 @@ namespace TapSDK.Login.Internal {
             public Type Type { get; set; }
             public string ClientId { get; set; }
             public string[] Scopes { get; set; }
-            public Action<TokenData> OnAuth { get; set; }
-            public Action<TapException> OnError { get; set; }
+            public Action<TokenData, String> OnAuth { get; set; }
+            public Action<TapException, String> OnError { get; set; }
             public Action OnClose { get; set; }
         }
 
@@ -61,10 +61,10 @@ namespace TapSDK.Login.Internal {
             openParams.OnClose.Invoke();
         }
 
-        protected void OnAuth(TokenData tokenData) {
+        protected void OnAuth(TokenData tokenData, String loginType) {
             if (tokenData != null) {
                 OpenParams openParams = openParam as OpenParams;
-                openParams.OnAuth.Invoke(tokenData);
+                openParams.OnAuth.Invoke(tokenData, loginType);
                 Close();           
             }
         }

package/Standalone/Runtime/Internal2/UI/QRCodeController.cs

@@ -6,6 +6,7 @@ using TapSDK.Login.Internal.Http;
 using TapSDK.Core;
 using TapSDK.Core.Internal.Utils;
 using UnityEngine.EventSystems;
+using TapSDK.Core.Internal.Log;
 
 namespace TapSDK.Login.Internal {
     public class QRCodeController {
@@ -25,7 +26,7 @@ namespace TapSDK.Login.Internal {
         private readonly static string AUTH_DENIED = "access_denied";
         private readonly static string AUTH_SUCCESS = "";
 
-        private readonly Action<TokenData> onAuth;
+        private readonly Action<TokenData, String> onAuth;
 
         private readonly Text titleText;
         private readonly RawImage qrcodeImage;
@@ -41,7 +42,7 @@ namespace TapSDK.Login.Internal {
         private string clientId;
         private string[] scopes;
 
-        public QRCodeController(Transform transform, Action<TokenData> onAuth) {
+        public QRCodeController(Transform transform, Action<TokenData, String> onAuth) {
             this.onAuth = onAuth;
 
             titleText = transform.Find("Title").GetComponent<Text>();
@@ -113,7 +114,8 @@ namespace TapSDK.Login.Internal {
                 } else {
                     try {
                         TokenData tokenData = await LoginService.RequestScanQRCodeResult(clientId, qrcodeData.DeviceCode);
-                        onAuth.Invoke(tokenData);
+                        TapLog.Log("Login , QRCodeController Success");
+                        onAuth.Invoke(tokenData, "pc_code");
                         
                         return ;
                     } catch (TapException e) {
@@ -140,7 +142,7 @@ namespace TapSDK.Login.Internal {
 
         private void OnShowIOSDemoImage() {
             string url = DEMO_IMAGE_URL_IOS_ZH;
-            if (TapTapSDK.tapTapSDKCoreOptions != null && TapTapSDK.tapTapSDKCoreOptions.region == TapTapRegionType.Overseas) {
+            if (TapTapSDK.taptapSdkOptions != null && TapTapSDK.taptapSdkOptions.region == TapTapRegionType.Overseas) {
                 url = DEMO_IMAGE_URL_IOS_EN;
             }
             ShowDemoImage(url);
@@ -148,7 +150,7 @@ namespace TapSDK.Login.Internal {
 
         private void OnShowAndroidDemoImage() {
             string url = DEMO_IMAGE_URL_ANDROID_ZH;
-            if (TapTapSDK.tapTapSDKCoreOptions != null && TapTapSDK.tapTapSDKCoreOptions.region == TapTapRegionType.Overseas) {
+            if (TapTapSDK.taptapSdkOptions != null && TapTapSDK.taptapSdkOptions.region == TapTapRegionType.Overseas) {
                 url = DEMO_IMAGE_URL_ANDROID_EN;
             }
             ShowDemoImage(url);

package/Standalone/Runtime/Internal2/UI/WebController.cs

@@ -5,10 +5,11 @@ using UnityEngine.UI;
 using TapSDK.Login.Internal.Http;
 using System.Collections.Specialized;
 using TapSDK.Core.Internal.Utils;
+using TapSDK.Core.Internal.Log;
 
 namespace TapSDK.Login.Internal {
     public class WebController {
-        private readonly Action<TokenData> onAuth;
+        private readonly Action<TokenData, String> onAuth;
 
         private readonly Text titleText;
         private readonly Button jumpButton;
@@ -22,7 +23,7 @@ namespace TapSDK.Login.Internal {
 
         private bool isRunning;
 
-        public WebController(Transform transform, Action<TokenData> onAuth) {
+        public WebController(Transform transform, Action<TokenData, String> onAuth) {
             this.onAuth = onAuth;
 
             titleText = transform.Find("Title").GetComponent<Text>();
@@ -92,8 +93,8 @@ namespace TapSDK.Login.Internal {
                     }
 
                     TokenData tokenData = await LoginService.Authorize(clientId, code);
-
-                    onAuth.Invoke(tokenData);
+                    TapLog.Log("Login , WebController Success");
+                    onAuth.Invoke(tokenData, "pc_browser");
 
                     return;
                 } catch (Exception) {

package/package.json

@@ -2,10 +2,10 @@
   "name": "com.taptap.sdk.login",
   "displayName": "TapTapSDK Login",
   "description": "TapTapSDK Login",
-  "version": "4.3.4",
+  "version": "4.3.10-alpha.4",
   "unity": "2019.4",
   "license": "MIT",
   "dependencies": {
-    "com.taptap.sdk.core": "4.3.4"
+    "com.taptap.sdk.core": "4.3.10-alpha.4"
   }
 }