domain.countAccounts() returns the Accounts limits infor by Cos

README.md

@@ -293,14 +293,24 @@ Count number of accounts by `CoS` in a domain.
 ```javascript
 zimbraApi.countAccounts('example.com', callback);
 
-// Object {unknow: 2, default: 33, basic: 28, premium: 31, professional: 31}
+// Object { premium: Object, professional: Object}
+// premium: {
+//   id: _COSId_,
+//   used: 50
+// }
+}
 ```
 
-If you have a `Domain` you can call `countAccounts(callback)` on it:
+If you have a `Domain` you can call `countAccounts(callback)` on it and it will returns the **Limit of Accounts** for the `Domain`:
 
 ```javascript
 // domain is a Domain, you got it from zimbraApi.getDomain....
 domain.countAccounts(callback);
-
-// Object {unknow: 2, default: 33, basic: 28, premium: 31, professional: 31}
+// Object { premium: Object, professional: Object}
+// premium: {
+//   id: _COSId_,
+//   used: 50,
+//   limit: 28
+// }
+}
 ```

package.json

 {
   "name": "zimbra-admin-api-js",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "private": true,
   "main": "lib/zimbra-admin-api.js",
   "dependencies": {

src/index.js

@@ -124,7 +124,10 @@ export default class ZimbraAdminApi {
     const result = {};
     const coses = data.get().CountAccountResponse.cos;
     coses.forEach((cos) => {
-      result[cos.name] = parseInt(cos._content);
+      result[cos.name] = {
+        used: parseInt(cos._content),
+        id: cos.id
+      }
     });
     // const counts = Object.values(result);
     // result.total = counts.reduce((a,b) => {return(a+b);});

src/zimbra/domain.js

@@ -9,14 +9,27 @@ export default class Domain extends Zimbra {
   }
 
   countAccounts(callback) {
+    const maxAccountsByCos = this.maxAccountsByCos();
     this.api.countAccounts(this.id, function(e,d){
       if(e) return callback(e);
+      if (maxAccountsByCos) Object.entries(d).forEach((cos) => {
+        cos[1].limit = maxAccountsByCos[cos[1].id];
+      });
       return callback(null, d);
     });
   }
 
-  maxAccounts(callback) {
-
+  maxAccountsByCos() {
+    const results = {};
+    if  (typeof this.attrs.zimbraDomainCOSMaxAccounts === 'undefined') return null;
+    // zimbraDomainCOSMaxAccounts can be only a String
+    // so we force it into an Array
+    const accounts_limits = [].concat.apply([], [this.attrs.zimbraDomainCOSMaxAccounts]);
+    accounts_limits.forEach((cos) => {
+      const split = cos.split(/:/);
+      results[split[0]] = parseInt(split[1]);
+    });
+    return results;
   }
 
 }

src/zimbra/zimbra.js

@@ -13,7 +13,13 @@ export default class Zimbra {
   buildAttrsMap(obj_ary) {
     const attrs = {};
     obj_ary.forEach((r) => {
-      attrs[r.n] = r._content;
+      if (attrs[r.n]) {
+        const ary = [attrs[r.n]];
+        attrs[r.n] = ary;
+        attrs[r.n].push(r._content);
+      } else {
+        attrs[r.n] = r._content;
+      }
     });
     return attrs;
   }

test/js/spec/test.js

@@ -327,7 +327,7 @@
       let api = new ZimbraAdminApi(auth_data);
       api.countAccounts('zboxapp.dev', function(err, data){
         if (err) console.error(err);
-        expect(data.default).to.be.above(1);
+        expect(data.default.used).to.be.above(1);
         done();
       });
     });
@@ -339,7 +339,19 @@
         if (err) console.error(err);
         let domain = data;
         domain.countAccounts(function(e, d){
-          expect(d.default).to.be.above(1);
+          expect(d.default.used).to.be.above(1);
+          done();
+        });
+      });
+    });
+
+    it('domain.countAccounts() should return the account Limits', function(done){
+      let api = new ZimbraAdminApi(auth_data);
+      api.getDomain('customer.dev', function(err, data){
+        if (err) console.error(err);
+        let domain = data;
+        domain.countAccounts(function(e, d){
+          expect(d.basic.limit).to.be.above(1);
           done();
         });
       });