Skip to content

Commit 92417d2

Browse files
authored
Merge pull request #142 from gustavo-bertoldi/master
Client init without parameters
2 parents f4ff98a + ad9c8f3 commit 92417d2

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

spec/amadeus/client/validator.test.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,14 @@ describe('Validator', () => {
3131
'test1' : '1'
3232
};
3333
process.env.AMADEUS_TEST2 = '2';
34+
process.env.AMADEUS_TEST_SNAKE_CASE = '5';
3435
expect(validator.initOptional('test1', options)).toBe('1');
3536
expect(validator.initOptional('test2', options)).toBe('2');
3637
expect(validator.initOptional('test3', options)).toBe(null);
3738
expect(validator.initOptional('test4', options, '4')).toBe('4');
39+
expect(validator.initOptional('testSnakeCase', options)).toBe('5');
3840
process.env.AMADEUS_TEST2 = undefined;
41+
process.env.AMADEUS_TEST_SNAKE_CASE = undefined;
3942
});
4043
});
4144

src/amadeus/client/validator.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ class Validator {
8181

8282
initOptional(key, options, fallback = null) {
8383
let value = options[key];
84-
let envKey = `AMADEUS_${key.toUpperCase()}`;
84+
//Env variables names expected to be in SNAKE_CASE and uppercase
85+
let envKey = `AMADEUS_${key.replace(/[A-Z]/g, c => `_${c.toLowerCase()}`).toUpperCase()}`;
8586
if (value == undefined) { value = options[key]; }
8687
if (value == undefined) { value = process.env[envKey]; }
8788
if (value == undefined) { value = fallback; }

0 commit comments

Comments
 (0)