com.taptap.sdk.login 4.3.8-alpha.2 → 4.3.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/Mobile/Editor/NativeDependencies.xml +3 -3
  2. package/Runtime/Internal/Init/LoginInitTask.cs +2 -2
  3. package/Runtime/Public/TapTapLogin.cs +1 -1
  4. package/Runtime/Public/TapTapSdk.cs +1 -1
  5. package/Standalone/Runtime/Internal/Tracker/TapLoginTracker.cs +7 -6
  6. package/Standalone/Runtime/Internal2/TapLoginStandaloneImpl.cs +8 -8
  7. package/Standalone/Runtime/Internal2/UI/LoginPanelController.cs +4 -4
  8. package/Standalone/Runtime/Internal2/UI/QRCodeController.cs +7 -5
  9. package/Standalone/Runtime/Internal2/UI/WebController.cs +5 -4
  10. package/package.json +2 -2
package/Mobile/Editor/NativeDependencies.xml CHANGED
@@ -5,16 +5,16 @@
5
5
  <repositories>
6
6
  <repository>https://repo.maven.apache.org/maven2</repository>
7
7
  </repositories>
8
- <androidPackage spec="com.taptap.sdk:tap-login-unity:4.3.8-alpha.11"/>
8
+ <androidPackage spec="com.taptap.sdk:tap-login-unity:4.3.10"/>
9
9
  </androidPackages>
10
10
 
11
11
  <!-- iOS Cocoapod dependencies can be specified by each iosPod element. -->
12
12
  <iosPods>
13
13
  <sources>
14
- <source>git@git.gametaptap.com:ios/international/TapSDK4-iOS-podspecs.git</source>
14
+ <source>https://github.com/CocoaPods/Specs.git</source>
15
15
  </sources>
16
16
  <iosPod name="Kingfisher" version="~> 6.0" bitcodeEnabled="false" addToAllTargets="false"/>
17
- <iosPod name="TapTapLoginSDK" version="~> 4.3.8-alpha.1" bitcodeEnabled="false" addToAllTargets="false"/>
17
+ <iosPod name="TapTapLoginSDK" version="~> 4.3.10" bitcodeEnabled="false" addToAllTargets="false"/>
18
18
  </iosPods>
19
19
  </dependencies>
20
20
 
