com.taptap.sdk.login 4.5.1-beta.2 → 4.5.2

package/Mobile/Editor/NativeDependencies.xml

@@ -4,13 +4,14 @@
     <repositories>
       <repository>https://repo.maven.apache.org/maven2</repository>
     </repositories>
-    <androidPackage spec="com.taptap.sdk:tap-login-unity:4.5.1-beta.1"/>
+    <androidPackage spec="com.taptap.sdk:tap-login-unity:4.5.2"/>
   </androidPackages>
   <iosPods>
     <sources>
       <source>https://github.com/CocoaPods/Specs.git</source>
     </sources>
     <iosPod name="Kingfisher" version="~> 6.0" bitcodeEnabled="false" addToAllTargets="false"/>
-    <iosPod name="TapTapLoginSDK" version="~> 4.5.0" bitcodeEnabled="false" addToAllTargets="false"/>
+    <iosPod name="TapTapLoginSDK" version="~> 4.5.2" bitcodeEnabled="false" addToAllTargets="false"/>
+    <iosPod name="TapTapGidSDK" version="~> 4.5.2" bitcodeEnabled="false" addToAllTargets="false"/>
   </iosPods>
 </dependencies>

package/Mobile/Runtime/TapTapLoginImpl.cs

@@ -17,16 +17,18 @@ namespace TapSDK.Login.Mobile
 
         private const string SERVICE_NAME = "BridgeLoginService";
         
+        public TapTapLoginImpl(){
+            EngineBridge.GetInstance().Register(
+                "com.taptap.sdk.login.unity.BridgeLoginService", 
+                "com.taptap.sdk.login.unity.BridgeLoginServiceImpl");
+        }
+
         public void Init(string clientId, TapTapRegionType regionType)
         {
             
             #if UNITY_IOS
             RegisterTapTapSDKLoginAppDelegateListener();
-            #endif
-
-            EngineBridge.GetInstance().Register(
-                "com.taptap.sdk.login.unity.BridgeLoginService", 
-                "com.taptap.sdk.login.unity.BridgeLoginServiceImpl");
+            #endif  
         }
 
         public Task<TapTapAccount> Login(string[] scopes)

package/Plugins/iOS/TapTapSDKLoginAppDelegate.mm

@@ -1,8 +1,9 @@
 
 #import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
+#import <TapTapBasicToolsSDK/TapTapSDKVerifyProtocol.h>
 #import <TapTapLoginSDK/TapTapLoginSDK-Swift.h>
 #import "UnityAppController.h"
-#import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #import "AppDelegateListener.h"
 

package/Runtime/Public/TapTapAccount.cs

@@ -16,7 +16,7 @@ namespace TapSDK.Login
         public string openId { get; }
         
         [JsonProperty("unionid")]
-        public string uniontId { get; }
+        public string unionId { get; }
         
         [JsonProperty("name")]
         [CanBeNull] public string name { get; }
@@ -31,17 +31,17 @@ namespace TapSDK.Login
         {
             accessToken = new AccessToken(SafeDictionary.GetValue<Dictionary<string, object>>(dict, "access_token"));
             openId = SafeDictionary.GetValue<string>(dict, "openid");
-            uniontId = SafeDictionary.GetValue<string>(dict, "unionid");
+            unionId = SafeDictionary.GetValue<string>(dict, "unionid");
             name = SafeDictionary.GetValue<string>(dict, "name");
             avatar = SafeDictionary.GetValue<string>(dict, "avatar");
             email = SafeDictionary.GetValue<string>(dict, "email");
         }
 
