From f6d8c59b06ed461f162624b8f5ea07fa7b56d7da Mon Sep 17 00:00:00 2001
From: unknown <garth@tunnel19.com>
Date: Wed, 26 Sep 2018 23:14:39 +0200
Subject: [PATCH] added id and instance_url to ApiSession

---
 src/main/java/com/force/api/ApiSession.java | 18 ++++++++++++++++--
 src/main/java/com/force/api/Auth.java       |  4 ++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/force/api/ApiSession.java b/src/main/java/com/force/api/ApiSession.java
index 057a8fd..ac89262 100644
--- a/src/main/java/com/force/api/ApiSession.java
+++ b/src/main/java/com/force/api/ApiSession.java
@@ -7,6 +7,8 @@ public class ApiSession implements java.io.Serializable {
 	String accessToken;
 	String apiEndpoint;
 	String refreshToken;
+	String instanceUrl;
+	String id;
 
 	public ApiSession() {}
 	
@@ -24,6 +26,12 @@ public String getApiEndpoint() {
 	public String getRefreshToken() {
 		return refreshToken;
 	}
+	public String getInstanceUrl() {
+		return instanceUrl;
+	}
+	public String getId() {
+		return id;
+	}
 	public ApiSession setAccessToken(String accessToken) {
 		this.accessToken = accessToken;
 		return this;
@@ -32,11 +40,17 @@ public ApiSession setApiEndpoint(String apiEndpoint) {
 		this.apiEndpoint = apiEndpoint;
 		return this;
 	}
-
 	public ApiSession setRefreshToken(String value) {
 		refreshToken = value;
 		return this;
 	}
-	
+	public ApiSession setInstanceUrl(String value) {
+		instanceUrl = value;
+		return this;
+	}
+	public ApiSession setId(String value) {
+		id = value;
+		return this;
+	}
 
 }
diff --git a/src/main/java/com/force/api/Auth.java b/src/main/java/com/force/api/Auth.java
index 72f4c8f..547dad3 100644
--- a/src/main/java/com/force/api/Auth.java
+++ b/src/main/java/com/force/api/Auth.java
@@ -153,6 +153,8 @@ static public final ApiSession completeOAuthWebServerFlow(AuthorizationResponse
 			} else {
 				Map<?, ?> resp = jsonMapper.readValue(r.getStream(), Map.class);
 				return new ApiSession()
+						.setId((String) resp.get("id"))
+						.setInstanceUrl((String) resp.get("instance_url"))
 						.setRefreshToken((String) resp.get("refresh_token"))
 						.setAccessToken((String) resp.get("access_token"))
 						.setApiEndpoint((String) resp.get("instance_url"));
@@ -184,6 +186,8 @@ static public final ApiSession refreshOauthTokenFlow(ApiConfig config, String re
 				Map<?, ?> resp = jsonMapper.readValue(r.getStream(), Map.class);
 
 				return new ApiSession()
+						.setId((String) resp.get("id"))
+						.setInstanceUrl((String) resp.get("instance_url"))
 						.setAccessToken((String) resp.get("access_token"))
 						.setApiEndpoint((String) resp.get("instance_url"))
 						.setRefreshToken(refreshToken);