Updated implementation and test cases

Author: khanh.nguyen

signature/claims.go

@@ -20,12 +20,12 @@ type Claims struct {
 	// immediately following call to Valid() by jwt-go has *all* necessary information to
 	// determine whether JWT is valid.  These fields should not be overwritten by JSON
 	// unmarshal.
-	receivedTime       time.Time `json:"-"`
-	correctPayloadHash string    `json:"-"`
-	correctURLHash     string    `json:"-"`
+	receivedTime       time.Time
+	correctPayloadHash string
+	correctURLHash     string
 
 	Issuer         string `json:"iss"`
-	IssuedAt       int64  `json:"iat"`
+	NotBefore      int64  `json:"nbf"`
 	ExpirationTime int64  `json:"exp"`
 	JWTID          string `json:"jti"`
 	URLHash        string `json:"url_hash"`
@@ -38,11 +38,11 @@ func (c Claims) Valid() error {
 	var errs []string
 
 	if c.Issuer != "MessageBird" {
-		errs = append(errs, "wrong iss")
+		errs = append(errs, "claim iss has wrong value")
 	}
 
-	if iat := time.Unix(c.IssuedAt, int64(c.receivedTime.Nanosecond())).Add(-maxSkew); c.receivedTime.Before(iat) {
-		errs = append(errs, "claim iat is in the future")
+	if iat := time.Unix(c.NotBefore, int64(c.receivedTime.Nanosecond())).Add(-maxSkew); c.receivedTime.Before(iat) {
+		errs = append(errs, "claim nbf is in the future")
 	}
 
 	if exp := time.Unix(c.ExpirationTime, int64(c.receivedTime.Nanosecond())).Add(maxSkew); c.receivedTime.After(exp) {

signature/signature_test.go

@@ -96,7 +96,8 @@ func TestValidSignature(t *testing.T) {
 		Payload   string `json:"payload"`
 		Timestamp string `json:"timestamp"`
 		Token     string `json:"token"`
-		Outcome   string `json:"outcome"`
+		Valid     bool   `json:"valid"`
+		Reason    string `json:"reason"`
 	}
 	if err := json.Unmarshal(testData, &tcs); err != nil {
 		assert.NoError(t, err)
@@ -109,13 +110,13 @@ func TestValidSignature(t *testing.T) {
 				return r
 			}
 
-			v := NewValidator(testSecret)
+			v := NewValidator([]byte(tc.Secret))
 			err := v.ValidSignature(tc.Token, tc.Url, []byte(tc.Payload))
-			if tc.Outcome == "valid" {
+			if tc.Valid {
 				assert.NoError(t, err)
 				return
 			}
-			assert.EqualError(t, err, tc.Outcome)
+			assert.EqualError(t, err, tc.Reason)
 		})
 	}
 }