From ba6e4ba6acd890196cdf16be48efbc9d9ad0cba1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Kr=C3=BCger?= Date: Tue, 25 Jan 2022 12:18:30 +0100 Subject: [PATCH] Fix fission-cli type errors --- fission-cli/library/Fission/CLI/Connected.hs | 7 ++----- fission-cli/library/Fission/CLI/Handler/Setup.hs | 4 ++-- fission-cli/library/Fission/CLI/Handler/User/Login.hs | 8 ++++---- fission-cli/library/Fission/CLI/Handler/User/Register.hs | 4 ++-- fission-web-server/library/Fission/Web/Server/Types.hs | 6 +++--- fission-web-server/test/Fission/Test/Web/Server/Auth.hs | 4 ++-- 6 files changed, 15 insertions(+), 18 deletions(-) diff --git a/fission-cli/library/Fission/CLI/Connected.hs b/fission-cli/library/Fission/CLI/Connected.hs index d413a643e..7dd397736 100644 --- a/fission-cli/library/Fission/CLI/Connected.hs +++ b/fission-cli/library/Fission/CLI/Connected.hs @@ -16,7 +16,7 @@ import qualified Network.IPFS.Process.Error as IPFS.Process import qualified Network.IPFS.Timeout.Types as IPFS import qualified Network.IPFS.Types as IPFS -import Web.DID.Types +import Web.DID.Types as DID import qualified Web.UCAN.Resolver.Error as UCAN.Resolver @@ -155,10 +155,7 @@ mkConnected inCfg ipfsTimeout = do let ignoredFiles = Environment.ignored config - cliDID = DID - { publicKey = Key.Ed25519PublicKey $ Ed25519.toPublic secretKey - , method = Key - } + cliDID = DID.Key $ Key.Ed25519PublicKey $ Ed25519.toPublic secretKey cfg = Config { httpManager = getField @"httpManager" inCfg, ..} diff --git a/fission-cli/library/Fission/CLI/Handler/Setup.hs b/fission-cli/library/Fission/CLI/Handler/Setup.hs index 76df7b174..3c0bc4dde 100644 --- a/fission-cli/library/Fission/CLI/Handler/Setup.hs +++ b/fission-cli/library/Fission/CLI/Handler/Setup.hs @@ -7,7 +7,7 @@ import RIO.FilePath import Network.DNS as DNS import Servant.Client -import Web.DID.Types +import Web.DID.Types as DID import qualified Web.UCAN.Types as UCAN @@ -96,7 +96,7 @@ setup maybeOS maybeUsername maybeEmail maybeKeyFile = do Right username -> do baseURL <- getRemoteBaseUrl signingPK <- Key.Store.fetchPublic (Proxy @SigningKey) - _ <- WNFS.create (DID Key $ Key.Ed25519PublicKey signingPK) "/" + _ <- WNFS.create (DID.Key $ Key.Ed25519PublicKey signingPK) "/" Env.init username baseURL Nothing Display.putOk $ "Done! Welcome to Fission, " <> textDisplay username <> " ✨" diff --git a/fission-cli/library/Fission/CLI/Handler/User/Login.hs b/fission-cli/library/Fission/CLI/Handler/User/Login.hs index 8dcec9b80..082a67a52 100644 --- a/fission-cli/library/Fission/CLI/Handler/User/Login.hs +++ b/fission-cli/library/Fission/CLI/Handler/User/Login.hs @@ -48,7 +48,7 @@ import qualified Fission.Web.Serialization as Web.Serializatio -- 🛂 JWT/UCAN -import Web.DID.Types +import Web.DID.Types as DID import qualified Web.UCAN.Claims.Error as UCAN.Claims import qualified Web.UCAN.Proof as UCAN.Proof import qualified Web.UCAN.Resolver.Class as UCAN @@ -159,7 +159,7 @@ consume signingSK baseURL optUsername = do signingPK <- Key.Store.toPublic (Proxy @SigningKey) signingSK let - myDID = DID Key (Ed25519PublicKey signingPK) + myDID = DID.Key (Ed25519PublicKey signingPK) topic = PubSub.Topic $ textDisplay targetDID PubSub.connect baseURL topic \conn -> reattempt 10 do @@ -167,7 +167,7 @@ consume signingSK baseURL optUsername = do aesConn <- secure conn () \(rsaConn :: Secure.Connection m (RSA.PublicKey, RSA.PrivateKey)) -> reattempt 10 do let Secure.Connection {key = (pk, _sk)} = rsaConn - sessionDID = DID Key (RSAPublicKey pk) + sessionDID = DID.Key (RSAPublicKey pk) logDebug @Text "🤝 Device linking handshake: Step 2" broadcastApiData conn sessionDID @@ -274,7 +274,7 @@ produce signingSK baseURL = do secure conn () \(rsaConn@Secure.Connection {key = (_, sk)} :: Secure.Connection m (RSA.PublicKey, RSA.PrivateKey)) -> reattempt 10 do logDebug @Text "🤝 Device linking handshake: Step 2" - requestorTempDID@(DID _ tmpPK) <- listenRaw conn + requestorTempDID@(DID.Key tmpPK) <- listenRaw conn case tmpPK of Ed25519PublicKey _ -> diff --git a/fission-cli/library/Fission/CLI/Handler/User/Register.hs b/fission-cli/library/Fission/CLI/Handler/User/Register.hs index 5a6f84a41..d3ec0f9ef 100644 --- a/fission-cli/library/Fission/CLI/Handler/User/Register.hs +++ b/fission-cli/library/Fission/CLI/Handler/User/Register.hs @@ -20,7 +20,7 @@ import Fission.User.Username.Types import Fission.Web.Auth.Token.Types import Fission.Web.Client as Client -import Web.DID.Types +import Web.DID.Types as DID import qualified Web.UCAN.Types as UCAN import Fission.User.Email.Types @@ -124,7 +124,7 @@ createAccount maybeUsername maybeEmail = do exchangePK <- KeyStore.fetchPublic (Proxy @ExchangeKey) signingPK <- KeyStore.fetchPublic (Proxy @SigningKey) - _ <- WNFS.create (DID Key $ Key.Ed25519PublicKey signingPK) "/" + _ <- WNFS.create (DID.Key $ Key.Ed25519PublicKey signingPK) "/" let form = Registration diff --git a/fission-web-server/library/Fission/Web/Server/Types.hs b/fission-web-server/library/Fission/Web/Server/Types.hs index 6db288347..c1f9e329d 100644 --- a/fission-web-server/library/Fission/Web/Server/Types.hs +++ b/fission-web-server/library/Fission/Web/Server/Types.hs @@ -559,19 +559,19 @@ instance User.Modifier Server where runUserUpdate updatePK pkToText uID "_did" where updatePK = User.updatePublicKeyDB uID pk now - pkToText pk' = textDisplay (DID Key pk') + pkToText pk' = textDisplay (DID.Key pk') addExchangeKey uID key now = runUserUpdate addKey keysToText uID "_exchange" where addKey = User.addExchangeKeyDB uID key now - keysToText keys = Text.intercalate "," (textDisplay . DID Key . Key.RSAPublicKey <$> keys) + keysToText keys = Text.intercalate "," (textDisplay . DID.Key . Key.RSAPublicKey <$> keys) removeExchangeKey uID key now = runUserUpdate removeKey keysToText uID "_exchange" where removeKey = User.removeExchangeKeyDB uID key now - keysToText keys = Text.intercalate "," (textDisplay . DID Key . Key.RSAPublicKey <$> keys) + keysToText keys = Text.intercalate "," (textDisplay . DID.Key . Key.RSAPublicKey <$> keys) setData userId newCID now = do runDB (User.getById userId) >>= \case diff --git a/fission-web-server/test/Fission/Test/Web/Server/Auth.hs b/fission-web-server/test/Fission/Test/Web/Server/Auth.hs index bef1b043e..7330e8c67 100644 --- a/fission-web-server/test/Fission/Test/Web/Server/Auth.hs +++ b/fission-web-server/test/Fission/Test/Web/Server/Auth.hs @@ -20,7 +20,7 @@ import qualified Fission.Web.API.Heroku.Auth.Types as Heroku import Fission.Web.Server.Auth import Fission.Web.Server.Auth.Token.Basic.Class import Fission.Web.Server.Authorization.Types -import Web.DID.Types +import Web.DID.Types as DID import qualified Fission.Test.Web.Server.Auth.Token as Token @@ -41,7 +41,7 @@ spec = context "DID auth" do it "uses the encapsulated function" do - didResult `shouldBe` Right (DID Key Ed25519.pk) + didResult `shouldBe` Right (DID.Key Ed25519.pk) context "heroku auth" do it "uses the encapsulated function" do