240 Commits

Author	SHA1	Message	Date
Tom Pallister	3f2af85969	test passing with authentication being provided by the user and mapped to the re route in config	2017-11-01 15:25:55 +00:00
Tom Gardham-Pallister	e0c16bea32	unit and int tests are passing with auth changes...but acceptance tests are in a state and there are loads of todos...	2017-11-01 08:05:22 +00:00
Tom Pallister	120532bb0d	fixed more failing acceptance tests...think the only thing to do now is work out the authentication stuff and that should fix all the other tests	2017-10-30 13:14:12 +00:00
Tom Gardham-Pallister	b28fc6694e	tidy up and no longer hard code admin area...still one int test failing before we start looking at rebuilding auth stuff	2017-10-29 16:35:12 +00:00
Tom Gardham-Pallister	25c1a2abdd	merged publish fix	2017-10-13 08:28:38 +01:00
Tom Gardham-Pallister	d0d74f0886	match whole input with regex	2017-10-12 19:03:20 +01:00
Tom Pallister	4d3a7ae5e1	another script change to find error	2017-10-10 17:52:38 +01:00
Tom Pallister	6419919e74	unit tests pass...	2017-09-25 13:13:07 +01:00
Tom Pallister	1c98dcbca3	updated packages and project versions...12 errors!	2017-09-25 11:53:56 +01:00
TomPallister	bd8b1ac042	FML	2017-09-21 23:10:09 +01:00
TomPallister	cffb8b63d9	blasduihasd	2017-09-21 23:09:36 +01:00
TomPallister	c06b492b46	upgraded to netcoreapp2.0	2017-09-21 23:00:22 +01:00
Tom Gardham-Pallister	7ef26f5f4b	fixes issue #117	2017-08-29 20:47:52 +01:00
TomPallister	58dc7c93bc	moved json converters under authentication feature	2017-07-04 19:14:37 +01:00
Tom Pallister	50ee9e20d8	Merge pull request #110 from sharpn/develop ... Adding JWT authentication for use with auth0	2017-06-30 09:32:55 +01:00
Tom Gardham-Pallister	e4e7fcc943	unit tests for cache clearing passing	2017-06-27 18:54:15 +01:00
Nick Sharp	ec0f3b32e4	Adding deserializer config for consul	2017-06-27 13:49:30 +01:00
Nick Sharp	a7eeadb4c6	fixing tests	2017-06-26 21:32:44 +01:00
nicksharp	20f6ebac2f	Fixing tests	2017-06-26 21:08:47 +01:00
nicksharp	461ef6aa52	Merging upstream	2017-06-26 19:39:28 +01:00
Nick Sharp	6209681b2c	Adding code ##BROKEN TESTS##	2017-06-26 11:50:58 +01:00
Tom Gardham-Pallister	6cdf4e67df	can now use tokens from ocelot a on ocelot b when using admin area	2017-06-23 15:17:40 +01:00
TomPallister	2d94884c6f	trying to get cluster working	2017-06-23 11:25:23 +01:00
TomPallister	6c1b95f95b	fixed some broken tests due to recent merges!	2017-06-10 15:52:31 +01:00
TomPallister	190c967655	Merge branch 'master' into develop	2017-06-10 15:20:37 +01:00
Juan Carlos Santana Herrera	efa68e9949	Allowed scopes checking added to AuthorisationMiddleware. ... Acceptance tests added.	2017-05-31 18:27:28 +01:00
Juan Carlos Santana Herrera	488aa97342	Removed unnecessary IdentityServer4 nuget package.	2017-05-19 11:41:38 +01: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	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	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
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
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
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
TomPallister	d80b73a0d2	change to get appveyor to pick up all tests from http://stackoverflow.com/questions/42747868/vs-2017-not-discovering-tests-if-net-core	2017-03-12 22:35:32 +00:00
TomPallister	c49a1c9004	removed a bunch of orig files checked in by accident	2017-03-09 17:00:51 +00:00
TomPallister	6f65d9bab0	upgraded to vs2017	2017-03-09 17:00:15 +00:00
TomPallister	d33e0c6f3b	merged develop and stolen binarymash dont publish unstable build script code	2017-02-25 18:27:20 +00:00
Tom Gardham-Pallister	112a9c303e	hacky auth working	2017-02-24 19:52:48 +00:00
Tom Gardham-Pallister	bd07af6926	more work towards getting identity server and admin area set up	2017-02-22 22:13:35 +00:00
Tom Gardham-Pallister	bf90b12f2c	acceptance tests passing after fixing registrations	2017-02-21 07:39:09 +00:00
Tom Gardham-Pallister	2dfdf0bb86	after much hacking unit tests passing	2017-02-21 07:34:47 +00:00
TomPallister	eb5dfc6975	removed test configuration nonsense	2017-02-19 15:43:58 +00:00
TomPallister	d548a86327	Added integration test project as acceptance style doesnt work when running the new admin area because identityserver needs to use proper networking	2017-02-19 15:29:32 +00:00
Philip Wood	3c9ad87b73	Fix cake on Mac. Also added compile-time support for OSX.10.12-x64. The acceptance tests still fail on this version of OS X, however, because of the funky stuff going on in TestConfiguration.cs. Fixing this is outside the scope of this issue.	2017-02-19 15:03:11 +00:00
TomPallister	d236ed3018	trying to get identity server authing	2017-02-19 13:59:17 +00:00
TomPallister	fa47663259	changed file config stuff to just use app base directory	2017-02-19 12:58:22 +00:00
Tom Gardham-Pallister	b98310c80d	working ssl example	2017-02-17 18:24:32 +00:00
Tom Gardham-Pallister	4dac8cb4fb	still hacking around	2017-02-17 07:27:49 +00:00