Merge branch 'master' into feat/config_api

Author: grvgoel81

Assets/Plugins/Web3AuthSDK/Samples/Web3AuthSample.cs

@@ -11,7 +11,7 @@ public class Web3AuthSample : MonoBehaviour
     List<LoginVerifier> verifierList = new List<LoginVerifier> {
         new LoginVerifier("Google", Provider.GOOGLE),
         new LoginVerifier("Facebook", Provider.FACEBOOK),
-        new LoginVerifier("CUSTOM_VERIFIER", Provider.CUSTOM_VERIFIER),
+        // new LoginVerifier("CUSTOM_VERIFIER", Provider.CUSTOM_VERIFIER),
         new LoginVerifier("Twitch", Provider.TWITCH),
         new LoginVerifier("Discord", Provider.DISCORD),
         new LoginVerifier("Reddit", Provider.REDDIT),
@@ -20,7 +20,7 @@ public class Web3AuthSample : MonoBehaviour
         new LoginVerifier("LinkedIn", Provider.LINKEDIN),
         new LoginVerifier("Twitter", Provider.TWITTER),
         new LoginVerifier("Line", Provider.LINE),
-        new LoginVerifier("Hosted Email Passwordless", Provider.EMAIL_PASSWORDLESS),
+        new LoginVerifier("Email Passwordless", Provider.EMAIL_PASSWORDLESS),
         new LoginVerifier("SMS Passwordless", Provider.SMS_PASSWORDLESS),
         new LoginVerifier("Farcaster", Provider.FARCASTER),
     };
@@ -69,7 +69,7 @@ void Start()
                 mode = ThemeModes.dark,
                 theme = new Dictionary<string, string>
                 {
-                    { "primary", "#123456" }
+                    { "primary", "#FFBF00" }
                 }
             },
             // If using your own custom verifier, uncomment this code. 
@@ -80,8 +80,8 @@ void Start()
                 {"CUSTOM_VERIFIER", loginConfigItem}
             }
             */
-            clientId = "BFuUqebV5I8Pz5F7a5A2ihW7YVmbv_OHXnHYDv6OltAD5NGr6e-ViNvde3U4BHdn6HvwfkgobhVu4VwC-OSJkik",
-            buildEnv = BuildEnv.TESTING,
+            clientId = "BPi5PB_UiIZ-cPz1GtV5i1I2iOSOHuimiXBI0e-Oe_u6X3oVAbCiAZOTEBtTXw4tsluTITPqA8zMsfxIKMjiqNQ",
+            buildEnv = BuildEnv.PRODUCTION,
             redirectUrl = new Uri("torusapp://com.torus.Web3AuthUnity/auth"),
             network = Web3Auth.Network.SAPPHIRE_DEVNET,
             sessionTime = 86400
@@ -158,6 +158,13 @@ private void login()
                 login_hint = emailAddressField.text
             };
         }
+        if (selectedProvider == Provider.SMS_PASSWORDLESS)
+        {
+            options.extraLoginOptions = new ExtraLoginOptions()
+            {
+                login_hint = "+XX-XXXXXXXXXX"
+            };
+        }
 
         web3Auth.login(options);
     }

Assets/Plugins/Web3AuthSDK/Types/AES256CBC.cs

@@ -135,7 +135,7 @@ public byte[] hmacSha256Sign(byte[] key, byte[] data)
     public bool hmacSha256Verify(byte[] key, byte[] data, string sig)
     {
         byte[] expectedSig = hmacSha256Sign(key, data);
-        string expectedSigHex = BitConverter.ToString(expectedSig).Replace("-", "").ToLower();
+        string expectedSigHex = BitConverter.ToString(expectedSig).Replace("-", "").ToLowerInvariant();
         return expectedSigHex.Equals(sig);
     }
 }

Assets/Plugins/Web3AuthSDK/Types/Web3AuthOptions.cs

