create snippets

Author: p3dr0rv

common/src/main/java/com/microsoft/identity/common/adal/internal/AuthenticationConstants.java

@@ -22,12 +22,16 @@
 // THE SOFTWARE.
 package com.microsoft.identity.common.adal.internal;
 
+import android.net.Uri;
+
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import com.microsoft.identity.common.internal.logging.Logger;
 import com.microsoft.identity.common.java.broker.BrokerAccountDataName;
 
 import java.nio.charset.Charset;
+import java.util.Set;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -549,6 +553,23 @@ public static final class SWITCH_BROWSER {
          * String Query parameter key for the endpoint.
          */
         public static final String ACTION = "action";
+
+        /**
+         * Check if the request is to switch the browser.
+         * <p>
+         * The request is considered "switch_browser" if the URL contains
+         * the action URI, code, and action parameters.
+         *
+         * @param uri The URI of the request.
+         * @return True if the request contains the required parameters, false otherwise.
+         */
+        public static boolean isSwitchBrowserRequest(@Nullable final Uri uri) {
+            if (uri == null) {
+                return false;
+            }
+            final Set<String> requiredParams = Set.of(ACTION_URI, CODE, ACTION);
+            return uri.getQueryParameterNames().containsAll(requiredParams);
+        }
     }
 
     /**

common/src/main/java/com/microsoft/identity/common/internal/providers/oauth2/WebViewAuthorizationFragment.java

@@ -476,6 +476,23 @@ public boolean launchWebBrowserIntent(@NonNull final Uri uri) {
         return false;
     }
 
+    public Uri constructSwithBrowserUri(@NonNull final String action_uri, @Nullable final HashMap<String, String> params) {
+        final String[] paths = action_uri.split("/");
+        final String authority = paths[0];
+        final Uri.Builder uriBuilder = new Uri.Builder()
+                .scheme("https")
+                .encodedAuthority(authority);
+        for (int i = 1; i < paths.length; i++) {
+            uriBuilder.appendPath(paths[i]);
+        }
+        if (params != null) {
+            for (HashMap.Entry<String, String> entry : params.entrySet()) {
+                uriBuilder.appendQueryParameter(entry.getKey(), entry.getValue());
+            }
+        }
+        return uriBuilder.build();
+    }
+
     /**
      * Helper method to check if the authorization request is being made through broker.
      * Done by checking for broker version key in the url

common/src/main/java/com/microsoft/identity/common/internal/ui/webview/AzureActiveDirectoryWebViewClient.java

@@ -70,13 +70,13 @@
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Set;
 
 import static com.microsoft.identity.common.adal.internal.AuthenticationConstants.Broker.AMAZON_APP_REDIRECT_PREFIX;
 import static com.microsoft.identity.common.adal.internal.AuthenticationConstants.Broker.COMPANY_PORTAL_APP_PACKAGE_NAME;
 import static com.microsoft.identity.common.adal.internal.AuthenticationConstants.Broker.IPPHONE_APP_PACKAGE_NAME;
 import static com.microsoft.identity.common.adal.internal.AuthenticationConstants.Broker.IPPHONE_APP_SIGNATURE;
 import static com.microsoft.identity.common.adal.internal.AuthenticationConstants.Broker.PLAY_STORE_INSTALL_PREFIX;
+import static com.microsoft.identity.common.adal.internal.AuthenticationConstants.SWITCH_BROWSER.isSwitchBrowserRequest;
 import static com.microsoft.identity.common.java.AuthenticationConstants.AAD.APP_LINK_KEY;
 
 import io.opentelemetry.api.trace.SpanContext;
@@ -312,26 +312,6 @@ private boolean isHeaderForwardingRequiredUri(@NonNull final String url) {
         return urlIsTrustedToReceiveHeaders && originalRequestHasHeaders;
     }
 
-    /**
-     * Check if the request is to switch the browser.
-     * <p>
-     * The request is considered "switch_browser" if the URL contains the action URI, code, and action parameters.
-     *
-     * @param uri The URI of the request.
-     * @return True if the request contains the required parameters, false otherwise.
-     */
-    private boolean isSwitchBrowserRequest(@Nullable final Uri uri) {
-        final Set<String> requiredParams = Set.of(
-                AuthenticationConstants.SWITCH_BROWSER.ACTION_URI,
-                AuthenticationConstants.SWITCH_BROWSER.CODE,
-                AuthenticationConstants.SWITCH_BROWSER.ACTION
-        );
-        if (uri == null) {
-            return false;
-        }
-        return uri.getQueryParameterNames().containsAll(requiredParams);
-    }
-
     // This function is only called when the client received a redirect that starts with the apps
     // redirect uri.
     protected void processRedirectUrl(@NonNull final WebView view, @NonNull final String url) {
@@ -362,17 +342,11 @@ protected boolean processSwitchToBrowserRequest(@NonNull final Uri uri) {
             Logger.error(TAG, "Switch browser action URI or code is null. Cannot switch browser.", null);
             return false;
         }
-        final String[] paths = action_uri.split("/");
-        final String authority = paths[0];
-        final Uri.Builder uriBuilder = new Uri.Builder()
-                .scheme("https")
-                .encodedAuthority(authority)
-                .appendQueryParameter(AuthenticationConstants.SWITCH_BROWSER.CODE, code)
-                .appendQueryParameter(AuthenticationConstants.OAuth2.REDIRECT_URI, mRedirectUrl);
-        for (int i = 1; i < paths.length; i++) {
-            uriBuilder.appendPath(paths[i]);
-        }
-        return fragment.launchWebBrowserIntent(uriBuilder.build());
+        final HashMap<String, String> queryParams = new HashMap<>();
+        queryParams.put(AuthenticationConstants.SWITCH_BROWSER.CODE, code);
+        queryParams.put(AuthenticationConstants.OAuth2.REDIRECT_URI, mRedirectUrl);
+        final Uri swithBrowserUri = fragment.constructSwithBrowserUri(action_uri, queryParams);
+        return fragment.launchWebBrowserIntent(swithBrowserUri);
     }
 
     private void processWebsiteRequest(@NonNull final WebView view, @NonNull final String url) {