From fa099382d1c5cde202c344abad2dbd0905ddcb81 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Thu, 18 Jul 2024 12:13:31 +0200
Subject: [PATCH] Fixes after review of beta2

---
 doc/upgrade.rst                               |   2 +-
 .../admin/dmarc/DmarcAligmentChart.vue        |   6 +-
 .../src/layouts/dashboard/DashboardLayout.vue |   6 +
 frontend/src/views/admin/ParametersView.vue   | 108 +++++++++---------
 .../views/admin/domains/DomainEditView.vue    |  15 ++-
 .../src/views/admin/domains/DomainView.vue    |   7 ++
 .../admin/identities/AccountEditView.vue      |  11 +-
 .../views/admin/identities/AliasEditView.vue  |  15 ++-
 .../core/commands/templates/settings.py.tpl   |   2 +-
 requirements.txt                              |   2 +-
 10 files changed, 103 insertions(+), 71 deletions(-)

diff --git a/doc/upgrade.rst b/doc/upgrade.rst
index bec3a4c56..06e648e06 100644
--- a/doc/upgrade.rst
+++ b/doc/upgrade.rst
@@ -269,7 +269,7 @@ by default.
          'OIDC_ENABLED': True,
          'OIDC_RP_INITIATED_LOGOUT_ENABLED': True,
          'OIDC_RP_INITIATED_LOGOUT_ALWAYS_PROMPT': True,
-         'OIDC_RSA_PRIVATE_KEY': env('OIDC_RSA_PRIVATE_KEY'),
+         'OIDC_RSA_PRIVATE_KEY': env.str('OIDC_RSA_PRIVATE_KEY', multiline=True),
          'SCOPES': {
             'openid': 'OpenID Connect scope',
             'read': 'Read scope',
diff --git a/frontend/src/components/admin/dmarc/DmarcAligmentChart.vue b/frontend/src/components/admin/dmarc/DmarcAligmentChart.vue
index 83d418ab8..7a470d98a 100644
--- a/frontend/src/components/admin/dmarc/DmarcAligmentChart.vue
+++ b/frontend/src/components/admin/dmarc/DmarcAligmentChart.vue
@@ -2,7 +2,7 @@
   <div v-if="alignments">
     <v-card>
       <v-toolbar dense elevation="0" class="mr-2">
-        <v-toolbar-title>$gettext('Alignment')</v-toolbar-title>
+        <v-toolbar-title>{{ $gettext('Alignment') }}</v-toolbar-title>
         <v-spacer />
         <v-btn icon="mdi-arrow-left" size="x-small" @click="previousWeek">
         </v-btn>
@@ -153,8 +153,8 @@ const boxes = ref([
 ])
 
 const now = DateTime.now()
-const currentWeek = ref(now.year)
-const currentYear = ref(now.weekNumber)
+const currentYear = ref(now.year)
+const currentWeek = ref(now.weekNumber)
 const dmarcDisabled = ref(false)
 const loading = ref(false)
 const panel = ref(null)
diff --git a/frontend/src/layouts/dashboard/DashboardLayout.vue b/frontend/src/layouts/dashboard/DashboardLayout.vue
index 00b805f6c..97b80fb29 100644
--- a/frontend/src/layouts/dashboard/DashboardLayout.vue
+++ b/frontend/src/layouts/dashboard/DashboardLayout.vue
@@ -42,3 +42,9 @@ busStore.$onAction(({ name, after }) => {
   }
 }, true)
 </script>
+
+<style>
+.v-application {
+  background-color: #f7f8fa;
+}
+</style>
diff --git a/frontend/src/views/admin/ParametersView.vue b/frontend/src/views/admin/ParametersView.vue
index 6998a9cb4..8fce86ec7 100644
--- a/frontend/src/views/admin/ParametersView.vue
+++ b/frontend/src/views/admin/ParametersView.vue
@@ -19,59 +19,61 @@
         v-for="element in displayableElements"
         :key="element.label"
       >
