Tweak provider config classes so that CreateRequest can be properly chained.

Author: micahstairs

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

@@ -29,16 +29,24 @@
  */
 public abstract class AuthProviderConfig {
 
-  @Key("name")
+  // Lazily initialized from 'resourceName'.
   private String providerId;
 
+  @Key("name")
+  private String resourceName;
+
   @Key("displayName")
   private String displayName;
 
   @Key("enabled")
   private boolean enabled;
 
+  // TODO(micahstairs): Add unit test for this.
+  // Example: projects/388188666963/oauthIdpConfigs/oidc.config-id
   public String getProviderId() {
+    if (providerId == null) {
+      providerId = resourceName.substring(resourceName.lastIndexOf("/") + 1);
+    }
     return providerId;
   }
 
@@ -56,45 +64,53 @@ public boolean isEnabled() {
    * <p>Set the initial attributes of the new provider by calling various setter methods available
    * in this class.
    */
-  public abstract static class CreateRequest {
+  public abstract static class CreateRequest<T extends CreateRequest<T>> {
 
     final Map<String,Object> properties = new HashMap<>();
+    String providerId;
 
     /**
-     * Sets the ID for the new provider.
+     * Sets the display name for the new provider.
      *
      * @param providerId a non-null, non-empty provider ID string.
      */
-    public CreateRequest setProviderId(String providerId) {
+    public T setProviderId(String providerId) {
       checkArgument(
           !Strings.isNullOrEmpty(providerId), "provider ID name must not be null or empty");
-      properties.put("name", providerId);
-      return this;
+      this.providerId = providerId;
+      return getThis();
+    }
+
+    // TODO(micahstairs): Add a unit test for this method.
+    String getProviderId() {
+      return providerId;
     }
 
     /**
      * Sets the display name for the new provider.
      *
      * @param displayName a non-null, non-empty display name string.
      */
-    public CreateRequest setDisplayName(String displayName) {
+    public T setDisplayName(String displayName) {
       checkArgument(!Strings.isNullOrEmpty(displayName), "display name must not be null or empty");
       properties.put("displayName", displayName);
-      return this;
+      return getThis();
     }
 
     /**
-     * Sets whether to allow the user to sign in with the provider..
+     * Sets whether to allow the user to sign in with the provider.
      *
      * @param enabled a boolean indicating whether the user can sign in with the provider
      */
-    public CreateRequest setEnabled(boolean enabled) {
+    public T setEnabled(boolean enabled) {
       properties.put("enabled", enabled);
-      return this;
+      return getThis();
     }
 
     Map<String, Object> getProperties() {
       return ImmutableMap.copyOf(properties);
     }
+
+    abstract T getThis();
   }
 }

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

@@ -51,13 +51,13 @@ public String getIssuer() {
    * <p>Set the initial attributes of the new provider by calling various setter methods available
    * in this class.
    */
-  public static final class CreateRequest extends AuthProviderConfig.CreateRequest {
+  public static final class CreateRequest extends AuthProviderConfig.CreateRequest<CreateRequest> {
 
     /**
      * Creates a new {@link CreateRequest}, which can be used to create a new OIDC Auth provider.
      *
      * <p>The returned object should be passed to
-     * {@link TenantAwareFirebaseAuth#createProviderConfig(CreateRequest)} to register the provider
+     * {@link AbstractFirebaseAuth#createProviderConfig(CreateRequest)} to register the provider
      * information persistently.
      */
     public CreateRequest() { }
@@ -83,5 +83,9 @@ public CreateRequest setIssuer(String issuer) {
       properties.put("issuer", issuer);
       return this;
     }
+
+    CreateRequest getThis() {
+      return this;
+    }
   }
 }