-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #37 from SiftScience/cchi_ato_api_updates_multiple…
…_events Add support for multiple new fields/events - $verification - $create_account and $update_account - $update_password
- Loading branch information
Showing
12 changed files
with
219 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
src/main/java/com/siftscience/model/UpdatePasswordFieldSet.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| package com.siftscience.model; | ||
|
|
||
| import com.google.gson.annotations.Expose; | ||
| import com.google.gson.annotations.SerializedName; | ||
|
|
||
| public class UpdatePasswordFieldSet extends BaseAppBrowserFieldSet<UpdatePasswordFieldSet> { | ||
| public static UpdatePasswordFieldSet fromJson(String json) { | ||
| return gson.fromJson(json, UpdatePasswordFieldSet.class); | ||
| } | ||
|
|
||
| @Expose @SerializedName("$reason") private String reason; | ||
| @Expose @SerializedName("$status") private String status; | ||
|
|
||
| @Override | ||
| public String getEventType() { | ||
| return "$update_password"; | ||
| } | ||
|
|
||
| public String getReason() { return reason; } | ||
|
|
||
| public UpdatePasswordFieldSet setReason(String reason) { | ||
| this.reason = reason; | ||
| return this; | ||
| } | ||
|
|
||
| public String getStatus() { return status; } | ||
|
|
||
| public UpdatePasswordFieldSet setStatus(String status) { | ||
| this.status = status; | ||
| return this; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
88 changes: 88 additions & 0 deletions
88
src/test/java/com/siftscience/UpdatePasswordEventTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| package com.siftscience; | ||
|
|
||
| import com.siftscience.model.App; | ||
| import com.siftscience.model.UpdatePasswordFieldSet; | ||
| import okhttp3.HttpUrl; | ||
| import okhttp3.mockwebserver.MockResponse; | ||
| import okhttp3.mockwebserver.MockWebServer; | ||
| import okhttp3.mockwebserver.RecordedRequest; | ||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
| import org.skyscreamer.jsonassert.JSONAssert; | ||
|
|
||
| import static java.net.HttpURLConnection.HTTP_OK; | ||
|
|
||
| /** | ||
| * Unit tests around the Update_password events. | ||
| */ | ||
|
|
||
| public class UpdatePasswordEventTest { | ||
| @Test | ||
| public void testUpdatePassword() throws Exception { | ||
| String expectedRequestBody = "{\n" + | ||
| " \"$type\" : \"$update_password\",\n" + | ||
| " \"$api_key\" : \"your_api_key_here\",\n" + | ||
| " \"$user_id\" : \"billy_jones_301\",\n" + | ||
| " \"$session_id\" : \"gigtleqddo84l8cm15qe4il\",\n" + | ||
| " \"$app\" : {\n" + | ||
| " \"$os\" : \"iOS\",\n" + | ||
| " \"$app_name\" : \"Calculator\",\n" + | ||
| " \"$device_manufacturer\" : \"Apple\",\n" + | ||
| " \"$device_model\" : \"iPhone 4,2\",\n" + | ||
| " \"$device_unique_id\" : \"A3D261E4-DE0A-470B-9E4A-720F3D3D22E6\",\n" + | ||
| " \"$app_version\" : \"3.2.7\",\n" + | ||
| " },\n" + | ||
| " \"$reason\" : \"$forced_reset\",\n" + | ||
| " \"$status\" : \"$success\",\n" + | ||
| " \"$ip\" : \"128.148.1.135\",\n" + | ||
| "}"; | ||
|
|
||
| MockWebServer server = new MockWebServer(); | ||
| MockResponse response = new MockResponse(); | ||
| response.setResponseCode(HTTP_OK); | ||
| response.setBody("{\n" + | ||
| " \"status\" : 0,\n" + | ||
| " \"error_message\" : \"OK\",\n" + | ||
| " \"time\" : 1327604222,\n" + | ||
| " \"request\" : \"" + TestUtils.unescapeJson(expectedRequestBody) + "\"\n" + | ||
| "}"); | ||
| server.enqueue(response); | ||
| server.start(); | ||
| HttpUrl baseUrl = server.url(""); | ||
|
|
||
| // Create a new client and link it to the mock server. | ||
| SiftClient client = new SiftClient("your_api_key_here"); | ||
| client.setBaseUrl(baseUrl); | ||
|
|
||
| // Build and execute the request against the mock server. | ||
| UpdatePasswordFieldSet fieldSet = new UpdatePasswordFieldSet() | ||
| .setUserId("billy_jones_301") | ||
| .setSessionId("gigtleqddo84l8cm15qe4il") | ||
| .setReason("$forced_reset") | ||
| .setStatus("$success") | ||
| .setIp("128.148.1.135") | ||
| .setApp(new App() | ||
| .setAppName("Calculator") | ||
| .setAppVersion("3.2.7") | ||
| .setDeviceManufacturer("Apple") | ||
| .setDeviceModel("iPhone 4,2") | ||
| .setDeviceUniqueId("A3D261E4-DE0A-470B-9E4A-720F3D3D22E6") | ||
| .setOperatingSystem("iOS")); | ||
|
|
||
| SiftRequest request = client.buildRequest(fieldSet); | ||
| SiftResponse siftResponse = request.send(); | ||
|
|
||
| //Verify the request | ||
| RecordedRequest request1 = server.takeRequest(); | ||
| Assert.assertEquals("POST", request1.getMethod()); | ||
| Assert.assertEquals("/v205/events", request1.getPath()); | ||
| JSONAssert.assertEquals(expectedRequestBody, request.getFieldSet().toJson(), true); | ||
|
|
||
| // Verify the response. | ||
| Assert.assertEquals(HTTP_OK, siftResponse.getHttpStatusCode()); | ||
| Assert.assertEquals(0, (int) siftResponse.getBody().getStatus()); | ||
| JSONAssert.assertEquals(response.getBody().readUtf8(), siftResponse.getBody().toJson(), true); | ||
|
|
||
| server.shutdown(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters