Skip to content
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

Jump to bottom

Correctly parse JSON when creating or deleting customer card source #857

Merged
merged 1 commit into from
Apr 9, 2019
Merged

Correctly parse JSON when creating or deleting customer card source #857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 29 additions & 3 deletions stripe/src/main/java/com/stripe/android/model/Source.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
public class Source extends StripeJsonModel implements StripePaymentSource {

static final String VALUE_SOURCE = "source";
private static final String VALUE_CARD = "card";

@Retention(RetentionPolicy.SOURCE)
@StringDef({
Expand Down Expand Up @@ -145,6 +146,12 @@ public class Source extends StripeJsonModel implements StripePaymentSource {
@Nullable @SourceType private String mType;
@Nullable @Usage private String mUsage;

private Source(@Nullable String id, @Nullable SourceCardData sourceTypeModel) {
mId = id;
mType = CARD;
mSourceTypeModel = sourceTypeModel;
}

private Source(
@Nullable String id,
@Nullable Long amount,
Expand Down Expand Up @@ -422,10 +429,30 @@ public static Source fromString(@Nullable String jsonString) {

@Nullable
public static Source fromJson(@Nullable JSONObject jsonObject) {
if (jsonObject == null || !VALUE_SOURCE.equals(jsonObject.optString(FIELD_OBJECT))) {
if (jsonObject == null) {
return null;
}

final String objectType = jsonObject.optString(FIELD_OBJECT);
if (VALUE_CARD.equals(objectType)) {
return fromCardJson(jsonObject);
} else if (VALUE_SOURCE.equals(objectType)) {
return fromSourceJson(jsonObject);
} else {
return null;
}
}

@NonNull
private static Source fromCardJson(@NonNull JSONObject jsonObject) {
return new Source(
optString(jsonObject, FIELD_ID),
SourceCardData.fromJson(jsonObject)
);
}

@NonNull
private static Source fromSourceJson(@NonNull JSONObject jsonObject) {
final String id = optString(jsonObject, FIELD_ID);
final Long amount = optLong(jsonObject, FIELD_AMOUNT);
final String clientSecret = optString(jsonObject, FIELD_CLIENT_SECRET);
Expand Down Expand Up @@ -459,8 +486,7 @@ public static Source fromJson(@Nullable JSONObject jsonObject) {
// trying to force it to be a type that we know of.
final Map<String, Object> sourceTypeData =
StripeJsonUtils.jsonObjectToMap(jsonObject.optJSONObject(typeRaw));
final StripeSourceTypeModel sourceTypeModel =
MODELED_TYPES.contains(typeRaw)
final StripeSourceTypeModel sourceTypeModel = MODELED_TYPES.contains(typeRaw)
? optStripeJsonModel(jsonObject, typeRaw, StripeSourceTypeModel.class)
: null;

Expand Down
52 changes: 52 additions & 0 deletions stripe/src/test/java/com/stripe/android/model/SourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

/**
Expand Down Expand Up @@ -173,6 +174,38 @@ public class SourceTest {
"}" +
"}";

private static final String DELETED_CARD_JSON = "{\n" +
" \"id\": \"card_1ELdAlCRMbs6FrXfNbmZEOb7\",\n" +
" \"object\": \"card\",\n" +
" \"deleted\": true\n" +
"}";

private static final String CREATED_CARD_JSON = "{\n" +
" \"id\": \"card_1ELxrOCRMbs6FrXfdxOGjnaD\",\n" +
" \"object\": \"card\",\n" +
" \"address_city\": null,\n" +
" \"address_country\": null,\n" +
" \"address_line1\": null,\n" +
" \"address_line1_check\": null,\n" +
" \"address_line2\": null,\n" +
" \"address_state\": null,\n" +
" \"address_zip\": null,\n" +
" \"address_zip_check\": null,\n" +
" \"brand\": \"Visa\",\n" +
" \"country\": \"US\",\n" +
" \"customer\": \"cus_Epd7N0VR3cdjsr\",\n" +
" \"cvc_check\": null,\n" +
" \"dynamic_last4\": null,\n" +
" \"exp_month\": 4,\n" +
" \"exp_year\": 2020,\n" +
" \"funding\": \"credit\",\n" +
" \"last4\": \"4242\",\n" +
" \"metadata\": {\n" +
" },\n" +
" \"name\": null,\n" +
" \"tokenization_method\": null\n" +
"}\n";

private Source mSource;

@Before
Expand Down Expand Up @@ -209,4 +242,23 @@ public void fromJsonString_withCustomType_createsSourceWithCustomType() {
assertNull(customSource.getSourceTypeModel());
assertNotNull("Failed to find custom api params", customSource.getSourceTypeData());
}

@Test
public void fromJsonString_withDeletedCardJson_shouldReturnSourceWithCardId() {
final Source source = Source.fromString(DELETED_CARD_JSON);
assertNotNull(source);
assertEquals("card_1ELdAlCRMbs6FrXfNbmZEOb7", source.getId());
}

@Test
public void fromJsonString_withCreatedCardJson_shouldReturnSourceWithCardId() {
final Source source = Source.fromString(CREATED_CARD_JSON);
assertNotNull(source);
assertEquals("card_1ELxrOCRMbs6FrXfdxOGjnaD", source.getId());
assertEquals(Source.CARD, source.getType());
assertTrue(source.getSourceTypeModel() instanceof SourceCardData);

final SourceCardData sourceCardData = (SourceCardData) source.getSourceTypeModel();
assertEquals(Card.VISA, sourceCardData.getBrand());
}
}