Merge branch 'master' into dependabot/maven/org.apache.maven.plugins-maven-checkstyle-plugin-3.0.0

Author: lahirumaramba

.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

@@ -78,6 +78,8 @@ jobs:
       startsWith(github.event.pull_request.title, '[chore] Release ')
 
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
 
     steps:
     - name: Checkout source for publish
@@ -98,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.4.1</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.1.114.Final</netty.version>
+        <netty.version>4.2.6.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.10.1</version>
+                        <version>3.11.3</version>
                         <executions>
                             <execution>
                                 <phase>site</phase>
@@ -157,7 +150,7 @@
                 <plugins>
                     <plugin>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.2.7</version>
+                        <version>3.2.8</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -189,7 +182,7 @@
                     <plugin>
                         <groupId>org.jacoco</groupId>
                         <artifactId>jacoco-maven-plugin</artifactId>
-                        <version>0.8.12</version>
+                        <version>0.8.13</version>
                         <executions>
                             <execution>
                                 <id>pre-unit-test</id>
@@ -215,7 +208,7 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
-                        <version>3.4.1</version>
+                        <version>3.5.1</version>
                         <executions>
                             <execution>
                                 <phase>test</phase>
@@ -270,7 +263,7 @@
             <!-- Compile Phase -->
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.13.0</version>
+                <version>3.14.0</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -280,7 +273,7 @@
             <!-- Test Phase -->
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.5.4</version>
                 <configuration>
                     <skipTests>${skipUTs}</skipTests>
                 </configuration>
@@ -301,7 +294,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.11.3</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -337,7 +330,7 @@
             <!-- Verify Phase -->
             <plugin>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.5.3</version>
                 <executions>
                     <execution>
                         <goals>
@@ -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>
@@ -367,7 +360,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>3.9.0</version>
                 <reportSets>
                     <reportSet>
                         <configuration>
@@ -385,14 +378,7 @@
             <dependency>
                 <groupId>com.google.cloud</groupId>
                 <artifactId>libraries-bom</artifactId>
-                <version>26.49.0</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>com.google.api-client</groupId>
-                <artifactId>google-api-client-bom</artifactId>
-                <version>2.7.0</version>
+                <version>26.67.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -401,6 +387,10 @@
 
     <dependencies>
         <!-- Google Cloud Platform dependencies -->
+        <dependency>
+            <groupId>com.google.auth</groupId>
+            <artifactId>google-auth-library-oauth2-http</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.google.api-client</groupId>
             <artifactId>google-api-client</artifactId>
@@ -417,10 +407,6 @@
             <groupId>com.google.api</groupId>
             <artifactId>api-common</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.auth</groupId>
-            <artifactId>google-auth-library-oauth2-http</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-storage</artifactId>
@@ -438,7 +424,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>2.0.16</version>
+            <version>2.0.17</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>

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

@@ -600,9 +600,10 @@ private CallableOperation<UserRecord, FirebaseAuthException> getUserByProviderUi
     // Although we don't really advertise it, we want to also handle
     // non-federated idps with this call. So if we detect one of them, we'll
     // reroute this request appropriately.
-    if (providerId == "phone") {
+    if ("phone".equals(providerId)) {
       return this.getUserByPhoneNumberOp(uid);
-    } else if (providerId == "email") {
+    }
+    if ("email".equals(providerId)) {
       return this.getUserByEmailOp(uid);
     }
 

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/FirebaseToken.java

@@ -37,12 +37,12 @@ public final class FirebaseToken {
     this.claims = ImmutableMap.copyOf(claims);
   }
 
-  /** Returns the Uid for the this token. */
+  /** Returns the Uid for this token. */
   public String getUid() {
     return (String) claims.get("sub");
   }
 
-  /** Returns the tenant ID for the this token. */
+  /** Returns the tenant ID for this token. */
   public String getTenantId() {
     Map<String, Object> firebase = (Map<String, Object>) claims.get("firebase");
     if (firebase == null) {
@@ -51,7 +51,7 @@ public String getTenantId() {
     return (String) firebase.get("tenant");
   }
 
-  /** Returns the Issuer for the this token. */
+  /** Returns the Issuer for this token. */
   public String getIssuer() {
     return (String) claims.get("iss");
   }

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

@@ -487,7 +487,7 @@ public UpdateRequest setPhoneNumber(@Nullable String phone) {
           // *and* by setting providersToUnlink to include 'phone', then we'll reject that. Though
           // it might also be reasonable to relax this restriction and just unlink it.
           for (String dp : deleteProviderIterable) {
-            if (dp == "phone") {
+            if ("phone".equals(dp)) {
               throw new IllegalArgumentException(
                   "Both UpdateRequest.setPhoneNumber(null) and "
                   + "UpdateRequest.setProvidersToUnlink(['phone']) were set. To unlink from a "
@@ -601,7 +601,7 @@ public UpdateRequest setProvidersToUnlink(Iterable<String> providerIds) {
       for (String id : providerIds) {
         checkArgument(!Strings.isNullOrEmpty(id), "providerIds must not be null or empty");
 
-        if (id == "phone" && properties.containsKey("phoneNumber")
+        if ("phone".equals(id) && properties.containsKey("phoneNumber")
             && properties.get("phoneNumber") == null) {
           // If we've been told to unlink the phone provider both via setting phoneNumber to null
           // *and* by setting providersToUnlink to include 'phone', then we'll reject that. Though

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;