Merge branch 'master' into je-fix-auth-error

Author: jonathanedey

pom.xml

@@ -89,7 +89,7 @@
                     <plugin>
                         <!-- Generate API docs using Doclava for the developer site -->
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.11.2</version>
+                        <version>3.11.3</version>
                         <executions>
                             <execution>
                                 <phase>site</phase>
@@ -301,7 +301,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.11.2</version>
+                <version>3.11.3</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -385,7 +385,7 @@
             <dependency>
                 <groupId>com.google.cloud</groupId>
                 <artifactId>libraries-bom</artifactId>
-                <version>26.65.0</version>
+                <version>26.67.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

src/main/java/com/google/firebase/auth/ActionCodeSettings.java

@@ -51,6 +51,9 @@ private ActionCodeSettings(Builder builder) {
     if (!Strings.isNullOrEmpty(builder.dynamicLinkDomain)) {
       properties.put("dynamicLinkDomain", builder.dynamicLinkDomain);
     }
+    if (!Strings.isNullOrEmpty(builder.linkDomain)) {
+      properties.put("linkDomain", builder.linkDomain);
+    }
     if (!Strings.isNullOrEmpty(builder.iosBundleId)) {
       properties.put("iOSBundleId", builder.iosBundleId);
     }
@@ -84,6 +87,7 @@ public static final class Builder {
     private String url;
     private boolean handleCodeInApp;
     private String dynamicLinkDomain;
+    private String linkDomain;
     private String iosBundleId;
     private String androidPackageName;
     private String androidMinimumVersion;
@@ -135,12 +139,28 @@ public Builder setHandleCodeInApp(boolean handleCodeInApp) {
      *
      * @param dynamicLinkDomain Firebase Dynamic Link domain string.
      * @return This builder.
+     * @deprecated Use {@link #setLinkDomain(String)} instead.
      */
+    @Deprecated
     public Builder setDynamicLinkDomain(String dynamicLinkDomain) {
       this.dynamicLinkDomain = dynamicLinkDomain;
       return this;
     }
 
+    /**
+     * Sets the link domain to use for the current link if it is to be opened using
+     * {@code handleCodeInApp}, as multiple link domains can be configured per project. This
+     * setting provides the ability to explicitly choose one. If none is provided, the default
+     * Firebase Hosting domain will be used.
+     *
+     * @param linkDomain Link domain string.
+     * @return This builder.
+     */
+    public Builder setLinkDomain(String linkDomain) {
+      this.linkDomain = linkDomain;
+      return this;
+    }
+
     /**
      * Sets the bundle ID of the iOS app where the link should be handled if the
      * application is already installed on the device.

src/main/java/com/google/firebase/auth/AuthErrorCode.java

@@ -58,6 +58,11 @@ public enum AuthErrorCode {
    */
   INVALID_DYNAMIC_LINK_DOMAIN,
 
+  /**
+   * The provided hosting link domain is not configured or authorized for the current project.
+   */
+  INVALID_HOSTING_LINK_DOMAIN,
+
   /**
    * The specified ID token is invalid.
    */

src/main/java/com/google/firebase/auth/internal/AuthErrorHandler.java

@@ -73,6 +73,13 @@ final class AuthErrorHandler extends AbstractHttpErrorHandler<FirebaseAuthExcept
                   "The provided dynamic link domain is not "
                       + "configured or authorized for the current project",
                   AuthErrorCode.INVALID_DYNAMIC_LINK_DOMAIN))
+          .put(
+              "INVALID_HOSTING_LINK_DOMAIN",
+              new AuthError(
+                  ErrorCode.INVALID_ARGUMENT,
+                  "The provided hosting link domain is not configured in Firebase Hosting or is "
+                      + "not owned by the current project",
+                  AuthErrorCode.INVALID_HOSTING_LINK_DOMAIN))
           .put(
               "PHONE_NUMBER_EXISTS",
               new AuthError(

src/test/java/com/google/firebase/auth/ActionCodeSettingsTest.java

@@ -68,6 +68,7 @@ public void testAllSettings() {
         .setUrl("https://example.com")
         .setHandleCodeInApp(true)
         .setDynamicLinkDomain("myapp.page.link")
+        .setLinkDomain("myapp.custom.link")
         .setIosBundleId("com.example.ios")
         .setAndroidPackageName("com.example.android")
         .setAndroidMinimumVersion("6.0")
@@ -77,6 +78,7 @@ public void testAllSettings() {
         .put("continueUrl", "https://example.com")
         .put("canHandleCodeInApp", true)
         .put("dynamicLinkDomain", "myapp.page.link")
+        .put("linkDomain", "myapp.custom.link")
         .put("iOSBundleId", "com.example.ios")
         .put("androidPackageName", "com.example.android")
         .put("androidMinimumVersion", "6.0")