Skip to content
This repository has been archived by the owner on Apr 23, 2021. It is now read-only.

Commit

Permalink
Merge pull request #71 from square/release/2.20190612.1
Browse files Browse the repository at this point in the history
Release 2.20190612.1
  • Loading branch information
mikekono authored Jun 26, 2019
2 parents c25be31 + bad7d78 commit 2afb4c6
Show file tree
Hide file tree
Showing 25 changed files with 157 additions and 44 deletions.
4 changes: 4 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Log

## Version 2.20190612.1 (2019-06-26)

* **Bug fix**: `Transaction.Charge` and `Customers.CreateCustomerCard` request objects — now include the `verification_token` required for [Strong Customer Authentication](https://developer.squareup.com/docs/sca-overview).

## Version 2.20190612.0 (2019-06-12)

* **BETA releases**:
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Add this dependency to your project's POM:
<dependency>
<groupId>com.squareup</groupId>
<artifactId>connect</artifactId>
<version>2.20190612.0</version>
<version>2.20190612.1</version>
<scope>compile</scope>
</dependency>
```
Expand All @@ -28,7 +28,7 @@ Add this dependency to your project's POM:
Add this dependency to your project's build file:

```groovy
compile "com.squareup:connect:2.20190612.0"
compile "com.squareup:connect:2.20190612.1"
```

### Option 3: Build and Install locally
Expand Down Expand Up @@ -70,7 +70,7 @@ At first generate the JAR by executing:

Then manually install the following JARs:

* target/connect-2.20190612.0.jar
* target/connect-2.20190612.1.jar
* target/lib/*.jar

## Getting Started
Expand Down Expand Up @@ -694,6 +694,7 @@ Class | Method | HTTP request | Description
- [V1VariationPricingType](docs/V1VariationPricingType.md)
- [VoidTransactionRequest](docs/VoidTransactionRequest.md)
- [VoidTransactionResponse](docs/VoidTransactionResponse.md)
- [WebhookEvents](docs/WebhookEvents.md)
- [Weekday](docs/Weekday.md)
- [WorkweekConfig](docs/WorkweekConfig.md)

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'idea'
apply plugin: 'eclipse'

group = 'com.squareup'
version = '2.20190612.0'
version = '2.20190612.1'

buildscript {
repositories {
Expand Down
2 changes: 1 addition & 1 deletion docs/CatalogObject.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

### Description

The wrapper object for object types in the Catalog data model. The type of a particular `CatalogObject` is determined by the value of `type` and only the corresponding data field may be set. - if type = `ITEM`, only `item_data` will be populated and it will contain a valid [CatalogItem](#type-catalogitem) object. - if type = `ITEM_VARIATION`, only `item_variation_data` will be populated and it will contain a valid [CatalogItemVariation](#type-catalogitemvariation) object. - if type = `MODIFIER`, only `modifier_data` will be populated and it will contain a valid [CatalogModifier](#type-catalogmodifier) object. - if type = `MODIFIER_LIST`, only `modifier_list_data` will be populated and it will contain a valid [CatalogModifierList](#type-catalogmodifierlist) object. - if type = `CATEGORY`, only `category_data` will be populated and it will contain a valid [CatalogCategory](#type-catalogcategory) object. - if type = `DISCOUNT`, only `discount_data` will be populated and it will contain a valid [CatalogDiscount](#type-catalogdiscount) object. - if type = `TAX`, only `tax_data` will be populated and it will contain a valid [CatalogTax](#type-catalogtax) object. - if type = `IMAGE`, only `image_data` will be populated and it will contain a valid [CatalogImage](#type-catalogimage) object. For a more detailed discussion of the Catalog data model, please see the [Catalog Overview](/products/catalog/overview).
The wrapper object for object types in the Catalog data model. The type of a particular `CatalogObject` is determined by the value of `type` and only the corresponding data field may be set. - if type = `ITEM`, only `item_data` will be populated and it will contain a valid [CatalogItem](#type-catalogitem) object. - if type = `ITEM_VARIATION`, only `item_variation_data` will be populated and it will contain a valid [CatalogItemVariation](#type-catalogitemvariation) object. - if type = `MODIFIER`, only `modifier_data` will be populated and it will contain a valid [CatalogModifier](#type-catalogmodifier) object. - if type = `MODIFIER_LIST`, only `modifier_list_data` will be populated and it will contain a valid [CatalogModifierList](#type-catalogmodifierlist) object. - if type = `CATEGORY`, only `category_data` will be populated and it will contain a valid [CatalogCategory](#type-catalogcategory) object. - if type = `DISCOUNT`, only `discount_data` will be populated and it will contain a valid [CatalogDiscount](#type-catalogdiscount) object. - if type = `TAX`, only `tax_data` will be populated and it will contain a valid [CatalogTax](#type-catalogtax) object. - if type = `IMAGE`, only `image_data` will be populated and it will contain a valid [CatalogImage](#type-catalogimage) object. For a more detailed discussion of the Catalog data model, please see the [Design a Catalog](/catalog-api/design-a-catalog) guide.

## Properties
Name | Type | Description | Notes
Expand Down
1 change: 1 addition & 0 deletions docs/ChargeRequest.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Name | Type | Description | Notes
**buyerEmailAddress** | **String** | The buyer&#39;s email address, if available. | [optional]
**orderId** | **String** | The ID of the order to associate with this transaction. If you provide this value, the &#x60;amount_money&#x60; value of your request must __exactly match__ the value of the order&#39;s &#x60;total_money&#x60; field. | [optional]
**additionalRecipients** | [**List&lt;AdditionalRecipient&gt;**](AdditionalRecipient.md) | The basic primitive of multi-party transaction. The value is optional. The transaction facilitated by you can be split from here. If you provide this value, the &#x60;amount_money&#x60; value in your additional_recipients must not be more than 90% of the &#x60;amount_money&#x60; value in the charge request. The &#x60;location_id&#x60; must be the valid location of the app owner merchant. This field requires the &#x60;PAYMENTS_WRITE_ADDITIONAL_RECIPIENTS&#x60; OAuth permission. This field is currently not supported in sandbox. | [optional]
**verificationToken** | **String** | An identifying token generated by &#x60;SqPaymentForm.verifyBuyer()&#x60;. Verification tokens encapsulate customer device information and 3-D Secure challenge results to indicate that Square has verified the buyer identity. | [optional]



5 changes: 3 additions & 2 deletions docs/CreateCustomerCardRequest.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ Defines the fields that are included in the request body of a request to the Cre
## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**cardNonce** | **String** | A card nonce representing the credit card to link to the customer. Card nonces are generated by the &#x60;SqPaymentForm&#x60; that buyers enter their card information into. See [Embedding the payment form](/payments/sqpaymentform/overview) for more information. __Note:__ Card nonces generated by digital wallets (e.g., Apple Pay) cannot be used to create a customer card. |
**cardNonce** | **String** | A card nonce representing the credit card to link to the customer. Card nonces are generated by the &#x60;SqPaymentForm&#x60; that buyers enter their card information into. See [Embedding the payment form](/payment-form/payment-form-walkthrough) for more information. __Note:__ Card nonces generated by digital wallets (e.g., Apple Pay) cannot be used to create a customer card. |
**billingAddress** | [**Address**](Address.md) | Address information for the card on file. Only the &#x60;postal_code&#x60; field is required for payments in the US and Canada. | [optional]
**cardholderName** | **String** | The cardholder&#39;s name. | [optional]
**cardholderName** | **String** | The full name printed on the credit card. | [optional]
**verificationToken** | **String** | An identifying token generated by &#x60;SqPaymentForm.verifyBuyer()&#x60;. Verification tokens encapsulate customer device information and 3-D Secure challenge results to indicate that Square has verified the buyer identity. | [optional]



4 changes: 2 additions & 2 deletions docs/CustomersApi.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ OAuth oauth2 = (OAuth) defaultClient.getAuthentication("oauth2");
oauth2.setAccessToken("YOUR ACCESS TOKEN");

CustomersApi apiInstance = new CustomersApi();
String customerId = "customerId_example"; // String | The ID of the customer to link the card on file to.
String customerId = "customerId_example"; // String | The Square ID of the customer profile the card is linked to.
CreateCustomerCardRequest body = new CreateCustomerCardRequest(); // CreateCustomerCardRequest | An object containing the fields to POST for the request. See the corresponding object definition for field details.
try {
CreateCustomerCardResponse result = apiInstance.createCustomerCard(customerId, body);
Expand All @@ -106,7 +106,7 @@ try {

Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
**customerId** | **String**| The ID of the customer to link the card on file to. |
**customerId** | **String**| The Square ID of the customer profile the card is linked to. |
**body** | [**CreateCustomerCardRequest**](CreateCustomerCardRequest.md)| An object containing the fields to POST for the request. See the corresponding object definition for field details. |

### Return type
Expand Down
2 changes: 1 addition & 1 deletion docs/OAuthApi.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ No authorization required
RenewToken

&#x60;RenewToken&#x60; is deprecated. For information about refreshing OAuth access tokens, see [Renew OAuth Token](/authz/oauth/cookbook/oauth-renew). Renews an OAuth access token before it expires. OAuth access tokens besides your application&#39;s personal access token expire after __30 days__. You can also renew expired tokens within __15 days__ of their expiration. You cannot renew an access token that has been expired for more than 15 days. Instead, the associated user must re-complete the OAuth flow from the beginning. __Important:__ The &#x60;Authorization&#x60; header for this endpoint must have the following format: &#x60;&#x60;&#x60; Authorization: Client APPLICATION_SECRET &#x60;&#x60;&#x60; Replace &#x60;APPLICATION_SECRET&#x60; with the application secret on the Credentials page in the [application dashboard](https://connect.squareup.com/apps).
&#x60;RenewToken&#x60; is deprecated. For information about refreshing OAuth access tokens, see [Renew OAuth Token](https://developer.squareup.com/docs/oauth-api/cookbook/renew-oauth-tokens). Renews an OAuth access token before it expires. OAuth access tokens besides your application&#39;s personal access token expire after __30 days__. You can also renew expired tokens within __15 days__ of their expiration. You cannot renew an access token that has been expired for more than 15 days. Instead, the associated user must re-complete the OAuth flow from the beginning. __Important:__ The &#x60;Authorization&#x60; header for this endpoint must have the following format: &#x60;&#x60;&#x60; Authorization: Client APPLICATION_SECRET &#x60;&#x60;&#x60; Replace &#x60;APPLICATION_SECRET&#x60; with the application secret on the Credentials page in the [application dashboard](https://connect.squareup.com/apps).

### Example
```java
Expand Down
2 changes: 1 addition & 1 deletion docs/OrderLineItem.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**uid** | **String** | Unique ID that identifies the line item only within this order. This field is read-only. | [optional]
**name** | **String** | The name of the line item. | [optional]
**quantity** | **String** | The quantity purchased, formatted as a decimal number. For example: &#x60;\&quot;3\&quot;&#x60;. Line items with a &#x60;quantity_unit&#x60; can have non-integer quantities. For example: &#x60;\&quot;1.70000\&quot;&#x60;. Orders Hub and older versions of Connect do not support non-integer quantities. See [Decimal quantities with Orders hub and older versions of Connect](/more-apis/orders/overview#decimal-quantities). |
**quantity** | **String** | The quantity purchased, formatted as a decimal number. For example: &#x60;\&quot;3\&quot;&#x60;. Line items with a &#x60;quantity_unit&#x60; can have non-integer quantities. For example: &#x60;\&quot;1.70000\&quot;&#x60;. |
**quantityUnit** | [**OrderQuantityUnit**](OrderQuantityUnit.md) | The unit and precision that this line item&#39;s quantity is measured in. | [optional]
**note** | **String** | The note of the line item. | [optional]
**catalogObjectId** | **String** | The [CatalogItemVariation](#type-catalogitemvariation) id applied to this line item. | [optional]
Expand Down
2 changes: 1 addition & 1 deletion docs/OrderQuantityUnit.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Contains the measurement unit for a quantity and a precision which specifies the
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**measurementUnit** | [**MeasurementUnit**](MeasurementUnit.md) | A [MeasurementUnit](#type-measurementunit) that represents the unit of measure for the quantity. | [optional]
**precision** | **Integer** | For non-integer quantities, represents the number of digits after the decimal point that are recorded for this quantity. For example, a precision of 1 allows quantities like &#x60;\&quot;1.0\&quot;&#x60; and &#x60;\&quot;1.1\&quot;&#x60;, but not &#x60;\&quot;1.01\&quot;&#x60;. Min: 0. Max: 5. Orders Hub and older versions of Connect do not support non-integer quantities. See [Decimal quantities with Orders hub and older versions of Connect](/more-apis/orders/overview#decimal-quantities). | [optional]
**precision** | **Integer** | For non-integer quantities, represents the number of digits after the decimal point that are recorded for this quantity. For example, a precision of 1 allows quantities like &#x60;\&quot;1.0\&quot;&#x60; and &#x60;\&quot;1.1\&quot;&#x60;, but not &#x60;\&quot;1.01\&quot;&#x60;. Min: 0. Max: 5. | [optional]



4 changes: 2 additions & 2 deletions docs/V1CashDrawerShift.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

### Description

V1CashDrawerShift
Contains details for a single cash drawer shift.

## Properties
Name | Type | Description | Notes
Expand All @@ -17,7 +17,7 @@ Name | Type | Description | Notes
**openingEmployeeId** | **String** | The ID of the employee that started the cash drawer shift. | [optional]
**endingEmployeeId** | **String** | The ID of the employee that ended the cash drawer shift. | [optional]
**closingEmployeeId** | **String** | The ID of the employee that closed the cash drawer shift by auditing the cash drawer&#39;s contents. | [optional]
**description** | **String** | The time when the timecard was created, in ISO 8601 format. | [optional]
**description** | **String** | A description of the cash drawer shift. | [optional]
**startingCashMoney** | [**V1Money**](V1Money.md) | The amount of money in the cash drawer at the start of the shift. | [optional]
**cashPaymentMoney** | [**V1Money**](V1Money.md) | The amount of money added to the cash drawer from cash payments. | [optional]
**cashRefundsMoney** | [**V1Money**](V1Money.md) | The amount of money removed from the cash drawer from cash refunds. This value is always negative or zero. | [optional]
Expand Down
2 changes: 1 addition & 1 deletion docs/V1Item.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Name | Type | Description | Notes
**masterImage** | [**V1ItemImage**](V1ItemImage.md) | The item&#39;s master image, if any. | [optional]
**category** | [**V1Category**](V1Category.md) | The category the item belongs to, if any. | [optional]
**variations** | [**List&lt;V1Variation&gt;**](V1Variation.md) | The item&#39;s variations. You must specify at least one variation. | [optional]
**modifierLists** | [**List&lt;V1Variation&gt;**](V1Variation.md) | The modifier lists that apply to the item, if any. | [optional]
**modifierLists** | [**List&lt;V1ModifierList&gt;**](V1ModifierList.md) | The modifier lists that apply to the item, if any. | [optional]
**fees** | [**List&lt;V1Fee&gt;**](V1Fee.md) | The fees that apply to the item, if any. | [optional]
**taxable** | **Boolean** | Deprecated. This field is not used. | [optional]
**categoryId** | **String** | The ID of the item&#39;s category, if any. | [optional]
Expand Down
10 changes: 10 additions & 0 deletions docs/WebhookEvents.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

# WebhookEvents

## Enum


* `UPDATED` (value: `"inventory.count.updated"`)



2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<artifactId>connect</artifactId>
<packaging>jar</packaging>
<name>connect</name>
<version>2.20190612.0</version>
<version>2.20190612.1</version>
<url>https://github.com/square/connect-java-sdk/</url>
<description>Java client library for the Square Connect API</description>
<scm>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/squareup/connect/ApiClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public ApiClient() {
this.dateFormat = new RFC3339DateFormat();

// Set default User-Agent.
setUserAgent("Square-Connect-Java/2.20190612.0");
setUserAgent("Square-Connect-Java/2.20190612.1");

// Setup authentications (key: authentication name, value: authentication).
authentications = new HashMap<String, Authentication>();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/squareup/connect/api/CustomersApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public CreateCustomerResponse createCustomer(CreateCustomerRequest body) throws
/**
* CreateCustomerCard
* Adds a card on file to an existing customer. As with charges, calls to &#x60;CreateCustomerCard&#x60; are idempotent. Multiple calls with the same card nonce return the same card record that was created with the provided nonce during the _first_ call. Cards on file are automatically updated on a monthly basis to confirm they are still valid and can be charged.
* @param customerId The ID of the customer to link the card on file to. (required)
* @param customerId The Square ID of the customer profile the card is linked to. (required)
* @param body An object containing the fields to POST for the request. See the corresponding object definition for field details. (required)
* @return CreateCustomerCardResponse
* @throws ApiException if fails to make API call
Expand Down Expand Up @@ -183,7 +183,7 @@ public CreateCustomerCardResponse createCustomerCard(String customerId, CreateCu
/**
* CreateCustomerCard
* Adds a card on file to an existing customer. As with charges, calls to &#x60;CreateCustomerCard&#x60; are idempotent. Multiple calls with the same card nonce return the same card record that was created with the provided nonce during the _first_ call. Cards on file are automatically updated on a monthly basis to confirm they are still valid and can be charged.
* @param customerId The ID of the customer to link the card on file to. (required)
* @param customerId The Square ID of the customer profile the card is linked to. (required)
* @param body An object containing the fields to POST for the request. See the corresponding object definition for field details. (required)
* @return CompleteResponse<CreateCustomerCardResponse>
* @throws ApiException if fails to make API call
Expand Down
Loading

0 comments on commit 2afb4c6

Please sign in to comment.