Merge pull request #240 from AzureAD/enroll_fix

enroll button fix

Author: omercs

ADALiOS.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "ADALiOS"
-  s.version      = "1.1.11"
+  s.version      = "1.1.12"
   s.summary      = "The ADAL SDK for iOS gives you the ability to add Azure Identity authentication to your application"
 
   s.description  = <<-DESC

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    1
-#define ADAL_VER_PATCH  11
+#define ADAL_VER_PATCH  12
 
 #import "ADLogger.h"
 #import "ADErrorCodes.h"

ADALiOS/ADALiOS/ADAuthenticationWebViewController.m

@@ -115,6 +115,13 @@ - (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)
     //DebugLog( @"URL: %@", request.URL.absoluteString );
     NSString *requestURL = [request.URL absoluteString];
 
+    
+    if ([[[request.URL scheme] lowercaseString] isEqualToString:@"browser"]) {
+        requestURL = [requestURL stringByReplacingOccurrencesOfString:@"browser://" withString:@"https://"];
+        [[UIApplication sharedApplication] openURL:[[NSURL alloc] initWithString:requestURL]];
+        return NO;
+    }
+    
     // check for pkeyauth challenge.
     if ([requestURL hasPrefix: pKeyAuthUrn] )
     {
@@ -150,12 +157,6 @@ - (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)
         return NO;
     }
 
-    if ([[[request.URL scheme] lowercaseString] isEqualToString:@"browser"] && navigationType == UIWebViewNavigationTypeLinkClicked) {
-        requestURL = [requestURL stringByReplacingOccurrencesOfString:@"browser://" withString:@"https://"];
-        [[UIApplication sharedApplication] openURL:[[NSURL alloc] initWithString:requestURL]];
-        return NO;
-    }
-    
     return YES;
 }
 

ADALiOS/ADALiOS/ADRegistrationInformation.m

@@ -78,7 +78,6 @@ -(void) releaseData{
         }
 
         if(_certificateSubject){
-            CFRelease((__bridge CFTypeRef)(_certificateSubject));
             _certificateSubject = nil;
         }
 
@@ -87,7 +86,6 @@ -(void) releaseData{
         }
 
         if(_userPrincipalName){
-            CFRelease((__bridge CFTypeRef)(_userPrincipalName));
             _userPrincipalName = nil;
         }
 

changelog.txt

@@ -1,3 +1,7 @@
+Version 1.1.12
+--------------
+* Fix to ignore navigation type in the webview. It was blocking users from enrolling their device.
+
 Version 1.1.11
 --------------
 This release contains bug fixes and updates for an improved developer experience. Given below is the changelist -