Skip to content

Commit 0040897

Browse files
AC-11662 CSP - improve script rendering
1 parent 62aba85 commit 0040897

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

app/code/Magento/PageBuilder/view/base/templates/googlemaps.phtml

+11-6
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,27 @@
1010
* @var \Magento\Framework\Escaper $escaper
1111
*/
1212

13+
$libraryUrl = $escaper->escapeJs($block->getLibraryUrl());
14+
$style = $escaper->escapeJs($block->getStyle());
15+
$apiKey = $escaper->escapeJs($block->getApiKey());
16+
$invalidApiKeyMessage = $escaper->escapeJs($block->getInvalidApiKeyMessage());
17+
1318
$script = <<<SCRIPT
1419
require.config({
1520
paths: {
16-
googleMaps: '" . $escaper->escapeJs($block->getLibraryUrl()); . "'
21+
googleMaps: '{$libraryUrl}'
1722
},
1823
config: {
1924
'Magento_PageBuilder/js/utils/map': {
20-
style: '" . $escaper->escapeJs($block->getStyle()); . "'
25+
style: '{$style}',
2126
},
2227
'Magento_PageBuilder/js/content-type/map/preview': {
23-
apiKey: '" . $escaper->escapeJs($block->getApiKey()); . "',
24-
apiKeyErrorMessage: '" . $escaper->escapeJs($block->getInvalidApiKeyMessage()); . "'
28+
apiKey: '{$apiKey}',
29+
apiKeyErrorMessage: '{$invalidApiKeyMessage}'
2530
},
2631
'Magento_PageBuilder/js/form/element/map': {
27-
apiKey: '" . $escaper->escapeJs($block->getApiKey()); . "',
28-
apiKeyErrorMessage: '" . $escaper->escapeJs($block->getInvalidApiKeyMessage()); . "'
32+
apiKey: '{$apiKey}',
33+
apiKeyErrorMessage: '{$invalidApiKeyMessage}'
2934
},
3035
}
3136
});

0 commit comments

Comments
 (0)