Update error messages

spec/integration/hmac_spec.cr → spec/integration/algorithms/hmac_spec.cr

@@ -1,4 +1,4 @@
-require "../spec_helper"
+require "../../spec_helper"
 
 describe JWT do
   secret_key = "$ecretKey"

spec/integration/none_spec.cr → spec/integration/algorithms/none_spec.cr

@@ -1,4 +1,4 @@
-require "../spec_helper"
+require "../../spec_helper"
 
 describe "none algorithm" do
   alg = "none"

spec/integration/claims/aud_spec.cr

@@ -13,7 +13,7 @@ describe "aud claim" do
     context "aud option is passed" do
       it "raises InvalidAudienceError" do
         token = JWT.encode({"foo" => "bar"}, "key", "HS256")
-        expect_raises(JWT::InvalidAudienceError, "Invalid audience. Expected sergey, got nothing") do
+        expect_raises(JWT::InvalidAudienceError, "Invalid audience (aud). Expected \"sergey\", received nothing") do
           JWT.decode(token, "key", "HS256", {:aud => "sergey"})
         end
       end
@@ -40,7 +40,7 @@ describe "aud claim" do
     context "aud does not match" do
       it "raises InvalidAudienceError" do
         token = JWT.encode({"foo" => "bar", "aud" => "sergey"}, "key", "HS256")
-        expect_raises(JWT::InvalidAudienceError, "Invalid audience. Expected julia, got sergey") do
+        expect_raises(JWT::InvalidAudienceError, "Invalid audience (aud). Expected \"julia\", received \"sergey\"") do
           JWT.decode(token, "key", "HS256", {aud: "julia"})
         end
       end
@@ -72,7 +72,7 @@ describe "aud claim" do
       it "raises InvalidAudienceError" do
         token = JWT.encode({"foo" => "bar", "aud" => ["sergey", "julia"]}, "key", "HS256")
 
-        expect_raises(JWT::InvalidAudienceError, "Invalid audience. Expected max, got [\"sergey\", \"julia\"]") do
+        expect_raises(JWT::InvalidAudienceError, "Invalid audience (aud). Expected \"max\", received [\"sergey\", \"julia\"]") do
           JWT.decode(token, "key", "HS256", {aud: "max"})
         end
       end

spec/integration/claims/iss_spec.cr

@@ -5,7 +5,7 @@ describe "iss claim" do
     context ":iss option is passed to .decode" do
       it "raises InvalidIssuerError" do
         token = JWT.encode({"foo" => "bar"}, "key", "HS256")
-        expect_raises(JWT::InvalidIssuerError, "Invalid issuer. Expected \"TEJO\", received nothing") do
+        expect_raises(JWT::InvalidIssuerError, "Invalid issuer (iss). Expected \"TEJO\", received nothing") do
           JWT.decode(token, "key", "HS256", {iss: "TEJO"})
         end
       end
@@ -33,7 +33,7 @@ describe "iss claim" do
       context "iss does not match" do
         it "raises InvalidIssuerError" do
           token = JWT.encode({"iss" => "TEJO"}, "key", "HS256")
-          expect_raises(JWT::InvalidIssuerError, "Invalid issuer. Expected \"UEA\", received \"TEJO\"") do
+          expect_raises(JWT::InvalidIssuerError, "Invalid issuer (iss). Expected \"UEA\", received \"TEJO\"") do
             JWT.decode(token, "key", "HS256", {iss: "UEA"})
           end
         end

src/jwt.cr

@@ -90,16 +90,16 @@ module JWT
 
   private def validate_aud!(payload, aud)
     if !payload["aud"]?
-      raise InvalidAudienceError.new("Invalid audience. Expected #{aud}, got nothing")
+      raise InvalidAudienceError.new("Invalid audience (aud). Expected #{aud.inspect}, received nothing")
     elsif payload["aud"].is_a?(String)
       if aud != payload["aud"]
-        raise InvalidAudienceError.new("Invalid audience. Expected #{aud}, got #{payload["aud"]}")
+        raise InvalidAudienceError.new("Invalid audience (aud). Expected #{aud.inspect}, received #{payload["aud"].inspect}")
       end
     elsif payload["aud"].is_a?(Array)
       # to prevent compile-time error
       auds = payload["aud"] as Array
       if !auds.includes?(aud)
-        msg = "Invalid audience. Expected #{aud}, got #{payload["aud"].inspect}"
+        msg = "Invalid audience (aud). Expected #{aud.inspect}, received #{payload["aud"].inspect}"
         raise InvalidAudienceError.new(msg)
       end
     else
@@ -109,9 +109,9 @@ module JWT
 
   private def validate_iss!(payload, iss)
     if !payload["iss"]?
-      raise InvalidIssuerError.new("Invalid issuer. Expected #{iss.inspect}, received nothing")
+      raise InvalidIssuerError.new("Invalid issuer (iss). Expected #{iss.inspect}, received nothing")
     elsif payload["iss"] != iss
-      raise InvalidIssuerError.new("Invalid issuer. Expected #{iss.inspect}, received #{payload["iss"].inspect}")
+      raise InvalidIssuerError.new("Invalid issuer (iss). Expected #{iss.inspect}, received #{payload["iss"].inspect}")
     end
   end
 end