@@ -1,17 +1,23 @@
1−{-# LANGUAGE AllowAmbiguousTypes #-}
2−{-# LANGUAGE CPP #-}
3−{-# LANGUAGE DataKinds #-}
4−{-# LANGUAGE FlexibleContexts #-}
5−{-# LANGUAGE FlexibleInstances #-}
6−{-# LANGUAGE InstanceSigs #-}
7−{-# LANGUAGE OverloadedStrings #-}
8−{-# LANGUAGE PolyKinds #-}
9−{-# LANGUAGE ScopedTypeVariables #-}
10−{-# LANGUAGE TupleSections #-}
11−{-# LANGUAGE TypeFamilies #-}
12−{-# LANGUAGE TypeOperators #-}
13−{-# LANGUAGE UndecidableInstances #-}
14−{-# LANGUAGE MultiParamTypeClasses #-}
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
1521
1622-- #include "overlapping-compat.h"
1723-- | This module provides 'client' which can automatically generate
@@ -19,56 +25,71 @@
1925-- API.
2026module Servant.Reflex
2127 ( client
28+ , clientWithOpts
29+ , clientWithOptsAndResultHandler
30+ , clientWithRoute
31+ , clientWithRouteAndResultHandler
2232 , BuildHeaderKeysTo(..)
2333 , toHeaders
24− , HasClient(..)
34+ , HasClient
35+ , Client
2536 , module Servant.Common.Req
2637 , module Servant.Common.BaseUrl
2738 ) where
2839
2940------------------------------------------------------------------------------
3041import Control.Applicative
42+import qualified Data.CaseInsensitive as CI
43+import Data.Functor.Identity
44+import qualified Data.Map as Map
3145import Data.Monoid ((<>))
32−import qualified Data.Set as Set
33−import qualified Data.Text.Encoding as E
34−import Data.CaseInsensitive (mk)
3546import Data.Proxy (Proxy (..))
36−import qualified Data.Map as Map
47+import qualified Data.Set as Set
3748import Data.Text (Text)
3849import qualified Data.Text as T
50+import qualified Data.Text.Encoding as E
51+import GHC.Exts (Constraint)
3952import GHC.TypeLits (KnownSymbol, symbolVal)
40−import Servant.API ((:<|>)(..),(:>), BasicAuth,
41− BasicAuthData, BuildHeadersTo(..),
42− Capture, contentType, Header,
43− Headers(..), HttpVersion, IsSecure,
44− MimeRender(..), MimeUnrender,
45− NoContent, QueryFlag, QueryParam,
46− QueryParams, Raw, ReflectMethod(..),
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 (..),
4760 RemoteHost, ReqBody,
48− ToHttpApiData(..), Vault, Verb)
49−
50−import Reflex.Dom (Dynamic, Event, Reflex,
51− XhrRequest(..),
52− XhrResponseHeaders(..),
53− XhrResponse(..), attachPromptlyDynWith, ffor, fmapMaybe,
54− leftmost, performRequestsAsync,
55− )
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)
5672------------------------------------------------------------------------------
5773import Servant.Common.BaseUrl (BaseUrl(..), Scheme(..), baseUrlWidget,
5874 showBaseUrl,
5975 SupportsServantReflex)
60−import Servant.Common.Req (Req, ReqResult(..), QParam(..),
76+import Servant.Common.Req (ClientOptions(..),
77+ defaultClientOptions,
78+ Req, ReqResult(..), QParam(..),
6179 QueryPart(..), addHeader, authData,
62− defReq, prependToPathParts,
63− performRequestCT,
80+ defReq, evalResponse, prependToPathParts,
81+ -- performRequestCT,
6482 performRequestsCT,
65− performRequestNoBody,
83+ -- performRequestNoBody,
6684 performRequestsNoBody,
6785 performSomeRequestsAsync,
6886 qParamToQueryPart, reqBody,
6987 reqSuccess, reqFailure,
70− reqMethod, respHeaders, response,
71− qParams)
88+ reqMethod, respHeaders,
89+ response,
90+ reqTag,
91+ qParams, withCredentials)
92+
7293
7394-- * Accessing APIs as a Client
7495
@@ -82,28 +103,75 @@ import Servant.Common.Req (Req, ReqResult(..), QParam(..),
82103-- >
83104-- > getAllBooks :: Event t l -> m (Event t (l, ReqResult [Book]))
84105-- > postNewBook :: Dynamic t (Maybe Book) -> Event t l
85−-- -> m (Event t (l, ReqResult Book)))
106+-- > -> m (Event t (l, ReqResult Book)))
86107-- > (getAllBooks :<|> postNewBook) = client myApi host
87108-- > where host = constDyn $ BaseUrl Http "localhost" 8080
88−client :: (HasClient t m layout tag)
89− => Proxy layout -> Proxy m -> Proxy tag -> Dynamic t BaseUrl -> Client t m layout tag
90−client p q t baseurl = clientWithRoute p q t defReq baseurl
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
91141
92142
93143-- | This class lets us define how each API combinator
94144-- influences the creation of an HTTP request. It's mostly
95145-- an internal class, you can just use 'client'.
96−class HasClient t m layout (tag :: *) where
146+class Monad m => HasClient t m layout (tag :: *) where
97147 type Client t m layout tag :: *
98− clientWithRoute :: Proxy layout -> Proxy m -> Proxy tag -> Req t -> Dynamic t BaseUrl -> Client t m layout tag
148+ clientWithRoute
149+ :: Proxy layout
150+ -> Proxy m
151+ -> Proxy tag
152+ -> Req t
153+ -> Dynamic t BaseUrl
154+ -> ClientOptions
155+ -> Client t m layout tag
156+ clientWithRoute l m t r b o = clientWithRouteAndResultHandler l m t r b o return
157+
158+ clientWithRouteAndResultHandler
159+ :: Proxy layout
160+ -> Proxy m
161+ -> 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
99167
100168
101169instance (HasClient t m a tag, HasClient t m b tag) => HasClient t m (a :<|> b) tag where
102170 type Client t m (a :<|> b) tag = Client t m a tag :<|> Client t m b tag
103171
104− clientWithRoute Proxy q pTag req baseurl =
105− clientWithRoute (Proxy :: Proxy a) q pTag req baseurl :<|>
106− clientWithRoute (Proxy :: Proxy b) q pTag req baseurl
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
107175
108176
109177-- Capture. Example:
@@ -124,11 +192,9 @@ instance (SupportsServantReflex t m, ToHttpApiData a, HasClient t m sublayout ta
124192 type Client t m (Capture capture a :> sublayout) tag =
125193 Dynamic t (Either Text a) -> Client t m sublayout tag
126194
127− clientWithRoute Proxy q t req baseurl val =
128− clientWithRoute (Proxy :: Proxy sublayout)
129− q t
130− (prependToPathParts p req)
131− baseurl
195+ clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap val =
196+ clientWithRouteAndResultHandler
197+ (Proxy :: Proxy sublayout) q t (prependToPathParts p req) baseurl opts wrap
132198 where p = (fmap . fmap) (toUrlPiece) val
133199
134200
@@ -138,11 +204,11 @@ instance {-# OVERLAPPABLE #-}
138204 (MimeUnrender ct a, ReflectMethod method, cts' ~ (ct ': cts), SupportsServantReflex t m
139205 ) => HasClient t m (Verb method status cts' a) tag where
140206 type Client t m (Verb method status cts' a) tag =
141− Event t tag -> m (Event t (tag, ReqResult a))
207+ Event t tag -> m (Event t (ReqResult tag a))
142208 -- TODO how to access input types here?
143209 -- ExceptT ServantError IO a
144− clientWithRoute Proxy _ _ req baseurl trigs =
145− performRequestCT (Proxy :: Proxy ct) method req' baseurl trigs
210+ clientWithRouteAndResultHandler Proxy _ _ req baseurl opts wrap trigs =
211+ wrap =<< fmap runIdentity <$> performRequestsCT (Proxy :: Proxy ct) method (constDyn $ Identity $ req') baseurl opts trigs
146212 where method = E.decodeUtf8 $ reflectMethod (Proxy :: Proxy method)
147213 req' = req { reqMethod = method }
148214
@@ -152,32 +218,36 @@ instance {-# OVERLAPPING #-}
152218 (ReflectMethod method, SupportsServantReflex t m) =>
153219 HasClient t m (Verb method status cts NoContent) tag where
154220 type Client t m (Verb method status cts NoContent) tag =
155− Event t tag -> m (Event t (tag, ReqResult NoContent))
221+ Event t tag -> m (Event t (ReqResult tag NoContent))
156222 -- TODO: how to access input types here?
157223 -- ExceptT ServantError IO NoContent
158− clientWithRoute Proxy _ _ req baseurl =
159− performRequestNoBody method req baseurl
224+ clientWithRouteAndResultHandler Proxy _ _ req baseurl opts wrap trigs =
225+ wrap =<< fmap runIdentity <$> performRequestsNoBody method (constDyn $ Identity req) baseurl opts trigs
160226 where method = E.decodeUtf8 $ reflectMethod (Proxy :: Proxy method)
161227
162228
163−toHeaders :: BuildHeadersTo ls => ReqResult a -> ReqResult (Headers ls a)
229+toHeaders :: BuildHeadersTo ls => ReqResult tag a -> ReqResult tag (Headers ls a)
164230toHeaders r =
165− let toBS = E.encodeUtf8
166− hdrs = maybe []
167− (\xhr -> fmap (\(h,v) -> (mk (toBS h), toBS v))
231+ let hdrs = maybe []
232+ (\xhr -> fmap (\(h,v) -> (CI.map E.encodeUtf8 h, E.encodeUtf8 v))
168233 (Map.toList $ _xhrResponse_headers xhr))
169234 (response r)
170235 in ffor r $ \a -> Headers {getResponse = a ,getHeadersHList = buildHeadersTo hdrs}
171236
237+
172238class BuildHeaderKeysTo hs where
173− buildHeaderKeysTo :: Proxy hs -> [T.Text]
239+ buildHeaderKeysTo :: Proxy hs -> [CI.CI T.Text]
174240
175241instance {-# OVERLAPPABLE #-} BuildHeaderKeysTo '[]
176242 where buildHeaderKeysTo _ = []
177243
178244instance {-# OVERLAPPABLE #-} (BuildHeaderKeysTo xs, KnownSymbol h)
179− => BuildHeaderKeysTo '[(Header h v) ': xs] where
180− buildHeaderKeysTo _ = (T.pack $ symbolVal (Proxy :: Proxy h)) : buildHeaderKeysTo (Proxy :: Proxy xs)
245+ => 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+
181251
182252-- HEADERS Verb (Content) --
183253-- Headers combinator not treated in fully general case,
@@ -191,11 +261,11 @@ instance {-# OVERLAPPABLE #-}
191261 SupportsServantReflex t m
192262 ) => HasClient t m (Verb method status cts' (Headers ls a)) tag where
193263 type Client t m (Verb method status cts' (Headers ls a)) tag =
194− Event t tag -> m (Event t (tag, ReqResult (Headers ls a)))
195− clientWithRoute Proxy _ _ req baseurl = do
264+ Event t tag -> m (Event t (ReqResult tag (Headers ls a)))
265+ clientWithRouteAndResultHandler Proxy _ _ req baseurl opts wrap trigs = do
196266 let method = E.decodeUtf8 $ reflectMethod (Proxy :: Proxy method)
197− resp <- performRequestCT (Proxy :: Proxy ct) method req' baseurl
198− return $ (fmap . fmap) toHeaders <$> resp
267+ resp <- fmap runIdentity <$> performRequestsCT (Proxy :: Proxy ct) method (constDyn $ Identity req') baseurl opts trigs
268+ wrap $ toHeaders <$> resp
199269 where req' = req { respHeaders =
200270 OnlyHeaders (Set.fromList (buildHeaderKeysTo (Proxy :: Proxy ls)))
201271 }
@@ -207,11 +277,11 @@ instance {-# OVERLAPPABLE #-}
207277 SupportsServantReflex t m
208278 ) => HasClient t m (Verb method status cts (Headers ls NoContent)) tag where
209279 type Client t m (Verb method status cts (Headers ls NoContent)) tag
210− = Event t tag -> m (Event t (tag, ReqResult (Headers ls NoContent)))
211− clientWithRoute Proxy _ _ req baseurl = do
280+ = Event t tag -> m (Event t (ReqResult tag (Headers ls NoContent)))
281+ clientWithRouteAndResultHandler Proxy _ _ req baseurl opts wrap trigs = do
212282 let method = E.decodeUtf8 $ reflectMethod (Proxy :: Proxy method)
213− resp <- performRequestNoBody method req' baseurl
214− return $ (fmap . fmap) toHeaders <$> resp
283+ resp <- fmap runIdentity <$> performRequestsNoBody method (constDyn $ Identity req') baseurl opts trigs
284+ wrap $ toHeaders <$> resp
215285 where req' = req {respHeaders =
216286 OnlyHeaders (Set.fromList (buildHeaderKeysTo (Proxy :: Proxy ls)))
217287 }
@@ -238,11 +308,11 @@ instance (KnownSymbol sym, ToHttpApiData a,
238308 type Client t m (Header sym a :> sublayout) tag =
239309 Dynamic t (Either Text a) -> Client t m sublayout tag
240310
241− clientWithRoute Proxy q t req baseurl eVal =
242− clientWithRoute (Proxy :: Proxy sublayout)
243− q t
244− (Servant.Common.Req.addHeader hname eVal req)
245− baseurl
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
246316 where hname = T.pack $ symbolVal (Proxy :: Proxy sym)
247317
248318
@@ -256,8 +326,20 @@ instance HasClient t m sublayout tag
256326 type Client t m (HttpVersion :> sublayout) tag =
257327 Client t m sublayout tag
258328
259− clientWithRoute Proxy q t =
260− clientWithRoute (Proxy :: Proxy sublayout) q t
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+
261343
262344
263345
@@ -288,15 +370,15 @@ instance HasClient t m sublayout tag
288370-- > -- 'getBooksBy Nothing' for all books
289371-- > -- 'getBooksBy (Just "Isaac Asimov")' to get all books by Isaac Asimov
290372instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout tag, Reflex t)
291− => HasClient t m (QueryParam sym a :> sublayout) tag where
373+ => HasClient t m (QueryParam' mods sym a :> sublayout) tag where
292374
293− type Client t m (QueryParam sym a :> sublayout) tag =
375+ type Client t m (QueryParam' mods sym a :> sublayout) tag =
294376 Dynamic t (QParam a) -> Client t m sublayout tag
295377
296378 -- if mparam = Nothing, we don't add it to the query string
297− clientWithRoute Proxy q t req baseurl mparam =
298− clientWithRoute (Proxy :: Proxy sublayout) q t
299− (req {qParams = paramPair : qParams req}) baseurl
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
300382
301383 where pname = symbolVal (Proxy :: Proxy sym)
302384 --p prm = QueryPartParam $ (fmap . fmap) (toQueryParam) prm
@@ -340,12 +422,12 @@ instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout tag, Reflex
340422 type Client t m (QueryParams sym a :> sublayout) tag =
341423 Dynamic t [a] -> Client t m sublayout tag
342424
343− clientWithRoute Proxy q t req baseurl paramlist =
344− clientWithRoute (Proxy :: Proxy sublayout) q t req' baseurl
425+ clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap paramlist =
426+ clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t req' baseurl opts wrap
345427
346428 where req' = req { qParams = (T.pack pname, params') : qParams req }
347429 pname = symbolVal (Proxy :: Proxy sym)
348− params' = QueryPartParams $ (fmap . fmap) (toQueryParam)
430+ params' = QueryPartParams $ (fmap . fmap) toQueryParam
349431 paramlist
350432
351433
@@ -380,8 +462,8 @@ instance (KnownSymbol sym, HasClient t m sublayout tag, Reflex t)
380462 type Client t m (QueryFlag sym :> sublayout) tag =
381463 Dynamic t Bool -> Client t m sublayout tag
382464
383− clientWithRoute Proxy q t req baseurl flag =
384− clientWithRoute (Proxy :: Proxy sublayout) q t req' baseurl
465+ clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap flag =
466+ clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t req' baseurl opts wrap
385467
386468 where req' = req { qParams = thisPair : qParams req }
387469 thisPair = (T.pack pName, QueryPartFlag flag) :: (Text, QueryPart t)
@@ -393,9 +475,9 @@ instance (KnownSymbol sym, HasClient t m sublayout tag, Reflex t)
393475instance SupportsServantReflex t m => HasClient t m Raw tag where
394476 type Client t m Raw tag = Dynamic t (Either Text (XhrRequest ()))
395477 -> Event t tag
396− -> m (Event t (tag, ReqResult ()))
478+ -> m (Event t (ReqResult tag ()))
397479
398− clientWithRoute _ _ _ _ baseurl xhrs triggers = do
480+ clientWithRouteAndResultHandler _ _ _ _ baseurl _ wrap xhrs triggers = do
399481
400482 let xhrs' = liftA2 (\x path -> case x of
401483 Left e -> Left e
@@ -406,8 +488,9 @@ instance SupportsServantReflex t m => HasClient t m Raw tag where
406488 okReq = fmapMaybe (\(t,x) -> either (const Nothing) (Just . (t,)) x) xhrs'' :: Event t (tag, XhrRequest ())
407489
408490 resps <- performRequestsAsync okReq
409− return $ leftmost [ fmap (ResponseSuccess ()) <$> resps
410− , fmap (RequestFailure) <$> badReq ]
491+ wrap $ leftmost [ uncurry RequestFailure <$> badReq
492+ , evalResponse (const $ Right ()) <$> resps
493+ ]
411494
412495
413496-- | If you use a 'ReqBody' in one of your endpoints in your API,
@@ -436,8 +519,8 @@ instance (MimeRender ct a, HasClient t m sublayout tag, Reflex t)
436519 type Client t m (ReqBody (ct ': cts) a :> sublayout) tag =
437520 Dynamic t (Either Text a) -> Client t m sublayout tag
438521
439− clientWithRoute Proxy q t req baseurl body =
440− clientWithRoute (Proxy :: Proxy sublayout) q t req' baseurl
522+ clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap body =
523+ clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t req' baseurl opts wrap
441524 where req' = req { reqBody = bodyBytesCT }
442525 ctProxy = Proxy :: Proxy ct
443526 ctString = T.pack $ show $ contentType ctProxy
@@ -451,10 +534,9 @@ instance (MimeRender ct a, HasClient t m sublayout tag, Reflex t)
451534instance (KnownSymbol path, HasClient t m sublayout tag, Reflex t) => HasClient t m (path :> sublayout) tag where
452535 type Client t m (path :> sublayout) tag = Client t m sublayout tag
453536
454− clientWithRoute Proxy q t req baseurl =
455− clientWithRoute (Proxy :: Proxy sublayout) q t
456− (prependToPathParts (pure (Right $ T.pack p)) req)
457− baseurl
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
458540
459541 where p = symbolVal (Proxy :: Proxy path)
460542
@@ -462,23 +544,23 @@ instance (KnownSymbol path, HasClient t m sublayout tag, Reflex t) => HasClient
462544instance HasClient t m api tag => HasClient t m (Vault :> api) tag where
463545 type Client t m (Vault :> api) tag = Client t m api tag
464546
465− clientWithRoute Proxy q t req baseurl =
466− clientWithRoute (Proxy :: Proxy api) q t req baseurl
547+ clientWithRouteAndResultHandler Proxy =
548+ clientWithRouteAndResultHandler (Proxy :: Proxy api)
467549
468550
469551instance HasClient t m api tag => HasClient t m (RemoteHost :> api) tag where
470552 type Client t m (RemoteHost :> api) tag = Client t m api tag
471553
472− clientWithRoute Proxy q t req baseurl =
473− clientWithRoute (Proxy :: Proxy api) q t req baseurl
554+ clientWithRouteAndResultHandler Proxy =
555+ clientWithRouteAndResultHandler (Proxy :: Proxy api)
474556
475557
476558
477559instance HasClient t m api tag => HasClient t m (IsSecure :> api) tag where
478560 type Client t m (IsSecure :> api) tag = Client t m api tag
479561
480− clientWithRoute Proxy q t req baseurl =
481− clientWithRoute (Proxy :: Proxy api) q t req baseurl
562+ clientWithRouteAndResultHandler Proxy =
563+ clientWithRouteAndResultHandler (Proxy :: Proxy api)
482564
483565
484566instance (HasClient t m api tag, Reflex t)
@@ -487,8 +569,8 @@ instance (HasClient t m api tag, Reflex t)
487569 type Client t m (BasicAuth realm usr :> api) tag = Dynamic t (Maybe BasicAuthData)
488570 -> Client t m api tag
489571
490− clientWithRoute Proxy q t req baseurl authdata =
491− clientWithRoute (Proxy :: Proxy api) q t req' baseurl
572+ clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap authdata =
573+ clientWithRouteAndResultHandler (Proxy :: Proxy api) q t req' baseurl opts wrap
492574 where
493575 req' = req { authData = Just authdata }
494576
@@ -514,3 +596,29 @@ non-empty lists, but is otherwise more specific, no instance will be overall
514596more specific. This in turn generally means adding yet another instance (one
515597for empty and one for non-empty lists).
516598-}
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