TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-27 11:41:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make SMTP username & password optional in mail configuration

Browse Source 
Fixes #438
This commit is contained in:
Mohit Panjwani
2021-04-10 07:46:32 +00:00
parent 16e4212300 109de237b1
commit 7f9938c80d
4 changed files with 13 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Requests/MailEnvironmentRequest.php
View File

@ -37,14 +37,6 @@ class MailEnvironmentRequest extends FormRequest
'mail_port' => [
'required'
],
'mail_username' => [
'required',
'string'
],
'mail_password' => [
'required',
'string'
],
'mail_encryption' => [
'required',
'string'

48
resources/assets/js/views/settings/mail-driver/SmtpMailDriver.vue
View File

@ -33,33 +33,21 @@
/>
</sw-input-group>
<sw-input-group
:label="$t('settings.mail.username')"
:error="usernameError"
required
>
<sw-input-group :label="$t('settings.mail.username')">
<sw-input
:invalid="$v.mailConfigData.mail_username.$error"
v-model.trim="mailConfigData.mail_username"
type="text"
name="db_name"
class="mt-2"
@input="$v.mailConfigData.mail_username.$touch()"
/>
</sw-input-group>
<sw-input-group
:label="$t('settings.mail.password')"
:error="passwordError"
required
>
<sw-input-group :label="$t('settings.mail.password')">
<sw-input
:invalid="$v.mailConfigData.mail_password.$error"
v-model.trim="mailConfigData.mail_password"
:type="getInputType"
name="password"
class="mt-2"
@input="$v.mailConfigData.mail_password.$touch()"
>
<template v-slot:rightIcon>
<eye-off-icon
@ -158,6 +146,10 @@ const { required, email, numeric } = require('vuelidate/lib/validators')
import { EyeIcon, EyeOffIcon } from '@vue-hero-icons/outline'
export default {
components: {
EyeIcon,
EyeOffIcon,
},
props: {
configData: {
type: Object,
@ -175,10 +167,6 @@ export default {
default: Array,
},
},
components: {
EyeIcon,
EyeOffIcon,
},
data() {
return {
mailConfigData: {
@ -207,12 +195,6 @@ export default {
required,
numeric,
},
mail_username: {
required,
},
mail_password: {
required,
},
mail_encryption: {
required,
},
@ -244,24 +226,6 @@ export default {
return this.$tc('validation.required')
}
},
usernameError() {
if (!this.$v.mailConfigData.mail_username.$error) {
return ''
}
if (!this.$v.mailConfigData.mail_username.required) {
return this.$tc('validation.required')
}
},
passwordError() {
if (!this.$v.mailConfigData.mail_password.$error) {
return ''
}
if (!this.$v.mailConfigData.mail_password.required) {
return this.$tc('validation.required')
}
},
portError() {
if (!this.$v.mailConfigData.mail_port.$error) {
return ''

2
resources/assets/js/views/wizard/Wizard.vue
View File

@ -10,7 +10,7 @@
/>
<sw-wizard
:steps="7"
:currentStep.sync="step"
:current-step.sync="step"
:allow-navigation-redirect="false"
>
<component :is="tab" @next="setTab" />

48
resources/assets/js/views/wizard/mail-driver/SmtpMailDriver.vue
View File

@ -33,31 +33,19 @@
</div>
<div class="grid grid-cols-1 gap-4 mb-4 md:grid-cols-2 md:mb-6">
<sw-input-group
:label="$t('wizard.mail.username')"
:error="usernameError"
required
>
<sw-input-group :label="$t('wizard.mail.username')">
<sw-input
:invalid="$v.mailConfigData.mail_username.$error"
v-model.trim="mailConfigData.mail_username"
type="text"
name="db_name"
@input="$v.mailConfigData.mail_username.$touch()"
/>
</sw-input-group>
<sw-input-group
:label="$t('wizard.mail.password')"
:error="passwordError"
required
>
<sw-input-group :label="$t('wizard.mail.password')">
<sw-input
:invalid="$v.mailConfigData.mail_password.$error"
v-model.trim="mailConfigData.mail_password"
:type="getInputType"
name="password"
@input="$v.mailConfigData.mail_password.$touch()"
>
<template v-slot:rightIcon>
<eye-off-icon
@ -154,6 +142,10 @@ const { required, email, numeric } = require('vuelidate/lib/validators')
import { EyeIcon, EyeOffIcon } from '@vue-hero-icons/outline'
export default {
components: {
EyeIcon,
EyeOffIcon,
},
props: {
configData: {
type: Object,
@ -171,10 +163,6 @@ export default {
default: Array,
},
},
components: {
EyeIcon,
EyeOffIcon,
},
data() {
return {
isShowPassword: false,
@ -203,12 +191,6 @@ export default {
required,
numeric,
},
mail_username: {
required,
},
mail_password: {
required,
},
mail_encryption: {
required,
},
@ -239,24 +221,6 @@ export default {
return this.$tc('validation.required')
}
},
usernameError() {
if (!this.$v.mailConfigData.mail_username.$error) {
return ''
}
if (!this.$v.mailConfigData.mail_username.required) {
return this.$tc('validation.required')
}
},
passwordError() {
if (!this.$v.mailConfigData.mail_password.$error) {
return ''
}
if (!this.$v.mailConfigData.mail_password.required) {
return this.$tc('validation.required')
}
},
portError() {
if (!this.$v.mailConfigData.mail_port.$error) {
return ''