Skip to content

Add support for Vipps eCom partner requests #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kurtinge wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add support for Vipps eCom partner requests #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
653c564
Add Merchant-Serial-Number header to all requests
kurtinge Dec 30, 2021
e6bd0ab
Change example for ecom to include getPayment
kurtinge Dec 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions _examples/ecom/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,18 @@ import (
"bufio"
"context"
"fmt"
"log"
"os"

logkit "github.com/go-kit/kit/log"

"github.com/torfjor/go-vipps"
"github.com/torfjor/go-vipps/auth"
"github.com/torfjor/go-vipps/ecom"
"log"
"os"
)

var (
ecomClient ecom.Client
ecomClient *ecom.Client
mi = ecom.MerchantInfo{
MerchantSerialNumber: "CHANGETHIS",
CallbackURL: "https://some.endpoint.no/callbacks",
Expand Down Expand Up @@ -41,7 +44,7 @@ func main() {
authClient := auth.NewClient(vipps.EnvironmentTesting, credentials)
ecomClient = ecom.NewClient(vipps.ClientConfig{
HTTPClient: authClient,
Logger: log.New(os.Stdout, "", log.LstdFlags),
Logger: logkit.NewLogfmtLogger(os.Stdout),
Environment: vipps.EnvironmentTesting,
})

Expand All @@ -57,6 +60,18 @@ func main() {
reader.ReadByte()
capturedPayment := capturePayment(orderID, transactionText, amount)
fmt.Printf("Captured payment: %+v\n", capturedPayment)

payment := getPayment(orderID)
fmt.Printf("Retreived payment: %+v\n", payment)

}

func getPayment(orderId string) *ecom.Payment {
p, err := ecomClient.GetPayment(context.TODO(), orderId, mi.MerchantSerialNumber)
if err != nil {
log.Fatal(err)
}
return p
}

func initiatePayment(orderID, transactionText string, amount, mobileNumber int) string {
Expand Down
14 changes: 11 additions & 3 deletions ecom/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ package ecom
import (
"context"
"fmt"
"net/http"
"net/url"

"github.com/go-kit/kit/log"
"github.com/torfjor/go-vipps"
"github.com/torfjor/go-vipps/internal"
"net/http"
"net/url"
)

type Doer interface {
Expand Down Expand Up @@ -73,6 +74,8 @@ func (c *Client) CancelPayment(ctx context.Context, cmd CancelPaymentCommand) (*
return nil, err
}

req.Header.Add("Merchant-Serial-Number", cmd.MerchantSerialNumber)

err = c.APIClient.Do(req, &res)
if err != nil {
return nil, wrapErr(err)
Expand Down Expand Up @@ -104,6 +107,7 @@ func (c *Client) CapturePayment(ctx context.Context, cmd CapturePaymentCommand)
return nil, err
}
req.Header.Add("X-Request-ID", cmd.IdempotencyKey)
req.Header.Add("Merchant-Serial-Number", cmd.MerchantSerialNumber)
err = c.APIClient.Do(req, &res)
if err != nil {
return nil, wrapErr(err)
Expand All @@ -113,7 +117,7 @@ func (c *Client) CapturePayment(ctx context.Context, cmd CapturePaymentCommand)
}

// GetPayment gets a Payment.
func (c *Client) GetPayment(ctx context.Context, orderID string) (*Payment, error) {
func (c *Client) GetPayment(ctx context.Context, orderID string, merchantSerialNumber string) (*Payment, error) {
endpoint := fmt.Sprintf("%s/%s/%s/details", c.BaseURL, ecomEndpoint, orderID)
method := http.MethodGet
res := Payment{}
Expand All @@ -123,6 +127,7 @@ func (c *Client) GetPayment(ctx context.Context, orderID string) (*Payment, erro
return nil, err
}

req.Header.Add("Merchant-Serial-Number", merchantSerialNumber)
err = c.APIClient.Do(req, &res)
if err != nil {
return nil, wrapErr(err)
Expand All @@ -146,6 +151,8 @@ func (c *Client) InitiatePayment(ctx context.Context, cmd InitiatePaymentCommand
return nil, err
}

req.Header.Add("Merchant-Serial-Number", cmd.MerchantInfo.MerchantSerialNumber)

err = c.APIClient.Do(req, &res)
if err != nil {
return nil, wrapErr(err)
Expand Down Expand Up @@ -177,6 +184,7 @@ func (c *Client) RefundPayment(ctx context.Context, cmd RefundPaymentCommand) (*
return nil, err
}
req.Header.Add("X-Request-ID", cmd.IdempotencyKey)
req.Header.Add("Merchant-Serial-Number", cmd.MerchantSerialNumber)
err = c.APIClient.Do(req, &res)
if err != nil {
return nil, wrapErr(err)
Expand Down
2 changes: 1 addition & 1 deletion ecom/ecom.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ type UserDetails struct {
// ShippingDetails represents details for a shipping method
type ShippingDetails struct {
Address Address `json:"address,omitempty"`
ShippingCost int `json:"shippingCost,omitempty"`
ShippingCost string `json:"shippingCost,omitempty"`
ShippingMethod string `json:"shippingMethod,omitempty"`
ShippingMethodID string `json:"shippingMethodId,omitempty"`
}
Expand Down
5 changes: 0 additions & 5 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfU
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
Expand All @@ -92,7 +91,6 @@ github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw=
github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
Expand Down Expand Up @@ -274,7 +272,6 @@ golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73r
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e h1:bRhVy7zSSasaqNksaRZiA5EEI+Ei4I1nO5Jh72wfHlg=
golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
Expand All @@ -291,11 +288,9 @@ golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BG
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw=
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
Expand Down