refactor!: rm configuration

v3/oauth2.go

@@ -61,6 +61,10 @@ func (c *Client) RequestAccessToken() (*GetAccessTokenResponse, error) {
 	}
 
 	b, err = ioutil.ReadAll(res.Body)
+	if err != nil {
+		return nil, err
+	}
+
 	dest := GetAccessTokenResponse{}
 	if err := json.Unmarshal(b, &dest); err != nil {
 		return nil, err

v3/payment_checkout.go

@@ -50,6 +50,12 @@ type CreatePaymentCheckoutRequest struct {
 		Amount         uint   `json:"amount"`
 		Currency       string `json:"currencyType"`
 	} `json:"order"`
+	Customer struct {
+		UserID      string `json:"userId"`
+		Email       string `json:"email,omitempty"`
+		CountryCode string `json:"countryCode,omitempty"`
+		PhoneNumber string `json:"phoneNumber,omitempty"`
+	} `json:"customer"`
 	Type          PaymentType     `json:"type"`
 	Method        []PaymentMethod `json:"method"`
 	StoreID       string          `json:"storeId"`
@@ -83,16 +89,20 @@ func (c *Client) CreatePaymentCheckout(
 		req.Order.Currency = "MYR"
 	}
 	if req.StoreID == "" {
-		res, err := c.GetStores(ctx)
-		if err != nil {
-			return nil, err
-		}
+		if c.storeID == "" {
+			res, err := c.GetStores(ctx)
+			if err != nil {
+				return nil, err
+			}
 
-		if len(res.Items) == 0 {
-			return nil, errors.New("no available store to init payment")
-		}
+			if len(res.Items) == 0 {
+				return nil, errors.New("no available store to init payment")
+			}
 
-		req.StoreID = res.Items[0].ID
+			req.StoreID = res.Items[0].ID
+		} else {
+			req.StoreID = c.storeID
+		}
 	}
 
 	resp := new(CreatePaymentCheckoutResponse)

v3/rm.go

@@ -35,6 +35,16 @@ var (
 	noopTracer = &opentracing.NoopTracer{}
 )
 
+type Config struct {
+	ClientID     string
+	ClientSecret string
+	PrivateKey   []byte
+	PublicKey    []byte
+	StoreID      string
+	Sandbox      bool
+	TokenSource  oauth2.TokenSource
+}
+
 // Client :
 type Client struct {
 	mu            sync.Mutex
@@ -47,32 +57,25 @@ type Client struct {
 	pk            *rsa.PrivateKey
 	pub           []byte
 	oauth2        oauth2.TokenSource
+	storeID       string
 }
 
 // NewClient :
-func NewClient(
-	clientID string,
-	clientSecret string,
-	privateKey []byte,
-	publicKey []byte,
-	sandbox bool,
-	opts ...Option,
-) *Client {
+func NewClient(cfg Config) *Client {
 	var (
 		c   = new(Client)
 		err error
 	)
-	c.clientID = clientID
-	c.clientSecret = clientSecret
-	c.oauth2 = c
+	c.clientID = cfg.ClientID
+	c.clientSecret = cfg.ClientSecret
 	c.oauthEndpoint = "https://oauth.revenuemonster.my"
 	c.openEndpoint = "https://open.revenuemonster.my"
-	if sandbox {
+	if cfg.Sandbox {
 		c.oauthEndpoint = "https://sb-oauth.revenuemonster.my"
 		c.openEndpoint = "https://sb-open.revenuemonster.my"
 	}
 
-	block, _ := pem.Decode(privateKey)
+	block, _ := pem.Decode(cfg.PrivateKey)
 	if block == nil {
 		panic("invalid format of private key")
 	}
@@ -81,13 +84,25 @@ func NewClient(
 	if err != nil {
 		panic(err)
 	}
-	for _, opt := range opts {
-		opt(c)
+	c.pub = cfg.PublicKey
+	if cfg.TokenSource != nil {
+		c.oauth2 = cfg.TokenSource
+	} else {
+		c.oauth2 = c
+	}
+
+	// if store id is empty, get store id
+	if cfg.StoreID == "" {
+		resp, err := c.GetStores(context.Background())
+		if err != nil {
+			panic(err)
+		}
+		c.storeID = resp.Items[0].ID
 	}
 	return c
 }
 
-func (c *Client) MaybeStartSpanFromContext(ctx context.Context, operationName string) opentracing.Span {
+func (c *Client) maybeStartSpanFromContext(ctx context.Context, operationName string) opentracing.Span {
 	var span opentracing.Span
 	if sp := opentracing.SpanFromContext(ctx); sp != nil {
 		span, _ = opentracing.StartSpanFromContext(ctx, operationName)
@@ -113,7 +128,7 @@ func (c *Client) do(
 		err    error
 	)
 
-	span := c.MaybeStartSpanFromContext(ctx, operationName)
+	span := c.maybeStartSpanFromContext(ctx, operationName)
 	defer span.Finish()
 
 	defer func() {

v3/rm_test.go

@@ -15,17 +15,20 @@ func TestRMClient(t *testing.T) {
 	pub, _ := ioutil.ReadFile("../test/server_pub.pem")
 
 	client := NewClient(
-		"1599646279297591629",
-		"NekiDbnNHbHLWdRmbqtwBCqywfYkVVnE",
-		pk,
-		pub,
-		true,
+		Config{
+			ClientID:     "1599646279297591629",
+			ClientSecret: "NekiDbnNHbHLWdRmbqtwBCqywfYkVVnE",
+			PrivateKey:   pk,
+			PublicKey:    pub,
+			Sandbox:      true,
+		},
 	)
 
 	req := CreatePaymentCheckoutRequest{}
 	req.Order.ID = uniuri.NewLen(10)
 	req.Order.Title = "Testing #" + req.Order.ID
 	req.Order.Amount = 1000
+	req.Customer.UserID = "1234"
 	req.StoreID = "2808912573238362402"
 	req.NotifyURL = "https://www.google.com"
 	req.RedirectURL = "https://www.google.com"