eeva/servant
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix line width from auth changes in servant-server

Browse source
This commit is contained in:
aaron levin 2016-01-27 20:07:16 +01:00
parent 61c5e05906
commit eb7111b965
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
servant-server/src/Servant/Server/Internal.hs
View file

@ -52,7 +52,8 @@ import Web.HttpApiData.Internal (parseHeaderMaybe,
parseQueryParamMaybe, parseQueryParamMaybe,
parseUrlPieceMaybe) parseUrlPieceMaybe)
import Servant.API ((:<|>) (..), (:>), AuthProtect, BasicAuth, Capture, import Servant.API ((:<|>) (..), (:>), AuthProtect,
BasicAuth, Capture,
Verb, ReflectMethod(reflectMethod), Verb, ReflectMethod(reflectMethod),
IsSecure(..), Header, IsSecure(..), Header,
QueryFlag, QueryParam, QueryParams, QueryFlag, QueryParam, QueryParams,
@ -420,7 +421,10 @@ instance ( AllCTUnrender list a, HasServer sublayout config
-- | Make sure the incoming request starts with @"/path"@, strip it and -- | Make sure the incoming request starts with @"/path"@, strip it and
-- pass the rest of the request path to @sublayout@. -- pass the rest of the request path to @sublayout@.
instance (KnownSymbol path, HasServer sublayout config) => HasServer (path :> sublayout) config where instance ( KnownSymbol path
, HasServer sublayout config
)
=> HasServer (path :> sublayout) config where
type ServerT (path :> sublayout) m = ServerT sublayout m type ServerT (path :> sublayout) m = ServerT sublayout m
@ -456,9 +460,14 @@ instance HasServer api config => HasServer (HttpVersion :> api) config where
route (Proxy :: Proxy api) config (passToServer subserver $ httpVersion req) route (Proxy :: Proxy api) config (passToServer subserver $ httpVersion req)
-- | Basic Authentication -- | Basic Authentication
instance (KnownSymbol realm, HasServer api config, HasConfigEntry config (BasicAuthCheck (AuthReturnType (BasicAuth realm)))) instance ( KnownSymbol realm
, HasServer api config
, HasConfigEntry config (BasicAuthCheck (AuthReturnType (BasicAuth realm)))
)
=> HasServer (BasicAuth realm :> api) config where => HasServer (BasicAuth realm :> api) config where
type ServerT (BasicAuth realm :> api) m = AuthReturnType (BasicAuth realm) -> ServerT api m
type ServerT (BasicAuth realm :> api) m =
AuthReturnType (BasicAuth realm) -> ServerT api m
route Proxy config subserver = WithRequest $ \ request -> route Proxy config subserver = WithRequest $ \ request ->
route (Proxy :: Proxy api) config (subserver `addAuthCheck` authCheck request) route (Proxy :: Proxy api) config (subserver `addAuthCheck` authCheck request)
@ -468,8 +477,13 @@ instance (KnownSymbol realm, HasServer api config, HasConfigEntry config (BasicA
authCheck req = runBasicAuth req realm basicAuthConfig authCheck req = runBasicAuth req realm basicAuthConfig
-- | General Authentication -- | General Authentication
instance (HasServer api config, HasConfigEntry config (AuthHandler Request (AuthReturnType (AuthProtect tag)))) => HasServer (AuthProtect tag :> api) config where instance ( HasServer api config
type ServerT (AuthProtect tag :> api) m = AuthReturnType (AuthProtect tag) -> ServerT api m , HasConfigEntry config (AuthHandler Request (AuthReturnType (AuthProtect tag)))
)
=> HasServer (AuthProtect tag :> api) config where
type ServerT (AuthProtect tag :> api) m =
AuthReturnType (AuthProtect tag) -> ServerT api m
route Proxy config subserver = WithRequest $ \ request -> route Proxy config subserver = WithRequest $ \ request ->
route (Proxy :: Proxy api) config (subserver `addAuthCheck` authCheck request) route (Proxy :: Proxy api) config (subserver `addAuthCheck` authCheck request)