From 37f1665f16a263915156a5c8ce395a26ee2204bf Mon Sep 17 00:00:00 2001 From: Pere Lev Date: Fri, 5 Jul 2024 20:01:23 +0300 Subject: [PATCH] OAuth: Upgrade Dvara version, fxing some bugs --- src/Vervis/Foundation.hs | 2 ++ stack.yaml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Vervis/Foundation.hs b/src/Vervis/Foundation.hs index 9c80014..e0128f4 100644 --- a/src/Vervis/Foundation.hs +++ b/src/Vervis/Foundation.hs @@ -73,6 +73,7 @@ import Yesod.Auth.Unverified.Creds import Yesod.Mail.Send import qualified Network.HTTP.Signature as S (Algorithm (..)) +import qualified Yesod.Hashids as YH import Control.Concurrent.Actor hiding (Message) import Crypto.ActorKey @@ -774,6 +775,7 @@ instance YesodAuthDvara App where maybe (Left err) (Right . toSqlKey) $ readMaybe $ T.unpack t where err = "Failed to parse an Int64 for AuthId a.k.a PersonId" + getUserRoute = fmap PersonR . YH.encodeKeyHashid instance DvaraScope (YesodAuthDvaraScope App) where renderScope ScopeRead = "read" diff --git a/stack.yaml b/stack.yaml index e10b971..534afb7 100644 --- a/stack.yaml +++ b/stack.yaml @@ -18,7 +18,7 @@ extra-deps: - git: https://codeberg.org/ForgeFed/darcs-lights commit: d12cfc6f7ac7593910da0803ff7fb7ac82a3a460 - git: https://codeberg.org/ForgeFed/dvara - commit: 7dc7cd8eaf235d27d5d9c7743024bde437381b1a + commit: 01c01ecce624b366cb630ec93e2a80bb873ef7e2 - git: https://codeberg.org/ForgeFed/haskell-hit-graph commit: f00d8c927ac37f4c4c28aee56069d2ca068b6536 - git: https://codeberg.org/ForgeFed/haskell-hit-harder