Merge pull request #30 from spira/hotfix/defaults-deep-config

Hotfix/defaults deep config
spira · Aug 13, 2015 · 7c37c28 · 7c37c28
2 parents 56b905f + 501ce0f
commit 7c37c28
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/bower.json b/bower.json
@@ -4,7 +4,7 @@
   "description": "Angular JSON Web Token Authentication Module",
   "main": "dist/ngJwtAuth.js",
   "dependencies": {
-    "lodash": "~3.9.3",
+    "lodash": "3.10.1",
     "moment": "~2.10.3",
     "angular": ">=1.4",
     "angular-utf8-base64": "~0.0.5",

diff --git a/dist/ngJwtAuth.js b/dist/ngJwtAuth.js
diff --git a/dist/ngJwtAuth.js.map b/dist/ngJwtAuth.js.map
diff --git a/src/ngJwtAuthServiceProvider.ts b/src/ngJwtAuthServiceProvider.ts
@@ -66,7 +66,7 @@ module NgJwtAuth {
                 throw new NgJwtAuthException("Invalid properties ["+mismatchedConfig.join(',')+"] passed to config)");
             }
 
-            this.config = _.defaults(config, this.config);
+            this.config = _.defaultsDeep(config, this.config);
             return this;
         }
 

diff --git a/typings/lodash/lodash.d.ts b/typings/lodash/lodash.d.ts
@@ -5623,6 +5623,12 @@ declare module _ {
         defaults<T, TResult>(
             object: T,
             ...sources: any[]): TResult;
+
+
+        //@xiphiaz added defaultsDeep here for lodash 3.10.1
+        defaultsDeep<T, TResult>(
+            object: T,
+            ...sources: any[]): TResult;
     }
 
     interface LoDashObjectWrapper<T> {