Skip to content

Commit 41824d4

Browse files
committed
Passing keys from index.js to routes handler
1 parent 333d2e7 commit 41824d4

File tree

3 files changed

+49
-24
lines changed

3 files changed

+49
-24
lines changed

index.js

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,28 @@ import {encryptAES, decryptAES} from './crypto.js';
77
// dev env
88
dotenv.config();
99

10+
let EXCHANGE_RATE_APIKEY;
11+
let BASE_URI;
12+
let SAMPLE2_URI;
13+
let WEATHERBIT_KEY;
14+
let WEATHERBIT_URI;
15+
16+
if (process.env.NODE_ENV === "production") {
17+
EXCHANGE_RATE_APIKEY = process.env.EXCHANGE_RATE_APIKEY;
18+
BASE_URI = process.env.EXCHANGE_BASE_URI;
19+
SAMPLE2_URI = process.env.SAMPLE2_URI;
20+
WEATHERBIT_KEY = process.env.WEATHERBIT_KEY;
21+
WEATHERBIT_URI = process.env.WEATHERBIT_URI;
22+
} else {
23+
EXCHANGE_RATE_APIKEY = keys.exchangerateapi.APIKEY;
24+
BASE_URI = keys.exchangerateapi.BASE_URI;
25+
SAMPLE2_URI = keys.exchangerateapi.SAMPLE2_URI;
26+
WEATHERBIT_KEY = keys.weatherbitapi.APIKEY;
27+
WEATHERBIT_URI = keys.weatherbitapi.BASE_URI;
28+
}
29+
30+
31+
1032
// Create network routing
1133
const app = express();
1234

@@ -69,3 +91,5 @@ app.listen(port, () => {
6991
console.log('Sorry, failed to launch.');
7092
}
7193
});
94+
95+
export { EXCHANGE_RATE_APIKEY, BASE_URI, SAMPLE2_URI, WEATHERBIT_KEY, WEATHERBIT_URI };

routes/currency-exchange-routes.js

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
import { data as currencyCodes } from 'currency-codes';
22
import request from 'request';
33
import express from 'express';
4+
import { EXCHANGE_RATE_APIKEY, BASE_URI, SAMPLE2_URI } from '../index.js';
45

5-
import { keys } from '../config/keys.js';
6-
7-
let EXCHANGE_RATE_APIKEY;
8-
let BASE_URI;
9-
let SAMPLE2_URI;
10-
if (process.env.NODE_ENV === "production") {
11-
EXCHANGE_RATE_APIKEY = process.env.EXCHANGE_RATE_APIKEY;
12-
BASE_URI = process.env.EXCHANGE_BASE_URI;
13-
SAMPLE2_URI = process.env.SAMPLE2_URI;
14-
} else {
15-
EXCHANGE_RATE_APIKEY = keys.exchangerateapi.APIKEY;
16-
BASE_URI = keys.exchangerateapi.BASE_URI;
17-
SAMPLE2_URI = keys.exchangerateapi.SAMPLE2_URI;
18-
}
6+
// let EXCHANGE_RATE_APIKEY;
7+
// let BASE_URI;
8+
// let SAMPLE2_URI;
9+
// if (process.env.NODE_ENV === "production") {
10+
// EXCHANGE_RATE_APIKEY = process.env.EXCHANGE_RATE_APIKEY;
11+
// BASE_URI = process.env.EXCHANGE_BASE_URI;
12+
// SAMPLE2_URI = process.env.SAMPLE2_URI;
13+
// } else {
14+
// EXCHANGE_RATE_APIKEY = keys.exchangerateapi.APIKEY;
15+
// BASE_URI = keys.exchangerateapi.BASE_URI;
16+
// SAMPLE2_URI = keys.exchangerateapi.SAMPLE2_URI;
17+
// }
1918

2019
const router = express.Router();
2120

routes/weatherbit-routes.js

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
import express from 'express';
22
import request from 'request';
3-
import { keys } from '../config/keys.js';
3+
4+
import { WEATHERBIT_KEY, WEATHERBIT_URI } from '../index.js';
5+
46
const router = express.Router();
57

6-
let WEATHERBIT_KEY;
7-
let WEATHERBIT_URI;
8+
// let WEATHERBIT_KEY;
9+
// let WEATHERBIT_URI;
810

9-
if (process.env.NODE_ENV === "production") {
10-
WEATHERBIT_KEY = process.env.WEATHERBIT_KEY;
11-
WEATHERBIT_URI = process.env.WEATHERBIT_URI;
12-
} else {
13-
WEATHERBIT_KEY = keys.weatherbitapi.APIKEY;
14-
WEATHERBIT_URI = keys.weatherbitapi.BASE_URI;
15-
}
11+
// if (process.env.NODE_ENV === "production") {
12+
// WEATHERBIT_KEY = process.env.WEATHERBIT_KEY;
13+
// WEATHERBIT_URI = process.env.WEATHERBIT_URI;
14+
// } else {
15+
// WEATHERBIT_KEY = keys.weatherbitapi.APIKEY;
16+
// WEATHERBIT_URI = keys.weatherbitapi.BASE_URI;
17+
// }
1618

1719
router.get('/', (req, res) => {
1820
res.render('pages/weatherbit');

0 commit comments

Comments
 (0)