Skip to content

Add support for reCAPTCHA site key #423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rlazo merged 3 commits into from
May 27, 2026
Merged

Add support for reCAPTCHA site key #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d45c748
Add support for reCAPTCHA site key
rlazo May 26, 2026
2022e07
Simplify handleSiteKey logic
rlazo May 27, 2026
37aaec9
Rename recaptcha_enterprise_site_key to recaptcha_site_key
rlazo May 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions google-services-plugin/src/main/kotlin/com/google/gms/googleservices/GoogleServicesTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ abstract class GoogleServicesTask : DefaultTask() {
if (jsonFiles.isEmpty()) {
val message =
"""
File $JSON_FILE_NAME is missing.
The Google Services Plugin cannot function without it.
File $JSON_FILE_NAME is missing.
The Google Services Plugin cannot function without it.
Searched locations: ${
googleServicesJsonFiles.get().joinToString { it.absolutePath }
}
Expand Down Expand Up @@ -109,6 +109,7 @@ abstract class GoogleServicesTask : DefaultTask() {
handleGoogleApiKey(resValues)
handleGoogleAppId(resValues)
handleWebClientId(resValues)
handleSiteKey(resValues)
}
?: throw GradleException(
"No matching client found for package name '${applicationId.get()}' in ${quickstartFile.path}")
Expand Down Expand Up @@ -208,7 +209,7 @@ abstract class GoogleServicesTask : DefaultTask() {
"""
<?xml version="1.0" encoding="utf-8"?>
<resources>

"""
.trimIndent())
for ((name, value) in values) {
Expand Down Expand Up @@ -259,6 +260,12 @@ abstract class GoogleServicesTask : DefaultTask() {
}
}

fun FirebaseClientData.handleSiteKey(resValues: MutableMap<String, String?>) {
this.getAsJsonPrimitive("recaptcha_site_key")?.let {
resValues["recaptcha_site_key"] = it.asString
}
}

/**
* Handle a client object for analytics (@xml/global_tracker)
*
Expand Down
1 change: 1 addition & 0 deletions ...n/src/test/testData/project1-expected/processFreeOneDebugGoogleServices/values/values.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@
<string name="google_app_id" translatable="false">1:123456789000:android:f1bf012572b04063</string>
<string name="google_crash_reporting_api_key" translatable="false">AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo</string>
<string name="project_id" translatable="false">mockproject-1234</string>
<string name="recaptcha_site_key" translatable="false">6L00000sAAAAAAaaaaaAAaa00000_AAAaAaaAa00</string>
</resources>
1 change: 1 addition & 0 deletions ...n/src/test/testData/project1-expected/processFreeTwoDebugGoogleServices/values/values.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@
<string name="google_app_id" translatable="false">1:123456789000:android:f1bf012572b04063</string>
<string name="google_crash_reporting_api_key" translatable="false">AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo</string>
<string name="project_id" translatable="false">mockproject-1234</string>
<string name="recaptcha_site_key" translatable="false">6L00000sAAAAAAaaaaaAAaa00000_AAAaAaaAa00</string>
</resources>
1 change: 1 addition & 0 deletions ...n/src/test/testData/project1-expected/processPaidOneDebugGoogleServices/values/values.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@
<string name="google_app_id" translatable="false">1:123456789000:android:f1bf012572b04063</string>
<string name="google_crash_reporting_api_key" translatable="false">AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo</string>
<string name="project_id" translatable="false">mockproject-1234</string>
<string name="recaptcha_site_key" translatable="false">6L00000sAAAAAAaaaaaAAaa00000_AAAaAaaAa00</string>
</resources>
1 change: 1 addition & 0 deletions ...n/src/test/testData/project1-expected/processPaidTwoDebugGoogleServices/values/values.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@
<string name="google_app_id" translatable="false">1:123456789000:android:f1bf012572b04063</string>
<string name="google_crash_reporting_api_key" translatable="false">AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo</string>
<string name="project_id" translatable="false">mockproject-1234</string>
<string name="recaptcha_site_key" translatable="false">6L00000sAAAAAAaaaaaAAaa00000_AAAaAaaAa00</string>
</resources>
5 changes: 3 additions & 2 deletions google-services-plugin/src/test/testData/project1/app/google-services.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,9 +956,10 @@
"test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111",
"test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712"
}
}
},
"recaptcha_site_key": "6L00000sAAAAAAaaaaaAAaa00000_AAAaAaaAa00"
}
],
"client_info": [],
"ARTIFACT_VERSION": "1"
}
}
Loading