fixing issues

Author: Rowley

algorithms.go

@@ -90,7 +90,7 @@ func (a *Algorithm) Decode(encoded string) (*Claims, error) {
 
 	b64Payload := encryptedComponents[1]
 
-	var claims map[string]string
+	var claims map[string]interface{}
 	payload, err := base64.StdEncoding.DecodeString(b64Payload)
 	if err != nil {
 		return nil, errors.Wrap(err, "unable to decode base64 payload")
@@ -149,6 +149,7 @@ func (a *Algorithm) validateSignature(encoded string) error {
 	return nil
 }
 
+
 func (a *Algorithm) validateExp(claims *Claims) error {
 	if claims.HasClaim("exp") {
 		exp, err := claims.GetTime("exp")

claims.go

@@ -1,7 +1,6 @@
 package jwt
 
 import (
-	"fmt"
 	"time"
 
 	"github.com/pkg/errors"
@@ -39,7 +38,7 @@ func (c *Claims) Set(key string, value interface{}) {
 
 // SetTime sets the claim given to the specified time.
 func (c *Claims) SetTime(key string, value time.Time) {
-	c.Set(key, fmt.Sprintf("%d", value.Unix()))
+	c.Set(key, value.Unix())
 }
 
 // Get returns the claim in string form and returns an error if the specified claim doesn't exist.

example/example.go

@@ -37,7 +37,12 @@ func main() {
 		panic(err)
 	}
 
-	if strings.Compare(role, "Admin") == 0 {
+	roleString, ok := role.(string)
+	if !ok {
+		panic(err)
+	}
+
+	if strings.Compare(roleString, "Admin") == 0 {
 		//user is an admin
 		fmt.Println("User is an admin")
 	}

jwt_test.go

@@ -24,13 +24,8 @@ func RunTest(t *testing.T, command func(Algorithm)) {
 func TestEncodeAndValidateToken(t *testing.T) {
 	RunTest(t, func(algorithm Algorithm) {
 		payload := NewClaim()
-		payload.SetTime("nbf", time.Now().Add(-1*time.Hour))
-		payload.SetTime("exp", time.Now().Add(1*time.Hour))
-
-		err := json.Unmarshal([]byte(`{"sub":"1234567890","name":"John Doe","admin":true}`), &payload)
-		if err != nil {
-			t.Fatal(err)
-		}
+		payload.SetTime("nbf", time.Now().Add(time.Duration(-1) * time.Hour))
+		payload.SetTime("exp", time.Now().Add(time.Duration(100) * time.Hour))
 
 		token, err := algorithm.Encode(payload)
 		if err != nil {
@@ -95,7 +90,7 @@ func TestVerifyTokenNbf(t *testing.T) {
 	RunTest(t, func(algorithm Algorithm) {
 
 		payload := NewClaim()
-		payload.Set("nbf", fmt.Sprintf("%d", time.Now().Add(1*time.Hour).Unix()))
+		payload.SetTime("nbf", time.Now().Add(time.Duration(1) * time.Hour))
 
 		err := json.Unmarshal([]byte(`{"sub":"1234567890","name":"John Doe","admin":true}`), &payload)
 		if err != nil {