implement the AuthenticateUsing Alert API in java

Author: lukeis

Diff for: java/CHANGELOG

@@ -1,3 +1,8 @@
+v2.47.0 in development
+======================
+
+* Beta Alert.AuthenticateUsing api implementation added, beta testing with IE. 
+
 v2.46.0
 =======
 

Diff for: java/client/src/org/openqa/selenium/Alert.java

@@ -17,7 +17,7 @@
 
 package org.openqa.selenium;
 
-import org.openqa.selenium.security.Credentials;
+import org.apache.http.auth.Credentials;
 
 public interface Alert {
   void dismiss();

Diff for: java/client/src/org/openqa/selenium/BUCK

@@ -8,7 +8,6 @@ java_library(name = 'webdriver-api',
     '//java/client/src/org/openqa/selenium/interactions:interactions',
     '//java/client/src/org/openqa/selenium/interactions:exceptions',
     '//java/client/src/org/openqa/selenium/logging:api',
-    '//java/client/src/org/openqa/selenium/security:security',
   ],
   visibility = ['PUBLIC'],
 )

Diff for: java/client/src/org/openqa/selenium/build.desc

@@ -84,7 +84,6 @@ java_library(name = "webdriver-api",
     ":codecs",
     "//java/client/src/org/openqa/selenium/interactions:api",
     "//java/client/src/org/openqa/selenium/logging:api",
-    "//java/client/src/org/openqa/selenium/security",
   ])
 
 java_library(name = "client-combined",

Diff for: java/client/src/org/openqa/selenium/remote/DriverCommand.java

@@ -93,6 +93,7 @@ public interface DriverCommand {
   String DISMISS_ALERT = "dismissAlert";
   String GET_ALERT_TEXT = "getAlertText";
   String SET_ALERT_VALUE = "setAlertValue";
+  String SET_ALERT_AUTHENTICATION = "setAuthentication";
 
   String SET_TIMEOUT = "setTimeout";
   String IMPLICITLY_WAIT = "implicitlyWait";

Diff for: java/client/src/org/openqa/selenium/remote/RemoteWebDriver.java

@@ -24,6 +24,7 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
+import org.apache.http.auth.Credentials;
 import org.openqa.selenium.Alert;
 import org.openqa.selenium.Beta;
 import org.openqa.selenium.By;
@@ -38,7 +39,6 @@
 import org.openqa.selenium.Point;
 import org.openqa.selenium.SearchContext;
 import org.openqa.selenium.TakesScreenshot;
-import org.openqa.selenium.UnsupportedCommandException;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.WebElement;
@@ -60,7 +60,6 @@
 import org.openqa.selenium.logging.NeedsLocalLogs;
 import org.openqa.selenium.remote.internal.JsonToWebElementConverter;
 import org.openqa.selenium.remote.internal.WebElementToJsonConverter;
-import org.openqa.selenium.security.Credentials;
 
 import java.net.URL;
 import java.util.Date;
@@ -935,8 +934,18 @@ public void sendKeys(String keysToSend) {
       execute(DriverCommand.SET_ALERT_VALUE, ImmutableMap.of("text", keysToSend));
     }
 
+    /**
+     * Authenticate an HTTP Basic Auth dialog.
+     *
+     * Usage: driver.switchTo().alert().authenticateUsing(new UsernamePasswordCredentials("cheese",
+     *        "secretGouda"));
+     * @param credentials
+     */
+    @Beta
     public void authenticateUsing(Credentials credentials) {
-      throw new UnsupportedCommandException("Not implemented yet");
+      execute(DriverCommand.SET_ALERT_AUTHENTICATION, ImmutableMap
+        .of("username", credentials.getUserPrincipal().getName(), "password",
+            credentials.getPassword()));
     }
   }
 

Diff for: java/client/src/org/openqa/selenium/remote/http/JsonHttpCommandCodec.java

@@ -97,6 +97,7 @@ public JsonHttpCommandCodec() {
     defineCommand(DISMISS_ALERT, post("/session/:sessionId/dismiss_alert"));
     defineCommand(GET_ALERT_TEXT, get("/session/:sessionId/alert_text"));
     defineCommand(SET_ALERT_VALUE, post("/session/:sessionId/alert_text"));
+    defineCommand(SET_ALERT_AUTHENTICATION, post("/session/:sessionId/authenticate"));
 
     defineCommand(EXECUTE_SCRIPT, post("/session/:sessionId/execute"));
     defineCommand(EXECUTE_ASYNC_SCRIPT, post("/session/:sessionId/execute_async"));