aaron levin
436046eb33
Remove deepseq dependency
2016-01-16 19:07:54 +01:00
aaron levin
8e1bed96c6
Update auth combinators across projects, fix build
2016-01-16 18:32:00 +01:00
aaron levin
9decfee68b
Remove unneeded tag from BasicAuth
2016-01-16 18:09:10 +01:00
aaron levin
2e7778d1d6
Merge commit '8ecc3f07064a3a627b8e49fb182789c82cd9c5d7' into jkarni/config
2016-01-16 17:46:23 +01:00
Sönke Hahn
8ecc3f0706
server: added Config machinery
2016-01-16 17:05:25 +01:00
Sönke Hahn
c6e0ccbc2f
server/docs: fix formatting inconsistency
2016-01-14 23:58:48 +01:00
aaron levin
9e71d083e5
Fix post-merge build
2016-01-10 12:42:06 +01:00
aaron levin
1146d15f52
Merge branch 'shahn/config' into jkarni/config
2016-01-10 12:28:48 +01:00
aaron levin
eafc5d33bb
Rename HList append from .: to .:.
...
Avoids conflicting with Data.Aeson.((.:))
2016-01-10 11:43:07 +01:00
aaron levin
f816ce30b3
Add authentication tests
2016-01-10 00:07:41 +01:00
aaron levin
970af450dd
Remove servant-server specific type from AuthProtect
...
the 'user' type is valid only for servant-server, so lets move it out of
the combinator. This means we need to use type families when
implementing the server.
2016-01-09 17:33:19 +01:00
Sönke Hahn
33cc9958ed
Merge remote-tracking branch 'origin/master' into shahn/config
...
Conflicts:
servant-server/test/Servant/ServerSpec.hs
2016-01-09 13:00:42 +01:00
Sönke Hahn
4384c1df07
remove debugging print
2016-01-09 12:34:52 +01:00
Sönke Hahn
66628ca043
config: added Show instance
2016-01-08 18:15:01 +01:00
Julian K. Arni
f1b6603c52
Review fixes
2016-01-08 18:03:28 +01:00
Sönke Hahn
5c863b2043
remove unneeded instances
2016-01-08 17:25:40 +01:00
Sönke Hahn
d99bde5fcd
config: remove overlapping noise
2016-01-08 17:25:15 +01:00
Julian K. Arni
3cc3c5c986
Add HasCfg typeclass.
...
This is largely Aaron Levin's work. But it was done in a merge commit,
so couldn't be cherry-picked in a sensible way. Thanks Aaron!
2016-01-08 17:12:07 +01:00
Julian K. Arni
da171780b8
Tests for Config.
2016-01-08 17:12:07 +01:00
Julian K. Arni
207a807428
Add Config parameter.
...
This allows combinator instances to receive dynamic data that isn't
constrained by the interface of Delayed etc.
2016-01-08 17:12:07 +01:00
aaron levin
4865114330
BasicAuth should have a tag for config
...
Stop relying on the realm to be the tag.
2016-01-08 13:53:27 +01:00
aaron levin
3db091db57
Export BasicAuth constructor in Servant.Server
2016-01-08 12:10:36 +01:00
aaron levin
752157a777
Export Basic & General Auth combinators from Servant.Server
2016-01-08 11:45:05 +01:00
aaron levin
9a94403d97
Rename AuthResult to BasicAuthResult
...
AuthResult is not extensible enough for more complex, homegrown
combinators
2016-01-08 11:43:58 +01:00
aaron levin
0764d9b84c
Add the generalized auth combinator
2016-01-08 11:35:26 +01:00
aaron levin
08cfe21393
Fix broken doc tests in Internal/Auth.hs
2016-01-07 23:00:34 +01:00
aaron levin
4e6a6c0ce6
Use BasicAuth realm as its Config tag.
...
For a given realm, there should only be one implementation, so the realm
already serves as a unique identifier to configure BasicAuth from the
Config perspective.
This makes for less noise in the BasicAuth type.
2016-01-07 22:57:37 +01:00
aaron levin
f6bdfa3c05
Implement Basic Auth with Config Tooling
...
Extend the Config tooling to allow an implementation with Basic
Authentication.
2016-01-07 22:51:16 +01:00
Julian K. Arni
783a849c67
Make NoContent still take an arg.
...
For consistency with other combinators, and to make using headers
easier.
2016-01-07 14:30:08 +01:00
Julian K. Arni
5909a6df7a
Fix rebase issues.
2016-01-07 13:47:08 +01:00
Julian K. Arni
c6071bfb02
Don't override status code on empty body.
2016-01-07 13:47:08 +01:00
Julian K. Arni
cda8bcf17c
Simplify verb combinators.
...
Create a single 'Verb' combinator with parameters for status code and
method. Make existing combinators type synonyms of 'Verb'.
2016-01-07 13:47:07 +01:00
Julian K. Arni
f8ea9ba8fe
Add HasCfg typeclass.
...
This is largely Aaron Levin's work. But it was done in a merge commit,
so couldn't be cherry-picked in a sensible way. Thanks Aaron!
2016-01-07 12:51:30 +01:00
Julian K. Arni
e9db7f651c
Tests for Config.
2016-01-07 12:18:42 +01:00
Julian K. Arni
212f066736
Add Config parameter.
...
This allows combinator instances to receive dynamic data that isn't
constrained by the interface of Delayed etc.
2016-01-07 12:18:42 +01:00
Julian K. Arni
ebfae81b1f
Fix rebase issues.
2016-01-06 17:17:14 +01:00
Julian K. Arni
6c6b438b31
Don't override status code on empty body.
2016-01-06 17:13:21 +01:00
Julian K. Arni
c27efeca7e
Simplify verb combinators.
...
Create a single 'Verb' combinator with parameters for status code and
method. Make existing combinators type synonyms of 'Verb'.
2016-01-06 17:13:21 +01:00
Luigy Leon
17fcc25d87
add include header files to extra-source-files
2016-01-04 23:05:05 -05:00
Julian K. Arni
79d4f944a4
less OverlappingInstances noise
2016-01-04 13:09:11 -05:00
Julian K. Arni
a4a0f1988b
Bump wai and warp upper bound to < 3.3.
2016-01-04 17:21:14 +01:00
Philipp Kant
da5c273640
Relaxed upper version bound for http-api-data ...
...
... in order to include http-api-data-0.2.1, which is currently in LTS
Haskell (lts-3.16).
2015-12-03 14:13:50 +01:00
Simon Hengel
4e53e2083b
Use tinc on travis
2015-11-05 09:32:13 +08:00
Julian K. Arni
9c12b7839b
7.8 routing fixes, -Wall, cleanup, changelog.
2015-10-26 16:56:46 +01:00
Andres Loeh
1398d1f5e1
More systematic approach to delayed checks.
...
This introduces a `Delayed` type in `RoutingApplication.hs` that
contains a handler together with delayed checks. There are several
blocks of delayed checks, so that we can ultimately execute them in the
order we desire.
The process is documented in more detail in `RoutingApplication.hs`.
2015-10-26 16:56:25 +01:00
Julian K. Arni
ccadba81ec
Cleanup errorspec description of routing, changelog.
...
Review fixes
2015-10-26 16:55:13 +01:00
Julian K. Arni
a3b5652ab9
Refactor RouteResult.
...
Fix rerouting tests
Fix 405 > 404 issue with Capture.
Remove ServantErrWithPriority and Monoid instance
More tests
Update auth-combinator for routing changes
2015-10-26 16:54:49 +01:00
Julian K. Arni
153de01a62
Error retry tests
...
Mime[Un]Render instances for PlainText String
pragmas and formatting
2015-10-26 16:54:28 +01:00
Julian K. Arni
9c62a3b150
Error order tests
2015-10-20 12:41:32 +02:00
Julian K. Arni
c22b5d1938
Changelogs for matrix params
2015-10-13 21:46:52 +02:00