Skip to content
This repository has been archived by the owner on Sep 16, 2023. It is now read-only.

docs(samples): added samples and test for recaptcha key operations #643

Merged
merged 4 commits into from Dec 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
Expand Up @@ -113,8 +113,10 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-recaptchaente
| Create Assessment | [source code](https://github.com/googleapis/java-recaptchaenterprise/blob/main/samples/snippets/cloud-client/src/main/java/recaptcha/CreateAssessment.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-recaptchaenterprise&page=editor&open_in_editor=samples/snippets/cloud-client/src/main/java/recaptcha/CreateAssessment.java) |
| Create Site Key | [source code](https://github.com/googleapis/java-recaptchaenterprise/blob/main/samples/snippets/cloud-client/src/main/java/recaptcha/CreateSiteKey.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-recaptchaenterprise&page=editor&open_in_editor=samples/snippets/cloud-client/src/main/java/recaptcha/CreateSiteKey.java) |
| Delete Site Key | [source code](https://github.com/googleapis/java-recaptchaenterprise/blob/main/samples/snippets/cloud-client/src/main/java/recaptcha/DeleteSiteKey.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-recaptchaenterprise&page=editor&open_in_editor=samples/snippets/cloud-client/src/main/java/recaptcha/DeleteSiteKey.java) |
| Get Metrics | [source code](https://github.com/googleapis/java-recaptchaenterprise/blob/main/samples/snippets/cloud-client/src/main/java/recaptcha/GetMetrics.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-recaptchaenterprise&page=editor&open_in_editor=samples/snippets/cloud-client/src/main/java/recaptcha/GetMetrics.java) |
| Get Site Key | [source code](https://github.com/googleapis/java-recaptchaenterprise/blob/main/samples/snippets/cloud-client/src/main/java/recaptcha/GetSiteKey.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-recaptchaenterprise&page=editor&open_in_editor=samples/snippets/cloud-client/src/main/java/recaptcha/GetSiteKey.java) |
| List Site Keys | [source code](https://github.com/googleapis/java-recaptchaenterprise/blob/main/samples/snippets/cloud-client/src/main/java/recaptcha/ListSiteKeys.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-recaptchaenterprise&page=editor&open_in_editor=samples/snippets/cloud-client/src/main/java/recaptcha/ListSiteKeys.java) |
| Migrate Key | [source code](https://github.com/googleapis/java-recaptchaenterprise/blob/main/samples/snippets/cloud-client/src/main/java/recaptcha/MigrateKey.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-recaptchaenterprise&page=editor&open_in_editor=samples/snippets/cloud-client/src/main/java/recaptcha/MigrateKey.java) |
| Update Site Key | [source code](https://github.com/googleapis/java-recaptchaenterprise/blob/main/samples/snippets/cloud-client/src/main/java/recaptcha/UpdateSiteKey.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-recaptchaenterprise&page=editor&open_in_editor=samples/snippets/cloud-client/src/main/java/recaptcha/UpdateSiteKey.java) |


Expand Down
@@ -0,0 +1,70 @@
/*
* Copyright 2021 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package recaptcha;

// [START recaptcha_enterprise_get_metrics_site_key]

import com.google.cloud.recaptchaenterprise.v1.RecaptchaEnterpriseServiceClient;
import com.google.recaptchaenterprise.v1.GetMetricsRequest;
import com.google.recaptchaenterprise.v1.Metrics;
import com.google.recaptchaenterprise.v1.MetricsName;
import com.google.recaptchaenterprise.v1.ScoreMetrics;
import java.io.IOException;

public class GetMetrics {

public static void main(String[] args) throws IOException {
String projectId = "project-id";
String recaptchaSiteKey = "recaptcha-site-key";

getMetrics(projectId, recaptchaSiteKey);
}

/**
* Get metrics specific to a recaptcha site key. E.g: score bucket count for a key or number of
* times the checkbox key failed/ passed etc.,
*
* @param projectId: Google Cloud Project Id.
* @param recaptchaSiteKey: Specify the site key to get metrics.
*/
public static void getMetrics(String projectId, String recaptchaSiteKey) throws IOException {
// Initialize client that will be used to send requests. This client only needs to be created
// once, and can be reused for multiple requests. After completing all of your requests, call
// the `client.close()` method on the client to safely
// clean up any remaining background resources.
try (RecaptchaEnterpriseServiceClient client = RecaptchaEnterpriseServiceClient.create()) {

GetMetricsRequest getMetricsRequest =
GetMetricsRequest.newBuilder()
.setName(MetricsName.of(projectId, recaptchaSiteKey).toString())
.build();

Metrics response = client.getMetrics(getMetricsRequest);

// Retrieve the metrics you want from the key.
// If the site key is checkbox type: then use response.getChallengeMetricsList() instead of
// response.getScoreMetricsList()
for (ScoreMetrics scoreMetrics : response.getScoreMetricsList()) {
// Each ScoreMetrics is in the granularity of one day.
int scoreBucketCount = scoreMetrics.getOverallMetrics().getScoreBucketsCount();
System.out.println(scoreBucketCount);
}
System.out.printf("Retrieved the bucket count for score based key: %s", recaptchaSiteKey);
}
}
}
// [END recaptcha_enterprise_get_metrics_site_key]
Expand Up @@ -19,6 +19,7 @@
// [START recaptcha_enterprise_list_site_keys]

import com.google.cloud.recaptchaenterprise.v1.RecaptchaEnterpriseServiceClient;
import com.google.cloud.recaptchaenterprise.v1.RecaptchaEnterpriseServiceClient.ListKeysPagedResponse;
import com.google.recaptchaenterprise.v1.Key;
import com.google.recaptchaenterprise.v1.ListKeysRequest;
import com.google.recaptchaenterprise.v1.ProjectName;
Expand All @@ -36,9 +37,9 @@ public static void main(String[] args) throws IOException {
/**
* List all keys present under the given project ID.
*
* @param projectID: GCloud Project ID.
* @param projectID : GCloud Project ID.
*/
public static void listSiteKeys(String projectID) throws IOException {
public static ListKeysPagedResponse listSiteKeys(String projectID) throws IOException {
// Initialize client that will be used to send requests. This client only needs to be created
// once, and can be reused for multiple requests. After completing all of your requests, call
// the `client.close()` method on the client to safely
Expand All @@ -48,10 +49,12 @@ public static void listSiteKeys(String projectID) throws IOException {
ListKeysRequest listKeysRequest =
ListKeysRequest.newBuilder().setParent(ProjectName.of(projectID).toString()).build();

ListKeysPagedResponse response = client.listKeys(listKeysRequest);
System.out.println("Listing reCAPTCHA site keys: ");
for (Key key : client.listKeys(listKeysRequest).iterateAll()) {
for (Key key : response.iterateAll()) {
System.out.println(key.getName());
}
return response;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This response is being used in the MigrateKey file. Returning void would mean adding this piece of code to the MigrateKey file (which would be redundant).
Is it okay to treat cases like this as an exception?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should avoid returning any value wherever possible, but otherwise fine

}
}
}
Expand Down
@@ -0,0 +1,70 @@
/*
* Copyright 2021 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package recaptcha;

// [START recaptcha_enterprise_migrate_site_key]

import com.google.cloud.recaptchaenterprise.v1.RecaptchaEnterpriseServiceClient;
import com.google.recaptchaenterprise.v1.Key;
import com.google.recaptchaenterprise.v1.KeyName;
import com.google.recaptchaenterprise.v1.MigrateKeyRequest;
import java.io.IOException;

public class MigrateKey {

public static void main(String[] args) throws IOException {
String projectId = "project-id";
String recaptchaSiteKey = "recaptcha-site-key";

migrateKey(projectId, recaptchaSiteKey);
}

/**
* Migrate a key from reCAPTCHA (non-Enterprise) to reCAPTCHA Enterprise. If you created the key
* using Admin console: https://www.google.com/recaptcha/admin/site, then use this API to migrate
* to reCAPTCHA Enterprise. For more info, see:
* https://cloud.google.com/recaptcha-enterprise/docs/migrate-recaptcha
*
* @param projectId: Google Cloud Project Id.
* @param recaptchaSiteKey: Specify the site key to migrate.
*/
public static void migrateKey(String projectId, String recaptchaSiteKey) throws IOException {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this one tested?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Migrate key can't be tested through client libraries as the non-enterprise version of the key needs to be created only through the Admin Console.

// Initialize client that will be used to send requests. This client only needs to be created
// once, and can be reused for multiple requests. After completing all of your requests, call
// the `client.close()` method on the client to safely
// clean up any remaining background resources.
try (RecaptchaEnterpriseServiceClient client = RecaptchaEnterpriseServiceClient.create()) {

// Specify the key name to migrate.
MigrateKeyRequest migrateKeyRequest =
MigrateKeyRequest.newBuilder()
.setName(KeyName.of(projectId, recaptchaSiteKey).toString())
.build();

Key response = client.migrateKey(migrateKeyRequest);

// To verify if the site key has been migrated, use 'ListSiteKeys' and check if the
// key is present.
for (Key key : recaptcha.ListSiteKeys.listSiteKeys(projectId).iterateAll()) {
if (key.equals(response)) {
System.out.printf("Key migrated successfully: %s", recaptchaSiteKey);
}
}
}
}
}
// [END recaptcha_enterprise_migrate_site_key]
10 changes: 9 additions & 1 deletion samples/snippets/cloud-client/src/test/java/app/SnippetsIT.java
Expand Up @@ -50,6 +50,7 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.web.util.UriComponentsBuilder;
import recaptcha.AnnotateAssessment;
import recaptcha.GetMetrics;

@RunWith(SpringJUnit4ClassRunner.class)
@EnableAutoConfiguration
Expand All @@ -73,7 +74,7 @@ public static void requireEnvVar(String envVarName) {
}

@BeforeClass
public static void setUp() throws IOException, InterruptedException, JSONException {
public static void setUp() throws IOException, InterruptedException {
requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
requireEnvVar("GOOGLE_CLOUD_PROJECT");

Expand Down Expand Up @@ -162,6 +163,13 @@ public void testCreateAnnotateAssessment()
assertThat(stdOut.toString()).contains("Annotated response sent successfully ! ");
}

@Test
public void testGetMetrics() throws IOException {
GetMetrics.getMetrics(PROJECT_ID, RECAPTCHA_SITE_KEY_1);
assertThat(stdOut.toString())
.contains("Retrieved the bucket count for score based key: " + RECAPTCHA_SITE_KEY_1);
}

public JSONObject createAssessment(String testURL)
throws IOException, JSONException, InterruptedException {

Expand Down