Skip to content

Commit 6c2a427

Browse files
strongly type ssl data
1 parent c35fe71 commit 6c2a427

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

server/controllers/mysqlData.controller.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,15 @@ const dotenv = require('dotenv');
55
dotenv.config();
66

77
const mySQLdataController = {};
8+
89
const SSL_KEY =
9-
Buffer.from(process.env.SSL_KEY, 'base64').toString('ascii') ||
10-
fs.readFileSync('./.cert/key.pem').toString();
10+
typeof process.env.SSL_KEY === 'string'
11+
? Buffer.from(process.env.SSL_KEY, 'base64').toString('ascii')
12+
: fs.readFileSync('./.cert/key.pem').toString();
1113
const SSL_CERT =
12-
Buffer.from(process.env.SSL_CERT, 'base64').toString('ascii') ||
13-
fs.readFileSync('./.cert/cert.pem').toString();
14+
typeof process.env.SSL_CERT === 'string'
15+
? Buffer.from(process.env.SSL_CERT, 'base64').toString('ascii')
16+
: fs.readFileSync('./.cert/cert.pem').toString();
1417

1518
/**
1619
* mySQLdataController.getSchema

server/models/userModel.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ dotenv.config();
77

88
const { USER_DB_USER, USER_DB_PW } = process.env;
99
const SSL_KEY =
10-
Buffer.from(process.env.SSL_KEY as string, 'base64').toString('ascii') ||
11-
fs.readFileSync('./.cert/key.pem').toString();
10+
typeof process.env.SSL_KEY === 'string'
11+
? Buffer.from(process.env.SSL_KEY, 'base64').toString('ascii')
12+
: fs.readFileSync('./.cert/key.pem').toString();
1213
const SSL_CERT =
13-
Buffer.from(process.env.SSL_CERT as string, 'base64').toString('ascii') ||
14-
fs.readFileSync('./.cert/cert.pem').toString();
14+
typeof process.env.SSL_CERT === 'string'
15+
? Buffer.from(process.env.SSL_CERT, 'base64').toString('ascii')
16+
: fs.readFileSync('./.cert/cert.pem').toString();
1517

1618
const pool = mysql
1719
.createPool({

0 commit comments

Comments
 (0)