Merge pull request #34 from marverix/master

Added changes for SDCC-115

dist/api/APIListServices.d.ts

@@ -3,6 +3,7 @@ import APIListPurchased from './APIListPurchased';
 declare class APIListServices extends APIList {
     constructor(parent: object);
     purchased(): APIListPurchased;
-    available(): void;
+    available(): APIList;
+    active(): APIList;
 }
 export default APIListServices;

dist/api/APIResourceAccountService.d.ts

@@ -0,0 +1,8 @@
+import APIResource from './APIResource';
+declare class APIResourceAccountService extends APIResource {
+    constructor(parent: object, id: number);
+    activate(): APIResource;
+    deactivate(): APIResource;
+    billingPeriod(): APIResource;
+}
+export default APIResourceAccountService;

dist/api/APIResourceUser.d.ts

@@ -14,14 +14,16 @@ import APIListFiles from './APIListFiles';
 import APIListServices from './APIListServices';
 import APIListRuns from './APIListRuns';
 import APIListNotifications from './APIListNotifications';
+import APIResourceAccountService from './APIResourceAccountService';
 declare class APIResourceUser extends APIResource {
     constructor(parent: object, id: number | 'me');
     account(): APIResourceAccount;
     deviceTime(): APIListDeviceTime;
     deviceTimeSummary(): APIList;
     services(): APIListServices;
     service(id: number): APIResource;
-    accountServiceBillingPeriod(id: number): APIResource;
+    accountServices(): APIList;
+    accountService(id: number): APIResourceAccountService;
     billingPeriods(): APIList;
     billingPeriod(id: number): APIResourceBillingPeriod;
     jobs(): APIList;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bitbar/cloud-api-client",
-  "version": "0.23.0",
+  "version": "0.24.0",
   "description": "Bitbar Cloud API Client for JavaScript",
   "main": "dist/bitbar-cloud-api-client.min.js",
   "types": "dist/index.d.ts",

src/api/APIListServices.ts

@@ -23,7 +23,19 @@ class APIListServices extends APIList {
 
   // /services/available
   public available () {
-    this.push('available');
+    return new APIList(this).push('available');
+  }
+
+  public active () {
+    const a = new APIList(this);
+    if (this.stack[0] === 'me') {
+      a.push('active');
+    } else {
+      a.params({
+        notArchived: true
+      });
+    }
+    return a;
   }
 
 }

src/api/APIResourceAccountService.ts

@@ -0,0 +1,42 @@
+import APIResource from './APIResource'
+
+/**
+ * APIResourceAccountService
+ *
+ * @class
+ * @extends APIResource
+ */
+class APIResourceAccountService extends APIResource {
+
+  /**
+   * /account-services/{id}
+   *
+   * Constructor
+   */
+  constructor (parent: object, id: number) {
+    if (id == null) {
+      throw new Error('Resource ID cannot be null!');
+    }
+
+    super(parent);
+    this.push('account-services', id);
+  }
+
+  // /account-services/{id}/activate
+  public activate () {
+    return new APIResource(this).push('activate');
+  }
+
+  // /account-services/{id}/deactivate
+  public deactivate () {
+    return new APIResource(this).push('deactivate');
+  }
+
+  // /account-services/{id}/billing-period
+  public billingPeriod () {
+    return new APIResource(this).push('billing-period');
+  }
+
+}
+
+export default APIResourceAccountService

src/api/APIResourceUser.ts

@@ -15,6 +15,7 @@ import APIListFiles from './APIListFiles'
 import APIListServices from './APIListServices'
 import APIListRuns from './APIListRuns'
 import APIListNotifications from './APIListNotifications'
+import APIResourceAccountService from './APIResourceAccountService';
 
 
 /**
@@ -75,13 +76,14 @@ class APIResourceUser extends APIResource {
     return new APIResource(this).push('services', id);
   }
 
-  // /users/{id}/account-services/{id}/billing-period
-  public accountServiceBillingPeriod (id: number) {
-    if (id == null) {
-      throw new Error('Resource ID cannot be null!');
-    }
+  // /users/{id}/account-services
+  public accountServices () {
+    return new APIList(this).push('account-services');
+  }
 
-    return new APIResource(this).push('account-services', id, 'billing-period');
+  // /users/{id}/account-services/{id}
+  public accountService (id: number) {
+    return new APIResourceAccountService(this, id);
   }
 
   // /users/{id}/billing-periods