Fix default inAudienceValidationFunction

The function had a statement that performed no value:
_.flatten(userRoles, this.roleToAudienceMapFunction) resulted in the
userRoles array being flattened, but it should have been mapping the
userRoles with the roleToAudienceMapFunction. Fixed this behavior and
also extended the behavior so the roleToAudienceMapFunction can return
an array of values, which will then be flattened into the final
userAudience list.

Author: justinsa

README.md

@@ -55,9 +55,9 @@ app.config(['$navigationProvider', function ($navigationProvider) {
       return userRole;
     },
     inAudienceValidationFunction: function (userRoles, audiences) {
-      var userAudiences = _.flatten(userRoles, this.roleToAudienceMapFunction);
+      var userAudiences = _.flatten(_.map(userRoles, this.roleToAudienceMapFunction));
       return !_.isEmpty(userAudiences) && !_.isEmpty(audiences) &&
-        (_.find(audiences, function (audience) { return _.includes(userAudiences, audience); }) !== undefined);
+        _.some(audiences, function (audience) { return _.includes(userAudiences, audience); });
     }
   });
 }]);
@@ -73,6 +73,9 @@ All properties (own and inherited) of the extensions object will be available as
 ```JAVASCRIPT
 // returns true if the user is in any of the specified audiences
 $navigation.inAudience('X', 'Y', 'Z');
+
+// will flatten provided arrays that are one-level deep in the arguments list
+$navigation.inAudience('X', ['Y', 'Z'], ['A']) === $navigation.inAudience('X', 'Y', 'Z', 'A')
 ```
 
 ### isActiveLocation

ng-navigation-service.js

@@ -24,9 +24,9 @@
         return userRole;
       },
       inAudienceValidationFunction: function (userRoles, audiences) {
-        var userAudiences = _.flatten(userRoles, this.roleToAudienceMapFunction);
+        var userAudiences = _.flatten(_.map(userRoles, this.roleToAudienceMapFunction));
         return !_.isEmpty(userAudiences) && !_.isEmpty(audiences) &&
-          (_.find(audiences, function (audience) { return _.includes(userAudiences, audience); }) !== undefined);
+          _.some(audiences, function (audience) { return _.includes(userAudiences, audience); });
       }
     };
 
@@ -40,7 +40,7 @@
     this.$get = ['$injector', '$location', '$log', '$window', function ($injector, $location, $log, $window) {
       var secService;
       var securityService = function () {
-        if (secService === undefined) {
+        if (_.isUndefined(secService)) {
           if (!_.isString(configuration.securityService)) {
             $log.error('No securityService configuration value provided');
             return undefined;
@@ -65,7 +65,7 @@
          * returns true if the user is in any of the specified audiences.
          */
         inAudience: function () {
-          var args = _.toArray(arguments);
+          var args = _.flatten(_.toArray(arguments));
           var authenticated = securityService().isAuthenticated();
           // handle 'all' and 'anonymous' special cases
           if (args.length === 1 && _.isString(args[0])) {

tests.js

@@ -16,7 +16,7 @@ describe('$navigation', function() {
     it('should be exposed as part of the service',
       inject(function ($navigation) {
         $navigation.links.key.should.equal('value');
-        $navigation.linker.should.be.a.Function; // jshint ignore:line
+        $navigation.linker.should.be.a.Function();
       })
     );
   });
@@ -43,8 +43,8 @@ describe('$navigation', function() {
     it('should have an expected default configuration',
       inject(function ($navigation) {
         var configuration = $navigation.getConfiguration();
-        configuration.inAudienceValidationFunction.should.be.a.Function; // jshint ignore:line
-        configuration.roleToAudienceMapFunction.should.be.a.Function; // jshint ignore:line
+        configuration.inAudienceValidationFunction.should.be.a.Function();
+        configuration.roleToAudienceMapFunction.should.be.a.Function();
         configuration.activeLinkDecorator.should.equal('active-decorator');
         configuration.inactiveLinkDecorator.should.equal('inactive-decorator');
         configuration.securityService.should.equal('$security');
@@ -55,7 +55,7 @@ describe('$navigation', function() {
       inject(function ($navigation) {
         var functions = ['decorateLink', 'getConfiguration', 'inAudience', 'isActiveLocation', 'tokenizePath'];
         for (var i in functions) {
-          $navigation[functions[i]].should.be.a.Function; // jshint ignore:line
+          $navigation[functions[i]].should.be.a.Function();
         }
       })
     );
@@ -235,6 +235,12 @@ describe('$navigation', function() {
             $navigation.inAudience('a', 'b').should.equal(true);
           })
         );
+
+        it('should handle an array as part of the argument list',
+          inject(function ($security, $navigation) {
+            $navigation.inAudience('b', ['a']).should.equal(true);
+          })
+        );
       });
     });