-        public TapTapAccount(AccessToken accessToken, string openId, string uniontId, string name, string avatar, string email)
+        public TapTapAccount(AccessToken accessToken, string openId, string unionId, string name, string avatar, string email)
         {
             this.accessToken = accessToken;
             this.openId = openId;
-            this.uniontId = uniontId;
+            this.unionId = unionId;
             this.name = name;
             this.avatar = avatar;
             this.email = email;
@@ -53,7 +53,7 @@ namespace TapSDK.Login
             {
                 ["access_token"] = accessToken.ToDict(),
                 ["openid"] = openId,
-                ["unionid"] = uniontId,
+                ["unionid"] = unionId,
                 ["name"] = name,
                 ["avatar"] = avatar,
                 ["email"] = email

package/Runtime/Public/TapTapLogin.cs

@@ -7,7 +7,7 @@ namespace TapSDK.Login
     public class TapTapLogin
     {
 
-        public static readonly string Version = "4.5.1-beta.2";
+        public static readonly string Version = "4.5.2";
 
         public const string TAP_LOGIN_SCOPE_BASIC_INFO = "basic_info";
         public const string TAP_LOGIN_SCOPE_PUBLIC_PROFILE = "public_profile";

package/Runtime/Public/TapTapSdk.cs

@@ -13,8 +13,6 @@ namespace TapSDK.Login.Internal
         public static Region CurrentRegion { get; private set; }
         
         public static void SDKInitialize(string clientId, bool isCn) {
-            if (string.IsNullOrEmpty(clientId))
-                throw new ArgumentException("[TapSDK] clientId is null or empty!");
             ClientId = clientId;
             CurrentRegion = isCn ? (Region)new RegionCN() : new RegionIO();
             TapLocalizeManager.SetCurrentRegion(isCn);

package/Standalone/Runtime/Internal2/TapLoginStandaloneImpl.cs

@@ -16,6 +16,9 @@ namespace TapSDK.Login.Internal
     {
         private static TapLoginStandaloneImpl instance;
 
+        // 当前是否正在登录中
+        private volatile bool IsLogging = false;
+
         private TapLoginStandaloneImpl()
         {
             
@@ -43,6 +46,13 @@ namespace TapSDK.Login.Internal
 
         public Task<TapTapAccount> Login(string[] scopes)
         {
+            // 正在登录时，返回登录异常
+            if(IsLogging){
+                var defaultTcs = new TaskCompletionSource<TapTapAccount>();
+                defaultTcs.TrySetException(new TapException((int) TapErrorCode.ERROR_CODE_LOGOUT_INVALID_LOGIN_STATE, "Currently logging in"));
+                return defaultTcs.Task;
+            }
+            IsLogging = true;
             string sessionId = Guid.NewGuid().ToString();
             TapLoginTracker.Instance.TrackStart("loginWithScopes", sessionId);
 
@@ -52,7 +62,7 @@ namespace TapSDK.Login.Internal
             }
             IComplianceProvider provider = BridgeUtils.CreateBridgeImplementation(typeof(IComplianceProvider),
                 "TapSDK.Compliance") as IComplianceProvider;
-            String complianceScope = provider?.GetAgeRangeScope();
+            string complianceScope = provider?.GetAgeRangeScope(TapTapSdk.CurrentRegion is RegionCN _);
             if (complianceScope != null)
             {
                 scopes = scopes.Append(complianceScope).ToArray();
@@ -64,6 +74,7 @@ namespace TapSDK.Login.Internal
                 OnAuth = async (tokenData, loginType) => {
                     if (tokenData == null) {
                         TapLoginTracker.Instance.TrackFailure("loginWithScopes", sessionId, loginType, (int) TapErrorCode.ERROR_CODE_UNDEFINED, "UnKnow Error");
+                        IsLogging = false;
                         tcs.TrySetException(new TapException((int) TapErrorCode.ERROR_CODE_UNDEFINED, "UnKnow Error"));
                     } else {
                         // 将 TokenData 转化为 AccessToken
@@ -81,21 +92,25 @@ namespace TapSDK.Login.Internal
                             AccountManager.Instance.Account = new TapTapAccount(
                                 refreshToken, profileData.OpenId, profileData.UnionId, profileData.Name, profileData.Avatar,
                                 profileData.Email);
+                            IsLogging = false;
                             tcs.TrySetResult(AccountManager.Instance.Account);
                         }
                         else
                         {
                             TapLoginTracker.Instance.TrackFailure("loginWithScopes", sessionId, loginType, (int) TapErrorCode.ERROR_CODE_UNDEFINED, "UnKnow Error");
+                            IsLogging = false;
                             tcs.TrySetException(new TapException((int) TapErrorCode.ERROR_CODE_UNDEFINED, "UnKnow Error"));
                         }
                     }
                 },
                 OnError = (e, loginType) => {
                     TapLoginTracker.Instance.TrackFailure("loginWithScopes", sessionId, loginType, e.Code, e.Message);
+                    IsLogging = false;
                     tcs.TrySetException(e);
                 },
                 OnClose = () => {
                     TapLoginTracker.Instance.TrackCancel("loginWithScopes", sessionId);
+                    IsLogging = false;
                     tcs.TrySetCanceled();
                 }
             };

package/Standalone/Runtime/Public/IComplianceProvider.cs

@@ -2,6 +2,6 @@ namespace TapSDK.Login.Standalone
 {
     public interface IComplianceProvider
     {
-        string GetAgeRangeScope();
+        string GetAgeRangeScope(bool isCN);
     }
 }

package/Standalone/Runtime/Public/TapTapLoginStandalone.cs

@@ -16,16 +16,29 @@ namespace TapSDK.Login.Standalone
 
         public Task<TapTapAccount> Login(string[] scopes)
         {
+             if(!TapCoreStandalone.CheckInitState()){
+                var defaultTcs = new TaskCompletionSource<TapTapAccount>();
+                defaultTcs.TrySetResult(null);
+                return defaultTcs.Task;
+            }
             return TapLoginStandaloneImpl.Instance.Login(scopes);
         }
 
         public void Logout()
         {
+            if(!TapCoreStandalone.CheckInitState()){
+                return;
+            }
             TapLoginStandaloneImpl.Instance.Logout();
         }
 
         public Task<TapTapAccount> GetCurrentAccount()
         {
+            if(!TapCoreStandalone.CheckInitState()){
+                var defaultTcs = new TaskCompletionSource<TapTapAccount>();
+                defaultTcs.TrySetResult(null);
+                return defaultTcs.Task;
+            }
             return TapLoginStandaloneImpl.Instance.GetCurrentAccount();
         }
     }

package/package.json

@@ -2,10 +2,10 @@
   "name": "com.taptap.sdk.login",
   "displayName": "TapTapSDK Login",
   "description": "TapTapSDK Login",
-  "version": "4.5.1-beta.2",
+  "version": "4.5.2",
   "unity": "2019.4",
   "license": "MIT",
   "dependencies": {
-    "com.taptap.sdk.core": "4.5.1-beta.2"
+    "com.taptap.sdk.core": "4.5.2"
   }
 }