@@ -1,23 +1,17 @@
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 #-}
2115
2216-- #include "overlapping-compat.h"
2317-- | This module provides 'client' which can automatically generate
@@ -25,71 +19,56 @@
2519-- API.
2620module Servant.Reflex
2721 ( client
28− , clientWithOpts
29− , clientWithOptsAndResultHandler
30− , clientWithRoute
31− , clientWithRouteAndResultHandler
3222 , BuildHeaderKeysTo(..)
3323 , toHeaders
34− , HasClient
35− , Client
24+ , HasClient(..)
3625 , module Servant.Common.Req
3726 , module Servant.Common.BaseUrl
3827 ) where
3928
4029------------------------------------------------------------------------------
4130import Control.Applicative
42−import qualified Data.CaseInsensitive as CI
43−import Data.Functor.Identity
44−import qualified Data.Map as Map
4531import Data.Monoid ((<>))
46−import Data.Proxy (Proxy (..))
4732import qualified Data.Set as Set
33+import qualified Data.Text.Encoding as E
34+import Data.CaseInsensitive (mk)
35+import Data.Proxy (Proxy (..))
36+import qualified Data.Map as Map
4837import Data.Text (Text)
4938import qualified Data.Text as T
50−import qualified Data.Text.Encoding as E
51−import GHC.Exts (Constraint)
5239import GHC.TypeLits (KnownSymbol, symbolVal)
53−import Servant.API ((:<|>) (..), (:>), BasicAuth,
54− BasicAuthData, BuildHeadersTo (..),
55− Capture, Header, Headers (..),
56− HttpVersion, IsSecure,
57− MimeRender (..), MimeUnrender,
40+import Servant.API ((:<|>)(..),(:>), BasicAuth,
41+ BasicAuthData, BuildHeadersTo(..),
42+ Capture, contentType, Header,
43+ Headers(..), HttpVersion, IsSecure,
44+ MimeRender(..), MimeUnrender,
5845 NoContent, QueryFlag, QueryParam,
59− QueryParams, Raw, ReflectMethod (..),
46+ QueryParams, Raw, ReflectMethod(..),
6047 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)
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+ )
7256------------------------------------------------------------------------------
7357import Servant.Common.BaseUrl (BaseUrl(..), Scheme(..), baseUrlWidget,
7458 showBaseUrl,
7559 SupportsServantReflex)
76−import Servant.Common.Req (ClientOptions(..),
77− defaultClientOptions,
78− Req, ReqResult(..), QParam(..),
60+import Servant.Common.Req (Req, ReqResult(..), QParam(..),
7961 QueryPart(..), addHeader, authData,
80− defReq, evalResponse, prependToPathParts,
81− -- performRequestCT,
62+ defReq, prependToPathParts,
63+ performRequestCT,
8264 performRequestsCT,
83− -- performRequestNoBody,
65+ performRequestNoBody,
8466 performRequestsNoBody,
8567 performSomeRequestsAsync,
8668 qParamToQueryPart, reqBody,
8769 reqSuccess, reqFailure,
88− reqMethod, respHeaders,
89− response,
90− reqTag,
91− qParams, withCredentials)
92−
70+ reqMethod, respHeaders, response,
71+ qParams)
9372
9473-- * Accessing APIs as a Client
9574
@@ -103,75 +82,28 @@ import Servant.Common.Req (ClientOptions(..),
10382-- >
10483-- > getAllBooks :: Event t l -> m (Event t (l, ReqResult [Book]))
10584-- > postNewBook :: Dynamic t (Maybe Book) -> Event t l
106−-- > -> m (Event t (l, ReqResult Book)))
85+-- -> m (Event t (l, ReqResult Book)))
10786-- > (getAllBooks :<|> postNewBook) = client myApi host
10887-- > 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
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
14191
14292
14393-- | This class lets us define how each API combinator
14494-- influences the creation of an HTTP request. It's mostly
14595-- an internal class, you can just use 'client'.
146−class Monad m => HasClient t m layout (tag :: *) where
96+class HasClient t m layout (tag :: *) where
14797 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
98+ clientWithRoute :: Proxy layout -> Proxy m -> Proxy tag -> Req t -> Dynamic t BaseUrl -> Client t m layout tag
16799
168100
169101instance (HasClient t m a tag, HasClient t m b tag) => HasClient t m (a :<|> b) tag where
170102 type Client t m (a :<|> b) tag = Client t m a tag :<|> Client t m b tag
171103
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
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
175107
176108
177109-- Capture. Example:
@@ -192,9 +124,11 @@ instance (SupportsServantReflex t m, ToHttpApiData a, HasClient t m sublayout ta
192124 type Client t m (Capture capture a :> sublayout) tag =
193125 Dynamic t (Either Text a) -> Client t m sublayout tag
194126
195− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap val =
196− clientWithRouteAndResultHandler
197− (Proxy :: Proxy sublayout) q t (prependToPathParts p req) baseurl opts wrap
127+ clientWithRoute Proxy q t req baseurl val =
128+ clientWithRoute (Proxy :: Proxy sublayout)
129+ q t
130+ (prependToPathParts p req)
131+ baseurl
198132 where p = (fmap . fmap) (toUrlPiece) val
199133
200134
@@ -204,11 +138,11 @@ instance {-# OVERLAPPABLE #-}
204138 (MimeUnrender ct a, ReflectMethod method, cts' ~ (ct ': cts), SupportsServantReflex t m
205139 ) => HasClient t m (Verb method status cts' a) tag where
206140 type Client t m (Verb method status cts' a) tag =
207− Event t tag -> m (Event t (ReqResult tag a))
141+ Event t tag -> m (Event t (tag, ReqResult a))
208142 -- TODO how to access input types here?
209143 -- 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
144+ clientWithRoute Proxy _ _ req baseurl trigs =
145+ performRequestCT (Proxy :: Proxy ct) method req' baseurl trigs
212146 where method = E.decodeUtf8 $ reflectMethod (Proxy :: Proxy method)
213147 req' = req { reqMethod = method }
214148
@@ -218,36 +152,32 @@ instance {-# OVERLAPPING #-}
218152 (ReflectMethod method, SupportsServantReflex t m) =>
219153 HasClient t m (Verb method status cts NoContent) tag where
220154 type Client t m (Verb method status cts NoContent) tag =
221− Event t tag -> m (Event t (ReqResult tag NoContent))
155+ Event t tag -> m (Event t (tag, ReqResult NoContent))
222156 -- TODO: how to access input types here?
223157 -- ExceptT ServantError IO NoContent
224− clientWithRouteAndResultHandler Proxy _ _ req baseurl opts wrap trigs =
225− wrap =<< fmap runIdentity <$> performRequestsNoBody method (constDyn $ Identity req) baseurl opts trigs
158+ clientWithRoute Proxy _ _ req baseurl =
159+ performRequestNoBody method req baseurl
226160 where method = E.decodeUtf8 $ reflectMethod (Proxy :: Proxy method)
227161
228162
229−toHeaders :: BuildHeadersTo ls => ReqResult tag a -> ReqResult tag (Headers ls a)
163+toHeaders :: BuildHeadersTo ls => ReqResult a -> ReqResult (Headers ls a)
230164toHeaders r =
231− let hdrs = maybe []
232− (\xhr -> fmap (\(h,v) -> (CI.map E.encodeUtf8 h, E.encodeUtf8 v))
165+ let toBS = E.encodeUtf8
166+ hdrs = maybe []
167+ (\xhr -> fmap (\(h,v) -> (mk (toBS h), toBS v))
233168 (Map.toList $ _xhrResponse_headers xhr))
234169 (response r)
235170 in ffor r $ \a -> Headers {getResponse = a ,getHeadersHList = buildHeadersTo hdrs}
236171
237−
238172class BuildHeaderKeysTo hs where
239− buildHeaderKeysTo :: Proxy hs -> [CI.CI T.Text]
173+ buildHeaderKeysTo :: Proxy hs -> [T.Text]
240174
241175instance {-# OVERLAPPABLE #-} BuildHeaderKeysTo '[]
242176 where buildHeaderKeysTo _ = []
243177
244178instance {-# OVERLAPPABLE #-} (BuildHeaderKeysTo xs, KnownSymbol h)
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−
179+ => BuildHeaderKeysTo '[(Header h v) ': xs] where
180+ buildHeaderKeysTo _ = (T.pack $ symbolVal (Proxy :: Proxy h)) : buildHeaderKeysTo (Proxy :: Proxy xs)
251181
252182-- HEADERS Verb (Content) --
253183-- Headers combinator not treated in fully general case,
@@ -261,11 +191,11 @@ instance {-# OVERLAPPABLE #-}
261191 SupportsServantReflex t m
262192 ) => HasClient t m (Verb method status cts' (Headers ls a)) tag where
263193 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
194+ Event t tag -> m (Event t (tag, ReqResult (Headers ls a)))
195+ clientWithRoute Proxy _ _ req baseurl = do
266196 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
197+ resp <- performRequestCT (Proxy :: Proxy ct) method req' baseurl
198+ return $ (fmap . fmap) toHeaders <$> resp
269199 where req' = req { respHeaders =
270200 OnlyHeaders (Set.fromList (buildHeaderKeysTo (Proxy :: Proxy ls)))
271201 }
@@ -277,11 +207,11 @@ instance {-# OVERLAPPABLE #-}
277207 SupportsServantReflex t m
278208 ) => HasClient t m (Verb method status cts (Headers ls NoContent)) tag where
279209 type Client t m (Verb method status cts (Headers ls NoContent)) tag
280− = Event t tag -> m (Event t (ReqResult tag (Headers ls NoContent)))
281− clientWithRouteAndResultHandler Proxy _ _ req baseurl opts wrap trigs = do
210+ = Event t tag -> m (Event t (tag, ReqResult (Headers ls NoContent)))
211+ clientWithRoute Proxy _ _ req baseurl = do
282212 let method = E.decodeUtf8 $ reflectMethod (Proxy :: Proxy method)
283− resp <- fmap runIdentity <$> performRequestsNoBody method (constDyn $ Identity req') baseurl opts trigs
284− wrap $ toHeaders <$> resp
213+ resp <- performRequestNoBody method req' baseurl
214+ return $ (fmap . fmap) toHeaders <$> resp
285215 where req' = req {respHeaders =
286216 OnlyHeaders (Set.fromList (buildHeaderKeysTo (Proxy :: Proxy ls)))
287217 }
@@ -308,11 +238,11 @@ instance (KnownSymbol sym, ToHttpApiData a,
308238 type Client t m (Header sym a :> sublayout) tag =
309239 Dynamic t (Either Text a) -> Client t m sublayout tag
310240
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
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
316246 where hname = T.pack $ symbolVal (Proxy :: Proxy sym)
317247
318248
@@ -326,20 +256,8 @@ instance HasClient t m sublayout tag
326256 type Client t m (HttpVersion :> sublayout) tag =
327257 Client t m sublayout tag
328258
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−
259+ clientWithRoute Proxy q t =
260+ clientWithRoute (Proxy :: Proxy sublayout) q t
343261
344262
345263
@@ -376,9 +294,9 @@ instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout tag, Reflex
376294 Dynamic t (QParam a) -> Client t m sublayout tag
377295
378296 -- 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
297+ clientWithRoute Proxy q t req baseurl mparam =
298+ clientWithRoute (Proxy :: Proxy sublayout) q t
299+ (req {qParams = paramPair : qParams req}) baseurl
382300
383301 where pname = symbolVal (Proxy :: Proxy sym)
384302 --p prm = QueryPartParam $ (fmap . fmap) (toQueryParam) prm
@@ -422,12 +340,12 @@ instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout tag, Reflex
422340 type Client t m (QueryParams sym a :> sublayout) tag =
423341 Dynamic t [a] -> Client t m sublayout tag
424342
425− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap paramlist =
426− clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t req' baseurl opts wrap
343+ clientWithRoute Proxy q t req baseurl paramlist =
344+ clientWithRoute (Proxy :: Proxy sublayout) q t req' baseurl
427345
428346 where req' = req { qParams = (T.pack pname, params') : qParams req }
429347 pname = symbolVal (Proxy :: Proxy sym)
430− params' = QueryPartParams $ (fmap . fmap) toQueryParam
348+ params' = QueryPartParams $ (fmap . fmap) (toQueryParam)
431349 paramlist
432350
433351
@@ -462,8 +380,8 @@ instance (KnownSymbol sym, HasClient t m sublayout tag, Reflex t)
462380 type Client t m (QueryFlag sym :> sublayout) tag =
463381 Dynamic t Bool -> Client t m sublayout tag
464382
465− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap flag =
466− clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t req' baseurl opts wrap
383+ clientWithRoute Proxy q t req baseurl flag =
384+ clientWithRoute (Proxy :: Proxy sublayout) q t req' baseurl
467385
468386 where req' = req { qParams = thisPair : qParams req }
469387 thisPair = (T.pack pName, QueryPartFlag flag) :: (Text, QueryPart t)
@@ -475,9 +393,9 @@ instance (KnownSymbol sym, HasClient t m sublayout tag, Reflex t)
475393instance SupportsServantReflex t m => HasClient t m Raw tag where
476394 type Client t m Raw tag = Dynamic t (Either Text (XhrRequest ()))
477395 -> Event t tag
478− -> m (Event t (ReqResult tag ()))
396+ -> m (Event t (tag, ReqResult ()))
479397
480− clientWithRouteAndResultHandler _ _ _ _ baseurl _ wrap xhrs triggers = do
398+ clientWithRoute _ _ _ _ baseurl xhrs triggers = do
481399
482400 let xhrs' = liftA2 (\x path -> case x of
483401 Left e -> Left e
@@ -488,9 +406,8 @@ instance SupportsServantReflex t m => HasClient t m Raw tag where
488406 okReq = fmapMaybe (\(t,x) -> either (const Nothing) (Just . (t,)) x) xhrs'' :: Event t (tag, XhrRequest ())
489407
490408 resps <- performRequestsAsync okReq
491− wrap $ leftmost [ uncurry RequestFailure <$> badReq
492− , evalResponse (const $ Right ()) <$> resps
493− ]
409+ return $ leftmost [ fmap (ResponseSuccess ()) <$> resps
410+ , fmap (RequestFailure) <$> badReq ]
494411
495412
496413-- | If you use a 'ReqBody' in one of your endpoints in your API,
@@ -519,8 +436,8 @@ instance (MimeRender ct a, HasClient t m sublayout tag, Reflex t)
519436 type Client t m (ReqBody (ct ': cts) a :> sublayout) tag =
520437 Dynamic t (Either Text a) -> Client t m sublayout tag
521438
522− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap body =
523− clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t req' baseurl opts wrap
439+ clientWithRoute Proxy q t req baseurl body =
440+ clientWithRoute (Proxy :: Proxy sublayout) q t req' baseurl
524441 where req' = req { reqBody = bodyBytesCT }
525442 ctProxy = Proxy :: Proxy ct
526443 ctString = T.pack $ show $ contentType ctProxy
@@ -534,9 +451,10 @@ instance (MimeRender ct a, HasClient t m sublayout tag, Reflex t)
534451instance (KnownSymbol path, HasClient t m sublayout tag, Reflex t) => HasClient t m (path :> sublayout) tag where
535452 type Client t m (path :> sublayout) tag = Client t m sublayout tag
536453
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
454+ clientWithRoute Proxy q t req baseurl =
455+ clientWithRoute (Proxy :: Proxy sublayout) q t
456+ (prependToPathParts (pure (Right $ T.pack p)) req)
457+ baseurl
540458
541459 where p = symbolVal (Proxy :: Proxy path)
542460
@@ -544,23 +462,23 @@ instance (KnownSymbol path, HasClient t m sublayout tag, Reflex t) => HasClient
544462instance HasClient t m api tag => HasClient t m (Vault :> api) tag where
545463 type Client t m (Vault :> api) tag = Client t m api tag
546464
547− clientWithRouteAndResultHandler Proxy =
548− clientWithRouteAndResultHandler (Proxy :: Proxy api)
465+ clientWithRoute Proxy q t req baseurl =
466+ clientWithRoute (Proxy :: Proxy api) q t req baseurl
549467
550468
551469instance HasClient t m api tag => HasClient t m (RemoteHost :> api) tag where
552470 type Client t m (RemoteHost :> api) tag = Client t m api tag
553471
554− clientWithRouteAndResultHandler Proxy =
555− clientWithRouteAndResultHandler (Proxy :: Proxy api)
472+ clientWithRoute Proxy q t req baseurl =
473+ clientWithRoute (Proxy :: Proxy api) q t req baseurl
556474
557475
558476
559477instance HasClient t m api tag => HasClient t m (IsSecure :> api) tag where
560478 type Client t m (IsSecure :> api) tag = Client t m api tag
561479
562− clientWithRouteAndResultHandler Proxy =
563− clientWithRouteAndResultHandler (Proxy :: Proxy api)
480+ clientWithRoute Proxy q t req baseurl =
481+ clientWithRoute (Proxy :: Proxy api) q t req baseurl
564482
565483
566484instance (HasClient t m api tag, Reflex t)
@@ -569,8 +487,8 @@ instance (HasClient t m api tag, Reflex t)
569487 type Client t m (BasicAuth realm usr :> api) tag = Dynamic t (Maybe BasicAuthData)
570488 -> Client t m api tag
571489
572− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap authdata =
573− clientWithRouteAndResultHandler (Proxy :: Proxy api) q t req' baseurl opts wrap
490+ clientWithRoute Proxy q t req baseurl authdata =
491+ clientWithRoute (Proxy :: Proxy api) q t req' baseurl
574492 where
575493 req' = req { authData = Just authdata }
576494
@@ -596,30 +514,3 @@ non-empty lists, but is otherwise more specific, no instance will be overall
596514more specific. This in turn generally means adding yet another instance (one
597515for empty and one for non-empty lists).
598516-}
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−