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

package/Plugins/iOS/XDAccountSDK.framework/Headers/XDGAccountVersion.h

@@ -4,6 +4,6 @@
 //
 //  Created by Fattycat on 2023/4/14.
 //
-#define XDGAccount_VERSION @"7.1.2"
-#define XDSAccount_VERSION_CODE @"7001020"
-// HASH 5355bc04
+#define XDGAccount_VERSION @"7.2.0"
+#define XDSAccount_VERSION_CODE @"7020000"
+// HASH 8d15387e

package/Runtime/Internal/Mobile/AccountFeaturesImpl.cs

@@ -299,13 +299,12 @@ namespace XD.SDK.Account.Internal.Mobile
             try
             {
                 var result = await XDGEventBus.PublishAsync<Dictionary<string, object>>(XDGEvents.TdsSDKGetUser);
-                var objectId = XDDictionary.GetValue<string>(result, "objectId");
+                var objectId = XDDictionary.GetValue<string>(result.GetValueOrThrow(), "objectId");
                 if (objectId == user.UserId)
                 {
                     return;
                 }
 
-                //TODO 同步之前先退登 TDSUser
                 XDGEventBus.Publish(XDGEvents.TdsSDKLogout);
                 var response = await HttpClient.PostAsync<LoginSyncResponse>(LoginSynUrl);
                 var sessionToken = XDDictionary.GetValue<string>(response.Data, "sessionToken");
@@ -317,9 +316,9 @@ namespace XD.SDK.Account.Internal.Mobile
 
                 XDGEventBus.Publish(XDGEvents.TdsSDKSyncUser, sessionToken, user.UserId);
             }
-            catch (Exception e)
+            catch (XDGError e)
             {
-                XDGLogger.Warn($"[SyncTDSUser] error:{e.Message}", XDGLoggerTag.Bridge);
+                XDGLogger.Warn($"[SyncTDSUser] error:{e.ErrorMsg}", XDGLoggerTag.Bridge);
             }
         }
 

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());
             }
         }
 
@@ -148,7 +148,7 @@ namespace XD.SDK.Account.Internal.Standalone
                     };
                     var url = AuthConstants.CN_PERSONAL_INFO + UserModule.XDG_PERSONAL_INFO + "?" +
                               XDUrlUtils.ToQueryString(queries);
