Move argument validation of create provider config methods outside CallableOperation.

Author: micahstairs

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

@@ -946,6 +946,8 @@ protected String execute() throws FirebaseAuthException {
    * @return An {@link OidcProviderConfig} instance corresponding to the newly created provider
    *     config.
    * @throws NullPointerException if the provided request is null.
+   * @throws IllegalArgumentException If the provider ID string is null or empty, or is not
+   *     prefixed with 'oidc.'.
    * @throws FirebaseAuthException if an error occurs while creating the provider config.
    */
   public OidcProviderConfig createOidcProviderConfig(
@@ -961,6 +963,8 @@ public OidcProviderConfig createOidcProviderConfig(
    *     instance corresponding to the newly created provider config. If an error occurs while
    *     creating the provider config, the future throws a {@link FirebaseAuthException}.
    * @throws NullPointerException if the provided request is null.
+   * @throws IllegalArgumentException If the provider ID string is null or empty, or is not
+   *     prefixed with 'oidc.'.
    */
   public ApiFuture<OidcProviderConfig> createOidcProviderConfigAsync(
       @NonNull OidcProviderConfig.CreateRequest request) {
@@ -971,6 +975,7 @@ public ApiFuture<OidcProviderConfig> createOidcProviderConfigAsync(
       createOidcProviderConfigOp(final OidcProviderConfig.CreateRequest request) {
     checkNotDestroyed();
     checkNotNull(request, "Create request must not be null.");
+    OidcProviderConfig.checkOidcProviderId(request.getProviderId());
     final FirebaseUserManager userManager = getUserManager();
     return new CallableOperation<OidcProviderConfig, FirebaseAuthException>() {
       @Override
@@ -1025,7 +1030,8 @@ protected OidcProviderConfig execute() throws FirebaseAuthException {
    *
    * @param providerId A provider ID string.
    * @return An {@link OidcProviderConfig} instance.
-   * @throws IllegalArgumentException If the provider ID string is null or empty.
+   * @throws IllegalArgumentException If the provider ID string is null or empty, or is not prefixed
+   *     with 'oidc'.
    * @throws FirebaseAuthException If an error occurs while retrieving the provider config.
    */
   public OidcProviderConfig getOidcProviderConfig(@NonNull String providerId)
@@ -1153,7 +1159,8 @@ protected ListProviderConfigsPage<OidcProviderConfig> execute()
    * Deletes the OIDC Auth provider config identified by the specified provider ID.
    *
    * @param providerId A provider ID string.
-   * @throws IllegalArgumentException If the provider ID string is null or empty.
+   * @throws IllegalArgumentException If the provider ID string is null or empty, or is not prefixed
+   *     with 'oidc'.
    * @throws FirebaseAuthException If an error occurs while deleting the provider config.
    */
   public void deleteOidcProviderConfig(@NonNull String providerId) throws FirebaseAuthException {
@@ -1196,6 +1203,8 @@ protected Void execute() throws FirebaseAuthException {
    * @return An {@link SamlProviderConfig} instance corresponding to the newly created provider
    *     config.
    * @throws NullPointerException if the provided request is null.
+   * @throws IllegalArgumentException If the provider ID string is null or empty, or is not prefixed
+   *     with 'saml'.
    * @throws FirebaseAuthException if an error occurs while creating the provider config.
    */
   public SamlProviderConfig createSamlProviderConfig(
@@ -1211,6 +1220,8 @@ public SamlProviderConfig createSamlProviderConfig(
    *     instance corresponding to the newly created provider config. If an error occurs while
    *     creating the provider config, the future throws a {@link FirebaseAuthException}.
    * @throws NullPointerException if the provided request is null.
+   * @throws IllegalArgumentException If the provider ID string is null or empty, or is not prefixed
+   *     with 'saml'.
    */
   public ApiFuture<SamlProviderConfig> createSamlProviderConfigAsync(
       @NonNull SamlProviderConfig.CreateRequest request) {
@@ -1221,6 +1232,7 @@ public ApiFuture<SamlProviderConfig> createSamlProviderConfigAsync(
       createSamlProviderConfigOp(final SamlProviderConfig.CreateRequest request) {
     checkNotDestroyed();
     checkNotNull(request, "Create request must not be null.");
+    SamlProviderConfig.checkSamlProviderId(request.getProviderId());
     final FirebaseUserManager userManager = getUserManager();
     return new CallableOperation<SamlProviderConfig, FirebaseAuthException>() {
       @Override
@@ -1234,7 +1246,8 @@ protected SamlProviderConfig execute() throws FirebaseAuthException {
    * Deletes the SAML Auth provider config identified by the specified provider ID.
    *
    * @param providerId A provider ID string.
-   * @throws IllegalArgumentException If the provider ID string is null or empty.
+   * @throws IllegalArgumentException If the provider ID string is null or empty, or is not prefixed
+   *     with "saml.".
    * @throws FirebaseAuthException If an error occurs while deleting the provider config.
    */
   public void deleteSamlProviderConfig(@NonNull String providerId) throws FirebaseAuthException {

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

@@ -252,6 +252,8 @@ Tenant createTenant(Tenant.CreateRequest request) throws FirebaseAuthException {
 
   Tenant updateTenant(Tenant.UpdateRequest request) throws FirebaseAuthException {
     Map<String, Object> properties = request.getProperties();
+    // TODO(micahstairs): Move this check so that argument validation happens outside the
+    // CallableOperation.
     checkArgument(!properties.isEmpty(), "tenant update must have at least one property set");
     GenericUrl url = new GenericUrl(tenantMgtBaseUrl + getTenantUrlSuffix(request.getTenantId()));
     url.put("updateMask", generateMask(properties));
@@ -318,24 +320,22 @@ String getEmailActionLink(EmailLinkType type, String email,
   OidcProviderConfig createOidcProviderConfig(
       OidcProviderConfig.CreateRequest request) throws FirebaseAuthException {
     GenericUrl url = new GenericUrl(idpConfigMgtBaseUrl + "/oauthIdpConfigs");
-    String providerId = request.getProviderId();
-    checkArgument(!Strings.isNullOrEmpty(providerId), "Provider ID must not be null or empty.");
-    url.set("oauthIdpConfigId", providerId);
+    url.set("oauthIdpConfigId", request.getProviderId());
     return sendRequest("POST", url, request.getProperties(), OidcProviderConfig.class);
   }
 
   SamlProviderConfig createSamlProviderConfig(
       SamlProviderConfig.CreateRequest request) throws FirebaseAuthException {
     GenericUrl url = new GenericUrl(idpConfigMgtBaseUrl + "/inboundSamlConfigs");
-    String providerId = request.getProviderId();
-    checkArgument(!Strings.isNullOrEmpty(providerId), "Provider ID must not be null or empty.");
-    url.set("inboundSamlConfigId", providerId);
+    url.set("inboundSamlConfigId", request.getProviderId());
     return sendRequest("POST", url, request.getProperties(), SamlProviderConfig.class);
   }
 
   OidcProviderConfig updateOidcProviderConfig(OidcProviderConfig.UpdateRequest request)
       throws FirebaseAuthException {
     Map<String, Object> properties = request.getProperties();
+    // TODO(micahstairs): Move this check so that argument validation happens outside the
+    // CallableOperation.
     checkArgument(!properties.isEmpty(),
         "Provider config update must have at least one property set.");
     GenericUrl url =