-        <v-card>
-          <v-card-text>
-            <template
-              v-for="param in displayableParams(element.parameters)"
-              :key="param.name"
-            >
-              <div class="my-4">
-                <template v-if="param.widget === 'SeparatorField'">
-                  <h2>{{ param.label }}</h2>
-                </template>
-                <template v-else-if="param.widget === 'BooleanField'">
-                  <v-switch
-                    v-if="param.widget === 'BooleanField'"
-                    v-model="parameters[param.name]"
-                    :label="param.label"
-                    :hint="param.help_text"
-                    :error="formErrors[param.name] !== undefined"
-                    color="primary"
-                    density="compact"
-                    :error-messages="formErrors[param.name]"
-                    persistent-hint
-                  />
-                </template>
-                <template v-else>
-                  <label class="m-label">{{ param.label }}</label>
-                  <v-select
-                    v-if="param.widget === 'ChoiceField'"
-                    v-model="parameters[param.name]"
-                    :items="param.choices"
-                    item-title="text"
-                    :hint="param.help_text"
-                    persistent-hint
-                    density="compact"
-                    variant="outlined"
-                  />
-                  <v-text-field
-                    v-else
-                    v-model="parameters[param.name]"
-                    :hint="param.help_text"
-                    persistent-hint
-                    :error="formErrors[param.name] !== undefined"
-                    :error-messages="formErrors[param.name]"
-                    :type="
-                      param.widget === 'PasswordField' ? 'password' : 'text'
-                    "
-                    density="compact"
-                    variant="outlined"
-                  />
-                </template>
-              </div>
-            </template>
-          </v-card-text>
-        </v-card>
+        <v-container fluid class="pa-0">
+          <v-card>
+            <v-card-text>
+              <template
+                v-for="param in displayableParams(element.parameters)"
+                :key="param.name"
+              >
+                <div class="my-4">
+                  <template v-if="param.widget === 'SeparatorField'">
+                    <h2>{{ param.label }}</h2>
+                  </template>
+                  <template v-else-if="param.widget === 'BooleanField'">
+                    <v-switch
+                      v-if="param.widget === 'BooleanField'"
+                      v-model="parameters[param.name]"
+                      :label="param.label"
+                      :hint="param.help_text"
+                      :error="formErrors[param.name] !== undefined"
+                      color="primary"
+                      density="compact"
+                      :error-messages="formErrors[param.name]"
+                      persistent-hint
+                    />
+                  </template>
+                  <template v-else>
+                    <label class="m-label">{{ param.label }}</label>
+                    <v-select
+                      v-if="param.widget === 'ChoiceField'"
+                      v-model="parameters[param.name]"
+                      :items="param.choices"
+                      item-title="text"
+                      :hint="param.help_text"
+                      persistent-hint
+                      density="compact"
+                      variant="outlined"
+                    />
+                    <v-text-field
+                      v-else
+                      v-model="parameters[param.name]"
+                      :hint="param.help_text"
+                      persistent-hint
+                      :error="formErrors[param.name] !== undefined"
+                      :error-messages="formErrors[param.name]"
+                      :type="
+                        param.widget === 'PasswordField' ? 'password' : 'text'
+                      "
+                      density="compact"
+                      variant="outlined"
+                    />
+                  </template>
+                </div>
+              </template>
+            </v-card-text>
+          </v-card>
+        </v-container>
       </v-tabs-window-item>
     </v-tabs-window>
     <v-btn
diff --git a/frontend/src/views/admin/domains/DomainEditView.vue b/frontend/src/views/admin/domains/DomainEditView.vue
index 41068a340..4244158fe 100644
--- a/frontend/src/views/admin/domains/DomainEditView.vue
+++ b/frontend/src/views/admin/domains/DomainEditView.vue
@@ -1,9 +1,8 @@
 <template>
-  <div>
-    <span class="text-h4">{{ $gettext('Edit domain') }}</span>
-    <div class="mt-4" />
-    <DomainEditForm :domain="domain" />
-  </div>
+  <v-toolbar flat>
+    <v-toolbar-title>{{ $gettext('Edit domain') }}</v-toolbar-title>
+  </v-toolbar>
+  <DomainEditForm :domain="domain" />
 </template>
 
 <script setup lang="js">
@@ -23,3 +22,9 @@ domainsStore
   .getDomain(route.params.id)
   .then((response) => (domain.value = response.data))
 </script>
