test smtp connection before set up

This commit is contained in:
Čarodej
2022-04-01 17:18:51 +02:00
parent d4199a796d
commit 2d4c7241ef
11 changed files with 222 additions and 106 deletions

View File

@@ -38,4 +38,7 @@
.overflow-initial {
overflow: initial;
}
.overflow-anywhere {
overflow-wrap: anywhere;
}
}

View File

@@ -13,7 +13,7 @@
<h1 v-if="title" class="mb-2 text-2xl font-bold">
{{ title }}
</h1>
<p v-if="message" class="mb-4 text-sm">
<p v-if="message" class="mb-4 text-sm overflow-anywhere">
{{ message }}
</p>
</div>

View File

@@ -519,7 +519,7 @@ export default {
wasabi: 'https://s3.' + val + '.wasabisys.com',
backblaze: 'https://s3.' + val + '.backblazeb2.com',
oss: 'https://' + val + '.aliyuncs.com',
s3: 'https://s3.amazonaws.com',
s3: 'https://s3.' + val + '.amazonaws.com',
other: undefined,
}[this.storage.driver]
},
@@ -947,7 +947,6 @@ export default {
})
})
.catch((error) => {
if (error.response.status === 401 && error.response.data.type === 's3-connection-error') {
events.$emit('alert:open', {
title: 'S3 Connection Error - Wrong Credentials or Not Permitted',
@@ -990,10 +989,17 @@ export default {
})
})
.catch((error) => {
events.$emit('alert:open', {
title: this.$t('popup_error.title'),
message: this.$t('popup_error.message'),
})
if (error.response.status === 401 && error.response.data.type === 'mailer-connection-error') {
events.$emit('alert:open', {
title: 'Mailer Connection Error - Wrong Credentials',
message: error.response.data.message,
})
} else {
events.$emit('toaster', {
type: 'danger',
message: this.$t('popup_error.title'),
})
}
})
.finally(() => {
this.isSendingEmailForm = false

View File

@@ -581,7 +581,7 @@ export default {
wasabi: 'https://s3.' + val + '.wasabisys.com',
backblaze: 'https://s3.' + val + '.backblazeb2.com',
oss: 'https://' + val + '.aliyuncs.com',
s3: 'https://s3.amazonaws.com',
s3: 'https://s3.' + val + '.amazonaws.com',
other: undefined,
}[this.storage.driver]
},
@@ -988,6 +988,11 @@ export default {
title: 'S3 Connection Error - Wrong Credentials or Not Permitted',
message: error.response.data.message,
})
} else if (error.response.status === 401 && error.response.data.type === 'mailer-connection-error') {
events.$emit('alert:open', {
title: 'Mailer Connection Error - Wrong Credentials',
message: error.response.data.message,
})
} else {
this.isError = true
}

View File

@@ -0,0 +1 @@
This is the test.