@@ -1,23 +1,24 @@
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 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 #-}
15+{-# LANGUAGE OverloadedStrings #-}
16+{-# LANGUAGE PolyKinds #-}
17+{-# LANGUAGE ScopedTypeVariables #-}
18+{-# LANGUAGE TupleSections #-}
19+{-# LANGUAGE TypeFamilies #-}
20+{-# LANGUAGE TypeOperators #-}
21+{-# LANGUAGE UndecidableInstances #-}
2122
2223-- #include "overlapping-compat.h"
2324-- | This module provides 'client' which can automatically generate
@@ -25,57 +26,47 @@
2526-- API.
2627module Servant.Reflex
2728 ( client
28− , clientWithOpts
29− , clientWithOptsAndResultHandler
30− , clientWithRoute
31− , clientWithRouteAndResultHandler
3229 , BuildHeaderKeysTo(..)
3330 , toHeaders
34− , HasClient
35− , Client
31+ , HasClient(..)
3632 , module Servant.Common.Req
3733 , module Servant.Common.BaseUrl
3834 ) where
3935
4036------------------------------------------------------------------------------
37+import Data.Aeson
4138import Control.Applicative
42−import qualified Data.CaseInsensitive as CI
43−import Data.Functor.Identity
44−import qualified Data.Map as Map
4539import Data.Monoid ((<>))
46−import Data.Proxy (Proxy (..))
4740import qualified Data.Set as Set
41+import qualified Data.Text.Encoding as E
42+import Data.CaseInsensitive (mk)
43+import Data.Functor.Identity
44+import Data.Proxy (Proxy (..))
45+import qualified Data.Map as Map
4846import Data.Text (Text)
4947import qualified Data.Text as T
50−import qualified Data.Text.Encoding as E
51−import GHC.Exts (Constraint)
5248import GHC.TypeLits (KnownSymbol, symbolVal)
53−import Servant.API ((:<|>) (..), (:>), BasicAuth,
54− BasicAuthData, BuildHeadersTo (..),
55− Capture, Header, Headers (..),
56− HttpVersion, IsSecure,
57− MimeRender (..), MimeUnrender,
49+import Servant.API ((:<|>)(..),(:>), BasicAuth,
50+ BasicAuthData, BuildHeadersTo(..),
51+ Capture, contentType, Header,
52+ Headers(..), HttpVersion, IsSecure,
53+ MimeRender(..), MimeUnrender,
5854 NoContent, QueryFlag, QueryParam,
59− QueryParams, Raw, ReflectMethod (..),
55+ QueryParams, Raw, ReflectMethod(..),
6056 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)
57+ ToHttpApiData(..), Vault, Verb)
58+
59+import Reflex.Dom (Dynamic, Event, Reflex,
60+ XhrRequest(..),
61+ XhrResponseHeaders(..),
62+ XhrResponse(..), attachPromptlyDynWith, constDyn, ffor, fmapMaybe,
63+ leftmost, performRequestsAsync,
64+ )
7265------------------------------------------------------------------------------
7366import Servant.Common.BaseUrl (BaseUrl(..), Scheme(..), baseUrlWidget,
7467 showBaseUrl,
7568 SupportsServantReflex)
76−import Servant.Common.Req (ClientOptions(..),
77− defaultClientOptions,
78− Req, ReqResult(..), QParam(..),
69+import Servant.Common.Req (Req, ReqResult(..), QParam(..),
7970 QueryPart(..), addHeader, authData,
8071 defReq, evalResponse, prependToPathParts,
8172 -- performRequestCT,
@@ -85,10 +76,9 @@ import Servant.Common.Req (ClientOptions(..),
8576 performSomeRequestsAsync,
8677 qParamToQueryPart, reqBody,
8778 reqSuccess, reqFailure,
88− reqMethod, respHeaders,
89− response,
79+ reqMethod, respHeaders, response,
9080 reqTag,
91− qParams, withCredentials)
81+ qParams)
9282
9383
9484-- * Accessing APIs as a Client
@@ -103,75 +93,28 @@ import Servant.Common.Req (ClientOptions(..),
10393-- >
10494-- > getAllBooks :: Event t l -> m (Event t (l, ReqResult [Book]))
10595-- > postNewBook :: Dynamic t (Maybe Book) -> Event t l
106−-- > -> m (Event t (l, ReqResult Book)))
96+-- -> m (Event t (l, ReqResult Book)))
10797-- > (getAllBooks :<|> postNewBook) = client myApi host
10898-- > 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
99+client :: (HasClient t m layout tag)
100+ => Proxy layout -> Proxy m -> Proxy tag -> Dynamic t BaseUrl -> Client t m layout tag
101+client p q t baseurl = clientWithRoute p q t defReq baseurl
141102
142103
143104-- | This class lets us define how each API combinator
144105-- influences the creation of an HTTP request. It's mostly
145106-- an internal class, you can just use 'client'.
146−class Monad m => HasClient t m layout (tag :: *) where
107+class HasClient t m layout (tag :: *) where
147108 type 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
109+ clientWithRoute :: Proxy layout -> Proxy m -> Proxy tag -> Req t -> Dynamic t BaseUrl -> Client t m layout tag
167110
168111
169112instance (HasClient t m a tag, HasClient t m b tag) => HasClient t m (a :<|> b) tag where
170113 type Client t m (a :<|> b) tag = Client t m a tag :<|> Client t m b tag
171114
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
115+ clientWithRoute Proxy q pTag req baseurl =
116+ clientWithRoute (Proxy :: Proxy a) q pTag req baseurl :<|>
117+ clientWithRoute (Proxy :: Proxy b) q pTag req baseurl
175118
176119
177120-- Capture. Example:
@@ -186,29 +129,32 @@ instance (HasClient t m a tag, HasClient t m b tag) => HasClient t m (a :<|> b)
186129-- -> m (Event t (l, ReqResult Book))
187130-- > getBook = client myApi (constDyn host)
188131
189−instance (SupportsServantReflex t m, ToHttpApiData a, HasClient t m sublayout tag)
132+instance (SupportsServantReflex t m, FromJSON a, ToHttpApiData a, HasClient t m sublayout tag)
190133 => HasClient t m (Capture capture a :> sublayout) tag where
191134
192135 type Client t m (Capture capture a :> sublayout) tag =
193136 Dynamic t (Either Text a) -> Client t m sublayout tag
194137
195− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap val =
196− clientWithRouteAndResultHandler
197− (Proxy :: Proxy sublayout) q t (prependToPathParts p req) baseurl opts wrap
138+ clientWithRoute Proxy q t req baseurl val =
139+ clientWithRoute (Proxy :: Proxy sublayout)
140+ q t
141+ (prependToPathParts p req)
142+ baseurl
198143 where p = (fmap . fmap) (toUrlPiece) val
199144
200145
201146-- VERB (Returning content) --
202147instance {-# OVERLAPPABLE #-}
203148 -- Note [Non-Empty Content Types]
204− (MimeUnrender ct a, ReflectMethod method, cts' ~ (ct ': cts), SupportsServantReflex t m
149+ (FromJSON a, MimeUnrender ct a, ReflectMethod method, cts' ~ (ct ': cts), SupportsServantReflex t m
205150 ) => HasClient t m (Verb method status cts' a) tag where
206151 type Client t m (Verb method status cts' a) tag =
207152 Event t tag -> m (Event t (ReqResult tag a))
208153 -- TODO how to access input types here?
209154 -- 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
155+ clientWithRoute Proxy _ _ req baseurl trigs =
156+ -- performRequestCT (Proxy :: Proxy ct) method req' baseurl trigs
157+ fmap runIdentity <$> performRequestsCT (Proxy :: Proxy ct) method (constDyn $ Identity $ req') baseurl trigs
212158 where method = E.decodeUtf8 $ reflectMethod (Proxy :: Proxy method)
213159 req' = req { reqMethod = method }
214160
@@ -221,33 +167,29 @@ instance {-# OVERLAPPING #-}
221167 Event t tag -> m (Event t (ReqResult tag NoContent))
222168 -- TODO: how to access input types here?
223169 -- ExceptT ServantError IO NoContent
224− clientWithRouteAndResultHandler Proxy _ _ req baseurl opts wrap trigs =
225− wrap =<< fmap runIdentity <$> performRequestsNoBody method (constDyn $ Identity req) baseurl opts trigs
170+ clientWithRoute Proxy _ _ req baseurl =
171+ (fmap . fmap) runIdentity . performRequestsNoBody method (constDyn $ Identity req) baseurl
226172 where method = E.decodeUtf8 $ reflectMethod (Proxy :: Proxy method)
227173
228174
229175toHeaders :: BuildHeadersTo ls => ReqResult tag a -> ReqResult tag (Headers ls a)
230176toHeaders r =
231− let hdrs = maybe []
232− (\xhr -> fmap (\(h,v) -> (CI.map E.encodeUtf8 h, E.encodeUtf8 v))
177+ let toBS = E.encodeUtf8
178+ hdrs = maybe []
179+ (\xhr -> fmap (\(h,v) -> (mk (toBS h), toBS v))
233180 (Map.toList $ _xhrResponse_headers xhr))
234181 (response r)
235182 in ffor r $ \a -> Headers {getResponse = a ,getHeadersHList = buildHeadersTo hdrs}
236183
237−
238184class BuildHeaderKeysTo hs where
239− buildHeaderKeysTo :: Proxy hs -> [CI.CI T.Text]
185+ buildHeaderKeysTo :: Proxy hs -> [T.Text]
240186
241187instance {-# OVERLAPPABLE #-} BuildHeaderKeysTo '[]
242188 where buildHeaderKeysTo _ = []
243189
244190instance {-# OVERLAPPABLE #-} (BuildHeaderKeysTo xs, KnownSymbol h)
245191 => 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−
192+ buildHeaderKeysTo _ = T.pack (symbolVal (Proxy :: Proxy h)) : buildHeaderKeysTo (Proxy :: Proxy xs)
251193
252194-- HEADERS Verb (Content) --
253195-- Headers combinator not treated in fully general case,
@@ -257,15 +199,16 @@ instance {-# OVERLAPPABLE #-} (BuildHeaderKeysTo xs, KnownSymbol h)
257199instance {-# OVERLAPPABLE #-}
258200 -- Note [Non-Empty Content Types]
259201 ( MimeUnrender ct a, BuildHeadersTo ls, BuildHeaderKeysTo ls,
202+ FromJSON a,
260203 ReflectMethod method, cts' ~ (ct ': cts),
261204 SupportsServantReflex t m
262205 ) => HasClient t m (Verb method status cts' (Headers ls a)) tag where
263206 type Client t m (Verb method status cts' (Headers ls a)) tag =
264207 Event t tag -> m (Event t (ReqResult tag (Headers ls a)))
265− clientWithRouteAndResultHandler Proxy _ _ req baseurl opts wrap trigs = do
208+ clientWithRoute Proxy _ _ req baseurl trigs = do
266209 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
210+ resp <- fmap runIdentity <$> performRequestsCT (Proxy :: Proxy ct) method (constDyn $ Identity req') baseurl trigs
211+ return $ toHeaders <$> resp
269212 where req' = req { respHeaders =
270213 OnlyHeaders (Set.fromList (buildHeaderKeysTo (Proxy :: Proxy ls)))
271214 }
@@ -278,10 +221,10 @@ instance {-# OVERLAPPABLE #-}
278221 ) => HasClient t m (Verb method status cts (Headers ls NoContent)) tag where
279222 type Client t m (Verb method status cts (Headers ls NoContent)) tag
280223 = Event t tag -> m (Event t (ReqResult tag (Headers ls NoContent)))
281− clientWithRouteAndResultHandler Proxy _ _ req baseurl opts wrap trigs = do
224+ clientWithRoute Proxy _ _ req baseurl trigs = do
282225 let method = E.decodeUtf8 $ reflectMethod (Proxy :: Proxy method)
283− resp <- fmap runIdentity <$> performRequestsNoBody method (constDyn $ Identity req') baseurl opts trigs
284− wrap $ toHeaders <$> resp
226+ resp <- fmap runIdentity <$> performRequestsNoBody method (constDyn $ Identity req') baseurl trigs
227+ return $ toHeaders <$> resp
285228 where req' = req {respHeaders =
286229 OnlyHeaders (Set.fromList (buildHeaderKeysTo (Proxy :: Proxy ls)))
287230 }
@@ -308,11 +251,11 @@ instance (KnownSymbol sym, ToHttpApiData a,
308251 type Client t m (Header sym a :> sublayout) tag =
309252 Dynamic t (Either Text a) -> Client t m sublayout tag
310253
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
254+ clientWithRoute Proxy q t req baseurl eVal =
255+ clientWithRoute (Proxy :: Proxy sublayout)
256+ q t
257+ (Servant.Common.Req.addHeader hname eVal req)
258+ baseurl
316259 where hname = T.pack $ symbolVal (Proxy :: Proxy sym)
317260
318261
@@ -326,21 +269,8 @@ instance HasClient t m sublayout tag
326269 type Client t m (HttpVersion :> sublayout) tag =
327270 Client t m sublayout tag
328271
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−
272+ clientWithRoute Proxy q t =
273+ clientWithRoute (Proxy :: Proxy sublayout) q t
344274
345275
346276-- | If you use a 'QueryParam' in one of your endpoints in your API,
@@ -376,9 +306,9 @@ instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout tag, Reflex
376306 Dynamic t (QParam a) -> Client t m sublayout tag
377307
378308 -- 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
309+ clientWithRoute Proxy q t req baseurl mparam =
310+ clientWithRoute (Proxy :: Proxy sublayout) q t
311+ (req {qParams = paramPair : qParams req}) baseurl
382312
383313 where pname = symbolVal (Proxy :: Proxy sym)
384314 --p prm = QueryPartParam $ (fmap . fmap) (toQueryParam) prm
@@ -422,8 +352,8 @@ instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout tag, Reflex
422352 type Client t m (QueryParams sym a :> sublayout) tag =
423353 Dynamic t [a] -> Client t m sublayout tag
424354
425− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap paramlist =
426− clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t req' baseurl opts wrap
355+ clientWithRoute Proxy q t req baseurl paramlist =
356+ clientWithRoute (Proxy :: Proxy sublayout) q t req' baseurl
427357
428358 where req' = req { qParams = (T.pack pname, params') : qParams req }
429359 pname = symbolVal (Proxy :: Proxy sym)
@@ -462,8 +392,8 @@ instance (KnownSymbol sym, HasClient t m sublayout tag, Reflex t)
462392 type Client t m (QueryFlag sym :> sublayout) tag =
463393 Dynamic t Bool -> Client t m sublayout tag
464394
465− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap flag =
466− clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t req' baseurl opts wrap
395+ clientWithRoute Proxy q t req baseurl flag =
396+ clientWithRoute (Proxy :: Proxy sublayout) q t req' baseurl
467397
468398 where req' = req { qParams = thisPair : qParams req }
469399 thisPair = (T.pack pName, QueryPartFlag flag) :: (Text, QueryPart t)
@@ -477,7 +407,7 @@ instance SupportsServantReflex t m => HasClient t m Raw tag where
477407 -> Event t tag
478408 -> m (Event t (ReqResult tag ()))
479409
480− clientWithRouteAndResultHandler _ _ _ _ baseurl _ wrap xhrs triggers = do
410+ clientWithRoute _ _ _ _ baseurl xhrs triggers = do
481411
482412 let xhrs' = liftA2 (\x path -> case x of
483413 Left e -> Left e
@@ -488,7 +418,7 @@ instance SupportsServantReflex t m => HasClient t m Raw tag where
488418 okReq = fmapMaybe (\(t,x) -> either (const Nothing) (Just . (t,)) x) xhrs'' :: Event t (tag, XhrRequest ())
489419
490420 resps <- performRequestsAsync okReq
491− wrap $ leftmost [ uncurry RequestFailure <$> badReq
421+ return $ leftmost [ uncurry RequestFailure <$> badReq
492422 , evalResponse (const $ Right ()) <$> resps
493423 ]
494424
@@ -519,8 +449,8 @@ instance (MimeRender ct a, HasClient t m sublayout tag, Reflex t)
519449 type Client t m (ReqBody (ct ': cts) a :> sublayout) tag =
520450 Dynamic t (Either Text a) -> Client t m sublayout tag
521451
522− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap body =
523− clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t req' baseurl opts wrap
452+ clientWithRoute Proxy q t req baseurl body =
453+ clientWithRoute (Proxy :: Proxy sublayout) q t req' baseurl
524454 where req' = req { reqBody = bodyBytesCT }
525455 ctProxy = Proxy :: Proxy ct
526456 ctString = T.pack $ show $ contentType ctProxy
@@ -534,9 +464,9 @@ instance (MimeRender ct a, HasClient t m sublayout tag, Reflex t)
534464instance (KnownSymbol path, HasClient t m sublayout tag, Reflex t) => HasClient t m (path :> sublayout) tag where
535465 type Client t m (path :> sublayout) tag = Client t m sublayout tag
536466
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
467+ clientWithRoute Proxy q t req baseurl =
468+ clientWithRoute (Proxy :: Proxy sublayout) q t
469+ (prependToPathParts (pure (Right $ T.pack p)) req) baseurl
540470
541471 where p = symbolVal (Proxy :: Proxy path)
542472
@@ -544,23 +474,23 @@ instance (KnownSymbol path, HasClient t m sublayout tag, Reflex t) => HasClient
544474instance HasClient t m api tag => HasClient t m (Vault :> api) tag where
545475 type Client t m (Vault :> api) tag = Client t m api tag
546476
547− clientWithRouteAndResultHandler Proxy =
548− clientWithRouteAndResultHandler (Proxy :: Proxy api)
477+ clientWithRoute Proxy q t req baseurl =
478+ clientWithRoute (Proxy :: Proxy api) q t req baseurl
549479
550480
551481instance HasClient t m api tag => HasClient t m (RemoteHost :> api) tag where
552482 type Client t m (RemoteHost :> api) tag = Client t m api tag
553483
554− clientWithRouteAndResultHandler Proxy =
555− clientWithRouteAndResultHandler (Proxy :: Proxy api)
484+ clientWithRoute Proxy q t req baseurl =
485+ clientWithRoute (Proxy :: Proxy api) q t req baseurl
556486
557487
558488
559489instance HasClient t m api tag => HasClient t m (IsSecure :> api) tag where
560490 type Client t m (IsSecure :> api) tag = Client t m api tag
561491
562− clientWithRouteAndResultHandler Proxy =
563− clientWithRouteAndResultHandler (Proxy :: Proxy api)
492+ clientWithRoute Proxy q t req baseurl =
493+ clientWithRoute (Proxy :: Proxy api) q t req baseurl
564494
565495
566496instance (HasClient t m api tag, Reflex t)
@@ -569,8 +499,8 @@ instance (HasClient t m api tag, Reflex t)
569499 type Client t m (BasicAuth realm usr :> api) tag = Dynamic t (Maybe BasicAuthData)
570500 -> Client t m api tag
571501
572− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap authdata =
573− clientWithRouteAndResultHandler (Proxy :: Proxy api) q t req' baseurl opts wrap
502+ clientWithRoute Proxy q t req baseurl authdata =
503+ clientWithRoute (Proxy :: Proxy api) q t req' baseurl
574504 where
575505 req' = req { authData = Just authdata }
576506
@@ -596,30 +526,3 @@ non-empty lists, but is otherwise more specific, no instance will be overall
596526more specific. This in turn generally means adding yet another instance (one
597527for empty and one for non-empty lists).
598528-}
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
625−