Merge branch 'master' into savicprvoslav-master

Author: mmartinic

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,19 @@
+Please use the following template to submit your issue. Following this template will allow us to quickly investigate and help you with your issue. Please be aware that issues which do not conform to this template may be closed.
+
+For feature requests please contact us at [email protected]
+
+
+## Version info
+  - intercom-java version:
+  - Java version:
+
+## Expected behavior
+
+## Actual behavior
+
+## Steps to reproduce
+ 1. 
+ 2. 
+ 3. 
+
+## Logs

.travis.yml

@@ -0,0 +1 @@
+language: java

CHANGES.md

@@ -1,27 +1,40 @@
 ### Changes
 
+#### 2.2.0
+
+- Include company custom attributes when updating a user with an embedded company object
+- Include support for Personal Access Token API access
+
+#### 2.1.0
+
+- Dynamically retrieve the parts for a conversation if not present
+
+#### 2.0.0
+
+- Fixes subscription metadata deserialization
+
 #### 1.3.1
 
 - Fixes company removal
 
 #### 1.3.0
 
 - Is a rollup of the 1.3.0 beta releases.
-  
+
 #### 1.3.0-b3
 
 - Configure Jackson ObjectMapper once [76](https://github.com/intercom/intercom-java/issues/76)
 
 #### 1.3.0-b2
 
-- Allow users to be removed from companies. 
+- Allow users to be removed from companies.
 
 #### 1.3.0-b1
 
-- Support bulk user and event submission. Save your request rate limit for 
+- Support bulk user and event submission. Save your request rate limit for
 a rainy day! You can post and delete users, and post events.  
 
-- Add a currentTimestamp() helper to Intercom. This divides currentTimeMillis 
+- Add a currentTimestamp() helper to Intercom. This divides currentTimeMillis
 by 1000 to produce a second level value.
 
 #### 1.2.1
@@ -30,13 +43,13 @@ by 1000 to produce a second level value.
 
 #### 1.2.0
 
-- Allow conversations to be assigned to others on your team. Conversations 
-are the most beautiful things, and now you can share them with others through 
+- Allow conversations to be assigned to others on your team. Conversations
+are the most beautiful things, and now you can share them with others through
 the API.    
 
 - Support closing and opening conversations, either directly or with a reply.
-  
-  
+
+
 #### 1.1.2
 
  - make setUserAgentData public. Previously this was a protected method.
@@ -47,17 +60,17 @@ the API.
 
 #### 1.1.0
 
- - add support for [Contacts](https://github.com/intercom/intercom-java#contacts) 
+ - add support for [Contacts](https://github.com/intercom/intercom-java#contacts)
 
 #### 1.0.9
 
- - remove secondary getters on user that stop older jackson versions working  [48](https://github.com/intercom/intercom-java/issues/45) (caused in [40](https://github.com/intercom/intercom-java/issues/48)). Doing a bang up job on regression bugs atm. 
+ - remove secondary getters on user that stop older jackson versions working  [48](https://github.com/intercom/intercom-java/issues/45) (caused in [40](https://github.com/intercom/intercom-java/issues/48)). Doing a bang up job on regression bugs atm.
 
 #### 1.0.8
 
  - fix user update regression [45](https://github.com/intercom/intercom-java/issues/45) (caused in [40](https://github.com/intercom/intercom-java/issues/40))
-  
- - don't send values for `unsubscribed_from_emails`, `update_last_request_at` or `new_session` unless set 
+
+ - don't send values for `unsubscribed_from_emails`, `update_last_request_at` or `new_session` unless set
 
 #### 1.0.7
 
@@ -73,7 +86,7 @@ allow the signed_up_at user field to be submitted
 
 #### 1.0.4
 
-allow the intercom user id field to be submitted 
+allow the intercom user id field to be submitted
 
 #### 1.0.3
 
@@ -86,21 +99,21 @@ encode social profile urls for user objects
 #### 1.0.1
 
  - send custom company attributes on update
- 
+
  - fix NPE when company has no plan on update
- 
- - invalidate setSessionCount on Company [27](https://github.com/intercom/intercom-java/issues/27) 
+
+ - invalidate setSessionCount on Company [27](https://github.com/intercom/intercom-java/issues/27)
 
 #### 1.0.0
 
  - removed tag methods requiring collections
- 
+
  - handle non-json error entities from server
 
 #### 0.1.0
 
  - support untag of users and companies
- 
+
  - renamed of current page and page methods on collections (breaking)
 
 #### 0.0.5

README.md

@@ -4,7 +4,7 @@
 
 Java bindings for the [Intercom API](https://api.intercom.io/docs)
 
- - [Installation](#installation)
+ - [Installation](#add-a-dependency)
  - [Resources](#resources)
  - [Authorization](#authorization)
  - [Usage](#usage)
@@ -38,7 +38,7 @@ and add the project declaration to your `pom.xml`:
 <dependency>
   <groupId>io.intercom</groupId>
   <artifactId>intercom-java</artifactId>
-  <version>1.3.1</version>
+  <version>2.2.0</version>
 </dependency>
 ```
 
@@ -56,7 +56,7 @@ and add the project to the `dependencies` block in your `build.gradle`:
 
 ```groovy
 dependencies {
-  compile 'io.intercom:intercom-java:1.3.1'
+  compile 'io.intercom:intercom-java:2.2.0'
 }  
 ```
 
@@ -71,7 +71,7 @@ resolvers += "jcenter" at "http://jcenter.bintray.com"
 and add the project to your `libraryDependencies` in your `build.sbt`:
 
 ```scala
-libraryDependencies += "io.intercom" % "intercom-java" % "1.3.1"
+libraryDependencies += "io.intercom" % "intercom-java" % "2.2.0"
 ```
 
 ## Resources
@@ -95,14 +95,22 @@ Resources this API supports:
 
 ## Authorization
 
-You can set the app's id and api key via the `Intercom` object -  
+
+If you're using a Personal Access Token (PAT) you can just use the following helper method, which will automatically set up the authentication scheme for you -
+
+```java
+Intercom.setToken("da39a3ee5e6b4b0d3255bfef95601890afd80709");
+```
+
+If you're still using API Keys (now deprecated), you can set up your App ID and API Key using the following methods -
 
 ```java
 Intercom.setAppID("pi3243fa");
 Intercom.setApiKey("da39a3ee5e6b4b0d3255bfef95601890afd80709");
 ```
 
 
+
 ## Usage
 
 ### Users
@@ -155,6 +163,10 @@ User.submit(moreItems, job);
 
 //View a bulk job error feed
 User.listJobErrorFeed(jobId)
+
+// Delete a user
+User user = User.find("541a144b201ebf2ec5000001");
+User.delete(user.getId());
 ```
 
 ### Contacts
@@ -272,8 +284,8 @@ System.out.println(job.getID());
 
 // Bulk submit, add to an existing job
 final List<JobItem<Event>> moreItems = Lists.newArrayList();
-items.add(new JobItem<Event>("post", event4));
-items.add(new JobItem<Event>("delete", event5));
+moreItems.add(new JobItem<Event>("post", event4));
+moreItems.add(new JobItem<Event>("delete", event5));
 Event.submit(moreItems, job);
 
 //View a bulk job error feed
@@ -414,7 +426,7 @@ while (userConversations.hasNext()) {
 final Conversation conversation = Conversation.find("66");
 ConversationMessage conversationMessage = conversation.getConversationMessage();
 ConversationPartCollection parts = conversation.getConversationPartCollection();
-List<ConversationPart> partList = parts.getPageItems();
+List<ConversationPart> partList = parts.getPage();
 for (ConversationPart part : partList) {
     String partType = part.getPartType();
     Author author = part.getAuthor();
@@ -435,6 +447,7 @@ ConversationCollection openForAdmin = Conversation.list(params);
 Admin admin = new Admin().setId("1");
 AdminReply adminReply = new AdminReply(admin);
 adminReply.setBody("These apples are healthsome");
+adminReply.setAttachmentUrls(new String[]{"http://www.example.com/attachment.jpg"}); // optional - list of attachments
 Conversation.reply("66", adminReply);
 
 // admin close
@@ -447,6 +460,7 @@ Conversation.reply("66", adminReply);
 User user1 = new User().setId("5310d8e8598c9a0b24000005");
 UserReply userReply = new UserReply(user1);
 userReply.setBody("Mighty fine shindig");
+userReply.setAttachmentUrls(new String[]{"http://www.example.com/attachment.jpg"}); // optional - list of attachments
 System.out.println(MapperSupport.objectMapper().writeValueAsString(userReply));
 Conversation.reply("66", userReply);
 ```
@@ -575,7 +589,7 @@ Some API classes have static `list()` methods that correspond to paginated API r
 These return a Collection object (eg `UserCollection`) which can be iterated in two
  ways
 
-- The collection's `getPageItems()`, `hasNextPage()` and `nextPage()` methods - these are useful when you want to fetch one or just a few pages directly.  
+- The collection's `getPage()`, `hasNextPage()` and `nextPage()` methods - these are useful when you want to fetch one or just a few pages directly.  
 
 - Java's inbuilt iterator methods `next()` and `hasNext()` - these are useful when you want to fetch data without manually handling pagination.
 

gradle.properties

@@ -1,4 +1,4 @@
-version: 1.3.1
+version: 2.2.0
 
 groupId: io.intercom
 

intercom-java/build.gradle

@@ -44,8 +44,8 @@ publishing {
 bintray {
   // gradle apslodes if the bintray* props aren't found and we never run this task in circle
   if (System.getenv('release') != null) {
-    user = bintrayUser
-    key = bintrayKey
+    user = System.getenv('BINTRAY_USER')
+    key = System.getenv('BINTRAY_KEY')
   }
   publications = ['mavenJava']
   dryRun = false

intercom-java/src/main/java/io/intercom/api/AdminReply.java

@@ -46,6 +46,11 @@ public String getAdminID() {
         public String getAssigneeID() {
             return reply.getAssigneeID();
         }
+
+        @JsonProperty("attachment_urls")
+        private String[] getAttachmentUrls() {
+            return reply.getAttachmentUrls();
+        }
     }
 
     @JsonProperty("assignee_id")

intercom-java/src/main/java/io/intercom/api/CompanyUpdateBuilder.java

@@ -58,6 +58,9 @@ private static CompanyWithStringPlan prepareUpdatableCompany(Company company) {
         updatableCompany.setSessionCount(company.getSessionCount());
         updatableCompany.setMonthlySpend(company.getMonthlySpend());
         updatableCompany.setRemoteCreatedAt(company.getRemoteCreatedAt());
+        if(company.getCustomAttributes() != null) {
+            updatableCompany.getCustomAttributes().putAll(company.getCustomAttributes());
+        }
         if (company.getPlan() != null) {
             updatableCompany.setPlan(company.getPlan().getName());
         }

intercom-java/src/main/java/io/intercom/api/Conversation.java

@@ -265,6 +265,10 @@ public long getUpdatedAt() {
     }
 
     public ConversationPartCollection getConversationPartCollection() {
+        if (conversationPartCollection == null || conversationPartCollection.getPage().isEmpty()) {
+            this.conversationPartCollection = find(this.getId()).getConversationPartCollection();
+        }
+
         return conversationPartCollection;
     }
 

intercom-java/src/main/java/io/intercom/api/HttpClient.java

@@ -59,8 +59,6 @@ private static String clientAgentDetails() {
 
     private final Map<String, String> headers;
 
-    private final String apiKey = Intercom.getApiKey();
-
     private final HttpConnectorSupplier connection = Intercom.getHttpConnectorSupplier();
 
     public HttpClient(URI uri) {
@@ -229,15 +227,21 @@ private HttpURLConnection prepareConnection(HttpURLConnection conn) {
     }
 
     private Map<String, String> createAuthorizationHeaders() {
-        if (Intercom.getAuthScheme().equals(Intercom.AUTH_BEARER)) {
-            headers.put("Authorization", "Bearer " + apiKey);
-        } else if (Intercom.getAuthScheme().equals(Intercom.AUTH_BASIC)) {
-            final String authString = Intercom.getAppID() + ":" + Intercom.getApiKey();
-            headers.put("Authorization", "Basic " + Base64.encodeBase64String(authString.getBytes()));
+        switch (Intercom.getAuthKeyType()) {
+            case API_KEY:
+                headers.put("Authorization", "Basic " + generateAuthString(Intercom.getAppID(),Intercom.getApiKey()));
+                break;
+            case TOKEN:
+                headers.put("Authorization", "Basic " + generateAuthString(Intercom.getToken(),""));
+                break;
         }
         return headers;
     }
 
+    private String generateAuthString(String username, String password) {
+        return Base64.encodeBase64String((username + ":" + password).getBytes());
+    }
+
     private Map<String, String> createHeaders() {
         headers.put("User-Agent", USER_AGENT);
         headers.put("X-Client-Platform-Details", CLIENT_AGENT_DETAILS);