Skip to content

Make create with refresh token work #53

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
petdoan wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Make create with refresh token work #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9c2e47
Update force.go
petdoan Mar 12, 2018
39ed7db
Update oauth.go
petdoan Mar 12, 2018
f12cb18
Update force.go
petdoan Mar 19, 2018
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
16 changes: 6 additions & 10 deletions force/force.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,12 @@ func CreateWithAccessToken(version, clientId, accessToken, instanceUrl string) (
return forceApi, nil
}

func CreateWithRefreshToken(version, clientId, accessToken, instanceUrl string) (*ForceApi, error) {
func CreateWithRefreshToken(version, clientId, clientSecret, refreshToken, environment string) (*ForceApi, error) {
oauth := &forceOauth{
clientId: clientId,
AccessToken: accessToken,
InstanceUrl: instanceUrl,
clientSecret: clientSecret,
refreshToken: refreshToken,
environment: environment,
}

forceApi := &ForceApi{
Expand All @@ -104,13 +105,8 @@ func CreateWithRefreshToken(version, clientId, accessToken, instanceUrl string)
oauth: oauth,
}

// obtain access token
if err := forceApi.RefreshToken(); err != nil {
return nil, err
}

// We need to check for oath correctness here, since we are not generating the token ourselves.
if err := forceApi.oauth.Validate(); err != nil {
// Init oauth
if err := forceApi.oauth.AuthenticateWithRefreshToken(); err != nil {
return nil, err
}

Expand Down
16 changes: 16 additions & 0 deletions force/oauth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (

const (
grantType = "password"
grantTypeRefreshToken = "refresh_token"
loginUri = "https://login.salesforce.com/services/oauth2/token"
testLoginUri = "https://test.salesforce.com/services/oauth2/token"

Expand Down Expand Up @@ -60,6 +61,21 @@ func (oauth *forceOauth) Authenticate() error {
"password": {fmt.Sprintf("%v%v", oauth.password, oauth.securityToken)},
}

return oauth.AuthenticateWithPayload(payload)
}

func (oauth *forceOauth) AuthenticateWithRefreshToken() error {
payload := url.Values{
"grant_type": {grantTypeRefreshToken},
"client_id": {oauth.clientId},
"client_secret": {oauth.clientSecret},
"refresh_token": {oauth.refreshToken},
}

return oauth.AuthenticateWithPayload(payload)
}

func (oauth *forceOauth) AuthenticateWithPayload(payload url.Values) error {
// Build Uri
uri := loginUri
if oauth.environment == "sandbox" {
Expand Down