From 7d94cf587d83c50fb4b0f94d16ba499cbff4dd76 Mon Sep 17 00:00:00 2001 From: Philippe Pittoli Date: Sun, 31 Mar 2024 11:52:46 +0200 Subject: [PATCH] dnsmanagerd always tell whether the client is admin. --- src/App/Container.purs | 6 +++--- src/App/Message/DNSManagerDaemon.purs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/App/Container.purs b/src/App/Container.purs index 2e032eb..ef6cf12 100644 --- a/src/App/Container.purs +++ b/src/App/Container.purs @@ -50,7 +50,7 @@ import Prelude (Unit, bind, discard, unit, ($), (=<<), (<>), show, pure) import Bulma as Bulma import Data.Array as A -import Data.Maybe (Maybe(..), maybe, fromMaybe) +import Data.Maybe (Maybe(..), maybe) import Data.Either (Either(..)) import Data.Tuple (Tuple(..)) import Halogen as H @@ -717,9 +717,9 @@ handleAction = case _ of m@(DNSManager.MkAcceptedDomains _) -> do handleAction $ Log $ SuccessLog $ "Received the list of accepted domains!" handleAction $ DispatchDNSMessage m - m@(DNSManager.MkLogged message) -> do + m@(DNSManager.MkLogged logged_message) -> do handleAction $ Log $ SuccessLog $ "Authenticated to dnsmanagerd!" - H.tell _nav unit $ NavigationInterface.ToggleAdmin (fromMaybe false message.admin) + H.tell _nav unit $ NavigationInterface.ToggleAdmin logged_message.admin handleAction $ DispatchDNSMessage m m@(DNSManager.MkDomainAdded response) -> do handleAction $ Log $ SuccessLog $ "Domain added: " <> response.domain diff --git a/src/App/Message/DNSManagerDaemon.purs b/src/App/Message/DNSManagerDaemon.purs index 522600c..f770a21 100644 --- a/src/App/Message/DNSManagerDaemon.purs +++ b/src/App/Message/DNSManagerDaemon.purs @@ -208,11 +208,11 @@ codecAcceptedDomains ∷ CA.JsonCodec AcceptedDomains codecAcceptedDomains = CA.object "AcceptedDomains" (CAR.record { domains: CA.array CA.string }) {- 16 -} -type Logged = { accepted_domains :: Array String, my_domains :: Array String, admin :: Maybe Boolean } +type Logged = { accepted_domains :: Array String, my_domains :: Array String, admin :: Boolean } codecLogged ∷ CA.JsonCodec Logged codecLogged = CA.object "Logged" (CAR.record { accepted_domains: CA.array CA.string , my_domains: CA.array CA.string - , admin: CAR.optional CA.boolean + , admin: CA.boolean }) {- 17 -}