Skip to content

added id and instance_url to ApiSession #71

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added id and instance_url to ApiSession #71

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions src/main/java/com/force/api/ApiSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ public class ApiSession implements java.io.Serializable {
String accessToken;
String apiEndpoint;
String refreshToken;
String instanceUrl;
String id;

public ApiSession() {}

Expand All @@ -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;
Expand All @@ -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;
}

}
4 changes: 4 additions & 0 deletions src/main/java/com/force/api/Auth.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand Down Expand Up @@ -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);
Expand Down