From 4f7d3d512744b8e199cdc0d462f750292141b525 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Wed, 27 Apr 2022 12:37:45 +0200
Subject: [PATCH] show warning in case configured baseurl differs from current
 url #149

---
 locales/en.json           |  6 ++++--
 locales/it.json           |  3 ++-
 pages/Admin.vue           |  2 +-
 pages/setup/Completed.vue | 18 +++++++++-------
 pages/setup/_db.vue       | 43 +++++++++++++++++----------------------
 5 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/locales/en.json b/locales/en.json
index 9a9305d1..fab32004 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -230,7 +230,8 @@
         "smtp_test_success": "A test email is sent to {admin_email}, please check your inbox",
         "smtp_test_button": "Send a test email",
         "admin_email": "Admin e-mail",
-        "widget": "Widget"
+        "widget": "Widget",
+        "wrong_domain_warning": "The baseurl configured in config.json <b>({baseurl})</b> differs from the one you're visiting <b>({url})</b>"
     },
     "auth": {
         "not_confirmed": "Not confirmed yet…",
@@ -277,6 +278,7 @@
         "completed": "Setup completed",
         "completed_description": "<p>You can now login with the following user:<br/><br/>User: <b>{email}</b><br/>Password: <b>{password}<b/></p>",
         "copy_password_dialog": "Yes, you have to copy the password!",
-        "start": "Start"
+        "start": "Start",
+        "https_warning": "You're visiting from HTTP, remember to change baseurl in config.json if you switch to HTTPS!"
     }
 }
diff --git a/locales/it.json b/locales/it.json
index b23ca228..e63155d9 100644
--- a/locales/it.json
+++ b/locales/it.json
@@ -277,6 +277,7 @@
         "completed": "Setup completato",
         "completed_description": "<p>Puoi entrare con le seguenti credenziali:<br/><br/>Utente: <b>{email}</b><br/>Password: <b>{password}<b/></p>",
         "copy_password_dialog": "Sì, devi copiare la password!",
-        "start": "Inizia"
+        "start": "Inizia",
+        "https_warning": "Stai visitando il setup da HTTP, ricorda di cambiare il baseurl nel config.json quando passarai ad HTTPS!"
     }
 }
diff --git a/pages/Admin.vue b/pages/Admin.vue
index 8cff27c2..1fc91f99 100644
--- a/pages/Admin.vue
+++ b/pages/Admin.vue
@@ -1,7 +1,7 @@
 <template lang="pug">
   v-container.container.pa-0.pa-md-3
     v-card
-      v-alert(v-if='url!==settings.baseurl' outlined type='warning' color='red' show-icon :icon='mdiAlert') {{$t('admin.wrong_domain_warning')}}
+      v-alert(v-if='url!==settings.baseurl' outlined type='warning' color='red' show-icon :icon='mdiAlert' v-html="$t('admin.wrong_domain_warning', { url, baseurl: settings.baseurl })")
       v-tabs(v-model='selectedTab' show-arrows)
 
         //- SETTINGS
diff --git a/pages/setup/Completed.vue b/pages/setup/Completed.vue
index 35e38379..3773dd14 100644
--- a/pages/setup/Completed.vue
+++ b/pages/setup/Completed.vue
@@ -1,16 +1,20 @@
 <template lang="pug">
-  v-container
-    v-card-title.d-block.text-h5.text-center(v-text="$t('setup.completed')")
-    v-card-text(v-html="$t('setup.completed_description', user)")
-    v-alert.mb-3.mt-1(outlined type='warning' color='red' show-icon :icon='mdiAlert') {{$t('setup.copy_password_dialog')}}
-    v-card-actions
-      v-btn(text @click='next' color='primary' :loading='loading' :disabled='loading') {{$t('setup.start')}}
-        v-icon(v-text='mdiArrowRight')
+v-container
+  v-card-title.d-block.text-h5.text-center(v-text="$t('setup.completed')")
+  v-card-text(v-html="$t('setup.completed_description', user)")
+  v-alert.mb-3.mt-1(v-if='isHttp' outlined type='warning' color='red' show-icon :icon='mdiAlert') {{$t('setup.https_warning')}}
+  v-alert.mb-3.mt-1(outlined type='warning' color='red' show-icon :icon='mdiAlert') {{$t('setup.copy_password_dialog')}}
+  v-card-actions
+    v-btn(text @click='next' color='primary' :loading='loading' :disabled='loading') {{$t('setup.start')}}
+      v-icon(v-text='mdiArrowRight')
 </template>
 <script>
 import { mdiArrowRight, mdiAlert } from '@mdi/js'
 
 export default {
+  props: {
+    isHttp: { type: Boolean, default: false },
+  },
   data () {
     return {
       mdiArrowRight, mdiAlert,
diff --git a/pages/setup/_db.vue b/pages/setup/_db.vue
index e23e789a..fdc7c89b 100644
--- a/pages/setup/_db.vue
+++ b/pages/setup/_db.vue
@@ -1,27 +1,21 @@
 <template lang="pug">
+v-container.pa-6
+  h2.mb-2.text-center Gancio Setup
+  v-stepper.grey.lighten-5(v-model='step')
+    v-stepper-header
+      v-stepper-step(v-show='!dbdone' :complete='step > 1' step='1') Database
+      v-divider(v-show='!dbdone')
+      v-stepper-step(:complete='step > 2' step='2') Configuration
+      v-divider
+      v-stepper-step(:complete='step > 3' step='3') Finish
 
-  v-container.pa-6
-    h2.mb-2.text-center Gancio Setup
-    v-stepper.grey.lighten-5(v-model='step')
-      v-stepper-header
-        v-stepper-step(v-show='!dbdone' :complete='step > 1' step='1') Database
-        v-divider(v-show='!dbdone')
-        v-stepper-step(:complete='step > 2' step='2') Configuration
-        v-divider
-        v-stepper-step(:complete='step > 3' step='3') Finish
-
-      v-stepper-items
-        v-stepper-content(v-show='!dbdone' step='1')
-          DbStep(@complete='dbCompleted')
-        v-stepper-content(step='2')
-          Settings(setup, @complete='configCompleted')
-        v-stepper-content(step='3')
-          Completed(ref='completed')
-
-        
-            
-            
-   
+    v-stepper-items
+      v-stepper-content(v-show='!dbdone' step='1')
+        DbStep(@complete='dbCompleted')
+      v-stepper-content(step='2')
+        Settings(setup, @complete='configCompleted')
+      v-stepper-content(step='3')
+        Completed(ref='completed' :isHttp='isHttp')
 </template>
 <script>
 import DbStep from './DbStep'
@@ -36,9 +30,10 @@ export default {
     title: 'Setup',
   },
   auth: false,
-  asyncData ({ params }) {
-
+  asyncData ({ params, req }) {
+    const protocol = process.client ? window.location.protocol : req.protocol + ':'
     return {
+      isHttp: protocol === 'http:',
       dbdone: !!Number(params.db),
       config: {
         db: {