Skip to content

Commit

Permalink
Merge pull request #8 from frozzare/revert-5-make-go-swish-work-again
Browse files Browse the repository at this point in the history 
Revert "Make go swish work again"
  • Loading branch information
@frozzare
frozzare authored Nov 16, 2018
2 parents 34c8199 + 9d60ec1 commit c4c8777
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 52 deletions.
48 changes: 27 additions & 21 deletions certs/root.pem
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,28 @@
-----BEGIN CERTIFICATE-----
MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh
MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT
MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG
9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB
CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97
nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt
43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P
T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4
gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO
BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR
TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw
DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr
hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg
06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF
PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls
YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
-----END CERTIFICATE-----
MIIFrjCCA5agAwIBAgIIHclBF0nNX3UwDQYJKoZIhvcNAQENBQAwWzEUMBIGA1UECgwLR2V0c3dp
c2ggQUIxHjAcBgNVBAsMFVN3aXNoIE1lbWJlciBCYW5rcyBDQTEjMCEGA1UEAwwaVGVzdCBTd2lz
aCBSb290IENBIHYxIFRlc3QwHhcNMTUwNTI1MTM1NDU5WhcNMzUxMjMxMTM1NDU5WjBbMRQwEgYD
VQQKDAtHZXRzd2lzaCBBQjEeMBwGA1UECwwVU3dpc2ggTWVtYmVyIEJhbmtzIENBMSMwIQYDVQQD
DBpUZXN0IFN3aXNoIFJvb3QgQ0EgdjEgVGVzdDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
ggIBALlHSAjTaFkVCfZnxIJJwtl7CP+9eKGHhmXx75/sKKThCTtJxZOxZtKCsOonQ24d3x2Tfylg
1ojMyAT1bFcEC5OuCge2IuMGVgtQz9bZZHL72uOfCbRZoOHWkeZsv6OdQQ9AspKX/Dr5J0nybqFC
xg6EtfCvUP9eY/ViAs/RuIvylGfPwqresEq+SZmJQWqAuO6h+lIFv3WuLkllZxk58AKzVgzGI93+
tkpQUHHOD1M6t5xBUtObKRx0q4x0EX5DofuTdhFww6HQqQRWAMI7ikL65XkR9Ce29FidJBqTGVem
eVqaLjwB6CIZTj0b4VhSJCgOnEfS0qVygNklKb2YBU7O/krbg4S9A/26MWcArWJeOtyOWS9CGxVc
X/w+OvP8E1qOTM2GV2UX4WtcrPPN6ClGFpKD9W/tt1+LCtJUaA0WyGU8jSadwC/MXd81k0qj9Y9a
/UsSRE76VsWdMtIlzZLFi9DP5aSiiSbrg/fkMbaw763t6DDvnaTi4N/itlbPE31y0aJa1lteqh5W
WGt+HHDWoZydHOasBkZ8Rq5HV6Xr7mvRBm34y8Py8M+o+I7VKYogpLXcR9TaAblPTa+Bf/NAJWEM
zMXiWMB/E+978aBGwBLE9f5LPAN3YxegiZUCcHGeROM50A5zIpAxpEKzjV0mxpSKf5ROno+T5DcH
HWG3AgMBAAGjdjB0MB0GA1UdDgQWBBQWZaH13VskneJrYkTGk97a6S/0GjAPBgNVHRMBAf8EBTAD
AQH/MB8GA1UdIwQYMBaAFBZlofXdWySd4mtiRMaT3trpL/QaMBEGA1UdIAQKMAgwBgYEKgMEBTAO
BgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQENBQADggIBAH/NnOCXk+QRieltgEKKyyNp/1w/npIn
98GuhdSr6dypMDOyMxpH9Pvgr+Isn7pnW7WnEUM3qaupJMimUWB5+Ixsw/7bhQwnRxYKNXdGQyYj
B7mNr6ZH7ZLNCL/3XnB+w7i4GrCpaaSZxlfl5dX2LClVjtLcnqy1Ur6nk8nSNWpTtClAVQD0jqpJ
N6h0aqxSoSkM4crX7VgyKwY3n+3zIfJ04LsPYhuaC/WNydS/V8S4bDqkyqvtlGONUOTj9qQMY06u
kX1DVxH4ItfYsEz39pbNBn1I/PfzN3ZtfDsM9GFBJF7Y5cyuH4/LtGMwLNVzVWzsq6t5+chonncI
icMIv2WaUC2xjPX/CZquA8z2KHWuqRPJKDIjsQthVUr08lE9x6hFbQjL1XCBZn0W/ZguP9p7CSkq
VUzDA0vYTZO+fLSLXGMX4v2sKz3i1pCj7VZMLSSTjgDPlgqfG/o2OdS39WiEoguVUCOhZ8BctNnY
pDXepLj4r3Tlbq17scIwtFZ6Lfw4oiOgMmw2txybcwDtPXvVNgxXMEoJZwOckM+zagOFxWKgNu8F
MeRzcbCm82/nn7NE6+Gi5DLBPX03q9DMZ31DmebOFOcdiAdOTjTklmaN0JEjAGJBh6IBsZ0wwqvA
5s1h5RehB9olq0b0KgwHX+kkiGcpOkH5cZVFm6qKHAHh
-----END CERTIFICATE-----
Binary file modified certs/test.p12
View file
Binary file not shown.
34 changes: 17 additions & 17 deletions endpoints.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@ var (

// PaymentRequest represents a payment request from Swish API.
type PaymentRequest struct {
AdditionalInformation string `json:"additionalInformation,omitempty"`
Amount float64 `json:"amount,omitempty"`
CallbackURL string `json:"callbackUrl,omitempty"`
Currency string `json:"currency,omitempty"`
DateCreated string `json:"dateCreated,omitempty"`
DatePaid string `json:"datePaid,omitempty"`
ErrorCode string `json:"errorCode,omitempty"`
ErrorMessage string `json:"errorMessage,omitempty"`
ID string `json:"id,omitempty"`
Message string `json:"message,omitempty"`
PayeeAlias string `json:"payeeAlias,omitempty"`
PayeePaymentReference string `json:"payeePaymentReference,omitempty"`
PayerPaymentReference string `json:"payerPaymentReference,omitempty"`
PayerAlias string `json:"payerAlias,omitempty"`
PaymentReference string `json:"paymentReference,omitempty"`
OriginalPaymentReference string `json:"originalPaymentReference,omitempty"`
Status string `json:"status,omitempty"`
AdditionalInformation string `json:"additionalInformation,omitempty"`
Amount string `json:"amount,omitempty"`
CallbackURL string `json:"callbackUrl,omitempty"`
Currency string `json:"currency,omitempty"`
DateCreated string `json:"dateCreated,omitempty"`
DatePaid string `json:"datePaid,omitempty"`
ErrorCode string `json:"errorCode,omitempty"`
ErrorMessage string `json:"errorMessage,omitempty"`
ID string `json:"id,omitempty"`
Message string `json:"message,omitempty"`
PayeeAlias string `json:"payeeAlias,omitempty"`
PayeePaymentReference string `json:"payeePaymentReference,omitempty"`
PayerPaymentReference string `json:"payerPaymentReference,omitempty"`
PayerAlias string `json:"payerAlias,omitempty"`
PaymentReference string `json:"paymentReference,omitempty"`
OriginalPaymentReference string `json:"originalPaymentReference,omitempty"`
Status string `json:"status,omitempty"`
}

// CreatePaymentRequest will create a payment request to Swish and return a payment
Expand Down
24 changes: 12 additions & 12 deletions endpoints_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ func TestCreatePaymentRequest(t *testing.T) {
return resp, nil
},
expectedResult: &PaymentRequest{
ID: "AB23D7406ECE4542A80152D909EF9F6B",
ID: "AB23D7406ECE4542A80152D909EF9F6B",
PayeePaymentReference: "0123456789",
CallbackURL: "https://example.com/api/swishcb/paymentrequests",
PayerAlias: "46701234567",
PayeeAlias: "1234760039",
Amount: 100,
Amount: "100",
Currency: "SEK",
Message: "Kingston USB Flash Drive 8 GB",
},
Expand Down Expand Up @@ -83,7 +83,7 @@ func TestCreatePaymentRequest(t *testing.T) {
CallbackURL: "https://example.com/api/swishcb/paymentrequests",
PayerAlias: "46701234567",
PayeeAlias: "1234760039",
Amount: 100,
Amount: "100",
Currency: "SEK",
Message: "Kingston USB Flash Drive 8 GB",
})
Expand Down Expand Up @@ -117,7 +117,7 @@ func TestPaymentRequest(t *testing.T) {
"callbackUrl": "https://example.com/api/swishcb/paymentrequests",
"payerAlias": "46701234567",
"payeeAlias": "1234760039",
"amount": 100,
"amount": "100",
"currency": "SEK",
"message": "Kingston USB Flash Drive 8 GB",
"status": "PAID",
Expand All @@ -127,13 +127,13 @@ func TestPaymentRequest(t *testing.T) {
`), nil
},
expectedResult: &PaymentRequest{
ID: "AB23D7406ECE4542A80152D909EF9F6B",
ID: "AB23D7406ECE4542A80152D909EF9F6B",
PayeePaymentReference: "0123456789",
PaymentReference: "6D6CD7406ECE4542A80152D909EF9F6B",
CallbackURL: "https://example.com/api/swishcb/paymentrequests",
PayerAlias: "46701234567",
PayeeAlias: "1234760039",
Amount: 100,
Amount: "100",
Currency: "SEK",
Message: "Kingston USB Flash Drive 8 GB",
Status: "PAID",
Expand Down Expand Up @@ -194,12 +194,12 @@ func TestCreateRefundRequest(t *testing.T) {
return resp, nil
},
expectedResult: &PaymentRequest{
ID: "AB23D7406ECE4542A80152D909EF9F6B",
ID: "AB23D7406ECE4542A80152D909EF9F6B",
OriginalPaymentReference: "AB23D7406ECE4542A80152D909EF9F6B",
PayerPaymentReference: "0123456789",
CallbackURL: "https://example.com/api/swishcb/paymentrequests",
PayerAlias: "46701234567",
Amount: 100,
Amount: "100",
Currency: "SEK",
Message: "Refund for Kingston USB Flash Drive 8 GB",
},
Expand Down Expand Up @@ -253,7 +253,7 @@ func TestCreateRefundRequest(t *testing.T) {
PayerPaymentReference: "0123456789",
CallbackURL: "https://example.com/api/swishcb/paymentrequests",
PayerAlias: "46701234567",
Amount: 100,
Amount: "100",
Currency: "SEK",
Message: "Refund for Kingston USB Flash Drive 8 GB",
})
Expand Down Expand Up @@ -287,7 +287,7 @@ func TestRefundRequest(t *testing.T) {
"callbackUrl": "https://example.com/api/swishcb/refunds",
"payerAlias": "46701234567",
"payeeAlias": "1234760039",
"amount": 100,
"amount": "100",
"currency": "SEK",
"message": "Refund for Kingston USB Flash Drive 8 GB",
"status": "PAID",
Expand All @@ -297,13 +297,13 @@ func TestRefundRequest(t *testing.T) {
`), nil
},
expectedResult: &PaymentRequest{
ID: "AB23D7406ECE4542A80152D909EF9F6B",
ID: "AB23D7406ECE4542A80152D909EF9F6B",
PayeePaymentReference: "0123456789",
PaymentReference: "6D6CD7406ECE4542A80152D909EF9F6B",
CallbackURL: "https://example.com/api/swishcb/refunds",
PayerAlias: "46701234567",
PayeeAlias: "1234760039",
Amount: 100,
Amount: "100",
Currency: "SEK",
Message: "Refund for Kingston USB Flash Drive 8 GB",
Status: "PAID",
Expand Down
4 changes: 2 additions & 2 deletions example/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ func init() {

func create(w http.ResponseWriter, r *http.Request) {
res, err := client.CreatePaymentRequest(context.Background(), &swish.PaymentRequest{
CallbackURL: "https://c06610e4.ngrok.io/callback",
CallbackURL: "https://c06610e4.ngrok.io",
PayeePaymentReference: "0123456789",
PayeeAlias: "1231181189",
Amount: 100.00,
Amount: "100.00",
Currency: "SEK",
Message: "Kingston USB Flash Drive 8 GB",
})
Expand Down

0 comments on commit c4c8777

Please sign in to comment.