Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/1.1.18 #1305

Merged
merged 11 commits into from
May 24, 2021
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode12
osx_image: xcode12.2

# Set up our rubygems (slather and xcpretty, namely)
install:
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## [1.1.18] - 2021-05-17:
* Minimum Xcode version bumped to 12.2
* Add CCS hint header (#1300)
* Update 'ts' field in AT Pop payload from string to number (#1310)

## [1.1.17] - 2021-04-19
* Added telemetry for different token refresh timing

Expand Down
2 changes: 1 addition & 1 deletion MSAL.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "MSAL"
s.version = "1.1.17"
s.version = "1.1.18"
s.summary = "Microsoft Authentication Library (MSAL) Preview for iOS"
s.description = <<-DESC
The MSAL library preview for iOS gives your app the ability to begin using the Microsoft Cloud by supporting Microsoft Azure Active Directory and Microsoft Accounts in a converged experience using industry standard OAuth2 and OpenID Connect. The library also supports Microsoft Azure B2C for those using our hosted identity management service.
Expand Down
2 changes: 1 addition & 1 deletion MSAL/resources/ios/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.1.17</string>
<string>1.1.18</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion MSAL/resources/mac/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.1.17</string>
<string>1.1.18</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSHumanReadableCopyright</key>
Expand Down
2 changes: 1 addition & 1 deletion MSAL/src/MSAL_Internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#define MSAL_VER_HIGH 1
#define MSAL_VER_LOW 1
#define MSAL_VER_PATCH 17
#define MSAL_VER_PATCH 18

#define STR_HELPER(x) #x
#define STR(x) STR_HELPER(x)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ - (void)testCompanyPortalInstallPrompt_withNonConvergedApp_withSystemWebView
[self acceptAuthSessionDialog];
[self aadEnterPassword];

XCUIElement *enrollButton = self.testApp.buttons[@"Enroll now"];
XCUIElement *enrollButton = self.testApp.buttons[@"Continue"];
[self waitForElement:enrollButton];
sleep(0.5f);
[enrollButton msidTap];
Expand Down Expand Up @@ -414,7 +414,7 @@ - (void)testCompanyPortalInstallPrompt_withConvergedApp_withEmbeddedWebview
[self acquireToken:config];
[self aadEnterPassword];

XCUIElement *enrollButton = self.testApp.buttons[@"Enroll now"];
XCUIElement *enrollButton = self.testApp.buttons[@"Continue"];
[self waitForElement:enrollButton];
[enrollButton msidTap];

Expand Down
3 changes: 2 additions & 1 deletion MSAL/test/unit/MSALAcquireTokenTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -1062,7 +1062,8 @@ - (void)testAcquireTokenInteractive_whenClaimsIsPassedAndLoginHintNotNil_shouldS
@"code_challenge_method" : @"S256",
@"haschrome" : @"1",
@"eqpKey" : @"eqpValue",
@"login_hint": @"upn@test.com"
@"login_hint": @"upn@test.com",
@"X-AnchorMailbox": [MSIDTestIgnoreSentinel new]
} mutableCopy];
[expectedQPs addEntriesFromDictionary:[MSIDDeviceId deviceId]];
[expectedQPs addEntriesFromDictionary:[self getAppMetadata]];
Expand Down
1 change: 1 addition & 0 deletions MSAL/test/unit/utils/MSIDTestURLResponse+MSAL.m
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ + (NSDictionary *)msalDefaultRequestHeaders
headers[@"x-app-name"] = @"MSIDTestsHostApp";
headers[@"x-app-ver"] = @"1.0";
headers[@"x-ms-PkeyAuth"] = @"1.0";
headers[@"X-AnchorMailbox"] = [MSIDTestIgnoreSentinel new];

s_msalHeaders = [headers copy];
});
Expand Down