Merge pull request #577 from AzureAD/oldalton/nsnull_sanitizing_cache

Sanitizing NSNulls in cached JSON
AzureAD · May 30, 2019 · b83e30f · b83e30f
2 parents 7ba9216 + ce4c8ee
commit b83e30f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [0.3.3] - 2019-05-29
+### Updated
+- Ignore cached fields in JSON if they contains "null"
+
 ## [0.3.2] - 2019-05-24
 ### Updated
 - Updated to newer v2 broker protocol version

diff --git a/MSAL.podspec b/MSAL.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MSAL"
-  s.version      = "0.3.2"
+  s.version      = "0.3.3"
   s.summary      = "Microsoft Authentication Library (MSAL) Preview for iOS"
 
   s.description  = <<-DESC

diff --git a/MSAL/IdentityCore b/MSAL/IdentityCore
diff --git a/MSAL/resources/ios/Info.plist b/MSAL/resources/ios/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3.2</string>
+	<string>0.3.3</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/MSAL/resources/mac/Info.plist b/MSAL/resources/mac/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3.2</string>
+	<string>0.3.3</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/MSAL/src/MSAL_Internal.h b/MSAL/src/MSAL_Internal.h
@@ -27,7 +27,7 @@
 
 #define MSAL_VER_HIGH       0
 #define MSAL_VER_LOW        3
-#define MSAL_VER_PATCH      2
+#define MSAL_VER_PATCH      3
 
 #define STR_HELPER(x) #x
 #define STR(x) STR_HELPER(x)
+16 −6		IdentityCore/IdentityCore.xcodeproj/project.pbxproj
+2 −4		IdentityCore/src/MSIDJsonSerializer.m
+13 −12		IdentityCore/src/cache/token/MSIDAccountCacheItem.m
+14 −14		IdentityCore/src/cache/token/MSIDCredentialCacheItem.m
+2 −1		IdentityCore/src/oauth2/aad_v2/MSIDAADV2BrokerResponse.m
+6 −3		IdentityCore/src/telemetry/MSIDTelemetryHttpEvent.m
+2 −3		IdentityCore/src/util/MSIDJsonObject.m
+0 −3		IdentityCore/src/util/NSData+MSIDExtensions.h
+0 −5		IdentityCore/src/util/NSData+MSIDExtensions.m
+4 −1		IdentityCore/src/util/NSDictionary+MSIDExtensions.h
+54 −9		IdentityCore/src/util/NSDictionary+MSIDExtensions.m
+32 −0		IdentityCore/src/util/NSJSONSerialization+MSIDExtensions.h
+43 −0		IdentityCore/src/util/NSJSONSerialization+MSIDExtensions.m
+27 −0		IdentityCore/tests/MSIDCredentialCacheItemTests.m
+31 −0		IdentityCore/tests/MSIDDictionaryExtensionsTests.m
+1 −0		common_version.txt