Merge pull request #33 from biocad/shevchenkod/ABSCAN-1481-ghc9

Check key for aeson 2.

Author: maksbotan

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.1.3.13] - 2023-01-23
+### Changed
+- Add check for aeson 2, for GHC 9.2.5.
+
 ## [0.1.3.12] - 2022-07-17
 ### Changed
 - Update imports to support `lens-aeson` >=1.2.

src/Web/Template/Servant/Auth.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                 #-}
 {-# LANGUAGE LambdaCase          #-}
 {-# LANGUAGE OverloadedStrings   #-}
 {-# LANGUAGE RecordWildCards     #-}
@@ -37,6 +38,11 @@ import           Crypto.JWT                     (ClaimsSet, JWTError, JWTValidat
                                                  defaultJWTValidationSettings, issuerPredicate,
                                                  string, unregisteredClaims, uri, verifyClaims)
 import           Data.Aeson                     (Value)
+
+#if MIN_VERSION_aeson(2, 0, 0)
+import           Data.Aeson.Key                 (fromText)
+#endif
+
 import           Data.Aeson.Lens                (_String, key, values)
 import           Data.ByteString                (ByteString, stripPrefix)
 import qualified Data.ByteString.Lazy           as LB
@@ -347,7 +353,11 @@ instance ( HasServer api context
         let haveRoles = claims
               ^.. unregisteredClaims
               . ix "resource_access"
+#if MIN_VERSION_aeson(2, 0, 0)
+              . key (fromText oidcClientId)
+#else
               . key oidcClientId
+#endif
               . key "roles"
               . values . _String
 

web-template.cabal

@@ -1,5 +1,5 @@
 name:                web-template
-version:             0.1.3.12
+version:             0.1.3.13
 synopsis:            Web template
 description:
             Web template includes: