Added Fixes for Web and ios

Author: Chase R. Crawford (Tek)

src/msal-capacitor-plugin-demo/ios/App/App.xcodeproj/project.pbxproj

@@ -349,12 +349,12 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = NGDMY4TLA6;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = App/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
-				PRODUCT_BUNDLE_IDENTIFIER = io.ionic.starter;
+				PRODUCT_BUNDLE_IDENTIFIER = some.bundle.id;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG USE_PUSH";
 				SWIFT_VERSION = 5.0;
@@ -369,11 +369,11 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = NGDMY4TLA6;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = App/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = io.ionic.starter;
+				PRODUCT_BUNDLE_IDENTIFIER = some.bundle.id;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = USE_PUSH;
 				SWIFT_VERSION = 5.0;

src/msal-capacitor-plugin-demo/ios/App/App/App.entitlements

@@ -4,9 +4,7 @@
 <dict>
 	<key>keychain-access-groups</key>
 	<array>
-		<string>$(AppIdentifierPrefix)com.microsoft.adalcache</string>
-		<string>$(AppIdentifierPrefix)com.microsoft.identity.universalstorage</string>
-		<string>$(AppIdentifierPrefix)sessionStorage</string>
+		<string>$(AppIdentifierPrefix)com.company.cache</string>
 	</array>
 </dict>
 </plist>

src/msal-capacitor-plugin-demo/ios/App/App/Info.plist

@@ -2,13 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>LSApplicationQueriesSchemes</key>
-	<array>
-		<string>msauthv2</string>
-		<string>msauthv3</string>
-	</array>
-	<key>NSFaceIDUsageDescription</key>
-	<string>For an easier and faster log in.</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
@@ -33,12 +26,17 @@
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>capacitor</string>
-				<string>msauth.assimalign.MSALiOS</string>
+				<string></string>
 			</array>
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
 	<string>1</string>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>msauthv2</string>
+		<string>msauthv3</string>
+	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
@@ -48,6 +46,8 @@
 	</dict>
 	<key>NSCameraUsageDescription</key>
 	<string>To Take Photos and Video</string>
+	<key>NSFaceIDUsageDescription</key>
+	<string>For an easier and faster log in.</string>
 	<key>NSLocationAlwaysUsageDescription</key>
 	<string>Always allow Geolocation?</string>
 	<key>NSLocationWhenInUseUsageDescription</key>

src/msal-capacitor-plugin-demo/ios/App/Podfile

@@ -10,7 +10,7 @@ def capacitor_pods
   # Automatic Capacitor Pod dependencies, do not delete
   pod 'Capacitor', :path => '../../node_modules/@capacitor/ios'
   pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
-  pod 'AssimalignMsalCapacitorPlugin', :path => '..\..\..\msal-capacitor-plugin'
+  pod 'AssimalignMsalCapacitorPlugin', :path => '../../../msal-capacitor-plugin'
   # Do not delete
 end
 

src/msal-capacitor-plugin-demo/src/context/auth/AuthContext.tsx

