Merge branch 'develop'

CHANGELOG.md

@@ -0,0 +1,14 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [1.1.0] - 2016-06-18
+
+### Added
+
++ Get one card
++ Cards are now instance of `Card`
++ Add Set / get limits on card
++ Add Block / unblock on card
++ Better CLI for unmocked tests

README.md

@@ -31,7 +31,7 @@ Not all endpoints are available yet.
 + [x] Get Transactions (with search)
 + [x] Add / update memo on transactions
 + [x] Create a transfert
-+ [ ] unpair
++ [x] unpair
 + [ ] pair
 + [ ] certify transfer
 
@@ -103,7 +103,4 @@ Run `npm test` for full mocked testing with coverage.
 
 Less asserts. Used for detect api change.
 
-Run `[email protected] TEST_PASSWORD=ilovemylittlepony TRANSFER_IBAN=FR7630001007941234567890185 TRANSFER_BIC=BNPAFRPP TRANSFER_NAME="George Loutre" TRANSFER_PIN=123456 npm run test-unmock` for un-mocked test.
-
-The transfer test (*0.01 €) can be switch off with env `NO_TRANSFER`.
-Otherwise, *it should be confirmed* in the app.
+Run `npm run test-unmock` for un-mocked test.

lib/account.js

@@ -1,6 +1,8 @@
 'use strict';
 const Promise = require('bluebird');
 
+const Card = require('./card.js');
+
 const api = require('./api');
 const utils = require('./utils');
 
@@ -41,17 +43,9 @@ const utils = require('./utils');
 /**
  * @typedef  cards
  *
- * @property {objet}    paging
- * @property {number}   paging.totalResults     Total amount of addresses
- * @property {Object[]} data
- * @property {String}   data.id
- * @property {String}   data.cardType           Card type
- * @property {String}   data.n26Status          Card status
- * @property {String}   data.maskedPan          Number card (masked)
- * @property {String}   data.expirationDate     Expiration date
- * @property {String}   data.pinDefined
- * @property {String}   data.cardActivated
- * @property {String}   data.usernameOnCard     Name on the card
+ * @property {objet}  paging
+ * @property {number} paging.totalResults     Total amount of addresses
+ * @property {Card[]} data
  */
 
 /**
@@ -328,12 +322,23 @@ class Account {
   }
 
   /**
-   * Get cards
+   * Get one specific or all cards
    *
-   * @return {Promise<cards>}
+   * @param  {String} [cardId] Card Id
+   *
+   * @return {Promise<Card>|Promise<cards>}
    */
