Tom Pallister 
							
						 
					 
					
						
						
							
						
						f58da434ba 
					 
					
						
						
							
							Merge pull request  #70  from MarcDenman/feature/updateLogging  
						
						 
						
						... 
						
						
						
						Update logging 
						
						
					 
					
						2017-03-19 15:57:28 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marc Denman 
							
						 
					 
					
						
						
							
						
						0ec7fc44ad 
					 
					
						
						
							
							Change all ctor's to use IOcelotLoggerFactory  
						
						 
						
						... 
						
						
						
						As part of #35  we are we are standardising on using IOcelotLoggerFactory
over the default ILogger for DI purposes. Following a sln search, the use
of ILogger was only found in one place (FileOcelotConfigurationCreator)
and it's corresponding tests.
This commit changes them and ensures the unit tests still pass. 
						
						
					 
					
						2017-03-13 11:44:02 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								TomPallister 
							
						 
					 
					
						
						
							
						
						558a0dfdab 
					 
					
						
						
							
							finished refactoring config cretor  
						
						 
						
						
						
						
					 
					
						2017-03-05 16:56:41 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Gardham-Pallister 
							
						 
					 
					
						
						
							
						
						8bbd781820 
					 
					
						
						
							
							updated file options  
						
						 
						
						
						
						
					 
					
						2017-03-02 09:18:53 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Gardham-Pallister 
							
						 
					 
					
						
						
							
						
						b44c02510a 
					 
					
						
						
							
							unit test for qos  
						
						 
						
						
						
						
					 
					
						2017-03-01 23:34:56 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Gardham-Pallister 
							
						 
					 
					
						
						
							
						
						0a2d7a6922 
					 
					
						
						
							
							qos options creator in own class  
						
						 
						
						
						
						
					 
					
						2017-03-01 23:28:32 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Gardham-Pallister 
							
						 
					 
					
						
						
							
						
						6661cb5f32 
					 
					
						
						
							
							use config tests  
						
						 
						
						
						
						
					 
					
						2017-03-01 23:15:30 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Gardham-Pallister 
							
						 
					 
					
						
						
							
						
						034732ce90 
					 
					
						
						
							
							added lame test for service config creator  
						
						 
						
						
						
						
					 
					
						2017-03-01 23:12:00 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Gardham-Pallister 
							
						 
					 
					
						
						
							
						
						fff743ccf8 
					 
					
						
						
							
							pulling out service config cretor  
						
						 
						
						
						
						
					 
					
						2017-03-01 12:42:37 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Gardham-Pallister 
							
						 
					 
					
						
						
							
						
						d4119ab33d 
					 
					
						
						
							
							extracted thing that creates request id key  
						
						 
						
						
						
						
					 
					
						2017-03-01 08:11:39 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Gardham-Pallister 
							
						 
					 
					
						
						
							
						
						c85ea41951 
					 
					
						
						
							
							refactoring ocelot config creation process  
						
						 
						
						
						
						
					 
					
						2017-03-01 07:54:07 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Gardham-Pallister 
							
						 
					 
					
						
						
							
						
						112a9c303e 
					 
					
						
						
							
							hacky auth working  
						
						 
						
						
						
						
					 
					
						2017-02-24 19:52:48 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Gardham-Pallister 
							
						 
					 
					
						
						
							
						
						aa0d8fe59a 
					 
					
						
						
							
							all tests passing, now to do authentication config provider  
						
						 
						
						
						
						
					 
					
						2017-02-22 07:48:49 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Gardham-Pallister 
							
						 
					 
					
						
						
							
						
						2dfdf0bb86 
					 
					
						
						
							
							after much hacking unit tests passing  
						
						 
						
						
						
						
					 
					
						2017-02-21 07:34:47 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Gardham-Pallister 
							
						 
					 
					
						
						
							
						
						816221c7a6 
					 
					
						
						
							
							morehaking about  
						
						 
						
						
						
						
					 
					
						2017-02-19 12:33:09 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Gardham-Pallister 
							
						 
					 
					
						
						
							
						
						95fc687e93 
					 
					
						
						
							
							started messing around with admin area  
						
						 
						
						
						
						
					 
					
						2017-02-13 12:13:53 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								TomPallister 
							
						 
					 
					
						
						
							
						
						286c7f8488 
					 
					
						
						
							
							Fixed issue where qos was being created for each request so circuit breaker was never stopping traffic going to downstream service.  
						
						 
						
						
						
						
					 
					
						2017-02-11 18:56:36 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								TomPallister 
							
						 
					 
					
						
						
							
						
						ce8da4c92d 
					 
					
						
						
							
							removed qos by accident, added back in  
						
						 
						
						
						
						
					 
					
						2017-02-11 13:14:25 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Gardham-Pallister 
							
						 
					 
					
						
						
							
						
						7fffc9827a 
					 
					
						
						
							
							auth options builders  
						
						 
						
						
						
						
					 
					
						2017-02-07 20:30:26 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Gardham-Pallister 
							
						 
					 
					
						
						
							
						
						33ce162693 
					 
					
						
						
							
							changed upstream http method to use httpmethod class in .net  
						
						 
						
						
						
						
					 
					
						2017-02-07 18:30:21 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Gardham-Pallister 
							
						 
					 
					
						
						
							
						
						bbb808eb51 
					 
					
						
						
							
							fixed failing tests  
						
						 
						
						
						
						
					 
					
						2017-02-07 13:46:22 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Gardham-Pallister 
							
						 
					 
					
						
						
							
						
						b4ef277c3e 
					 
					
						
						
							
							added builder for service provider config  
						
						 
						
						
						
						
					 
					
						2017-02-07 07:50:23 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								TomPallister 
							
						 
					 
					
						
						
							
						
						c46dcc05b8 
					 
					
						
						
							
							started implementing the consul service provider  
						
						 
						
						
						
						
					 
					
						2017-02-04 13:16:31 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tom.pallister 
							
						 
					 
					
						
						
							
						
						b0ff2fd317 
					 
					
						
						
							
							fixed failing tests  
						
						 
						
						
						
						
					 
					
						2017-02-03 13:02:51 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Gardham-Pallister 
							
						 
					 
					
						
						
							
						
						aef6507da3 
					 
					
						
						
							
							fixed failing tests after service discovery changes  
						
						 
						
						
						
						
					 
					
						2017-02-03 07:43:26 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Gardham-Pallister 
							
						 
					 
					
						
						
							
						
						07ca7989b0 
					 
					
						
						
							
							more work towards getting service discovery working with load balancing  
						
						 
						
						
						
						
					 
					
						2017-02-02 21:34:15 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Gardham-Pallister 
							
						 
					 
					
						
						
							
						
						c3a47f66c8 
					 
					
						
						
							
							merge  
						
						 
						
						
						
						
					 
					
						2017-01-23 12:13:24 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Gardham-Pallister 
							
						 
					 
					
						
						
							
						
						044b609ea9 
					 
					
						
						
							
							started implementing service discovery integration  
						
						 
						
						
						
						
					 
					
						2017-01-20 19:03:18 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								TomPallister 
							
						 
					 
					
						
						
							
						
						536db48049 
					 
					
						
						
							
							fixed problems where routes were not mathing  
						
						 
						
						
						
						
					 
					
						2016-11-26 14:08:09 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								TomPallister 
							
						 
					 
					
						
						
							
						
						ff5776613f 
					 
					
						
						
							
							Now defaults to case insensitive routing but you can override with a setting, also global request id setting available  
						
						 
						
						
						
						
					 
					
						2016-11-06 11:50:33 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								TomPallister 
							
						 
					 
					
						
						
							
						
						f4acb4f041 
					 
					
						
						
							
							changed to json configuration to get rid of yaml imports  
						
						 
						
						
						
						
					 
					
						2016-11-02 21:50:53 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								TomPallister 
							
						 
					 
					
						
						
							
						
						5082cc6c05 
					 
					
						
						
							
							Updated error handling code and readme to indicate how logging works for Ocelot  
						
						 
						
						
						
						
					 
					
						2016-10-29 20:48:59 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								TomPallister 
							
						 
					 
					
						
						
							
						
						0455398199 
					 
					
						
						
							
							fixed failing test where i had the logic wrong in the first place  
						
						 
						
						
						
						
					 
					
						2016-10-24 19:41:41 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								TomPallister 
							
						 
					 
					
						
						
							
						
						9798cf01e5 
					 
					
						
						
							
							refactoring acceptance tests..they need some tlc  
						
						 
						
						
						
						
					 
					
						2016-10-19 21:28:55 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tom.pallister 
							
						 
					 
					
						
						
							
						
						ab5d7fa33d 
					 
					
						
						
							
							allowing people to inject functions as custom middleware  
						
						 
						
						
						
						
					 
					
						2016-10-19 19:32:05 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tom.pallister 
							
						 
					 
					
						
						
							
						
						b8951c4698 
					 
					
						
						
							
							Can authorise routes based on claims, there is also a claims transformation middleware  
						
						 
						
						
						
						
					 
					
						2016-10-19 11:56:05 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								TomPallister 
							
						 
					 
					
						
						
							
						
						8b0ceeda5b 
					 
					
						
						
							
							removed library namespace  
						
						 
						
						
						
						
					 
					
						2016-10-18 19:10:09 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								TomPallister 
							
						 
					 
					
						
						
							
						
						f79b76b414 
					 
					
						
						
							
							reorganised project so its a bit more vertical for features  
						
						 
						
						
						
						
					 
					
						2016-10-18 18:52:43 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								TomPallister 
							
						 
					 
					
						
						
							
						
						2e6640c6ef 
					 
					
						
						
							
							refactoring configuration code so its not so crazy, still need to work on the creator class  
						
						 
						
						
						
						
					 
					
						2016-10-18 18:32:34 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								TomPallister 
							
						 
					 
					
						
						
							
						
						707f1d6908 
					 
					
						
						
							
							renamed and removed some stuff that wasnt needed  
						
						 
						
						
						
						
					 
					
						2016-10-18 16:22:51 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								TomPallister 
							
						 
					 
					
						
						
							
						
						84256e7bac 
					 
					
						
						
							
							Added ability to strip claims and forward to downstream service as headers  
						
						 
						
						
						
						
					 
					
						2016-10-18 15:51:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tom.pallister 
							
						 
					 
					
						
						
							
						
						3d60602c7e 
					 
					
						
						
							
							Added a get authentication test, removed the infrastructure name space as it seemed pointless, started thinking about how to pass claims on with the request  
						
						 
						
						
						
						
					 
					
						2016-10-17 18:00:36 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								TomPallister 
							
						 
					 
					
						
						
							
						
						ce84ad4fc2 
					 
					
						
						
							
							Added tests for identity server reference tokens, general refactoring and come config validation  
						
						 
						
						
						
						
					 
					
						2016-10-16 20:28:23 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tom.pallister 
							
						 
					 
					
						
						
							
						
						f545ba8620 
					 
					
						
						
							
							removed thing that checks if route is authorised cos we dont need it  
						
						 
						
						
						
						
					 
					
						2016-10-14 20:08:09 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tom.pallister 
							
						 
					 
					
						
						
							
						
						58393f07ec 
					 
					
						
						
							
							started adding authentication stack, thing that decides if we should be authenticated is in  
						
						 
						
						
						
						
					 
					
						2016-10-12 13:40:46 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								TomPallister 
							
						 
					 
					
						
						
							
						
						1fddcf0836 
					 
					
						
						
							
							regex for url match, means annoying constructor ocelot configuration object but cant work out a better way to do this at the moment  
						
						 
						
						
						
						
					 
					
						2016-10-09 15:40:13 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								TomPallister 
							
						 
					 
					
						
						
							
						
						8688c1eb6f 
					 
					
						
						
							
							removed flurl and made a request creator  
						
						 
						
						
						
						
					 
					
						2016-10-07 12:54:50 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tom.pallister 
							
						 
					 
					
						
						
							
						
						74a7f5d270 
					 
					
						
						
							
							ripping out flurl...sorry flurl  
						
						 
						
						
						
						
					 
					
						2016-10-06 21:18:12 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								TomPallister 
							
						 
					 
					
						
						
							
						
						ab8407e7dc 
					 
					
						
						
							
							Now supports the same upstream url by difrenciating by http method. Also broke up the proxy middleware into three seperate pieces that do their thing and stick something into the OWIN context  
						
						 
						
						
						
						
					 
					
						2016-10-04 21:30:16 +01:00