Added Web and iOS Plugin Fixes

Author: Chase Crawford

src/msal-capacitor-plugin/README.md

@@ -103,7 +103,7 @@ Using `useContext` hook we will implement an auth provider that will wrap our ap
     }, []);
 
     const initializeOptions = async() => {
-      let uri = isPlatform('capacitor') ? 'ios redirect url' : 'http://localhost:3000';
+      let uri = isPlatform('capacitor') ? 'msauth.{Bundle ID}://auth' : 'http://localhost:3000';
       console.log(uri);
       (await MsalCap.setOptions({
         clientId: 'Client Id',
@@ -226,6 +226,39 @@ Using `useContext` hook we will implement an auth provider that will wrap our ap
   export default AuthContext;
   ```
 
+### 3. Update AppDelegate.swift file in App Folder of ios platform 
+Because the Capacitor Callback bridge can't handle a redirect from a broker applicaiton we need to add the MSALPublicClientApplication Handler response to the ui return.
+
+This happens when redirect are in applications like Microsoft Authenticator.
+
+
+- Find the following applicaiton method below
+  
+  ```swift
+
+   func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool {
+    // Called when the app was launched with a url. Feel free to add additional processing here,
+
+    return CAPBridge.handleOpenUrl(url, options)
+  }
+
+  ```
+- Add the following code
+
+  ```swift
+  func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool {
+      // Called when the app was launched with a url. Feel free to add additional processing here,
+
+      var response = false
+      
+      response = MSALPublicClientApplication.handleMSALRespobse((url), sourceApplication: options[UIApplication.OpenURLOptionsKey.sourceApplication] as? String)
+      response = CAPBridge.handleOpenUrl(url, options)
+      
+      return response
+    }
+
+  ```
+
 ---
 
 

src/msal-capacitor-plugin/ios/Plugin/Plugin.swift

@@ -33,9 +33,8 @@ public class MsalPlugin: CAPPlugin {
 
     @objc func setOptions(_ call: CAPPluginCall) {
         do {
-            // 1. Sometimes Javascripts Apps cause re-renders resulting in options being set again
-            // This protects from options being set again
-            if (call.getBool("guardForRerenders") ?? false) == true && self.msalHasOptions == true {
+            // 1. Sometimes Javascripts Apps cause re-renders resulting in options being set again. This protects from options being set again
+            if (call.getBool("rerenderGuard") ?? false) == true && self.msalHasOptions == true {
                 return
             }
 
@@ -94,7 +93,6 @@ public class MsalPlugin: CAPPlugin {
         }
     }
 
-    
     @objc func acquireAccessTokenForUser(_ call: CAPPluginCall) {
         // 1. Check if Options have been set
         if self.msalHasOptions == false {
@@ -105,8 +103,7 @@ public class MsalPlugin: CAPPlugin {
         if self.msalAuthenticated == true {
             // 2.
             let msalParameters = MSALParameters()
-            msalParameters.completionBlockQueue = DispatchQueue.main
-            
+
             self.msalClient?.getCurrentAccount(with: msalParameters, completionBlock: { (currentAccount, previousAccount, error)  in
                 if let currentAccount = currentAccount {
                     self.msalAccount = currentAccount
@@ -271,7 +268,6 @@ public class MsalPlugin: CAPPlugin {
                 if let completion = completion {
                     completion(nil)
                 }
-
                 return
             }
 
@@ -291,7 +287,6 @@ public class MsalPlugin: CAPPlugin {
         })
     }
 
-    
     private func logoutInteractive(_ call: CAPPluginCall) {
         do {
             // 1. Set Web View Parameters  for iOS or macos
@@ -330,8 +325,8 @@ public class MsalPlugin: CAPPlugin {
         #endif
 
         let parameters = MSALInteractiveTokenParameters(scopes: self.msalPopupScopes!, webviewParameters: webViewParameters)
-        parameters.promptType = .default
-        parameters.completionBlockQueue = DispatchQueue.main
+        parameters.webviewParameters.webviewType = .wkWebView
+        parameters.promptType = .selectAccount
 
         // 3. Acquire Token view Redirect Login through Microsft Identity Platform
         self.msalClient?.acquireToken(with: parameters) { (response, error) in

src/msal-capacitor-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assimalign/msal-capacitor-plugin",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "A custom Capacitor Plugin for MSAL targeting Web and IOS Platforms",
   "main": "dist/index.js",
   "module": "dist/esm/index.js",

src/msal-capacitor-plugin/src/definitions.ts

@@ -37,7 +37,7 @@ export interface IMsalPluginOptions {
   webOptions?: IMsalWebPluginOptions;
   iosOptions?: IMsalIosPluginOptions;
   androidOptions?: IMsalAndroidPluginOptions;
-  guardForRerenders?: boolean;
+  rerenderGuard?: boolean;
 }
 
 export interface IMsalPlugin {

src/msal-capacitor-plugin/src/web.ts

@@ -26,7 +26,7 @@ export class MsalPluginWeb extends WebPlugin implements IMsalPlugin {
       try {
         if(options) {
 
-          if(options.guardForRerenders === true) {
+          if (options.rerenderGuard === true && this.msalHasOptions == true) {
             return
           }