geffzhang
54db27100d
Merge pull request #25 from TomPallister/develop
...
merge newest code
2017-05-18 08:45:50 +08:00
Juan Carlos Santana Herrera
30a5227e1e
Adds two acceptance tests that checks two scenarios:
...
- Get 401 when we do a request to api with a token issued to other api
- Get 403 when we do a request to scope not allowed
2017-05-17 15:06:21 +01:00
Philip Wood
f452e8ea86
Fixes to get build running again on macOS. Basically, re-applying changes from #41
2017-05-10 21:23:36 +01:00
Tom Pallister
89375111fc
Merge pull request #94 from juancash/multipleUpstreamHttpMethod
...
Set multiple verbs in the UpstreamHttpMethod property
2017-05-09 21:59:12 +01:00
Philip Wood
64814358fa
Merge pull request #96 from binarymash/feature/testCoverage
...
Test coverage reporting
2017-05-09 20:38:56 +01:00
Philip Wood
e9ab5d64ea
Not sure how I missed the acceptance test xunit update on the last commit. And, improve logging around test coverage.
2017-05-09 20:33:21 +01:00
Philip Wood
944e96c4f8
update to latest xunit prerelease
2017-05-09 19:44:47 +01:00
Juan Carlos Santana Herrera
ac49022274
Updated CharactersDontMatch method.
...
At this point the comparer must ignore case sensitive.
2017-05-09 19:02:26 +01:00
Tom Pallister
e34317a539
Update README.md
2017-05-09 17:43:15 +01:00
Philip Wood
28de6f2fbf
Oops. Forgot to do this switcheroo after testing locally.
2017-05-09 13:06:54 +01:00
Philip Wood
0507806aae
Rough first go at test coverage. Might need tidying up.
2017-05-06 17:53:44 +01:00
Juan Carlos Santana Herrera
24f7b9a171
UpstreamHttpMethod property (of class FileReRoute) changes from string to List<string>.
2017-05-05 11:47:28 +01:00
Juan Carlos Santana Herrera
e91da1ac23
Add the possibility of set mutiple verbs in the UpstreamHttpMethod property.
...
Add UnitTests and AcceptanceTests to try this feature.
2017-05-04 10:56:16 +01:00
Tom Pallister
f0205758ba
Update README.md
2017-04-29 12:08:32 +01:00
tom.pallister
be3a2fb6ed
Change to fix issue not setting content type header
2017-04-28 13:04:40 +01:00
geffzhang
c76fa1e5fb
Merge pull request #24 from TomPallister/develop
...
mergeNewestcode
2017-04-24 07:16:26 +08:00
TomPallister
1a76c9fbd9
Merge branch 'master' into develop
2017-04-23 15:40:50 +01:00
Tom Pallister
11f5aa08ee
Merge pull request #89 from juancash/placeholder_for_final_url_path
...
Use final paths in the reroutes of configuration.json file.
2017-04-23 15:38:56 +01:00
Juan Carlos Santana Herrera
6510f173b9
Adds an acceptance test to check the use of placeholder for a final url path.
2017-04-22 22:06:00 +01:00
Tom Pallister
c7d45022af
Merge pull request #88 from binarymash/feature/RequestMutation
...
Feature/request mutation
2017-04-21 16:22:08 +01:00
Juan Carlos Santana Herrera
b8ee43c737
Adds the posibility of use final paths in the reroutes of configuration.json file.
...
Adds a unit test method to test the functionality.
2017-04-20 11:05:46 +01:00
Philip Wood
80e728aa00
Made changes based on PR comments. Also added lots more tests!
2017-04-19 20:12:08 +01:00
Philip Wood
878eacf1db
Remove obsolete code
2017-04-18 15:35:54 +01:00
Philip Wood
a1c6ab4ce4
Get rest of unit tests working
2017-04-18 15:16:27 +01:00
Philip Wood
7c1a277147
Fixed some unit tests
2017-04-18 14:05:15 +01:00
Philip Wood
8b93f44077
Fix request id middleware
2017-04-18 11:05:37 +01:00
Philip Wood
da922c0e04
Initial mapping of request
2017-04-18 10:13:10 +01:00
Philip Wood
eeb8f691c7
Very hacky proof of concept
2017-04-17 21:25:04 +01:00
Marc Denman
637d93dc4b
Use DiagnosticListner for middleware logging
...
Instead of each middleware having to log that it has started and ended,
the DianosticListner package allows for capturing of these events in a
lightwieght manner.
This commit implements this and removes unncessary logging from most
middleware.
2017-04-17 11:23:34 +01:00
geffzhang
8533186cf0
Merge pull request #23 from TomPallister/develop
...
config_in_consul
2017-04-17 11:24:00 +08:00
Tom Pallister
8d31b40c21
Merge pull request #85 from TomPallister/feature/config-in-consul
...
added a new implementation that stores the ocelot config in consul kv…
2017-04-16 19:45:54 +01:00
TomPallister
c3cd181b90
added a new implementation that stores the ocelot config in consul kv store, had to change some major things and add cache settings as default
2017-04-16 19:35:59 +01:00
geffzhang
34070021ce
Merge pull request #21 from TomPallister/develop
...
refactor httpclientcache
2017-04-06 07:46:11 +08:00
Tom Pallister
ab9c8e30b2
Merge pull request #82 from geffzhang/HttpClientPerformance
...
Http client performance looks good!
2017-04-05 06:48:54 +01:00
geffzhang
81e2e8a5be
refactor : ConcurrentDictionary and ConcurrentQueue replace MemoryCache for cache HttpClient
2017-04-04 16:06:27 +08:00
geffzhang
34325d7969
Merge pull request #20 from geffzhang/develop
...
merge newest code
2017-04-03 21:06:00 +08:00
geffzhang
9e5faa268f
Merge pull request #19 from TomPallister/develop
...
updateLogger
2017-03-20 13:06:49 +08:00
Tom Pallister
f58da434ba
Merge pull request #70 from MarcDenman/feature/updateLogging
...
Update logging
2017-03-19 15:57:28 +00:00
TomPallister
be0918879c
Change to not log loads of rubbish when running integration tests
2017-03-19 12:46:42 +00:00
Tom Pallister
77a16b4175
Merge pull request #72 from geffzhang/develop
...
refactor: replace AddSingleton with TryAddSingleton
2017-03-19 12:42:26 +00:00
Marc Denman
34be5a2955
Update middelware to use logging extension methods
2017-03-18 18:33:51 +00:00
Marc Denman
ad81b7a305
Update OcelotLogger to accept name of class
...
OcelotLogger now has a property called "Name" intended to store the name
of the type for which the logger has been built for. This is intended to
keep the code a little bit cleaner and also allows for a few extention
methods for common logging scenarios
2017-03-18 18:30:09 +00:00
geffzhang
aa66fdddd3
Merge branch 'develop' of https://github.com/geffzhang/Ocelot into develop
2017-03-18 19:58:04 +08:00
geffzhang
faf6d40d73
refactor: TryAddSingleton replace AddSingleton
2017-03-18 19:56:08 +08:00
Tom Pallister
4ac8e98029
Merge pull request #71 from geffzhang/develop
...
string.Equals under Centos not expect
2017-03-18 08:06:15 +00:00
geffzhang
18d4013e61
Fix: This string.Equals Method Windows is normal, but running under Centos, due to a case of the string problem, seems to be. NET core implementation issues on a Linux system is case sensitive.
...
Modifications are as follows
var applicableReRoutes = configuration.Data.ReRoutes.Where(r => string.Equals(r.UpstreamHttpMethod.Method.ToLower(), upstreamHttpMethod.ToLower(), StringComparison.CurrentCultureIgnoreCase));
2017-03-16 20:13:27 +08:00
geffzhang
01fc26fb68
Merge pull request #18 from TomPallister/develop
...
Renamed ScopeName to ApiName, ScopeSecret to ApiSecret
2017-03-16 14:31:19 +08:00
Tom Pallister
d0296bc020
Merge pull request #69 from FryDerm/develop
...
Properties renamed for consistency with Identity Server
2017-03-15 18:37:03 +00:00
Marc Denman
82ecd667e0
Merged in develop
2017-03-14 21:50:03 +00:00
David Derman
a3b387aeb1
Renamed ScopeName to ApiName, ScopeSecret to ApiSecret, and
...
AdditionalScopes to Allowed Scoped in order to be more consistent with
Identity Server naming conventions.
2017-03-14 16:54:55 -04:00
