Merge branch 'dev' into pedroro/switch-to-browser

Author: p3dr0rv

changelog.txt

@@ -1,5 +1,6 @@
 vNext
 ----------
+- [MINOR] Add switch_browser toMicrosoftStsAuthorizationRequest (#2550)
 - [MAJOR] Add suberror for network errors (#2537)
 - [PATCH] Translate MFA token error to UIRequiredException instead of ServiceException (#2538)
 - [MINOR] Add Child Spans for Interactive Span (#2516)

common4j/src/main/com/microsoft/identity/common/java/opentelemetry/SpanName.java

@@ -26,34 +26,25 @@ public enum SpanName {
     AcquirePrtUsingBrt,
     AcquireTokenInteractive,
     AcquireTokenSilent,
-    CryptoFactoryEvent,
     SetScopeForDMAgentForFoci,
     GetAccounts,
     RemoveAccount,
     WorkplaceJoin,
     ATIInteractively,
     ATISilently,
-    DoDiscovery,
     WorkplaceLeave,
     DeviceState,
     CertBasedAuth,
-    UploadBrokerLogs,
-    InitializePowerLift,
     MSAL_PerformIpcStrategy,
     DeviceRegistrationApi,
     WorkplaceJoinApi,
     AcquireTokenDcf,
     AcquireTokenDcfAuthRequest,
     AcquireTokenDcfFetchToken,
-    AccountStorageWithBackup,
     EncryptionManager,
     Passthrough,
     BrokerOperationRequestDispatcher,
-    BrokerDiscoveryManagerGetActiveBroker,
     BrokerDiscoveryManagerPerformDiscoveryProcess,
-    BrokerDiscoveryMetadataAggregator,
-    BrokerSelectionProtocolManager,
-    BrokerDiscoveryV1ProtocolBroadcastResult,
     Fido,
     BrokerAccountServiceRemoveAccounts,
     AcquirePrtUsingTransferToken,

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

@@ -125,6 +125,13 @@ public class MicrosoftStsAuthorizationRequest extends MicrosoftAuthorizationRequ
     // TODO private transient InstanceDiscoveryMetadata mInstanceDiscoveryMetadata;
     // TODO private boolean mIsExtendedLifetimeEnabled = false;
 
+    // The value 1 indicates that client supports DUNA flow.
+    @Getter
+    @Accessors(prefix = "m")
+    @SerializedName("switch_browser")
+    private final String mSwitchBrowser;
+
+
     public static final class Prompt {
         /**
          * AcquireToken will send prompt=select_account to the authorize endpoint. Shows a list of users from which can be
@@ -170,6 +177,7 @@ protected MicrosoftStsAuthorizationRequest(final Builder builder) {
         mApplicationIdentifier = builder.mApplicationIdentifier;
         mMamEnrollmentIdentifier = builder.mMamEnrollmentIdentifier;
         mOpenIdProviderConfiguration = builder.mOpenIdProviderConfiguration;
+        mSwitchBrowser = builder.mSwitchBrowser;
     }
 
     public static class Builder extends MicrosoftAuthorizationRequest.Builder<MicrosoftStsAuthorizationRequest.Builder> {
@@ -186,6 +194,8 @@ public static class Builder extends MicrosoftAuthorizationRequest.Builder<Micros
         private Map<String, String> mFlightParameters = new HashMap<>();
         private OpenIdProviderConfiguration mOpenIdProviderConfiguration;
 
+        private String mSwitchBrowser;
+
         public MicrosoftStsAuthorizationRequest.Builder setUid(String uid) {
             mUid = uid;
             return self();
@@ -241,6 +251,11 @@ public MicrosoftStsAuthorizationRequest.Builder setOpenIdProviderConfiguration(O
             return self();
         }
 
+        public MicrosoftStsAuthorizationRequest.Builder setSwitchBrowser(final String value) {
+            mSwitchBrowser = value;
+            return self();
+        }
+
         @Override
         public MicrosoftStsAuthorizationRequest.Builder self() {
             return this;

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

@@ -296,4 +296,15 @@ public void testSetFlightParameters() throws MalformedURLException, ClientExcept
         assertTrue("Flight Param 1", actualCodeRequestUrl.contains(MOCK_FLIGHT_QUERY_1 + "=" + MOCK_FLIGHT_VALUE_1));
         assertTrue("Flight Param 2", actualCodeRequestUrl.contains(MOCK_FLIGHT_QUERY_2 + "=" + MOCK_FLIGHT_VALUE_2));
     }
+
+    @Test
+    public void testRequestWithSwitchBrowser() throws ClientException, MalformedURLException {
+        final MicrosoftStsAuthorizationRequest request = new MicrosoftStsAuthorizationRequest.Builder()
+                .setAuthority(getValidRequestUrl())
+                .setSwitchBrowser("1")
+                .build();
+
+        final String actualCodeRequestUrl = request.getAuthorizationRequestAsHttpRequest().toString();
+        assertTrue(actualCodeRequestUrl.contains("switch_browser=1"));
+    }
 }