@@ -1,23 +1,19 @@
1−{-# LANGUAGE AllowAmbiguousTypes #-}
2−{-# LANGUAGE CPP #-}
3−{-# LANGUAGE DataKinds #-}
4−{-# LANGUAGE FlexibleContexts #-}
5−{-# LANGUAGE FlexibleInstances #-}
6−{-# LANGUAGE GeneralizedNewtypeDeriving #-}
7−{-# LANGUAGE InstanceSigs #-}
8−{-# LANGUAGE MultiParamTypeClasses #-}
9−{-# LANGUAGE OverloadedStrings #-}
10−{-# LANGUAGE PolyKinds #-}
11−{-# LANGUAGE Rank2Types #-}
12−{-# LANGUAGE ScopedTypeVariables #-}
13−{-# LANGUAGE TupleSections #-}
14−{-# LANGUAGE TypeFamilies #-}
15−{-# LANGUAGE TypeOperators #-}
16−{-# LANGUAGE UndecidableInstances #-}
17−
18−#if MIN_VERSION_base(4,9,0)
19−{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
20−#endif
1+{-# LANGUAGE AllowAmbiguousTypes #-}
2+{-# LANGUAGE CPP #-}
3+{-# LANGUAGE DataKinds #-}
4+{-# LANGUAGE FlexibleContexts #-}
5+{-# LANGUAGE FlexibleInstances #-}
6+{-# LANGUAGE FunctionalDependencies #-}
7+{-# LANGUAGE GADTs #-}
8+{-# LANGUAGE InstanceSigs #-}
9+{-# LANGUAGE MultiParamTypeClasses #-}
10+{-# LANGUAGE OverloadedStrings #-}
11+{-# LANGUAGE PolyKinds #-}
12+{-# LANGUAGE ScopedTypeVariables #-}
13+{-# LANGUAGE TupleSections #-}
14+{-# LANGUAGE TypeFamilies #-}
15+{-# LANGUAGE TypeOperators #-}
16+{-# LANGUAGE UndecidableInstances #-}
2117
2218-- #include "overlapping-compat.h"
2319-- | This module provides 'client' which can automatically generate
@@ -25,70 +21,56 @@
2521-- API.
2622module Servant.Reflex
2723 ( client
28− , clientWithOpts
29− , clientWithOptsAndResultHandler
30− , clientWithRoute
31− , clientWithRouteAndResultHandler
3224 , BuildHeaderKeysTo(..)
3325 , toHeaders
34− , HasClient
35− , Client
26+ , HasClient(..)
3627 , module Servant.Common.Req
3728 , module Servant.Common.BaseUrl
3829 ) where
3930
4031------------------------------------------------------------------------------
4132import Control.Applicative
42−import qualified Data.CaseInsensitive as CI
33+import Data.CaseInsensitive (mk)
4334import Data.Functor.Identity
44−import qualified Data.Map as Map
45−import Data.Monoid ((<>))
46−import Data.Proxy (Proxy (..))
47−import qualified Data.Set as Set
48−import Data.Text (Text)
49−import qualified Data.Text as T
50−import qualified Data.Text.Encoding as E
51−import GHC.Exts (Constraint)
52−import GHC.TypeLits (KnownSymbol, symbolVal)
53−import Servant.API ((:<|>) (..), (:>), BasicAuth,
54− BasicAuthData, BuildHeadersTo (..),
55− Capture, Header, Headers (..),
56− HttpVersion, IsSecure,
57− MimeRender (..), MimeUnrender,
58− NoContent, QueryFlag, QueryParam',
59− QueryParams, Raw, ReflectMethod (..),
60− RemoteHost, ReqBody,
61− ToHttpApiData (..), Vault, Verb,
62− contentType)
63−import Servant.API.Description (Summary)
64−import qualified Servant.Auth as Auth
65−
66−import Reflex.Dom.Core (Dynamic, Event, Reflex,
67− XhrRequest (..), XhrResponse (..),
68− XhrResponseHeaders (..),
69− attachPromptlyDynWith, constDyn, ffor,
70− fmapMaybe, leftmost,
71− performRequestsAsync)
35+import qualified Data.Map as Map
36+import Data.Monoid ((<>))
37+import Data.Proxy (Proxy (..))
38+import qualified Data.Set as Set
39+import Data.Text (Text)
40+import qualified Data.Text as T
41+import qualified Data.Text.Encoding as E
42+import GHC.TypeLits
43+import Servant.API ((:<|>) (..), (:>), BasicAuth,
44+ BasicAuthData, BuildHeadersTo (..),
45+ Capture, Header, Headers (..),
46+ HttpVersion, IsSecure, MimeRender (..),
47+ MimeUnrender, NoContent, QueryFlag,
48+ QueryParam, QueryParams, Raw,
49+ ReflectMethod (..), RemoteHost,
50+ ReqBody, ToHttpApiData (..), Vault,
51+ Verb, contentType)
52+
53+import Reflex.Dom (Dynamic, Event, Reflex,
54+ XhrRequest (..), XhrResponse (..),
55+ XhrResponseHeaders (..),
56+ attachPromptlyDynWith, constDyn, ffor,
57+ fmapMaybe, leftmost,
58+ performRequestsAsync)
7259------------------------------------------------------------------------------
73−import Servant.Common.BaseUrl (BaseUrl(..), Scheme(..), baseUrlWidget,
74− showBaseUrl,
75− SupportsServantReflex)
76−import Servant.Common.Req (ClientOptions(..),
77− defaultClientOptions,
78− Req, ReqResult(..), QParam(..),
79− QueryPart(..), addHeader, authData,
80− defReq, evalResponse, prependToPathParts,
81− -- performRequestCT,
82− performRequestsCT,
83− -- performRequestNoBody,
84− performRequestsNoBody,
85− performSomeRequestsAsync,
86− qParamToQueryPart, reqBody,
87− reqSuccess, reqFailure,
88− reqMethod, respHeaders,
89− response,
90− reqTag,
91− qParams, withCredentials)
60+import Servant.Common.BaseUrl (BaseUrl (..), Scheme (..),
61+ SupportsServantReflex, baseUrlWidget,
62+ showBaseUrl)
63+import Servant.Common.Req (QParam (..), QueryPart (..), Req,
64+ ReqIO(..), ReqResult (..), addHeader, addHeaderIO,
65+ authData, defReq, evalResponse,
66+ performRequestsCT,
67+ performRequestsCTIO,
68+ performRequestsNoBody,
69+ performSomeRequestsAsync,
70+ prependToPathParts, prependToPathPartsIO, qParamToQueryPart,
71+ qParams, reqBody, reqFailure,
72+ reqMethod, reqSuccess, reqTag,
73+ respHeaders, response)
9274
9375
9476-- * Accessing APIs as a Client
@@ -103,75 +85,71 @@ import Servant.Common.Req (ClientOptions(..),
10385-- >
10486-- > getAllBooks :: Event t l -> m (Event t (l, ReqResult [Book]))
10587-- > postNewBook :: Dynamic t (Maybe Book) -> Event t l
106−-- > -> m (Event t (l, ReqResult Book)))
88+-- -> m (Event t (l, ReqResult Book)))
10789-- > (getAllBooks :<|> postNewBook) = client myApi host
10890-- > where host = constDyn $ BaseUrl Http "localhost" 8080
109−client
110− :: (HasClient t m layout tag)
111− => Proxy layout
112− -> Proxy m
113− -> Proxy tag
114− -> Dynamic t BaseUrl
115− -> Client t m layout tag
116−client p q t baseurl = clientWithRoute p q t defReq baseurl defaultClientOptions
117−
118−clientWithOpts
119− :: (HasClient t m layout tag)
120− => Proxy layout
121− -> Proxy m
122− -> Proxy tag
123− -> Dynamic t BaseUrl
124− -> ClientOptions
125− -> Client t m layout tag
126−clientWithOpts p q t baseurl = clientWithRoute p q t defReq baseurl
127−
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)
133− => Proxy layout
134− -> Proxy m
135− -> Proxy tag
136− -> Dynamic t BaseUrl
137− -> ClientOptions
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
91+client :: (HasClient t m layout tag)
92+ => Proxy layout -> Proxy m -> Proxy tag -> Dynamic t BaseUrl -> Client t m layout tag
93+client p q t = clientWithRoute p q t defReq
14194
14295
14396-- | This class lets us define how each API combinator
14497-- influences the creation of an HTTP request. It's mostly
14598-- an internal class, you can just use 'client'.
146−class Monad m => HasClient t m layout (tag :: *) where
99+class HasClient t m layout (tag :: *) | m -> t where
147100 type Client t m layout tag :: *
101+ type ClientIO m layout tag :: *
102+ type Inp m layout tag :: k
148103 clientWithRoute
149104 :: Proxy layout
150105 -> Proxy m
151106 -> Proxy tag
152107 -> Req t
153108 -> Dynamic t BaseUrl
154− -> ClientOptions
155109 -> Client t m layout tag
156− clientWithRoute l m t r b o = clientWithRouteAndResultHandler l m t r b o return
157−
158− clientWithRouteAndResultHandler
110+ clientWithRouteIO
159111 :: Proxy layout
160112 -> Proxy m
161113 -> Proxy tag
162− -> Req t
163− -> Dynamic t BaseUrl
164− -> ClientOptions
165− -> (forall a. Event t (ReqResult tag a) -> m (Event t (ReqResult tag a)))
166− -> Client t m layout tag
114+ -> ReqIO
115+ -> BaseUrl
116+ -> ClientIO m layout tag
117+
118+data HList :: [*] -> * where
119+ HNil :: HList '[]
120+ HCons :: a -> HList xs -> HList (a ': xs)
121+
122+
123+type family ToTuple xs :: *
124+
125+type instance ToTuple (HList '[]) = ()
126+type instance ToTuple (HList (a ': '[])) = a
127+type instance ToTuple (HList (a ': b ': '[])) = (a,b)
128+type instance ToTuple (HList (a ': b ': c ': '[])) = (a,b,c)
129+type instance ToTuple (HList (a ': b ': c ': d ': '[])) = (a,b,c,d)
130+type instance ToTuple (HList (a ': b ': c ': d ': e ': '[])) = (a,b,c,d,e)
131+type instance ToTuple (HList (a ': b ': c ': d ': e ': f ': '[])) = (a,b,c,d,e,f)
132+
133+type instance ToTuple (a :> ()) = a
134+type instance ToTuple (a :> b :> ()) = (a,b)
135+type instance ToTuple (a :> b :> c :> ()) = (a,b,c)
136+type instance ToTuple (a :> b :> c :> d :> ()) = (a,b,c,d)
137+type instance ToTuple (a :> b :> c :> d :> e :> ()) = (a,b,c,d,e)
138+type instance ToTuple (a :> b :> c :> d :> e :> f :> ()) = (a,b,c,d,e,f)
167139
168140
169141instance (HasClient t m a tag, HasClient t m b tag) => HasClient t m (a :<|> b) tag where
170142 type Client t m (a :<|> b) tag = Client t m a tag :<|> Client t m b tag
143+ type Inp m (a :<|> b) tag = Inp m a tag :<|> Inp m b tag
144+ type ClientIO m (a :<|> b) tag = ClientIO m a tag :<|> ClientIO m b tag
171145
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
146+ clientWithRoute Proxy q pTag req baseurl =
147+ clientWithRoute (Proxy :: Proxy a) q pTag req baseurl :<|>
148+ clientWithRoute (Proxy :: Proxy b) q pTag req baseurl
149+
150+ clientWithRouteIO Proxy q pTag req baseurl =
151+ clientWithRouteIO (Proxy :: Proxy a) q pTag req baseurl :<|>
152+ clientWithRouteIO (Proxy :: Proxy b) q pTag req baseurl
175153
176154
177155-- Capture. Example:
@@ -192,10 +170,26 @@ instance (SupportsServantReflex t m, ToHttpApiData a, HasClient t m sublayout ta
192170 type Client t m (Capture capture a :> sublayout) tag =
193171 Dynamic t (Either Text a) -> Client t m sublayout tag
194172
195− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap val =
196− clientWithRouteAndResultHandler
197− (Proxy :: Proxy sublayout) q t (prependToPathParts p req) baseurl opts wrap
198− where p = (fmap . fmap) (toUrlPiece) val
173+ -- type ClientIO m (Capture capture a :> sublayout) tag =
174+ -- ToTuple (Inp m (Capture capture a :> sublayout) -> ClientIO m sublayout tag
175+
176+ -- type Inp m (Capture capture a :> sublayout) tag =
177+ -- a :> Inp m sublayout tag
178+
179+ clientWithRoute Proxy q t req baseurl val =
180+ clientWithRoute (Proxy :: Proxy sublayout)
181+ q t
182+ (prependToPathParts p req)
183+ baseurl
184+ where p = (fmap . fmap) toUrlPiece val
185+
186+ -- clientWithRouteIO Proxy q t req baseurl val =
187+ -- clientWithRouteIO (Proxy :: Proxy sublayout)
188+ -- q t
189+ -- req
190+ -- -- (prependToPathPartsIO p req)
191+ -- baseurl
192+ -- where p = toUrlPiece val
199193
200194
201195-- VERB (Returning content) --
@@ -203,15 +197,26 @@ instance {-# OVERLAPPABLE #-}
203197 -- Note [Non-Empty Content Types]
204198 (MimeUnrender ct a, ReflectMethod method, cts' ~ (ct ': cts), SupportsServantReflex t m
205199 ) => HasClient t m (Verb method status cts' a) tag where
200+
206201 type Client t m (Verb method status cts' a) tag =
207202 Event t tag -> m (Event t (ReqResult tag a))
203+
204+ type ClientIO m (Verb method status cts' a) tag =
205+ tag -> m (ReqResult tag a)
206+
208207 -- TODO how to access input types here?
209208 -- ExceptT ServantError IO a
210− clientWithRouteAndResultHandler Proxy _ _ req baseurl opts wrap trigs =
211− wrap =<< fmap runIdentity <$> performRequestsCT (Proxy :: Proxy ct) method (constDyn $ Identity $ req') baseurl opts trigs
209+ clientWithRoute Proxy _ _ req baseurl trigs =
210+ -- performRequestCT (Proxy :: Proxy ct) method req' baseurl trigs
211+ fmap runIdentity <$> performRequestsCT (Proxy :: Proxy ct) method (constDyn $ Identity req') baseurl trigs
212212 where method = E.decodeUtf8 $ reflectMethod (Proxy :: Proxy method)
213213 req' = req { reqMethod = method }
214214
215+ -- clientWithRouteIO Proxy _ _ req baseurl tag =
216+ -- performRequestsCTIO (Proxy :: Proxy ct) method (constDyn $ Identity req') baseurl tag
217+ -- where method = E.decodeUtf8 $ reflectMethod (Proxy :: Proxy method)
218+ -- req' = req { reqMethodIO = method }
219+
215220
216221-- -- VERB (No content) --
217222instance {-# OVERLAPPING #-}
@@ -221,33 +226,29 @@ instance {-# OVERLAPPING #-}
221226 Event t tag -> m (Event t (ReqResult tag NoContent))
222227 -- TODO: how to access input types here?
223228 -- ExceptT ServantError IO NoContent
224− clientWithRouteAndResultHandler Proxy _ _ req baseurl opts wrap trigs =
225− wrap =<< fmap runIdentity <$> performRequestsNoBody method (constDyn $ Identity req) baseurl opts trigs
229+ clientWithRoute Proxy _ _ req baseurl =
230+ (fmap . fmap) runIdentity . performRequestsNoBody method (constDyn $ Identity req) baseurl
226231 where method = E.decodeUtf8 $ reflectMethod (Proxy :: Proxy method)
227232
228233
229234toHeaders :: BuildHeadersTo ls => ReqResult tag a -> ReqResult tag (Headers ls a)
230235toHeaders r =
231− let hdrs = maybe []
232− (\xhr -> fmap (\(h,v) -> (CI.map E.encodeUtf8 h, E.encodeUtf8 v))
236+ let toBS = E.encodeUtf8
237+ hdrs = maybe []
238+ (\xhr -> fmap (\(h,v) -> (mk (toBS h), toBS v))
233239 (Map.toList $ _xhrResponse_headers xhr))
234240 (response r)
235241 in ffor r $ \a -> Headers {getResponse = a ,getHeadersHList = buildHeadersTo hdrs}
236242
237−
238243class BuildHeaderKeysTo hs where
239− buildHeaderKeysTo :: Proxy hs -> [CI.CI T.Text]
244+ buildHeaderKeysTo :: Proxy hs -> [T.Text]
240245
241246instance {-# OVERLAPPABLE #-} BuildHeaderKeysTo '[]
242247 where buildHeaderKeysTo _ = []
243248
244249instance {-# OVERLAPPABLE #-} (BuildHeaderKeysTo xs, KnownSymbol h)
245250 => BuildHeaderKeysTo ((Header h v) ': xs) where
246− buildHeaderKeysTo _ =
247− let
248− thisKey = CI.mk $ T.pack (symbolVal (Proxy :: Proxy h))
249− in thisKey : buildHeaderKeysTo (Proxy :: Proxy xs)
250−
251+ buildHeaderKeysTo _ = T.pack (symbolVal (Proxy :: Proxy h)) : buildHeaderKeysTo (Proxy :: Proxy xs)
251252
252253-- HEADERS Verb (Content) --
253254-- Headers combinator not treated in fully general case,
@@ -262,10 +263,10 @@ instance {-# OVERLAPPABLE #-}
262263 ) => HasClient t m (Verb method status cts' (Headers ls a)) tag where
263264 type Client t m (Verb method status cts' (Headers ls a)) tag =
264265 Event t tag -> m (Event t (ReqResult tag (Headers ls a)))
265− clientWithRouteAndResultHandler Proxy _ _ req baseurl opts wrap trigs = do
266+ clientWithRoute Proxy _ _ req baseurl trigs = do
266267 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
268+ resp <- fmap runIdentity <$> performRequestsCT (Proxy :: Proxy ct) method (constDyn $ Identity req') baseurl trigs
269+ return $ toHeaders <$> resp
269270 where req' = req { respHeaders =
270271 OnlyHeaders (Set.fromList (buildHeaderKeysTo (Proxy :: Proxy ls)))
271272 }
@@ -278,10 +279,10 @@ instance {-# OVERLAPPABLE #-}
278279 ) => HasClient t m (Verb method status cts (Headers ls NoContent)) tag where
279280 type Client t m (Verb method status cts (Headers ls NoContent)) tag
280281 = Event t tag -> m (Event t (ReqResult tag (Headers ls NoContent)))
281− clientWithRouteAndResultHandler Proxy _ _ req baseurl opts wrap trigs = do
282+ clientWithRoute Proxy _ _ req baseurl trigs = do
282283 let method = E.decodeUtf8 $ reflectMethod (Proxy :: Proxy method)
283− resp <- fmap runIdentity <$> performRequestsNoBody method (constDyn $ Identity req') baseurl opts trigs
284− wrap $ toHeaders <$> resp
284+ resp <- fmap runIdentity <$> performRequestsNoBody method (constDyn $ Identity req') baseurl trigs
285+ return $ toHeaders <$> resp
285286 where req' = req {respHeaders =
286287 OnlyHeaders (Set.fromList (buildHeaderKeysTo (Proxy :: Proxy ls)))
287288 }
@@ -308,13 +309,20 @@ instance (KnownSymbol sym, ToHttpApiData a,
308309 type Client t m (Header sym a :> sublayout) tag =
309310 Dynamic t (Either Text a) -> Client t m sublayout tag
310311
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)
315− baseurl opts wrap
312+ clientWithRoute Proxy q t req baseurl eVal =
313+ clientWithRoute (Proxy :: Proxy sublayout)
314+ q t
315+ (Servant.Common.Req.addHeader hname eVal req)
316+ baseurl
316317 where hname = T.pack $ symbolVal (Proxy :: Proxy sym)
317318
319+ -- clientWithRouteIO Proxy q t req baseurl eVal =
320+ -- clientWithRouteIO (Proxy :: Proxy sublayout)
321+ -- q t
322+ -- (Servant.Common.Req.addHeaderIO hname eVal req)
323+ -- baseurl
324+ -- where hname = T.pack $ symbolVal (Proxy :: Proxy sym)
325+
318326
319327
320328
@@ -326,21 +334,8 @@ instance HasClient t m sublayout tag
326334 type Client t m (HttpVersion :> sublayout) tag =
327335 Client t m sublayout tag
328336
329− clientWithRouteAndResultHandler Proxy =
330− clientWithRouteAndResultHandler (Proxy :: Proxy sublayout)
331−
332−-- | Using a 'Summary' combinator in your API doesn't affect the client
333−-- functions.
334−instance (HasClient t m sublayout tag, KnownSymbol sym)
335− => HasClient t m (Summary sym :> sublayout) tag where
336−
337− type Client t m (Summary sym :> sublayout) tag =
338− Client t m sublayout tag
339−
340− clientWithRouteAndResultHandler Proxy =
341− clientWithRouteAndResultHandler (Proxy :: Proxy sublayout)
342−
343−
337+ clientWithRoute Proxy =
338+ clientWithRoute (Proxy :: Proxy sublayout)
344339
345340
346341-- | If you use a 'QueryParam' in one of your endpoints in your API,
@@ -370,15 +365,15 @@ instance (HasClient t m sublayout tag, KnownSymbol sym)
370365-- > -- 'getBooksBy Nothing' for all books
371366-- > -- 'getBooksBy (Just "Isaac Asimov")' to get all books by Isaac Asimov
372367instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout tag, Reflex t)
373− => HasClient t m (QueryParam' mods sym a :> sublayout) tag where
368+ => HasClient t m (QueryParam sym a :> sublayout) tag where
374369
375− type Client t m (QueryParam' mods sym a :> sublayout) tag =
370+ type Client t m (QueryParam sym a :> sublayout) tag =
376371 Dynamic t (QParam a) -> Client t m sublayout tag
377372
378373 -- if mparam = Nothing, we don't add it to the query string
379− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap mparam =
380− clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t
381− (req {qParams = paramPair : qParams req}) baseurl opts wrap
374+ clientWithRoute Proxy q t req baseurl mparam =
375+ clientWithRoute (Proxy :: Proxy sublayout) q t
376+ (req {qParams = paramPair : qParams req}) baseurl
382377
383378 where pname = symbolVal (Proxy :: Proxy sym)
384379 --p prm = QueryPartParam $ (fmap . fmap) (toQueryParam) prm
@@ -422,8 +417,8 @@ instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout tag, Reflex
422417 type Client t m (QueryParams sym a :> sublayout) tag =
423418 Dynamic t [a] -> Client t m sublayout tag
424419
425− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap paramlist =
426− clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t req' baseurl opts wrap
420+ clientWithRoute Proxy q t req baseurl paramlist =
421+ clientWithRoute (Proxy :: Proxy sublayout) q t req' baseurl
427422
428423 where req' = req { qParams = (T.pack pname, params') : qParams req }
429424 pname = symbolVal (Proxy :: Proxy sym)
@@ -462,8 +457,8 @@ instance (KnownSymbol sym, HasClient t m sublayout tag, Reflex t)
462457 type Client t m (QueryFlag sym :> sublayout) tag =
463458 Dynamic t Bool -> Client t m sublayout tag
464459
465− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap flag =
466− clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t req' baseurl opts wrap
460+ clientWithRoute Proxy q t req baseurl flag =
461+ clientWithRoute (Proxy :: Proxy sublayout) q t req' baseurl
467462
468463 where req' = req { qParams = thisPair : qParams req }
469464 thisPair = (T.pack pName, QueryPartFlag flag) :: (Text, QueryPart t)
@@ -477,7 +472,7 @@ instance SupportsServantReflex t m => HasClient t m Raw tag where
477472 -> Event t tag
478473 -> m (Event t (ReqResult tag ()))
479474
480− clientWithRouteAndResultHandler _ _ _ _ baseurl _ wrap xhrs triggers = do
475+ clientWithRoute _ _ _ _ baseurl xhrs triggers = do
481476
482477 let xhrs' = liftA2 (\x path -> case x of
483478 Left e -> Left e
@@ -488,7 +483,7 @@ instance SupportsServantReflex t m => HasClient t m Raw tag where
488483 okReq = fmapMaybe (\(t,x) -> either (const Nothing) (Just . (t,)) x) xhrs'' :: Event t (tag, XhrRequest ())
489484
490485 resps <- performRequestsAsync okReq
491− wrap $ leftmost [ uncurry RequestFailure <$> badReq
486+ return $ leftmost [ uncurry RequestFailure <$> badReq
492487 , evalResponse (const $ Right ()) <$> resps
493488 ]
494489
@@ -519,8 +514,8 @@ instance (MimeRender ct a, HasClient t m sublayout tag, Reflex t)
519514 type Client t m (ReqBody (ct ': cts) a :> sublayout) tag =
520515 Dynamic t (Either Text a) -> Client t m sublayout tag
521516
522− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap body =
523− clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t req' baseurl opts wrap
517+ clientWithRoute Proxy q t req baseurl body =
518+ clientWithRoute (Proxy :: Proxy sublayout) q t req' baseurl
524519 where req' = req { reqBody = bodyBytesCT }
525520 ctProxy = Proxy :: Proxy ct
526521 ctString = T.pack $ show $ contentType ctProxy
@@ -534,9 +529,9 @@ instance (MimeRender ct a, HasClient t m sublayout tag, Reflex t)
534529instance (KnownSymbol path, HasClient t m sublayout tag, Reflex t) => HasClient t m (path :> sublayout) tag where
535530 type Client t m (path :> sublayout) tag = Client t m sublayout tag
536531
537− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap =
538− clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t
539− (prependToPathParts (pure (Right $ T.pack p)) req) baseurl opts wrap
532+ clientWithRoute Proxy q t req =
533+ clientWithRoute (Proxy :: Proxy sublayout) q t
534+ (prependToPathParts (pure (Right $ T.pack p)) req)
540535
541536 where p = symbolVal (Proxy :: Proxy path)
542537
@@ -544,23 +539,23 @@ instance (KnownSymbol path, HasClient t m sublayout tag, Reflex t) => HasClient
544539instance HasClient t m api tag => HasClient t m (Vault :> api) tag where
545540 type Client t m (Vault :> api) tag = Client t m api tag
546541
547− clientWithRouteAndResultHandler Proxy =
548− clientWithRouteAndResultHandler (Proxy :: Proxy api)
542+ clientWithRoute Proxy =
543+ clientWithRoute (Proxy :: Proxy api)
549544
550545
551546instance HasClient t m api tag => HasClient t m (RemoteHost :> api) tag where
552547 type Client t m (RemoteHost :> api) tag = Client t m api tag
553548
554− clientWithRouteAndResultHandler Proxy =
555− clientWithRouteAndResultHandler (Proxy :: Proxy api)
549+ clientWithRoute Proxy =
550+ clientWithRoute (Proxy :: Proxy api)
556551
557552
558553
559554instance HasClient t m api tag => HasClient t m (IsSecure :> api) tag where
560555 type Client t m (IsSecure :> api) tag = Client t m api tag
561556
562− clientWithRouteAndResultHandler Proxy =
563− clientWithRouteAndResultHandler (Proxy :: Proxy api)
557+ clientWithRoute Proxy =
558+ clientWithRoute (Proxy :: Proxy api)
564559
565560
566561instance (HasClient t m api tag, Reflex t)
@@ -569,8 +564,8 @@ instance (HasClient t m api tag, Reflex t)
569564 type Client t m (BasicAuth realm usr :> api) tag = Dynamic t (Maybe BasicAuthData)
570565 -> Client t m api tag
571566
572− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap authdata =
573− clientWithRouteAndResultHandler (Proxy :: Proxy api) q t req' baseurl opts wrap
567+ clientWithRoute Proxy q t req baseurl authdata =
568+ clientWithRoute (Proxy :: Proxy api) q t req' baseurl
574569 where
575570 req' = req { authData = Just authdata }
576571
@@ -596,29 +591,3 @@ non-empty lists, but is otherwise more specific, no instance will be overall
596591more specific. This in turn generally means adding yet another instance (one
597592for empty and one for non-empty lists).
598593-}
599−
600−
601−-- SUPPORT FOR servant-auth --
602−
603−-- For JavaScript clients we should be sending/storing JSON web tokens in a
604−-- way that is inaccessible to JavaScript.
605−--
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
609−-- directly.
610−
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
614−
615− type Client t m (Auth.Auth auths a :> api) tag = Client t m api tag
616− clientWithRouteAndResultHandler Proxy = clientWithRouteAndResultHandler (Proxy :: Proxy api)
617−
618−
619−type family HasCookieAuth xs :: Constraint where
620− HasCookieAuth (Auth.Cookie ': xs) = ()
621− HasCookieAuth (x ': xs) = HasCookieAuth xs
622− HasCookieAuth '[] = CookieAuthNotEnabled
623−
624−class CookieAuthNotEnabled