fix(env): make $secure work without $default

Fix #27
FGRibreau · Oct 29, 2018 · 465890f · 465890f
1 parent c4f0b76
commit 465890f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/src/lib/env.js b/src/lib/env.js
@@ -133,8 +133,7 @@ module.exports = function envFactory() {
       throw new Error('$aliases must be an array');
     }
 
-    const aliaseOrSecureIsDefined = !_.isUndefined(config.$aliases) || !_.isUndefined(config.$secure);
-    if (aliaseOrSecureIsDefined && (_.isUndefined(config.$type) && _.isUndefined(config.$default))) {
+    if (!_.isUndefined(config.$aliases) && (_.isUndefined(config.$type) && _.isUndefined(config.$default))) {
       throw new CommonEnvInvalidConfiguration(context.fullKeyName);
     }
 
@@ -159,7 +158,7 @@ module.exports = function envFactory() {
 
       // only try to get an env var if memo is undefined
       if (isLast) {
-        return _.isUndefined(config.$default) ? getOrDieWithAliases(varEnvName, $typeConverter, aliases) : getOrElse(varEnvName, config.$default, $typeConverter, config.$secure);
+        return _.isUndefined(config.$default) ? getOrDieWithAliases(varEnvName, $typeConverter, aliases, config.$secure) : getOrElse(varEnvName, config.$default, $typeConverter, config.$secure);
       }
 
       return getOrElse(varEnvName, null, $typeConverter, config.$secure);
@@ -189,8 +188,8 @@ module.exports = function envFactory() {
   }
 
   function getOrDieFactory(f) {
-    return function(fullKeyName, $typeConverter /* args */ ) {
-      var value = getOrElse(fullKeyName, null, $typeConverter);
+    return function(fullKeyName, $typeConverter, aliases, $secure) {
+      var value = getOrElse(fullKeyName, null, $typeConverter, $secure);
 
       if (value === null) {
         f.apply(null, arguments);
@@ -248,7 +247,7 @@ function isArrayOfAtom(array) {
 }
 
 function isConfigurationObject(value) {
-  return _.isObject(value) && (_.has(value, '$default') || _.has(value, '$aliases') || _.has(value, '$type'));
+  return _.isObject(value) && (_.has(value, '$default') || _.has(value, '$aliases') || _.has(value, '$type') || _.has(value, '$secure'));
 }
 
 /**

diff --git a/src/lib/errors.js b/src/lib/errors.js
@@ -22,7 +22,7 @@ function CommonEnvRootConfigurationObjectException(object, prefix) {
 util.inherits(CommonEnvRootConfigurationObjectException, Error);
 
 function CommonEnvInvalidConfiguration(key) {
-  this.message = 'Invalid configuration, `$aliases` or `$secure` must be defined along side $default or $type in key "{key}"'.replace('{key}', key);
+  this.message = 'Invalid configuration, `$aliases` must be defined along side $default or $type in key "{key}"'.replace('{key}', key);
   this.name = 'CommonEnvInvalidConfiguration';
 }
 util.inherits(CommonEnvInvalidConfiguration, Error);

diff --git a/src/withLogger.test.js b/src/withLogger.test.js
@@ -57,6 +57,21 @@ describe('withLogger', function() {
         }
       });
     });
+  });
+
+  it('should handle $secure without $default', function() {
+    process.env = {};
+    process.env.PASSWORD = 'ohMyGodImSoSecret';
 
+    var config = env.getOrElseAll({
+      password: {
+        $secure: true
+      }
+    });
+    t.strictEqual(config.password, process.env.PASSWORD);
+    t.deepEqual(logger.calls, [
+      ["[env] %s was defined, using: %s", "PASSWORD", "***"]
+    ]);
   });
+
 });