Merge pull request #1591 from Microsoft/develop

Merge into master
microsoft · May 3, 2019 · 1c6f396 · 1c6f396
2 parents 07be938 + 23c883d
commit 1c6f396
Show file tree

Hide file tree

Showing 20 changed files with 36 additions and 20 deletions.
diff --git a/AppCenter.podspec b/AppCenter.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name              = 'AppCenter'
-  s.version           = '2.0.0'
+  s.version           = '2.0.1'
 
   s.summary           = 'Visual Studio App Center is your continuous integration, delivery and learning solution for iOS and macOS apps.'
   s.description       = <<-DESC

diff --git a/AppCenter/AppCenter/Internals/HttpClient/Util/MSHttpUtil.m b/AppCenter/AppCenter/Internals/HttpClient/Util/MSHttpUtil.m
@@ -41,7 +41,11 @@ + (NSString *)hideSecret:(NSString *)secret {
 + (NSString *)hideAuthToken:(NSString *)token {
 
   // Hide token value.
-  NSString *prefix = [[token componentsSeparatedByCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] firstObject];
+  NSArray<NSString *> *tokenArray = [token componentsSeparatedByCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+  if (tokenArray.count == 1) {
+    return @"***";
+  }
+  NSString *prefix = [tokenArray firstObject];
   return [prefix stringByAppendingString:@" ***"];
 }
 

diff --git a/AppCenter/AppCenterTests/MSHttpUtilTests.m b/AppCenter/AppCenterTests/MSHttpUtilTests.m
@@ -56,6 +56,18 @@ - (void)testHideAuthToken {
   assertThat(hiddenToken, is(@"Bearer ***"));
 }
 
+- (void)testHideAuthTokenThatHasNoSpaces {
+
+  // If
+  NSString *token = @"type%3Dresource%26ver%3D1%26sig%3pjGyKiHTIwDwAaZywx9xj1AkvbaA%2";
+
+  // When
+  NSString *hiddenToken = [MSHttpUtil hideAuthToken:token];
+
+  // Then
+  assertThat(hiddenToken, is(@"***"));
+}
+
 - (void)testIsNoInternetConnectionError {
 
   // When

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,8 @@
 # App Center SDK for iOS and macOS Change Log
 
-## Version 2.0.0
+## Version 2.0.1
 
-Version 2.0.0 of the App Center SDK includes two new modules: Auth and Data. This version has a **breaking change**, it only supports Xcode 10.0.0+.
+Version 2.0.1 of the App Center SDK includes two new modules: Auth and Data. This version has a **breaking change**, it only supports Xcode 10.0.0+.
 
 ### AppCenterAuth
 

diff --git a/Config/Version.xcconfig b/Config/Version.xcconfig
@@ -1,2 +1,2 @@
 BUILD_NUMBER = 1
-VERSION_STRING = 2.0.0
+VERSION_STRING = 2.0.1
diff --git a/Documentation/iOS/AppCenter/.jazzy.yaml b/Documentation/iOS/AppCenter/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: iphonesimulator
 theme: ../../Themes/apple
 
 module: AppCenter
-module_version: 2.0.0
+module_version: 2.0.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Documentation/iOS/AppCenterAnalytics/.jazzy.yaml b/Documentation/iOS/AppCenterAnalytics/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: iphonesimulator
 theme: ../../Themes/apple
 
 module: AppCenterAnalytics
-module_version: 2.0.0
+module_version: 2.0.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Documentation/iOS/AppCenterAuth/.jazzy.yaml b/Documentation/iOS/AppCenterAuth/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: iphonesimulator
 theme: ../../Themes/apple
 
 module: AppCenterAuth
-module_version: 2.0.0
+module_version: 2.0.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Documentation/iOS/AppCenterCrashes/.jazzy.yaml b/Documentation/iOS/AppCenterCrashes/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: iphonesimulator
 theme: ../../Themes/apple
 
 module: AppCenterCrashes
-module_version: 2.0.0
+module_version: 2.0.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Documentation/iOS/AppCenterData/.jazzy.yaml b/Documentation/iOS/AppCenterData/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: iphonesimulator
 theme: ../../Themes/apple
 
 module: AppCenterData
-module_version: 2.0.0
+module_version: 2.0.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Documentation/iOS/AppCenterDistribute/.jazzy.yaml b/Documentation/iOS/AppCenterDistribute/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: iphonesimulator
 theme: ../../Themes/apple
 
 module: AppCenterDistribute
-module_version: 2.0.0
+module_version: 2.0.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Documentation/iOS/AppCenterPush/.jazzy.yaml b/Documentation/iOS/AppCenterPush/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: iphonesimulator
 theme: ../../Themes/apple
 
 module: AppCenterPush
-module_version: 2.0.0
+module_version: 2.0.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Documentation/macOS/AppCenter/.jazzy.yaml b/Documentation/macOS/AppCenter/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: macosx
 theme: ../../Themes/apple
 
 module: AppCenter
-module_version: 2.0.0
+module_version: 2.0.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Documentation/macOS/AppCenterAnalytics/.jazzy.yaml b/Documentation/macOS/AppCenterAnalytics/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: macosx
 theme: ../../Themes/apple
 
 module: AppCenterAnalytics
-module_version: 2.0.0
+module_version: 2.0.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Documentation/macOS/AppCenterAuth/.jazzy.yaml b/Documentation/macOS/AppCenterAuth/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: macosx
 theme: ../../Themes/apple
 
 module: AppCenterAuth
-module_version: 2.0.0
+module_version: 2.0.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Documentation/macOS/AppCenterCrashes/.jazzy.yaml b/Documentation/macOS/AppCenterCrashes/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: macosx
 theme: ../../Themes/apple
 
 module: AppCenterCrashes
-module_version: 2.0.0
+module_version: 2.0.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Documentation/macOS/AppCenterPush/.jazzy.yaml b/Documentation/macOS/AppCenterPush/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: macosx
 theme: ../../Themes/apple
 
 module: AppCenterPush
-module_version: 2.0.0
+module_version: 2.0.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Documentation/tvOS/AppCenter/.jazzy.yaml b/Documentation/tvOS/AppCenter/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: appletvsimulator
 theme: ../../Themes/apple
 
 module: AppCenter
-module_version: 2.0.0
+module_version: 2.0.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Documentation/tvOS/AppCenterAnalytics/.jazzy.yaml b/Documentation/tvOS/AppCenterAnalytics/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: appletvsimulator
 theme: ../../Themes/apple
 
 module: AppCenterAnalytics
-module_version: 2.0.0
+module_version: 2.0.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Documentation/tvOS/AppCenterCrashes/.jazzy.yaml b/Documentation/tvOS/AppCenterCrashes/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: appletvsimulator
 theme: ../../Themes/apple
 
 module: AppCenterCrashes
-module_version: 2.0.0
+module_version: 2.0.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com