@@ -11,25 +11,23 @@ public class Web3AuthOptions {
     public string sdkUrl {
         get {
             if (buildEnv == Web3Auth.BuildEnv.STAGING)
-                return "https://staging-auth.web3auth.io/{openLoginVersion}";
+                return "https://staging-auth.web3auth.io/v8";
             else if (buildEnv == Web3Auth.BuildEnv.TESTING)
                 return "https://develop-auth.web3auth.io";
             else 
-                return "https://auth.web3auth.io/{openLoginVersion}";    
+                return "https://auth.web3auth.io/v8";
         }
         set { }
     }
-    public const string openLoginVersion = "v8";
 
-    public const string walletServicesVersion = "v2";
     public string walletSdkUrl {
          get {
             if (buildEnv == Web3Auth.BuildEnv.STAGING)
-                return "https://staging-wallet.web3auth.io/{walletServicesVersion}";
+                return "https://staging-wallet.web3auth.io/v2";
             else if (buildEnv == Web3Auth.BuildEnv.TESTING)
                 return "https://develop-wallet.web3auth.io";
             else
-                return "https://wallet.web3auth.io/{walletServicesVersion}";
+                return "https://wallet.web3auth.io/v2";
          }
          set { }
     }

Assets/Plugins/Web3AuthSDK/Web3Auth.cs

@@ -63,7 +63,7 @@ public void Awake()
         this.initParams = new Dictionary<string, object>();
 
         this.initParams["clientId"] = clientId;
-        this.initParams["network"] = network.ToString().ToLower();
+        this.initParams["network"] = network.ToString().ToLowerInvariant();
 
         if (!string.IsNullOrEmpty(redirectUri))
             this.initParams["redirectUrl"] = redirectUri;
@@ -293,7 +293,14 @@ private async void request(string path, LoginParams loginParams = null)
                 })));
 
             UriBuilder uriBuilder = new UriBuilder(this.web3AuthOptions.sdkUrl);
-            uriBuilder.Path = "start";
+            if(this.web3AuthOptions.sdkUrl.Contains("develop"))
+            {
+                uriBuilder.Path = "/" + "start";
+            }
+            else
+            {
+                uriBuilder.Path += "/" + "start";
+            }
             uriBuilder.Fragment = "b64Params=" + hash;
             //Debug.Log("finalUriBuilderToOpen: =>" + uriBuilder.ToString());
 
@@ -342,7 +349,14 @@ public async void launchWalletServices(ChainConfig chainConfig, string path = "w
                     })));
 
                 UriBuilder uriBuilder = new UriBuilder(this.web3AuthOptions.walletSdkUrl);
-                uriBuilder.Path = path;
+                if(this.web3AuthOptions.sdkUrl.Contains("develop"))
+                {
+                    uriBuilder.Path = "/" + path;
+                }
+                else
+                {
+                    uriBuilder.Path += "/" + path;
+                }
                 uriBuilder.Fragment = "b64Params=" + hash;
                 //Debug.Log("WalletUriBuilderToOpen: =>" + uriBuilder.ToString());
 
@@ -369,12 +383,14 @@ public void setResultUrl(Uri uri)
             throw new UserCancelledException();
 #endif
         hash = hash.Remove(0, 1);
-        Dictionary<string, string> queryParameters = Utils.ParseQuery(uri.Query);
 
+        Dictionary<string, string> queryParameters = Utils.ParseQuery(uri.Query);
         if (queryParameters.Keys.Contains("error"))
             throw new UnKnownException(queryParameters["error"]);
 
-        string b64Params = hash.Split('=')[1];
+        string newUriString = "http://" + uri.Host + "?" + hash;
+        Uri newUri = new Uri(newUriString);
+        string b64Params = getQueryParamValue(newUri, "b64Params");
         string decodedString = decodeBase64Params(b64Params);
         SessionResponse sessionResponse = null;
         try
@@ -399,6 +415,25 @@ public void setResultUrl(Uri uri)
 #endif
     }
 
+    private string getQueryParamValue(Uri uri, string key)
+    {
+        string value = "";
+        if (uri.Query != null && uri.Query.Length > 0)
+        {
+            string[] queryParameters = uri.Query.Substring(1).Split('&');
+            foreach (string queryParameter in queryParameters)
+            {
+                string[] keyValue = queryParameter.Split('=');
+                if (keyValue[0] == key)
+                {
+                    value = keyValue[1];
+                    break;
+                }
+            }
+        }
+        return value;
+    }
+
     private string decodeBase64Params(string base64Params)
     {
         if(string.IsNullOrEmpty(base64Params))