Browse Source

refactor(nocodb): lint

pull/5413/head
Wing-Kam Wong 2 years ago
parent
commit
2bdb598ac8
  1. 24
      packages/nocodb/src/lib/db/sql-client/lib/SqlClientFactory.ts
  2. 18
      packages/nocodb/src/lib/utils/NcConfigFactory.ts

24
packages/nocodb/src/lib/db/sql-client/lib/SqlClientFactory.ts

@ -48,21 +48,27 @@ export default class {
typeof connectionConfig.connection.ssl === 'object'
) {
if (connectionConfig.connection.ssl.caFilePath) {
connectionConfig.connection.ssl.ca = (await promisify(fs.readFile)(
connectionConfig.connection.ssl.caFilePath
)).toString();
connectionConfig.connection.ssl.ca = (
await promisify(fs.readFile)(
connectionConfig.connection.ssl.caFilePath
)
).toString();
delete connectionConfig.connection.ssl.caFilePath;
}
if (connectionConfig.connection.ssl.keyFilePath) {
connectionConfig.connection.ssl.key = (await promisify(fs.readFile)(
connectionConfig.connection.ssl.keyFilePath
)).toString();
connectionConfig.connection.ssl.key = (
await promisify(fs.readFile)(
connectionConfig.connection.ssl.keyFilePath
)
).toString();
delete connectionConfig.connection.ssl.keyFilePath;
}
if (connectionConfig.connection.ssl.certFilePath) {
connectionConfig.connection.ssl.cert = (await promisify(fs.readFile)(
connectionConfig.connection.ssl.certFilePath
)).toString();
connectionConfig.connection.ssl.cert = (
await promisify(fs.readFile)(
connectionConfig.connection.ssl.certFilePath
)
).toString();
delete connectionConfig.connection.ssl.certFilePath;
}
}

18
packages/nocodb/src/lib/utils/NcConfigFactory.ts

@ -380,24 +380,24 @@ export default class NcConfigFactory implements NcConfig {
typeof dbConfig?.connection?.ssl === 'object'
) {
if (dbConfig.connection.ssl.caFilePath && !dbConfig.connection.ssl.ca) {
dbConfig.connection.ssl.ca = (await promisify(fs.readFile)(
dbConfig.connection.ssl.caFilePath
)).toString();
dbConfig.connection.ssl.ca = (
await promisify(fs.readFile)(dbConfig.connection.ssl.caFilePath)
).toString();
delete dbConfig.connection.ssl.caFilePath;
}
if (dbConfig.connection.ssl.keyFilePath && !dbConfig.connection.ssl.key) {
dbConfig.connection.ssl.key = (await promisify(fs.readFile)(
dbConfig.connection.ssl.keyFilePath
)).toString();
dbConfig.connection.ssl.key = (
await promisify(fs.readFile)(dbConfig.connection.ssl.keyFilePath)
).toString();
delete dbConfig.connection.ssl.keyFilePath;
}
if (
dbConfig.connection.ssl.certFilePath &&
!dbConfig.connection.ssl.cert
) {
dbConfig.connection.ssl.cert = (await promisify(fs.readFile)(
dbConfig.connection.ssl.certFilePath
)).toString();
dbConfig.connection.ssl.cert = (
await promisify(fs.readFile)(dbConfig.connection.ssl.certFilePath)
).toString();
delete dbConfig.connection.ssl.certFilePath;
}
}

Loading…
Cancel
Save