Shortcode are not being cached

[maxime-rainville]

Module version(s) affected

2.2.0, but probably all version of 2

Description

The method that's meant to check the cache for FileShortcodeProvider and ImageShortcodeProvider will always return an empty string unless you allow session grant.

In CMS4, I think session grant was enabled by default so this wasn't a problem.

silverstripe-assets/src/Shortcodes/FileShortcodeProvider.php

Lines 137 to 150 in ff5e8a7

	protected static function getCachedMarkup($cache, $cacheKey, $arguments): string
	{
	$item = $cache->get($cacheKey);
	$assetStore = Injector::inst()->get(AssetStore::class);
	if ($item && $item['markup'] && !empty($item['filename'])) {
	// Initiate a protected asset grant if necessary
	$allowSessionGrant = static::getGrant(null, $arguments);
	if ($allowSessionGrant && $assetStore->exists($item['filename'], $item['hash'])) {
	$assetStore->grant($item['filename'], $item['hash']);
	return $item['markup'];
	}
	}
	return '';
	}

How to reproduce

• Add a die('cache hit'); statement in this if clause

  silverstripe-assets/src/Shortcodes/ImageShortcodeProvider.php

  Lines 59 to 64 in ff5e8a7

  	$cache = static::getCache();
  	$cacheKey = static::getCacheKey($args, $content);
  	$cachedMarkup = static::getCachedMarkup($cache, $cacheKey, $args);
  	if ($cachedMarkup) {
  	return $cachedMarkup;
  	}

  .
• Add an Image to a WYSIWYG and publish the page.
• Access the page twice.

Expected results: I hit the die statement.
Actual: My cache check always returns a blank string and I regenerate the short code each time.

Possible Solution

No response

Additional Context

No response

Validations

• Check that there isn't already an issue that reports the same bug
• Double check that your reproduction steps work in a fresh installation of silverstripe/installer (with any code examples you've provided)

Pull request

• BUG Make sure the cache shortcode value is used in FileShortcodeProvider #598

[GuySartorelli]

@maxime-rainville Please link to any revelant PRs since this is in the peer review column

[maxime-rainville]

Added a link to PR #598

[GuySartorelli]

PR merged. Will be automatically tagged by GitHub actions