Skip to content

Commit 8f6e570

Browse files
shahzaibjAzure DevOps PipelinefadidurahShahzaib JameelCopilot
authored
Merge Release integration/24.3.0 to dev, Fixes AB#3618269 (#3131)
[AB#3618269](https://identitydivision.visualstudio.com/fac9d424-53d2-45c0-91b5-ef6ba7a6bf26/_workitems/edit/3618269) --------- Co-authored-by: Azure DevOps Pipeline <build-agent@azuredevops.com> Co-authored-by: fadidurah <88730756+fadidurah@users.noreply.github.com> Co-authored-by: Shahzaib Jameel <shjameel@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 3efa7f5 commit 8f6e570

5 files changed

Lines changed: 5 additions & 14 deletions

File tree

changelog.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
vNext
22
----------
3+
4+
Version 24.3.0
5+
----------
36
- [MINOR] Add SwitchBrowserRedirectActivity for non-broker Switch Browser protocol flows. BrokerBrowserRedirectActivity now extends this shared base class (#3133)
47
- [PATCH] Fix Token Endpoint Server Telemetry Parsing (#3128)
58
- [MINOR] Enable passkey registration by default in CommonFlight (ENABLE_PASSKEY_REGISTRATION) (#3132)

common4j/src/main/com/microsoft/identity/common/java/providers/microsoft/microsoftsts/AbstractMicrosoftStsTokenResponseHandler.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import com.microsoft.identity.common.java.util.ResultUtil;
4747
import com.microsoft.identity.common.java.util.StringUtil;
4848

49-
5049
import java.net.HttpURLConnection;
5150
import java.util.HashMap;
5251
import java.util.List;

common4j/src/test/com/microsoft/identity/common/java/providers/microsoft/microsoftsts/MicrosoftStsTokenResponseHandlerTest.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -145,47 +145,36 @@ public void testHandleTokenResponse_withUrlEncodedClientDataHeader_attributesEmi
145145
// eSTS URL-encodes pipe separators in the response header (e.g. "%7C" for "|").
146146
// Real-world example: x-ms-clientdata=[m%7C0x800482A5%7C%7Cmicrosoftonline.com%7Cnone]
147147
final String encodedClientDataHeader = "m%7C0x800482A5%7C%7Cmicrosoftonline.com%7Cnone";
148-
149148
final HashMap<String, List<String>> headers = new HashMap<>();
150149
headers.put("Content-Type", Collections.singletonList("application/json; charset=utf-8"));
151150
headers.put(HttpConstants.HeaderField.X_MS_CLIENTDATA,
152151
Collections.singletonList(encodedClientDataHeader));
153-
154152
final HttpResponse response = new HttpResponse(200, MOCK_TOKEN_SUCCESS_RESPONSE, headers);
155153
final MicrosoftStsTokenResponseHandler handler = new MicrosoftStsTokenResponseHandler();
156-
157154
final Span mockSpan = mock(Span.class);
158155
when(mockSpan.setAttribute(Mockito.anyString(), Mockito.anyString())).thenReturn(mockSpan);
159-
160156
try (MockedStatic<SpanExtension> mockedExtension = Mockito.mockStatic(SpanExtension.class)) {
161157
mockedExtension.when(SpanExtension::current).thenReturn(mockSpan);
162-
163158
final TokenResult tokenResult = handler.handleTokenResponse(response);
164-
165159
Assert.assertNotNull(tokenResult);
166160
Assert.assertTrue(tokenResult.getSuccess());
167161
Assert.assertNotNull(tokenResult.getClientDataInfo());
168162
verify(mockSpan).setAttribute(AttributeName.server_error.name(), "0x800482A5");
169163
verify(mockSpan).setAttribute(AttributeName.account_type.name(), "MSA");
170164
}
171165
}
172-
173166
@SneakyThrows
174167
@Test
175168
public void testHandleTokenResponse_withMalformedPercentEncoding_doesNotCrash() {
176169
// Lone '%' is invalid percent-encoding; decode should fail gracefully and skip ClientDataInfo.
177170
final String malformedHeader = "e|AADSTS50058|%ZZ|us|public";
178-
179171
final HashMap<String, List<String>> headers = new HashMap<>();
180172
headers.put("Content-Type", Collections.singletonList("application/json; charset=utf-8"));
181173
headers.put(HttpConstants.HeaderField.X_MS_CLIENTDATA,
182174
Collections.singletonList(malformedHeader));
183-
184175
final HttpResponse response = new HttpResponse(200, MOCK_TOKEN_SUCCESS_RESPONSE, headers);
185176
final MicrosoftStsTokenResponseHandler handler = new MicrosoftStsTokenResponseHandler();
186-
187177
final TokenResult tokenResult = handler.handleTokenResponse(response);
188-
189178
Assert.assertNotNull(tokenResult);
190179
Assert.assertTrue(tokenResult.getSuccess());
191180
// Malformed encoding => null ClientDataInfo, but token result still valid.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#Wed May 12 20:08:39 UTC 2021
2-
versionName=24.2.0
2+
versionName=24.3.0
33
versionCode=1
44
latestPatchVersion=227

versioning/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#Tue Apr 06 22:55:08 UTC 2021
2-
versionName=24.2.0
2+
versionName=24.3.0
33
versionCode=1
44
latestPatchVersion=234

0 commit comments

Comments
 (0)