1.0.18

.gitignore

@@ -15,8 +15,6 @@ node_modules/
 
 # builds
 dist/
-dist_web/
+dist_*/
-dist_serve/
-dist_ts_web/
 
 # custom

.gitlab-ci.yml

@@ -4,13 +4,13 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 cache:
   paths:
     - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
+  - security
-- test
+  - test
-- release
+  - release
-- metadata
+  - metadata
 
 # ====================
 # security stage
@@ -19,20 +19,35 @@ mirror:
   stage: security
   script:
     - npmci git mirror
+  only:
+    - tags
   tags:
+    - lossless
     - docker
     - notpriv
 
-snyk:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
-    - npmci command npm install -g snyk
+    - npmci command npm install --production --ignore-scripts
-    - npmci command npm install --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command snyk test
+    - npmci command npm audit --audit-level=high --only=prod --production
   tags:
     - docker
-  - notpriv
+
+auditDevDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=dev
+  tags:
+    - docker
+  allow_failure: true
 
 # ====================
 # test stage
@@ -48,7 +63,6 @@ testStable:
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
-  - priv
 
 testBuild:
   stage: test
@@ -60,7 +74,6 @@ testBuild:
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
-  - notpriv
 
 release:
   stage: release
@@ -70,6 +83,7 @@ release:
   only:
     - tags
   tags:
+    - lossless
     - docker
     - notpriv
 
@@ -79,11 +93,15 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
     - npmci command npm install -g tslint typescript
+    - npmci npm prepare
     - npmci npm install
     - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
+    - lossless
     - docker
     - priv
 
@@ -94,20 +112,20 @@ trigger:
   only:
     - tags
   tags:
+    - lossless
     - docker
     - notpriv
 
 pages:
-  image: hosttoday/ht-docker-dbase:npmci
-  services:
-   - docker:stable-dind
   stage: metadata
   script:
+    - npmci node install lts
     - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
     - npmci command tsdoc
   tags:
+    - lossless
     - docker
     - notpriv
   only:

.vscode/settings.json

@@ -11,7 +11,13 @@
           },
           "gitzone": {
             "type": "object",
-            "description": "settings for gitzone"
+            "description": "settings for gitzone",
+            "properties": {
+              "projectType": {
+                "type": "string",
+                "enum": ["website", "element", "service", "npm", "wcc"]
+              }
+            }
           }
         }
       }

npmextra.json

@@ -1,5 +1,6 @@
 {
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "mojoio",

package.json

@@ -1,10 +1,10 @@
 {
   "name": "@mojoio/bunq",
-  "version": "1.0.9",
+  "version": "1.0.18",
   "private": false,
   "description": "a bunq api abstraction package",
-  "main": "dist/index.js",
+  "main": "dist_ts/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "dist_ts/index.d.ts",
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
@@ -13,19 +13,34 @@
     "format": "(gitzone format)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.0.22",
+    "@gitzone/tsbuild": "^2.1.25",
-    "@gitzone/tstest": "^1.0.15",
+    "@gitzone/tstest": "^1.0.44",
-    "@pushrocks/qenv": "^4.0.6",
+    "@pushrocks/qenv": "^4.0.10",
-    "@pushrocks/tapbundle": "^3.0.7",
+    "@pushrocks/tapbundle": "^3.2.9",
-    "@types/node": "^10.11.7",
+    "@types/node": "^14.6.0",
-    "tslint": "^5.11.0",
+    "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "@bunq-community/bunq-js-client": "^0.42.1",
+    "@bunq-community/bunq-js-client": "^1.1.2",
     "@pushrocks/smartcrypto": "^1.0.9",
-    "@pushrocks/smartfile": "^7.0.6",
+    "@pushrocks/smartfile": "^8.0.0",
     "@pushrocks/smartpromise": "^3.0.6",
     "json-store": "^1.0.0"
-  }
+  },
+  "files": [
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
+  ]
 }

readme.md

