Redirect to login page when session ends

plugins/CoreHome/CoreHome.php

@@ -413,6 +413,7 @@ public function getClientSideTranslationKeys(&$translationKeys)
         $translationKeys[] = 'CoreHome_CopyModalNote';
         $translationKeys[] = 'CoreHome_CopyX';
         $translationKeys[] = 'CoreHome_CopyXDescription';
+        $translationKeys[] = 'General_YourSessionHasExpired';
 
         // add admin menu translations
         if (

plugins/CoreHome/tests/UI/WidgetLoader_spec.js

@@ -0,0 +1,51 @@
+/*!
+ * Matomo - free/libre analytics platform
+ *
+ * WidgetLoader screenshot tests.
+ *
+ * @link    https://matomo.org
+ * @license https://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+describe('WidgetLoader', function () {
+  this.timeout(0);
+
+  this.fixture = "Piwik\\Tests\\Fixtures\\OneVisit";
+
+  before(function () {
+      testEnvironment.testUseMockAuth = 0;
+      testEnvironment.save();
+    });
+
+  it('should redirect to the landing page when the session cookie is cleared during widget loading', async function () {
+    // We try to do an actual login
+    await page.goto("");
+    await page.type("#login_form_login", superUserLogin);
+    await page.type("#login_form_password", superUserPassword);
+    await page.click('#login_form_submit');
+    await page.waitForNetworkIdle();
+
+    // check dashboard is shown
+    await page.waitForSelector('#dashboard');
+    expect(await page.$('#dashboard')).to.be.ok;
+    await page.clearCookies();
+
+    //Click on Dashboard menu item
+    const dashboardMenuSelector = 'div.reportingMenu ul li[data-category-id="Dashboard_Dashboard"] ul li:nth-child(1) a';
+    await page.click(dashboardMenuSelector);
+    await page.waitForNetworkIdle();
+
+    const loginForm = await page.waitForSelector('#login_form');
+    expect(loginForm).to.be.ok;
+
+    const errorNotification = await page.waitForSelector('div.system.notification-error');
+    expect(errorNotification).to.be.ok;
+
+    const errorText = await page.evaluate(() => _pk_translate('General_Error'));
+    const expectedErrorNotificationText = await page.evaluate(() => _pk_translate('General_YourSessionHasExpired'));
+    const expectedText = errorText + ': ' + expectedErrorNotificationText;
+    const notificationText = await page.$eval('div.system.notification-error .notification-body', el => el.textContent.trim());
+    expect(notificationText).to.equal(expectedText);
+
+  });
+});

plugins/CoreHome/vue/src/AjaxHelper/AjaxHelper.ts

@@ -543,6 +543,11 @@ export default class AjaxHelper<T = any> { // eslint-disable-line
           return;
         }
 
+        if (xhr.status === 401) {
+          Matomo.helper.refreshAfter(0);
+          return;
+        }
+
         console.log(`Warning: the ${$.param(this.getParams)} request failed!`);
 
         reject(xhr);

plugins/Login/Controller.php

@@ -338,6 +338,7 @@ public function bruteForceLog()
      */
     public function ajaxNoAccess($errorMessage)
     {
+        http_response_code(401);
         return sprintf(
             '<div class="alert alert-danger">
                 <p><strong>%s:</strong> %s</p>