Update files name / path etc.

Author: hiyali

README.md

@@ -35,9 +35,12 @@ https://www.yourdomain.com/path?ad_network=5450213213286189855&ad_unit=12345678&
 | `admob.Verify(url *url.Url) error` | |
 | `mopub.Verify(url *url.Url, secret, verifierKey string) error` | verifierKey usually is `hash`, you'll find secret key in `Rewarded video` tab in `https://app.mopub.com/account` page |
 
-## Examples
+## Test
+```
+go test ./...
+```
 
-* echo ([echo.labstack.com](https://echo.labstack.com))
+## Example with [echo](https://echo.labstack.com) framework
 
 ```golang
 import "github.com/hiyali/go-lib-ssv/admob"

admob/main.go renamed to admob/admob.go

@@ -18,8 +18,10 @@ import (
 	"time"
 )
 
-const admobKeyServerEndpoint = "https://gstatic.com/admob/reward/verifier-keys.json"
-const admobKeyServerEndpointTest = "https://gstatic.com/admob/reward/verifier-keys-test.json"
+const (
+	keyServerEndpoint     = "https://gstatic.com/admob/reward/verifier-keys.json"
+	keyServerEndpointTest = "https://gstatic.com/admob/reward/verifier-keys-test.json"
+)
 
 /*
 * https://github.com/google/tink/blob/master/apps/rewardedads/src/main/java/com/google/crypto/tink/apps/rewardedads/RewardedAdsVerifier.java
@@ -97,7 +99,7 @@ func keysToMap(keys []VerifierKey) (KeyMap, error) {
 func Verify(cbUrl *url.URL) (err error) {
 	// -- get verifier keys json
 	verifierKeyJson := &VerifierKeyJson{}
-	if err = getJson(admobKeyServerEndpoint, verifierKeyJson); err != nil {
+	if err = getJson(keyServerEndpoint, verifierKeyJson); err != nil {
 		return
 	}
 

admob/admob_test.go

@@ -0,0 +1,37 @@
+package admob
+
+import (
+	"net/url"
+	"testing"
+)
+
+const (
+	testCBWithHashDataAndEncodedSpace = "https://api.example.com/callback?ad_network=4970775877303683148&ad_unit=3543424263&reward_amount=1&reward_item=Key%20Doubler&timestamp=1584428655496&transaction_id=0280088a3d615a1a28929ba7c00861d4&user_id=KK1nqvkZ4tQDon92LrStOXPJbx93&signature=MEUCIQChVBUhVph0ymVFqHzdld9PWZitruPy2Q-OELQZH9g35wIgO3cVUChofhVrlSXZodlQFQM5vIvf5dGLqBAGXz6AmaE&key_id=3335741209"
+	testCBWithHashData                = "https://api.example.com/callback?ad_network=4970775877303683148&ad_unit=3543424263&reward_amount=1&reward_item=Key Doubler&timestamp=1584428655496&transaction_id=0280088a3d615a1a28929ba7c00861d4&user_id=KK1nqvkZ4tQDon92LrStOXPJbx93&signature=MEUCIQChVBUhVph0ymVFqHzdld9PWZitruPy2Q-OELQZH9g35wIgO3cVUChofhVrlSXZodlQFQM5vIvf5dGLqBAGXz6AmaE&key_id=3335741209"
+)
+
+func TestAdmobVerifyWithEscapedSpace(t *testing.T) {
+	testUrl, err := url.Parse(testCBWithHashDataAndEncodedSpace)
+	if err != nil {
+		t.Errorf("url.Parse(%s) - err: %v", testCBWithHashDataAndEncodedSpace, err)
+	}
+
+	LogEnabled = true
+
+	if err = Verify(testUrl); err != nil {
+		t.Errorf("Verify(%v) - url.RawQuery: %s, err: %v", testUrl, testUrl.RawQuery, err)
+	}
+}
+
+func TestAdmobVerifyWithoutEscapedSpace(t *testing.T) {
+	testUrl, err := url.Parse(testCBWithHashData)
+	if err != nil {
+		t.Errorf("url.Parse(%s) - err: %v", testCBWithHashData, err)
+	}
+
+	LogEnabled = true
+
+	if err = Verify(testUrl); err != nil {
+		t.Errorf("Verify(%v) - url.RawQuery: %s, err: %v", testUrl, testUrl.RawQuery, err)
+	}
+}

admob_test.go

@@ -0,0 +1,23 @@
+package mopub
+
+import (
+	"net/url"
+	"testing"
+)
+
+const (
+	testSecretKey            = "7dbcfd2a42134f47bfb72daa02f85ec9"
+	testCallbackWithHashData = "https://api.example.com/callback?customer_id=3453523454&id=70bae1905f7844a3a012a5f4173021db&hash=28f3b28b09b2578db06ee371990b5a02882523eba954d5a1b57afe2c7e7d3f10&value=20&type=Coins"
+)
+
+func TestMopubVerify(t *testing.T) {
+	testUrl, err := url.Parse(testCallbackWithHashData)
+	if err != nil {
+		t.Errorf("url.Parse(%s) - err: %v", testCallbackWithHashData, err)
+	}
+
+	// LogEnabled = true
+	if err = Verify(testUrl, testSecretKey, "hash"); err != nil {
+		t.Errorf("Verify(%v, %s, %s) - url.RawQuery: %s, err: %v", testUrl, testSecretKey, "hash", testUrl.RawQuery, err)
+	}
+}