@@ -0,0 +1,39 @@
+# @mojoio/bunq
+a bunq api abstraction package
+
+## Availabililty and Links
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@mojoio/bunq)
+* [gitlab.com (source)](https://gitlab.com/mojoio/bunq)
+* [github.com (source mirror)](https://github.com/mojoio/bunq)
+* [docs (typedoc)](https://mojoio.gitlab.io/bunq/)
+
+## Status for master
+
+Status Category | Status Badge
+-- | --
+GitLab Pipelines | [![pipeline status](https://gitlab.com/mojoio/bunq/badges/master/pipeline.svg)](https://lossless.cloud)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/mojoio/bunq/badges/master/coverage.svg)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@mojoio/bunq)](https://lossless.cloud)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/mojoio/bunq)](https://lossless.cloud)
+TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
+node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@mojoio/bunq)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@mojoio/bunq)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@mojoio/bunq)](https://lossless.cloud)
+Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
+
+## Usage
+
+Use Typescript for best in class intellisense.
+
+## Contribution
+
+We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
+
+For further information read the linked docs at the top of this readme.
+
+> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
+
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

test/test.ts

@@ -9,7 +9,7 @@ let testBunqAccount: bunq.BunqAccount;
 const testBunqOptions: bunq.IBunqConstructorOptions = {
   apiKey: testQenv.getEnvVarOnDemand('BUNQ_APIKEY'),
   deviceName: 'mojoiobunqpackage',
-  environment: 'SANDBOX'
+  environment: 'SANDBOX',
 };
 
 tap.test('should create a valid bunq account', async () => {
@@ -23,15 +23,19 @@ tap.test('should init the client', async () => {
 
 tap.test('should get accounts', async () => {
   const accounts = await testBunqAccount.getAccounts();
-  console.log(accounts[2].alias);
+  console.log(accounts);
 });
 
 tap.test('should get transactions', async () => {
   const accounts = await testBunqAccount.getAccounts();
   for (const account of accounts) {
     const transactions = await account.getTransactions();
-    // console.log(transactions);
+    console.log(transactions);
   }
 });
 
+tap.test('should stop the instance', async () => {
+  await testBunqAccount.stop();
+});
+
 tap.start();

ts/bunq.classes.account.ts

@@ -34,13 +34,26 @@ export class BunqAccount {
 
     // lets setup bunq client
     await plugins.smartfile.fs.ensureDir(paths.nogitDir);
-    await plugins.smartfile.fs.ensureFile(paths.bunqJsonFile, '{}');
+    await plugins.smartfile.fs.ensureFile(paths.bunqJsonProductionFile, '{}');
-    const storageInstance = plugins.JSONFileStore(paths.bunqJsonFile);
+    await plugins.smartfile.fs.ensureFile(paths.bunqJsonSandboxFile, '{}');
-    this.bunqJSClient = new plugins.bunqCommunityClient.default(storageInstance);
+    let apiKey: string;
+
+    if (this.options.environment === 'SANDBOX') {
+      this.bunqJSClient = new plugins.bunqCommunityClient.default(
+        plugins.JSONFileStore(paths.bunqJsonSandboxFile)
+      );
+      apiKey = await this.bunqJSClient.api.sandboxUser.post();
+      console.log(apiKey);
+    } else {
+      this.bunqJSClient = new plugins.bunqCommunityClient.default(
+        plugins.JSONFileStore(paths.bunqJsonProductionFile)
+      );
+      apiKey = this.options.apiKey;
+    }
 
     // run the bunq application with our API key
     await this.bunqJSClient.run(
-      this.options.apiKey,
+      apiKey,
       this.permittedIps,
       this.options.environment,
       this.encryptionKey
@@ -64,6 +77,8 @@ export class BunqAccount {
     const users = await this.bunqJSClient.api.user.list();
     if (users.UserPerson) {
       this.userId = users.UserPerson.id;
+    } else if (users.UserApiKey) {
+      this.userId = users.UserApiKey.id;
     } else if (users.UserCompany) {
       this.userId = users.UserCompany.id;
     } else {
@@ -72,11 +87,26 @@ export class BunqAccount {
   }
 
   public async getAccounts() {
-    const apiMonetaryAccounts = await this.bunqJSClient.api.monetaryAccount.list(this.userId);
+    const apiMonetaryAccounts = await this.bunqJSClient.api.monetaryAccount
+      .list(this.userId, {})
+      .catch((e) => {
+        console.log(e);
+      });
     const accountsArray: MonetaryAccount[] = [];
     for (const apiAccount of apiMonetaryAccounts) {
       accountsArray.push(MonetaryAccount.fromAPIObject(this, apiAccount));
     }
     return accountsArray;
   }
+
+  /**
+   * stops the instance
+   */
+  public async stop() {
+    if (this.bunqJSClient) {
+      this.bunqJSClient.setKeepAlive(false);
+      await this.bunqJSClient.destroyApiSession();
+      this.bunqJSClient = null;
+    }
+  }
 }

ts/bunq.classes.monetaryaccount.ts

@@ -32,7 +32,7 @@ export class MonetaryAccount {
         throw new Error('unknown accoun type');
     }
 
-    Object.assign(newMonetaryAccount, apiObject[accessor], {type});
+    Object.assign(newMonetaryAccount, apiObject[accessor], { type });
     return newMonetaryAccount;
   }
 
@@ -82,7 +82,6 @@ export class MonetaryAccount {
   public auto_save_id: null;
   public all_auto_save_id: any[];
 
-
   public bunqAccountRef: BunqAccount;
   constructor(bunqAccountRefArg: BunqAccount) {
     this.bunqAccountRef = bunqAccountRefArg;
@@ -91,11 +90,25 @@ export class MonetaryAccount {
   /**
    * gets all transactions no this account
    */
-  public async getTransactions() {
+  public async getTransactions(startingIdArg: number | false = false) {
-    const apiTransactions = await this.bunqAccountRef.bunqJSClient.api.payment.list(this.bunqAccountRef.userId, this.id);
+    const paginationOptions: {
+      count?: number;
+      newer_id?: number | false;
+      older_id?: number | false;
+    } = {
+      count: 200,
+      newer_id: startingIdArg,
+    };
+
+    const apiTransactions = await this.bunqAccountRef.bunqJSClient.api.payment.list(
+      this.bunqAccountRef.userId,
+      this.id,
+      paginationOptions
+    );
     const transactionsArray: Transaction[] = [];
     for (const apiTransaction of apiTransactions) {
       transactionsArray.push(Transaction.fromApiObject(this, apiTransaction));
     }
+    return transactionsArray;
   }
 }

ts/bunq.classes.transaction.ts

@@ -4,11 +4,10 @@ import { MonetaryAccount } from './bunq.classes.monetaryaccount';
 export class Transaction {
   public static fromApiObject(monetaryAccountRefArg: MonetaryAccount, apiObjectArg: any) {
     const newTransaction = new this(monetaryAccountRefArg);
-    Object.assign(newTransaction, apiObjectArg);
+    Object.assign(newTransaction, apiObjectArg.Payment);
     return newTransaction;
   }
 
-
   public id: number;
   public created: string;
   public updated: string;
@@ -41,5 +40,4 @@ export class Transaction {
   constructor(monetaryAccountRefArg: MonetaryAccount) {
     this.monetaryAccountRef = monetaryAccountRefArg;
   }
-
 }

ts/bunq.paths.ts

@@ -3,4 +3,5 @@ import * as plugins from './bunq.plugins';
 export const packageDir = plugins.path.join(__dirname, '../');
 export const nogitDir = plugins.path.join(packageDir, './.nogit/');
 
-export const bunqJsonFile = plugins.path.join(nogitDir, 'bunq.json');
+export const bunqJsonProductionFile = plugins.path.join(nogitDir, 'bunqproduction.json');
+export const bunqJsonSandboxFile = plugins.path.join(nogitDir, 'bunqsandbox.json');

ts/bunq.plugins.ts

@@ -1,23 +1,17 @@
 // node natice
 import * as path from 'path';
 
-export {
+export { path };
-  path
-};
 
 // @pushrocks scope
 import * as smartcrypto from '@pushrocks/smartcrypto';
 import * as smartfile from '@pushrocks/smartfile';
 import * as smartpromise from '@pushrocks/smartpromise';
 
-export {
+export { smartcrypto, smartfile, smartpromise };
-  smartcrypto,
-  smartfile,
-  smartpromise,
-};
 
 // third party
-import JSONFileStore from "@bunq-community/bunq-js-client/dist/Stores/JSONFileStore"; 
+import JSONFileStore from '@bunq-community/bunq-js-client/dist/Stores/JSONFileStore';
 import * as bunqCommunityClient from '@bunq-community/bunq-js-client';
 
 export { JSONFileStore, bunqCommunityClient };