com.taptap.sdk.login 4.3.12 → 4.4.0

package/Mobile/Editor/NativeDependencies.xml

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

package/Mobile/Editor/TapLoginMobileProcessBuild.cs

@@ -6,7 +6,7 @@ namespace TapSDK.Login.Mobile.Editor {
     public class TapLoginMobileProcessBuild : SDKLinkProcessBuild {
         public override int callbackOrder => 0;
 
-        public override string LinkPath => "TapTap/Login/link.xml";
+        public override string LinkPath => "TapSDK/Login/link.xml";
 
         public override LinkedAssembly[] LinkedAssemblies => new LinkedAssembly[] {
                     new LinkedAssembly { Fullname = "TapSDK.Login.Runtime" },

package/Runtime/Public/TapTapLogin.cs

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

package/Standalone/Runtime/Internal2/LoginService.cs

@@ -5,14 +5,18 @@ using System.Security.Cryptography;
 using System.Text;
 using UnityEngine;
 using TapSDK.Login.Internal.Http;
+using TapSDK.Core.Standalone.Internal.Service;
 
-namespace TapSDK.Login.Internal {
-    public static class LoginService {
+namespace TapSDK.Login.Internal
+{
+    public static class LoginService
+    {
         private static readonly LoginHttpClient httpClient = new LoginHttpClient();
 
         public static LoginHttpClient HttpClient => httpClient;
 
-        public static async Task<QRCodeData> GetQRCodeUrl(string clientId, string[] scopes) {
+        public static async Task<QRCodeData> GetQRCodeUrl(string clientId, string[] scopes)
+        {
             Dictionary<string, object> data = new Dictionary<string, object> {
                 { "client_id", clientId },
                 { "response_type", "device_code" },
@@ -21,12 +25,13 @@ namespace TapSDK.Login.Internal {
                 { "platform", "unity" },
                 { "info", "{\"device_id\":\"" + SystemInfo.deviceModel + "\"}" }
             };
-            QRCodeResponse response = await httpClient.Post<QRCodeResponse>(TapTapSdk.CurrentRegion.CodeUrl(), 
+            QRCodeResponse response = await httpClient.Post<QRCodeResponse>(TapTapSdk.CurrentRegion.CodeUrl(),
                 data: data);
             return response.Data;
         }
 
-        public static async Task<TokenData> Authorize(string clientId, string code) {
+        public static async Task<TokenData> Authorize(string clientId, string code)
+        {
             Dictionary<string, string> data = new Dictionary<string, string> {
                 { "client_id", clientId },
                 { "grant_type", "authorization_code" },
@@ -35,12 +40,13 @@ namespace TapSDK.Login.Internal {
                 { "redirect_uri", WebLoginRequestManager.Instance.GetCurrentRequest().GetRedirectUri() },
                 { "code_verifier", WebLoginRequestManager.Instance.GetCodeVerifier() }
             };
-            TokenResponse response = await httpClient.Post<TokenResponse>(TapTapSdk.CurrentRegion.TokenUrl(), 
+            TokenResponse response = await httpClient.Post<TokenResponse>(TapTapSdk.CurrentRegion.TokenUrl(),
                 data: data);
             return response.Data;
         }
 
-        public static async Task<TokenData> RequestScanQRCodeResult(string clientId, string deviceCode) {
+        public static async Task<TokenData> RequestScanQRCodeResult(string clientId, string deviceCode)
+        {
             Dictionary<string, string> data = new Dictionary<string, string> {
                 { "grant_type", "device_token" },
                 { "client_id", clientId },
@@ -50,16 +56,18 @@ namespace TapSDK.Login.Internal {
                 { "platform", "unity" },
                 { "info", "{\"device_id\":\"" + SystemInfo.deviceModel + "\"}" }
             };
-            TokenResponse response = await httpClient.Post<TokenResponse>(TapTapSdk.CurrentRegion.TokenUrl(), 
+            TokenResponse response = await httpClient.Post<TokenResponse>(TapTapSdk.CurrentRegion.TokenUrl(),
                 data: data);
             return response.Data;
         }
 
-        public static async Task<ProfileData> GetProfile(string clientId, AccessToken token, int timestamp = 0) {
+        public static async Task<ProfileData> GetProfile(string clientId, AccessToken token, int timestamp = 0)
+        {
             string url = TapTapSdk.CurrentRegion.ProfileUrl(token.scopeSet.Contains(TapTapLogin.TAP_LOGIN_SCOPE_PUBLIC_PROFILE)) + clientId;
             var uri = new Uri(url);
             var ts = timestamp;
-            if (ts == 0) {
+            if (ts == 0)
+            {
                 var dt = DateTime.UtcNow - new DateTime(1970, 1, 1);
                 ts = (int)dt.TotalSeconds;
             }
@@ -76,7 +84,7 @@ namespace TapSDK.Login.Internal {
             ProfileResponse response = await httpClient.Get<ProfileResponse>(url, headers: headers);
             return response.Data;
         }
-        
+
         public static string GetAuthorizationHeader(string kid,
             string macKey,
             string macAlgorithm,
@@ -84,13 +92,15 @@ namespace TapSDK.Login.Internal {
             string uri,
             string host,
             string port,
-            int timestamp) {
+            int timestamp)
+        {
             var nonce = new System.Random().Next().ToString();
 
             var normalizedString = $"{timestamp}\n{nonce}\n{method}\n{uri}\n{host}\n{port}\n\n";
 
             HashAlgorithm hashGenerator;
-            switch (macAlgorithm) {
+            switch (macAlgorithm)
+            {
                 case "hmac-sha-256":
                     hashGenerator = new HMACSHA256(Encoding.ASCII.GetBytes(macKey));
                     break;
@@ -110,7 +120,8 @@ namespace TapSDK.Login.Internal {
             return authorizationHeader.ToString();
         }
 
-        public static async Task<TokenData> RefreshToken(string clientId, string accessToken) {
+        public static async Task<TokenData> RefreshToken(string clientId, string accessToken)
+        {
             Dictionary<string, object> data = new Dictionary<string, object> {
                 { "client_id", clientId },
                 { "grant_type", "refresh_token" },
@@ -119,7 +130,7 @@ namespace TapSDK.Login.Internal {
                 { "platform", "unity" },
                 { "info", "{\"device_id\":\"" + SystemInfo.deviceModel + "\"}" }
             };
-            TokenResponse response = await httpClient.Post<TokenResponse>(TapTapSdk.CurrentRegion.TokenUrl(), 
+            TokenResponse response = await httpClient.Post<TokenResponse>(TapTapSdk.CurrentRegion.TokenUrl(),
                 data: data);
             return response.Data;
         }

package/Standalone/Runtime/Internal2/TapLoginService.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Threading.Tasks;
+using TapSDK.Core.Internal.Log;
+using TapSDK.Core.Standalone.Internal.Service;
+using TapSDK.Login.Internal;
+
+namespace TapSDK.Login.Standalone.Internal
+{
+    internal class TapLoginService : ITapLoginService
+    {
+        public string ObtainAuthorizationAsync(string url, string method)
+        {
+            TapTapAccount tapAccount = AccountManager.Instance.Account;
+            if (tapAccount == null)
+            {
+                return null;
+            }
+            AccessToken token = tapAccount.accessToken;
+            if (token == null)
+            {
+                return null;
+            }
+            var dt = DateTime.UtcNow - new DateTime(1970, 1, 1);
+            var ts = (int)dt.TotalSeconds;
+            string port = "443";
+            if (url.StartsWith("http://"))
+            {
+                port = "80";
+            }
+            UriBuilder uri = new UriBuilder(url);
+            string host = uri.Host;
+            string pathAndQuery = url.Substring(url.LastIndexOf(host) + host.Length);
+            var sign = "MAC " + LoginService.GetAuthorizationHeader(
+                token.kid,
+                token.macKey,
+                token.macAlgorithm,
+                method,
+                pathAndQuery,
+                host,
+                port,
+                ts);
+            return sign;
+        }
+    }
+}

package/Standalone/Runtime/{Internal/Net.cs.meta → Internal2/TapLoginService.cs.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: cdf561f46b3c346708bd7de2f21c56da
+guid: b5641596ac5084807a736c29246e2fe4
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

package/Standalone/Runtime/Internal2/TapLoginStandaloneImpl.cs

@@ -36,7 +36,7 @@ namespace TapSDK.Login.Internal
         {
             TapTapSdk.SDKInitialize(clientId, regionType == TapTapRegionType.CN);
             AccountManager.Instance.Init();
-            CheckAndRefreshToken();
+            _ = CheckAndRefreshToken();
             TapLoginTracker.Instance.TrackInit();
         }
 

package/Standalone/Runtime/Internal2/UI/QRCodeController.cs

@@ -18,13 +18,13 @@ namespace TapSDK.Login.Internal {
         private readonly static string DEMO_IMAGE_URL_IOS_EN = $"{DEMO_IMAGE_IO_HOST}/scan-guide/ios.png";
         private readonly static string DEMO_IMAGE_URL_ANDROID_EN = $"{DEMO_IMAGE_IO_HOST}/scan-guide/android.png";
 
-        private readonly static string DEFAULT_IOS_CLIENT = "Sprites/taptap-login-ios-client";
-        private readonly static string DEFAULT_ANDROID_CLIENT = "Sprites/taptap-login-android-client";
+        // private readonly static string DEFAULT_IOS_CLIENT = "Sprites/taptap-login-ios-client";
+        // private readonly static string DEFAULT_ANDROID_CLIENT = "Sprites/taptap-login-android-client";
 
         private readonly static string AUTH_PENDING = "authorization_pending";
         private readonly static string AUTH_WAITING = "authorization_waiting";
         private readonly static string AUTH_DENIED = "access_denied";
-        private readonly static string AUTH_SUCCESS = "";
+        // private readonly static string AUTH_SUCCESS = "";
 
         private readonly Action<TokenData, String> onAuth;
 

package/link.xml

@@ -0,0 +1,4 @@
+<linker>
+  <assembly fullname="TapSDK.Login.Runtime" preserve="all" />
+  <assembly fullname="TapSDK.Login.Mobile.Runtime" preserve="all" />
+</linker>

package/link.xml.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: be71b67c0945c40c0817e128f2bff96a
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/package.json

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

package/Standalone/Runtime/Internal/Net.cs

@@ -1,291 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Text;
-using System.Text.RegularExpressions;
-using TapSDK.Core;
-using UnityEngine;
-
-namespace TapSDK.Login.Internal
-{
-    public class Net : MonoBehaviour
-    {
-        public delegate void Action();
-
-        // ReSharper disable Unity.PerformanceAnalysis
-        public void PostAsync(string url, Dictionary<string, string> queryParams, Dictionary<string, string> formParams, Action<string> methodForResult, Action<int, string> methodForError)
-        {
-            if (string.IsNullOrEmpty(url))
-            {
-                methodForError(-1, "empty url");
-                return;
-            }
-            StartCoroutine(Post(url, queryParams, formParams, methodForResult, methodForError));
-        }
-
-        // ReSharper disable Unity.PerformanceAnalysis
-        public void GetAsync(string url, string authorization, Dictionary<string, string> queryParams, Action<string> methodForResult, Action<int, string> methodForError)
-        {
-            if (string.IsNullOrEmpty(url))
-            {
-                methodForError(-1, "empty url");
-                return;
-            }
-            StartCoroutine(Get(url, authorization, queryParams, methodForResult, methodForError));
-        }
-
-        // ReSharper disable Unity.PerformanceAnalysis
-        private IEnumerator Get(string url, string authorization, Dictionary<string, string> queryParams, Action<string> methodForResult, Action<int, string> methodForError)
-        {
-            string baseUrl;
-            Dictionary<string, string> finalQueryParams = queryParams ?? new Dictionary<string, string>();
-            NameValueCollection collection = new NameValueCollection();
-            ParseUrl(url, out baseUrl, out collection);
-            foreach (string key in collection.AllKeys)
-            {
-                foreach (string value in collection.GetValues(key))
-                {
-                    finalQueryParams.Add(key, value);
-                }
-            }
-            string finalUrl;
-            if (finalQueryParams.Count == 0)
-            {
-                finalUrl = baseUrl;
-            }
-            else
-            {
-                finalUrl = baseUrl + "?" + DictToQueryString(finalQueryParams);
-            }
-
-
-            Dictionary<string, string> headers = new Dictionary<string, string>();
-            headers.Add("User-Agent", "TapTapUnitySDK/" + TapTapSdk.Version + " " + "UnityPlayer/" + Application.unityVersion);
-            headers.Add("Authorization", authorization);
-            WWW w = new WWW(finalUrl, null, headers);
-            PrintRequest(w, "GET", null, headers);
-            yield return w;
-            PrintResponse(w);
-            if (!string.IsNullOrEmpty(w.error))
-            {
-                string data = w.text;
-                if (data != null)
-                {
-                    methodForError(GetResponseCode(w), data);
-                }
-                else
-                {
-                    methodForError(GetResponseCode(w), w.error);
-                }
-
-                w.Dispose();
-                yield break;
-            }
-            else
-            {
-                string data = w.text;
-                if (data != null)
-                {
-                    methodForResult(w.text);
-                    yield break;
-                }
-                else
-                {
-                    methodForError(GetResponseCode(w), "Empyt response from server : " + url);
-                }
-            }
-        }
-
-        // ReSharper disable Unity.PerformanceAnalysis
-        private IEnumerator Post(string url, Dictionary<string, string> queryParams, Dictionary<string, string> formParams, Action<string> methodForResult, Action<int, string> methodForError)
-        {
-            string baseUrl;
-            Dictionary<string, string> finalQueryParams = queryParams ?? new Dictionary<string, string>();
-            NameValueCollection collection = new NameValueCollection();
-            ParseUrl(url, out baseUrl, out collection);
-            foreach (string key in collection.AllKeys)
-            {
-                foreach (string value in collection.GetValues(key))
-                {
-                    finalQueryParams.Add(key, value);
-                }
-            }
-            string finalUrl;
-            if(finalQueryParams.Count == 0)
-            {
-                finalUrl = baseUrl;
-            } else
-            {
-                finalUrl = baseUrl + "?" + DictToQueryString(finalQueryParams);
-            }
-            WWWForm wwwForm = new WWWForm();
-            Dictionary<string, string> finalFormParams = formParams ?? new Dictionary<string, string>();
-            foreach (KeyValuePair<string, string> kv in finalFormParams)
-            {
-                // Debug.Log($"kv.key:{kv.Key} value:{kv.Value}");
-                wwwForm.AddField(kv.Key, kv.Value);
-;            }
-
-
-            Dictionary<string, string> headers = new Dictionary<string, string>();
-            headers.Add("User-Agent", "TapTapUnitySDK/1.0 " + "UnityPlayer/" + Application.unityVersion);
-            WWW w = new WWW(finalUrl, wwwForm.data, headers);
-            PrintRequest(w, "POST", wwwForm, headers);
-            yield return w;
-            PrintResponse(w);
-            if (!string.IsNullOrEmpty(w.error))
-            {
-                string data = w.text;
-                if (data != null)
-                {
-                    methodForError(GetResponseCode(w), data);
-                }
-                else
-                {
-                    methodForError(GetResponseCode(w), w.error);
-                }
-
-                w.Dispose();
-                yield break;
-            }
-            else
-            {
-                string data = w.text;
-                if (data != null)
-                {
-                    methodForResult(w.text);
-                    yield break;
-                }
-                else
-                {
-                    methodForError(GetResponseCode(w), "Empyt response from server : " + url);
-                }
-            }
-        }
-        public static void PrintRequest(WWW request, string method, WWWForm wwwFrom, Dictionary<string, string> headers) {
-            if (TapLogger.LogDelegate == null) {
-                return;
-            }
-            if (request == null) {
-                return;
-            }
-            StringBuilder sb = new StringBuilder();
-            sb.AppendLine("=== HTTP Request Start ===");
-            sb.AppendLine($"URL: {request.url}");
-            sb.AppendLine($"Method: {method}");
-            
-            sb.AppendLine($"Headers: \t");
-            if (wwwFrom?.headers != null)
-            {
-                foreach (var header in wwwFrom.headers) {
-                    sb.AppendLine($"{header.Key}: {header.Value}");
-                }
-            }
-
-            if (headers != null)
-            {
-                foreach (var header in headers) {
-                    sb.AppendLine($"{header.Key}: {header.Value}");
-                }
-            }
-            sb.AppendLine("=== HTTP Request End ===");
-            TapLogger.Debug(sb.ToString());
-        }
-        
-        private static void PrintResponse(WWW response) {
-            if (TapLogger.LogDelegate == null) {
-                return;
-            }
-            StringBuilder sb = new StringBuilder();
-            sb.AppendLine("=== HTTP Response Start ===");
-            sb.AppendLine($"URL: {response.url}");
-            sb.AppendLine($"Status Code: {GetResponseCode(response)}");
-            sb.AppendLine($"error: {response.error}");
-            if (!string.IsNullOrEmpty(response.text)) {
-                sb.AppendLine($"Content: {response.text}");
-            }
-            sb.AppendLine("=== HTTP Response End ===");
-            TapLogger.Debug(sb.ToString());
-        }
-
-        public static int GetResponseCode(WWW request)
-        {
-            int ret = 0;
-            if (request.responseHeaders == null)
-            {
-                Debug.LogError("no response headers.");
-            }
-            else
-            {
-                if (!request.responseHeaders.ContainsKey("STATUS"))
-                {
-                    Debug.LogError("response headers has no STATUS.");
-                }
-                else
-                {
-                    ret = ParseResponseCode(request.responseHeaders["STATUS"]);
-                }
-            }
-
-            return ret;
-        }
-
-        public static int ParseResponseCode(string statusLine)
-        {
-            int ret = 0;
-
-            string[] components = statusLine.Split(' ');
-            if (components.Length < 3)
-            {
-                Debug.LogError("invalid response status: " + statusLine);
-            }
-            else
-            {
-                if (!int.TryParse(components[1], out ret))
-                {
-                    Debug.LogError("invalid response code: " + components[1]);
-                }
-            }
-
-            return ret;
-        }
-
-        public static string DictToQueryString(IDictionary<string, string> dict)
-        {
-            List<string> list = new List<string>();
-            foreach (var item in dict)
-            {
-                list.Add(item.Key + "=" + item.Value);
-            }
-            return string.Join("&", list.ToArray());
-        }
-
-        public static void ParseUrl(string url, out string baseUrl, out NameValueCollection nvc)
-        {
-            if (url == null)
-                throw new ArgumentNullException("url");
-            nvc = new NameValueCollection();
-            baseUrl = "";
-            if (url == "")
-                return;
-            int questionMarkIndex = url.IndexOf('?');
-            if (questionMarkIndex == -1)
-            {
-                baseUrl = url;
-                return;
-            }
-            baseUrl = url.Substring(0, questionMarkIndex);
-            if (questionMarkIndex == url.Length - 1)
-                return;
-            string ps = url.Substring(questionMarkIndex + 1);
-            Regex re = new Regex(@"(^|&)?(\w+)=([^&]+)(&|$)?", RegexOptions.None);
-            MatchCollection mc = re.Matches(ps);
-            foreach (Match m in mc)
-            {
-                nvc.Add(m.Result("$2").ToLower(), m.Result("$3"));
-            }
-        }
-
-    }
-}

package/Standalone/Runtime/Internal/QRCodeWindow.cs

@@ -1,776 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Net;
-using System.Security.Cryptography;
-using System.Text;
-using System.Threading.Tasks;
-using TapSDK.Core;
-using UnityEngine;
-using UnityEngine.UI;
-using ZXing;
-using ZXing.Common;
-using ZXing.QrCode.Internal;
-using Debug = UnityEngine.Debug;
-using Random = System.Random;
-
-namespace TapSDK.Login.Internal
-{
-    internal class QRCodeWindow : UIElement
-    {
-        // // \ue90f\ue91c\ue911\ue91a\ue901\ue902\ue903\ue90c  您已取消此次登录
-        // private static readonly string TEXT_CANCEL_LOGIN = "";
-        //
-        // // \ue910\ue91f\ue91b\ue914\ue90d  请重新扫码
-        // private static readonly string TEXT_PLEASE_RESCRAN = "";
-        //
-        // // \ue914\ue90d\ue900\ue907  扫码成功
-        // private static readonly string TEXT_SCAN_SUCCESS = "";
-        //
-        // // \ue910\ue91e\ue917\ue90a\ue915\ue912\ue913 请在手机上确认
-        // private static readonly string TEXT_CONFIRM_ON_PHONE = "";
-
-        public RawImage QRCodeRawImage;
-        public Text StatusText;
-        public Text SubStatusText;
-        public Image RefreshImage;
-        public Button RefreshButton;
-        public Button CloseButton;
-
-        public Button WebLoginButton;
-
-        private string clientId;
-        private string[] scopes;
-        private bool isLogin;
-
-        private string deviceCode;
-        private long expireAt = 0;
-        private long lastCheckAt = 0;
-        private long interval = 5;
-
-        private Net net;
-        private HttpListener _httpListener;
-
-        private long lastWebRequestTime = 0;
-        private string webRequestMode = "";
-
-        private void SetObjectText(string parentName, string objectName, string text)
-        {
-            try
-            {
-                var targetTransform = transform;
-                if (!string.IsNullOrEmpty(parentName))
-                {
-                    targetTransform = transform.Find(parentName).gameObject.transform;
-                }
-
-                var targetObject = targetTransform.Find(objectName).gameObject;
-                var gameText = targetObject.GetComponent<Text>();
-                gameText.text = text;
-            }
-            catch (Exception e)
-            {
-                Debug.Log("SetObjectText fail" + parentName + "  " + objectName);
-                Debug.Log("SetObjectText fail\n" + e);
-            }
-        }
-
-        void Awake()
-        {
-            var qrImageObject = transform.Find("QRImage").gameObject;
-            QRCodeRawImage = qrImageObject.GetComponent<RawImage>();
-            var statusObject = transform.Find("Status").gameObject;
-            StatusText = statusObject.GetComponent<Text>();
-            var subStatusObject = transform.Find("SubStatus").gameObject;
-            SubStatusText = subStatusObject.GetComponent<Text>();
-            var refreshObject = transform.Find("Refresh").gameObject;
-            RefreshImage = refreshObject.GetComponent<Image>();
-            var refreshButtonObject = refreshObject.transform.Find("RefreshButton").gameObject;
-            RefreshButton = refreshButtonObject.GetComponent<Button>();
-            var closeObject = transform.Find("Close").gameObject;
-            CloseButton = closeObject.GetComponent<Button>();
-
-            var webLoginButtonObject = transform.Find("WebLoginButton").gameObject;
-            WebLoginButton = webLoginButtonObject.GetComponent<Button>();
-
-            WebLoginButton.onClick.AddListener(() =>
-            {
-                var now = GetCurrentTime();
-                if (now - lastWebRequestTime > 1)
-                {
-                    StartWebLogin();
-                }
-
-                lastWebRequestTime = now;
-            });
-            RefreshImage.gameObject.SetActive(false);
-            RefreshButton.onClick.AddListener(RefreshCode);
-            SubStatusText.gameObject.SetActive(false);
-            StatusText.gameObject.SetActive(false);
-            CloseButton.onClick.AddListener(Close);
-
-            // SetObjectText("TitleContent", "TitleUse", LoginLanguage.GetCurrentLang().TitleUse());
-            SetObjectText("TitleContent", "TitleAccount", LoginLanguage.GetCurrentLang().TitleLogin());
-            SetObjectText("", "ScanLogin", LoginLanguage.GetCurrentLang().QrTitleLogin());
-            SetObjectText("", "ScanLogin", LoginLanguage.GetCurrentLang().QrTitleLogin());
-            SetObjectText("Notice", "Notice1", LoginLanguage.GetCurrentLang().QrNoticeUse());
-            SetObjectText("Notice", "Notice2", LoginLanguage.GetCurrentLang().QrNoticeClient());
-            SetObjectText("", "Notice3", LoginLanguage.GetCurrentLang().QrNoticeScanToLogin());
-            SetObjectText("", "WebLogin", LoginLanguage.GetCurrentLang().WebLogin());
-            SetObjectText("", "WebDescription", LoginLanguage.GetCurrentLang().WebNotice());
-            SetObjectText("WebLoginButton", "Text", LoginLanguage.GetCurrentLang().WebButtonJumpToWeb());
-
-            refreshButtonObject.transform.Find("Text").gameObject.GetComponent<Text>().text =
-                LoginLanguage.GetCurrentLang().QrRefresh();
-
-            if (string.IsNullOrEmpty(LoginLanguage.GetCurrentLang().QrNoticeUse()) &&
-                string.IsNullOrEmpty(LoginLanguage.GetCurrentLang().QrNoticeClient())) {
-                GameObject logoGO = transform.Find("Notice/Logo").gameObject;
-                logoGO.SetActive(false);
-            }
-        }
-
-        public override void OnEnter()
-        {
-            base.OnEnter();
-            gameObject.AddComponent<Net>();
-            net = gameObject.GetComponent<Net>();
-            GetCode();
-            WebLoginRequestManager.Instance.CreateNewLoginRequest(scopes);
-            StartHttpServer();
-        }
-
-        public override void OnExit()
-        {
-            base.OnExit();
-            Destroy(net.gameObject);
-        }
-
-        private void Close()
-        {
-            if (_httpListener != null)
-            {
-                try
-                {
-                    _httpListener.Stop();
-                }
-                catch (Exception)
-                {
-                    // ignored
-                }
-            }
-
-            OnCallback(UIManager.RESULT_CLOSE, "Close button clicked.");
-            GetUIManager().Pop();
-        }
-
-        private void StartHttpServer()
-        {
-            if (_httpListener == null)
-            {
-                _httpListener = new HttpListener();
-                _httpListener.Prefixes.Add(WebLoginRequestManager.Instance.GetCurrentRequest().GetRedirectHost());
-            }
-
-            try
-            {
-                _httpListener.Start();
-            }
-            catch (Exception)
-            {
-                Debug.Log("Http listener start fail, maybe is already started");
-            }
-        }
-
-        private void StartWebLogin()
-        {
-            ShowStatus("", "");
-
-            Application.OpenURL(WebLoginRequestManager.Instance.GetCurrentRequest().GetWebLoginUrl());
-            // Waits for the OAuth authorization response.
-
-            _ = StartWaitForRequest();
-
-            // _httpListener.BeginGetContext(HandleHttpRequest, _httpListener);
-        }
-
-        private async Task StartWaitForRequest()
-        {
-            HttpListenerContext context = await _httpListener.GetContextAsync();
-
-            Debug.Log(context.Request.RawUrl);
-
-            if (context.Request.HttpMethod == "OPTIONS") {
-                // 跨域请求
-                context.Response.StatusCode = 200;
-                context.Response.Close();
-            } else {
-                webRequestMode = "";
-                // NOTE@luran:这里负责监听 authorization code 的回调
-                TapLogger.Debug($"[TapLogin] Get Authorization Code Response: {context.Request.RawUrl}");
-                var resultCode = UrlCheck(context.Request.RawUrl);
-
-                CodeToTokenFromWeb(resultCode);
-
-                var response = context.Response;
-                var buffer = Array.Empty<byte>();
-                if (!string.IsNullOrEmpty(resultCode)) {
-                    switch (webRequestMode) {
-                        case "gif": {
-                                response.StatusCode = 200;
-                                response.AppendHeader("Access-Control-Allow-Origin", "*");
-                                response.ContentType = "image/gif";
-                                const string gif = "R0lGODlhAQABAIABAAAAAP///yH5BAEAAAEALAAAAAABAAEAAAICTAEAOw==";
-                                try {
-                                    buffer = Convert.FromBase64String(gif);
-                                } catch (Exception) {
-                                    buffer = Encoding.UTF8.GetBytes("ok");
-                                }
-
-                                break;
-                            }
-                        case "redirect":
-                            response.Redirect(CodeUtil.GetTapTapOAuthRedirectUri());
-                            break;
-                        default:
-                            response.StatusCode = 200;
-                            response.AppendHeader("Access-Control-Allow-Origin", "*");
-                            response.ContentType = "text/plain";
-                            buffer = Encoding.UTF8.GetBytes("ok");
-                            break;
-                    }
-                } else {
-                    response.StatusCode = 404;
-                }
-
-                response.ContentLength64 = buffer.Length;
-                var responseOutput = response.OutputStream;
-                await responseOutput.WriteAsync(buffer, 0, buffer.Length)
-                    .ContinueWith((task) => { responseOutput.Close(); });
-            }
-
-            _ = StartWaitForRequest();
-        }
-
-        private string UrlCheck(string url)
-        {
-            // check url
-            if (string.IsNullOrEmpty(url) || !url.Contains(CodeUtil.GetTapTapOAuthPrefix()))
-            {
-                return null;
-            }
-
-            var urlParams = url.Split('?');
-            if (urlParams.Length <= 1)
-            {
-                return null;
-            }
-
-            var args = urlParams[1].Split('&');
-            var dic = args.Select(arg => arg.Split('=')).ToDictionary(kv => kv[0], kv => kv[1]);
-
-            var code = dic.ContainsKey("code") ? dic["code"] : "";
-            var state = dic.ContainsKey("state") ? dic["state"] : "";
-            webRequestMode = dic.ContainsKey("mode") ? dic["mode"] : "";
-            if (string.IsNullOrEmpty(code) || string.IsNullOrEmpty(state))
-            {
-                return null;
-            }
-
-            var content = new StringBuilder();
-            foreach (var VARIABLE in dic) {
-                content.AppendLine($"key: {VARIABLE.Key}, value: {VARIABLE.Value}");
-            }
-            
-            TapLogger.Debug($"[TapLogin] Get Authorization Code Response Content:\n {content.ToString()}");
-
-            return !state.Equals(WebLoginRequestManager.Instance.GetCurrentRequest().GetState()) ? null : code;
-        }
-
-        private void CodeToTokenFromWeb(string code)
-        {
-            if (string.IsNullOrEmpty(code)) return;
-            ShowStatus(LoginLanguage.GetCurrentLang().WebNoticeLogin(), "");
-            // url is ok, go to get token
-            var formParams = new Dictionary<string, string>
-            {
-                { "client_id", clientId },
-                { "grant_type", "authorization_code" },
-                { "secret_type", "hmac-sha-1" },
-                { "code", code },
-                { "redirect_uri", WebLoginRequestManager.Instance.GetCurrentRequest().GetRedirectUri() },
-                { "code_verifier", WebLoginRequestManager.Instance.GetCodeVerifier() }
-            };
-            net.PostAsync(TapTapSdk.CurrentRegion.TokenUrl(), null, formParams, (result =>
-            {
-                TapLogger.Debug($"[TapLogin] Get Access Token Origin Result: {result}");
-                if (Json.Deserialize(result) is Dictionary<string, object> resultDict &&
-                    resultDict.ContainsKey("success") && (bool)resultDict["success"])
-                {
-                    if (resultDict["data"] is Dictionary<string, object> dataDict) {
-                        // convert dataDict content to a format string for debug
-                        #if UNITY_EDITOR
-                        var c = new StringBuilder();
-                        foreach (var kv in dataDict) {
-                            c.AppendLine($"key: {kv.Key}, valuue: {kv.Value.ToString()}");
-                        }
-                        TapLogger.Debug($"[TapLogin] Get Access Token data:\n {c.ToString()}");
-                        #endif
-                        var token = new AccessToken
-                        {
-                            kid = dataDict["kid"] as string,
-                            macKey = dataDict["mac_key"] as string,
-                            tokenType = dataDict["token_type"] as string,
-                            macAlgorithm = dataDict["mac_algorithm"] as string,
-                            scopeSet = new HashSet<string>((dataDict["scope"] as string)?.Split(' '))
-                        };
-
-                        // stop http server when success get token
-                        _httpListener.Stop();
-                        Debug.Log("HTTP server stopped.");
-                        GetProfile(token);
-                        return;
-                    }
-                }
-
-                ShowStatus(LoginLanguage.GetCurrentLang().WebNoticeFail(),
-                    LoginLanguage.GetCurrentLang().WebNoticeFail2());
-                Debug.Log("CodeToTokenFromWeb success with fail data \n" + result);
-            }), ((error, msg) =>
-            {
-                Debug.Log("CodeToTokenFromWeb fail \n" + msg);
-                if (Json.Deserialize(msg) is Dictionary<string, object> resultDict &&
-                    resultDict.ContainsKey("data"))
-                {
-                    if (resultDict["data"] is Dictionary<string, object> dataDict &&
-                        dataDict.ContainsKey("error"))
-                    {
-                        var errorMsg = dataDict["error"] as string;
-                        var errorDesc = dataDict["error_description"] as string;
-                        ShowStatus(LoginLanguage.GetCurrentLang().WebNoticeFail(),
-                            LoginLanguage.GetCurrentLang().WebNoticeFail2());
-                        return;
-                    }
-                }
-
-                ShowStatus(LoginLanguage.GetCurrentLang().WebNoticeFail(),
-                    LoginLanguage.GetCurrentLang().WebNoticeFail2());
-            }));
-        }
-
-        private void RefreshCode()
-        {
-            StatusText.gameObject.SetActive(false);
-            SubStatusText.gameObject.SetActive(false);
-            GetCode();
-        }
-
-        private void GetCode() {
-            RefreshImage.gameObject.SetActive(false);
-
-            var formParams = new Dictionary<string, string>
-            {
-                { "client_id", clientId },
-                { "response_type", "device_code" },
-                { "scope", string.Join(",", scopes) },
-                { "version", TapTapSdk.Version },
-                { "platform", "unity" },
-                { "info", "{\"device_id\":\"" + SystemInfo.deviceModel + "\"}" }
-            };
-            net.PostAsync(TapTapSdk.CurrentRegion.CodeUrl(),
-                null,
-                formParams,
-                (result) =>
-                {
-                    if (Json.Deserialize(result) is Dictionary<string, object> resultDict &&
-                        resultDict.ContainsKey("success") && (bool)resultDict["success"])
-                    {
-                        if (resultDict["data"] is Dictionary<string, object> dataDict &&
-                            dataDict.ContainsKey("qrcode_url"))
-                        {
-                            var qrCodeUrl = dataDict["qrcode_url"] as string;
-                            EncodeQrImage(qrCodeUrl, 309, 309);
-                            if (dataDict.ContainsKey("device_code"))
-                            {
-                                deviceCode = dataDict["device_code"] as string;
-                            }
-
-                            if (dataDict.ContainsKey("expires_in"))
-                            {
-                                var expireIn = (long)dataDict["expires_in"];
-                                var ts = DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0);
-                                expireAt = Convert.ToInt64(ts.TotalSeconds) + expireIn;
-                            }
-
-                            if (dataDict.ContainsKey("interval"))
-                            {
-                                interval = (long)dataDict["interval"];
-                            }
-
-                            StartCheck();
-                            Debug.Log("QRCODE Get");
-                        }
-                        else
-                        {
-                            //StatusText.text = "获取二维码失败";
-                            ShowQrRefresh();
-                            Debug.Log("QRCODE Get Fail 1");
-                        }
-                    }
-                    else
-                    {
-                        //StatusText.text = "获取二维码失败";
-                        ShowQrRefresh();
-                        Debug.Log("QRCODE Get Fail 2");
-                    }
-                },
-                (error, msg) =>
-                {
-                    //StatusText.text = "获取二维码失败";
-                    ShowQrRefresh();
-                    Debug.Log("QRCODE Get Fail 3");
-                }
-            );
-        }
-
-        private void EncodeQrImage(string content, int width, int height)
-        {
-            var writer = new MultiFormatWriter();
-            var hints = new Dictionary<EncodeHintType, object>
-            {
-                { EncodeHintType.CHARACTER_SET, "UTF-8" },
-                //hints.Add(EncodeHintType.MARGIN, 0);
-                { EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.M }
-            };
-            var bitMatrix = writer.encode(content, BarcodeFormat.QR_CODE, width, height, hints);
-            bitMatrix = DeleteWhite(bitMatrix);
-            var w = bitMatrix.Width;
-            var h = bitMatrix.Height;
-            var texture = new Texture2D(w, h);
-            for (var x = 0; x < h; x++)
-            {
-                for (var y = 0; y < w; y++)
-                {
-                    texture.SetPixel(y, x, bitMatrix[x, y] ? Color.black : Color.white);
-                }
-            }
-
-            texture.Apply();
-            texture.filterMode = FilterMode.Point;
-            QRCodeRawImage.texture = texture;
-        }
-
-        private static BitMatrix DeleteWhite(BitMatrix matrix)
-        {
-            var rec = matrix.getEnclosingRectangle();
-            var resWidth = rec[2];
-            var resHeight = rec[3];
-
-            var resMatrix = new BitMatrix(resWidth, resHeight);
-            resMatrix.clear();
-            for (var i = 0; i < resWidth; i++)
-            {
-                for (var j = 0; j < resHeight; j++)
-                {
-                    if (matrix[i + rec[0], j + rec[1]])
-                    {
-                        resMatrix.flip(i, j);
-                    }
-                }
-            }
-
-            return resMatrix;
-        }
-
-        private void StartCheck()
-        {
-            StartCoroutine(nameof(AutoCheck));
-        }
-
-        private void StopCheck()
-        {
-            StopCoroutine(nameof(AutoCheck));
-        }
-
-        private IEnumerator AutoCheck()
-        {
-            while (true)
-            {
-                yield return new WaitForSeconds(0.5f);
-                var ts = DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0);
-                var now = Convert.ToInt64(ts.TotalSeconds);
-                //Debug.Log("Now: " + now + "  ExpireAt: " + expireAt + "  Remain: " + (expireAt - now));
-                if (now > expireAt)
-                {
-                    ShowQrRefresh();
-                    StopCheck();
-                    break;
-                }
-
-                if (now <= lastCheckAt + interval) continue;
-                var wait = true;
-                var stop = false;
-                var formParams = new Dictionary<string, string>
-                {
-                    { "grant_type", "device_token" },
-                    { "client_id", clientId },
-                    { "secret_type", "hmac-sha-1" },
-                    { "code", deviceCode },
-                    { "version", "1.0" },
-                    { "platform", "unity" },
-                    { "info", "{\"device_id\":\"" + SystemInfo.deviceModel + "\"}" }
-                };
-                net.PostAsync(TapTapSdk.CurrentRegion.TokenUrl(),
-                    null,
-                    formParams,
-                    (result) =>
-                    {
-                        //StatusText.text = "";
-                        TapLogger.Debug(string.Format("qr code login result: {0}", result));
-                        if (Json.Deserialize(result) is Dictionary<string, object> resultDict &&
-                            resultDict.ContainsKey("success") && (bool)resultDict["success"])
-                        {
-                            //StatusText.text = "扫码成功";
-                            //SubStatusText.gameObject.SetActive(false);
-                            if (resultDict["data"] is Dictionary<string, object> dataDict)
-                            {
-                                var token = new AccessToken
-                                {
-                                    kid = dataDict["kid"] as string,
-                                    macKey = dataDict["mac_key"] as string,
-                                    tokenType = dataDict["token_type"] as string,
-                                    macAlgorithm = dataDict["mac_algorithm"] as string,
-                                    scopeSet = new HashSet<string>((dataDict["scope"] as string)?.Split(' '))
-                                };
-
-                                GetProfile(token);
-                            }
-                            else
-                            {
-                                ShowQrRefresh();
-                            }
-                        }
-                        else
-                        {
-                            //StatusText.text = "扫描二维码失败";
-                            ShowQrRefresh();
-                        }
-
-                        wait = false;
-                        stop = true;
-                        StopCheck();
-                    },
-                    (error, msg) =>
-                    {
-                        wait = false;
-
-                        if (Json.Deserialize(msg) is Dictionary<string, object> resultDict &&
-                            resultDict.ContainsKey("data"))
-                        {
-                            if (resultDict["data"] is Dictionary<string, object> dataDict &&
-                                dataDict.ContainsKey("error"))
-                            {
-                                var errorMsg = dataDict["error"] as string;
-
-                                // Debug.Log("QRCODE FAIL " + errorMsg);
-                                switch (errorMsg)
-                                {
-                                    case "authorization_pending":
-                                        //StatusText.text = "扫码二维码登录";
-                                        break;
-                                    case "authorization_waiting":
-                                        ShowStatus(LoginLanguage.GetCurrentLang().QrnNoticeSuccess(),
-                                            LoginLanguage.GetCurrentLang().QrnNoticeSuccess2());
-                                        break;
-                                    case "access_denied":
-                                        ShowStatus(LoginLanguage.GetCurrentLang().QrNoticeCancel(),
-                                            LoginLanguage.GetCurrentLang().QrNoticeCancel2());
-                                        stop = true;
-                                        StopCheck();
-                                        GetCode();
-                                        break;
-                                    case "invalid_grant":
-                                        ShowQrRefresh();
-                                        stop = true;
-                                        StopCheck();
-                                        break;
-                                    case "slow_down":
-                                        break;
-                                    default:
-                                        ShowQrRefresh();
-                                        stop = true;
-                                        StopCheck();
-                                        break;
-                                }
-
-                                return;
-                            }
-                        }
-
-                        // if false then refresh
-                        ShowQrRefresh();
-                        stop = true;
-                        StopCheck();
-                    }
-                );
-                while (wait)
-                {
-                    yield return new WaitForSeconds(0.5f);
-                }
-
-                ts = DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0);
-                lastCheckAt = Convert.ToInt64(ts.TotalSeconds);
-                if (stop) break;
-            }
-        }
-
-        private void GetProfile(AccessToken accessToken, int timestamp = 0) {
-            var havePublicProfile = accessToken.scopeSet != null && accessToken.scopeSet.Contains("public_profile");
-            var url = TapTapSdk.CurrentRegion.ProfileUrl(havePublicProfile) + clientId;
-            var ts = timestamp;
-            if (ts == 0)
-            {
-                var dt = DateTime.UtcNow - new DateTime(1970, 1, 1);
-                ts = (int)dt.TotalSeconds;
-            }
-
-            var uri = new Uri(url);
-            var sign = "MAC " + GetAuthorizationHeader(accessToken.kid,
-                accessToken.macKey,
-                accessToken.macAlgorithm,
-                "GET",
-                uri.PathAndQuery,
-                uri.Host,
-                "443", ts);
-
-            net.GetAsync(url,
-                sign,
-                null,
-                (result) =>
-                {
-                    try
-                    {
-                        var tokenDict = new Dictionary<string, string>
-                        {
-                            { "kid", accessToken.kid },
-                            { "mac_key", accessToken.macKey },
-                            { "token_type", accessToken.tokenType },
-                            { "mac_algorithm", accessToken.macAlgorithm },
-                            { "scope", string.Join(" ", accessToken.scopeSet) },
-                        };
-
-                        if (Json.Deserialize(result) is Dictionary<string, object> resultDict &&
-                            resultDict.ContainsKey("success") && (bool)resultDict["success"])
-                        {
-                            var dataDict = resultDict["data"] as Dictionary<string, object>;
-                            var profileStr = Json.Serialize(dataDict);
-                            Profile p = new Profile(profileStr);   
-                            if (isLogin) {
-                                DataStorage.SaveString("taptapsdk_accesstoken", Json.Serialize(tokenDict));
-                                DataStorage.SaveString("taptapsdk_profile", profileStr);
-                            }
-                            OnCallback(UIManager.RESULT_SUCCESS, new Tuple<AccessToken, Profile>(accessToken, p));
-                            GetUIManager().Pop();
-                        }
-                        else
-                        {
-                            OnCallback(UIManager.RESULT_FAILED, "Get profile error");
-                            GetUIManager().Pop();
-                        }
-                    }
-                    catch (Exception)
-                    {
-                        OnCallback(UIManager.RESULT_FAILED, "Get profile error");
-                        GetUIManager().Pop();
-                    }
-                },
-                (error, msg) =>
-                {
-                    if (timestamp == 0 && !string.IsNullOrEmpty(msg) && msg.Contains("invalid_time") &&
-                        msg.Contains("now"))
-                    {
-                        try
-                        {
-                            if (!(Json.Deserialize(msg) is Dictionary<string, object> json)) return;
-                            var now = (int)(long)json["now"];
-                            GetProfile(accessToken, now);
-
-                            return;
-                        }
-                        catch (Exception)
-                        {
-                            // ignored
-                        }
-                    }
-
-                    OnCallback(UIManager.RESULT_FAILED, msg);
-                    GetUIManager().Pop();
-                });
-        }
-
-        private static string GetAuthorizationHeader(string kid,
-            string macKey,
-            string macAlgorithm,
-            string method,
-            string uri,
-            string host,
-            string port,
-            int timestamp)
-        {
-            var nonce = new Random().Next().ToString();
-
-            var normalizedString = $"{timestamp}\n{nonce}\n{method}\n{uri}\n{host}\n{port}\n\n";
-
-            HashAlgorithm hashGenerator;
-            switch (macAlgorithm)
-            {
-                case "hmac-sha-256":
-                    hashGenerator = new HMACSHA256(Encoding.ASCII.GetBytes(macKey));
-                    break;
-                case "hmac-sha-1":
-                    hashGenerator = new HMACSHA1(Encoding.ASCII.GetBytes(macKey));
-                    break;
-                default:
-                    throw new InvalidOperationException("Unsupported MAC algorithm");
-            }
-
-            var hash = Convert.ToBase64String(hashGenerator.ComputeHash(Encoding.ASCII.GetBytes(normalizedString)));
-
-            var authorizationHeader = new StringBuilder();
-            authorizationHeader.AppendFormat(@"id=""{0}"",ts=""{1}"",nonce=""{2}"",mac=""{3}""",
-                kid, timestamp, nonce, hash);
-
-            return authorizationHeader.ToString();
-        }
-
-        private void ShowQrRefresh()
-        {
-            RefreshImage.gameObject.SetActive(true);
-            SubStatusText.gameObject.SetActive(false);
-            StatusText.gameObject.SetActive(false);
-        }
-
-        private void ShowStatus(string statusText, string subStatusText)
-        {
-            StatusText.text = statusText;
-            SubStatusText.text = subStatusText;
-            if (!string.IsNullOrEmpty(statusText))
-            {
-                StatusText.gameObject.SetActive(true);
-            }
-
-            if (!string.IsNullOrEmpty(subStatusText))
-            {
-                SubStatusText.gameObject.SetActive(true);
-            }
-        }
-
-        private static long GetCurrentTime()
-        {
-            var ts = DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0);
-            return Convert.ToInt64(ts.TotalSeconds);
-        }
-    }
-}

package/Standalone/Runtime/Internal/QRCodeWindow.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 527cc8535a0b844679c3c21266399f04
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: