Merge pull request #1528 from AzureAD/release/4.0.7

Release ADAL 4.0.7
AzureAD · Apr 18, 2020 · fa10566 · fa10566
2 parents ddab70f + 0ca2a93
commit fa10566
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 10 deletions.
diff --git a/ADAL.podspec b/ADAL.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "ADAL"
   s.module_name  = "ADAL"
-  s.version      = "4.0.6"
+  s.version      = "4.0.7"
   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/ADAL/IdentityCore b/ADAL/IdentityCore
diff --git a/ADAL/resources/ios/Framework/Info.plist b/ADAL/resources/ios/Framework/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.0.6</string>
+	<string>4.0.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/ADAL/src/ADAL_Internal.h b/ADAL/src/ADAL_Internal.h
@@ -28,7 +28,7 @@
 
 #define ADAL_VER_HIGH       4
 #define ADAL_VER_LOW        0
-#define ADAL_VER_PATCH      6
+#define ADAL_VER_PATCH      7
 
 #define STR_HELPER(x) #x
 #define STR(x) STR_HELPER(x)

diff --git a/ADAL/src/ADAuthenticationContext.m b/ADAL/src/ADAuthenticationContext.m
@@ -22,11 +22,13 @@
 // THE SOFTWARE.
 
 #import "ADAuthenticationSettings.h"
-#import "ADTokenCache+Internal.h"
 #import "ADRequestParameters.h"
 #if TARGET_OS_IPHONE
 #import "ADKeychainTokenCache+Internal.h"
 #import "MSIDKeychainTokenCache.h"
+#else
+#import "ADTokenCache.h"
+#import "ADTokenCache+Internal.h"
 #endif 
 
 #import "ADAuthenticationContext+Internal.h"
@@ -42,7 +44,6 @@
 #import "MSIDMacTokenCache.h"
 #import "MSIDLegacyTokenCacheAccessor.h"
 #import "MSIDDefaultTokenCacheAccessor.h"
-#import "ADTokenCache.h"
 #import "MSIDAADV1Oauth2Factory.h"
 
 // This variable is purposefully a global so that way we can more easily pull it out of the
@@ -53,8 +54,10 @@
 @interface ADAuthenticationContext()
 
 @property (nonatomic) MSIDLegacyTokenCacheAccessor *tokenCache;
+#if !TARGET_OS_IPHONE
 // It is used only for delegate proxy purposes between legacy mac delegate and msdi mac delegate.
 @property (nonatomic) ADTokenCache *legacyMacCache;
+#endif
 // iOS keychain group.
 @property (nonatomic) NSString *sharedGroup;
 

diff --git a/ADAL/src/broker/ios/ADBrokerKeyHelper.m b/ADAL/src/broker/ios/ADBrokerKeyHelper.m
@@ -329,7 +329,7 @@ + (NSDictionary *)decryptBrokerResponse:(NSDictionary *)response correlationId:(
     }
 
     //now compute the hash on the unencrypted data
-    NSString *actualHash = [MSIDPkeyAuthHelper computeThumbprint:decrypted isSha2:YES];
+    NSString *actualHash = [MSIDPkeyAuthHelper computeThumbprint:decrypted];
     if(![hash isEqualToString:actualHash])
     {
         AUTH_ERROR(AD_ERROR_TOKENBROKER_RESPONSE_HASH_MISMATCH, @"Decrypted response does not match the hash", correlationId);

diff --git a/ADAL/src/public/ADAuthenticationContext.h b/ADAL/src/public/ADAuthenticationContext.h
@@ -29,10 +29,10 @@
 @class ADUserInformation;
 @class ADUserIdentifier;
 @class UIViewController;
-@class ADTokenCache;
 @class WKWebView;
 
 #if !TARGET_OS_IPHONE
+@class ADTokenCache;
 @protocol ADTokenCacheDelegate;
 #endif
 

diff --git a/ADAL/src/public/ADAuthenticationSettings.h b/ADAL/src/public/ADAuthenticationSettings.h
@@ -23,7 +23,9 @@
 
 #import <Foundation/Foundation.h>
 
+#if !TARGET_OS_IPHONE
 @protocol ADTokenCacheDelegate;
+#endif
 
 /*! The class stores global settings for the ADAL library. It is a singleton class
  and the alloc, init and new should not be called directly. The "sharedInstance" selector

diff --git a/ADAL/src/request/ADAuthenticationRequest+WebRequest.m b/ADAL/src/request/ADAuthenticationRequest+WebRequest.m
@@ -114,7 +114,7 @@ - (NSString *)getRefreshTokenForRequest
             }
         }
 
-        MSID_LOG_VERBOSE(_requestParams, @"Retrieve refresh token from cache for web view: %@, error code: %ld", _PII_NULLIFY(refreshTokenItem), refreshTokenError.code);
+        MSID_LOG_VERBOSE(_requestParams, @"Retrieve refresh token from cache for web view: %@, error code: %ld", _PII_NULLIFY(refreshTokenItem), (long)refreshTokenError.code);
         return [refreshTokenItem refreshToken];
     }
 

diff --git a/ADAL/tests/app/resources/ios/Info.plist b/ADAL/tests/app/resources/ios/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.0.6</string>
+	<string>4.0.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,8 @@
+Version 4.0.7 (04.17.2020)
+------
+* Remove ADTokenCache.h dependency from iOS library since that header only exists on macOS (#1526)
+* Remove ADAL SHA-1 dependency (#1525)
+
 Version 4.0.6 (02.21.2020)
 ------
 * Support passing refresh token in the header to avoid extra prompts (#1495)