Skip to content

Commit 50ad030

Browse files
committed
fix(auth): simplify provider ID validation and remove unused imports
1 parent 7c02169 commit 50ad030

4 files changed

Lines changed: 2 additions & 8 deletions

File tree

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ static void checkOidcProviderId(String providerId) {
7878
checkArgument(!Strings.isNullOrEmpty(providerId), "Provider ID must not be null or empty.");
7979
checkArgument(providerId.startsWith("oidc."),
8080
"Invalid OIDC provider ID (must be prefixed with 'oidc.'): " + providerId);
81-
checkArgument(!providerId.equals("oidc.") && Utils.isSafeUrlSegment(providerId),
82-
"Invalid OIDC provider ID: " + providerId);
81+
checkArgument(Utils.isSafeUrlSegment(providerId), "Invalid OIDC provider ID: " + providerId);
8382
}
8483

8584
static Map<String, Boolean> ensureResponseType(Map<String,Object> properties) {

‎src/main/java/com/google/firebase/auth/SamlProviderConfig.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ static void checkSamlProviderId(String providerId) {
8585
checkArgument(!Strings.isNullOrEmpty(providerId), "Provider ID must not be null or empty.");
8686
checkArgument(providerId.startsWith("saml."),
8787
"Invalid SAML provider ID (must be prefixed with 'saml.'): " + providerId);
88-
checkArgument(!providerId.equals("saml.") && Utils.isSafeUrlSegment(providerId),
89-
"Invalid SAML provider ID: " + providerId);
88+
checkArgument(Utils.isSafeUrlSegment(providerId), "Invalid SAML provider ID: " + providerId);
9089
}
9190

9291
private static List<Object> ensureNestedList(Map<String, Object> outerMap, String id) {

‎src/main/java/com/google/firebase/auth/multitenancy/TenantAwareFirebaseAuth.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,9 @@
1616

1717
package com.google.firebase.auth.multitenancy;
1818

19-
import static com.google.common.base.Preconditions.checkArgument;
20-
2119
import com.google.api.core.ApiAsyncFunction;
2220
import com.google.api.core.ApiFuture;
2321
import com.google.api.core.ApiFutures;
24-
import com.google.common.base.Strings;
2522
import com.google.common.util.concurrent.MoreExecutors;
2623
import com.google.firebase.FirebaseApp;
2724
import com.google.firebase.auth.AbstractFirebaseAuth;

‎src/main/java/com/google/firebase/auth/multitenancy/TenantManager.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.google.api.client.http.HttpResponseInterceptor;
2323
import com.google.api.core.ApiFuture;
2424
import com.google.common.annotations.VisibleForTesting;
25-
import com.google.common.base.Strings;
2625
import com.google.firebase.FirebaseApp;
2726
import com.google.firebase.auth.FirebaseAuth;
2827
import com.google.firebase.auth.FirebaseAuthException;

0 commit comments

Comments
 (0)