-                    
+
                     UIManager.ShowUI<XDWebViewAlert>("XDWebViewAlert", new Dictionary<string, object>
                     {
                         {
@@ -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,15 +239,16 @@ 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"),
                 // XDDictionary.GetValue<string>(complianceResult, "extras"));
-                if (XDDictionary.GetValue<bool>(complianceResult, "success"))
+                var compliance = complianceResult.GetValueOrDefault();
+                if (XDDictionary.GetValue<bool>(compliance, "success"))
                 {
                     await AgreementModule.SignAgreement(user.UserId);
+                    AliyunTrack.LoginSuccess();
                     return user;
                 }
 
@@ -269,7 +270,15 @@ namespace XD.SDK.Account.Internal.Standalone
             }
             catch (Exception e)
             {
-                AliyunTrack.LoginFail(e.Message);
+                if (e is XDGError error)
+                {
+                    AliyunTrack.LoginFail(error.ErrorMsg);
+                }
+                else
+                {
+                    AliyunTrack.LoginFail(e.Message);
+                }
+
                 AgreementModule.ClearLocalSignedAgreements();
                 throw;
             }
@@ -279,7 +288,7 @@ namespace XD.SDK.Account.Internal.Standalone
         {
             // SDK 登陆成功
             AliyunTrack.LoginLogout(logoutType);
-            
+
             ClearUserCache();
 
             XDGEventBus.Publish(XDGEvents.TdsSDKLogout);

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/Auth/TapAuth.cs

@@ -27,18 +27,11 @@ namespace XD.SDK.Account.Internal.Standalone
                     UIManager.ShowLoading(timeout: 3);
                 }
                 // 使用明确指定参数类型的反射调用
-                var permissions = ConfigModule.TapConfig.Permissions;
-                var authData = await XDGEventBus.PublishAsync<Dictionary<string, object>>(XDGEvents.TapSDKLogin, permissions);
-
-                // 检查返回结果是否为 null
-                if (authData == null)
-                {
-                    throw new XDGError(ResponseCode.Common.Failed, "TapTap 登录返回数据为空");
-                }
-
+                var permissions = ConfigModule.TapConfig?.Permissions;
+                var authDataResult = await XDGEventBus.PublishAsync<Dictionary<string, object>>(XDGEvents.TapSDKLogin, permissions);
+                var authData = authDataResult.GetValueOrThrow();
                 authData.Add("type", (int)LoginType.TapTap);
                 authData.Add("scope", string.Join(",", permissions?.ToArray()));
-                
                 if (ConfigModule.TapConfig != null && ConfigModule.UsingTapPC)
                 {
                     UIManager.DismissLoading();
@@ -60,11 +53,11 @@ namespace XD.SDK.Account.Internal.Standalone
             //         throw new XDGError(ResponseCode.Common.Failed, e.Message);
             //     }
             // }
-            catch (Exception e)
+            catch (XDGError e)
             {
-                AliyunTrack.LoginAuthorizeFail(e.Message);
-                XDGLogger.Warn($"Tap 登录失败：{e}", XDGLoggerTag.Account);
-                throw new XDGError(ResponseCode.Common.Failed, e.Message);
+                AliyunTrack.LoginAuthorizeFail(e.ErrorMsg);
+                XDGLogger.Warn($"Tap 登录失败：{e.ErrorMsg}",XDGLoggerTag.Common);
+                throw new XDGError(ResponseCode.Common.Failed, e.ErrorMsg);
             }
         }
     }

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

@@ -431,7 +431,8 @@ namespace XD.SDK.Account.Internal.Standalone
 
         private static Dictionary<string, string> GetLoginModuleCommonProperties(string eventName, string userLoginTypeString = "")
         {
-            var current = XDGEventBus.Publish<XDGUser>(XDGEvents.AccountGetCurrentUser)?.UserId;
+            var result = XDGEventBus.Publish<XDGUser>(XDGEvents.AccountGetCurrentUser);
+            var current = result.GetValueOrDefault()?.UserId;
             var content = new Dictionary<string, string>();
             content["tag"] = "sdklogin";
             content["event_session_id"] = LoginEventSessionId;
@@ -439,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
                 {
@@ -205,18 +205,18 @@ namespace XD.SDK.Account.Internal.Standalone
                 {
                     try
                     {
-                        var token = await XDGEventBus.PublishAsync<Dictionary<string, object>>(XDGEvents.TapSDKGetAccessToken);
-
+                        var tokenResult = await XDGEventBus.PublishAsync<Dictionary<string, object>>(XDGEvents.TapSDKGetAccessToken);
+                        var token = tokenResult.GetValueOrThrow();
                         if (token == null || !token.ContainsKey("token"))
                         {
                             XDGLogger.Warn("Third token expired.", XDGLoggerTag.Account);
                             throw new XDGError(ResponseCode.Account.TokenExpired, "Third token expired.");
                         }
                     }
-                    catch (Exception e)
+                    catch (XDGError e)
                     {
-                        XDGLogger.Warn(e.Message, XDGLoggerTag.Account);
-                        throw new XDGError(ResponseCode.Common.Failed, e.Message);
+                        XDGLogger.Warn(e.ErrorMsg, XDGLoggerTag.Account);
+                        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.1.2",
+  "version": "7.2.1-alpha",
   "description": "XDGSDK",
   "unity": "2019.3",
   "license": "MIT",
   "dependencies": {
-    "com.xd.sdk.common": "7.1.2"
+    "com.xd.sdk.common": "7.2.1-alpha"
   }
 }