Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common
Submodule common updated 37 files
+1 −0 changelog.txt
+21 −7 common/src/main/java/com/microsoft/identity/common/adal/internal/AuthenticationConstants.java
+13 −0 common/src/main/java/com/microsoft/identity/common/internal/broker/BrokerRequest.java
+1 −0 common/src/main/java/com/microsoft/identity/common/internal/cache/WebAppsAccountIdRegistry.kt
+109 −81 common/src/main/java/com/microsoft/identity/common/internal/controllers/BrokerMsalController.java
+10 −0 common/src/main/java/com/microsoft/identity/common/internal/platform/AndroidPlatformUtil.java
+22 −8 common/src/main/java/com/microsoft/identity/common/internal/request/MsalBrokerRequestAdapter.java
+13 −0 common/src/main/java/com/microsoft/identity/common/internal/result/AdalBrokerResultAdapter.java
+20 −0 common/src/main/java/com/microsoft/identity/common/internal/result/IBrokerResultAdapter.java
+112 −11 common/src/main/java/com/microsoft/identity/common/internal/result/MsalBrokerResultAdapter.java
+180 −0 common/src/main/java/com/microsoft/identity/common/internal/util/WebAppsUtil.kt
+284 −0 common/src/test/java/com/microsoft/identity/common/internal/controllers/BrokerMsalControllerTest.java
+70 −0 common/src/test/java/com/microsoft/identity/common/shadows/ShadowAcquireTokenInternalBrokerMsalController.kt
+2 −1 .../src/main/com/microsoft/identity/common/java/commands/parameters/BrokerDeviceCodeFlowCommandParameters.java
+18 −2 ...rc/main/com/microsoft/identity/common/java/commands/parameters/BrokerInteractiveTokenCommandParameters.java
+21 −11 ...n4j/src/main/com/microsoft/identity/common/java/commands/parameters/BrokerSilentTokenCommandParameters.java
+2 −1 common4j/src/main/com/microsoft/identity/common/java/commands/parameters/RopcTokenCommandParameters.java
+1 −1 common4j/src/main/com/microsoft/identity/common/java/commands/parameters/SilentTokenCommandParameters.java
+2 −1 common4j/src/main/com/microsoft/identity/common/java/commands/parameters/TokenCommandParameters.java
+39 −0 common4j/src/main/com/microsoft/identity/common/java/commands/webapps/MatsProperties.kt
+122 −0 common4j/src/main/com/microsoft/identity/common/java/commands/webapps/WebAppBrokerErrorCode.kt
+80 −0 common4j/src/main/com/microsoft/identity/common/java/commands/webapps/WebAppError.kt
+49 −0 common4j/src/main/com/microsoft/identity/common/java/commands/webapps/WebAppErrorDetails.kt
+48 −0 common4j/src/main/com/microsoft/identity/common/java/commands/webapps/WebAppsAccountItem.kt
+46 −0 common4j/src/main/com/microsoft/identity/common/java/commands/webapps/WebAppsGetTokenSubOperationEnvelope.kt
+100 −0 common4j/src/main/com/microsoft/identity/common/java/commands/webapps/WebAppsGetTokenSubOperationRequest.kt
+74 −0 common4j/src/main/com/microsoft/identity/common/java/commands/webapps/WebAppsGetTokenSubOperationResponse.kt
+45 −0 common4j/src/main/com/microsoft/identity/common/java/commands/webapps/WebAppsSupportedContracts.kt
+8 −0 common4j/src/main/com/microsoft/identity/common/java/eststelemetry/PublicApiId.java
+5 −0 common4j/src/main/com/microsoft/identity/common/java/exception/ErrorStrings.java
+5 −0 common4j/src/main/com/microsoft/identity/common/java/flighting/CommonFlight.java
+48 −0 .../main/com/microsoft/identity/common/java/providers/microsoft/azureactivedirectory/AzureActiveDirectory.java
+26 −0 common4j/src/main/com/microsoft/identity/common/java/providers/oauth2/OpenIdConnectPromptParameter.java
+6 −1 common4j/src/main/com/microsoft/identity/common/java/request/BrokerRequestType.java
+9 −0 common4j/src/main/com/microsoft/identity/common/java/util/IPlatformUtil.java
+52 −0 common4j/src/test/com/microsoft/identity/common/java/providers/oauth2/OpenIdConnectPromptParameterTest.java
+4 −0 common4j/src/testFixtures/java/com/microsoft/identity/common/components/MockPlatformComponentsFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,7 @@ public void testDeviceCodeFlowTokenExpiredToken() throws IOException, ClientExce

// Previously authenticated code
tokenRequest.setDeviceCode(
"BAQABIQEAAADnfolhJpSnRYB1SVj-Hgd8CWNtqmssVukUXfdCHy1XJMxy2O7R0WZgTVcQVF4A3fjnWPQ1JPXf-"
+ "SIl-NLuC9gGzGRgsLyUyknjbUReNC7vcHx8jigGiO2CkKi_Mc_YRU0E0lGH3EQZiJNwHxUc_YkTGG5DKl9sww36TdMPz-v7Bzy6cHzR6r3yQWULGNtidaogAA");
"EAQABIQEAAABlMNzVhAPUTrARzfQjWPtKRXZvU3RzQXJ0aWZhY3RzAQAAAAAAPYh9V3CvjvOB825bqyY61Bde3S6FzapbES5Yr5kuUdO4amvrqBW9JTaXBUIH9PMoK7yFKza-nSqRHL0yoxYNHhkg0f1_juE50MlJSvdXBWJEsHHZk2y2T5804dMx1QZX0739imnhE0Y9Lm1Wd5iFbaTQZrcD9oKgxxKRL8GavO4gAA");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

EAQABIQEAAABlMNz

was this generated msal test app?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good to include instruction or comment how to handle in case of failure, especially inputs on generating new device code? can be helpful in future,

Copy link
Contributor Author

@melissaahn melissaahn Dec 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll put some instructions here: I used debug msalTestApp to run DCF with a breakpoint here, and from that breakpoint, I took the device code value. I think it took about 30 ish min to expire.

Some folks are also wondering if maybe this test isn't needed anymore. @fadidurah can you evaluate this when you get back?


final TokenResult tokenResult = strategy.requestToken(tokenRequest);
Assert.assertNull(tokenResult.getTokenResponse());
Expand Down
Loading