-  cards() {
-    return utils.callApi(this, 'getCards');
+  cards(cardId) {
+    if (cardId) {
+      return utils.callApi(this, 'getCard', cardId)
+        .then((card) => new Card(this, card));
+    }
+
+    return utils.callApi(this, 'getCards')
+      .then(cards => ({
+        paging: cards.paging,
+        data: cards.data.map((card) => new Card(this, card))
+      }));
   }
 
   /**

lib/api.js

@@ -27,6 +27,28 @@ module.exports = {
     .catch(errorHandler);
   },
 
+  blockCard(token, cardId) {
+    return request.post({
+      url: `${api}/api/cards/${cardId}/block`,
+      json: true,
+      headers: {
+        Authorization: `Bearer ${token}`
+      }
+    })
+    .catch(errorHandler);
+  },
+
+  unblockCard(token, cardId) {
+    return request.post({
+      url: `${api}/api/cards/${cardId}/unblock`,
+      json: true,
+      headers: {
+        Authorization: `Bearer ${token}`
+      }
+    })
+    .catch(errorHandler);
+  },
+
   checkBarzahlen(token) {
     return request.get({
       url: `${api}/api/barzahlen/check`,
@@ -103,6 +125,17 @@ module.exports = {
     .catch(errorHandler);
   },
 
+  getCard(token, cardId) {
+    return request.get({
+      url: `${api}/api/cards/${cardId}`,
+      json: true,
+      headers: {
+        Authorization: `Bearer ${token}`
+      }
+    })
+    .catch(errorHandler);
+  },
+
   getCards(token) {
     return request.get({
       url: `${api}/api/cards`,
@@ -114,6 +147,28 @@ module.exports = {
     .catch(errorHandler);
   },
 
+  getCardLimits(token, cardId) {
+    return request.get({
+      url: `${api}/api/settings/limits/${cardId}`,
+      json: true,
+      headers: {
+        Authorization: `Bearer ${token}`
+      }
+    })
+    .catch(errorHandler);
+  },
+
+  setCardLimits(token, opt) {
+    return request.put({
+      url: `${api}/api/settings/limits/${opt.cardId}`,
+      json: opt.limit,
+      headers: {
+        Authorization: `Bearer ${token}`
+      }
+    })
+    .catch(errorHandler);
+  },
+
   getContacts(token) {
     return request.get({
       url: `${api}/api/smrt/contacts`,

lib/card.js

@@ -0,0 +1,79 @@
+'use strict';
+
+const Promise = require('bluebird');
+
+const utils = require('./utils');
+
+/**
+ * @typedef cardLimit
+ *
+ * @property {String}   limit         Limit type
+ * @property {Number}   [amount]      Amount
+ * @property {String[]} [countryList] Array of country code
+ */
+
+/**
+ * Card instance
+ * linked to an account. An account should contains many card.
+ */
+class Card {
+  constructor(account, card) {
+    this.account = account;
+    this.id = card.id;
+    this.cardType = card.cardType;
+    this.n26Status = card.n26Status;
+    this.maskedPan = card.maskedPan;
+    this.expirationDate = card.expirationDate;
+    this.pinDefined = card.pinDefined;
+    this.cardActivated = card.cardActivated;
+    this.usernameOnCard = card.usernameOnCard;
+  }
+
+  /**
+   * Get / set card limit
+   *
+   * @param {Object}   [limit]
+   * @param {String}   limit.limit         Limit type
+   * @param {Number}   [limit.amount]      Amount
+   * @param {String[]} [limit.countryList] Array of country code
+   *
+   * @return {Promise<cardLimit[]>}
+   */
+  limits(limit) {
+    return Promise.try(() => {
+      if (limit) {
+        if (!limit.limit ||
+          (limit.limit === 'COUNTRY_LIST' && !limit.countryList) ||
+          (limit.limit !== 'COUNTRY_LIST' && limit.amount === undefined)) {
+          throw new Error('BAD_PARAMS');
+        }
+
+        return utils.callApi(this.account, 'setCardLimits', {cardId: this.id, limit});
+      }
+
+      return utils.callApi(this.account, 'getCardLimits', this.id);
+    });
+  }
+
+  /**
+   * Block card
+   *
+   * @return {Promise}
+   */
+  block() {
+    return utils.callApi(this.account, 'blockCard', this.id)
+      .tap(() => { this.n26Status = 'BLOCKED'; });
+  }
+
+  /**
+   * Unblock card
+   *
+   * @return {Promise}
+   */
+  unblock() {
+    return utils.callApi(this.account, 'unblockCard', this.id)
+      .tap(() => { this.n26Status = 'ACTIVE'; });
+  }
+}
+
+module.exports = Card;

package.json

@@ -1,11 +1,11 @@
 {
   "name": "number26",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Un-official node.js module for interact with your number26 account",
   "main": "index.js",
   "scripts": {
     "test": "istanbul cover _mocha tests/index.js && if [ \"$CONTINUOUS_INTEGRATION\" = \"true\" ]; then cat ./coverage/lcov.info | ./node_modules/.bin/coveralls; fi",
-    "test-unmock": "_mocha -b tests/unmock.js",
+    "test-unmock": "node tests/unmock.js",
     "lint": "eslint *.js lib/* tests/*; exit 0",
     "docs": "jsdoc -c .jsdoc.json -R README.md",
     "deployDocs": "npm run docs && sh ./scripts/deployDocs.sh"
@@ -30,12 +30,14 @@
   },
   "devDependencies": {
     "chai": "^3.2.0",
+    "configstore": "^2.0.0",
     "coveralls": "^2.11.9",
     "dirty-chai": "^1.2.2",
     "docdash": "^0.4.0",
     "eslint": "^2.8.0",
     "eslint-config-airbnb-base": "^3.0.1",
     "eslint-plugin-import": "^1.5.0",
+    "inquirer": "^1.0.3",
     "istanbul": "^0.4.2",
     "jsdoc": "^3.4.0",
     "mocha": "^2.2.5",

tests/account/account.js

@@ -26,7 +26,7 @@ describe('account', () => {
       .defaultReplyHeaders({
         'Content-Type': 'application/json'
       })
-      .matchHeader('Authorization', `Bearer ${data.access_token}`)
+      .matchHeader('Authorization', `Bearer ${data.account.access_token}`)
       .get('/api/accounts')
       .reply(200, {
         status: 'OPEN_PRIMARY_ACCOUNT',

tests/account/addresses.js

@@ -26,7 +26,7 @@ describe('addresses', () => {
     .defaultReplyHeaders({
       'Content-Type': 'application/json'
     })
-    .matchHeader('Authorization', `Bearer ${data.access_token}`)
+    .matchHeader('Authorization', `Bearer ${data.account.access_token}`)
     .get('/api/addresses')
     .reply(200, {
       paging: {

tests/account/auth.js

@@ -32,13 +32,13 @@ describe('auth', () => {
       password: 'password',
       grant_type: 'password'
     })
-    .reply(200, data);
+    .reply(200, data.account);
 
     api = nock('https://api.tech26.de')
     .defaultReplyHeaders({
       'Content-Type': 'application/json'
     })
-    .matchHeader('Authorization', `Bearer ${data.access_token}`)
+    .matchHeader('Authorization', `Bearer ${data.account.access_token}`)
     .get('/api/me')
     .reply(200, {
       email: '[email protected]',

tests/account/barzahlen.js

@@ -37,7 +37,7 @@ describe('barzahlen', () => {
       .defaultReplyHeaders({
         'Content-Type': 'application/json'
       })
-      .matchHeader('Authorization', `Bearer ${data.access_token}`)
+      .matchHeader('Authorization', `Bearer ${data.account.access_token}`)
       .get('/api/barzahlen/check')
       .reply(200, dataBarzahlen);