OrchardCMS#808 Fixes after Nicholas and Wojciech reviews

rserj · Jul 25, 2017 · 2323dfb · 2323dfb
1 parent 4cb7755
commit 2323dfb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/src/OrchardCore.Modules/Orchard.OpenId/ModelBinders/UrlsAttribute.cs b/src/OrchardCore.Modules/Orchard.OpenId/ModelBinders/UrlsAttribute.cs
@@ -16,11 +16,6 @@ public Task BindModelAsync(ModelBindingContext bindingContext)
             {
                 var valueAsString = valueProviderResult.FirstValue;
 
-                if (string.IsNullOrEmpty(valueAsString))
-                {
-                    return TaskCache.CompletedTask;
-                }
-
                 if (!string.IsNullOrEmpty(valueAsString))
                 {
                     var origins = valueAsString

diff --git a/src/OrchardCore.Modules/Orchard.OpenId/Services/OpenIdCorsConfiguration.cs b/src/OrchardCore.Modules/Orchard.OpenId/Services/OpenIdCorsConfiguration.cs
@@ -20,14 +20,17 @@ public OpenIdCorsConfiguration(OpenIdApplicationStore openIdService)
 
         public void Configure(CorsOptions options)
         {
-            var openIdApplications = _openIdApplicationStore.GetAllApps().GetAwaiter().GetResult();
-            if (openIdApplications == null || !openIdApplications.Any()) return;
+            var openIdApplications = _openIdApplicationStore.GetAllApps().GetAwaiter().GetResult().ToList();
+            if (openIdApplications == null || openIdApplications.Count==0) return;
             var appOrigins = openIdApplications
                 .Where(app => (app.AllowPasswordFlow || app.AllowClientCredentialsFlow || app.AllowRefreshTokenFlow) 
                               && app.AllowedOrigins != null && app.AllowedOrigins.Any())
                 .SelectMany(app => app.AllowedOrigins)
                 .ToArray();
-            if (!appOrigins.Any()) return;
+            if (appOrigins.Length == 0)
+            {
+                return;
+            }
 
             //Auth end-points policy
             options.AddPolicy(Constants.OpenIdConnectAuthPolicy, builder => builder

diff --git a/src/OrchardCore/OrchardCore.Cms/OrchardCore.Cms.csproj b/src/OrchardCore/OrchardCore.Cms/OrchardCore.Cms.csproj
@@ -22,7 +22,7 @@
   -->
 
   <ItemGroup>
-    <ProjectReference Include="..\..\OrchardCore.Modules\Orchard.Cors\Orchard.Cors.csproj" />
+    <ProjectReference Include="..\..\OrchardCore.Modules\Orchard.Cors\Orchard.Cors.csproj" PrivateAssets="none" />
     <ProjectReference Include="..\..\OrchardCore.Modules\Orchard.Queries\Orchard.Queries.csproj" />
     <ProjectReference Include="..\OrchardCore.AsBundle\OrchardCore.AsBundle.csproj" PrivateAssets="none" />
     <ProjectReference Include="..\..\OrchardCore.Modules\Orchard.Admin\Orchard.Admin.csproj" PrivateAssets="none" />