diff --git a/src/utils/getFiles.ts b/src/utils/getFiles.ts index 571da0b4f..496bdbdcb 100644 --- a/src/utils/getFiles.ts +++ b/src/utils/getFiles.ts @@ -2,19 +2,12 @@ import fs from 'fs' import path from 'path' import { SSLPath, SSLContent } from '@/views/connections/types' -export const getCAFile = () => { - // igonre -} - export const getSSLFile = (sslPath: SSLPath): SSLContent | undefined => { const { ca, cert, key } = sslPath - if (ca === '' && cert === '' && key === '') { - return undefined - } const res: SSLContent = { - ca: fs.readFileSync(path.join(ca), 'utf-8'), - cert: fs.readFileSync(path.join(cert), 'utf-8'), - key: fs.readFileSync(path.join(key), 'utf-8'), + ca: ca !== '' ? [fs.readFileSync(path.join(ca), 'utf-8')] : undefined, + cert: cert !== '' ? fs.readFileSync(path.join(cert), 'utf-8') : undefined, + key: key !== '' ? fs.readFileSync(path.join(key), 'utf-8') : undefined, } return res } diff --git a/src/views/connections/ConnectionForm.vue b/src/views/connections/ConnectionForm.vue index 3dbff036d..7b69792bb 100644 --- a/src/views/connections/ConnectionForm.vue +++ b/src/views/connections/ConnectionForm.vue @@ -78,7 +78,7 @@ - CA signed server + CA signed server Self signed @@ -259,8 +259,6 @@ export default class ConnectionCreate extends Vue { port: [{ required: true, message: this.$t('common.inputRequired') }], certType: [{ required: true, message: this.$t('common.selectRequired') }], ca: [{ required: true, message: this.$t('common.inputRequired') }], - cert: [{ required: true, message: this.$t('common.inputRequired') }], - key: [{ required: true, message: this.$t('common.inputRequired') }], } } diff --git a/src/views/connections/types.ts b/src/views/connections/types.ts index 3da2b8614..c71f23389 100644 --- a/src/views/connections/types.ts +++ b/src/views/connections/types.ts @@ -28,7 +28,7 @@ export interface ConnectionModel extends SSLPath { username: string, password: string, path: string, - certType?: '' | 'ca' | 'self', + certType?: '' | 'server' | 'self', ssl: boolean, mqttVersion: '3.1.1' | '5.0', unreadMessageCount: number,