Merge pull request #1581 from AzureAD/release/6.0.0

Release ADAL 6.0.0

ADAL.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "ADAL"
   s.module_name  = "ADAL"
-  s.version      = "5.0.0"
+  s.version      = "6.0.0"
   s.summary      = "The ADAL SDK for iOS gives you the ability to add Azure Identity authentication to your application"
 
   s.description  = <<-DESC
@@ -49,10 +49,10 @@ Pod::Spec.new do |s|
   # This is a hack because one of the headers is public on mac but private on ios
   s.subspec 'tokencacheheader' do |ph|
   	ph.platform = :ios
-  	ph.ios.source_files = "ADAL/src/public/mac/ADTokenCache.h"
-  	# This extra nonsense is so that it doesn't make ADTokenCache.h a public header on iOS
+  	ph.ios.source_files = "ADAL/src/public/mac/ADALTokenCache.h"
+  	# This extra nonsense is so that it doesn't make ADALTokenCache.h a public header on iOS
   	# And also doesn't generate a podspec warning
-  	ph.ios.private_header_files = "ADAL/src/public/mac/ADTokenCache.h"
+  	ph.ios.private_header_files = "ADAL/src/public/mac/ADALTokenCache.h"
   end
 
   # Note, ADAL has limited support for running in app extensions.

ADAL/automation/ADAutoBaseViewController.h

@@ -25,8 +25,8 @@
 
 @class ADAutoRequestViewController;
 @class ADAutoPassedInWebViewController;
-@class ADAuthenticationContext;
-@protocol ADTokenCacheDataSource;
+@class ADALAuthenticationContext;
+@protocol ADALTokenCacheDataSource;
 
 @interface ADAutoBaseViewController: ADAutoViewController
 
@@ -35,8 +35,8 @@
 
 - (void)showRequestDataViewWithCompletionHandler:(ADAutoParamBlock)completionHandler;
 - (void)showResultViewWithResult:(NSString *)resultJson logs:(NSString *)resultLogs;
-- (void)showPassedInWebViewControllerWithContext:(ADAuthenticationContext *)context;
-- (id<ADTokenCacheDataSource>)cacheDatasource;
+- (void)showPassedInWebViewControllerWithContext:(ADALAuthenticationContext *)context;
+- (id<ADALTokenCacheDataSource>)cacheDatasource;
 - (void)clearCache;
 - (void)clearKeychain;
 - (void)openURL:(NSURL *)url;

ADAL/automation/ios/ADAutoBaseViewController.m

@@ -26,8 +26,8 @@
 #import "ADAutoResultViewController.h"
 #import "ADAutoPassedInWebViewController.h"
 #import "ADAL.h"
-#import "ADTokenCacheDataSource.h"
-#import "ADKeychainTokenCache+Internal.h"
+#import "ADALTokenCacheDataSource.h"
+#import "ADALKeychainTokenCache+Internal.h"
 #import "MSIDKeychainTokenCache.h"
 #import <WebKit/WebKit.h>
 
@@ -88,7 +88,7 @@ - (void)presentResults:(NSString *)resultJson logs:(NSString *)resultLogs
                                                             @"resultLogs":resultLogs ? resultLogs : @""}];
 }
 
-- (void)showPassedInWebViewControllerWithContext:(ADAuthenticationContext *)context
+- (void)showPassedInWebViewControllerWithContext:(ADALAuthenticationContext *)context
 {
     context.webView = self.webView;
 
@@ -107,9 +107,9 @@ - (void)viewDidLoad
 
 }
 
-- (id<ADTokenCacheDataSource>)cacheDatasource
+- (id<ADALTokenCacheDataSource>)cacheDatasource
 {
-    return [ADKeychainTokenCache new];
+    return [ADALKeychainTokenCache new];
 }
 
 - (void)clearCache

ADAL/automation/ios/ADAutoPassedInWebViewController.m

@@ -22,7 +22,7 @@
 // THE SOFTWARE.
 
 #import "ADAutoPassedInWebViewController.h"
-#import "ADWebAuthController.h"
+#import "ADALWebAuthController.h"
 #import <WebKit/WebKit.h>
 
 @interface ADAutoPassedInWebViewController ()
@@ -47,7 +47,7 @@ - (void)viewWillAppear:(BOOL)animated
 - (IBAction)cancelTapped:(id)sender {
 
     [self dismissViewControllerAnimated:YES completion:^{
-        [ADWebAuthController cancelCurrentWebAuthSession];
+        [ADALWebAuthController cancelCurrentWebAuthSession];
     }];
 }
 

ADAL/automation/macos/ADAutoBaseViewController.m

@@ -25,9 +25,9 @@
 #import "ADAutoRequestViewController.h"
 #import "ADAutoResultViewController.h"
 #import "ADAL.h"
-#import "ADTokenCacheDataSource.h"
-#import "ADTokenCache.h"
-#import "ADTokenCache+Internal.h"
+#import "ADALTokenCacheDataSource.h"
+#import "ADALTokenCache.h"
+#import "ADALTokenCache+Internal.h"
 #import "ADTestAppCache.h"
 #import "ADAutoPassedInWebViewController.h"
 
@@ -70,28 +70,28 @@ - (NSViewController *)viewControllerAtIndex:(NSUInteger)index
     return tabViewController.tabViewItems[index].viewController;
 }
 
-- (void)showPassedInWebViewControllerWithContext:(ADAuthenticationContext *)context
+- (void)showPassedInWebViewControllerWithContext:(ADALAuthenticationContext *)context
 {
     [self selectTabViewAtIndex:3];
     ADAutoPassedInWebViewController *webViewController = (ADAutoPassedInWebViewController *) [self viewControllerAtIndex:3];
     [context setWebView:webViewController.passedInWebview];
 }
 
 
-- (id<ADTokenCacheDataSource>)cacheDatasource
+- (id<ADALTokenCacheDataSource>)cacheDatasource
 {
-    return [ADTokenCache defaultCache];
+    return [ADALTokenCache defaultCache];
 }
 
 - (void)clearCache
 {
-    [[ADTokenCache defaultCache].macTokenCache clear];
+    [[ADALTokenCache defaultCache].macTokenCache clear];
     [[ADTestAppCache sharedCache] clearCacheWithError:nil];
 }
 
 - (void)clearKeychain
 {
-    [[ADTokenCache defaultCache].macTokenCache clear];
+    [[ADALTokenCache defaultCache].macTokenCache clear];
     [[ADTestAppCache sharedCache] clearCacheWithError:nil];
 }
 

ADAL/automation/tests/interactive/ADALAADLoginTests.m

@@ -440,7 +440,7 @@ - (void)testAADLogin_withPromptAlways_LoginHint_loginMultipleAccounts
     [self assertAccessTokenNotNil];
 }
 
-// #296758: Different ADUserIdentifierType settings
+// #296758: Different ADALUserIdentifierType settings
 - (void)testAADLogin_withPromptAlways_LoginHint_differentUserTypeSettings
 {
     MSIDTestAutomationConfigurationRequest *configurationRequest = [MSIDTestAutomationConfigurationRequest new];

ADAL/resources/mac/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.0.0</string>
+	<string>6.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

ADAL/src/ADAuthenticationContext+Internal.h → ADAL/src/ADALAuthenticationContext+Internal.h

@@ -22,16 +22,16 @@
 // THE SOFTWARE.
 
 #define CHECK_FOR_NIL(_val) \
-    if (!_val) { completionBlock([ADAuthenticationResult resultFromError:[ADAuthenticationError unexpectedInternalError:@"" #_val " is nil!" correlationId:[_requestParams correlationId]]]); return; }
+    if (!_val) { completionBlock([ADALAuthenticationResult resultFromError:[ADALAuthenticationError unexpectedInternalError:@"" #_val " is nil!" correlationId:[_requestParams correlationId]]]); return; }
 
 #import "ADAL_Internal.h"
 
-@class ADUserIdentifier;
-@protocol ADTokenCacheDataSource;
+@class ADALUserIdentifier;
+@protocol ADALTokenCacheDataSource;
 @class MSIDOauth2Factory;
 
-#import "ADAuthenticationContext.h"
-#import "ADAuthenticationResult+Internal.h"
+#import "ADALAuthenticationContext.h"
+#import "ADALAuthenticationResult+Internal.h"
 
 #import "MSIDOAuth2Constants.h"
 
@@ -41,24 +41,24 @@ extern NSString* const ADInteractionNotSupportedInExtension;
 extern NSString* const ADServerError;
 extern NSString* const ADRedirectUriInvalidError;
 
-@interface ADAuthenticationContext (Internal)
+@interface ADALAuthenticationContext (Internal)
 
 + (BOOL)handleNilOrEmptyAsResult:(NSObject *)argumentValue
                     argumentName:(NSString *)argumentName
-            authenticationResult:(ADAuthenticationResult **)authenticationResult;
+            authenticationResult:(ADALAuthenticationResult **)authenticationResult;
 
-+ (ADAuthenticationError*)errorFromDictionary:(NSDictionary *)dictionary
-                                    errorCode:(ADErrorCode)errorCode;
++ (ADALAuthenticationError*)errorFromDictionary:(NSDictionary *)dictionary
+                                    errorCode:(ADALErrorCode)errorCode;
 
-+ (BOOL)isFinalResult:(ADAuthenticationResult *)result;
++ (BOOL)isFinalResult:(ADALAuthenticationResult *)result;
 
-+ (NSString*)getPromptParameter:(ADPromptBehavior)prompt;
++ (NSString*)getPromptParameter:(ADALPromptBehavior)prompt;
 
-+ (BOOL)isForcedAuthorization:(ADPromptBehavior)prompt;
++ (BOOL)isForcedAuthorization:(ADALPromptBehavior)prompt;
 
 
-+ (ADAuthenticationResult*)updateResult:(ADAuthenticationResult*)result
-                                 toUser:(ADUserIdentifier*)userId
++ (ADALAuthenticationResult*)updateResult:(ADALAuthenticationResult*)result
+                                 toUser:(ADALUserIdentifier*)userId
                            verifyUserId:(BOOL)verifyUserId;
 
 @property (readonly) MSIDOauth2Factory *oauthFactory;