refactor

piusalfred · Dec 24, 2023 · 3423991 · 3423991
1 parent 920ee02
commit 3423991
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/pkg/http/http.go b/pkg/http/http.go
@@ -36,7 +36,7 @@ import (
 
 const (
 	BaseURL           = "https://graph.facebook.com"
-	DefaultApiVersion = "v16.0" // This is the lowest version of the API that is supported
+	DefaultAPIVersion = "v16.0" // This is the lowest version of the API that is supported
 )
 
 type (
@@ -390,7 +390,7 @@ func MakeRequest(options ...RequestOption) *Request {
 	request := &Request{
 		Context: &RequestContext{
 			BaseURL:    BaseURL,
-			ApiVersion: DefaultApiVersion,
+			ApiVersion: DefaultAPIVersion,
 		},
 		Method:  http.MethodPost,
 		Headers: map[string]string{"Content-Type": "application/json"},

diff --git a/qr.go b/qr.go
@@ -62,19 +62,19 @@ type (
 	}
 )
 
-func (c *BaseClient) CreateQR(ctx context.Context, rtx *RequestContext,
+func (c *BaseClient) CreateQR(ctx context.Context, rtx *whttp.RequestContext,
 	req *CreateRequest,
 ) (*CreateResponse, error) {
 	queryParams := map[string]string{
 		"prefilled_message": req.PrefilledMessage,
 		"generate_qr_image": string(req.ImageFormat),
-		"access_token":      rtx.AccessToken,
+		"access_token":      rtx.Bearer,
 	}
 	reqCtx := &whttp.RequestContext{
 		Name:          "create qr code",
 		BaseURL:       rtx.BaseURL,
 		ApiVersion:    rtx.ApiVersion,
-		PhoneNumberID: rtx.PhoneID,
+		PhoneNumberID: rtx.PhoneNumberID,
 		Endpoints:     []string{"message_qrdls"},
 	}
 	params := &whttp.Request{
@@ -126,7 +126,7 @@ type RequestContext struct {
 
 var ErrNoDataFound = fmt.Errorf("no data found")
 
-func (c *BaseClient) Get(ctx context.Context, request *RequestContext, qrCodeID string,
+func (c *BaseClient) Get(ctx context.Context, request *whttp.RequestContext, qrCodeID string,
 ) (*Information, error) {
 	var (
 		list ListResponse
@@ -136,14 +136,14 @@ func (c *BaseClient) Get(ctx context.Context, request *RequestContext, qrCodeID
 		Name:          "get qr code",
 		BaseURL:       request.BaseURL,
 		ApiVersion:    request.ApiVersion,
-		PhoneNumberID: request.PhoneID,
+		PhoneNumberID: request.PhoneNumberID,
 		Endpoints:     []string{"message_qrdls", qrCodeID},
 	}
 
 	req := &whttp.Request{
 		Context: reqCtx,
 		Method:  http.MethodGet,
-		Query:   map[string]string{"access_token": request.AccessToken},
+		Query:   map[string]string{"access_token": request.Bearer},
 	}
 
 	err := c.base.Do(ctx, req, &list)
@@ -160,14 +160,14 @@ func (c *BaseClient) Get(ctx context.Context, request *RequestContext, qrCodeID
 	return &resp, nil
 }
 
-func (c *BaseClient) UpdateQR(ctx context.Context, rtx *RequestContext, qrCodeID string,
+func (c *BaseClient) UpdateQR(ctx context.Context, rtx *whttp.RequestContext, qrCodeID string,
 	req *CreateRequest) (*SuccessResponse, error,
 ) {
 	reqCtx := &whttp.RequestContext{
 		Name:          "update qr code",
 		BaseURL:       rtx.BaseURL,
 		ApiVersion:    rtx.ApiVersion,
-		PhoneNumberID: rtx.PhoneID,
+		PhoneNumberID: rtx.PhoneNumberID,
 		Endpoints:     []string{"message_qrdls", qrCodeID},
 	}
 
@@ -177,7 +177,7 @@ func (c *BaseClient) UpdateQR(ctx context.Context, rtx *RequestContext, qrCodeID
 		Query: map[string]string{
 			"prefilled_message": req.PrefilledMessage,
 			"generate_qr_image": string(req.ImageFormat),
-			"access_token":      rtx.AccessToken,
+			"access_token":      rtx.Bearer,
 		},
 	}
 
@@ -190,20 +190,20 @@ func (c *BaseClient) UpdateQR(ctx context.Context, rtx *RequestContext, qrCodeID
 	return &resp, nil
 }
 
-func (c *BaseClient) DeleteQR(ctx context.Context, rtx *RequestContext, qrCodeID string,
+func (c *BaseClient) DeleteQR(ctx context.Context, rtx *whttp.RequestContext, qrCodeID string,
 ) (*SuccessResponse, error) {
 	reqCtx := &whttp.RequestContext{
 		Name:          "delete qr code",
 		BaseURL:       rtx.BaseURL,
 		ApiVersion:    rtx.ApiVersion,
-		PhoneNumberID: rtx.PhoneID,
+		PhoneNumberID: rtx.PhoneNumberID,
 		Endpoints:     []string{"message_qrdls", qrCodeID},
 	}
 
 	req := &whttp.Request{
 		Context: reqCtx,
 		Method:  http.MethodDelete,
-		Query:   map[string]string{"access_token": rtx.AccessToken},
+		Query:   map[string]string{"access_token": rtx.Bearer},
 	}
 	var resp SuccessResponse
 	err := c.base.Do(ctx, req, &resp)