+
+<style scoped>
+.v-toolbar {
+  background-color: #f7f8fa !important;
+}
+</style>
diff --git a/frontend/src/views/admin/domains/DomainView.vue b/frontend/src/views/admin/domains/DomainView.vue
index 4f22feb10..4568f254e 100644
--- a/frontend/src/views/admin/domains/DomainView.vue
+++ b/frontend/src/views/admin/domains/DomainView.vue
@@ -27,6 +27,7 @@
         {{ $gettext('DMARC') }}
       </v-tab>
     </v-tabs>
+
     <v-tabs-window v-model="tab">
       <v-tabs-window-item>
         <v-row>
@@ -117,3 +118,9 @@ function refreshDomain() {
   background-color: #f7f8fa !important;
 }
 </style>
+
+<style>
+.v-window__container {
+  width: 100% !important;
+}
+</style>
diff --git a/frontend/src/views/admin/identities/AccountEditView.vue b/frontend/src/views/admin/identities/AccountEditView.vue
index 3b9869e7a..d60489ff2 100644
--- a/frontend/src/views/admin/identities/AccountEditView.vue
+++ b/frontend/src/views/admin/identities/AccountEditView.vue
@@ -1,6 +1,7 @@
 <template>
-  <span class="text-h4">{{ $gettext('Edit account') }}</span>
-  <div class="mt-4" />
+  <v-toolbar flat>
+    <v-toolbar-title>{{ $gettext('Edit account') }}</v-toolbar-title>
+  </v-toolbar>
   <AccountEditForm />
 </template>
 
@@ -10,3 +11,9 @@ import { useGettext } from 'vue3-gettext'
 
 const { $gettext } = useGettext()
 </script>
+
+<style scoped>
+.v-toolbar {
+  background-color: #f7f8fa !important;
+}
+</style>
diff --git a/frontend/src/views/admin/identities/AliasEditView.vue b/frontend/src/views/admin/identities/AliasEditView.vue
index 31ba106b6..2eb69ed3c 100644
--- a/frontend/src/views/admin/identities/AliasEditView.vue
+++ b/frontend/src/views/admin/identities/AliasEditView.vue
@@ -1,9 +1,8 @@
 <template>
-  <div>
-    <span class="text-h4">{{ $gettext('Edit alias') }}</span>
-    <div class="mt-4" />
-    <AliasEditForm :alias="alias" />
-  </div>
+  <v-toolbar flat>
+    <v-toolbar-title>{{ $gettext('Edit alias') }}</v-toolbar-title>
+  </v-toolbar>
+  <AliasEditForm :alias="alias" />
 </template>
 
 <script setup lang="js">
@@ -12,3 +11,9 @@ import { useGettext } from 'vue3-gettext'
 
 const { $gettext } = useGettext()
 </script>
+
+<style scoped>
+.v-toolbar {
+  background-color: #f7f8fa !important;
+}
+</style>
diff --git a/modoboa/core/commands/templates/settings.py.tpl b/modoboa/core/commands/templates/settings.py.tpl
index 9513eceb5..bb1d941b5 100644
--- a/modoboa/core/commands/templates/settings.py.tpl
+++ b/modoboa/core/commands/templates/settings.py.tpl
@@ -206,7 +206,7 @@ OAUTH2_PROVIDER = {
     'OIDC_ENABLED': True,
     'OIDC_RP_INITIATED_LOGOUT_ENABLED': True,
     'OIDC_RP_INITIATED_LOGOUT_ALWAYS_PROMPT': True,
-    'OIDC_RSA_PRIVATE_KEY': env('OIDC_RSA_PRIVATE_KEY'),
+    'OIDC_RSA_PRIVATE_KEY': env.str('OIDC_RSA_PRIVATE_KEY', multiline=True),
     'SCOPES': {
         'openid': 'OpenID Connect scope',
         'read': 'Read scope',
diff --git a/requirements.txt b/requirements.txt
index 28451ce11..e6d86cba9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -53,4 +53,4 @@ rq>=1.13.0
 django-rq
 
 # Sieve
-sievelib>=1.4
+sievelib>=1.4.1