@@ -1,23 +1,16 @@
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 CPP #-}
2+{-# LANGUAGE DataKinds #-}
3+{-# LANGUAGE FlexibleContexts #-}
4+{-# LANGUAGE FlexibleInstances #-}
5+{-# LANGUAGE InstanceSigs #-}
6+{-# LANGUAGE OverloadedStrings #-}
7+{-# LANGUAGE PolyKinds #-}
8+{-# LANGUAGE ScopedTypeVariables #-}
9+{-# LANGUAGE TupleSections #-}
10+{-# LANGUAGE TypeFamilies #-}
11+{-# LANGUAGE TypeOperators #-}
12+{-# LANGUAGE UndecidableInstances #-}
13+{-# LANGUAGE MultiParamTypeClasses #-}
2114
2215-- #include "overlapping-compat.h"
2316-- | This module provides 'client' which can automatically generate
@@ -25,71 +18,48 @@
2518-- API.
2619module Servant.Reflex
2720 ( client
28− , clientWithOpts
29− , clientWithOptsAndResultHandler
30− , clientWithRoute
31− , clientWithRouteAndResultHandler
32− , BuildHeaderKeysTo(..)
33− , toHeaders
34− , HasClient
35− , Client
21+ , HasClient(..)
3622 , module Servant.Common.Req
3723 , module Servant.Common.BaseUrl
3824 ) where
3925
40−------------------------------------------------------------------------------
26+-------------------------------------------------------------------------------
4127import Control.Applicative
42−import qualified Data.CaseInsensitive as CI
43−import Data.Functor.Identity
44−import qualified Data.Map as Map
4528import Data.Monoid ((<>))
46−import Data.Proxy (Proxy (..))
4729import qualified Data.Set as Set
30+import qualified Data.Text.Encoding as E
31+import Data.CaseInsensitive (mk)
32+import Data.Proxy (Proxy (..))
33+import qualified Data.Map as Map
4834import Data.Text (Text)
4935import qualified Data.Text as T
50−import qualified Data.Text.Encoding as E
51−import GHC.Exts (Constraint)
5236import GHC.TypeLits (KnownSymbol, symbolVal)
53−import Servant.API ((:<|>) (..), (:>), BasicAuth,
54− BasicAuthData, BuildHeadersTo (..),
55− Capture, Header, Headers (..),
56− HttpVersion, IsSecure,
57− MimeRender (..), MimeUnrender,
37+import Servant.API ((:<|>)(..),(:>), BasicAuth,
38+ BasicAuthData, BuildHeadersTo(..),
39+ Capture, contentType, Header,
40+ Headers(..), HttpVersion, IsSecure,
41+ MimeRender(..), MimeUnrender,
5842 NoContent, QueryFlag, QueryParam,
59− QueryParams, Raw, ReflectMethod (..),
43+ QueryParams, Raw, ReflectMethod(..),
6044 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)
72−------------------------------------------------------------------------------
73−import Servant.Common.BaseUrl (BaseUrl(..), Scheme(..), baseUrlWidget,
74− showBaseUrl,
45+ ToHttpApiData(..), Vault, Verb)
46+import Servant.Common.BaseUrl (BaseUrl, baseUrlWidget, showBaseUrl,
7547 SupportsServantReflex)
76−import Servant.Common.Req (ClientOptions(..),
77− defaultClientOptions,
78− Req, ReqResult(..), QParam(..),
48+import Servant.Common.Req (Req, ReqResult(..), QParam(..),
7949 QueryPart(..), addHeader, authData,
80− defReq, evalResponse, prependToPathParts,
81− -- performRequestCT,
82− performRequestsCT,
83− -- performRequestNoBody,
84− performRequestsNoBody,
85− performSomeRequestsAsync,
50+ defReq, prependToPathParts,
51+ performRequestCT,
52+ performRequestNoBody,
8653 qParamToQueryPart, reqBody,
8754 reqSuccess, reqFailure,
88− reqMethod, respHeaders,
89− response,
90− reqTag,
91− qParams, withCredentials)
92−
55+ reqMethod, respHeaders, response,
56+ qParams)
57+import Reflex.Dom (Dynamic, Event, Reflex,
58+ XhrRequest(..),
59+ XhrResponseHeaders(..),
60+ XhrResponse(..), ffor, fmapMaybe,
61+ leftmost, performRequestAsync,
62+ tagPromptlyDyn )
9363
9464-- * Accessing APIs as a Client
9565
@@ -101,78 +71,28 @@ import Servant.Common.Req (ClientOptions(..),
10171-- > myApi :: Proxy MyApi
10272-- > myApi = Proxy
10373-- >
104−-- > getAllBooks :: Event t l -> m (Event t (l, ReqResult [Book]))
105−-- > postNewBook :: Dynamic t (Maybe Book) -> Event t l
106−-- > -> m (Event t (l, ReqResult Book)))
74+-- > getAllBooks :: Event t () -> m (Event t (Either XhrError ((),[Book])))
75+-- > postNewBook :: Dynamic t (Maybe Book) -> Event t ()
76+-- -> m (Event t (Either XhrError (Book,Book)))
10777-- > (getAllBooks :<|> postNewBook) = client myApi host
10878-- > 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
141−
79+client :: (HasClient t m layout)
80+ => Proxy layout -> Proxy m -> Dynamic t BaseUrl -> Client t m layout
81+client p q baseurl = clientWithRoute p q defReq baseurl
14282
14383-- | This class lets us define how each API combinator
14484-- influences the creation of an HTTP request. It's mostly
14585-- an internal class, you can just use 'client'.
146−class Monad m => HasClient t m layout (tag :: *) where
147− 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
167−
168−
169−instance (HasClient t m a tag, HasClient t m b tag) => HasClient t m (a :<|> b) tag where
170− type Client t m (a :<|> b) tag = Client t m a tag :<|> Client t m b tag
171−
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
86+class HasClient t m layout where
87+ type Client t m layout :: *
88+ clientWithRoute :: Proxy layout -> Proxy m -> Req t -> Dynamic t BaseUrl -> Client t m layout
89+
17590
91+instance (HasClient t m a, HasClient t m b) => HasClient t m (a :<|> b) where
92+ type Client t m (a :<|> b) = Client t m a :<|> Client t m b
93+ clientWithRoute Proxy q req baseurl =
94+ clientWithRoute (Proxy :: Proxy a) q req baseurl :<|>
95+ clientWithRoute (Proxy :: Proxy b) q req baseurl
17696
17797-- Capture. Example:
17898-- > type MyApi = "books" :> Capture "isbn" Text :> Get '[JSON] Book
@@ -182,72 +102,67 @@ instance (HasClient t m a tag, HasClient t m b tag) => HasClient t m (a :<|> b)
182102-- > getBook :: SupportsServantReflex t m
183103-- => Dynamic t BaseUrl
184104-- -> Dynamic t (Maybe Text)
185−-- -> Event t l
186−-- -> m (Event t (l, ReqResult Book))
105+-- -> Event t ()
106+-- -> m (Event t (Either XhrError (Text, Book)))
187107-- > getBook = client myApi (constDyn host)
108+instance (SupportsServantReflex t m, ToHttpApiData a, HasClient t m sublayout)
109+ => HasClient t m (Capture capture a :> sublayout) where
188110
189−instance (SupportsServantReflex t m, ToHttpApiData a, HasClient t m sublayout tag)
190− => HasClient t m (Capture capture a :> sublayout) tag where
111+ type Client t m (Capture capture a :> sublayout) =
112+ Dynamic t (Either Text a) -> Client t m sublayout
191113
192− type Client t m (Capture capture a :> sublayout) tag =
193− Dynamic t (Either Text a) -> Client t m sublayout tag
114+ clientWithRoute Proxy q req baseurl val =
115+ clientWithRoute (Proxy :: Proxy sublayout)
116+ q
117+ (prependToPathParts p req)
118+ baseurl
194119
195− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap val =
196− clientWithRouteAndResultHandler
197− (Proxy :: Proxy sublayout) q t (prependToPathParts p req) baseurl opts wrap
198120 where p = (fmap . fmap) (toUrlPiece) val
199121
200−
201122-- VERB (Returning content) --
202123instance {-# OVERLAPPABLE #-}
203124 -- Note [Non-Empty Content Types]
204125 (MimeUnrender ct a, ReflectMethod method, cts' ~ (ct ': cts), SupportsServantReflex t m
205− ) => HasClient t m (Verb method status cts' a) tag where
206− type Client t m (Verb method status cts' a) tag =
207− Event t tag -> m (Event t (ReqResult tag a))
126+ ) => HasClient t m (Verb method status cts' a) where
127+ type Client t m (Verb method status cts' a) =
128+ Event t () -> m (Event t (ReqResult a))
208129 -- TODO how to access input types here?
209130 -- 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
131+ clientWithRoute Proxy _ req baseurl =
132+ performRequestCT (Proxy :: Proxy ct) method req' baseurl
212133 where method = E.decodeUtf8 $ reflectMethod (Proxy :: Proxy method)
213134 req' = req { reqMethod = method }
214135
215−
216136-- -- VERB (No content) --
217137instance {-# OVERLAPPING #-}
218138 (ReflectMethod method, SupportsServantReflex t m) =>
219− HasClient t m (Verb method status cts NoContent) tag where
220− type Client t m (Verb method status cts NoContent) tag =
221− Event t tag -> m (Event t (ReqResult tag NoContent))
139+ HasClient t m (Verb method status cts NoContent) where
140+ type Client t m (Verb method status cts NoContent) =
141+ Event t () -> m (Event t (ReqResult NoContent))
222142 -- TODO: how to access input types here?
223143 -- ExceptT ServantError IO NoContent
224− clientWithRouteAndResultHandler Proxy _ _ req baseurl opts wrap trigs =
225− wrap =<< fmap runIdentity <$> performRequestsNoBody method (constDyn $ Identity req) baseurl opts trigs
144+ clientWithRoute Proxy _ req baseurl =
145+ performRequestNoBody method req baseurl
226146 where method = E.decodeUtf8 $ reflectMethod (Proxy :: Proxy method)
227147
228−
229−toHeaders :: BuildHeadersTo ls => ReqResult tag a -> ReqResult tag (Headers ls a)
148+toHeaders :: BuildHeadersTo ls => ReqResult a -> ReqResult (Headers ls a)
230149toHeaders r =
231− let hdrs = maybe []
232− (\xhr -> fmap (\(h,v) -> (CI.map E.encodeUtf8 h, E.encodeUtf8 v))
150+ let toBS = E.encodeUtf8
151+ hdrs = maybe []
152+ (\xhr -> fmap (\(h,v) -> (mk (toBS h), toBS v))
233153 (Map.toList $ _xhrResponse_headers xhr))
234154 (response r)
235155 in ffor r $ \a -> Headers {getResponse = a ,getHeadersHList = buildHeadersTo hdrs}
236156
237−
238157class BuildHeaderKeysTo hs where
239− buildHeaderKeysTo :: Proxy hs -> [CI.CI T.Text]
158+ buildHeaderKeysTo :: Proxy hs -> [T.Text]
240159
241160instance {-# OVERLAPPABLE #-} BuildHeaderKeysTo '[]
242161 where buildHeaderKeysTo _ = []
243162
244163instance {-# 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−
164+ => BuildHeaderKeysTo '[(Header h v) ': xs] where
165+ buildHeaderKeysTo _ = (T.pack $ symbolVal (Proxy :: Proxy h)) : buildHeaderKeysTo (Proxy :: Proxy xs)
251166
252167-- HEADERS Verb (Content) --
253168-- Headers combinator not treated in fully general case,
@@ -259,35 +174,33 @@ instance {-# OVERLAPPABLE #-}
259174 ( MimeUnrender ct a, BuildHeadersTo ls, BuildHeaderKeysTo ls,
260175 ReflectMethod method, cts' ~ (ct ': cts),
261176 SupportsServantReflex t m
262− ) => HasClient t m (Verb method status cts' (Headers ls a)) tag where
263− type Client t m (Verb method status cts' (Headers ls a)) tag =
264− Event t tag -> m (Event t (ReqResult tag (Headers ls a)))
265− clientWithRouteAndResultHandler Proxy _ _ req baseurl opts wrap trigs = do
177+ ) => HasClient t m (Verb method status cts' (Headers ls a)) where
178+ type Client t m (Verb method status cts' (Headers ls a)) =
179+ Event t () -> m (Event t (ReqResult (Headers ls a)))
180+ clientWithRoute Proxy _ req baseurl = do
266181 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
182+ resp <- performRequestCT (Proxy :: Proxy ct) method req' baseurl
183+ return $ (fmap . fmap) toHeaders resp
269184 where req' = req { respHeaders =
270185 OnlyHeaders (Set.fromList (buildHeaderKeysTo (Proxy :: Proxy ls)))
271186 }
272187
273−
274188-- HEADERS Verb (No content) --
275189instance {-# OVERLAPPABLE #-}
276190 ( BuildHeadersTo ls, BuildHeaderKeysTo ls, ReflectMethod method,
277191 SupportsServantReflex t m
278− ) => HasClient t m (Verb method status cts (Headers ls NoContent)) tag where
279− 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
192+ ) => HasClient t m (Verb method status cts (Headers ls NoContent)) where
193+ type Client t m (Verb method status cts (Headers ls NoContent))
194+ = Event t () -> m (Event t (ReqResult (Headers ls NoContent)))
195+ clientWithRoute Proxy _ req baseurl = do
282196 let method = E.decodeUtf8 $ reflectMethod (Proxy :: Proxy method)
283− resp <- fmap runIdentity <$> performRequestsNoBody method (constDyn $ Identity req') baseurl opts trigs
284− wrap $ toHeaders <$> resp
197+ resp <- performRequestNoBody method req' baseurl
198+ return $ (fmap . fmap) toHeaders resp
285199 where req' = req {respHeaders =
286200 OnlyHeaders (Set.fromList (buildHeaderKeysTo (Proxy :: Proxy ls)))
287201 }
288202
289203
290−
291204-- HEADER
292205-- > newtype Referer = Referer { referrer :: Text }
293206-- > deriving (Eq, Show, Generic, FromText, ToHttpApiData)
@@ -302,45 +215,29 @@ instance {-# OVERLAPPABLE #-}
302215-- > -- then you can just use "viewRefer" to query that endpoint
303216-- > -- specifying Nothing or e.g Just "http://haskell.org/" as arguments
304217instance (KnownSymbol sym, ToHttpApiData a,
305− HasClient t m sublayout tag, SupportsServantReflex t m)
306− => HasClient t m (Header sym a :> sublayout) tag where
218+ HasClient t m sublayout, SupportsServantReflex t m)
219+ => HasClient t m (Header sym a :> sublayout) where
307220
308− type Client t m (Header sym a :> sublayout) tag =
309− Dynamic t (Either Text a) -> Client t m sublayout tag
221+ type Client t m (Header sym a :> sublayout) =
222+ Dynamic t (Either Text a) -> Client t m sublayout
310223
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
224+ clientWithRoute Proxy q req baseurl eVal =
225+ clientWithRoute (Proxy :: Proxy sublayout)
226+ q
227+ (Servant.Common.Req.addHeader hname eVal req)
228+ baseurl
316229 where hname = T.pack $ symbolVal (Proxy :: Proxy sym)
317230
318−
319−
320−
321231-- | Using a 'HttpVersion' combinator in your API doesn't affect the client
322232-- functions.
323−instance HasClient t m sublayout tag
324− => HasClient t m (HttpVersion :> sublayout) tag where
325−
326− type Client t m (HttpVersion :> sublayout) tag =
327− Client t m sublayout tag
328−
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)
233+instance HasClient t m sublayout
234+ => HasClient t m (HttpVersion :> sublayout) where
342235
236+ type Client t m (HttpVersion :> sublayout) =
237+ Client t m sublayout
343238
239+ clientWithRoute Proxy q =
240+ clientWithRoute (Proxy :: Proxy sublayout) q
344241
345242
346243-- | If you use a 'QueryParam' in one of your endpoints in your API,
@@ -369,16 +266,16 @@ instance (HasClient t m sublayout tag, KnownSymbol sym)
369266-- > -- then you can just use "getBooksBy" to query that endpoint.
370267-- > -- 'getBooksBy Nothing' for all books
371268-- > -- 'getBooksBy (Just "Isaac Asimov")' to get all books by Isaac Asimov
372−instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout tag, Reflex t)
373− => HasClient t m (QueryParam sym a :> sublayout) tag where
269+instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout, Reflex t)
270+ => HasClient t m (QueryParam sym a :> sublayout) where
374271
375− type Client t m (QueryParam sym a :> sublayout) tag =
376− Dynamic t (QParam a) -> Client t m sublayout tag
272+ type Client t m (QueryParam sym a :> sublayout) =
273+ Dynamic t (QParam a) -> Client t m sublayout
377274
378275 -- 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
276+ clientWithRoute Proxy q req baseurl mparam =
277+ clientWithRoute (Proxy :: Proxy sublayout) q
278+ (req {qParams = paramPair : qParams req}) baseurl
382279
383280 where pname = symbolVal (Proxy :: Proxy sym)
384281 --p prm = QueryPartParam $ (fmap . fmap) (toQueryParam) prm
@@ -386,8 +283,6 @@ instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout tag, Reflex
386283 p prm = QueryPartParam $ fmap qParamToQueryPart prm -- (fmap . fmap) (unpack . toQueryParam) prm
387284 paramPair = (T.pack pname, p mparam)
388285
389−
390−
391286-- | If you use a 'QueryParams' in one of your endpoints in your API,
392287-- the corresponding querying function will automatically take
393288-- an additional argument, a list of values of the type specified
@@ -416,22 +311,21 @@ instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout tag, Reflex
416311-- > -- 'getBooksBy []' for all books
417312-- > -- 'getBooksBy ["Isaac Asimov", "Robert A. Heinlein"]'
418313-- > -- to get all books by Asimov and Heinlein
419−instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout tag, Reflex t)
420− => HasClient t m (QueryParams sym a :> sublayout) tag where
314+instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout, Reflex t)
315+ => HasClient t m (QueryParams sym a :> sublayout) where
421316
422− type Client t m (QueryParams sym a :> sublayout) tag =
423− Dynamic t [a] -> Client t m sublayout tag
317+ type Client t m (QueryParams sym a :> sublayout) =
318+ Dynamic t [a] -> Client t m sublayout
424319
425− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap paramlist =
426− clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t req' baseurl opts wrap
320+ clientWithRoute Proxy q req baseurl paramlist =
321+ clientWithRoute (Proxy :: Proxy sublayout) q req' baseurl
427322
428323 where req' = req { qParams = (T.pack pname, params') : qParams req }
429324 pname = symbolVal (Proxy :: Proxy sym)
430− params' = QueryPartParams $ (fmap . fmap) toQueryParam
325+ params' = QueryPartParams $ (fmap . fmap) (toQueryParam)
431326 paramlist
432327
433328
434−
435329-- | If you use a 'QueryFlag' in one of your endpoints in your API,
436330-- the corresponding querying function will automatically take
437331-- an additional 'Bool' argument.
@@ -456,42 +350,49 @@ instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout tag, Reflex
456350-- > -- 'getBooksBy True' to only get _already published_ books
457351
458352-- TODO Bring back
459−instance (KnownSymbol sym, HasClient t m sublayout tag, Reflex t)
460− => HasClient t m (QueryFlag sym :> sublayout) tag where
353+instance (KnownSymbol sym, HasClient t m sublayout, Reflex t)
354+ => HasClient t m (QueryFlag sym :> sublayout) where
461355
462− type Client t m (QueryFlag sym :> sublayout) tag =
463− Dynamic t Bool -> Client t m sublayout tag
356+ type Client t m (QueryFlag sym :> sublayout) =
357+ Dynamic t Bool -> Client t m sublayout
464358
465− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap flag =
466− clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t req' baseurl opts wrap
359+ clientWithRoute Proxy q req baseurl flag =
360+ clientWithRoute (Proxy :: Proxy sublayout) q req' baseurl
467361
468362 where req' = req { qParams = thisPair : qParams req }
469363 thisPair = (T.pack pName, QueryPartFlag flag) :: (Text, QueryPart t)
470364 pName = symbolVal (Proxy :: Proxy sym)
471365
472366
473−
474−-- | Send a raw 'XhrRequest ()' directly to 'baseurl'
475−instance SupportsServantReflex t m => HasClient t m Raw tag where
476− type Client t m Raw tag = Dynamic t (Either Text (XhrRequest ()))
477− -> Event t tag
478− -> m (Event t (ReqResult tag ()))
479−
480− clientWithRouteAndResultHandler _ _ _ _ baseurl _ wrap xhrs triggers = do
481−
482− let xhrs' = liftA2 (\x path -> case x of
483− Left e -> Left e
484− Right jx -> Right $ jx { _xhrRequest_url = path <> _xhrRequest_url jx }
485− ) xhrs (showBaseUrl <$> baseurl)
486− xhrs'' = attachPromptlyDynWith (flip (,)) xhrs' triggers :: Event t (tag, Either Text (XhrRequest ()))
487− badReq = fmapMaybe (\(t,x) -> either (Just . (t,)) (const Nothing) x) xhrs'' :: Event t (tag, Text)
488− okReq = fmapMaybe (\(t,x) -> either (const Nothing) (Just . (t,)) x) xhrs'' :: Event t (tag, XhrRequest ())
489−
490− resps <- performRequestsAsync okReq
491− wrap $ leftmost [ uncurry RequestFailure <$> badReq
492− , evalResponse (const $ Right ()) <$> resps
493− ]
494−
367+-- | Pick a 'Method' and specify where the server you want to query is. You get
368+-- back the full `Response`.
369+-- TODO redo
370+instance SupportsServantReflex t m => HasClient t m Raw where
371+ type Client t m Raw = Dynamic t (Either Text (XhrRequest ()))
372+ -> Event t ()
373+ -> m (Event t (ReqResult ()))
374+
375+ -- clientWithRoute :: Proxy Raw -> Proxy m -> Req -> BaseUrl -> Client t m Raw
376+ clientWithRoute _ _ _ baseurl xhrs triggers = do
377+ let xhrs' = liftA2 (\x path -> case x of
378+ Left e -> Left e
379+ Right jx -> Right $ jx {_xhrRequest_url = path
380+ <> _xhrRequest_url jx})
381+ xhrs
382+ (showBaseUrl <$> baseurl)
383+ reqs = tagPromptlyDyn xhrs' triggers
384+ okReq = fmapMaybe hush reqs
385+ badReq = fmapMaybe tattle reqs
386+ resps <- performRequestAsync okReq
387+ return $ leftmost [fmap (ResponseSuccess () ) resps
388+ ,fmap RequestFailure badReq]
389+
390+
391+hush :: Either e a -> Maybe a
392+hush = either (const Nothing) Just
393+
394+tattle :: Either e a -> Maybe e
395+tattle = either Just (const Nothing)
495396
496397-- | If you use a 'ReqBody' in one of your endpoints in your API,
497398-- the corresponding querying function will automatically take
@@ -513,14 +414,14 @@ instance SupportsServantReflex t m => HasClient t m Raw tag where
513414-- > where host = BaseUrl Http "localhost" 8080
514415-- > -- then you can just use "addBook" to query that endpoint
515416
516−instance (MimeRender ct a, HasClient t m sublayout tag, Reflex t)
517− => HasClient t m (ReqBody (ct ': cts) a :> sublayout) tag where
417+instance (MimeRender ct a, HasClient t m sublayout, Reflex t)
418+ => HasClient t m (ReqBody (ct ': cts) a :> sublayout) where
518419
519− type Client t m (ReqBody (ct ': cts) a :> sublayout) tag =
520− Dynamic t (Either Text a) -> Client t m sublayout tag
420+ type Client t m (ReqBody (ct ': cts) a :> sublayout) =
421+ Dynamic t (Either Text a) -> Client t m sublayout
521422
522− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap body =
523− clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t req' baseurl opts wrap
423+ clientWithRoute Proxy q req baseurl body =
424+ clientWithRoute (Proxy :: Proxy sublayout) q req' baseurl
524425 where req' = req { reqBody = bodyBytesCT }
525426 ctProxy = Proxy :: Proxy ct
526427 ctString = T.pack $ show $ contentType ctProxy
@@ -528,49 +429,43 @@ instance (MimeRender ct a, HasClient t m sublayout tag, Reflex t)
528429 (\b -> (mimeRender ctProxy b, ctString))
529430 body
530431
531−
532−
533432-- | Make the querying function append @path@ to the request path.
534−instance (KnownSymbol path, HasClient t m sublayout tag, Reflex t) => HasClient t m (path :> sublayout) tag where
535− type Client t m (path :> sublayout) tag = Client t m sublayout tag
433+instance (KnownSymbol path, HasClient t m sublayout, Reflex t) => HasClient t m (path :> sublayout) where
434+ type Client t m (path :> sublayout) = Client t m sublayout
536435
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
436+ clientWithRoute Proxy q req baseurl =
437+ clientWithRoute (Proxy :: Proxy sublayout) q
438+ (prependToPathParts (pure (Right $ T.pack p)) req)
439+ baseurl
540440
541441 where p = symbolVal (Proxy :: Proxy path)
542442
443+instance HasClient t m api => HasClient t m (Vault :> api) where
444+ type Client t m (Vault :> api) = Client t m api
543445
544−instance HasClient t m api tag => HasClient t m (Vault :> api) tag where
545− type Client t m (Vault :> api) tag = Client t m api tag
546−
547− clientWithRouteAndResultHandler Proxy =
548− clientWithRouteAndResultHandler (Proxy :: Proxy api)
549−
550−
551−instance HasClient t m api tag => HasClient t m (RemoteHost :> api) tag where
552− type Client t m (RemoteHost :> api) tag = Client t m api tag
446+ clientWithRoute Proxy q req baseurl =
447+ clientWithRoute (Proxy :: Proxy api) q req baseurl
553448
554− clientWithRouteAndResultHandler Proxy =
555− clientWithRouteAndResultHandler (Proxy :: Proxy api)
449+instance HasClient t m api => HasClient t m (RemoteHost :> api) where
450+ type Client t m (RemoteHost :> api) = Client t m api
556451
452+ clientWithRoute Proxy q req baseurl =
453+ clientWithRoute (Proxy :: Proxy api) q req baseurl
557454
455+instance HasClient t m api => HasClient t m (IsSecure :> api) where
456+ type Client t m (IsSecure :> api) = Client t m api
558457
559−instance HasClient t m api tag => HasClient t m (IsSecure :> api) tag where
560− type Client t m (IsSecure :> api) tag = Client t m api tag
458+ clientWithRoute Proxy q req baseurl =
459+ clientWithRoute (Proxy :: Proxy api) q req baseurl
561460
562− clientWithRouteAndResultHandler Proxy =
563− clientWithRouteAndResultHandler (Proxy :: Proxy api)
461+instance (HasClient t m api, Reflex t)
462+ => HasClient t m (BasicAuth realm usr :> api) where
564463
464+ type Client t m (BasicAuth realm usr :> api) = Dynamic t (Maybe BasicAuthData)
465+ -> Client t m api
565466
566−instance (HasClient t m api tag, Reflex t)
567− => HasClient t m (BasicAuth realm usr :> api) tag where
568−
569− type Client t m (BasicAuth realm usr :> api) tag = Dynamic t (Maybe BasicAuthData)
570− -> Client t m api tag
571−
572− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap authdata =
573− clientWithRouteAndResultHandler (Proxy :: Proxy api) q t req' baseurl opts wrap
467+ clientWithRoute Proxy q req baseurl authdata =
468+ clientWithRoute (Proxy :: Proxy api) q req' baseurl
574469 where
575470 req' = req { authData = Just authdata }
576471
@@ -596,30 +491,3 @@ non-empty lists, but is otherwise more specific, no instance will be overall
596491more specific. This in turn generally means adding yet another instance (one
597492for empty and one for non-empty lists).
598493-}
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−