Resolve "Redirect to CMS-page if Cookies are Disabled" is "No" but it still redirect issue25148

Author: edenduong

app/code/Magento/Cookie/Block/RequireCookie.php

@@ -3,15 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
+declare(strict_types=1);
 /**
  * Frontend form key content block
  */
 namespace Magento\Cookie\Block;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
 /**
  * @api
  * @since 100.0.2
+ *
+ * Class \Magento\Cookie\Block\RequireCookie
  */
 class RequireCookie extends \Magento\Framework\View\Element\Template
 {
@@ -22,9 +27,12 @@ class RequireCookie extends \Magento\Framework\View\Element\Template
      */
     public function getScriptOptions()
     {
+        $isRedirectCmsPage = ObjectManager::getInstance()->get(ScopeConfigInterface::class)
+            ->getValue('web/browser_capabilities/cookies');
         $params = [
             'noCookieUrl' => $this->escapeUrl($this->getUrl('cookie/index/noCookies/')),
-            'triggers' => $this->escapeHtml($this->getTriggers())
+            'triggers' => $this->escapeHtml($this->getTriggers()),
+            'isRedirectCmsPage' => (boolean)$isRedirectCmsPage
         ];
         return json_encode($params);
     }

app/code/Magento/Cookie/i18n/en_US.csv

@@ -11,3 +11,5 @@
 "Cookie Domain","Cookie Domain"
 "Use HTTP Only","Use HTTP Only"
 "Cookie Restriction Mode","Cookie Restriction Mode"
+"Cookies are disabled in your browser.","Cookies are disabled in your browser."
+

app/code/Magento/Cookie/view/frontend/web/js/require-cookie.js

@@ -8,15 +8,19 @@
  */
 define([
     'jquery',
-    'jquery-ui-modules/widget'
-], function ($) {
+    'Magento_Ui/js/modal/alert',
+    'jquery-ui-modules/widget',
+    'mage/mage',
+    'mage/translate'
+], function ($, alert) {
     'use strict';
 
     $.widget('mage.requireCookie', {
         options: {
             event: 'click',
             noCookieUrl: 'enable-cookies',
-            triggers: ['.action.login', '.action.submit']
+            triggers: ['.action.login', '.action.submit'],
+            isRedirectCmsPage: true
         },
 
         /**
@@ -49,8 +53,16 @@ define([
             if (navigator.cookieEnabled) {
                 return;
             }
+
             event.preventDefault();
-            window.location = this.options.noCookieUrl;
+
+            if (this.options.isRedirectCmsPage) {
+                window.location = this.options.noCookieUrl;
+            } else {
+                alert({
+                    content: $.mage.__('Cookies are disabled in your browser.')
+                });
+            }
         }
     });