Added Remember-Token to Authenticate
Renamed Authenticate to Authenticate2 and added remember-me support Created Authenticate as wrapper for Authenticate2 for backwards compat.
This commit is contained in:
1
api.go
1
api.go
@@ -15,6 +15,7 @@ const (
|
|||||||
type TastytradeAPI struct {
|
type TastytradeAPI struct {
|
||||||
httpClient *http.Client
|
httpClient *http.Client
|
||||||
authToken string
|
authToken string
|
||||||
|
remToken string
|
||||||
host string
|
host string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
17
sessions.go
17
sessions.go
@@ -17,6 +17,7 @@ type User struct {
|
|||||||
type AuthData struct {
|
type AuthData struct {
|
||||||
User User `json:"user"`
|
User User `json:"user"`
|
||||||
SessionToken string `json:"session-token"`
|
SessionToken string `json:"session-token"`
|
||||||
|
RememberToken string `json:"remember-token"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type AuthResponse struct {
|
type AuthResponse struct {
|
||||||
@@ -25,11 +26,18 @@ type AuthResponse struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Authenticate authenticates the client with the Tastytrade API
|
// Authenticate authenticates the client with the Tastytrade API
|
||||||
func (api *TastytradeAPI) Authenticate(username, password string) error {
|
func (api *TastytradeAPI) Authenticate2(username, password string, remember bool) error {
|
||||||
|
var remStr string
|
||||||
|
if remember {
|
||||||
|
remStr = "true"
|
||||||
|
} else {
|
||||||
|
remStr = "false"
|
||||||
|
}
|
||||||
authURL := fmt.Sprintf("%s/sessions", api.host)
|
authURL := fmt.Sprintf("%s/sessions", api.host)
|
||||||
authData := map[string]string{
|
authData := map[string]string{
|
||||||
"login": username,
|
"login": username,
|
||||||
"password": password,
|
"password": password,
|
||||||
|
"remember-me": remStr,
|
||||||
}
|
}
|
||||||
authBody, err := json.Marshal(authData)
|
authBody, err := json.Marshal(authData)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -52,5 +60,12 @@ func (api *TastytradeAPI) Authenticate(username, password string) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
api.authToken = authResponse.Data.SessionToken
|
api.authToken = authResponse.Data.SessionToken
|
||||||
|
if remember {
|
||||||
|
api.remToken = authResponse.Data.RememberToken
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (api *TastytradeAPI) Authenticate(username, password string) error {
|
||||||
|
return api.Authenticate2(username, password, false)
|
||||||
|
}
|
||||||
|
|||||||
@@ -22,4 +22,30 @@ func TestAuthenticate(t *testing.T) {
|
|||||||
if api.authToken != "testtoken" {
|
if api.authToken != "testtoken" {
|
||||||
t.Errorf("expected %s, got %s", "testtoken", api.authToken)
|
t.Errorf("expected %s, got %s", "testtoken", api.authToken)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (len(api.remToken) > 0) {
|
||||||
|
t.Errorf("no remember token expected, got remember token %s", api.remToken)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestAuthenticate2(t *testing.T) {
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
|
||||||
|
rw.Write([]byte(`{"context": "test", "data": {"user": {"email": "test@example.com", "username": "testuser", "external-id": "123", "is-confirmed": true}, "session-token": "testtoken", "remember-token": "remember"}}`))
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
api := NewTastytradeAPI(server.URL)
|
||||||
|
err := api.Authenticate2("testuser", "testpassword", true)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("expected nil, got %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if api.authToken != "testtoken" {
|
||||||
|
t.Errorf("expected %s, got %s", "testtoken", api.authToken)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (api.remToken != "remember") {
|
||||||
|
t.Errorf("Expected remember token remember, got remember token %s", api.remToken)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user