Add state argument to delete

examples/scotty/Main.hs

@@ -20,8 +20,8 @@
 import           Data.List                            as L
 import           Data.Map                             (Map)
 import qualified Data.Map                             as M
 import           Data.Maybe                           (Maybe (..), fromMaybe)
 import           Data.Monoid                          ((<>))
 import           Data.Text                            as T
 import           Data.Text.Encoding                   (decodeUtf8)
 import           Data.Text.Lazy                       as TL
@@ -167,7 +167,7 @@
             { sessionStoreGenerate = genBytes cprg
             , sessionStoreSave     = saveState ssm sid
             , sessionStoreGet      = getStateBy ssm sid
-            , sessionStoreDelete   = deleteState ssm sid
+            , sessionStoreDelete   = const $ deleteState ssm sid 
             }
 
     blaze = html . renderHtml

src/Web/OIDC/Client/CodeFlow.hs

@@ -24,7 +24,7 @@
 import qualified Data.ByteString.Char8              as B
 import           Data.List                          (nub)
 import           Data.Maybe                         (isNothing)
 import           Data.Monoid                        ((<>))
 import           Data.Text                          (Text, pack, unpack)
 import           Data.Text.Encoding                 (decodeUtf8With)
 import           Data.Text.Encoding.Error           (lenientDecode)
@@ -79,7 +79,7 @@
     savedNonce <- sessionStoreGet store stateFromIdP
     when (isNothing savedNonce) $ throwM UnknownState
     result <- liftIO $ requestTokens oidc savedNonce code mgr
-    sessionStoreDelete store
+    sessionStoreDelete store stateFromIdP
     return result
 
 -- | Make URL for Authorization Request.

src/Web/OIDC/Client/IdTokenFlow.hs

@@ -17,11 +17,11 @@
 import           Data.Aeson                         (FromJSON)
 import qualified Data.ByteString.Char8              as B
 import           Data.List                          (nub)
 import           Data.Maybe                         (isNothing, fromMaybe)
 import           Data.Monoid                        ((<>))
 import           Data.Text                          (unpack)
 import           Data.Text.Encoding                 (decodeUtf8With)
 import           Data.Text.Encoding.Error           (lenientDecode)
 import qualified Jose.Jwt                           as Jwt
 import           Network.HTTP.Client                (getUri, setQueryString)
 import           Network.URI                        (URI)
@@ -64,7 +64,7 @@
     msavedNonce <- sessionStoreGet store stateFromIdP
     savedNonce <- maybe (liftIO $ throwIO UnknownState) pure msavedNonce
     jwt <- Jwt.Jwt <$> getIdToken
-    sessionStoreDelete store
+    sessionStoreDelete store stateFromIdP
     idToken <- liftIO $ validateIdToken oidc jwt
     nonce' <- maybe (liftIO $ throwIO MissingNonceInResponse) pure (nonce idToken)
     when (nonce' /= savedNonce) $ liftIO $ throwIO MismatchedNonces

src/Web/OIDC/Client/Types.hs

@@ -70,6 +70,6 @@ data SessionStore m = SessionStore
     , sessionStoreSave :: State -> Nonce -> m ()
     , sessionStoreGet :: State -> m (Maybe Nonce)
     -- ^ Returns 'Nothing' if 'State' is unknown
-    , sessionStoreDelete :: m ()
+    , sessionStoreDelete :: State -> m ()
     -- ^ Should delete at least nonce
     }