Merge branch 'master' of https://github.com/Web3Auth/web3auth-unity-sdk

Author: usmankaiz

Assets/Plugins/Web3AuthSDK/Editor/BuildPostProcess.cs

@@ -13,7 +13,7 @@ public class BuildPostProcess
     public static void OnPostprocessBuild(BuildTarget target, string pathToBuiltProject)
     {
 #if UNITY_IOS
-        /*
+        
         Uri uri = null;
 
         try
@@ -39,7 +39,7 @@ public static void OnPostprocessBuild(BuildTarget target, string pathToBuiltProj
         urlSchemes.AddString(uri.Scheme);
 
         infoPlist.WriteToFile(infoPlistPath);
-        */
+        
 
 #endif
     }

Assets/Plugins/Web3AuthSDK/Samples/Web3AuthSample.unity

@@ -886,8 +886,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3eab2a0bf902d6e4b9c2e968ad89f528, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  clientId: BJYIrHuzluClBK0vvTBUJ7kQylV_Dj3NA-X1q4Qvxs2Ay3DySkacOpoOb83lDTHJRVY83bFlYtt4p8pQR-oCYtw
-  redirectUri: com.web3auth.sdkapp://auth
+  clientId: BAwFgL-r7wzQKmtcdiz2uHJKNZdK7gzEf2q-m55xfzSZOw8jLOyIi4AVvvzaEQO5nv2dFLEmf9LBkF8kaq3aErg
+  redirectUri: torusapp://com.torus.Web3AuthUnity/auth
   network: 1
 --- !u!1 &529774071
 GameObject:

Assets/Plugins/Web3AuthSDK/Utils.cs

@@ -8,18 +8,13 @@
 
 public static class Utils
 {
-    //https://qiita.com/lucifuges/items/b17d602417a9a249689f
 #if UNITY_IOS
     [DllImport("__Internal")]
-    extern static void launchUrl(string url);
-    [DllImport("__Internal")]
-    extern static void dismiss();
-    [DllImport("__Internal")]
-    extern static void _web3auth_launch(string url, string redirectUri);
+    extern static void web3auth_launch(string url, string redirectUri, string objectName);
 #endif
 
 
-    public static void LaunchUrl(string url, string redirectUri = null)
+    public static void LaunchUrl(string url, string redirectUri = null, string objectName = null)
     {
         Debug.Log((new Uri(redirectUri)).Scheme);
 #if UNITY_EDITOR || UNITY_STANDALONE_WIN
@@ -34,15 +29,7 @@ public static void LaunchUrl(string url, string redirectUri = null)
 
 #elif UNITY_IOS
     var uri = new Uri(redirectUri);
-    _web3auth_launch(url, uri.Scheme);
-    //launchUrl(url);
-#endif
-    }
-
-    public static void Dismiss()
-    {
-#if UNITY_IOS && !UNITY_EDITOR
-    dismiss();
+    web3auth_launch(url, uri.Scheme, objectName);
 #endif
     }
 

Assets/Plugins/Web3AuthSDK/Web3Auth.cs

@@ -214,7 +214,7 @@ private void request(string  path, LoginParams loginParams = null, Dictionary<st
         uriBuilder.Path = path;
         uriBuilder.Fragment = hash;
 
-        Utils.LaunchUrl(uriBuilder.ToString(), this.initParams["redirectUrl"].ToString());
+        Utils.LaunchUrl(uriBuilder.ToString(), this.initParams["redirectUrl"].ToString(), gameObject.name);
     }
 
     public void setResultUrl(Uri uri)
@@ -239,9 +239,6 @@ public void setResultUrl(Uri uri)
         else
             this.Enqueue(() => this.onLogin?.Invoke(this.web3AuthResponse));
 
-#if UNITY_IOS
-        Utils.Dismiss();
-#endif
     }
 
     public void login(LoginParams loginParams)

Assets/Plugins/Web3AuthSDK/iOS/SafariView.mm

@@ -10,7 +10,7 @@
 #import <UnityFramework/UnityFramework-Swift.h>
 
 extern "C" {
-    void _web3auth_launch(const char *url, const char *redirectUri) {
-        [WebAuthenticate launch:[NSString stringWithUTF8String:url] :[NSString stringWithUTF8String:redirectUri]];
+    void web3auth_launch(const char *url, const char *redirectUri, const char *objectName) {
+        [WebAuthenticate launch:[NSString stringWithUTF8String:url] :[NSString stringWithUTF8String:redirectUri] :[NSString stringWithUTF8String:objectName]];
     }
 }

Assets/Plugins/Web3AuthSDK/iOS/SafariView.mm.meta

@@ -2,36 +2,39 @@ import AuthenticationServices
 import SafariServices
 import UIKit
 
+
 @objc public class WebAuthenticate: NSObject {
     public static let instance = WebAuthenticate();
+    public static var authSession: ASWebAuthenticationSession? = nil;
 
-    @objc public func call(_ url: String,_ redirectUri: String) {
-        let authSession = ASWebAuthenticationSession(
+    @objc public func call(_ url: String,_ redirectUri: String,_ objectName: String) {
+        WebAuthenticate.authSession = ASWebAuthenticationSession(
             url: URL(string: url)!, callbackURLScheme: redirectUri) { callbackURL, authError in
-                
-                print("hello world");
+                guard authError == nil, let callbackURL = callbackURL else {
+                    return
+                }
+
                 let unity = UnityFramework.getInstance();
-                unity?.sendMessageToGO(withName: "Web3Auth", functionName: "onDeepLinkActivated", message: callbackURL?.absoluteString);
+                unity?.sendMessageToGO(withName: objectName, functionName: "onDeepLinkActivated", message: callbackURL.absoluteString);
         }
 
         if #available(iOS 13.0, *) {
-            authSession.presentationContextProvider = self
-            authSession.prefersEphemeralWebBrowserSession = true
+            WebAuthenticate.authSession?.presentationContextProvider = self
+            WebAuthenticate.authSession?.prefersEphemeralWebBrowserSession = true
         }
 
-        authSession.start();
+        WebAuthenticate.authSession?.start();
     }
 
-    @objc public static func launch(_ url: String,_ redirectUri: String) {
-        instance.call(url, redirectUri);
+    @objc public static func launch(_ url: String,_ redirectUri: String,_ objectName: String) {
+        instance.call(url, redirectUri, objectName);
     }
 }
 
 
 @available(iOS 12.0, *)
 extension WebAuthenticate: ASWebAuthenticationPresentationContextProviding {
     public func presentationAnchor(for session: ASWebAuthenticationSession) -> ASPresentationAnchor {
-        let window = UIApplication.shared.windows.first { $0.isKeyWindow }
-        return window ?? ASPresentationAnchor()
+        return UnityFramework.getInstance().appController().window;
     }
 }

Assets/Plugins/Web3AuthSDK/iOS/WebAuthenticate.mm

@@ -1 +1 @@
-torusapp://org.torusresearch.web3authunity/auth
+torusapp://com.torus.Web3AuthUnity/auth

Assets/Plugins/Web3AuthSDK/iOS/WebAuthenticate.swift

@@ -157,12 +157,12 @@ PlayerSettings:
   applicationIdentifier:
     Android: org.torusresearch.web3authunitysdk
     Standalone: org.torusresearch.web3authunitysdk
-    iPhone: com.web3auth.sdkapp
+    iPhone: com.torusresearch.web3auth-unity-sdk
   buildNumber:
     Standalone: 0
     iPhone: 0
     tvOS: 0
-  overrideDefaultApplicationIdentifier: 1
+  overrideDefaultApplicationIdentifier: 0
   AndroidBundleVersionCode: 1
   AndroidMinSdkVersion: 24
   AndroidTargetSdkVersion: 0