Merge pull request #16 from Azure-Samples/jason/updateMSAL0.4.0

Update sample to MSAL 0.4.0

Author: jasoncoolmax

Cartfile

@@ -1 +1 @@
-github "AzureAD/microsoft-authentication-library-for-objc" "dev"
+github "AzureAD/microsoft-authentication-library-for-objc" "0.4.2"

Cartfile.resolved

@@ -36,16 +36,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
 
-        let logger = MSALLogger.init()
-        
-        
         /** When capturing log messages from MSAL you only need to capture either messages where
          containsPII == YES or containsPII == NO, as log messages are duplicated between the
          two, however the containsPII version might contain Personally Identifiable Information (PII)
          about the user being logged in.
          */
 
-        logger.setCallback { (logLevel, message, containsPII) in
+        MSALGlobalConfig.loggerConfig.setLogCallback { (logLevel, message, containsPII) in
 
             if (!containsPII) {
 
@@ -83,8 +80,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
         print("Received callback!")
 
-        MSALPublicClientApplication.handleMSALResponse(url)
+        guard let sourceApp = sourceApplication else { return false }
 
+        MSALPublicClientApplication.handleMSALResponse(url, sourceApplication: sourceApp)
 
         return true
     }

MSALiOSB2C/AppDelegate.swift

@@ -28,7 +28,6 @@
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>msal90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6</string>
-				<string>auth</string>
 			</array>
 		</dict>
 	</array>

MSALiOSB2C/Info.plist

@@ -4,8 +4,7 @@
 <dict>
 	<key>keychain-access-groups</key>
 	<array>
-		<string>$(AppIdentifierPrefix)com.microsoft.identity.client.sample.MSALiOSB2C</string>
-		<string>$(AppIdentifierPrefix)com.microsoft.msalcache</string>
+		<string>$(AppIdentifierPrefix)com.microsoft.adalcache</string>
 	</array>
 </dict>
 </plist>

MSALiOSB2C/MSALiOSB2C.entitlements

@@ -25,7 +25,11 @@ The MSAL preview library for iOS and macOS gives your app the ability to begin u
 
 ```swift
 do {
-    let application = try MSALPublicClientApplication.init(clientId: <your-client-id-here> authority: kAuthority)
+    // Create an instance of MSALPublicClientApplication with proper config
+    let authority = try MSALB2CAuthority(url: URL(string:kAuthority)!)
+    let pcaConfig = MSALPublicClientApplicationConfig(clientId: <your-client-id-here>, redirectUri: nil, authority: authority)
+    let application = try MSALPublicClientApplication(configuration: pcaConfig)
+    
     application.acquireToken(forScopes: kScopes) { (result, error) in
     DispatchQueue.main.async {
     if result != nil {