Merge branch 'master' into ssrc

Author: rathovarun1032

.github/resources/settings.xml

@@ -7,9 +7,9 @@
 
   <servers>
     <server>
-      <id>ossrh</id>
-      <username>${env.NEXUS_OSSRH_USERNAME}</username>
-      <password>${env.NEXUS_OSSRH_PASSWORD}</password>
+      <id>central</id>
+      <username>${env.CENTRAL_USERNAME}</username>
+      <password>${env.CENTRAL_TOKEN}</password>
     </server>
   </servers>
 

.github/scripts/publish_artifacts.sh

@@ -26,7 +26,7 @@ gpg --import --no-tty --batch --yes firebase.asc
 #  1. Compiles the source (compile phase)
 #  2. Packages the artifacts - src, bin, javadocs (package phase)
 #  3. Signs the artifacts (verify phase)
-#  4. Publishes artifacts via Nexus (deploy phase)
+#  4. Publishes artifacts via Central Publisher Portal (deploy phase)
 mvn -B clean deploy \
   -Dcheckstyle.skip \
   -DskipTests \

.github/workflows/release.yml

@@ -100,8 +100,8 @@ jobs:
       env:
         GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
         GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-        NEXUS_OSSRH_USERNAME: ${{ secrets.NEXUS_OSSRH_USERNAME }}
-        NEXUS_OSSRH_PASSWORD: ${{ secrets.NEXUS_OSSRH_PASSWORD }}
+        CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }}
+        CENTRAL_TOKEN: ${{ secrets.CENTRAL_TOKEN }}
 
     # See: https://cli.github.com/manual/gh_release_create
     - name: Create release tag

pom.xml

@@ -19,7 +19,7 @@
 
     <groupId>com.google.firebase</groupId>
     <artifactId>firebase-admin</artifactId>
-    <version>9.5.0</version>
+    <version>9.6.0</version>
     <packaging>jar</packaging>
 
     <name>firebase-admin</name>
@@ -59,7 +59,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <skipUTs>${skipTests}</skipUTs>
-        <netty.version>4.2.3.Final</netty.version>
+        <netty.version>4.2.5.Final</netty.version>
     </properties>
 
     <scm>
@@ -69,13 +69,6 @@
         <tag>HEAD</tag>
     </scm>
 
-    <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
-
     <profiles>
         <profile>
             <id>devsite-apidocs</id>
@@ -89,7 +82,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 +294,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.11.2</version>
+                <version>3.11.3</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -350,14 +343,14 @@
 
             <!-- Deploy Phase -->
             <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.7.0</version>
+                <groupId>org.sonatype.central</groupId>
+                <artifactId>central-publishing-maven-plugin</artifactId>
+                <version>0.8.0</version>
                 <extensions>true</extensions>
                 <configuration>
-                    <serverId>ossrh</serverId>
-                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                    <publishingServerId>central</publishingServerId>
+                    <autoPublish>true</autoPublish>
+                    <waitUntil>published</waitUntil>
                 </configuration>
             </plugin>
         </plugins>
@@ -385,7 +378,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(
@@ -180,7 +187,7 @@ String buildMessage(AuthServiceErrorResponse response) {
 
   /**
    * JSON data binding for JSON error messages sent by Google identity toolkit service. These
-   * error messages take the form `{"error": {"message": "CODE: OPTIONAL DETAILS"}}`.
+   * error messages take the form `{"error": {"message": "CODE : OPTIONAL DETAILS"}}`.
    */
   private static class AuthServiceErrorResponse {
 
@@ -196,7 +203,7 @@ public String getCode() {
 
       int separator = message.indexOf(':');
       if (separator != -1) {
-        return message.substring(0, separator);
+        return message.substring(0, separator).trim();
       }
 
       return message;

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")

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

@@ -82,6 +82,7 @@ public class FirebaseAuthIT {
   private static final JsonFactory jsonFactory = ApiClientUtils.getDefaultJsonFactory();
   private static final HttpTransport transport = ApiClientUtils.getDefaultTransport();
   private static final String ACTION_LINK_CONTINUE_URL = "http://localhost/?a=1&b=2#c=3";
+  private static final String INVALID_ACTION_LINK_CONTINUE_URL = "http://www.localhost/?a=1&b=2#c=3";
 
   private static final FirebaseAuth auth = FirebaseAuth.getInstance(
       IntegrationTestUtils.ensureDefaultApp());
@@ -868,6 +869,31 @@ public void testGenerateSignInWithEmailLink() throws Exception {
     assertTrue(auth.getUser(user.getUid()).isEmailVerified());
   }
 
+  @Test
+  public void testAuthErrorCodeParse() throws Exception {
+    RandomUser user = UserTestUtils.generateRandomUserInfo();
+    temporaryUser.create(new UserRecord.CreateRequest()
+        .setUid(user.getUid())
+        .setEmail(user.getEmail())
+        .setEmailVerified(false)
+        .setPassword("password"));
+    try {
+      auth.generateSignInWithEmailLink(user.getEmail(), ActionCodeSettings.builder()
+          .setUrl(INVALID_ACTION_LINK_CONTINUE_URL)
+          .build());
+      fail("No error thrown for invlaid custom hosting domain");
+    } catch (FirebaseAuthException e) {
+      assertEquals(
+          "The domain of the continue URL is not whitelisted (UNAUTHORIZED_DOMAIN): Domain not "
+              + "allowlisted by project",
+          e.getMessage());
+      assertEquals(ErrorCode.INVALID_ARGUMENT, e.getErrorCode());
+      assertNotNull(e.getCause());
+      assertNotNull(e.getHttpResponse());
+      assertEquals(AuthErrorCode.UNAUTHORIZED_CONTINUE_URL, e.getAuthErrorCode());
+    }
+  }
+
   @Test
   public void testOidcProviderConfigLifecycle() throws Exception {
     // Create provider config