From 82a06a1eff77582efe57f284c1391ca9d931ea6c Mon Sep 17 00:00:00 2001
From: Spitap <dev@asdrip.fr>
Date: Tue, 12 Sep 2023 19:34:21 +0200
Subject: [PATCH] Fixed test, fixed review

---
 .../components/identities/AccountCreationForm.vue  |  2 +-
 frontend/src/components/identities/AccountForm.vue |  4 ++--
 .../src/components/identities/AccountRoleForm.vue  | 14 +++++++++-----
 modoboa/pdfcredentials/handlers.py                 |  3 +--
 modoboa/pdfcredentials/lib.py                      |  3 +--
 modoboa/pdfcredentials/tests/test_views.py         |  9 ++++++++-
 6 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/identities/AccountCreationForm.vue b/frontend/src/components/identities/AccountCreationForm.vue
index c7c1c12a2..8b05020f8 100644
--- a/frontend/src/components/identities/AccountCreationForm.vue
+++ b/frontend/src/components/identities/AccountCreationForm.vue
@@ -11,7 +11,7 @@
   @create="submit"
   >
   <template v-slot:form.role="{ step }">
-    <account-role-form :ref="`form_${step}`" v-model="account.role" :account="account" :authUserRole="authUser.role" />
+    <account-role-form :ref="`form_${step}`" v-model="account.role" :account="account" />
   </template>
   <template v-slot:form.identification="{ step }">
     <account-general-form v-if="step >= 2" :ref="`form_${step}`" v-model="account" />
diff --git a/frontend/src/components/identities/AccountForm.vue b/frontend/src/components/identities/AccountForm.vue
index f6023137c..3564c4bc7 100644
--- a/frontend/src/components/identities/AccountForm.vue
+++ b/frontend/src/components/identities/AccountForm.vue
@@ -27,7 +27,7 @@
         </v-row>
       </v-expansion-panel-header>
       <v-expansion-panel-content>
-        <account-role-form ref="roleForm" v-model="editedAccount.role" :account="editedAccount" :authUserRole="authUser.role"/>
+        <account-role-form ref="roleForm" v-model="editedAccount.role" :account="editedAccount" />
       </v-expansion-panel-content>
     </v-expansion-panel>
     <v-expansion-panel>
@@ -155,7 +155,7 @@
                 >
                 <template v-if="account.resources != undefined && account.resources.length == 2">
                   <v-col cols="6">
-                    <translate class="mr-2">Mailbox: </translate> <translate>Number of allowed mailbox: </translate> {{ account.resources[0].max_value}}
+                    <translate class="mr-2">Mailbox: </translate> <translate>Number of allowed mailboxes: </translate> {{ account.resources[0].max_value}}
                   </v-col>
                   <v-col cols="6">
                   <translate class="mr-2">Mailbox aliases: </translate> <translate>Number of allowed mailbox aliases: </translate> {{ account.resources[1].max_value}}
diff --git a/frontend/src/components/identities/AccountRoleForm.vue b/frontend/src/components/identities/AccountRoleForm.vue
index 31dad604e..955f8227b 100644
--- a/frontend/src/components/identities/AccountRoleForm.vue
+++ b/frontend/src/components/identities/AccountRoleForm.vue
@@ -29,12 +29,13 @@
 
 <script>
 import ChoiceField from '@/components/tools/ChoiceField'
+import { mapGetters } from 'vuex'
 
 export default {
   components: {
     ChoiceField
   },
-  props: ['value', 'account', 'role', 'authUserRole'],
+  props: ['value', 'account', 'role'],
   computed: {
     roleLabel () {
       const role = this.accountRoles.find(role => role.value === this.account.role)
@@ -45,16 +46,19 @@ export default {
       return role !== undefined ? role.help : ''
     },
     accountRoles () {
-      if (this.authUserRole === 'SuperAdmins') {
+      if (this.authUser.role === 'SuperAdmins') {
         return [...this.domainAdminsRole, ...this.resellerRole, ...this.simpleUserRole, ...this.superAdminsRole]
-      } else if (this.authUserRole === 'DomainAdmins') {
+      } else if (this.authUser.role === 'DomainAdmins') {
         return this.simpleUserRole
-      } else if (this.authUserRole === 'Resellers') {
+      } else if (this.authUser.role === 'Resellers') {
         return [...this.domainAdminsRole, ...this.simpleUserRole]
       } else {
         return []
       }
-    }
+    },
+    ...mapGetters({
+      authUser: 'auth/authUser'
+    })
   },
   methods: {
     reset () { }
diff --git a/modoboa/pdfcredentials/handlers.py b/modoboa/pdfcredentials/handlers.py
index 72852fcc9..cf8dfb360 100644
--- a/modoboa/pdfcredentials/handlers.py
+++ b/modoboa/pdfcredentials/handlers.py
@@ -33,8 +33,7 @@ def password_updated(sender, account, password, created, **kwargs):
         logger = logging.getLogger("modoboa.admin")
         logger.error(
             _("Failed to create PDF_credentials directory. "
-            "Please check the permissions or the path."),
-            exc_info=e)
+            "Please check the permissions or the path."))
     credentials(account, password)
 
 
diff --git a/modoboa/pdfcredentials/lib.py b/modoboa/pdfcredentials/lib.py
index cfe5200c5..895e202ca 100644
--- a/modoboa/pdfcredentials/lib.py
+++ b/modoboa/pdfcredentials/lib.py
@@ -83,8 +83,7 @@ def crypt_and_save_to_file(content, filename, length, chunksize=64*512):
         logger = logging.getLogger("modoboa.admin")
         logger.error(
             _("Failed to create PDF_credentials file. "
-            "Please check the permissions or the path."),
-            exc_info=e)
+            "Please check the permissions or the path."))
 
 
 def decrypt_file(filename, chunksize=24*1024):
diff --git a/modoboa/pdfcredentials/tests/test_views.py b/modoboa/pdfcredentials/tests/test_views.py
index 885528ffa..48f2d9508 100644
--- a/modoboa/pdfcredentials/tests/test_views.py
+++ b/modoboa/pdfcredentials/tests/test_views.py
@@ -144,4 +144,11 @@ class EventsTestCase(ModoTestCase):
     def test_storage_dir_creation(self):
         """Test storage directory creation."""
         self.set_global_parameter("storage_dir", "/nonexistentdir")
-        self._create_account("leon@test.com", expected_status=500)
+        with self.assertLogs(logger='modoboa.admin', level='ERROR') as log:
+            resp = self._create_account("leon@test.com")
+            self.assertIn(
+                "ERROR:modoboa.admin:Failed to create PDF_credentials directory. "
+                "Please check the permissions or the path.",
+                log.output
+            )
+