ACP2E-4128: [CLOUD] Getting 404 for JS file on checkout page on first attempt after implementing sri patch

Author: alzota

app/code/Magento/Csp/Plugin/GenerateAssetIntegrity.php

@@ -103,27 +103,8 @@ public function afterCreateRequireJsMixinsAsset(
         FileManager $subject,
         File $result
     ): File {
-        if (PHP_SAPI == 'cli') {
-            if (in_array($result->getContentType(), self::CONTENT_TYPES)) {
-                try {
-                    $content = $result->getContent();
-                } catch (\Exception $e) {
-                    $content = null;
-                }
-                $path = $result->getPath();
-
-                if ($content !== null) {
-                    $integrity = $this->integrityFactory->create(
-                        [
-                            "data" => [
-                                'hash' => $this->hashGenerator->generate($content),
-                                'path' => $path
-                            ]
-                        ]
-                    );
-                    $this->integrityCollector->collect($integrity);
-                }
-            }
+        if (PHP_SAPI === 'cli') {
+            $this->generateHash($result);
         }
 
         return $result;
@@ -133,39 +114,50 @@ public function afterCreateRequireJsMixinsAsset(
      * Generates integrity for static JS asset.
      *
      * @param FileManager $subject
-     * @param File $result
+     * @param File|false $result
      *
      * @return File
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function afterCreateStaticJsAsset(
         FileManager $subject,
-        File $result
+        File|false $result
     ): File {
-        if (PHP_SAPI == 'cli') {
-            if (in_array($result->getContentType(), self::CONTENT_TYPES)) {
-                try {
-                    $content = $result->getContent();
-                } catch (\Exception $e) {
-                    $content = null;
-                }
-                $path = $result->getPath();
-
-                if ($content !== null) {
-                    $integrity = $this->integrityFactory->create(
-                        [
-                            "data" => [
-                                'hash' => $this->hashGenerator->generate($content),
-                                'path' => $path
-                            ]
-                        ]
-                    );
-                    $this->integrityCollector->collect($integrity);
-                }
-            }
+        if ($result !== false && PHP_SAPI === 'cli') {
+            $this->generateHash($result);
         }
 
         return $result;
     }
+
+    /**
+     * Generates hash for the given file result if it matches the supported content types.
+     *
+     * @param File $result
+     * @return void
+     */
+    private function generateHash(File $result): void
+    {
+        if (in_array($result->getContentType(), self::CONTENT_TYPES)) {
+            try {
+                $content = $result->getContent();
+            } catch (\Exception $e) {
+                $content = null;
+            }
+            $path = $result->getPath();
+
+            if ($content !== null) {
+                $integrity = $this->integrityFactory->create(
+                    [
+                        "data" => [
+                            'hash' => $this->hashGenerator->generate($content),
+                            'path' => $path
+                        ]
+                    ]
+                );
+                $this->integrityCollector->collect($integrity);
+            }
+        }
+    }
 }