.gitlab-ci.yml

@@ -19,35 +19,23 @@ mirror:
   stage: security
   script:
     - npmci git mirror
-  only:
-    - tags
   tags:
     - lossless
     - docker
     - notpriv
 
-auditProductionDependencies:
+audit:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-  stage: security
-  script:
-    - npmci npm prepare
-    - npmci command npm install --production --ignore-scripts
-    - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high --only=prod --production
-  tags:
-    - docker
-
-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
+    - npmci command npm audit --audit-level=high
   tags:
+    - lossless
     - docker
-  allow_failure: true
+    - notpriv
 
 # ====================
 # test stage
@@ -62,7 +50,9 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
+    - lossless
     - docker
+    - priv
 
 testBuild:
   stage: test
@@ -73,7 +63,9 @@ testBuild:
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
+    - lossless
     - docker
+    - notpriv
 
 release:
   stage: release
@@ -93,8 +85,6 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
-  only:
-    - tags
   script:
     - npmci command npm install -g tslint typescript
     - npmci npm prepare

.vscode/settings.json

@@ -15,7 +15,7 @@
             "properties": {
               "projectType": {
                 "type": "string",
-                "enum": ["website", "element", "service", "npm", "wcc"]
+                "enum": ["website", "element", "service", "npm"]
               }
             }
           }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojoio/bunq",
-  "version": "1.0.22",
+  "version": "1.0.17",
   "private": false,
   "description": "a bunq api abstraction package",
   "main": "dist_ts/index.js",
@@ -13,12 +13,12 @@
     "format": "(gitzone format)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.25",
+    "@gitzone/tsbuild": "^2.1.24",
-    "@gitzone/tstest": "^1.0.44",
+    "@gitzone/tstest": "^1.0.33",
     "@pushrocks/qenv": "^4.0.10",
-    "@pushrocks/tapbundle": "^3.2.9",
+    "@pushrocks/tapbundle": "^3.2.1",
-    "@types/node": "^14.6.0",
+    "@types/node": "^14.0.13",
-    "tslint": "^6.1.3",
+    "tslint": "^6.1.2",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
@@ -39,8 +39,5 @@
     "cli.js",
     "npmextra.json",
     "readme.md"
-  ],
-  "browserslist": [
-    "last 1 chrome versions"
   ]
 }

readme.md

@@ -27,6 +27,7 @@ Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20W
 
 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). :)

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 () => {

ts/bunq.classes.account.ts

@@ -1,6 +1,6 @@
 import * as plugins from './bunq.plugins';
 import * as paths from './bunq.paths';
-import { BunqMonetaryAccount } from './bunq.classes.monetaryaccount';
+import { MonetaryAccount } from './bunq.classes.monetaryaccount';
 
 export interface IBunqConstructorOptions {
   deviceName: string;
@@ -87,14 +87,12 @@ export class BunqAccount {
   }
 
   public async getAccounts() {
-    const apiMonetaryAccounts = await this.bunqJSClient.api.monetaryAccount
+    const apiMonetaryAccounts = await this.bunqJSClient.api.monetaryAccount.list(this.userId, {}).catch(e => {
-      .list(this.userId, {})
-      .catch((e) => {
       console.log(e);
     });
-    const accountsArray: BunqMonetaryAccount[] = [];
+    const accountsArray: MonetaryAccount[] = [];
     for (const apiAccount of apiMonetaryAccounts) {
-      accountsArray.push(BunqMonetaryAccount.fromAPIObject(this, apiAccount));
+      accountsArray.push(MonetaryAccount.fromAPIObject(this, apiAccount));
     }
     return accountsArray;
   }

ts/bunq.classes.monetaryaccount.ts

@@ -1,13 +1,13 @@
 import * as plugins from './bunq.plugins';
 import { BunqAccount } from './bunq.classes.account';
-import { BunqTransaction } from './bunq.classes.transaction';
+import { Transaction } from './bunq.classes.transaction';
 
 export type TAccountType = 'joint' | 'savings' | 'bank';
 
 /**
  * a monetary account
  */
-export class BunqMonetaryAccount {
+export class MonetaryAccount {
   public static fromAPIObject(bunqAccountRef: BunqAccount, apiObject: any) {
     const newMonetaryAccount = new this(bunqAccountRef);
 
@@ -97,7 +97,7 @@ export class BunqMonetaryAccount {
       older_id?: number | false;
     } = {
       count: 200,
-      newer_id: startingIdArg,
+      newer_id: startingIdArg
     };
 
     const apiTransactions = await this.bunqAccountRef.bunqJSClient.api.payment.list(
@@ -105,9 +105,9 @@ export class BunqMonetaryAccount {
       this.id,
       paginationOptions
     );
-    const transactionsArray: BunqTransaction[] = [];
+    const transactionsArray: Transaction[] = [];
     for (const apiTransaction of apiTransactions) {
-      transactionsArray.push(BunqTransaction.fromApiObject(this, apiTransaction));
+      transactionsArray.push(Transaction.fromApiObject(this, apiTransaction));
     }
     return transactionsArray;
   }

ts/bunq.classes.transaction.ts

@@ -1,8 +1,8 @@
 import * as plugins from './bunq.plugins';
-import { BunqMonetaryAccount } from './bunq.classes.monetaryaccount';
+import { MonetaryAccount } from './bunq.classes.monetaryaccount';
 
-export class BunqTransaction {
+export class Transaction {
-  public static fromApiObject(monetaryAccountRefArg: BunqMonetaryAccount, apiObjectArg: any) {
+  public static fromApiObject(monetaryAccountRefArg: MonetaryAccount, apiObjectArg: any) {
     const newTransaction = new this(monetaryAccountRefArg);
     Object.assign(newTransaction, apiObjectArg.Payment);
     return newTransaction;
@@ -20,31 +20,7 @@ export class BunqTransaction {
   public type: 'MASTERCARD' | 'BUNQ';
   public merchant_reference: null;
   public alias: [Object];
-  public counterparty_alias: {
+  public counterparty_alias: [Object];
-    iban: string,
-    is_light: any,
-    display_name: string,
-    avatar: {
-      uuid: string,
-      image: [
-        {
-          attachment_public_uuid: string,
-          height: number,
-          width: number,
-          content_type: string,
-        },
-      ],
-      anchor_uuid: null,
-    },
-    label_user: {
-      uuid: null,
-      display_name: string,
-      country: string,
-      avatar: null,
-      public_nick_name: string,
-    },
-    country: string,
-  };
   public attachment: [];
   public geolocation: null;
   public batch_id: null;
@@ -59,9 +35,9 @@ export class BunqTransaction {
     value: string;
   };
 
-  public monetaryAccountRef: BunqMonetaryAccount;
+  public monetaryAccountRef: MonetaryAccount;
 
-  constructor(monetaryAccountRefArg: BunqMonetaryAccount) {
+  constructor(monetaryAccountRefArg: MonetaryAccount) {
     this.monetaryAccountRef = monetaryAccountRefArg;
   }
 }

ts/index.ts

@@ -1,3 +1 @@
 export * from './bunq.classes.account';
-export * from './bunq.classes.monetaryaccount';
-export * from './bunq.classes.transaction';