Fixed - Number of items in a request is one larger than maxBatchedReq…

…uestPerCallAdded the ability to send non-HTTPOnly cookies in each request segment in a batch request via the sendCookies flag on theconfig object.The batcher can now be disabled by setting the enabled config flag to false

README.md

@@ -58,7 +58,9 @@ The setAllowedBatchEndpoint has some options that can be passed in as a third pa
 	maxBatchedRequestPerCall: 10,
 	minimumBatchSize: 2,
 	batchRequestCollectionDelay: 100,
-	ignoredVerbs: ['head']
+	ignoredVerbs: ['head'],
+    sendCookies: false,
+    enabled: true
 }
 ```
 
@@ -71,8 +73,48 @@ The smallest number of individual calls allowed in a batch request.  This has a
 ####ignoredVerbs
 This is a string array of the HTTP verbs that are **not** allowed to form part of a batch request.  By default HEAD requests will not be batched.  If for instance you did not want to batch HEAD and DELETE calls you would pass in this array as an option <code>['head', 'delete']</code>
 
+####enabled
+True by default.  If this is set to false the batcher will ignore all request and them will be send as normal single HTTP requests.
+
+####sendCookies
+False by default to reduce requesst size.  If this is set to true cookies availiable on the document.cookie property will be set
+in each segment of a batch request.  Note that only non HTTPOnly cookie will be sent as HTTPOnly cookies cannot be access by JavaScript
+because of security limitations.
+
+Note that if you are sending CORS request you will have to enable withCredentials on $http to allow cookies to be sent on the XHR request.
+
+```language-javascript
+    angular.module('myApp').config(['$httpProvider', function($httpProvider) {
+        $httpProvider.defaults.withCredentials = true;
+    }]);
+```
+
+Also ensure the server responses to the OPTIONS call with the below header:
+
+```language-csharp
+Access-Control-Allow-Credentials: true
+
+[EnableCors("*", "*", "*", SupportsCredentials=true)]
+
+or
+
+config.EnableCors();
+var defaultPolicyProvider = new EnableCorsAttribute("*", "*", "*");
+defaultPolicyProvider.SupportsCredentials = true; //important if you are sending cookies
+AttributeBasedPolicyProviderFactory policyProviderFactory = new AttributeBasedPolicyProviderFactory();
+policyProviderFactory.DefaultPolicyProvider = defaultPolicyProvider;
+config.SetCorsPolicyProviderFactory(policyProviderFactory);
+
+config.Routes.MapHttpRoute(
+    name: "BatchApi",
+    routeTemplate: "api/batch",
+    defaults: null,
+    constraints: null,
+    handler: new CorsMessageHandler(config) { InnerHandler = new DefaultHttpBatchHandler(GlobalConfiguration.DefaultServer) });
+```
+
 ####batchRequestCollectionDelay
-This is undoubtaly the most important option.  As this module tries to be as transparent as possible to the user.
+This is undoubtedly the most important option.  As this module tries to be as transparent as possible to the user.
 
 The default time in milliseconds the http batcher should wait to collection all request to this domain after the first http call that can be batched has been collect.  This defaults to 100ms.  Therefore if you send a HTTP GET call that can be batched the HTTP batcher will receive this call and wait a further 100ms before sending the call in order to wait for other calls to the same domain in order to add them to the current batch request.  If no other calls are collected the initial HTTP call will be allowed to continue as normal and will not be batched unless the config property - **minimumBatchSize** is set to one.
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-http-batcher",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "Enables transparent HTTP batch requests with Angular",
   "main": "dist/angular-http-batch.js",
   "keywords": [

dist/ChangeLog.txt

@@ -1,3 +1,9 @@
+29/05/2015 V1.8.0
+Fixed - Number of items in a request is one larger than maxBatchedRequestPerCall
+Added the ability to send non-HTTPOnly cookies in each request segment in a batch request via the sendCookies flag on the
+config object.
+The batcher can now be disabled by setting the enabled config flag to false
+
 16/03/2015 V1.7.0
 Fixed issue with parsing the response string into a json object with having more than two dashes '--' in the returned data.
 
@@ -23,4 +29,4 @@ be a string.
 
 27/08/2014 V1.1.0
 Fixed bug when a request hit the batch collection timeout and the request have not reached the min batch size the pending
-request is not moved which forces other request to have sending delays.
+request is not moved which forces other request to have sending delays.

dist/angular-http-batch.js

@@ -1,5 +1,5 @@
 /*
- * angular-http-batcher - v1.7.0 - 2015-03-18
+ * angular-http-batcher - v1.8.0 - 2015-05-29
  * https://github.com/jonsamwell/angular-http-batcher
  * Copyright (c) 2015 Jon Samwell
  */
@@ -29,7 +29,9 @@ angular.module(window.ahb.name).provider('httpBatchConfig', [
                 maxBatchedRequestPerCall: 10,
                 minimumBatchSize: 2,
                 batchRequestCollectionDelay: 100,
-                ignoredVerbs: ['head']
+                ignoredVerbs: ['head'],
+                sendCookies: false,
+                enabled: true
             };
 
         /**
@@ -63,6 +65,11 @@ angular.module(window.ahb.name).provider('httpBatchConfig', [
          *      request.  If no other calls are collected the initial HTTP call will be allowed to continue as normal and will
          *      not be batched unless the config property - **minimumBatchSize** is set to one.
          *  - **ignoredVerbs** - The HTTP verbs that are ignored and not included in a batch request.  By default only HEAD request are ignored.
+         *  - **sendCookies** - True indicates that cookies will be send within each request segment in the batch request.  Note
+         *      only non HTTPOnly cookies can be sent as Javascript cannot access HTTPOnly cookies for security reasons.  This
+         *      property is false by default to reduce request size.
+         *  - **enabled** True indicates batching is enabled.  The default is true.  If the property is false the batcher will
+         *      send request down the normal $http pipeline and request will not be batched.
          */
         this.setAllowedBatchEndpoint = function (serviceUrl, batchEndpointUrl, config) {
             var mergedConfiguration = angular.copy(defaultConfiguration);
@@ -125,6 +132,7 @@ angular.module(window.ahb.name).provider('httpBatchConfig', [
         this.canBatchCall = function (url, method) {
             var config = this.getBatchConfig(url);
             return config !== undefined &&
+                config.enabled === true &&
                 config.batchEndpointUrl !== url &&
                 config.ignoredVerbs.indexOf(method.toLowerCase()) === -1;
         };
@@ -142,7 +150,6 @@ angular.module(window.ahb.name).provider('httpBatchConfig', [
         };
 
         this.$get = [
-
             function () {
                 return this;
             }
@@ -152,10 +159,11 @@ angular.module(window.ahb.name).provider('httpBatchConfig', [
 
 angular.module(window.ahb.name).factory('httpBatcher', [
     '$injector',
+    '$document',
     '$window',
     '$timeout',
     'httpBatchConfig',
-    function ($injector, $window, $timeout, httpBatchConfig) {
+    function ($injector, $document, $window, $timeout, httpBatchConfig) {
         'use strict';
 
         var constants = {
@@ -344,6 +352,10 @@ angular.module(window.ahb.name).factory('httpBatcher', [
                             batchBody.push(header + ': ' + request.headers[header]);
                         }
 
+                        if (config.sendCookies === true && $document[0].cookie && $document[0].cookie.length > 0) {
+                            batchBody.push('Cookie: ' + $document[0].cookie);
+                        }
+
                         batchBody.push(constants.emptyString);
 
                         if (request.data) {
@@ -387,7 +399,7 @@ angular.module(window.ahb.name).factory('httpBatcher', [
                 addRequest = function (request) {
                     this.requests.push(request);
 
-                    if (this.requests.length > this.config.maxBatchedRequestPerCall) {
+                    if (this.requests.length >= this.config.maxBatchedRequestPerCall) {
                         this.flush();
                     }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-http-batcher",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "Enables transparent HTTP batch requests with Angular",
   "main": "angular-http-batcher.min.js",
   "scripts": {

servers/WebApi2/WebApiHttpBatchServer/App_Start/WebApiConfig.cs

@@ -13,12 +13,13 @@ public static class WebApiConfig
     {
         public static void Register(HttpConfiguration config)
         {
-            //config.EnableCors();
+            config.EnableCors();
             // Web API routes
             config.EnableSystemDiagnosticsTracing().IsVerbose = true;
             config.MapHttpAttributeRoutes();
 
             var defaultPolicyProvider = new EnableCorsAttribute("*", "*", "*");
+            defaultPolicyProvider.SupportsCredentials = true; //important if you are sending cookies
             AttributeBasedPolicyProviderFactory policyProviderFactory = new AttributeBasedPolicyProviderFactory();
             policyProviderFactory.DefaultPolicyProvider = defaultPolicyProvider;
             config.SetCorsPolicyProviderFactory(policyProviderFactory);