update: logout on a successful restore.

ItzNotABug · Sep 15, 2024 · 11251c6 · 11251c6
1 parent 99b5cc1
commit 11251c6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/routes/settings.js b/routes/settings.js
@@ -93,6 +93,7 @@ router.post('/configs', async (req, res) => {
     res.render('dashboard/import-export', {
         level,
         message,
+        invalidate_session: level === 'success',
     });
 });
 

diff --git a/utils/data/transfers.js b/utils/data/transfers.js
@@ -97,7 +97,7 @@ export default class Transfers {
 
             return {
                 level: 'success',
-                message: 'Import successful!',
+                message: 'Import successful! You will now be logged out.',
             };
         } catch (error) {
             logError(logTags.Configs, error);
@@ -176,8 +176,8 @@ export default class Transfers {
             'newsletter.show_subscription',
             'newsletter.show_featured_image',
             'newsletter.show_powered_by_ghost',
+            'newsletter.custom_subject_pattern',
             'newsletter.show_powered_by_ghosler',
-            // 'newsletter.custom_subject_pattern',
 
             'custom_template',
             'custom_template.enabled',

diff --git a/views/partials/common/message.ejs b/views/partials/common/message.ejs
@@ -15,6 +15,10 @@
                 alertMessage.style.margin = '0';
                 alertMessage.style.padding = '0';
             }, 500);
+
+            <% if ((typeof invalidate_session !== 'undefined' && invalidate_session === true)) { %>
+                window.location.href = '/logout';
+            <% } %>
         }, 3000);
     </script>
 <% } %>
-Original file line number
+Diff line change
@@ Expand Up / @@ -93,6 +93,7 @@ router.post('/configs', async (req, res) => { @@
         res.render('dashboard/import-export', {
             level,
             message,
+            invalidate_session: level === 'success',
         });
     });
@@ Expand Down @@