Skip to content

Improved the RenderLavaEndpoint command to parse the querystring in the route parameter #6633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
MichaelAllen wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Improved the RenderLavaEndpoint command to parse the querystring in the route parameter #6633

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions Rock/Lava/Blocks/RenderLavaEndpoint.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@

using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.IO;
using System.Linq;
using System.Web;

using Rock.Cms;
Expand Down Expand Up @@ -63,6 +65,16 @@ public override void OnRender( ILavaRenderContext context, TextWriter result )
}

var route = settings["route"].TrimStart( "^/".ToCharArray() );
NameValueCollection queryParams = null;

// Split out query string
var splitRoute = route.Split( new[] { '?' }, 2 );
if ( splitRoute.Length == 2 )
{
route = splitRoute[0];
queryParams = splitRoute[1].ParseQueryString();
}

var routeComponents = route.Split( new[] { '/' }, 2 );

// Check for invalid route
Expand Down Expand Up @@ -98,7 +110,7 @@ public override void OnRender( ILavaRenderContext context, TextWriter result )
return;
}

result.Write( MergeRequest( lavaEndpoint, lavaApplication, currentPerson ) );
result.Write( MergeRequest( lavaEndpoint, lavaApplication, currentPerson, queryParams ) );
}

/// <summary>
Expand Down Expand Up @@ -150,12 +162,24 @@ private static Person GetCurrentPerson( ILavaRenderContext context )
/// <param name="lavaEndpoint">The lava endpoint.</param>
/// <param name="lavaApplication">The lava application.</param>
/// <param name="currentPerson">The current person related to this rendering request.</param>
/// <param name="localQueryParams">The query parameters extracted from the route.</param>
/// <returns>The output from the application endpoint.</returns>
private string MergeRequest( LavaEndpointCache lavaEndpoint, LavaApplicationCache lavaApplication, Person currentPerson )
private string MergeRequest( LavaEndpointCache lavaEndpoint, LavaApplicationCache lavaApplication, Person currentPerson, NameValueCollection localQueryParams )
{
var mergeFields = LavaApplicationRequestHelpers.RequestToDictionary( HttpContext.Current.Request, currentPerson );
mergeFields.Add( "ConfigurationRigging", lavaApplication.ConfigurationRigging );

// Add any local query params
if ( localQueryParams != null )
{
var queryParams = ( Dictionary<string, string> ) mergeFields["QueryString"];
foreach ( string key in localQueryParams.AllKeys.Where( k => !k.IsNullOrWhiteSpace() ) )
{
queryParams.AddOrReplace( key, localQueryParams[key] );
}
mergeFields.AddOrReplace( "QueryString", queryParams );
}

try
{
return lavaEndpoint.CodeTemplate.ResolveMergeFields(
Expand Down