feat: auth-services v9 updates and session manager updates

Signed-off-by: Gaurav Goel <[email protected]>

Author: grvgoel81

Assets/Plugins/Web3AuthSDK/Api/Web3AuthApi.cs

@@ -22,21 +22,24 @@ public IEnumerator authorizeSession(string key, string origin, Action<StoreApiRe
     {
         //var requestURL = $"{baseAddress}/store/get?key={key}";
         //var request = UnityWebRequest.Get(requestURL);
+        var requestURL = $"{baseAddress}/store/get";
+        //Debug.Log("Request URL => " + requestURL);
+
         WWWForm data = new WWWForm();
         data.AddField("key", key);
 
-        var request = UnityWebRequest.Post($"{baseAddress}/store/get", data);
+        var request = UnityWebRequest.Post(requestURL, data);
         request.SetRequestHeader("origin", origin);
 
         yield return request.SendWebRequest();
-         Debug.Log("baseAddress =>" + baseAddress);
-         Debug.Log("key =>" + key);
-         Debug.Log("request URL =>"+ request);
-         Debug.Log("request.isNetworkError =>" + request.isNetworkError);
-         Debug.Log("request.isHttpError =>" + request.isHttpError);
-         Debug.Log("request.isHttpError =>" + request.error);
-         Debug.Log("request.result =>" + request.result);
-         Debug.Log("request.downloadHandler.text =>" + request.downloadHandler.text);
+         //Debug.Log("baseAddress =>" + baseAddress);
+         //Debug.Log("key =>" + key);
+         //Debug.Log("request URL =>"+ request);
+         //Debug.Log("request.isNetworkError =>" + request.isNetworkError);
+         //Debug.Log("request.isHttpError =>" + request.isHttpError);
+         //Debug.Log("request.isHttpError =>" + request.error);
+         //Debug.Log("request.result =>" + request.result);
+         //Debug.Log("request.downloadHandler.text =>" + request.downloadHandler.text);
         if (request.result == UnityWebRequest.Result.Success)
         {
             string result = request.downloadHandler.text;

Assets/Plugins/Web3AuthSDK/Keystore/KeyStoreManagerUtils.cs

@@ -28,6 +28,7 @@ public class KeyStoreManagerUtils
     public static string IV_KEY = "ivKey";
     public static string EPHEM_PUBLIC_Key = "ephemPublicKey";
     public static string MAC = "mac";
+    public static string REDIRECT_URL = "redirectUrl";
 
     public static string getPubKey(string sessionId)
     {

Assets/Plugins/Web3AuthSDK/Web3Auth.cs

@@ -64,6 +64,7 @@ public static void setSignResponse(SignResponse _response)
 
     [SerializeField]
     private Web3Auth.Network network;
+    private string redirectUrl;
 
     private static readonly Queue<Action> _executionQueue = new Queue<Action>();
 
@@ -108,7 +109,8 @@ public async void setOptions(Web3AuthOptions web3AuthOptions)
         {
             throw new Exception("Failed to fetch project config. Please try again later.");
         } else {
-            authorizeSession("", this.web3AuthOptions.redirectUrl.ToString());
+            var redirectUrl = KeyStoreManagerUtils.getPreferencesData(KeyStoreManagerUtils.REDIRECT_URL);
+            authorizeSession("", redirectUrl);
 
             JsonSerializerSettings settings = new JsonSerializerSettings
             {
@@ -264,8 +266,11 @@ private void IncomingHttpRequest(IAsyncResult result)
 
     private async void processRequest(string path, LoginParams loginParams = null)
     {
+        redirectUrl = this.initParams["redirectUrl"].ToString();
+
 #if UNITY_STANDALONE || UNITY_EDITOR
         this.initParams["redirectUrl"] = StartLocalWebserver();
+        redirectUrl = this.initParams["redirectUrl"].ToString().Replace("/complete/", "");
 #elif UNITY_WEBGL
         this.initParams["redirectUrl"] = Utils.GetCurrentURL();
 #endif
@@ -326,8 +331,10 @@ public async void launchWalletServices(ChainConfig chainConfig, string path = "w
             string sessionId = KeyStoreManagerUtils.getPreferencesData(KeyStoreManagerUtils.SESSION_ID);
             if (!string.IsNullOrEmpty(sessionId))
             {
+            redirectUrl = this.initParams["redirectUrl"].ToString();
     #if UNITY_STANDALONE || UNITY_EDITOR
             this.initParams["redirectUrl"] = StartLocalWebserver();
+            redirectUrl = this.initParams["redirectUrl"].ToString().Replace("/complete/", "");
     #elif UNITY_WEBGL
             this.initParams["redirectUrl"] = Utils.GetCurrentURL();
     #endif
@@ -425,9 +432,11 @@ public void setResultUrl(Uri uri)
         }
         string sessionId = sessionResponse.sessionId;
         this.Enqueue(() => KeyStoreManagerUtils.savePreferenceData(KeyStoreManagerUtils.SESSION_ID, sessionId));
+        this.Enqueue(() => KeyStoreManagerUtils.savePreferenceData(KeyStoreManagerUtils.REDIRECT_URL, redirectUrl));
 
         //call authorize session API
-        this.Enqueue(() => authorizeSession(sessionId, this.web3AuthOptions.redirectUrl.ToString()));
+        //Debug.Log("redirectUrl: =>" + redirectUrl);
+        this.Enqueue(() => authorizeSession(sessionId, redirectUrl));
 
 #if !UNITY_EDITOR && UNITY_WEBGL
         if (this.web3AuthResponse != null) 
@@ -536,8 +545,10 @@ public async void request(ChainConfig chainConfig, string method, JArray request
         string sessionId = KeyStoreManagerUtils.getPreferencesData(KeyStoreManagerUtils.SESSION_ID);
         if (!string.IsNullOrEmpty(sessionId))
         {
+                    redirectUrl = this.initParams["redirectUrl"].ToString();
             #if UNITY_STANDALONE || UNITY_EDITOR
                     this.initParams["redirectUrl"] = StartLocalWebserver();
+                    redirectUrl = this.initParams["redirectUrl"].ToString().Replace("/complete/", "");
             #elif UNITY_WEBGL
                     this.initParams["redirectUrl"] = Utils.GetCurrentURL();
             #endif
@@ -614,8 +625,8 @@ private void authorizeSession(string newSessionId, string origin)
         if (!string.IsNullOrEmpty(sessionId))
         {
             var pubKey = KeyStoreManagerUtils.getPubKey(sessionId);
-            Debug.Log("pubKey: =>" + pubKey);
-            Debug.Log("origin: =>" + origin);
+            //Debug.Log("pubKey: =>" + pubKey);
+            //Debug.Log("origin: =>" + origin);
             StartCoroutine(Web3AuthApi.getInstance().authorizeSession(pubKey, origin, (response =>
             {
                 if (response != null)
@@ -643,6 +654,7 @@ private void authorizeSession(string newSessionId, string origin)
                         if (!string.IsNullOrEmpty(this.web3AuthResponse.sessionId))
                         {
                             KeyStoreManagerUtils.savePreferenceData(KeyStoreManagerUtils.SESSION_ID, this.web3AuthResponse.sessionId);
+                            //Debug.Log("redirectUrl: =>" + redirectUrl);
                         }
 
                         if (!string.IsNullOrEmpty(web3AuthResponse.userInfo?.dappShare))
@@ -667,10 +679,11 @@ private void authorizeSession(string newSessionId, string origin)
     private void sessionTimeOutAPI()
     {
         string sessionId = KeyStoreManagerUtils.getPreferencesData(KeyStoreManagerUtils.SESSION_ID);
+        string redirectUrl = KeyStoreManagerUtils.getPreferencesData(KeyStoreManagerUtils.REDIRECT_URL);
         if (!string.IsNullOrEmpty(sessionId))
         {
             var pubKey = KeyStoreManagerUtils.getPubKey(sessionId);
-            StartCoroutine(Web3AuthApi.getInstance().authorizeSession(pubKey, this.web3AuthOptions.redirectUrl.ToString(), (response =>
+            StartCoroutine(Web3AuthApi.getInstance().authorizeSession(pubKey, redirectUrl, (response =>
             {
                 if (response != null)
                 {