@@ -21,11 +21,11 @@ export const useAuthentication = (): IAuthContext => {
   }, []);
 
   const initializeOptions = async() => {
-    let uri = isPlatform('capacitor') ? 'msauth.{iOS MAC redirect Url}://auth' : 'http://localhost:3000';
+    let uri = isPlatform('capacitor') ? 'msauth.{bundle Id}://auth' : 'http://localhost:3000';
     console.log(uri);
     (await MsalCap.setOptions({
-      clientId: 'Client ID',
-      authority: `https://login.microsoftonline.com/{Tenant ID}`,
+      clientId: 'Client Id',
+      authority: `https://login.microsoftonline.com/{Tenant Id}`,
       redirectUri: uri,
       scopes: [
         'user.read'

src/msal-capacitor-plugin/README.md

@@ -30,6 +30,30 @@ Below are examples are of how to implement an authentication provider that can b
 - Step 4 : `npm i @assimalign/msal-capacitor-plugin`
 - Step 5 : `ionic cap sync` Downlaoad Package
 
+
+### Ios Specific Setup: Add keys to info.plist File
+```xml
+  <key>LSApplicationQueriesSchemes</key>
+  <array>
+    <string>msauthv2</string>
+    <string>msauthv3</string>
+  </array>
+  <key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>com.getcapacitor.capacitor</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>capacitor</string>
+				<string><!--The Key Sharing Groups which will be added to XCode--></string>
+			</array>
+		</dict>
+	</array>
+  <!-- If use Biometric Auth-->
+  <key>NSFaceIDUsageDescription</key>
+  <string>For an easier and faster log in.</string>
+```
 ---
 
 ## React App Instruction (Typescript)
@@ -61,8 +85,7 @@ Using `useContext` hook we will implement an auth provider that will wrap our ap
   import { IAuthContext } from './types';
   import { Plugins } from '@capacitor/core';
   import { isPlatform } from '@ionic/react';
-  import { AvailableResult, BiometryType } from 'capacitor-native-biometric';
-  import '@eastdil/msal-capacitor-plugin';
+  import '@assimalign/msal-capacitor-plugin';
 
   const AuthContext = createContext<IAuthContext>({
     isAuthenticated: () => { },

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

@@ -45,23 +45,25 @@ public class MsalPlugin: CAPPlugin {
                 } else {
                     self.msalUseBiometrics = isoOptions["enableBiometrics"] as! Bool;
                 }
+                
+                var tokenCache = ""
 
-               var tokenCache = ""
+                 #if os(iOS)
+                 if isoOptions["keyShareLocation"] == nil {
+                     tokenCache = "com.microsoft.adalcache"
+                 } else {
+                     tokenCache = isoOptions["keyShareLocation"] as! String
+                 }
+                 #else
+                 if isoOptions["keyShareLocation"] == nil {
+                     tokenCache = "com.microsoft.identity.universalstorage"
+                 } else {
+                     tokenCache = isoOptions["keyShareLocation"] as! String
+                 }
+                 #endif
+                 clientConfiguration.cacheConfig.keychainSharingGroup = tokenCache
 
-                #if os(iOS)
-                if isoOptions["keyShareLocation"] == nil {
-                    tokenCache = "com.microsoft.adalcache"
-                } else {
-                    tokenCache = isoOptions["keyShareLocation"] as! String
-                }
-                #else
-                if isoOptions["keyShareLocation"] == nil {
-                    tokenCache = "com.microsoft.identity.universalstorage"
-                } else {
-                    tokenCache = isoOptions["keyShareLocation"] as! String
-                }
-                #endif
-                clientConfiguration.cacheConfig.keychainSharingGroup = tokenCache
+               
             } else {
                 self.msalUseBiometrics = false
             }
@@ -209,7 +211,7 @@ public class MsalPlugin: CAPPlugin {
                     if success {
                         DispatchQueue.main.async {
                             self.setCurrentAccount {(account) in
-                                guard let currentAccount = self.msalAccount else {
+                                guard let currentAccount = account else {
                                     self.loginInteractive(call)
                                     return
                                 }
@@ -255,6 +257,10 @@ public class MsalPlugin: CAPPlugin {
 
         self.msalClient?.getCurrentAccount(with: msalParameters, completionBlock: { (currentAccount, previousAccount, error) in
             if let error = error {
+                if let completion = completion {
+                    completion(nil)
+                }
+
                 return
             }
 
@@ -313,7 +319,8 @@ public class MsalPlugin: CAPPlugin {
         #endif
 
         let parameters = MSALInteractiveTokenParameters(scopes: self.msalPopupScopes!, webviewParameters: webViewParameters)
-        parameters.promptType = .selectAccount
+        parameters.promptType = .default
+        parameters.completionBlockQueue = DispatchQueue.main
 
         // 3. Acquire Token view Redirect Login through Microsft Identity Platform
         self.msalClient?.acquireToken(with: parameters) { (response, error) in