com.xd.sdk.account 7.2.0 → 7.2.1-alpha

package/Runtime/Internal/Standalone/AccountFeaturesImpl.cs

@@ -66,11 +66,11 @@ namespace XD.SDK.Account.Internal.Standalone
             }
             catch (XDGError xe)
             {
-                errorCallback?.Invoke(xe);
+                errorCallback?.Invoke(xe.ParseToError());
             }
             catch (Exception e)
             {
-                errorCallback?.Invoke(new XDGError(ResponseCode.Common.Failed, e.Message));
+                errorCallback?.Invoke(e.ParseToError());
             }
         }
 
@@ -207,7 +207,7 @@ namespace XD.SDK.Account.Internal.Standalone
             }
             catch (XDGError e)
             {
-                callback?.Invoke(false, new XDGError(ResponseCode.Common.Failed, e.ErrorMsg));
+                callback?.Invoke(false, e.ParseToError());
             }
         }
 
@@ -239,8 +239,7 @@ namespace XD.SDK.Account.Internal.Standalone
             {
                 var user = await UserModule.Login(loginType);
                 AliyunTrack.LoginAntiAddictionStartup();
-                var complianceResult =
-                    await XDGEventBus.PublishAsync<Dictionary<string, object>>(XDGEvents.TapSDKComplianceStartup, ConfigModule.IsGlobal, user.UserId);
+                var complianceResult = await XDGEventBus.PublishAsync<Dictionary<string, object>>(XDGEvents.TapSDKComplianceStartup, ConfigModule.IsGlobal, user.UserId);
                 // TODO 统一走回调进行埋点
                 // AliyunTrack.LoginAntiAddictionResult(XDDictionary.GetValue(complianceResult, "code", -100),
                 // XDDictionary.GetValue<string>(complianceResult, "reason"),
@@ -249,6 +248,7 @@ namespace XD.SDK.Account.Internal.Standalone
                 if (XDDictionary.GetValue<bool>(compliance, "success"))
                 {
                     await AgreementModule.SignAgreement(user.UserId);
+                    AliyunTrack.LoginSuccess();
                     return user;
                 }
 

package/Runtime/Internal/Standalone/Auth/SteamAuth.cs

@@ -14,7 +14,7 @@ namespace XD.SDK.Account.Internal.Standalone
 
         internal static async Task<Dictionary<string, object>> GetAuthData()
         {
-            if (SteamUtils.IsSDKSupported)
+            if (SteamWrapper.Initialized())
             {
                 // 先尝试从 Steam SDK 中获取 auth data
                 Dictionary<string, object> authData = await GetAuthDataFromSDK();
@@ -38,7 +38,7 @@ namespace XD.SDK.Account.Internal.Standalone
             AliyunTrack.LoginAuthorize();
             try
             {
-                string ticket = await SteamUtils.Instance.GetAuthTicket();
+                string ticket = await SteamWrapper.Instance.GetAuthTicket();
                 if (string.IsNullOrWhiteSpace(ticket))
                 {
                     // 登陆授权失败
@@ -70,12 +70,12 @@ namespace XD.SDK.Account.Internal.Standalone
 
         public static string GetSteamIdFromSDK()
         {
-            return SteamUtils.Instance.GetSteamId();
+            return SteamWrapper.Instance.GetSteamId();
         }
 
         public static Dictionary<string, object> GetCacheData()
         {
-            if (!SteamUtils.IsSDKSupported)
+            if (!SteamWrapper.Initialized())
             {
                 return null;
             }

package/Runtime/Internal/Standalone/Track/AliyunTrack.Login.cs

@@ -440,12 +440,10 @@ namespace XD.SDK.Account.Internal.Standalone
             content["user_login_type"] = string.IsNullOrEmpty(current) ? "" : userLoginTypeString;
             content["logid"] = CommonTrack.GetLogId(LoginEventSessionId, eventName);
             content["isLoginModule"] = "true";
-#if XD_STEAM_SUPPORT
-            if (SteamUtils.IsSDKSupported)
+            if (SteamWrapper.Initialized())
             {
                 content["console_type"] = "steam";
             }
-#endif
 
             if (isPhoneLogin)
             {

package/Runtime/Internal/Standalone/UserModule.cs

@@ -124,7 +124,7 @@ namespace XD.SDK.Account.Internal.Standalone
                 if (XDGCommonInternal.IsCn())
                 {
                     XDGLogger.Warn("暂不支持的登录方式", XDGLoggerTag.Account);
-                    throw new XDGError(ResponseCode.Common.UnavailableService, "暂不支持的登录方式");
+                    throw new XDGError(ResponseCode.Account.TypeNotAvailable, "Email auth is not support in CN");
                 }
                 else
                 {
@@ -158,7 +158,7 @@ namespace XD.SDK.Account.Internal.Standalone
                 if (XDGCommonInternal.IsCn())
                 {
                     XDGLogger.Warn($"暂不支持的登录方式:{LoginType.Email}", XDGLoggerTag.Account);
-                    throw new XDGError(ResponseCode.Common.UnavailableService, "暂不支持的登录方式");
+                    throw new XDGError(ResponseCode.Common.UnavailableService, "Email auth is not support in CN");
                 }
                 else
                 {
@@ -216,7 +216,7 @@ namespace XD.SDK.Account.Internal.Standalone
                     catch (XDGError e)
                     {
                         XDGLogger.Warn(e.ErrorMsg, XDGLoggerTag.Account);
-                        throw new XDGError(ResponseCode.Common.Failed, e.ErrorMsg);
+                        throw;
                     }
                 }
 
@@ -228,7 +228,7 @@ namespace XD.SDK.Account.Internal.Standalone
                 {
                     if (e.HttpStatusCode == 401 || e.Code == 40311 || e.Code == 40312)
                     {
-                        throw e;
+                        throw;
                     }
                 }
                 catch (Exception e)
@@ -356,7 +356,7 @@ namespace XD.SDK.Account.Internal.Standalone
         public static async Task<XDGUser> LoginByConsole()
         {
             // 判断当前有接入哪个主机 SDK
-            if (SteamUtils.IsSDKSupported)
+            if (SteamWrapper.Initialized())
             {
                 try
                 {
@@ -444,7 +444,7 @@ namespace XD.SDK.Account.Internal.Standalone
                 case LoginType.Facebook:
                     return await FacebookAuth.GetAuthData();
                 default:
-                    return new Dictionary<string, object>();
+                    throw new XDGError(ResponseCode.Account.TypeNotAvailable, "暂不支持的登录方式");
             }
         }
 

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "com.xd.sdk.account",
   "displayName": "XDGSDK Account",
-  "version": "7.2.0",
+  "version": "7.2.1-alpha",
   "description": "XDGSDK",
   "unity": "2019.3",
   "license": "MIT",
   "dependencies": {
-    "com.xd.sdk.common": "7.2.0"
+    "com.xd.sdk.common": "7.2.1-alpha"
   }
 }