bump gin-pow to v0.5.0

jeongY-Cho · jeongY-Cho · commit e01b509e46c9 · 2020-09-29T01:09:54.000-04:00
diff --git a/generateProblem_test.go b/generateProblem_test.go
@@ -29,7 +29,7 @@ func Test_server_GenerateProblem(t *testing.T) {
 			Secret:                  "secret",
 			NonceChecksumContextKey: "checksum",
 			ExtractData:             func(c *gin.Context) (string, error) { return "", nil },
-			NonceGenerator:          func(i int) (string, error) { return "test1.123", nil },
+			NonceGenerator:          func(i int) ([]byte, error) { return []byte("test1.123"), nil },
 		})
 
 		if err != nil {
@@ -82,7 +82,7 @@ func Test_server_GenerateProblem(t *testing.T) {
 		m, err := ginpow.New(&ginpow.Middleware{
 			NonceChecksumContextKey: "checksum",
 			ExtractData:             func(c *gin.Context) (string, error) { return "", nil },
-			NonceGenerator:          func(i int) (string, error) { return "test1.123", nil },
+			NonceGenerator:          func(i int) ([]byte, error) { return []byte("test1.123"), nil },
 		})
 
 		if err != nil {
diff --git a/go.mod b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/fatih/structs v1.1.0
 	github.com/gin-gonic/gin v1.6.3
 	github.com/go-redis/redis/v8 v8.2.3
-	github.com/jeongy-cho/gin-pow v0.4.1
+	github.com/jeongy-cho/gin-pow v0.5.0
 	github.com/lestrrat/go-jwx v0.0.0-20180221005942-b7d4802280ae
 	github.com/lestrrat/go-pdebug v0.0.0-20180220043741-569c97477ae8 // indirect
 	github.com/matoous/go-nanoid v1.4.1
diff --git a/go.sum b/go.sum
@@ -71,8 +71,14 @@ github.com/jeongy-cho/gin-pow v0.4.0 h1:MU3o32qCbvUlRymKk/iiARYRNEzVi796aPR7APrv
 github.com/jeongy-cho/gin-pow v0.4.0/go.mod h1:6+lYmwfWI8e2DuIkKZ+Sse3rWTGCFn01PTIwuMOyTmI=
 github.com/jeongy-cho/gin-pow v0.4.1 h1:Vr47ysnCFfeqNmOzY2CfptQM8D31GSHTOBkt0bqv6LM=
 github.com/jeongy-cho/gin-pow v0.4.1/go.mod h1:6+lYmwfWI8e2DuIkKZ+Sse3rWTGCFn01PTIwuMOyTmI=
+github.com/jeongy-cho/gin-pow v0.5.0 h1:HGAUAH5GF9jK1YxInU+0PkItfnYusq2Pt9zdEC6o8qc=
+github.com/jeongy-cho/gin-pow v0.5.0/go.mod h1:qY9MVa+Fi1BC5y42N/Ol8esYvpg8mblZCy87+ukMNxg=
 github.com/jeongy-cho/go-pow v1.2.1 h1:z4vJ5M+pjN/tb7b+IeZ4QeXJ7AQDps1mKJmLIHvslpg=
 github.com/jeongy-cho/go-pow v1.2.1/go.mod h1:LK4l4W/AvtVIgbOGGyc7t3NiGhsczT9AgEvhKQqXDRQ=
+github.com/jeongy-cho/go-pow v1.3.0 h1:JHABXDWobK/e558kWo1t3ULVbuKXfsYE8+n6IqzA8Zg=
+github.com/jeongy-cho/go-pow v1.3.0/go.mod h1:LK4l4W/AvtVIgbOGGyc7t3NiGhsczT9AgEvhKQqXDRQ=
+github.com/jeongy-cho/go-pow/v2 v2.0.1 h1:tmvh5oWgVUQDOgLRaeoBTp4uXjrEkZrbj9mcJaYVxRU=
+github.com/jeongy-cho/go-pow/v2 v2.0.1/go.mod h1:q1MZX95Jwp9tGo7Gwe3SFpSoTJKzwqZuMD0kVfCc/X8=
 github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
 github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
diff --git a/pogifyApi.go b/pogifyApi.go
@@ -152,17 +152,17 @@ func Server(rr *gin.RouterGroup) {
 	rr.POST("/auth/twitch", s.twitchAuth)
 }
 
-func generateSessionCode(_ int) (string, error) {
+func generateSessionCode(_ int) ([]byte, error) {
 	// testing flag for predictable keys
 	if _testing {
-		return "test1.123", nil
+		return []byte("test1.123"), nil
 	}
 
 	nonce, err := gonanoid.Generate("abcdefghijklmnopqrstuwxyz0123456789-", 5)
 	if err != nil {
-		return "", err
+		return []byte(""), err
 	}
-	return fmt.Sprintf("%v.%v", nonce, time.Now().Unix()), nil
+	return []byte(fmt.Sprintf("%v.%v", nonce, time.Now().Unix())), nil
 }
 
 // Time is a JSON un/marshallable type of time.Time
diff --git a/pogifyApi_test.go b/pogifyApi_test.go
@@ -218,7 +218,7 @@ func Test_generateSessionCode(t *testing.T) {
 		panic(err)
 	}
 
-	split := strings.Split(nonce, ".")
+	split := strings.Split(string(nonce), ".")
 
 	if expect := 5; len(split[0]) != expect {
 		t.Errorf("different session id length: %v, expected %v", len(split[0]), expect)

Original file line number	Diff line number	Diff line change
`@@ -152,17 +152,17 @@ func Server(rr *gin.RouterGroup) {`
`152`	`152`	`rr.POST("/auth/twitch", s.twitchAuth)`
`153`	`153`	`}`
`154`	`154`
`155`		`-func generateSessionCode(_ int) (string, error) {`
	`155`	`+func generateSessionCode(_ int) ([]byte, error) {`
`156`	`156`	`// testing flag for predictable keys`
`157`	`157`	`if _testing {`
`158`		`- return "test1.123", nil`
	`158`	`+ return []byte("test1.123"), nil`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`nonce, err := gonanoid.Generate("abcdefghijklmnopqrstuwxyz0123456789-", 5)`
`162`	`162`	`if err != nil {`
`163`		`- return "", err`
	`163`	`+ return []byte(""), err`
`164`	`164`	`}`
`165`		`- return fmt.Sprintf("%v.%v", nonce, time.Now().Unix()), nil`
	`165`	`+ return []byte(fmt.Sprintf("%v.%v", nonce, time.Now().Unix())), nil`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`// Time is a JSON un/marshallable type of time.Time`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ func Test_generateSessionCode(t *testing.T) {`
`218`	`218`	`panic(err)`
`219`	`219`	`}`
`220`	`220`
`221`		`- split := strings.Split(nonce, ".")`
	`221`	`+ split := strings.Split(string(nonce), ".")`
`222`	`222`
`223`	`223`	`if expect := 5; len(split[0]) != expect {`
`224`	`224`	`t.Errorf("different session id length: %v, expected %v", len(split[0]), expect)`