From 617bf7b6a34fe880c2b354932907867de2cef293 Mon Sep 17 00:00:00 2001 From: Robert Date: Thu, 4 Jul 2019 17:56:45 +0200 Subject: [PATCH] Update jose to 0.8 (and adapt error message test) (#1324) The message changes between jose versions 0.7 and 0.8. --- postgrest.cabal | 2 +- stack.yaml | 1 + test/Feature/AuthSpec.hs | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/postgrest.cabal b/postgrest.cabal index c67342313..a40980e00 100644 --- a/postgrest.cabal +++ b/postgrest.cabal @@ -63,7 +63,7 @@ library , http-types >= 0.12.2 && < 0.13 , insert-ordered-containers >= 0.1 && < 0.3 , interpolatedstring-perl6 >= 1 && < 1.1 - , jose >= 0.7 && < 0.8 + , jose >= 0.8 && < 0.9 , lens >= 4.14 && < 4.18 , lens-aeson >= 1.0.1 && < 1.1 , network-uri >= 2.6.1 && < 2.7 diff --git a/stack.yaml b/stack.yaml index d608e2647..6aad75765 100644 --- a/stack.yaml +++ b/stack.yaml @@ -12,6 +12,7 @@ extra-deps: - text-builder-0.6.5.1 - deferred-folds-0.9.10.1 - primitive-0.6.4.0 +- jose-0.8.0.0 ghc-options: postgrest: -O2 -Werror -Wall -fwarn-identities -fno-warn-redundant-constraints -optP-Wno-nonportable-include-path nix: diff --git a/test/Feature/AuthSpec.hs b/test/Feature/AuthSpec.hs index 64bc79bdc..130081d13 100644 --- a/test/Feature/AuthSpec.hs +++ b/test/Feature/AuthSpec.hs @@ -117,11 +117,11 @@ spec actualPgVersion = describe "authorization" $ do it "hides tables from users with invalid JWT" $ do let auth = authHeaderJWT "ey9zdGdyZXN0X3Rlc3RfYXV0aG9yIiwiaWQiOiJqZG9lIn0.y4vZuu1dDdwAl0-S00MCRWRYMlJ5YAMSir6Es6WtWx0" request methodGet "/authors_only" [auth] "" - `shouldRespondWith` [json| {"message":"JWSError (CompactDecodeError \"expected 3 parts, got 2\")"} |] + `shouldRespondWith` [json| {"message":"JWSError (CompactDecodeError CompactDecodeError: Expected 3 parts; got 2)"} |] { matchStatus = 401 , matchHeaders = [ "WWW-Authenticate" <:> - "Bearer error=\"invalid_token\", error_description=\"JWSError (CompactDecodeError \\\"expected 3 parts, got 2\\\")\"" + "Bearer error=\"invalid_token\", error_description=\"JWSError (CompactDecodeError CompactDecodeError: Expected 3 parts; got 2)\"" ] }