@@ -1,16 +1,23 @@
1−{-# LANGUAGE CPP #-}
1+{-# LANGUAGE AllowAmbiguousTypes #-}
2−{-# LANGUAGE DataKinds #-}
3+{-# LANGUAGE DataKinds #-}
3−{-# LANGUAGE FlexibleContexts #-}
4+{-# LANGUAGE FlexibleContexts #-}
4−{-# LANGUAGE FlexibleInstances #-}
5+{-# LANGUAGE FlexibleInstances #-}
6+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
5−{-# LANGUAGE InstanceSigs #-}
7+{-# LANGUAGE InstanceSigs #-}
8+{-# LANGUAGE MultiParamTypeClasses #-}
6−{-# LANGUAGE OverloadedStrings #-}
9+{-# LANGUAGE OverloadedStrings #-}
7−{-# LANGUAGE PolyKinds #-}
10+{-# LANGUAGE PolyKinds #-}
11+{-# LANGUAGE Rank2Types #-}
8−{-# LANGUAGE ScopedTypeVariables #-}
12+{-# LANGUAGE ScopedTypeVariables #-}
9−{-# LANGUAGE TupleSections #-}
13+{-# LANGUAGE TupleSections #-}
10−{-# LANGUAGE TypeFamilies #-}
14+{-# LANGUAGE TypeFamilies #-}
11−{-# LANGUAGE TypeOperators #-}
15+{-# LANGUAGE TypeOperators #-}
12−{-# LANGUAGE UndecidableInstances #-}
16+{-# LANGUAGE UndecidableInstances #-}
13−{-# LANGUAGE MultiParamTypeClasses #-}
17+
18+#if MIN_VERSION_base(4,9,0)
19+{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
15-- #include "overlapping-compat.h"
22-- #include "overlapping-compat.h"
16-- | This module provides 'client' which can automatically generate
23-- | This module provides 'client' which can automatically generate
@@ -18,31 +25,71 @@
19module Servant.Reflex
26module Servant.Reflex
21− , HasClient(..)
28+ , clientWithOpts
29+ , clientWithOptsAndResultHandler
31+ , clientWithRouteAndResultHandler
32+ , BuildHeaderKeysTo(..)
22 , module Servant.Common.Req
36 , module Servant.Common.Req
23 , module Servant.Common.BaseUrl
37 , module Servant.Common.BaseUrl
40+------------------------------------------------------------------------------
26−import Control.Applicative ((<$>), liftA2)
41+import Control.Applicative
27−import Control.Monad.Trans.Except
28−import qualified Data.ByteString.Char8 as BS
29−import Data.ByteString.Lazy (ByteString)
30−import qualified Data.CaseInsensitive as CI
42+import qualified Data.CaseInsensitive as CI
31−import Data.List
43+import Data.Functor.Identity
32−import Data.Proxy
44+import qualified Data.Map as Map
33−import Data.String.Conversions
45+import Data.Monoid ((<>))
34−import Data.Maybe (maybeToList)
46+import Data.Proxy (Proxy (..))
47+import qualified Data.Set as Set
35−import Data.Text (unpack)
48+import Data.Text (Text)
36−import Data.Traversable (sequenceA)
49+import qualified Data.Text as T
50+import qualified Data.Text.Encoding as E
51+import GHC.Exts (Constraint)
37−import GHC.TypeLits
52+import GHC.TypeLits (KnownSymbol, symbolVal)
38−import qualified Network.HTTP.Media as M
53+import Servant.API ((:<|>) (..), (:>), BasicAuth,
39−import Servant.API
54+ BasicAuthData, BuildHeadersTo (..),
55+ Capture, Header, Headers (..),
56+ HttpVersion, IsSecure,
57+ MimeRender (..), MimeUnrender,
58+ NoContent, QueryFlag, QueryParam',
59+ QueryParams, Raw, ReflectMethod (..),
61+ ToHttpApiData (..), Vault, Verb,
63+import Servant.API.Description (Summary)
64+import qualified Servant.Auth as Auth
66+import Reflex.Dom.Core (Dynamic, Event, Reflex,
67+ XhrRequest (..), XhrResponse (..),
68+ XhrResponseHeaders (..),
69+ attachPromptlyDynWith, constDyn, ffor,
71+ performRequestsAsync)
72+------------------------------------------------------------------------------
40−import Servant.Common.BaseUrl
73+import Servant.Common.BaseUrl (BaseUrl(..), Scheme(..), baseUrlWidget,
75+ SupportsServantReflex)
41−import Servant.Common.Req
76+import Servant.Common.Req (ClientOptions(..),
42−import Servant.API.ContentTypes
77+ defaultClientOptions,
43−import Reflex
78+ Req, ReqResult(..), QParam(..),
44−import Reflex.Dom
79+ QueryPart(..), addHeader, authData,
45−import Reflex.Dom.Xhr
80+ defReq, evalResponse, prependToPathParts,
83+ -- performRequestNoBody,
84+ performRequestsNoBody,
85+ performSomeRequestsAsync,
86+ qParamToQueryPart, reqBody,
87+ reqSuccess, reqFailure,
88+ reqMethod, respHeaders,
91+ qParams, withCredentials)
47-- * Accessing APIs as a Client
94-- * Accessing APIs as a Client
@@ -54,116 +101,191 @@ import Reflex.Dom.Xhr
54-- > myApi :: Proxy MyApi
101-- > myApi :: Proxy MyApi
55-- > myApi = Proxy
102-- > myApi = Proxy
57−-- > getAllBooks :: Event t () -> m (Event t (Either XhrError ((),[Book])))
104+-- > getAllBooks :: Event t l -> m (Event t (l, ReqResult [Book]))
58−-- > postNewBook :: Behavior t (Maybe Book) -> Event t ()
105+-- > postNewBook :: Dynamic t (Maybe Book) -> Event t l
59−-- -> m (Event t (Either XhrError (Book,Book)))
106+-- > -> m (Event t (l, ReqResult Book)))
60-- > (getAllBooks :<|> postNewBook) = client myApi host
107-- > (getAllBooks :<|> postNewBook) = client myApi host
61-- > where host = constDyn $ BaseUrl Http "localhost" 8080
108-- > where host = constDyn $ BaseUrl Http "localhost" 8080
62−client :: (HasClient t m layout, MonadWidget t m)
110+ :: (HasClient t m layout tag)
114+ -> Dynamic t BaseUrl
115+ -> Client t m layout tag
116+client p q t baseurl = clientWithRoute p q t defReq baseurl defaultClientOptions
119+ :: (HasClient t m layout tag)
63− => Proxy layout -> Proxy m -> Dynamic t BaseUrl -> Client t m layout
123+ -> Dynamic t BaseUrl
125+ -> Client t m layout tag
64−client p q baseurl = clientWithRoute p q defReq baseurl
126+clientWithOpts p q t baseurl = clientWithRoute p q t defReq baseurl
128+-- | Like 'clientWithOpts' but allows passing a function which will process the
129+-- result event in some way. This can be used to handle errors in a uniform way
130+-- across call sites.
131+clientWithOptsAndResultHandler
132+ :: (HasClient t m layout tag)
136+ -> Dynamic t BaseUrl
138+ -> (forall a. Event t (ReqResult tag a) -> m (Event t (ReqResult tag a)))
139+ -> Client t m layout tag
140+clientWithOptsAndResultHandler p q t = clientWithRouteAndResultHandler p q t defReq
66-- | This class lets us define how each API combinator
143-- | This class lets us define how each API combinator
67-- influences the creation of an HTTP request. It's mostly
144-- influences the creation of an HTTP request. It's mostly
68-- an internal class, you can just use 'client'.
145-- an internal class, you can just use 'client'.
69−class HasClient t m layout where
146+class Monad m => HasClient t m layout (tag :: *) where
70− type Client t m layout :: *
147+ type Client t m layout tag :: *
71− clientWithRoute :: Proxy layout -> Proxy m -> Req t -> Dynamic t BaseUrl -> Client t m layout
148+ clientWithRoute
153+ -> Dynamic t BaseUrl
155+ -> Client t m layout tag
156+ clientWithRoute l m t r b o = clientWithRouteAndResultHandler l m t r b o return
158+ clientWithRouteAndResultHandler
163+ -> Dynamic t BaseUrl
165+ -> (forall a. Event t (ReqResult tag a) -> m (Event t (ReqResult tag a)))
166+ -> Client t m layout tag
169+instance (HasClient t m a tag, HasClient t m b tag) => HasClient t m (a :<|> b) tag where
170+ type Client t m (a :<|> b) tag = Client t m a tag :<|> Client t m b tag
172+ clientWithRouteAndResultHandler Proxy q pTag req baseurl opts wrap =
173+ clientWithRouteAndResultHandler (Proxy :: Proxy a) q pTag req baseurl opts wrap :<|>
174+ clientWithRouteAndResultHandler (Proxy :: Proxy b) q pTag req baseurl opts wrap
74−instance (HasClient t m a, HasClient t m b) => HasClient t m (a :<|> b) where
75− type Client t m (a :<|> b) = Client t m a :<|> Client t m b
76− clientWithRoute Proxy q req baseurl =
77− clientWithRoute (Proxy :: Proxy a) q req baseurl :<|>
78− clientWithRoute (Proxy :: Proxy b) q req baseurl
80-- Capture. Example:
177-- Capture. Example:
81-- > type MyApi = "books" :> Capture "isbn" Text :> Get '[JSON] Book
178-- > type MyApi = "books" :> Capture "isbn" Text :> Get '[JSON] Book
83-- > myApi :: Proxy MyApi = Proxy
180-- > myApi :: Proxy MyApi = Proxy
85−-- > getBook :: MonadWidget t m
182+-- > getBook :: SupportsServantReflex t m
86-- => Dynamic t BaseUrl
183-- => Dynamic t BaseUrl
87−-- -> Behavior t (Maybe Text)
184+-- -> Dynamic t (Maybe Text)
88−-- -> Event t ()
185+-- -> Event t l
89−-- -> m (Event t (Either XhrError (Text, Book)))
186+-- -> m (Event t (l, ReqResult Book))
90-- > getBook = client myApi (constDyn host)
187-- > getBook = client myApi (constDyn host)
91−instance (MonadWidget t m, KnownSymbol capture, ToHttpApiData a, HasClient t m sublayout)
92− => HasClient t m (Capture capture a :> sublayout) where
189+instance (SupportsServantReflex t m, ToHttpApiData a, HasClient t m sublayout tag)
190+ => HasClient t m (Capture capture a :> sublayout) tag where
94− type Client t m (Capture capture a :> sublayout) =
192+ type Client t m (Capture capture a :> sublayout) tag =
95− Behavior t (Either String a) -> Client t m sublayout
193+ Dynamic t (Either Text a) -> Client t m sublayout tag
97− clientWithRoute Proxy q req baseurl val =
195+ clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap val =
98− clientWithRoute (Proxy :: Proxy sublayout)
196+ clientWithRouteAndResultHandler
100− (prependToPathParts p req)
197+ (Proxy :: Proxy sublayout) q t (prependToPathParts p req) baseurl opts wrap
101− baseurl
198+ where p = (fmap . fmap) (toUrlPiece) val
103− where p = (fmap . fmap) (unpack . toUrlPiece) val
105-- VERB (Returning content) --
201-- VERB (Returning content) --
106instance {-# OVERLAPPABLE #-}
202instance {-# OVERLAPPABLE #-}
107 -- Note [Non-Empty Content Types]
203 -- Note [Non-Empty Content Types]
108− (MimeUnrender ct a, ReflectMethod method, cts' ~ (ct ': cts), MonadWidget t m
204+ (MimeUnrender ct a, ReflectMethod method, cts' ~ (ct ': cts), SupportsServantReflex t m
109− ) => HasClient t m (Verb method status cts' a) where
205+ ) => HasClient t m (Verb method status cts' a) tag where
110− type Client t m (Verb method status cts' a) =
206+ type Client t m (Verb method status cts' a) tag =
111− Event t () -> m (Event t (ReqResult a))
207+ Event t tag -> m (Event t (ReqResult tag a))
112 -- TODO how to access input types here?
208 -- TODO how to access input types here?
113 -- ExceptT ServantError IO a
209 -- ExceptT ServantError IO a
114− clientWithRoute Proxy q req baseurl =
210+ clientWithRouteAndResultHandler Proxy _ _ req baseurl opts wrap trigs =
115− performRequestCT (Proxy :: Proxy ct) method req' baseurl
211+ wrap =<< fmap runIdentity <$> performRequestsCT (Proxy :: Proxy ct) method (constDyn $ Identity $ req') baseurl opts trigs
116− where method = BS.unpack $ reflectMethod (Proxy :: Proxy method)
212+ where method = E.decodeUtf8 $ reflectMethod (Proxy :: Proxy method)
117 req' = req { reqMethod = method }
213 req' = req { reqMethod = method }
119-- -- VERB (No content) --
216-- -- VERB (No content) --
120instance {-# OVERLAPPING #-}
217instance {-# OVERLAPPING #-}
121− (ReflectMethod method, MonadWidget t m) =>
218+ (ReflectMethod method, SupportsServantReflex t m) =>
122− HasClient t m (Verb method status cts NoContent) where
219+ HasClient t m (Verb method status cts NoContent) tag where
123− type Client t m (Verb method status cts NoContent) =
220+ type Client t m (Verb method status cts NoContent) tag =
124− Event t () -> m (Event t (ReqResult NoContent))
221+ Event t tag -> m (Event t (ReqResult tag NoContent))
125 -- TODO: how to access input types here?
222 -- TODO: how to access input types here?
126 -- ExceptT ServantError IO NoContent
223 -- ExceptT ServantError IO NoContent
127− clientWithRoute Proxy q req baseurl =
224+ clientWithRouteAndResultHandler Proxy _ _ req baseurl opts wrap trigs =
128− performRequestNoBody method req baseurl
225+ wrap =<< fmap runIdentity <$> performRequestsNoBody method (constDyn $ Identity req) baseurl opts trigs
129− where method = BS.unpack $ reflectMethod (Proxy :: Proxy method)
226+ where method = E.decodeUtf8 $ reflectMethod (Proxy :: Proxy method)
131−-- -- HEADERS Verb (Content) --
228+
132−-- -- Headers combinator not treated in fully general case,
229+toHeaders :: BuildHeadersTo ls => ReqResult tag a -> ReqResult tag (Headers ls a)
133−-- -- in order to deny instances for (Headers ls (Capture "id" Int)),
230+toHeaders r =
134−-- -- a combinator that wouldn't make sense
231+ let hdrs = maybe []
135−-- -- TODO Overlapping??
232+ (\xhr -> fmap (\(h,v) -> (CI.map E.encodeUtf8 h, E.encodeUtf8 v))
136−-- instance {-# OVERLAPPABLE #-}
233+ (Map.toList $ _xhrResponse_headers xhr))
137−-- -- Note [Non-Empty Content Types]
234+ (response r)
138−-- ( MimeUnrender ct a, BuildHeadersTo ls,
139−-- ReflectMethod method, cts' ~ (ct ': cts),
141−-- ) => HasClient t m (Verb method status cts' (Headers ls a)) where
142−-- type Client t m (Verb method status cts' (Headers ls a))
143−-- = Event t () -> m (Event t (Maybe a, XhrResponse))
144−-- -- ExceptT ServantError IO (Headers ls a)
145−-- clientWithRoute Proxy req baseurl = do
146−-- let method = reflectMethod (Proxy :: Proxy method)
147−-- (hdrs, resp) <- performRequestCT (Proxy :: Proxy ct) method req baseurl
148−-- return $ Headers { getResponse = resp
149−-- , getHeadersHList = buildHeadersTo hdrs
235+ in ffor r $ \a -> Headers {getResponse = a ,getHeadersHList = buildHeadersTo hdrs}
238+class BuildHeaderKeysTo hs where
239+ buildHeaderKeysTo :: Proxy hs -> [CI.CI T.Text]
241+instance {-# OVERLAPPABLE #-} BuildHeaderKeysTo '[]
242+ where buildHeaderKeysTo _ = []
244+instance {-# OVERLAPPABLE #-} (BuildHeaderKeysTo xs, KnownSymbol h)
245+ => BuildHeaderKeysTo ((Header h v) ': xs) where
246+ buildHeaderKeysTo _ =
248+ thisKey = CI.mk $ T.pack (symbolVal (Proxy :: Proxy h))
249+ in thisKey : buildHeaderKeysTo (Proxy :: Proxy xs)
252+-- HEADERS Verb (Content) --
253+-- Headers combinator not treated in fully general case,
254+-- in order to deny instances for (Headers ls (Capture "id" Int)),
255+-- a combinator that wouldn't make sense
152-- TODO Overlapping??
256-- TODO Overlapping??
257+instance {-# OVERLAPPABLE #-}
258+ -- Note [Non-Empty Content Types]
259+ ( MimeUnrender ct a, BuildHeadersTo ls, BuildHeaderKeysTo ls,
260+ ReflectMethod method, cts' ~ (ct ': cts),
261+ SupportsServantReflex t m
262+ ) => HasClient t m (Verb method status cts' (Headers ls a)) tag where
263+ type Client t m (Verb method status cts' (Headers ls a)) tag =
264+ Event t tag -> m (Event t (ReqResult tag (Headers ls a)))
265+ clientWithRouteAndResultHandler Proxy _ _ req baseurl opts wrap trigs = do
266+ let method = E.decodeUtf8 $ reflectMethod (Proxy :: Proxy method)
267+ resp <- fmap runIdentity <$> performRequestsCT (Proxy :: Proxy ct) method (constDyn $ Identity req') baseurl opts trigs
268+ wrap $ toHeaders <$> resp
269+ where req' = req { respHeaders =
270+ OnlyHeaders (Set.fromList (buildHeaderKeysTo (Proxy :: Proxy ls)))
153−-- -- HEADERS Verb (No content) --
274+-- HEADERS Verb (No content) --
154−-- instance {-# OVERLAPPABLE #-}
275+instance {-# OVERLAPPABLE #-}
155−-- ( BuildHeadersTo ls, ReflectMethod method,
276+ ( BuildHeadersTo ls, BuildHeaderKeysTo ls, ReflectMethod method,
156−-- MonadWidget t m
277+ SupportsServantReflex t m
157−-- ) => HasClient t m (Verb method status cts (Headers ls NoContent)) where
278+ ) => HasClient t m (Verb method status cts (Headers ls NoContent)) tag where
158−-- type Client t m (Verb method status cts (Headers ls NoContent))
279+ type Client t m (Verb method status cts (Headers ls NoContent)) tag
159−-- = Event t () -> m (Event t XhrResponse)
160−-- -- ExceptT ServantError IO (Headers ls NoContent)
280+ = Event t tag -> m (Event t (ReqResult tag (Headers ls NoContent)))
161−-- clientWithRoute Proxy req baseurl = do
281+ clientWithRouteAndResultHandler Proxy _ _ req baseurl opts wrap trigs = do
162−-- let method = reflectMethod (Proxy :: Proxy method)
282+ let method = E.decodeUtf8 $ reflectMethod (Proxy :: Proxy method)
163−-- hdrs <- performRequestNoBody method req baseurl
283+ resp <- fmap runIdentity <$> performRequestsNoBody method (constDyn $ Identity req') baseurl opts trigs
164−-- return $ Headers { getResponse = NoContent
284+ wrap $ toHeaders <$> resp
165−-- , getHeadersHList = buildHeadersTo hdrs
285+ where req' = req {respHeaders =
286+ OnlyHeaders (Set.fromList (buildHeaderKeysTo (Proxy :: Proxy ls)))
@@ -180,34 +302,46 @@ instance {-# OVERLAPPING #-}
180-- > -- then you can just use "viewRefer" to query that endpoint
302-- > -- then you can just use "viewRefer" to query that endpoint
181-- > -- specifying Nothing or e.g Just "http://haskell.org/" as arguments
303-- > -- specifying Nothing or e.g Just "http://haskell.org/" as arguments
182instance (KnownSymbol sym, ToHttpApiData a,
304instance (KnownSymbol sym, ToHttpApiData a,
183− HasClient t m sublayout, MonadWidget t m)
305+ HasClient t m sublayout tag, SupportsServantReflex t m)
184− => HasClient t m (Header sym a :> sublayout) where
306+ => HasClient t m (Header sym a :> sublayout) tag where
308+ type Client t m (Header sym a :> sublayout) tag =
309+ Dynamic t (Either Text a) -> Client t m sublayout tag
311+ clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap eVal =
312+ clientWithRouteAndResultHandler
313+ (Proxy :: Proxy sublayout) q t
314+ (Servant.Common.Req.addHeader hname eVal req)
316+ where hname = T.pack $ symbolVal (Proxy :: Proxy sym)
186− type Client t m (Header sym a :> sublayout) =
187− Behavior t (Either String a) -> Client t m sublayout
189− clientWithRoute Proxy q req baseurl mval =
190− clientWithRoute (Proxy :: Proxy sublayout)
193− -- (maybe req -- TODO Need to pass the header in
194− -- (\value -> Servant.Common.Req.addHeader hname value req)
199− where hname = symbolVal (Proxy :: Proxy sym)
201-- | Using a 'HttpVersion' combinator in your API doesn't affect the client
321-- | Using a 'HttpVersion' combinator in your API doesn't affect the client
202-- functions.
322-- functions.
203−instance HasClient t m sublayout
323+instance HasClient t m sublayout tag
204− => HasClient t m (HttpVersion :> sublayout) where
324+ => HasClient t m (HttpVersion :> sublayout) tag where
326+ type Client t m (HttpVersion :> sublayout) tag =
327+ Client t m sublayout tag
329+ clientWithRouteAndResultHandler Proxy =
330+ clientWithRouteAndResultHandler (Proxy :: Proxy sublayout)
332+-- | Using a 'Summary' combinator in your API doesn't affect the client
334+instance (HasClient t m sublayout tag, KnownSymbol sym)
335+ => HasClient t m (Summary sym :> sublayout) tag where
337+ type Client t m (Summary sym :> sublayout) tag =
338+ Client t m sublayout tag
340+ clientWithRouteAndResultHandler Proxy =
341+ clientWithRouteAndResultHandler (Proxy :: Proxy sublayout)
206− type Client t m (HttpVersion :> sublayout) =
207− Client t m sublayout
209− clientWithRoute Proxy q =
210− clientWithRoute (Proxy :: Proxy sublayout) q
212-- | If you use a 'QueryParam' in one of your endpoints in your API,
346-- | If you use a 'QueryParam' in one of your endpoints in your API,
213-- the corresponding querying function will automatically take
347-- the corresponding querying function will automatically take
@@ -235,21 +369,24 @@ instance HasClient t m sublayout
235-- > -- then you can just use "getBooksBy" to query that endpoint.
369-- > -- then you can just use "getBooksBy" to query that endpoint.
236-- > -- 'getBooksBy Nothing' for all books
370-- > -- 'getBooksBy Nothing' for all books
237-- > -- 'getBooksBy (Just "Isaac Asimov")' to get all books by Isaac Asimov
371-- > -- 'getBooksBy (Just "Isaac Asimov")' to get all books by Isaac Asimov
238−instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout, Reflex t)
372+instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout tag, Reflex t)
239− => HasClient t m (QueryParam sym a :> sublayout) where
373+ => HasClient t m (QueryParam' mods sym a :> sublayout) tag where
241− type Client t m (QueryParam sym a :> sublayout) =
375+ type Client t m (QueryParam' mods sym a :> sublayout) tag =
242− -- TODO (Maybe a), or (Maybe (Maybe a))? (should the user be able to send a Nothing)
243− Behavior t (Either String a) -> Client t m sublayout
376+ Dynamic t (QParam a) -> Client t m sublayout tag
245 -- if mparam = Nothing, we don't add it to the query string
378 -- if mparam = Nothing, we don't add it to the query string
246− clientWithRoute Proxy q req baseurl mparam =
379+ clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap mparam =
247− clientWithRoute (Proxy :: Proxy sublayout) q
380+ clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t
248− (req {qParams = paramPair : qParams req}) baseurl
381+ (req {qParams = paramPair : qParams req}) baseurl opts wrap
250 where pname = symbolVal (Proxy :: Proxy sym)
383 where pname = symbolVal (Proxy :: Proxy sym)
251− p prm = QueryPartParam $ (fmap . fmap) (unpack . toQueryParam) prm
384+ --p prm = QueryPartParam $ (fmap . fmap) (toQueryParam) prm
385+ --paramPair = (T.pack pname, p mparam)
386+ p prm = QueryPartParam $ fmap qParamToQueryPart prm -- (fmap . fmap) (unpack . toQueryParam) prm
252− paramPair = (pname, p mparam)
387+ paramPair = (T.pack pname, p mparam)
254-- | If you use a 'QueryParams' in one of your endpoints in your API,
391-- | If you use a 'QueryParams' in one of your endpoints in your API,
255-- the corresponding querying function will automatically take
392-- the corresponding querying function will automatically take
@@ -279,21 +416,22 @@ instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout, Reflex t)
279-- > -- 'getBooksBy []' for all books
416-- > -- 'getBooksBy []' for all books
280-- > -- 'getBooksBy ["Isaac Asimov", "Robert A. Heinlein"]'
417-- > -- 'getBooksBy ["Isaac Asimov", "Robert A. Heinlein"]'
281-- > -- to get all books by Asimov and Heinlein
418-- > -- to get all books by Asimov and Heinlein
282−instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout, Reflex t)
419+instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout tag, Reflex t)
283− => HasClient t m (QueryParams sym a :> sublayout) where
420+ => HasClient t m (QueryParams sym a :> sublayout) tag where
285− type Client t m (QueryParams sym a :> sublayout) =
422+ type Client t m (QueryParams sym a :> sublayout) tag =
286− Behavior t [a] -> Client t m sublayout
423+ Dynamic t [a] -> Client t m sublayout tag
288− clientWithRoute Proxy q req baseurl paramlist =
425+ clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap paramlist =
289− clientWithRoute (Proxy :: Proxy sublayout) q req' baseurl
426+ clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t req' baseurl opts wrap
291− where req' = req { qParams = (pname, params') : qParams req }
428+ where req' = req { qParams = (T.pack pname, params') : qParams req }
292 pname = symbolVal (Proxy :: Proxy sym)
429 pname = symbolVal (Proxy :: Proxy sym)
293− params' = QueryPartParams $ (fmap . fmap) (unpack . toQueryParam)
430+ params' = QueryPartParams $ (fmap . fmap) toQueryParam
294 paramlist
431 paramlist
297-- | If you use a 'QueryFlag' in one of your endpoints in your API,
435-- | If you use a 'QueryFlag' in one of your endpoints in your API,
298-- the corresponding querying function will automatically take
436-- the corresponding querying function will automatically take
299-- an additional 'Bool' argument.
437-- an additional 'Bool' argument.
@@ -318,49 +456,42 @@ instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout, Reflex t)
318-- > -- 'getBooksBy True' to only get _already published_ books
456-- > -- 'getBooksBy True' to only get _already published_ books
320-- TODO Bring back
458-- TODO Bring back
321−instance (KnownSymbol sym, HasClient t m sublayout, Reflex t)
459+instance (KnownSymbol sym, HasClient t m sublayout tag, Reflex t)
322− => HasClient t m (QueryFlag sym :> sublayout) where
460+ => HasClient t m (QueryFlag sym :> sublayout) tag where
324− type Client t m (QueryFlag sym :> sublayout) =
462+ type Client t m (QueryFlag sym :> sublayout) tag =
325− Behavior t Bool -> Client t m sublayout
463+ Dynamic t Bool -> Client t m sublayout tag
327− clientWithRoute Proxy q req baseurl flag =
465+ clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap flag =
328− clientWithRoute (Proxy :: Proxy sublayout) q req' baseurl
466+ clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t req' baseurl opts wrap
330 where req' = req { qParams = thisPair : qParams req }
468 where req' = req { qParams = thisPair : qParams req }
331− thisPair = (pName, QueryPartFlag flag) :: (String, QueryPart t)
469+ thisPair = (T.pack pName, QueryPartFlag flag) :: (Text, QueryPart t)
332 pName = symbolVal (Proxy :: Proxy sym)
470 pName = symbolVal (Proxy :: Proxy sym)
335−-- | Pick a 'Method' and specify where the server you want to query is. You get
473+
336−-- back the full `Response`.
474+-- | Send a raw 'XhrRequest ()' directly to 'baseurl'
338−instance (MonadWidget t m) => HasClient t m Raw where
475+instance SupportsServantReflex t m => HasClient t m Raw tag where
339− type Client t m Raw = Behavior t (Either String XhrRequest)
476+ type Client t m Raw tag = Dynamic t (Either Text (XhrRequest ()))
340− -> Event t ()
477+ -> Event t tag
341− -> m (Event t (ReqResult ()))
478+ -> m (Event t (ReqResult tag ()))
343− -- clientWithRoute :: Proxy Raw -> Proxy m -> Req -> BaseUrl -> Client t m Raw
480+ clientWithRouteAndResultHandler _ _ _ _ baseurl _ wrap xhrs triggers = do
344− clientWithRoute p q req baseurl xhrs triggers = do
481+
345− let xhrs' = liftA2 (\x path -> case x of
482+ let xhrs' = liftA2 (\x path -> case x of
346− Left e -> Left e
483+ Left e -> Left e
347− Right jx -> Right $ jx {_xhrRequest_url = path
484+ Right jx -> Right $ jx { _xhrRequest_url = path <> _xhrRequest_url jx }
348− ++ _xhrRequest_url jx})
350− (showBaseUrl <$> current baseurl)
485+ ) xhrs (showBaseUrl <$> baseurl)
351− reqs = tag xhrs' triggers
486+ xhrs'' = attachPromptlyDynWith (flip (,)) xhrs' triggers :: Event t (tag, Either Text (XhrRequest ()))
352− okReq = fmapMaybe hush reqs
487+ badReq = fmapMaybe (\(t,x) -> either (Just . (t,)) (const Nothing) x) xhrs'' :: Event t (tag, Text)
353− badReq = fmapMaybe tattle reqs
488+ okReq = fmapMaybe (\(t,x) -> either (const Nothing) (Just . (t,)) x) xhrs'' :: Event t (tag, XhrRequest ())
354− resps <- performRequestAsync okReq
489+
355− return $ leftmost [fmap (ResponseSuccess () ) resps
490+ resps <- performRequestsAsync okReq
356− ,fmap RequestFailure badReq]
491+ wrap $ leftmost [ uncurry RequestFailure <$> badReq
357−
492+ , evalResponse (const $ Right ()) <$> resps
359−hush :: Either e a -> Maybe a
494+
360−hush = either (const Nothing) Just
362−tattle :: Either e a -> Maybe e
363−tattle = either Just (const Nothing)
365-- | If you use a 'ReqBody' in one of your endpoints in your API,
496-- | If you use a 'ReqBody' in one of your endpoints in your API,
366-- the corresponding querying function will automatically take
497-- the corresponding querying function will automatically take
@@ -382,50 +513,66 @@ tattle = either Just (const Nothing)
382-- > where host = BaseUrl Http "localhost" 8080
513-- > where host = BaseUrl Http "localhost" 8080
383-- > -- then you can just use "addBook" to query that endpoint
514-- > -- then you can just use "addBook" to query that endpoint
385−instance (MimeRender ct a, HasClient t m sublayout, Reflex t)
516+instance (MimeRender ct a, HasClient t m sublayout tag, Reflex t)
386− => HasClient t m (ReqBody (ct ': cts) a :> sublayout) where
517+ => HasClient t m (ReqBody (ct ': cts) a :> sublayout) tag where
388− type Client t m (ReqBody (ct ': cts) a :> sublayout) =
519+ type Client t m (ReqBody (ct ': cts) a :> sublayout) tag =
389− Behavior t (Either String a) -> Client t m sublayout
520+ Dynamic t (Either Text a) -> Client t m sublayout tag
391− clientWithRoute Proxy q req baseurl body =
522+ clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap body =
392− clientWithRoute (Proxy :: Proxy sublayout) q req' baseurl
523+ clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t req' baseurl opts wrap
393 where req' = req { reqBody = bodyBytesCT }
524 where req' = req { reqBody = bodyBytesCT }
394 ctProxy = Proxy :: Proxy ct
525 ctProxy = Proxy :: Proxy ct
395− ctString = show $ contentType ctProxy
526+ ctString = T.pack $ show $ contentType ctProxy
396− --ctString = BS.unpack . CI.original . M.mainType $ contentType ctProxy
397 bodyBytesCT = Just $ (fmap . fmap)
527 bodyBytesCT = Just $ (fmap . fmap)
398 (\b -> (mimeRender ctProxy b, ctString))
528 (\b -> (mimeRender ctProxy b, ctString))
401-- | Make the querying function append @path@ to the request path.
533-- | Make the querying function append @path@ to the request path.
402−instance (KnownSymbol path, HasClient t m sublayout, Reflex t) => HasClient t m (path :> sublayout) where
534+instance (KnownSymbol path, HasClient t m sublayout tag, Reflex t) => HasClient t m (path :> sublayout) tag where
403− type Client t m (path :> sublayout) = Client t m sublayout
535+ type Client t m (path :> sublayout) tag = Client t m sublayout tag
405− clientWithRoute Proxy q req baseurl =
537+ clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap =
406− clientWithRoute (Proxy :: Proxy sublayout) q
538+ clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t
407− (prependToPathParts (constant (Right p)) req)
539+ (prependToPathParts (pure (Right $ T.pack p)) req) baseurl opts wrap
410 where p = symbolVal (Proxy :: Proxy path)
541 where p = symbolVal (Proxy :: Proxy path)
412−instance HasClient t m api => HasClient t m (Vault :> api) where
413− type Client t m (Vault :> api) = Client t m api
415− clientWithRoute Proxy q req baseurl =
544+instance HasClient t m api tag => HasClient t m (Vault :> api) tag where
416− clientWithRoute (Proxy :: Proxy api) q req baseurl
545+ type Client t m (Vault :> api) tag = Client t m api tag
547+ clientWithRouteAndResultHandler Proxy =
548+ clientWithRouteAndResultHandler (Proxy :: Proxy api)
551+instance HasClient t m api tag => HasClient t m (RemoteHost :> api) tag where
552+ type Client t m (RemoteHost :> api) tag = Client t m api tag
554+ clientWithRouteAndResultHandler Proxy =
555+ clientWithRouteAndResultHandler (Proxy :: Proxy api)
418−instance HasClient t m api => HasClient t m (RemoteHost :> api) where
419− type Client t m (RemoteHost :> api) = Client t m api
421− clientWithRoute Proxy q req baseurl =
422− clientWithRoute (Proxy :: Proxy api) q req baseurl
424−instance HasClient t m api => HasClient t m (IsSecure :> api) where
559+instance HasClient t m api tag => HasClient t m (IsSecure :> api) tag where
425− type Client t m (IsSecure :> api) = Client t m api
560+ type Client t m (IsSecure :> api) tag = Client t m api tag
427− clientWithRoute Proxy q req baseurl =
562+ clientWithRouteAndResultHandler Proxy =
563+ clientWithRouteAndResultHandler (Proxy :: Proxy api)
566+instance (HasClient t m api tag, Reflex t)
567+ => HasClient t m (BasicAuth realm usr :> api) tag where
569+ type Client t m (BasicAuth realm usr :> api) tag = Dynamic t (Maybe BasicAuthData)
570+ -> Client t m api tag
572+ clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap authdata =
428− clientWithRoute (Proxy :: Proxy api) q req baseurl
573+ clientWithRouteAndResultHandler (Proxy :: Proxy api) q t req' baseurl opts wrap
575+ req' = req { authData = Just authdata }
430-- instance HasClient t m subapi =>
577-- instance HasClient t m subapi =>
431-- HasClient t m (WithNamedConfig name config subapi) where
578-- HasClient t m (WithNamedConfig name config subapi) where
@@ -449,3 +596,29 @@ non-empty lists, but is otherwise more specific, no instance will be overall
449more specific. This in turn generally means adding yet another instance (one
596more specific. This in turn generally means adding yet another instance (one
450for empty and one for non-empty lists).
597for empty and one for non-empty lists).
601+-- SUPPORT FOR servant-auth --
603+-- For JavaScript clients we should be sending/storing JSON web tokens in a
604+-- way that is inaccessible to JavaScript.
606+-- For @servant-auth@ this is done with HTTP-only cookies. In a Reflex-DOM
607+-- app this means the @servant-auth@ client should only verify that the API
608+-- supports Cookie-based authentication but do nothing with the token
611+-- @HasCookieAuth auths@ is nominally a redundant constraint, but ensures
612+-- we're not trying to rely on cookies when the API does not use them.
613+instance (HasCookieAuth auths, HasClient t m api tag) => HasClient t m (Auth.Auth auths a :> api) tag where
615+ type Client t m (Auth.Auth auths a :> api) tag = Client t m api tag
616+ clientWithRouteAndResultHandler Proxy = clientWithRouteAndResultHandler (Proxy :: Proxy api)
619+type family HasCookieAuth xs :: Constraint where
620+ HasCookieAuth (Auth.Cookie ': xs) = ()
621+ HasCookieAuth (x ': xs) = HasCookieAuth xs
622+ HasCookieAuth '[] = CookieAuthNotEnabled
624+class CookieAuthNotEnabled