tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-04-23 00:32:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/geffzhang/Ocelot into develop

Browse Source
This commit is contained in:
geffzhang 2019-03-12 08:47:46 +08:00
commit cf3246afd2
4 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
docs/features/authentication.rst
View File

@ -138,8 +138,28 @@ Then map the authentication provider key to a ReRoute in your configuration e.g.
Okta
^^^^
Add nuget package : `"Okta.AspNetCore" https://www.nuget.org/packages/Okta.AspNetCore/`_
I have not had time to write this up but we have `Issue 446 <https://github.com/ThreeMammals/Ocelot/issues/446>`_ that contains some code and examples that might help with Okta integration.
In a StartUp.cs file add to a method Configure next lines:
app.UseAuthentication();
app.UseOcelot().Wait();
In a StartUp.cs file add to a method ConfigureServices lines:
services.AddAuthentication(options =>
{
options.DefaultAuthenticateScheme = OktaDefaults.ApiAuthenticationScheme;
options.DefaultChallengeScheme = OktaDefaults.ApiAuthenticationScheme;
options.DefaultSignInScheme = OktaDefaults.ApiAuthenticationScheme;
})
.AddOktaWebApi(new OktaWebApiOptions
{
OktaDomain = _cfg["Okta:OktaDomain"]
});
services.AddOcelot(_cfg);
`Issue 446 <https://github.com/ThreeMammals/Ocelot/issues/446>`_ that contains some code and examples that might help with Okta integration.
Allowed Scopes
^^^^^^^^^^^^^

2
src/Ocelot/DependencyInjection/IOcelotBuilder.cs
View File

@ -12,6 +12,8 @@ namespace Ocelot.DependencyInjection
IConfiguration Configuration { get; }
IMvcCoreBuilder MvcCoreBuilder { get; }
IOcelotBuilder AddDelegatingHandler<T>(bool global = false)
where T : DelegatingHandler;

6
src/Ocelot/DependencyInjection/OcelotBuilder.cs
View File

@ -42,6 +42,7 @@ namespace Ocelot.DependencyInjection
{
public IServiceCollection Services { get; }
public IConfiguration Configuration { get; }
public IMvcCoreBuilder MvcCoreBuilder { get; }
public OcelotBuilder(IServiceCollection services, IConfiguration configurationRoot)
{
@ -133,7 +134,7 @@ namespace Ocelot.DependencyInjection
//add asp.net services..
var assembly = typeof(FileConfigurationController).GetTypeInfo().Assembly;
Services.AddMvcCore()
this.MvcCoreBuilder = Services.AddMvcCore()
.AddApplicationPart(assembly)
.AddControllersAsServices()
.AddAuthorization()
@ -144,6 +145,7 @@ namespace Ocelot.DependencyInjection
Services.AddWebEncoders();
}
public IOcelotBuilder AddSingletonDefinedAggregator<T>()
where T : class, IDefinedAggregator
{
@ -170,7 +172,7 @@ namespace Ocelot.DependencyInjection
if(global)
{
Services.AddTransient<THandler>();
Services.AddTransient<GlobalDelegatingHandler>(s => {
Services.AddTransient<GlobalDelegatingHandler>(s =>{
var service = s.GetService<THandler>();
return new GlobalDelegatingHandler(service);
});

8
src/Ocelot/Infrastructure/Claims/Parser/ClaimsParser.cs
View File

@ -1,6 +1,6 @@
namespace Ocelot.Infrastructure.Claims.Parser
{
using Errors;
using Microsoft.Extensions.Primitives;
using Responses;
using System.Collections.Generic;
using System.Linq;
@ -45,11 +45,11 @@
private Response<string> GetValue(IEnumerable<Claim> claims, string key)
{
var claim = claims.FirstOrDefault(c => c.Type == key);
var claimValues = claims.Where(c => c.Type == key).Select(c => c.Value).ToArray();
if (claim != null)
if (claimValues.Length > 0)
{
return new OkResponse<string>(claim.Value);
return new OkResponse<string>(new StringValues(claimValues).ToString());
}
return new ErrorResponse<string>(new CannotFindClaimError($"Cannot find claim for key: {key}"));