refactor: rename processEstsReturnRedirect to processEstsHostRedirect and related identifiers

Agent-Logs-Url: https://github.com/AzureAD/microsoft-authentication-library-common-for-android/sessions/78e45bd4-5958-4e41-9f10-eaadb93b8b4f

Co-authored-by: somalaya <69237821+somalaya@users.noreply.github.com>

Author: Copilot

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

@@ -365,8 +365,8 @@ else if (isRedirectUrl(formattedURL)) {
                 processHeaderForwardingRequiredUri(view, url);
             } else if (CommonFlightsManager.INSTANCE.getFlightsProvider().isFlightEnabled(CommonFlight.ENABLE_PRT_HEADER_FOR_ESTS_RETURN_REDIRECT)
                     && isEstsCloudHost(url)) {
-                Logger.info(methodTag, "Navigation returns to eSTS cloud host, re-attaching PRT header.");
-                processEstsReturnRedirect(view, url);
+                Logger.info(methodTag, "Navigation redirects to eSTS cloud host, re-attaching PRT header.");
+                processEstsHostRedirect(view, url);
             } else if (CommonFlightsManager.INSTANCE.getFlightsProvider().isFlightEnabled(CommonFlight.ENABLE_ATTACH_PRT_HEADER_WHEN_CROSS_CLOUD) && isCrossCloudRedirect(formattedURL)) {
                 Logger.info(methodTag,"Navigation contains cross cloud redirect.");
                 processCrossCloudRedirect(view, url);
@@ -1166,15 +1166,15 @@ boolean isEstsCloudHost(@NonNull final String url) {
     }
 
     /**
-     * Processes a return-to-eSTS redirect by generating a fresh PRT credential JWT and attaching it.
+     * Processes an eSTS host redirect by generating a fresh PRT credential JWT and attaching it.
      */
-    private void processEstsReturnRedirect(@NonNull final WebView view, @NonNull final String url) {
-        final String methodTag = TAG + ":processEstsReturnRedirect";
-        Logger.info(methodTag, "Processing return-to-eSTS redirect with PRT re-attachment.");
-        final Span span = createSpanWithAttributesFromParent(SpanName.EstsReturnRedirectPrtAttach.name());
+    private void processEstsHostRedirect(@NonNull final WebView view, @NonNull final String url) {
+        final String methodTag = TAG + ":processEstsHostRedirect";
+        Logger.info(methodTag, "Processing eSTS host redirect with PRT re-attachment.");
+        final Span span = createSpanWithAttributesFromParent(SpanName.EstsHostRedirectPrtAttach.name());
         try {
             final String host = new URL(url).getHost();
-            span.setAttribute(AttributeName.ests_return_host.name(), host);
+            span.setAttribute(AttributeName.ests_redirect_host.name(), host);
         } catch (final MalformedURLException e) {
             // Domain attribute is best-effort for telemetry
         }

…WebViewClientEstsReturnRedirectTest.java …ryWebViewClientEstsHostRedirectTest.javacommon/src/test/java/com/microsoft/identity/common/internal/ui/webview/AzureActiveDirectoryWebViewClientEstsReturnRedirectTest.java renamed to common/src/test/java/com/microsoft/identity/common/internal/ui/webview/AzureActiveDirectoryWebViewClientEstsHostRedirectTest.java common/src/test/java/com/microsoft/identity/common/internal/ui/webview/AzureActiveDirectoryWebViewClientEstsReturnRedirectTest.java renamed to common/src/test/java/com/microsoft/identity/common/internal/ui/webview/AzureActiveDirectoryWebViewClientEstsHostRedirectTest.java

@@ -60,7 +60,7 @@
  * {@link AzureActiveDirectoryWebViewClient}.
  */
 @RunWith(RobolectricTestRunner.class)
-public class AzureActiveDirectoryWebViewClientEstsReturnRedirectTest {
+public class AzureActiveDirectoryWebViewClientEstsHostRedirectTest {
 
     private static final String TEST_REDIRECT_URI = "abc12";
     private static final String TEST_ESTS_URL =
@@ -144,7 +144,7 @@ public void handleUrl_whenFlightEnabled_andEstsHost_returnsTrue() {
     }
 
     @Test
-    public void handleUrl_whenFlightDisabled_andEstsHost_doesNotCallProcessEstsReturnRedirect() {
+    public void handleUrl_whenFlightDisabled_andEstsHost_doesNotCallProcessEstsHostRedirect() {
         final IFlightsProvider mockFlightsProvider = Mockito.mock(IFlightsProvider.class);
         when(mockFlightsProvider.isFlightEnabled(CommonFlight.ENABLE_PRT_HEADER_FOR_ESTS_RETURN_REDIRECT))
                 .thenReturn(false);
@@ -160,7 +160,7 @@ public void handleUrl_whenFlightDisabled_andEstsHost_doesNotCallProcessEstsRetur
     }
 
     @Test
-    public void handleUrl_whenFlightEnabled_andNonEstsHost_doesNotHandleAsEstsReturn() {
+    public void handleUrl_whenFlightEnabled_andNonEstsHost_doesNotHandleAsEstsHostRedirect() {
         final IFlightsProvider mockFlightsProvider = Mockito.mock(IFlightsProvider.class);
         when(mockFlightsProvider.isFlightEnabled(CommonFlight.ENABLE_PRT_HEADER_FOR_ESTS_RETURN_REDIRECT))
                 .thenReturn(true);
@@ -180,8 +180,8 @@ public void handleUrl_whenFlightEnabled_andNonEstsHost_doesNotHandleAsEstsReturn
     @Test
     public void setRequestUrl_extractsLoginHint_whenPresent() {
         // Verifies that setRequestUrl does not throw and populates mLoginHint by
-        // checking indirectly: when the flight is enabled and the redirect returns
-        // to an eSTS host, the handler is called (i.e., processEstsReturnRedirect
+        // checking indirectly: when the flight is enabled and the redirect goes to
+        // an eSTS host, the handler is called (i.e., processEstsHostRedirect
         // was triggered), meaning the URL was handled.
         final IFlightsProvider mockFlightsProvider = Mockito.mock(IFlightsProvider.class);
         when(mockFlightsProvider.isFlightEnabled(CommonFlight.ENABLE_PRT_HEADER_FOR_ESTS_RETURN_REDIRECT))
@@ -193,10 +193,10 @@ public void setRequestUrl_extractsLoginHint_whenPresent() {
         // Set request URL with login_hint — this also populates mLoginHint
         mWebViewClient.setRequestUrl(TEST_ESTS_URL_WITH_LOGIN_HINT);
 
-        // The redirect back to an eSTS host should be handled by the new code path
+        // The eSTS host redirect should be handled by the new code path
         final AzureActiveDirectoryWebViewClient spyClient = spy(mWebViewClient);
         final boolean result = spyClient.shouldOverrideUrlLoading(mMockWebView, TEST_ESTS_URL);
-        assertTrue("Expected eSTS redirect to be handled after login_hint extraction", result);
+        assertTrue("Expected eSTS host redirect to be handled after login_hint extraction", result);
     }
 
     @Test

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

@@ -665,12 +665,12 @@ public enum AttributeName {
     target_blank_navigation_route,
 
     /**
-     * The hostname of the eSTS cloud host to which a WebView redirect returned,
-     * used for telemetry during PRT header re-attachment on eSTS return redirects.
+     * The hostname of the eSTS cloud host targeted by a WebView redirect,
+     * used for telemetry during PRT header re-attachment on eSTS host redirects.
      * Value: the URL host string (e.g. "login.microsoftonline.com").
      * NOTE: This attribute must also be added to the broker repo's AttributeName.java.
      */
-    ests_return_host,
+    ests_redirect_host,
 
     //endregion
 }

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

@@ -64,9 +64,9 @@ public enum SpanName {
     KeyPairGeneration,
     ProcessCrossCloudRedirect,
     /**
-     * Span name for PRT header re-attachment when WebView returns to an eSTS cloud host.
+     * Span name for PRT header re-attachment when WebView redirects to an eSTS cloud host.
      */
-    EstsReturnRedirectPrtAttach,
+    EstsHostRedirectPrtAttach,
     SwitchBrowserResume,
     SwitchBrowserProcess,
     WrappedKeyAlgorithmIdentifier,