firejwt 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22a3cbe836d5c04927447040ffdc8580f0a8863798dc1089e3e4fa6940989b0f
-  data.tar.gz: 886dbe43fee7a2132259c1997018e711a08e54e53366a461efc77516c6893bfc
+  metadata.gz: f3032c59245418498f9001893a4ee7171a82a853d0595d5b5fb81668236a3661
+  data.tar.gz: de674f7c87deed20cf6f1c50cd3871a00c5db41664b43adcb05f764e05f0d923
 SHA512:
-  metadata.gz: de05062161e6489c4c074b786a4125a2c412d3b4641b23e91c18f3e6f734993e81ea98eea4a0775259f10183c9872597e84e2a3d944c405bd6ea38d3edd82862
-  data.tar.gz: c62208610c25313796a7a663dcad304c7568293a9096bce5c26b9d0de493fb90eedc159cc8047864f9eb7ca028caa4361c508b276ff2733bb7662e13b96e9a25
+  metadata.gz: 6beeea534dd67e2d489b54fdf86ab1484f8e55bd6cf83eb86587000fe3c6f856987aa1648e44f7f5b3fa1447ded216834d5b20ae5269702f430bc13e1aba1a43
+  data.tar.gz: 3ac5a9fe61a9f9c806ca34367a2d635f8c7eba1f00f0caef7c7d15cc9a32e3cd3e6cc31f767fb9754d288a7c873f0b53fec628b38c82dc832f1c0a2017f01080

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    firejwt (0.2.0)
+    firejwt (0.3.0)
       jwt
 
 GEM

data/firejwt.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'firejwt'
-  s.version       = '0.2.0'
+  s.version       = '0.3.0'
   s.authors       = ['Black Square Media Ltd']
   s.email         = ['info@blacksquaremedia.com']
   s.summary       = %(Firebase JWT validation)

data/firejwt.go

@@ -59,8 +59,15 @@ func (v *Validator) Stop() {
 }
 
 // Decode decodes the token
-func (v *Validator) Decode(tokenString string) (*jwt.Token, error) {
-	return jwt.ParseWithClaims(tokenString, new(Claims), v.verify)
+func (v *Validator) Decode(tokenString string) (*Claims, error) {
+	claims := new(Claims)
+	token, err := jwt.ParseWithClaims(tokenString, claims, v.verify)
+	if err != nil {
+		return nil, err
+	} else if !token.Valid {
+		return nil, errTokenInvalid
+	}
+	return claims, nil
 }
 
 // ExpTime returns the expiration time.
@@ -97,6 +104,7 @@ var (
 	errIssuedFuture = errors.New("issued in the future")
 	errNoSubject    = errors.New("subject is missing")
 	errAuthFuture   = errors.New("auth-time in the future")
+	errTokenInvalid = errors.New("token is invalid")
 )
 
 func (v *Validator) verify(token *jwt.Token) (interface{}, error) {

data/firejwt_test.go

@@ -25,10 +25,10 @@ import (
 var _ = Describe("Validator", func() {
 	var subject *firejwt.Validator
 	var server *httptest.Server
-	var claims *firejwt.Claims
+	var seeds *firejwt.Claims
 
 	generate := func() string {
-		token := jwt.NewWithClaims(jwt.SigningMethodRS256, claims)
+		token := jwt.NewWithClaims(jwt.SigningMethodRS256, seeds)
 		token.Header["kid"] = certKID
 
 		data, err := token.SignedString(privKey)
@@ -43,7 +43,7 @@ var _ = Describe("Validator", func() {
 				certKID: string(certPEM),
 			})
 		}))
-		claims = mockClaims(time.Now().Unix())
+		seeds = mockClaims(time.Now().Unix())
 
 		var err error
 		subject, err = firejwt.Mocked(server.URL)
@@ -60,10 +60,9 @@ var _ = Describe("Validator", func() {
 	})
 
 	It("should decode tokens", func() {
-		token, err := subject.Decode(generate())
+		claims, err := subject.Decode(generate())
 		Expect(err).NotTo(HaveOccurred())
-		Expect(token.Valid).To(BeTrue())
-		Expect(token.Claims).To(Equal(claims))
+		Expect(claims).To(Equal(seeds))
 	})
 
 	It("should reject bad tokens", func() {
@@ -73,42 +72,42 @@ var _ = Describe("Validator", func() {
 	})
 
 	It("should verify exp", func() {
-		claims.ExpiresAt = time.Now().Unix() - 1
+		seeds.ExpiresAt = time.Now().Unix() - 1
 		_, err := subject.Decode(generate())
 		Expect(err).To(MatchError(`token has expired`))
 		Expect(err).To(BeAssignableToTypeOf(&jwt.ValidationError{}))
 	})
 
 	It("should verify iat", func() {
-		claims.IssuedAt = time.Now().Unix() + 1
+		seeds.IssuedAt = time.Now().Unix() + 1
 		_, err := subject.Decode(generate())
 		Expect(err).To(MatchError(`issued in the future`))
 		Expect(err).To(BeAssignableToTypeOf(&jwt.ValidationError{}))
 	})
 
 	It("should verify aud", func() {
-		claims.Audience = "other"
+		seeds.Audience = "other"
 		_, err := subject.Decode(generate())
 		Expect(err).To(MatchError(`invalid audience claim "other"`))
 		Expect(err).To(BeAssignableToTypeOf(&jwt.ValidationError{}))
 	})
 
 	It("should verify iss", func() {
-		claims.Issuer = "other"
+		seeds.Issuer = "other"
 		_, err := subject.Decode(generate())
 		Expect(err).To(MatchError(`invalid issuer claim "other"`))
 		Expect(err).To(BeAssignableToTypeOf(&jwt.ValidationError{}))
 	})
 
 	It("should verify sub", func() {
-		claims.Subject = ""
+		seeds.Subject = ""
 		_, err := subject.Decode(generate())
 		Expect(err).To(MatchError(`subject is missing`))
 		Expect(err).To(BeAssignableToTypeOf(&jwt.ValidationError{}))
 	})
 
 	It("should verify auth time", func() {
-		claims.AuthAt = time.Now().Unix() + 1
+		seeds.AuthAt = time.Now().Unix() + 1
 		_, err := subject.Decode(generate())
 		Expect(err).To(MatchError(`auth-time in the future`))
 		Expect(err).To(BeAssignableToTypeOf(&jwt.ValidationError{}))
@@ -117,8 +116,8 @@ var _ = Describe("Validator", func() {
 
 var _ = Describe("Claims", func() {
 	It("should be JWT compatible", func() {
-		claims := mockClaims(1515151515)
-		Expect(json.Marshal(claims)).To(MatchJSON(`{
+		subject := mockClaims(1515151515)
+		Expect(json.Marshal(subject)).To(MatchJSON(`{
 			"name": "Me",
 			"picture": "https://test.host/me.jpg",
 			"sub": "MDYwNDQwNjUtYWQ0ZC00ZDkwLThl",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: firejwt
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Black Square Media Ltd