Merge pull request #12 from messagebird/version_3.0.0

Replacing OTP with new Verify call

Author: cooldarkdryplace

client.go

@@ -144,7 +144,8 @@ func (c *Client) HLR(id string) (*HLR, error) {
 func (c *Client) NewHLR(msisdn, reference string) (*HLR, error) {
 	params := &url.Values{
 		"msisdn":    {msisdn},
-		"reference": {reference}}
+		"reference": {reference},
+	}
 
 	hlr := &HLR{}
 	if err := c.request(hlr, "hlr", params); err != nil {
@@ -227,41 +228,40 @@ func (c *Client) NewVoiceMessage(recipients []string, body string, params *Voice
 	return message, nil
 }
 
-// OtpGenerate generates a new One-Time-Password for one recipient.
-func (c *Client) OtpGenerate(recipient string, params *OtpParams) (*OtpMessage, error) {
-	urlParams := paramsForOtp(params)
+// NewVerify generates a new One-Time-Password for one recipient.
+func (c *Client) NewVerify(recipient string, params *VerifyParams) (*Verify, error) {
+	urlParams := paramsForVerify(params)
 	urlParams.Set("recipient", recipient)
 
-	message := &OtpMessage{}
-	if err := c.request(message, "otp/generate", urlParams); err != nil {
+	verify := &Verify{}
+	if err := c.request(verify, "verify", urlParams); err != nil {
 		if err == ErrResponse {
-			return message, err
+			return verify, err
 		}
 
 		return nil, err
 	}
 
-	return message, nil
+	return verify, nil
 }
 
-// OtpVerify verifies the token that was generated with OtpGenerate.
-func (c *Client) OtpVerify(recipient string, token string, params *OtpParams) (*OtpMessage, error) {
-	urlParams := paramsForOtp(params)
-	urlParams.Set("recipient", recipient)
-	urlParams.Set("token", token)
+// VerifyToken performs token value check against MessageBird API.
+func (c *Client) VerifyToken(id, token string) (*Verify, error) {
+	params := &url.Values{}
+	params.Set("token", token)
 
-	path := "otp/verify?" + urlParams.Encode()
+	path := "verify/" + id + "?" + params.Encode()
 
-	message := &OtpMessage{}
-	if err := c.request(message, path, nil); err != nil {
+	verify := &Verify{}
+	if err := c.request(verify, path, nil); err != nil {
 		if err == ErrResponse {
-			return message, err
+			return verify, err
 		}
 
 		return nil, err
 	}
 
-	return message, nil
+	return verify, nil
 }
 
 // Lookup performs a new lookup for the specified number.

otp_message_test.go

@@ -2,48 +2,55 @@ package messagebird
 
 import (
 	"net/url"
+	"strconv"
 	"time"
 )
 
-type OtpMessage struct {
-	Id                 string
-	Recipient          string
+// Verify object represents MessageBird server response.
+type Verify struct {
+	ID                 string
+	HRef               string
 	Reference          string
 	Status             string
-	Href               map[string]string `json:"href"`
+	Messages           map[string]string
 	CreatedDatetime    *time.Time
 	ValidUntilDatetime *time.Time
+	Recipient          int
 	Errors             []Error
 }
 
-type OtpParams struct {
-	Reference  string
-	Originator string
-	Type       string
-	Language   string
-	Voice      string
-	Template   string
-	DataCoding string
+// VerifyParams handles optional verification parameters.
+type VerifyParams struct {
+	Originator  string
+	Reference   string
+	Type        string
+	Template    string
+	DataCoding  string
+	Voice       string
+	Language    string
+	Timeout     int
+	TokenLength int
 }
 
-// paramsForOtp converts the specified OtpParams struct to a
-// url.Values pointer and returns it.
-func paramsForOtp(params *OtpParams) *url.Values {
+func paramsForVerify(params *VerifyParams) *url.Values {
 	urlParams := &url.Values{}
 
 	if params == nil {
 		return urlParams
 	}
 
-	if params.Reference != "" {
-		urlParams.Set("reference", params.Reference)
-	}
 	if params.Originator != "" {
 		urlParams.Set("originator", params.Originator)
 	}
+
+	if params.Reference != "" {
+		urlParams.Set("reference", params.Reference)
+	}
+
 	if params.Type != "" {
 		urlParams.Set("type", params.Type)
 	}
+
 	if params.Template != "" {
 		urlParams.Set("template", params.Template)
 	}
@@ -52,6 +59,14 @@ func paramsForOtp(params *OtpParams) *url.Values {
 		urlParams.Set("datacoding", params.DataCoding)
 	}
 
+	if params.Timeout != 0 {
+		urlParams.Set("timeout", strconv.Itoa(params.Timeout))
+	}
+
+	if params.TokenLength != 0 {
+		urlParams.Set("tokenLength", strconv.Itoa(params.TokenLength))
+	}
+
 	// Specific params for voice messages
 	if params.Language != "" {
 		urlParams.Set("language", params.Language)