summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Newson <rnewson@apache.org>2017-06-09 19:37:15 +0100
committerRobert Newson <rnewson@apache.org>2017-06-09 19:37:15 +0100
commit382229e7cb7fb36461d53fb1f858b674a6c2c193 (patch)
treee28a91246dc51528422c5eb805b77cac651dba55
parent280376f11b770b58af900f4efe68229bdeb3a58e (diff)
downloadcouchdb-382229e7cb7fb36461d53fb1f858b674a6c2c193.tar.gz
Ensure error reason is convertable to JSON
-rw-r--r--src/jwtf.erl12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/jwtf.erl b/src/jwtf.erl
index a461da98d..28cab6cd3 100644
--- a/src/jwtf.erl
+++ b/src/jwtf.erl
@@ -195,7 +195,7 @@ validate_nbf(Props, Checks) ->
{true, undefined} ->
throw({error, missing_nbf});
{true, IAT} ->
- assert_past(nbf, IAT)
+ assert_past(<<"nbf">>, IAT)
end.
@@ -209,7 +209,7 @@ validate_exp(Props, Checks) ->
{true, undefined} ->
throw({error, missing_exp});
{true, EXP} ->
- assert_future(exp, EXP)
+ assert_future(<<"exp">>, EXP)
end.
@@ -282,7 +282,7 @@ assert_past(Name, Time) ->
true ->
ok;
false ->
- throw({error, {Name, not_in_past}})
+ throw({error, <<Name/binary, " not in past">>})
end.
assert_future(Name, Time) ->
@@ -290,7 +290,7 @@ assert_future(Name, Time) ->
true ->
ok;
false ->
- throw({error, {Name, not_in_future}})
+ throw({error, <<Name/binary, " not in future">>})
end.
@@ -373,7 +373,7 @@ missing_nbf_test() ->
invalid_nbf_test() ->
Encoded = encode(valid_header(), {[{<<"nbf">>, 32503680000}]}),
- ?assertEqual({error, {nbf,not_in_past}}, decode(Encoded, [nbf], nil)).
+ ?assertEqual({error, <<"nbf not in past">>}, decode(Encoded, [nbf], nil)).
missing_exp_test() ->
@@ -383,7 +383,7 @@ missing_exp_test() ->
invalid_exp_test() ->
Encoded = encode(valid_header(), {[{<<"exp">>, 0}]}),
- ?assertEqual({error, {exp,not_in_future}}, decode(Encoded, [exp], nil)).
+ ?assertEqual({error, <<"exp not in future">>}, decode(Encoded, [exp], nil)).
missing_kid_test() ->