logout api changes + minor fixes

Author: musab1234

Assets/Plugins/Web3AuthSDK/Api/Web3AuthApi.cs

@@ -3,6 +3,7 @@
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json;
 using UnityEngine.Networking;
+using UnityEngine;
 
 public class Web3AuthApi
 {
@@ -32,13 +33,13 @@ public IEnumerator authorizeSession(string key, Action<StoreApiResponse> callbac
 
     public IEnumerator logout(LogoutApiRequest logoutApiRequest, Action<JObject> callback)
     {
-        var request = new UnityWebRequest($"{baseAddress}/store/set");
-
-        byte[] data = new System.Text.UTF8Encoding().GetBytes(JsonConvert.SerializeObject(logoutApiRequest));
-        request.uploadHandler = new UploadHandlerRaw(data);
-        request.downloadHandler = new DownloadHandlerBuffer();
-        request.SetRequestHeader("Content-Type", "application/json");
+        WWWForm data = new WWWForm();
+        data.AddField("key", logoutApiRequest.key);
+        data.AddField("data", logoutApiRequest.data);
+        data.AddField("signature", logoutApiRequest.signature);
+        data.AddField("timeout", logoutApiRequest.timeout.ToString());
 
+        var request = UnityWebRequest.Post($"{baseAddress}/store/set", data);
         yield return request.SendWebRequest();
 
         if (request.result == UnityWebRequest.Result.Success)

Assets/Plugins/Web3AuthSDK/Web3Auth.cs

@@ -232,9 +232,13 @@ private void request(string  path, LoginParams loginParams = null, Dictionary<st
     public void setResultUrl(Uri uri)
     {
         string hash = uri.Fragment;
+#if !UNITY_EDITOR && UNITY_WEBGL
         if (hash == null || hash.Length == 0)
             return;
-
+#else
+        if (hash == null)
+            throw new UserCancelledException();
+#endif
         hash = hash.Remove(0, 1);
 
         Dictionary<string, string> queryParameters = Utils.ParseQuery(uri.Query);
@@ -288,7 +292,6 @@ public void login(LoginParams loginParams)
     public void logout(Dictionary<string, object> extraParams)
     {
         sessionTimeOutAPI();
-        request("logout", extraParams: extraParams);
     }
 
     public void logout(Uri redirectUrl = null, string appState = null)
@@ -315,21 +318,6 @@ private void authorizeSession()
                 {
                     var shareMetadata = Newtonsoft.Json.JsonConvert.DeserializeObject<ShareMetadata>(response.message);
 
-                    KeyStoreManagerUtils.savePreferenceData(
-                        KeyStoreManagerUtils.EPHEM_PUBLIC_Key,
-                        shareMetadata.ephemPublicKey
-                    );
-
-                    KeyStoreManagerUtils.savePreferenceData(
-                        KeyStoreManagerUtils.IV_KEY,
-                        shareMetadata.iv
-                    );
-
-                    KeyStoreManagerUtils.savePreferenceData(
-                        KeyStoreManagerUtils.MAC,
-                        shareMetadata.mac
-                    );
-
                     var aes256cbc = new AES256CBC(
                         sessionId,
                         shareMetadata.ephemPublicKey,
@@ -367,59 +355,59 @@ private void sessionTimeOutAPI()
         string sessionId = KeyStoreManagerUtils.getPreferencesData(KeyStoreManagerUtils.SESSION_ID);
         if (!string.IsNullOrEmpty(sessionId))
         {
-            var ephemKey = KeyStoreManagerUtils.getPreferencesData(KeyStoreManagerUtils.EPHEM_PUBLIC_Key);
-            var ivKey = KeyStoreManagerUtils.getPreferencesData(KeyStoreManagerUtils.IV_KEY);
-            var mac = KeyStoreManagerUtils.getPreferencesData(KeyStoreManagerUtils.MAC);
-
-            if (string.IsNullOrEmpty(ephemKey) == true && string.IsNullOrEmpty(ivKey) == true) return;
-
-            var aes256cbc = new AES256CBC(
-                sessionId,
-                ephemKey,
-                ivKey
-            );
-
-
-            var encryptedData = aes256cbc.encrypt(System.Text.Encoding.UTF8.GetBytes(""));
-            var encryptedMetadata = new ShareMetadata()
+            var pubKey = KeyStoreManagerUtils.getPubKey(sessionId);
+            StartCoroutine(Web3AuthApi.getInstance().authorizeSession(pubKey, (response =>
             {
-                iv = ivKey,
-                ephemPublicKey = ephemKey,
-                ciphertext = encryptedData,
-                mac = mac
-            };
-            var jsonData = JsonConvert.SerializeObject(encryptedMetadata);
-
-            StartCoroutine(Web3AuthApi.getInstance().logout(
-                new LogoutApiRequest()
+                if (response != null)
                 {
-                    key = KeyStoreManagerUtils.getPubKey(sessionId),
-                    data = jsonData,
-                    signature = KeyStoreManagerUtils.getECDSASignature(
+                    var shareMetadata = Newtonsoft.Json.JsonConvert.DeserializeObject<ShareMetadata>(response.message);
+
+                    var aes256cbc = new AES256CBC(
                         sessionId,
-                        jsonData
-                    ),
-                    timeout = 1
-                }, result =>
-                {
-                    if (result != null)
+                        shareMetadata.ephemPublicKey,
+                        shareMetadata.iv
+                    );
+
+                    var encryptedData = aes256cbc.encrypt(System.Text.Encoding.UTF8.GetBytes(""));
+                    var encryptedMetadata = new ShareMetadata()
                     {
-                        try
+                        iv = shareMetadata.iv,
+                        ephemPublicKey = shareMetadata.ephemPublicKey,
+                        ciphertext = encryptedData,
+                        mac = shareMetadata.mac
+                    };
+                    var jsonData = JsonConvert.SerializeObject(encryptedMetadata);
+
+                    StartCoroutine(Web3AuthApi.getInstance().logout(
+                        new LogoutApiRequest()
                         {
-                            KeyStoreManagerUtils.deletePreferencesData(KeyStoreManagerUtils.EPHEM_PUBLIC_Key);
-                            KeyStoreManagerUtils.deletePreferencesData(KeyStoreManagerUtils.IV_KEY);
-                            KeyStoreManagerUtils.deletePreferencesData(KeyStoreManagerUtils.MAC);
-                            KeyStoreManagerUtils.deletePreferencesData(KeyStoreManagerUtils.SESSION_ID);
-                            KeyStoreManagerUtils.deletePreferencesData(web3AuthOptions.loginConfig?.Values.First()?.verifier);
-                        }
-                        catch (Exception ex)
+                            key = KeyStoreManagerUtils.getPubKey(sessionId),
+                            data = jsonData,
+                            signature = KeyStoreManagerUtils.getECDSASignature(
+                                sessionId,
+                                jsonData
+                            ),
+                            timeout = 1
+                        }, result =>
                         {
-                            Debug.LogError(ex.Message);
+                            if (result != null)
+                            {
+                                try
+                                {
+                                    KeyStoreManagerUtils.deletePreferencesData(KeyStoreManagerUtils.SESSION_ID);
+                                    KeyStoreManagerUtils.deletePreferencesData(web3AuthOptions.loginConfig?.Values.First()?.verifier);
+
+                                    this.Enqueue(() => this.onLogout?.Invoke());
+                                }
+                                catch (Exception ex)
+                                {
+                                    Debug.LogError(ex.Message);
+                                }
+                            }
                         }
-                    }
+                    ));
                 }
-            ));
-            
+            })));
         }
     }