Merge pull request #66 from JonathanLorimer/add-state-argument-to-delete

Add state argument to delete

examples/scotty/Main.hs

@@ -167,7 +167,7 @@ run' = do
             { 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

@@ -79,7 +79,7 @@ getValidTokens store oidc mgr stateFromIdP code = do
     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

@@ -64,7 +64,7 @@ getValidIdTokenClaims store oidc stateFromIdP getIdToken = do
     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
     }