@@ -1,23 +1,16 @@
1−{-# LANGUAGE AllowAmbiguousTypes #-}
1+{-# LANGUAGE CPP #-}
3−{-# LANGUAGE DataKinds #-}
2+{-# LANGUAGE DataKinds #-}
4−{-# LANGUAGE FlexibleContexts #-}
3+{-# LANGUAGE FlexibleContexts #-}
5−{-# LANGUAGE FlexibleInstances #-}
4+{-# LANGUAGE FlexibleInstances #-}
6−{-# LANGUAGE GeneralizedNewtypeDeriving #-}
7−{-# LANGUAGE InstanceSigs #-}
5+{-# LANGUAGE InstanceSigs #-}
8−{-# LANGUAGE MultiParamTypeClasses #-}
9−{-# LANGUAGE OverloadedStrings #-}
6+{-# LANGUAGE OverloadedStrings #-}
10−{-# LANGUAGE PolyKinds #-}
7+{-# LANGUAGE PolyKinds #-}
11−{-# LANGUAGE Rank2Types #-}
12−{-# LANGUAGE ScopedTypeVariables #-}
8+{-# LANGUAGE ScopedTypeVariables #-}
13−{-# LANGUAGE TupleSections #-}
9+{-# LANGUAGE TupleSections #-}
14−{-# LANGUAGE TypeFamilies #-}
10+{-# LANGUAGE TypeFamilies #-}
15−{-# LANGUAGE TypeOperators #-}
11+{-# LANGUAGE TypeOperators #-}
16−{-# LANGUAGE UndecidableInstances #-}
12+{-# LANGUAGE UndecidableInstances #-}
17−
13+{-# LANGUAGE MultiParamTypeClasses #-}
18−#if MIN_VERSION_base(4,9,0)
19−{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
22-- #include "overlapping-compat.h"
15-- #include "overlapping-compat.h"
23-- | This module provides 'client' which can automatically generate
16-- | This module provides 'client' which can automatically generate
@@ -25,71 +18,31 @@
26module Servant.Reflex
19module Servant.Reflex
28− , clientWithOpts
21+ , HasClient(..)
29− , clientWithOptsAndResultHandler
31− , clientWithRouteAndResultHandler
32− , BuildHeaderKeysTo(..)
36 , module Servant.Common.Req
22 , module Servant.Common.Req
37 , module Servant.Common.BaseUrl
23 , module Servant.Common.BaseUrl
40−------------------------------------------------------------------------------
41−import Control.Applicative
26+import Control.Applicative ((<$>), liftA2)
27+import Control.Monad.Trans.Except
28+import qualified Data.ByteString.Char8 as BS
29+import Data.ByteString.Lazy (ByteString)
42−import qualified Data.CaseInsensitive as CI
30+import qualified Data.CaseInsensitive as CI
43−import Data.Functor.Identity
31+import Data.List
44−import qualified Data.Map as Map
32+import Data.Proxy
45−import Data.Monoid ((<>))
33+import Data.String.Conversions
46−import Data.Proxy (Proxy (..))
34+import Data.Maybe (maybeToList)
47−import qualified Data.Set as Set
48−import Data.Text (Text)
35+import Data.Text (unpack)
49−import qualified Data.Text as T
36+import Data.Traversable (sequenceA)
50−import qualified Data.Text.Encoding as E
51−import GHC.Exts (Constraint)
52−import GHC.TypeLits (KnownSymbol, symbolVal)
37+import GHC.TypeLits
53−import Servant.API ((:<|>) (..), (:>), BasicAuth,
38+import qualified Network.HTTP.Media as M
54− BasicAuthData, BuildHeadersTo (..),
39+import Servant.API
55− Capture, Header, Headers (..),
56− HttpVersion, IsSecure,
57− MimeRender (..), MimeUnrender,
58− NoContent, QueryFlag, QueryParam,
59− QueryParams, Raw, ReflectMethod (..),
61− ToHttpApiData (..), Vault, Verb,
63−import Servant.API.Description (Summary)
64−import qualified Servant.Auth as Auth
66−import Reflex.Dom.Core (Dynamic, Event, Reflex,
67− XhrRequest (..), XhrResponse (..),
68− XhrResponseHeaders (..),
69− attachPromptlyDynWith, constDyn, ffor,
71− performRequestsAsync)
72−------------------------------------------------------------------------------
73−import Servant.Common.BaseUrl (BaseUrl(..), Scheme(..), baseUrlWidget,
40+import Servant.Common.BaseUrl
75− SupportsServantReflex)
76−import Servant.Common.Req (ClientOptions(..),
41+import Servant.Common.Req
77− defaultClientOptions,
42+import Servant.API.ContentTypes
78− Req, ReqResult(..), QParam(..),
43+import Reflex
79− QueryPart(..), addHeader, authData,
44+import Reflex.Dom
80− defReq, evalResponse, prependToPathParts,
45+import Reflex.Dom.Xhr
83− -- performRequestNoBody,
84− performRequestsNoBody,
85− performSomeRequestsAsync,
86− qParamToQueryPart, reqBody,
87− reqSuccess, reqFailure,
88− reqMethod, respHeaders,
91− qParams, withCredentials)
94-- * Accessing APIs as a Client
47-- * Accessing APIs as a Client
@@ -101,191 +54,116 @@ import Servant.Common.Req (ClientOptions(..),
101-- > myApi :: Proxy MyApi
54-- > myApi :: Proxy MyApi
102-- > myApi = Proxy
55-- > myApi = Proxy
104−-- > getAllBooks :: Event t l -> m (Event t (l, ReqResult [Book]))
57+-- > getAllBooks :: Event t () -> m (Event t (Either XhrError ((),[Book])))
105−-- > postNewBook :: Dynamic t (Maybe Book) -> Event t l
58+-- > postNewBook :: Behavior t (Maybe Book) -> Event t ()
106−-- > -> m (Event t (l, ReqResult Book)))
59+-- -> m (Event t (Either XhrError (Book,Book)))
107-- > (getAllBooks :<|> postNewBook) = client myApi host
60-- > (getAllBooks :<|> postNewBook) = client myApi host
108-- > where host = constDyn $ BaseUrl Http "localhost" 8080
61-- > where host = constDyn $ BaseUrl Http "localhost" 8080
109−client
62+client :: (HasClient t m layout, MonadWidget t m)
110− :: (HasClient t m layout tag)
114− -> Dynamic t BaseUrl
115− -> Client t m layout tag
116−client p q t baseurl = clientWithRoute p q t defReq baseurl defaultClientOptions
119− :: (HasClient t m layout tag)
123− -> Dynamic t BaseUrl
63+ => Proxy layout -> Proxy m -> Dynamic t BaseUrl -> Client t m layout
125− -> Client t m layout tag
126−clientWithOpts p q t baseurl = clientWithRoute p q t defReq baseurl
64+client p q baseurl = clientWithRoute p q defReq baseurl
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)
136− -> Dynamic t BaseUrl
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
143-- | This class lets us define how each API combinator
66-- | This class lets us define how each API combinator
144-- influences the creation of an HTTP request. It's mostly
67-- influences the creation of an HTTP request. It's mostly
145-- an internal class, you can just use 'client'.
68-- an internal class, you can just use 'client'.
146−class Monad m => HasClient t m layout (tag :: *) where
69+class HasClient t m layout where
147− type Client t m layout tag :: *
70+ type Client t m layout :: *
148− clientWithRoute
71+ clientWithRoute :: Proxy layout -> Proxy m -> Req t -> Dynamic t BaseUrl -> Client t m layout
153− -> Dynamic t BaseUrl
155− -> Client t m layout tag
156− clientWithRoute l m t r b o = clientWithRouteAndResultHandler l m t r b o return
158− clientWithRouteAndResultHandler
163− -> Dynamic t BaseUrl
165− -> (forall a. Event t (ReqResult tag a) -> m (Event t (ReqResult tag a)))
166− -> Client t m layout tag
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
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
74+instance (HasClient t m a, HasClient t m b) => HasClient t m (a :<|> b) where
75+ type Client t m (a :<|> b) = Client t m a :<|> Client t m b
76+ clientWithRoute Proxy q req baseurl =
77+ clientWithRoute (Proxy :: Proxy a) q req baseurl :<|>
78+ clientWithRoute (Proxy :: Proxy b) q req baseurl
177-- Capture. Example:
80-- Capture. Example:
178-- > type MyApi = "books" :> Capture "isbn" Text :> Get '[JSON] Book
81-- > type MyApi = "books" :> Capture "isbn" Text :> Get '[JSON] Book
180-- > myApi :: Proxy MyApi = Proxy
83-- > myApi :: Proxy MyApi = Proxy
182−-- > getBook :: SupportsServantReflex t m
85+-- > getBook :: MonadWidget t m
183-- => Dynamic t BaseUrl
86-- => Dynamic t BaseUrl
184−-- -> Dynamic t (Maybe Text)
87+-- -> Behavior t (Maybe Text)
185−-- -> Event t l
88+-- -> Event t ()
186−-- -> m (Event t (l, ReqResult Book))
89+-- -> m (Event t (Either XhrError (Text, Book)))
187-- > getBook = client myApi (constDyn host)
90-- > getBook = client myApi (constDyn host)
91+instance (MonadWidget t m, KnownSymbol capture, ToHttpApiData a, HasClient t m sublayout)
92+ => HasClient t m (Capture capture a :> sublayout) where
189−instance (SupportsServantReflex t m, ToHttpApiData a, HasClient t m sublayout tag)
190− => HasClient t m (Capture capture a :> sublayout) tag where
192− type Client t m (Capture capture a :> sublayout) tag =
94+ type Client t m (Capture capture a :> sublayout) =
193− Dynamic t (Either Text a) -> Client t m sublayout tag
95+ Behavior t (Either String a) -> Client t m sublayout
195− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap val =
97+ clientWithRoute Proxy q req baseurl val =
196− clientWithRouteAndResultHandler
98+ clientWithRoute (Proxy :: Proxy sublayout)
197− (Proxy :: Proxy sublayout) q t (prependToPathParts p req) baseurl opts wrap
100+ (prependToPathParts p req)
198− where p = (fmap . fmap) (toUrlPiece) val
101+ baseurl
103+ where p = (fmap . fmap) (unpack . toUrlPiece) val
201-- VERB (Returning content) --
105-- VERB (Returning content) --
202instance {-# OVERLAPPABLE #-}
106instance {-# OVERLAPPABLE #-}
203 -- Note [Non-Empty Content Types]
107 -- Note [Non-Empty Content Types]
204− (MimeUnrender ct a, ReflectMethod method, cts' ~ (ct ': cts), SupportsServantReflex t m
108+ (MimeUnrender ct a, ReflectMethod method, cts' ~ (ct ': cts), MonadWidget t m
205− ) => HasClient t m (Verb method status cts' a) tag where
109+ ) => HasClient t m (Verb method status cts' a) where
206− type Client t m (Verb method status cts' a) tag =
110+ type Client t m (Verb method status cts' a) =
207− Event t tag -> m (Event t (ReqResult tag a))
111+ Event t () -> m (Event t (ReqResult a))
208 -- TODO how to access input types here?
112 -- TODO how to access input types here?
209 -- ExceptT ServantError IO a
113 -- ExceptT ServantError IO a
210− clientWithRouteAndResultHandler Proxy _ _ req baseurl opts wrap trigs =
114+ clientWithRoute Proxy q req baseurl =
211− wrap =<< fmap runIdentity <$> performRequestsCT (Proxy :: Proxy ct) method (constDyn $ Identity $ req') baseurl opts trigs
115+ performRequestCT (Proxy :: Proxy ct) method req' baseurl
212− where method = E.decodeUtf8 $ reflectMethod (Proxy :: Proxy method)
116+ where method = BS.unpack $ reflectMethod (Proxy :: Proxy method)
213 req' = req { reqMethod = method }
117 req' = req { reqMethod = method }
216-- -- VERB (No content) --
119-- -- VERB (No content) --
217instance {-# OVERLAPPING #-}
120instance {-# OVERLAPPING #-}
218− (ReflectMethod method, SupportsServantReflex t m) =>
121+ (ReflectMethod method, MonadWidget t m) =>
219− HasClient t m (Verb method status cts NoContent) tag where
122+ HasClient t m (Verb method status cts NoContent) where
220− type Client t m (Verb method status cts NoContent) tag =
123+ type Client t m (Verb method status cts NoContent) =
221− Event t tag -> m (Event t (ReqResult tag NoContent))
124+ Event t () -> m (Event t (ReqResult NoContent))
222 -- TODO: how to access input types here?
125 -- TODO: how to access input types here?
223 -- ExceptT ServantError IO NoContent
126 -- ExceptT ServantError IO NoContent
224− clientWithRouteAndResultHandler Proxy _ _ req baseurl opts wrap trigs =
127+ clientWithRoute Proxy q req baseurl =
225− wrap =<< fmap runIdentity <$> performRequestsNoBody method (constDyn $ Identity req) baseurl opts trigs
128+ performRequestNoBody method req baseurl
226− where method = E.decodeUtf8 $ reflectMethod (Proxy :: Proxy method)
129+ where method = BS.unpack $ reflectMethod (Proxy :: Proxy method)
228−
131+-- -- HEADERS Verb (Content) --
229−toHeaders :: BuildHeadersTo ls => ReqResult tag a -> ReqResult tag (Headers ls a)
132+-- -- Headers combinator not treated in fully general case,
230−toHeaders r =
133+-- -- in order to deny instances for (Headers ls (Capture "id" Int)),
231− let hdrs = maybe []
134+-- -- a combinator that wouldn't make sense
232− (\xhr -> fmap (\(h,v) -> (CI.map E.encodeUtf8 h, E.encodeUtf8 v))
135+-- -- TODO Overlapping??
233− (Map.toList $ _xhrResponse_headers xhr))
136+-- instance {-# OVERLAPPABLE #-}
234− (response r)
137+-- -- Note [Non-Empty Content Types]
138+-- ( MimeUnrender ct a, BuildHeadersTo ls,
139+-- ReflectMethod method, cts' ~ (ct ': cts),
141+-- ) => HasClient t m (Verb method status cts' (Headers ls a)) where
142+-- type Client t m (Verb method status cts' (Headers ls a))
143+-- = Event t () -> m (Event t (Maybe a, XhrResponse))
144+-- -- ExceptT ServantError IO (Headers ls a)
145+-- clientWithRoute Proxy req baseurl = do
146+-- let method = reflectMethod (Proxy :: Proxy method)
147+-- (hdrs, resp) <- performRequestCT (Proxy :: Proxy ct) method req baseurl
148+-- return $ Headers { getResponse = resp
235− in ffor r $ \a -> Headers {getResponse = a ,getHeadersHList = buildHeadersTo hdrs}
149+-- , getHeadersHList = buildHeadersTo hdrs
238−class BuildHeaderKeysTo hs where
239− buildHeaderKeysTo :: Proxy hs -> [CI.CI T.Text]
241−instance {-# OVERLAPPABLE #-} BuildHeaderKeysTo '[]
242− where buildHeaderKeysTo _ = []
244−instance {-# OVERLAPPABLE #-} (BuildHeaderKeysTo xs, KnownSymbol h)
245− => BuildHeaderKeysTo ((Header h v) ': xs) where
246− buildHeaderKeysTo _ =
248− thisKey = CI.mk $ T.pack (symbolVal (Proxy :: Proxy h))
249− in thisKey : buildHeaderKeysTo (Proxy :: Proxy xs)
252−-- HEADERS Verb (Content) --
253−-- Headers combinator not treated in fully general case,
254−-- in order to deny instances for (Headers ls (Capture "id" Int)),
255−-- a combinator that wouldn't make sense
256-- TODO Overlapping??
152-- TODO Overlapping??
257−instance {-# OVERLAPPABLE #-}
258− -- Note [Non-Empty Content Types]
259− ( MimeUnrender ct a, BuildHeadersTo ls, BuildHeaderKeysTo ls,
260− ReflectMethod method, cts' ~ (ct ': cts),
261− 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
266− 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
269− where req' = req { respHeaders =
270− OnlyHeaders (Set.fromList (buildHeaderKeysTo (Proxy :: Proxy ls)))
274−-- HEADERS Verb (No content) --
153+-- -- HEADERS Verb (No content) --
275−instance {-# OVERLAPPABLE #-}
154+-- instance {-# OVERLAPPABLE #-}
276− ( BuildHeadersTo ls, BuildHeaderKeysTo ls, ReflectMethod method,
155+-- ( BuildHeadersTo ls, ReflectMethod method,
277− SupportsServantReflex t m
156+-- MonadWidget t m
278− ) => HasClient t m (Verb method status cts (Headers ls NoContent)) tag where
157+-- ) => HasClient t m (Verb method status cts (Headers ls NoContent)) where
279− type Client t m (Verb method status cts (Headers ls NoContent)) tag
158+-- type Client t m (Verb method status cts (Headers ls NoContent))
159+-- = Event t () -> m (Event t XhrResponse)
280− = Event t tag -> m (Event t (ReqResult tag (Headers ls NoContent)))
160+-- -- ExceptT ServantError IO (Headers ls NoContent)
281− clientWithRouteAndResultHandler Proxy _ _ req baseurl opts wrap trigs = do
161+-- clientWithRoute Proxy req baseurl = do
282− let method = E.decodeUtf8 $ reflectMethod (Proxy :: Proxy method)
162+-- let method = reflectMethod (Proxy :: Proxy method)
283− resp <- fmap runIdentity <$> performRequestsNoBody method (constDyn $ Identity req') baseurl opts trigs
163+-- hdrs <- performRequestNoBody method req baseurl
284− wrap $ toHeaders <$> resp
164+-- return $ Headers { getResponse = NoContent
285− where req' = req {respHeaders =
165+-- , getHeadersHList = buildHeadersTo hdrs
286− OnlyHeaders (Set.fromList (buildHeaderKeysTo (Proxy :: Proxy ls)))
@@ -302,46 +180,34 @@ instance {-# OVERLAPPABLE #-}
302-- > -- then you can just use "viewRefer" to query that endpoint
180-- > -- then you can just use "viewRefer" to query that endpoint
303-- > -- specifying Nothing or e.g Just "http://haskell.org/" as arguments
181-- > -- specifying Nothing or e.g Just "http://haskell.org/" as arguments
304instance (KnownSymbol sym, ToHttpApiData a,
182instance (KnownSymbol sym, ToHttpApiData a,
305− HasClient t m sublayout tag, SupportsServantReflex t m)
183+ HasClient t m sublayout, MonadWidget t m)
306− => HasClient t m (Header sym a :> sublayout) tag where
184+ => HasClient t m (Header sym a :> sublayout) where
308− type Client t m (Header sym a :> sublayout) tag =
309− Dynamic t (Either Text a) -> Client t m sublayout tag
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)
316− where hname = T.pack $ symbolVal (Proxy :: Proxy sym)
186+ type Client t m (Header sym a :> sublayout) =
187+ Behavior t (Either String a) -> Client t m sublayout
189+ clientWithRoute Proxy q req baseurl mval =
190+ clientWithRoute (Proxy :: Proxy sublayout)
193+ -- (maybe req -- TODO Need to pass the header in
194+ -- (\value -> Servant.Common.Req.addHeader hname value req)
199+ where hname = symbolVal (Proxy :: Proxy sym)
321-- | Using a 'HttpVersion' combinator in your API doesn't affect the client
201-- | Using a 'HttpVersion' combinator in your API doesn't affect the client
322-- functions.
202-- functions.
323−instance HasClient t m sublayout tag
203+instance HasClient t m sublayout
324− => HasClient t m (HttpVersion :> sublayout) tag where
204+ => HasClient t m (HttpVersion :> sublayout) where
326− type Client t m (HttpVersion :> sublayout) tag =
327− Client t m sublayout tag
329− clientWithRouteAndResultHandler Proxy =
330− clientWithRouteAndResultHandler (Proxy :: Proxy sublayout)
332−-- | Using a 'Summary' combinator in your API doesn't affect the client
334−instance (HasClient t m sublayout tag, KnownSymbol sym)
335− => HasClient t m (Summary sym :> sublayout) tag where
337− type Client t m (Summary sym :> sublayout) tag =
338− Client t m sublayout tag
340− clientWithRouteAndResultHandler Proxy =
341− clientWithRouteAndResultHandler (Proxy :: Proxy sublayout)
206+ type Client t m (HttpVersion :> sublayout) =
207+ Client t m sublayout
209+ clientWithRoute Proxy q =
210+ clientWithRoute (Proxy :: Proxy sublayout) q
346-- | If you use a 'QueryParam' in one of your endpoints in your API,
212-- | If you use a 'QueryParam' in one of your endpoints in your API,
347-- the corresponding querying function will automatically take
213-- the corresponding querying function will automatically take
@@ -369,24 +235,21 @@ instance (HasClient t m sublayout tag, KnownSymbol sym)
369-- > -- then you can just use "getBooksBy" to query that endpoint.
235-- > -- then you can just use "getBooksBy" to query that endpoint.
370-- > -- 'getBooksBy Nothing' for all books
236-- > -- 'getBooksBy Nothing' for all books
371-- > -- 'getBooksBy (Just "Isaac Asimov")' to get all books by Isaac Asimov
237-- > -- 'getBooksBy (Just "Isaac Asimov")' to get all books by Isaac Asimov
372−instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout tag, Reflex t)
238+instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout, Reflex t)
373− => HasClient t m (QueryParam sym a :> sublayout) tag where
239+ => HasClient t m (QueryParam sym a :> sublayout) where
375− type Client t m (QueryParam sym a :> sublayout) tag =
241+ type Client t m (QueryParam sym a :> sublayout) =
242+ -- TODO (Maybe a), or (Maybe (Maybe a))? (should the user be able to send a Nothing)
376− Dynamic t (QParam a) -> Client t m sublayout tag
243+ Behavior t (Either String a) -> Client t m sublayout
378 -- if mparam = Nothing, we don't add it to the query string
245 -- if mparam = Nothing, we don't add it to the query string
379− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap mparam =
246+ clientWithRoute Proxy q req baseurl mparam =
380− clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t
247+ clientWithRoute (Proxy :: Proxy sublayout) q
381− (req {qParams = paramPair : qParams req}) baseurl opts wrap
248+ (req {qParams = paramPair : qParams req}) baseurl
383 where pname = symbolVal (Proxy :: Proxy sym)
250 where pname = symbolVal (Proxy :: Proxy sym)
384− --p prm = QueryPartParam $ (fmap . fmap) (toQueryParam) prm
385− --paramPair = (T.pack pname, p mparam)
386− p prm = QueryPartParam $ fmap qParamToQueryPart prm -- (fmap . fmap) (unpack . toQueryParam) prm
251+ p prm = QueryPartParam $ (fmap . fmap) (unpack . toQueryParam) prm
387− paramPair = (T.pack pname, p mparam)
252+ paramPair = (pname, p mparam)
391-- | If you use a 'QueryParams' in one of your endpoints in your API,
254-- | If you use a 'QueryParams' in one of your endpoints in your API,
392-- the corresponding querying function will automatically take
255-- the corresponding querying function will automatically take
@@ -416,22 +279,21 @@ instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout tag, Reflex
416-- > -- 'getBooksBy []' for all books
279-- > -- 'getBooksBy []' for all books
417-- > -- 'getBooksBy ["Isaac Asimov", "Robert A. Heinlein"]'
280-- > -- 'getBooksBy ["Isaac Asimov", "Robert A. Heinlein"]'
418-- > -- to get all books by Asimov and Heinlein
281-- > -- to get all books by Asimov and Heinlein
419−instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout tag, Reflex t)
282+instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout, Reflex t)
420− => HasClient t m (QueryParams sym a :> sublayout) tag where
283+ => HasClient t m (QueryParams sym a :> sublayout) where
422− type Client t m (QueryParams sym a :> sublayout) tag =
285+ type Client t m (QueryParams sym a :> sublayout) =
423− Dynamic t [a] -> Client t m sublayout tag
286+ Behavior t [a] -> Client t m sublayout
425− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap paramlist =
288+ clientWithRoute Proxy q req baseurl paramlist =
426− clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t req' baseurl opts wrap
289+ clientWithRoute (Proxy :: Proxy sublayout) q req' baseurl
428− where req' = req { qParams = (T.pack pname, params') : qParams req }
291+ where req' = req { qParams = (pname, params') : qParams req }
429 pname = symbolVal (Proxy :: Proxy sym)
292 pname = symbolVal (Proxy :: Proxy sym)
430− params' = QueryPartParams $ (fmap . fmap) toQueryParam
293+ params' = QueryPartParams $ (fmap . fmap) (unpack . toQueryParam)
431 paramlist
294 paramlist
435-- | If you use a 'QueryFlag' in one of your endpoints in your API,
297-- | If you use a 'QueryFlag' in one of your endpoints in your API,
436-- the corresponding querying function will automatically take
298-- the corresponding querying function will automatically take
437-- an additional 'Bool' argument.
299-- an additional 'Bool' argument.
@@ -456,42 +318,49 @@ instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout tag, Reflex
456-- > -- 'getBooksBy True' to only get _already published_ books
318-- > -- 'getBooksBy True' to only get _already published_ books
458-- TODO Bring back
320-- TODO Bring back
459−instance (KnownSymbol sym, HasClient t m sublayout tag, Reflex t)
321+instance (KnownSymbol sym, HasClient t m sublayout, Reflex t)
460− => HasClient t m (QueryFlag sym :> sublayout) tag where
322+ => HasClient t m (QueryFlag sym :> sublayout) where
462− type Client t m (QueryFlag sym :> sublayout) tag =
324+ type Client t m (QueryFlag sym :> sublayout) =
463− Dynamic t Bool -> Client t m sublayout tag
325+ Behavior t Bool -> Client t m sublayout
465− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap flag =
327+ clientWithRoute Proxy q req baseurl flag =
466− clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t req' baseurl opts wrap
328+ clientWithRoute (Proxy :: Proxy sublayout) q req' baseurl
468 where req' = req { qParams = thisPair : qParams req }
330 where req' = req { qParams = thisPair : qParams req }
469− thisPair = (T.pack pName, QueryPartFlag flag) :: (Text, QueryPart t)
331+ thisPair = (pName, QueryPartFlag flag) :: (String, QueryPart t)
470 pName = symbolVal (Proxy :: Proxy sym)
332 pName = symbolVal (Proxy :: Proxy sym)
473−
335+-- | Pick a 'Method' and specify where the server you want to query is. You get
474−-- | Send a raw 'XhrRequest ()' directly to 'baseurl'
336+-- back the full `Response`.
475−instance SupportsServantReflex t m => HasClient t m Raw tag where
338+instance (MonadWidget t m) => HasClient t m Raw where
476− type Client t m Raw tag = Dynamic t (Either Text (XhrRequest ()))
339+ type Client t m Raw = Behavior t (Either String XhrRequest)
477− -> Event t tag
340+ -> Event t ()
478− -> m (Event t (ReqResult tag ()))
341+ -> m (Event t (ReqResult ()))
480− clientWithRouteAndResultHandler _ _ _ _ baseurl _ wrap xhrs triggers = do
343+ -- clientWithRoute :: Proxy Raw -> Proxy m -> Req -> BaseUrl -> Client t m Raw
481−
344+ clientWithRoute p q req baseurl xhrs triggers = do
482− let xhrs' = liftA2 (\x path -> case x of
345+ let xhrs' = liftA2 (\x path -> case x of
483− Left e -> Left e
346+ Left e -> Left e
484− Right jx -> Right $ jx { _xhrRequest_url = path <> _xhrRequest_url jx }
347+ Right jx -> Right $ jx {_xhrRequest_url = path
348+ ++ _xhrRequest_url jx})
485− ) xhrs (showBaseUrl <$> baseurl)
350+ (showBaseUrl <$> current baseurl)
486− xhrs'' = attachPromptlyDynWith (flip (,)) xhrs' triggers :: Event t (tag, Either Text (XhrRequest ()))
351+ reqs = tag xhrs' triggers
487− badReq = fmapMaybe (\(t,x) -> either (Just . (t,)) (const Nothing) x) xhrs'' :: Event t (tag, Text)
352+ okReq = fmapMaybe hush reqs
488− okReq = fmapMaybe (\(t,x) -> either (const Nothing) (Just . (t,)) x) xhrs'' :: Event t (tag, XhrRequest ())
353+ badReq = fmapMaybe tattle reqs
489−
354+ resps <- performRequestAsync okReq
490− resps <- performRequestsAsync okReq
355+ return $ leftmost [fmap (ResponseSuccess () ) resps
491− wrap $ leftmost [ uncurry RequestFailure <$> badReq
356+ ,fmap RequestFailure badReq]
492− , evalResponse (const $ Right ()) <$> resps
357+
494−
359+hush :: Either e a -> Maybe a
360+hush = either (const Nothing) Just
362+tattle :: Either e a -> Maybe e
363+tattle = either Just (const Nothing)
496-- | If you use a 'ReqBody' in one of your endpoints in your API,
365-- | If you use a 'ReqBody' in one of your endpoints in your API,
497-- the corresponding querying function will automatically take
366-- the corresponding querying function will automatically take
@@ -513,64 +382,59 @@ instance SupportsServantReflex t m => HasClient t m Raw tag where
513-- > where host = BaseUrl Http "localhost" 8080
382-- > where host = BaseUrl Http "localhost" 8080
514-- > -- then you can just use "addBook" to query that endpoint
383-- > -- then you can just use "addBook" to query that endpoint
516−instance (MimeRender ct a, HasClient t m sublayout tag, Reflex t)
385+instance (MimeRender ct a, HasClient t m sublayout, Reflex t)
517− => HasClient t m (ReqBody (ct ': cts) a :> sublayout) tag where
386+ => HasClient t m (ReqBody (ct ': cts) a :> sublayout) where
519− type Client t m (ReqBody (ct ': cts) a :> sublayout) tag =
388+ type Client t m (ReqBody (ct ': cts) a :> sublayout) =
520− Dynamic t (Either Text a) -> Client t m sublayout tag
389+ Behavior t (Either String a) -> Client t m sublayout
522− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap body =
391+ clientWithRoute Proxy q req baseurl body =
523− clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t req' baseurl opts wrap
392+ clientWithRoute (Proxy :: Proxy sublayout) q req' baseurl
524 where req' = req { reqBody = bodyBytesCT }
393 where req' = req { reqBody = bodyBytesCT }
525 ctProxy = Proxy :: Proxy ct
394 ctProxy = Proxy :: Proxy ct
526− ctString = T.pack $ show $ contentType ctProxy
395+ ctString = show $ contentType ctProxy
396+ --ctString = BS.unpack . CI.original . M.mainType $ contentType ctProxy
527 bodyBytesCT = Just $ (fmap . fmap)
397 bodyBytesCT = Just $ (fmap . fmap)
528 (\b -> (mimeRender ctProxy b, ctString))
398 (\b -> (mimeRender ctProxy b, ctString))
533-- | Make the querying function append @path@ to the request path.
401-- | 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
402+instance (KnownSymbol path, HasClient t m sublayout, Reflex t) => HasClient t m (path :> sublayout) where
535− type Client t m (path :> sublayout) tag = Client t m sublayout tag
403+ type Client t m (path :> sublayout) = Client t m sublayout
537− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap =
405+ clientWithRoute Proxy q req baseurl =
538− clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t
406+ clientWithRoute (Proxy :: Proxy sublayout) q
539− (prependToPathParts (pure (Right $ T.pack p)) req) baseurl opts wrap
407+ (prependToPathParts (constant (Right p)) req)
541 where p = symbolVal (Proxy :: Proxy path)
410 where p = symbolVal (Proxy :: Proxy path)
412+instance HasClient t m api => HasClient t m (Vault :> api) where
413+ type Client t m (Vault :> api) = Client t m api
544−instance HasClient t m api tag => HasClient t m (Vault :> api) tag where
415+ clientWithRoute Proxy q req baseurl =
545− type Client t m (Vault :> api) tag = Client t m api tag
416+ clientWithRoute (Proxy :: Proxy api) q req baseurl
547− clientWithRouteAndResultHandler Proxy =
548− clientWithRouteAndResultHandler (Proxy :: Proxy api)
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
554− clientWithRouteAndResultHandler Proxy =
418+instance HasClient t m api => HasClient t m (RemoteHost :> api) where
555− clientWithRouteAndResultHandler (Proxy :: Proxy api)
419+ type Client t m (RemoteHost :> api) = Client t m api
421+ clientWithRoute Proxy q req baseurl =
422+ clientWithRoute (Proxy :: Proxy api) q req baseurl
424+instance HasClient t m api => HasClient t m (IsSecure :> api) where
425+ type Client t m (IsSecure :> api) = Client t m api
559−instance HasClient t m api tag => HasClient t m (IsSecure :> api) tag where
427+ clientWithRoute Proxy q req baseurl =
560− type Client t m (IsSecure :> api) tag = Client t m api tag
428+ clientWithRoute (Proxy :: Proxy api) q req baseurl
562− clientWithRouteAndResultHandler Proxy =
430+instance (HasClient t m api, Reflex t)
563− clientWithRouteAndResultHandler (Proxy :: Proxy api)
431+ => HasClient t m (BasicAuth realm usr :> api) where
433+ type Client t m (BasicAuth realm usr :> api) = Behavior t (Maybe BasicAuthData)
566−instance (HasClient t m api tag, Reflex t)
567− => HasClient t m (BasicAuth realm usr :> api) tag where
569− type Client t m (BasicAuth realm usr :> api) tag = Dynamic t (Maybe BasicAuthData)
570− -> Client t m api tag
572− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap authdata =
436+ clientWithRoute Proxy q req baseurl authdata =
573− clientWithRouteAndResultHandler (Proxy :: Proxy api) q t req' baseurl opts wrap
437+ clientWithRoute (Proxy :: Proxy api) q req' baseurl
575 req' = req { authData = Just authdata }
439 req' = req { authData = Just authdata }
@@ -596,30 +460,3 @@ non-empty lists, but is otherwise more specific, no instance will be overall
596more specific. This in turn generally means adding yet another instance (one
460more specific. This in turn generally means adding yet another instance (one
597for empty and one for non-empty lists).
461for empty and one for non-empty lists).
601−-- SUPPORT FOR servant-auth --
603−-- For JavaScript clients we should be sending/storing JSON web tokens in a
604−-- way that is inaccessible to JavaScript.
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
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
615− type Client t m (Auth.Auth auths a :> api) tag = Client t m api tag
616− clientWithRouteAndResultHandler Proxy = clientWithRouteAndResultHandler (Proxy :: Proxy api)
619−type family HasCookieAuth xs :: Constraint where
620− HasCookieAuth (Auth.Cookie ': xs) = ()
621− HasCookieAuth (x ': xs) = HasCookieAuth xs
622− HasCookieAuth '[] = CookieAuthNotEnabled
624−class CookieAuthNotEnabled