Merge pull request #57 from ThreeMammals/develop

merge

docs/features/authentication.rst

@@ -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
 ^^^^^^^^^^^^^

src/Ocelot.Provider.Kubernetes/Ocelot.Provider.Kubernetes.csproj

@@ -2,6 +2,16 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Version>0.0.0-dev</Version>
+    <Authors>geffzhang</Authors>
+    <Company />
+    <Product>Ocelot</Product>
+    <Description>Provides Ocelot extensions to use kubernetes</Description>
+    <PackageProjectUrl>https://github.com/ThreeMammals/Ocelot</PackageProjectUrl>
+    <PackageIconUrl>http://threemammals.com/images/ocelot_logo.png</PackageIconUrl>
+    <PackageReleaseNotes></PackageReleaseNotes>
+    <PackageTags>API Gateway;.NET core</PackageTags>
   </PropertyGroup>
 
   <ItemGroup>

src/Ocelot/DependencyInjection/IOcelotBuilder.cs

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

src/Ocelot/DependencyInjection/OcelotBuilder.cs

@@ -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,17 +134,18 @@ namespace Ocelot.DependencyInjection
             //add asp.net services..
             var assembly = typeof(FileConfigurationController).GetTypeInfo().Assembly;
 
-            Services.AddMvcCore()
+            this.MvcCoreBuilder = Services.AddMvcCore()
-                .AddApplicationPart(assembly)
+                  .AddApplicationPart(assembly)
-                .AddControllersAsServices()
+                  .AddControllersAsServices()
-                .AddAuthorization()
+                  .AddAuthorization()
-                .AddJsonFormatters();
+                  .AddJsonFormatters();
 
             Services.AddLogging();
             Services.AddMiddlewareAnalysis();
             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);
                 });

src/Ocelot/Infrastructure/Claims/Parser/ClaimsParser.cs

@@ -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}"));