package/Runtime/Internal/Init/LoginInitTask.cs CHANGED
@@ -7,12 +7,12 @@ namespace TapSDK.Login.Internal.Init {
7
7
  public class LoginInitTask : IInitTask {
8
8
  public int Order => 11;
9
9
 
10
- public void Init(TapTapSDKCoreOptions coreOption, TapTapSDKBaseOption[] otherOptions)
10
+ public void Init(TapTapSdkOptions coreOption, TapTapSdkBaseOptions[] otherOptions)
11
11
  {
12
12
  TapTapLoginManager.Instance.Init(coreOption.clientId, coreOption.region);
13
13
  }
14
14
 
15
- public void Init(TapTapSDKCoreOptions coreOption)
15
+ public void Init(TapTapSdkOptions coreOption)
16
16
  {
17
17
  TapTapLoginManager.Instance.Init(coreOption.clientId, coreOption.region);
18
18
  }
package/Runtime/Public/TapTapLogin.cs CHANGED
@@ -7,7 +7,7 @@ namespace TapSDK.Login
7
7
  public class TapTapLogin
8
8
  {
9
9
 
10
- public static readonly string Version = "4.3.4";
10
+ public static readonly string Version = "4.3.10";
11
11
 
12
12
  public const string TAP_LOGIN_SCOPE_BASIC_INFO = "basic_info";
13
13
  public const string TAP_LOGIN_SCOPE_PUBLIC_PROFILE = "public_profile";
package/Runtime/Public/TapTapSdk.cs CHANGED
@@ -9,7 +9,7 @@ namespace TapSDK.Login.Internal
9
9
  public static class TapTapSdk
10
10
  {
11
11
  // todo
12
- public const string Version = "1.2.0";
12
+ public const string Version = "4.3.10";
13
13
 
14
14
  public static string ClientId { get; private set; }
15
15
 
package/Standalone/Runtime/Internal/Tracker/TapLoginTracker.cs CHANGED
@@ -53,12 +53,13 @@ namespace TapSDK.Login.Standalone.Internal
53
53
  });
54
54
  }
55
55
 
56
- internal void TrackSuccess(string funcNace, string seesionId)
56
+ internal void TrackSuccess(string funcNace, string seesionId, string loginType)
57
57
  {
58
58
  Dictionary<string, string> parameters = new Dictionary<string, string>
59
59
  {
60
60
  { "func_name", funcNace },
61
- { "seesion_id", seesionId }
61
+ { "seesion_id", seesionId },
62
+ { "login_type", loginType }
62
63
  };
63
64
  ReportLog(ACTION_SUCCESS, new Dictionary<string, string>()
64
65
  {
@@ -78,15 +79,16 @@ namespace TapSDK.Login.Standalone.Internal
78
79
  { "args", JsonConvert.SerializeObject(parameters) }
79
80
  });
80
81
  }
81
-
82
- internal void TrackFailure(string funcNace, string seesionId, int errorCode = -1, string errorMessage = null)
82
+
83
+ internal void TrackFailure(string funcNace, string seesionId, string loginType, int errorCode = -1, string errorMessage = null)
83
84
  {
84
85
  Dictionary<string, string> parameters = new Dictionary<string, string>
85
86
  {
86
87
  { "func_name", funcNace },
87
88
  { "seesion_id", seesionId },
88
89
  { "error_code", errorCode.ToString() },
89
- { "error_msg", errorMessage }
90
+ { "error_msg", errorMessage },
91
+ { "login_type", loginType }
90
92
  };
91
93
  ReportLog(ACTION_FAIL, new Dictionary<string, string>()
92
94
  {
@@ -94,7 +96,6 @@ namespace TapSDK.Login.Standalone.Internal
94
96
  });
95
97
  }
96
98
 
97
-
98
99
  private void ReportLog(string action, Dictionary<string, string> parameters = null)
99
100
  {
100
101
  openlog.LogBusiness(action, parameters);
package/Standalone/Runtime/Internal2/TapLoginStandaloneImpl.cs CHANGED
@@ -60,9 +60,9 @@ namespace TapSDK.Login.Internal
60
60
  LoginPanelController.OpenParams openParams = new LoginPanelController.OpenParams {
61
61
  ClientId = TapTapSdk.ClientId,
62
62
  Scopes = scopes,
63
- OnAuth = async tokenData => {
63
+ OnAuth = async (tokenData, loginType) => {
64
64
  if (tokenData == null) {
65
- TapLoginTracker.Instance.TrackFailure("loginWithScopes", sessionId, (int) TapErrorCode.ERROR_CODE_UNDEFINED, "UnKnow Error");
65
+ TapLoginTracker.Instance.TrackFailure("loginWithScopes", sessionId, loginType, (int) TapErrorCode.ERROR_CODE_UNDEFINED, "UnKnow Error");
66
66
  tcs.TrySetException(new TapException((int) TapErrorCode.ERROR_CODE_UNDEFINED, "UnKnow Error"));
67
67
  } else {
68
68
  // 将 TokenData 转化为 AccessToken
@@ -76,7 +76,7 @@ namespace TapSDK.Login.Internal
76
76
  ProfileData profileData = await LoginService.GetProfile(TapTapSdk.ClientId, refreshToken);
77
77
  if (profileData != null)
78
78
  {
79
- TapLoginTracker.Instance.TrackSuccess("loginWithScopes", sessionId);
79
+ TapLoginTracker.Instance.TrackSuccess("loginWithScopes", sessionId, loginType);
80
80
  AccountManager.Instance.Account = new TapTapAccount(
81
81
  refreshToken, profileData.OpenId, profileData.UnionId, profileData.Name, profileData.Avatar,
82
82
  profileData.Email);
@@ -84,13 +84,13 @@ namespace TapSDK.Login.Internal
84
84
  }
85
85
  else
86
86
  {
87
- TapLoginTracker.Instance.TrackFailure("loginWithScopes", sessionId, (int) TapErrorCode.ERROR_CODE_UNDEFINED, "UnKnow Error");
87
+ TapLoginTracker.Instance.TrackFailure("loginWithScopes", sessionId, loginType, (int) TapErrorCode.ERROR_CODE_UNDEFINED, "UnKnow Error");
88
88
  tcs.TrySetException(new TapException((int) TapErrorCode.ERROR_CODE_UNDEFINED, "UnKnow Error"));
89
89
  }
90
90
  }
91
91
  },
92
- OnError = e => {
93
- TapLoginTracker.Instance.TrackFailure("loginWithScopes", sessionId, e.Code, e.Message);
92
+ OnError = (e, loginType) => {
93
+ TapLoginTracker.Instance.TrackFailure("loginWithScopes", sessionId, loginType, e.Code, e.Message);
94
94
  tcs.TrySetException(e);
95
95
  },
96
96
  OnClose = () => {
@@ -108,7 +108,7 @@ namespace TapSDK.Login.Internal
108
108
  LoginPanelController.OpenParams openParams = new LoginPanelController.OpenParams {
109
109
  ClientId = TapTapSdk.ClientId,
110
110
  Scopes = new HashSet<string>(scopes).ToArray(),
111
- OnAuth = tokenData => {
111
+ OnAuth = (tokenData, loginType) => {
112
112
  if (tokenData == null) {
113
113
  tcs.TrySetException(new TapException((int) TapErrorCode.ERROR_CODE_UNDEFINED, "UnKnow Error"));
114
114
  } else {
@@ -123,7 +123,7 @@ namespace TapSDK.Login.Internal
123
123
  tcs.TrySetResult(accessToken);
124
124
  }
125
125
  },
126
- OnError = e => {
126
+ OnError = (e, loginType) => {
127
127
  tcs.TrySetException(e);
128
128
  },
129
129
  OnClose = () => {
package/Standalone/Runtime/Internal2/UI/LoginPanelController.cs CHANGED
@@ -16,8 +16,8 @@ namespace TapSDK.Login.Internal {
16
16
  public Type Type { get; set; }
17
17
  public string ClientId { get; set; }
18
18
  public string[] Scopes { get; set; }
19
- public Action<TokenData> OnAuth { get; set; }
20
- public Action<TapException> OnError { get; set; }
19
+ public Action<TokenData, String> OnAuth { get; set; }
20
+ public Action<TapException, String> OnError { get; set; }
21
21
  public Action OnClose { get; set; }
22
22
  }
23
23
 
@@ -61,10 +61,10 @@ namespace TapSDK.Login.Internal {
61
61
  openParams.OnClose.Invoke();
62
62
  }
63
63
 
64
- protected void OnAuth(TokenData tokenData) {
64
+ protected void OnAuth(TokenData tokenData, String loginType) {
65
65
  if (tokenData != null) {
66
66
  OpenParams openParams = openParam as OpenParams;
67
- openParams.OnAuth.Invoke(tokenData);
67
+ openParams.OnAuth.Invoke(tokenData, loginType);
68
68
  Close();
69
69
  }
70
70
  }
package/Standalone/Runtime/Internal2/UI/QRCodeController.cs CHANGED
@@ -6,6 +6,7 @@ using TapSDK.Login.Internal.Http;
6
6
  using TapSDK.Core;
7
7
  using TapSDK.Core.Internal.Utils;
8
8
  using UnityEngine.EventSystems;
9
+ using TapSDK.Core.Internal.Log;
9
10
 
10
11
  namespace TapSDK.Login.Internal {
11
12
  public class QRCodeController {
@@ -25,7 +26,7 @@ namespace TapSDK.Login.Internal {
25
26
  private readonly static string AUTH_DENIED = "access_denied";
26
27
  private readonly static string AUTH_SUCCESS = "";
27
28
 
28
- private readonly Action<TokenData> onAuth;
29
+ private readonly Action<TokenData, String> onAuth;
29
30
 
30
31
  private readonly Text titleText;
31
32
  private readonly RawImage qrcodeImage;
@@ -41,7 +42,7 @@ namespace TapSDK.Login.Internal {
41
42
  private string clientId;
42
43
  private string[] scopes;
43
44
 
44
- public QRCodeController(Transform transform, Action<TokenData> onAuth) {
45
+ public QRCodeController(Transform transform, Action<TokenData, String> onAuth) {
45
46
  this.onAuth = onAuth;
46
47
 
47
48
  titleText = transform.Find("Title").GetComponent<Text>();
@@ -113,7 +114,8 @@ namespace TapSDK.Login.Internal {
113
114
  } else {
114
115
  try {
115
116
  TokenData tokenData = await LoginService.RequestScanQRCodeResult(clientId, qrcodeData.DeviceCode);
116
- onAuth.Invoke(tokenData);
117
+ TapLog.Log("Login , QRCodeController Success");
118
+ onAuth.Invoke(tokenData, "pc_code");
117
119
 
118
120
  return ;
119
121
  } catch (TapException e) {
@@ -140,7 +142,7 @@ namespace TapSDK.Login.Internal {
140
142
 
141
143
  private void OnShowIOSDemoImage() {
142
144
  string url = DEMO_IMAGE_URL_IOS_ZH;
143
- if (TapTapSDK.tapTapSDKCoreOptions != null && TapTapSDK.tapTapSDKCoreOptions.region == TapTapRegionType.Overseas) {
145
+ if (TapTapSDK.taptapSdkOptions != null && TapTapSDK.taptapSdkOptions.region == TapTapRegionType.Overseas) {
144
146
  url = DEMO_IMAGE_URL_IOS_EN;
145
147
  }
146
148
  ShowDemoImage(url);
@@ -148,7 +150,7 @@ namespace TapSDK.Login.Internal {
148
150
 
149
151
  private void OnShowAndroidDemoImage() {
150
152
  string url = DEMO_IMAGE_URL_ANDROID_ZH;
151
- if (TapTapSDK.tapTapSDKCoreOptions != null && TapTapSDK.tapTapSDKCoreOptions.region == TapTapRegionType.Overseas) {
153
+ if (TapTapSDK.taptapSdkOptions != null && TapTapSDK.taptapSdkOptions.region == TapTapRegionType.Overseas) {
152
154
  url = DEMO_IMAGE_URL_ANDROID_EN;
153
155
  }
154
156
  ShowDemoImage(url);
package/Standalone/Runtime/Internal2/UI/WebController.cs CHANGED
@@ -5,10 +5,11 @@ using UnityEngine.UI;
5
5
  using TapSDK.Login.Internal.Http;
6
6
  using System.Collections.Specialized;
7
7
  using TapSDK.Core.Internal.Utils;
8
+ using TapSDK.Core.Internal.Log;
8
9
 
9
10
  namespace TapSDK.Login.Internal {
10
11
  public class WebController {
11
- private readonly Action<TokenData> onAuth;
12
+ private readonly Action<TokenData, String> onAuth;
12
13
 
13
14
  private readonly Text titleText;
14
15
  private readonly Button jumpButton;
@@ -22,7 +23,7 @@ namespace TapSDK.Login.Internal {
22
23
 
23
24
  private bool isRunning;
24
25
 
25
- public WebController(Transform transform, Action<TokenData> onAuth) {
26
+ public WebController(Transform transform, Action<TokenData, String> onAuth) {
26
27
  this.onAuth = onAuth;
27
28
 
28
29
  titleText = transform.Find("Title").GetComponent<Text>();
@@ -92,8 +93,8 @@ namespace TapSDK.Login.Internal {
92
93
  }
93
94
 
94
95
  TokenData tokenData = await LoginService.Authorize(clientId, code);
95
-
96
- onAuth.Invoke(tokenData);
96
+ TapLog.Log("Login , WebController Success");
97
+ onAuth.Invoke(tokenData, "pc_browser");
97
98
 
98
99
  return;
99
100
  } catch (Exception) {
package/package.json CHANGED
@@ -2,10 +2,10 @@
2
2
  "name": "com.taptap.sdk.login",
3
3
  "displayName": "TapTapSDK Login",
4
4
  "description": "TapTapSDK Login",
5
- "version": "4.3.8-alpha.2",
5
+ "version": "4.3.10",
6
6
  "unity": "2019.4",
7
7
  "license": "MIT",
8
8
  "dependencies": {
9
- "com.taptap.sdk.core": "4.3.8-alpha.2"
9
+ "com.taptap.sdk.core": "4.3.10"
10
10
  }
11
11
  }