code cln

2 files changed, 22 insertions, 10 deletions

diff --git a/src/store/modules/Settings/SmtpStore.js b/src/store/modules/Settings/SmtpStore.js
index b89b99b6..88fad25c 100644
--- a/src/store/modules/Settings/SmtpStore.js
+++ b/src/store/modules/Settings/SmtpStore.js
@@ -10,10 +10,13 @@ const SmtpStore = {
   },
   actions: {
     async setSmtpSettings({ commit }, payload) {
+      let url = `/redfish/v1/Smtp/ChangeParameters`;
+      for (let key in payload) {
+        url += `&${key}=${payload[key]}`;
+      }
+
       return await api
-        .get(
-          `/redfish/v1/Smtp/ChangeParameters&user=${payload.user}&password=${payload.password}&host=smtp.${payload.host}&port=${payload.port}&auth=${payload.auth}&ssl=${payload.ssl}`
-        )
+        .get(url)
         .then(() => {
           commit('saveSmtpSettings', payload);
           return i18n.t('pageTransfer.saveSmtpSuсcess');
@@ -24,9 +27,12 @@ const SmtpStore = {
         });
     },
     async sendTestMessage(_, payload) {
-      return await api.get(
-        `redfish/v1/Smtp/SendMail&from=${payload.from}&to=${payload.to}&subject=${payload.subject}&text=${payload.text}`
-      );
+      let url = `/redfish/v1/Smtp/SendMail`;
+      for (let key in payload) {
+        url += `&${key}=${payload[key]}`;
+      }
+
+      return await api.get(url);
     },
   },
 };
diff --git a/src/views/_sila/Settings/TransferInfo/WarningSmtp.vue b/src/views/_sila/Settings/TransferInfo/WarningSmtp.vue
index 63d3a75a..f48633b2 100644
--- a/src/views/_sila/Settings/TransferInfo/WarningSmtp.vue
+++ b/src/views/_sila/Settings/TransferInfo/WarningSmtp.vue
@@ -28,7 +28,7 @@
           <b-form-input
             id="smtp-name"
             v-model="form.user"
-            :disabled="isNotAdmin"
+            :disabled="isNotAdmin || !form.auth"
           /> </b-form-group
       ></b-col>
       <b-col xs="12" sm="12">
@@ -41,7 +41,7 @@
               id="smtp-password"
               v-model="form.password"
               type="password"
-              :disabled="isNotAdmin"
+              :disabled="isNotAdmin || !form.auth"
             />
           </input-password-toggle>
         </b-form-group>
@@ -136,8 +136,8 @@ export default {
         password: '',
         host: '',
         port: '',
-        auth: null,
-        ssl: null,
+        auth: false,
+        ssl: false,
       },
       fields: [
         {
@@ -164,6 +164,12 @@ export default {
   },
   methods: {
     saveSmtp() {
+      if (!this.form.auth) {
+        // eslint-disable-next-line no-unused-vars
+        const { user, password, ...formWithoutCredits } = this.form;
+        this.form = formWithoutCredits;
+      }
+
       this.$store
         .dispatch('smtpStore/setSmtpSettings', this.form)
         .then((message) => this.successToast(message))