Merge remote-tracking branch 'origin/master' into saas_auth

StatCan · Apr 8, 2021 · 5cb6985 · 5cb6985
2 parents 90f5e38 + 76dd7ca
commit 5cb6985
Show file tree

Hide file tree

Showing 59 changed files with 260 additions and 224 deletions.
diff --git a/docs/en/index.md b/docs/en/index.md
@@ -4,7 +4,7 @@ Welcome to the `StatCan.OrchardCore` documentation. Learn how to use our collect
 
 ## OrchardCore CMS
 
-The project is built on OrchardCore CMS version `1.0.0-rc2-15907`. To learn more about the underlying framework, take a look through the [Orchard Core CMS documentation](https://docs.orchardcore.net) and the [Orchard Core Github repository](https://github.com/OrchardCMS/OrchardCore).
+The project is built on OrchardCore CMS version `1.0.0-rc2-16071`. To learn more about the underlying framework, take a look through the [Orchard Core CMS documentation](https://docs.orchardcore.net) and the [Orchard Core Github repository](https://github.com/OrchardCMS/OrchardCore).
 
 
 ## Where to Start?

diff --git a/src/Build/Dependencies.props b/src/Build/Dependencies.props
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AspNetCoreTargetFramework>net5.0</AspNetCoreTargetFramework>
-    <OrchardCoreVersion>1.0.0-rc2-15907</OrchardCoreVersion>
+    <OrchardCoreVersion>1.0.0-rc2-16071</OrchardCoreVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Modules/StatCan.OrchardCore.ContentFields/MultiValueTextField/Startup.cs b/src/Modules/StatCan.OrchardCore.ContentFields/MultiValueTextField/Startup.cs
@@ -14,18 +14,18 @@ namespace StatCan.OrchardCore.ContentFields.MultiValueTextField
     [Feature(Constants.Features.MultiValueTextField)]
     public class Startup : StartupBase
     {
-        static Startup()
-        {
-            TemplateContext.GlobalMemberAccessStrategy.Register<Fields.MultiValueTextField>();
-            TemplateContext.GlobalMemberAccessStrategy.Register<DisplayMultiValueTextFieldViewModel>();
-        }
         public override void ConfigureServices(IServiceCollection services)
         {
             services.AddContentField<Fields.MultiValueTextField>()
                 .UseDisplayDriver<MultiValueTextFieldDisplayDriver>();
             services.AddScoped<IContentPartFieldDefinitionDisplayDriver, MultiValueTextFieldSettingsDriver>();
             services.AddScoped<IContentPartFieldDefinitionDisplayDriver, TextFieldHeaderDisplaySettingsDriver>();
             services.AddScoped<IContentPartFieldDefinitionDisplayDriver, MultiValueTextFieldEditorSettingsDriver>();
+            services.Configure<TemplateOptions>(o =>
+            {
+                o.MemberAccessStrategy.Register<Fields.MultiValueTextField>();
+                o.MemberAccessStrategy.Register<DisplayMultiValueTextFieldViewModel>();
+            });
         }
     }
 }
diff --git a/src/Modules/StatCan.OrchardCore.ContentPermissions/Liquid/UserCanViewFilter.cs b/src/Modules/StatCan.OrchardCore.ContentPermissions/Liquid/UserCanViewFilter.cs
@@ -27,7 +27,7 @@ public UserCanViewFilter(IContentPermissionsService contentPermissionsService)
 
         #region Implementation
 
-        public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, TemplateContext context)
+        public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext context)
         {
             var item = input.ToObjectValue() as ContentItem;
 

diff --git a/src/Modules/StatCan.OrchardCore.ContentPermissions/README.md b/src/Modules/StatCan.OrchardCore.ContentPermissions/README.md
@@ -19,7 +19,8 @@ Users can be displayed an alternative by customising the view template, as shown
 Example of how to check users permission and display alternative content with Liquid template.
 
 ```
-{% if Model.ContentItem | user_can_view %}
+{% assign canView = Model.ContentItem | user_can_view %}
+{% if canView %}
 	<p>Awesome content that you have permission to view.</p>
 {% else %}
 	<p>Unfortunately you're not able to view this content.</p>
@@ -41,4 +42,4 @@ else
 {
     <p>Unfortunately you're not able to view this content.</p>
 }
-```
+```
diff --git a/src/Modules/StatCan.OrchardCore.DisplayHelpers/EventHandlers/HttpContextItemsEventHandler.cs b/src/Modules/StatCan.OrchardCore.DisplayHelpers/EventHandlers/HttpContextItemsEventHandler.cs
diff --git a/src/Modules/StatCan.OrchardCore.DisplayHelpers/Filters/BoolFilter.cs b/src/Modules/StatCan.OrchardCore.DisplayHelpers/Filters/BoolFilter.cs
@@ -7,10 +7,10 @@ namespace StatCan.OrchardCore.DisplayHelpers.Filters
 {
     public class BoolFilter : ILiquidFilter
     {
-        public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments args, TemplateContext context)
+        public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments args, LiquidTemplateContext context)
         {
             var content = input.ToBooleanValue();
             return new ValueTask<FluidValue>(BooleanValue.Create(content));
         }
     }
-}
+}
diff --git a/src/Modules/StatCan.OrchardCore.DisplayHelpers/Filters/ClonePropertiesFilter.cs b/src/Modules/StatCan.OrchardCore.DisplayHelpers/Filters/ClonePropertiesFilter.cs
@@ -8,7 +8,7 @@ namespace StatCan.OrchardCore.DisplayHelpers.Filters
 {
     public class ClonePropertiesFilter : ILiquidFilter
     {
-        public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, TemplateContext ctx)
+        public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
         {
           if (input.ToObjectValue() is IShape inputShape && arguments.At(0).ToObjectValue() is IShape toClone)
           {
@@ -19,7 +19,7 @@ public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments argu
                 inputShape.Properties.Add(prop.Key, prop.Value);
               }
             }
-            return new ValueTask<FluidValue>(FluidValue.Create(inputShape));
+            return new ValueTask<FluidValue>(FluidValue.Create(inputShape, ctx.Options));
           }
           return new ValueTask<FluidValue>(input);
         }

diff --git a/src/Modules/StatCan.OrchardCore.DisplayHelpers/Filters/GetClaimLiquidFilter.cs b/src/Modules/StatCan.OrchardCore.DisplayHelpers/Filters/GetClaimLiquidFilter.cs
@@ -8,7 +8,7 @@ namespace StatCan.OrchardCore.DisplayHelpers.Filters
 {
     public class GetClaimLiquidFilter : ILiquidFilter
     {
-        public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, TemplateContext context)
+        public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext context)
         {
             var claimType = arguments["type"].Or(arguments.At(0)).ToStringValue();
 

diff --git a/src/Modules/StatCan.OrchardCore.DisplayHelpers/Filters/IsCurrentUrlFilter.cs b/src/Modules/StatCan.OrchardCore.DisplayHelpers/Filters/IsCurrentUrlFilter.cs
@@ -15,7 +15,7 @@ public IsCurrentUrlFilter(IHttpContextAccessor httpContextAccessor)
             _httpContext = httpContextAccessor.HttpContext;
         }
 
-        public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments args, TemplateContext context)
+        public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments args, LiquidTemplateContext context)
         {
             var path = (_httpContext.Request.PathBase + _httpContext.Request.Path).ToString().TrimEnd('/');
             var toCompare = input.ToStringValue().TrimEnd('/');
@@ -27,4 +27,4 @@ public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments args
             return new ValueTask<FluidValue>(BooleanValue.False);
         }
     }
-}
+}
diff --git a/src/Modules/StatCan.OrchardCore.DisplayHelpers/Filters/ReturnUrlFilter.cs b/src/Modules/StatCan.OrchardCore.DisplayHelpers/Filters/ReturnUrlFilter.cs
@@ -2,6 +2,7 @@
 using Fluid.Values;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Routing;
 using OrchardCore.Liquid;
 using System;
 using System.Threading.Tasks;
@@ -11,18 +12,17 @@ namespace StatCan.OrchardCore.DisplayHelpers.Filters
     public class ReturnUrlFilter : ILiquidFilter
     {
         private readonly HttpContext _httpContext;
+        private readonly IUrlHelperFactory _urlHelperFactory;
 
-        public ReturnUrlFilter(IHttpContextAccessor httpContextAccessor)
+        public ReturnUrlFilter(IUrlHelperFactory urlHelperFactory, IHttpContextAccessor httpContextAccessor)
         {
             _httpContext = httpContextAccessor.HttpContext;
+            _urlHelperFactory = urlHelperFactory;
         }
 
-        public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, TemplateContext context)
+        public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext context)
         {
-            if (!context.AmbientValues.TryGetValue("UrlHelper", out var urlHelper))
-            {
-                throw new ArgumentException("UrlHelper missing while invoking 'return_url'");
-            }
+            var urlHelper = _urlHelperFactory.GetUrlHelper(context.ViewContext);
 
             var returnPath = (_httpContext.Request.PathBase + _httpContext.Request.Path).ToString();
             if (arguments["type"].Or(arguments.At(0)).ToStringValue() != "")
@@ -40,4 +40,4 @@ public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments argu
             return new ValueTask<FluidValue>(new StringValue(((IUrlHelper)urlHelper).Content(string.Concat(targetPath, "?returnUrl=", returnPath))));
         }
     }
-}
+}
diff --git a/src/Modules/StatCan.OrchardCore.DisplayHelpers/Filters/UsersByRole.cs b/src/Modules/StatCan.OrchardCore.DisplayHelpers/Filters/UsersByRole.cs
@@ -16,7 +16,7 @@ namespace StatCan.OrchardCore.DisplayHelpers.Filters
 {
     public class UsersByRoleFilter : ILiquidFilter
     {
-        public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, TemplateContext ctx)
+        public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
         {
             if (!ctx.AmbientValues.TryGetValue("Services", out var services))
             {
@@ -33,12 +33,12 @@ public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArgument
                  var query = session.Query<User>();
                  query.With<UserByRoleNameIndex>(x => x.RoleName.IsIn(userRoles));
 
-                return FluidValue.Create(await query.ListAsync());
+                return FluidValue.Create(await query.ListAsync(), ctx.Options);
             }
             else
             {
                 var normalizedRoleName = roleManager.NormalizeKey(input.ToStringValue());
-                return  FluidValue.Create(await session.Query<User, UserByRoleNameIndex>(u => u.RoleName == normalizedRoleName).ListAsync());
+                return  FluidValue.Create(await session.Query<User, UserByRoleNameIndex>(u => u.RoleName == normalizedRoleName).ListAsync(), ctx.Options);
             }
         }
     }

diff --git a/src/Modules/StatCan.OrchardCore.DisplayHelpers/Razor/OrchardHelperExtensions.cs b/src/Modules/StatCan.OrchardCore.DisplayHelpers/Razor/OrchardHelperExtensions.cs
@@ -25,7 +25,7 @@ public static Task<string> LiquidAsync(this IOrchardHelper orchardHelper, string
         var liquidTemplateManager = orchardHelper.HttpContext.RequestServices.GetRequiredService<ILiquidTemplateManager>();
         var htmlEncoder = orchardHelper.HttpContext.RequestServices.GetRequiredService<HtmlEncoder>();
 
-        return liquidTemplateManager.RenderAsync(liquid, htmlEncoder, model);
+        return liquidTemplateManager.RenderStringAsync(liquid, htmlEncoder, model);
     }
 
     /// <summary>
@@ -49,7 +49,7 @@ public static async Task<IHtmlContent> LiquidToSanitizedHtmlAsync(this IOrchardH
         var htmlSanitizer= orchardHelper.HttpContext.RequestServices.GetRequiredService<IHtmlSanitizer>();
         var htmlEncoder = orchardHelper.HttpContext.RequestServices.GetRequiredService<HtmlEncoder>();
 
-        liquid = await liquidTemplateManager.RenderAsync(liquid, htmlEncoder, model);
+        liquid = await liquidTemplateManager.RenderStringAsync(liquid, htmlEncoder, model);
 
         return new HtmlString(htmlSanitizer.Sanitize(liquid));
     }
@@ -65,7 +65,7 @@ public static async Task<string> LiquidShortcodesAsync(this IOrchardHelper orcha
         var shortcodeService = orchardHelper.HttpContext.RequestServices.GetRequiredService<IShortcodeService>();
         var htmlEncoder = orchardHelper.HttpContext.RequestServices.GetRequiredService<HtmlEncoder>();
 
-        liquid = await liquidTemplateManager.RenderAsync(liquid, htmlEncoder, model);
+        liquid = await liquidTemplateManager.RenderStringAsync(liquid, htmlEncoder, model);
         liquid = await shortcodeService.ProcessAsync(liquid);
 
         return liquid;

diff --git a/src/Modules/StatCan.OrchardCore.EmailTemplates/Controllers/EmailTemplateController.cs b/src/Modules/StatCan.OrchardCore.EmailTemplates/Controllers/EmailTemplateController.cs
@@ -86,7 +86,7 @@ public async Task<IActionResult> Index(ViewModels.ContentOptions options, PagerP
 
             if (!string.IsNullOrWhiteSpace(options.Search))
             {
-                templates = templates.Where(x => x.Value.Name.ToLower().Contains(options.Search.ToLower())).ToList();
+                templates = templates.Where(x => x.Value.Name.Contains(options.Search, StringComparison.OrdinalIgnoreCase)).ToList();
             }
 
             var count = templates.Count;
@@ -385,7 +385,7 @@ public async Task<IActionResult> SendEmail(SendEmailTemplateViewModel model, str
             }
 
             return View(model);
-        }   
+        }
 
         private IActionResult RedirectToReturnUrlOrIndex(string returnUrl)
         {

diff --git a/src/Modules/StatCan.OrchardCore.EmailTemplates/Services/EmailTemplatesService.cs b/src/Modules/StatCan.OrchardCore.EmailTemplates/Services/EmailTemplatesService.cs
@@ -64,9 +64,9 @@ public Task<string> RenderLiquid(string liquid, object model)
         {
             if (!string.IsNullOrWhiteSpace(liquid))
             {
-                return _liquidTemplateManager.RenderAsync(liquid, _htmlEncoder, model, null);
+                return _liquidTemplateManager.RenderStringAsync(liquid, _htmlEncoder, model, null);
             }
             return Task.FromResult(liquid);
         }
-    }   
+    }
 }
diff --git a/src/Modules/StatCan.OrchardCore.GitHub/Liquid/GetIssueCommentsFilter.cs b/src/Modules/StatCan.OrchardCore.GitHub/Liquid/GetIssueCommentsFilter.cs
@@ -12,7 +12,7 @@ namespace StatCan.OrchardCore.GitHub.Liquid
 {
     public class GetIssueCommentsFilter : ILiquidFilter
     {
-        public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, TemplateContext ctx)
+        public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
         {
             if (!ctx.AmbientValues.TryGetValue("Services", out var services))
             {
@@ -39,11 +39,11 @@ public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArgument
             try
             {
                 var client = await gitHubApiService.GetGitHubClient(tokenName);
-                return FluidValue.Create(await client.Issue.Comment.GetAllForIssue(owner, repo, parsedNumber));
+                return FluidValue.Create(await client.Issue.Comment.GetAllForIssue(owner, repo, parsedNumber), ctx.Options);
             }
             catch(Octokit.ApiException ex)
             {
-                return FluidValue.Create(ex.Message);
+                return FluidValue.Create(ex.Message, ctx.Options);
             }
         }
     }

diff --git a/src/Modules/StatCan.OrchardCore.GitHub/Liquid/GetIssueFilter.cs b/src/Modules/StatCan.OrchardCore.GitHub/Liquid/GetIssueFilter.cs
@@ -10,7 +10,7 @@ namespace StatCan.OrchardCore.GitHub.Liquid
 {
     public class GetIssueFilter : ILiquidFilter
     {
-        public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, TemplateContext ctx)
+        public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
         {
             if (!ctx.AmbientValues.TryGetValue("Services", out var services))
             {
@@ -38,11 +38,11 @@ public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArgument
             {
                 var client = await gitHubApiService.GetGitHubClient(tokenName);
 
-                return FluidValue.Create(await client.Issue.Get(owner, repo, parsedNumber));
+                return FluidValue.Create(await client.Issue.Get(owner, repo, parsedNumber), ctx.Options);
             }
             catch (Octokit.ApiException ex)
             {
-                return FluidValue.Create(ex.Message);
+                return FluidValue.Create(ex.Message, ctx.Options);
             }
         }
     }

diff --git a/src/Modules/StatCan.OrchardCore.GitHub/Liquid/GetPullRequestCommentsFilter.cs b/src/Modules/StatCan.OrchardCore.GitHub/Liquid/GetPullRequestCommentsFilter.cs
@@ -11,7 +11,7 @@ namespace StatCan.OrchardCore.GitHub.Liquid
 {
     public class GetPullRequestCommentsFilter : ILiquidFilter
     {
-        public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, TemplateContext ctx)
+        public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
         {
             if (!ctx.AmbientValues.TryGetValue("Services", out var services))
             {
@@ -39,11 +39,11 @@ public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArgument
             {
                 var client = await gitHubApiService.GetGitHubClient(tokenName);
 
-                return FluidValue.Create(await client.PullRequest.ReviewComment.GetAll(owner, repo, parsedNumber));
+                return FluidValue.Create(await client.PullRequest.ReviewComment.GetAll(owner, repo, parsedNumber), ctx.Options);
             }
             catch (Octokit.ApiException ex)
             {
-                return FluidValue.Create(ex.Message);
+                return FluidValue.Create(ex.Message, ctx.Options);
             }
         }
     }

diff --git a/src/Modules/StatCan.OrchardCore.GitHub/Liquid/GetPullRequestFilter.cs b/src/Modules/StatCan.OrchardCore.GitHub/Liquid/GetPullRequestFilter.cs
@@ -10,7 +10,7 @@ namespace StatCan.OrchardCore.GitHub.Liquid
 {
     public class GetPullRequestFilter : ILiquidFilter
     {
-        public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, TemplateContext ctx)
+        public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
         {
             if (!ctx.AmbientValues.TryGetValue("Services", out var services))
             {
@@ -38,11 +38,11 @@ public async ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArgument
             {
                 var client = await gitHubApiService.GetGitHubClient(tokenName);
 
-                return FluidValue.Create(await client.PullRequest.Get(owner, repo, parsedNumber));
+                return FluidValue.Create(await client.PullRequest.Get(owner, repo, parsedNumber), ctx.Options);
             }
             catch (Octokit.ApiException ex)
             {
-                return FluidValue.Create(ex.Message);
+                return FluidValue.Create(ex.Message, ctx.Options);
             }
         }
     }