Fix endpoint and JSON payload

Looks like OneLogin has changed the following endpoint:

/auth/oauth2/token -> /auth/oauth2/v2/token

In addition, the /api/1/saml_assertion endpoint started to return
HTTP 500 when the ip_address field is included with an empty value.

onelogin/client.go

@@ -21,28 +21,19 @@ type GenerateTokensParams struct {
 }
 
 type GenerateTokensResponse struct {
-	Status struct {
-		Error   bool   `json:"error"`
-		Code    int    `json:"code"`
-		Type    string `json:"type"`
-		Message string `json:"message"`
-	} `json:"status"`
-	Data []struct {
-		AccessToken  string    `json:"access_token"`
-		CreatedAt    time.Time `json:"created_at"`
-		ExpiresIn    int       `json:"expires_in"`
-		RefreshToken string    `json:"refresh_token"`
-		TokenType    string    `json:"token_type"`
-		AccountID    int       `json:"account_id"`
-	} `json:"data"`
+	AccessToken  string    `json:"access_token"`
+	CreatedAt    time.Time `json:"created_at"`
+	ExpiresIn    int       `json:"expires_in"`
+	RefreshToken string    `json:"refresh_token"`
+	TokenType    string    `json:"token_type"`
+	AccountID    int       `json:"account_id"`
 }
 
 type GenerateSamlAssertionParams struct {
 	UsernameOrEmail string `json:"username_or_email"`
 	Password        string `json:"password"`
 	AppId           string `json:"app_id"`
 	Subdomain       string `json:"subdomain"`
-	IpAddress       string `json:"ip_address"`
 }
 
 // TODO This one assumes MFA is enabled. Need to handle all cases.
@@ -164,7 +155,7 @@ func (c *Client) GenerateTokens(clientID, clientSecret string) (string, error) {
 
 	// TODO add handling for valid JSON with wrong response
 
-	return resp.Data[0].AccessToken, nil
+	return resp.AccessToken, nil
 }
 
 // GenerateSamlAssertion gets a OneLogin access token and a GenerateSamlAssertionParams struct

onelogin/client_test.go

@@ -40,22 +40,12 @@ func TestNewClient(t *testing.T) {
 
 func TestGenerateTokens(t *testing.T) {
 	data := `{
-    "status": {
-        "error": false,
-        "code": 200,
-        "type": "success",
-        "message": "Success"
-    },
-    "data": [
-        {
-            "access_token": "fake_token",
-            "created_at": "2015-11-11T03:36:18.714Z",
-            "expires_in": 36000,
-            "refresh_token": "fake",
-            "token_type": "bearer",
-            "account_id": 555555
-        }
- ]
+	"access_token": "fake_token",
+	"created_at": "2015-11-11T03:36:18.714Z",
+	"expires_in": 36000,
+	"refresh_token": "fake",
+	"token_type": "bearer",
+	"account_id": 555555
 }`
 
 	ts := getTestServer(data)

onelogin/endpoints.go

@@ -10,7 +10,7 @@ const (
 	euBase = "https://api.eu.onelogin.com"
 
 	GenerateSamlAssertionPath string = "/api/1/saml_assertion"
-	GenerateTokensPath        string = "/auth/oauth2/token"
+	GenerateTokensPath        string = "/auth/oauth2/v2/token"
 	GetUserByEmailPath        string = "/api/1/users?email=%s"
 	VerifyFactorPath          string = "/api/1/saml_assertion/verify_factor"
 )