Merge pull request #320 from AzureAD/Release-1.2.x

Release 1.2.4
AzureAD · May 19, 2015 · e68a764 · e68a764
2 parents 6f061c4 + 263f402
commit e68a764
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/ADALiOS.podspec b/ADALiOS.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "ADALiOS"
-  s.version      = "1.2.3"
+  s.version      = "1.2.4"
   s.summary      = "The ADAL SDK for iOS gives you the ability to add Azure Identity authentication to your application"
 
   s.description  = <<-DESC

diff --git a/ADALiOS/ADALiOS/ADALiOS.h b/ADALiOS/ADALiOS/ADALiOS.h
@@ -20,7 +20,7 @@
 //version in static define until we identify a better place:
 #define ADAL_VER_HIGH   1
 #define ADAL_VER_LOW    2
-#define ADAL_VER_PATCH  3
+#define ADAL_VER_PATCH  4
 
 #import "ADLogger.h"
 #import "ADErrorCodes.h"

diff --git a/ADALiOS/ADALiOS/ADAuthenticationBroker.m b/ADALiOS/ADALiOS/ADAuthenticationBroker.m
@@ -226,7 +226,13 @@ - (void)start:(NSURL *)startURL
     // Save the completion block
     _completionBlock = [completionBlock copy];
     ADAuthenticationError* error = nil;
-
+
+    _ntlmSession = [ADNTLMHandler startWebViewNTLMHandlerWithError:nil];
+    if (_ntlmSession)
+    {
+        AD_LOG_INFO(@"Authorization UI", @"NTLM support enabled.");
+    }
+
     if (webView)
     {
         AD_LOG_INFO(@"Authorization UI", @"Use the application provided WebView.");
@@ -257,12 +263,6 @@ - (void)start:(NSURL *)startURL
 
         if (parent)
         {
-            _ntlmSession = [ADNTLMHandler startWebViewNTLMHandlerWithError:nil];
-            if (_ntlmSession)
-            {
-                AD_LOG_INFO(@"Authorization UI", @"NTLM support enabled.");
-            }
-
             parentController = parent;
             // Load our resource bundle, find the navigation controller for the authentication view, and then the authentication view
             UINavigationController *navigationController = [[self.class storyboard:&error] instantiateViewControllerWithIdentifier:@"LogonNavigator"];

diff --git a/ADALiOS/ADALiOSBundle/ADALiOSBundle-Info.plist b/ADALiOS/ADALiOSBundle/ADALiOSBundle-Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.3</string>
+	<string>1.2.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.3</string>
+	<string>1.2.4</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2013 MS Open Tech. All rights reserved.</string>
 	<key>NSPrincipalClass</key>

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,7 @@
+Version 1.2.4
+-------------
+* Support NTLM for developers who provide custom webview.
+
 Version 1.2.3
 -------------
 * Fix a bug (#316) where non-ASCII input would result in a nil base64 value.