Skip to content

Commit 5a2d761

Browse files
authored
rollback format checks for AppId and ApiKey, whcih will be added back on next release (#1464)
1 parent 27810dc commit 5a2d761

File tree

3 files changed

+0
-62
lines changed

3 files changed

+0
-62
lines changed

firebase-installations/src/main/java/com/google/firebase/installations/FirebaseInstallations.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -146,16 +146,6 @@ private void preConditionChecks() {
146146
Preconditions.checkNotEmpty(getApplicationId());
147147
Preconditions.checkNotEmpty(getProjectIdentifier());
148148
Preconditions.checkNotEmpty(getApiKey());
149-
Preconditions.checkArgument(
150-
Utils.isValidAppIdFormat(getApplicationId()),
151-
"Please set your Application ID. A valid Firebase App ID is required to communicate "
152-
+ "with Firebase server APIs: It identifies your application with Firebase."
153-
+ "Please refer to https://firebase.google.com/support/privacy/init-options.");
154-
Preconditions.checkArgument(
155-
Utils.isValidApiKeyFormat(getApiKey()),
156-
"Please set a valid API key. A Firebase API key is required to communicate with "
157-
+ "Firebase server APIs: It authenticates your project with Google."
158-
+ "Please refer to https://firebase.google.com/support/privacy/init-options.");
159149
}
160150

161151
/** Returns the Project Id or Project Number for the Firebase Project. */

firebase-installations/src/main/java/com/google/firebase/installations/Utils.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,13 @@
1515
package com.google.firebase.installations;
1616

1717
import android.text.TextUtils;
18-
import androidx.annotation.NonNull;
1918
import com.google.firebase.installations.local.PersistedInstallationEntry;
2019
import java.util.concurrent.TimeUnit;
21-
import java.util.regex.Pattern; // not using re2j for SDK size considerations
2220

2321
/** Util methods used for {@link FirebaseInstallations} */
2422
class Utils {
2523
public static final long AUTH_TOKEN_EXPIRATION_BUFFER_IN_SECS = TimeUnit.HOURS.toSeconds(1);
2624

27-
private static final String APP_ID_IDENTIFICATION_SUBSTRING = ":";
28-
private static final Pattern API_KEY_FORMAT = Pattern.compile("\\AA[\\w-]{38}\\z");
29-
3025
/**
3126
* Checks if the FIS Auth token is expired or going to expire in next 1 hour {@link
3227
* #AUTH_TOKEN_EXPIRATION_BUFFER_IN_SECS}.
@@ -46,12 +41,4 @@ public boolean isAuthTokenExpired(PersistedInstallationEntry entry) {
4641
public long currentTimeInSecs() {
4742
return TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis());
4843
}
49-
50-
static boolean isValidAppIdFormat(@NonNull String appId) {
51-
return appId.contains(APP_ID_IDENTIFICATION_SUBSTRING);
52-
}
53-
54-
static boolean isValidApiKeyFormat(@NonNull String apiKey) {
55-
return API_KEY_FORMAT.matcher(apiKey).matches();
56-
}
5744
}

firebase-installations/src/test/java/com/google/firebase/installations/FirebaseInstallationsTest.java

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -966,43 +966,4 @@ public void testDelete_networkError() throws Exception {
966966
entry.isRegistered());
967967
}
968968
}
969-
970-
@Test
971-
public void testAppIdCheck() {
972-
// valid appid
973-
assertTrue(Utils.isValidAppIdFormat("1:123456789:android:abcdef"));
974-
assertTrue(Utils.isValidAppIdFormat("1:515438998704:android:e78ec19738058349"));
975-
assertTrue(Utils.isValidAppIdFormat("1:208472424340:android:a243f98a00873753"));
976-
assertTrue(Utils.isValidAppIdFormat("1:755541669657:ios:4d6d5a5ce71e9d30"));
977-
assertTrue(Utils.isValidAppIdFormat("1:1086610230652:ios:852c7f6ee799ff89"));
978-
assertTrue(Utils.isValidAppIdFormat("1:35006771263:web:32b6f4a5b95acd2c"));
979-
// invalid appid
980-
assertFalse(Utils.isValidAppIdFormat("abc.abc.abc"));
981-
assertFalse(
982-
Utils.isValidAppIdFormat(
983-
"com.google.firebase.samples.messaging.advanced")); // using pakage name as App ID
984-
}
985-
986-
@Test
987-
public void testApiKeyCheck() {
988-
// valid ApiKey
989-
assertTrue(Utils.isValidApiKeyFormat("AIzaSyabcdefghijklmnopqrstuvwxyz1234567"));
990-
assertTrue(Utils.isValidApiKeyFormat("AIzaSyA4UrcGxgwQFTfaI3no3t7Lt1sjmdnP5sQ"));
991-
assertTrue(Utils.isValidApiKeyFormat("AIzaSyA5_iVawFQ8ABuTZNUdcwERLJv_a_p4wtM"));
992-
assertTrue(Utils.isValidApiKeyFormat("AIzaSyANUvH9H9BsUccjsu2pCmEkOPjjaXeDQgY"));
993-
assertTrue(Utils.isValidApiKeyFormat("AIzaSyASWm6HmTMdYWpgMnjRBjxcQ9CKctWmLd4"));
994-
assertTrue(Utils.isValidApiKeyFormat("AIzaSyAdOS2zB6NCsk1pCdZ4-P6GBdi_UUPwX7c"));
995-
assertTrue(Utils.isValidApiKeyFormat("AIzaSyAnLA7NfeLquW1tJFpx_eQCxoX-oo6YyIs"));
996-
// invalid ApiKey
997-
assertFalse(
998-
Utils.isValidApiKeyFormat("BIzaSyabcdefghijklmnopqrstuvwxyz1234567")); // wrong prefix
999-
assertFalse(Utils.isValidApiKeyFormat("AIzaSyabcdefghijklmnopqrstuvwxyz")); // wrong length
1000-
assertFalse(Utils.isValidApiKeyFormat("AIzaSyabcdefghijklmno:qrstuvwxyzabcdefg")); // wrong char
1001-
assertFalse(Utils.isValidApiKeyFormat("AIzaSyabcdefghijklmno qrstuvwxyzabcdefg")); // wrong char
1002-
assertFalse(
1003-
Utils.isValidApiKeyFormat(
1004-
"AAAAdpB7anM:APA91bFFK03DIT8y3l5uymwbKcUDJdYqTRSP9Qcxg8SU5kKPalEpObdx0C0xv8gQttdWlL"
1005-
+ "W4hLvvHA0JoDKA6Lrvbi-edUjFCPY_WJkuvHxFwGWXjnj4yI4sPQ27mXuSVIyAbgX4aTK0QY"
1006-
+ "pIKq2j1NBi7ZU75gunQg")); // using FCM server key as API key.
1007-
}
1008969
}

0 commit comments

Comments
 (0)