com.taptap.sdk.login 4.5.1 → 4.5.3

package/Mobile/Editor/NativeDependencies.xml

@@ -4,14 +4,13 @@
     <repositories>
       <repository>https://repo.maven.apache.org/maven2</repository>
     </repositories>
-    <androidPackage spec="com.taptap.sdk:tap-login-unity:4.5.1"/>
+    <androidPackage spec="com.taptap.sdk:tap-login-unity:4.5.3"/>
   </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.1" bitcodeEnabled="false" addToAllTargets="false"/>
-    <iosPod name="TapTapGidSDK" version="~> 4.5.1" bitcodeEnabled="false" addToAllTargets="false"/>
+    <iosPod name="TapTapLoginSDK" version="~> 4.5.3" bitcodeEnabled="false" addToAllTargets="false"/>
+    <iosPod name="TapTapGidSDK" version="~> 4.5.3" bitcodeEnabled="false" addToAllTargets="false"/>
   </iosPods>
 </dependencies>

package/Runtime/Public/TapTapLogin.cs

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

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
@@ -74,28 +85,38 @@ namespace TapSDK.Login.Internal
                             macAlgorithm = tokenData.MacAlgorithm,
                             scopeSet = tokenData.Scopes
                         };
-                        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);
-                            tcs.TrySetResult(AccountManager.Instance.Account);
-                        }
-                        else
-                        {
+                        try{
+                            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);
+                                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"));
+                            }
+                        } catch(Exception e) {
                             TapLoginTracker.Instance.TrackFailure("loginWithScopes", sessionId, loginType, (int) TapErrorCode.ERROR_CODE_UNDEFINED, "UnKnow Error");
-                            tcs.TrySetException(new TapException((int) TapErrorCode.ERROR_CODE_UNDEFINED, "UnKnow Error"));
+                            IsLogging = false;
+                            tcs.TrySetException(new TapException((int) TapErrorCode.ERROR_CODE_UNDEFINED, "UnKnow Error " + e.Message));
                         }
                     }
                 },
                 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/link.xml.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 233dc61db84f84cceb309285fc5087b5
+guid: 6402d7e8f43c843439a34fde4f6a5dbd
 TextScriptImporter:
   externalObjects: {}
   userData: 

package/package.json

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