@felloh-org/lambda-wrapper 1.0.22 → 1.0.25

package/cli/seed/create-schema.js

@@ -19,6 +19,7 @@ const run = async () => {
   await queryRunner.createSchema('bank', true);
   await queryRunner.createSchema('user', true);
   await queryRunner.createSchema('total_processing', true);
+  await queryRunner.createSchema('token', true);
 };
 
 run();

package/dist/entity/index.js

@@ -19,8 +19,10 @@ var _trustPayments = _interopRequireDefault(require("./trust-payments"));
 
 var _totalProcessing = _interopRequireDefault(require("./total-processing"));
 
+var _token = _interopRequireDefault(require("./token"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const ENTITIES = [..._agentData.default, ..._bank.default, ..._nuapay.default, ..._payment.default, ..._totalProcessing.default, ..._trustPayments.default, ..._user.default];
+const ENTITIES = [..._agentData.default, ..._bank.default, ..._nuapay.default, ..._payment.default, ..._token.default, ..._totalProcessing.default, ..._trustPayments.default, ..._user.default];
 var _default = ENTITIES;
 exports.default = _default;

package/dist/entity/token/index.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _token = _interopRequireDefault(require("./token"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const ENTITIES = [_token.default];
+var _default = ENTITIES;
+exports.default = _default;

package/dist/entity/token/token/index.js

@@ -0,0 +1,128 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _typeorm = require("typeorm");
+
+var _uuid = require("uuid");
+
+var _organisation = _interopRequireDefault(require("../../user/organisation"));
+
+var _user = _interopRequireDefault(require("../../user/user"));
+
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9;
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; Object.defineProperty(target, property, { enumerable: descriptor.enumerable, configurable: descriptor.configurable, writable: descriptor.writable, value: descriptor.initializer ? descriptor.initializer.call(context) : void 0 }); }
+
+function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; }
+
+function _initializerWarningHelper(descriptor, context) { throw new Error('Decorating class property failed. Please ensure that ' + 'proposal-class-properties is enabled and runs after the decorators transform.'); }
+
+let Token = (_dec = (0, _typeorm.Entity)({
+  name: 'token',
+  schema: 'token'
+}), _dec2 = (0, _typeorm.PrimaryColumn)("varchar"), _dec3 = (0, _typeorm.ManyToOne)(() => _organisation.default), _dec4 = (0, _typeorm.JoinColumn)({
+  name: 'organisation_id',
+  referencedColumnName: 'id'
+}), _dec5 = (0, _typeorm.Column)({
+  type: "varchar",
+  length: "250"
+}), _dec6 = (0, _typeorm.Column)({
+  type: "varchar",
+  length: "150"
+}), _dec7 = (0, _typeorm.Column)({
+  type: "varchar",
+  length: "250"
+}), _dec8 = (0, _typeorm.Column)({
+  type: "varchar",
+  length: "4"
+}), _dec9 = (0, _typeorm.ManyToOne)(() => _user.default), _dec10 = (0, _typeorm.JoinColumn)({
+  name: 'user_id',
+  referencedColumnName: 'id'
+}), _dec11 = (0, _typeorm.CreateDateColumn)(), _dec12 = (0, _typeorm.DeleteDateColumn)(), _dec(_class = (_class2 = class Token {
+  constructor() {
+    _initializerDefineProperty(this, "id", _descriptor, this);
+
+    _initializerDefineProperty(this, "organisation", _descriptor2, this);
+
+    _initializerDefineProperty(this, "name", _descriptor3, this);
+
+    _initializerDefineProperty(this, "public_key", _descriptor4, this);
+
+    _initializerDefineProperty(this, "secret_key", _descriptor5, this);
+
+    _initializerDefineProperty(this, "secret_key_last_four", _descriptor6, this);
+
+    _initializerDefineProperty(this, "user", _descriptor7, this);
+
+    _initializerDefineProperty(this, "created_at", _descriptor8, this);
+
+    _initializerDefineProperty(this, "deleted_at", _descriptor9, this);
+  }
+
+}, (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "id", [_dec2], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: function () {
+    return (0, _uuid.v4)();
+  }
+}), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, "organisation", [_dec3, _dec4], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: function () {
+    return _organisation.default;
+  }
+}), _descriptor3 = _applyDecoratedDescriptor(_class2.prototype, "name", [_dec5], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: function () {
+    return "";
+  }
+}), _descriptor4 = _applyDecoratedDescriptor(_class2.prototype, "public_key", [_dec6], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: function () {
+    return "";
+  }
+}), _descriptor5 = _applyDecoratedDescriptor(_class2.prototype, "secret_key", [_dec7], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: function () {
+    return "";
+  }
+}), _descriptor6 = _applyDecoratedDescriptor(_class2.prototype, "secret_key_last_four", [_dec8], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: function () {
+    return "";
+  }
+}), _descriptor7 = _applyDecoratedDescriptor(_class2.prototype, "user", [_dec9, _dec10], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: function () {
+    return _user.default;
+  }
+}), _descriptor8 = _applyDecoratedDescriptor(_class2.prototype, "created_at", [_dec11], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor9 = _applyDecoratedDescriptor(_class2.prototype, "deleted_at", [_dec12], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+})), _class2)) || _class);
+exports.default = Token;

package/dist/entity/user/user/index.js

@@ -9,7 +9,7 @@ var _typeorm = require("typeorm");
 
 var _organisation = _interopRequireDefault(require("../organisation"));
 
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _dec14, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11;
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _dec14, _dec15, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -60,6 +60,9 @@ let User = (_dec = (0, _typeorm.Entity)({
     name: "organisation_id",
     referencedColumnName: "id"
   }
+}), _dec15 = (0, _typeorm.Column)({
+  type: "boolean",
+  default: false
 }), _dec(_class = (_class2 = class User {
   constructor() {
     _initializerDefineProperty(this, "id", _descriptor, this);
@@ -83,6 +86,8 @@ let User = (_dec = (0, _typeorm.Entity)({
     _initializerDefineProperty(this, "deleted_at", _descriptor10, this);
 
     _initializerDefineProperty(this, "organisations", _descriptor11, this);
+
+    _initializerDefineProperty(this, "is_api_user", _descriptor12, this);
   }
 
   propgate(email, mobile, status, firstName, lastName) {
@@ -182,5 +187,12 @@ let User = (_dec = (0, _typeorm.Entity)({
   enumerable: true,
   writable: true,
   initializer: null
+}), _descriptor12 = _applyDecoratedDescriptor(_class2.prototype, "is_api_user", [_dec15], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: function () {
+    return false;
+  }
 })), _class2)) || _class);
 exports.default = User;

package/dist/index.js

@@ -249,6 +249,12 @@ Object.defineProperty(exports, "TProTransactionMetadataEntity", {
     return _transactionMetadata2.default;
   }
 });
+Object.defineProperty(exports, "TokenEntity", {
+  enumerable: true,
+  get: function () {
+    return _token.default;
+  }
+});
 Object.defineProperty(exports, "TransactionEntity", {
   enumerable: true,
   get: function () {
@@ -392,6 +398,8 @@ var _transaction3 = _interopRequireDefault(require("./entity/total-processing/tr
 
 var _transactionMetadata2 = _interopRequireDefault(require("./entity/total-processing/transaction-metadata"));
 
+var _token = _interopRequireDefault(require("./entity/token/token"));
+
 var _batch = _interopRequireDefault(require("./entity/trust-payments/batch"));
 
 var _merchant = _interopRequireDefault(require("./entity/trust-payments/merchant"));

package/dist/migration/token/1645613145774-token.js

@@ -0,0 +1,15 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class token1645613145774 {
+    name = 'token1645613145774'
+
+    async up(queryRunner) {
+        await queryRunner.query(`CREATE TABLE "token"."token" ("id" character varying NOT NULL, "name" character varying(250) NOT NULL, "public_key" character varying(150) NOT NULL, "secret_key" character varying(150) NOT NULL, "secret_key_last_four" character varying(4) NOT NULL, "created_at" TIMESTAMP NOT NULL DEFAULT now(), "organisation_id" character varying(150), CONSTRAINT "PK_82fae97f905930df5d62a702fc9" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`ALTER TABLE "token"."token" ADD CONSTRAINT "FK_56e183ecf0324bbecebec1b4057" FOREIGN KEY ("organisation_id") REFERENCES "user"."organisation"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "token"."token" DROP CONSTRAINT "FK_56e183ecf0324bbecebec1b4057"`);
+        await queryRunner.query(`DROP TABLE "token"."token"`);
+    }
+}

package/dist/migration/token/1645618345963-token_secret_length.js

@@ -0,0 +1,15 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class tokenSecretLength1645618345963 {
+    name = 'tokenSecretLength1645618345963'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "token"."token" DROP COLUMN "secret_key"`);
+        await queryRunner.query(`ALTER TABLE "token"."token" ADD "secret_key" character varying(250) NOT NULL`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "token"."token" DROP COLUMN "secret_key"`);
+        await queryRunner.query(`ALTER TABLE "token"."token" ADD "secret_key" character varying(150) NOT NULL`);
+    }
+}

package/dist/migration/token/1645621420506-token_user.js

@@ -0,0 +1,17 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class tokenUser1645621420506 {
+    name = 'tokenUser1645621420506'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "token"."token" ADD "deleted_at" TIMESTAMP`);
+        await queryRunner.query(`ALTER TABLE "token"."token" ADD "user_id" character varying`);
+        await queryRunner.query(`ALTER TABLE "token"."token" ADD CONSTRAINT "FK_e50ca89d635960fda2ffeb17639" FOREIGN KEY ("user_id") REFERENCES "user"."user"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "token"."token" DROP CONSTRAINT "FK_e50ca89d635960fda2ffeb17639"`);
+        await queryRunner.query(`ALTER TABLE "token"."token" DROP COLUMN "user_id"`);
+        await queryRunner.query(`ALTER TABLE "token"."token" DROP COLUMN "deleted_at"`);
+    }
+}

package/dist/migration/user/1645621100580-user_is_api_user.js

@@ -0,0 +1,13 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class userIsApiUser1645621100580 {
+    name = 'userIsApiUser1645621100580'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user"."user" ADD "is_api_user" boolean NOT NULL DEFAULT false`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user"."user" DROP COLUMN "is_api_user"`);
+    }
+}

package/dist/service/request.js

@@ -259,11 +259,13 @@ class Request extends _dependencyAware.default {
         Logger.label('request-validation-failed');
         const validationErrorResponse = new _response.default({}, 422);
         Object.keys(validation).forEach(validationKey => {
-          validation[validationKey].forEach(description => {
+          validation[validationKey].forEach(message => {
             validationErrorResponse.addError({
+              title: 'Validation Error',
+              message,
+              documentation_url: 'https://developers.felloh.com/errors#error-responses',
               type: 'validation',
-              field: validationKey,
-              description
+              code: `validation.${validationKey}`
             });
           });
         });

package/dist/wrapper/index.js

@@ -34,7 +34,7 @@ const handleSuccess = (di, outcome) => {
   } // Outcome may be undefined as not all lambdas have a return value.
 
 
-  logger.metric('lambda.statusCode', outcome && outcome.statusCode || 200);
+  logger.metric('lambda.status_code', outcome && outcome.statusCode || 200);
   return outcome;
 };
 /**
@@ -54,40 +54,26 @@ const handleSuccess = (di, outcome) => {
  *
  * @param {DependencyInjection} di
  * @param {Error} error
- * @param {boolean} [throwError=false]
  */
 
 
 exports.handleSuccess = handleSuccess;
 
-const handleError = (di, error, throwError = false) => {
+const handleError = (di, error) => {
   const logger = di.get(_dependencies.DEFINITIONS.LOGGER);
-  logger.metric('lambda.statusCode', error.code || 500);
+  logger.metric('lambda.status_code', error.code || 500);
+  logger.error(error);
 
-  if (error.raiseOnEpsagon || !error.code || error.code >= 500) {
-    logger.error(error);
-  } else {
-    logger.info(error);
+  if (error instanceof _response.default) {
+    return error.generate();
   }
 
-  if (throwError) {
-    if (error instanceof Error) {
-      return error;
-    } // We want to be absolutely sure
-    // that we are returning an error
-    // as Lambda sync handlers will only fail
-    // if the object is instanceof Error
+  const response = new _response.default({}, Number.isInteger(error.code) ? error.code : 500);
 
-
-    return new Error(error);
-  }
-
-  if (error instanceof _response.default) {
-    return error.generate();
+  if (typeof error.body !== 'undefined') {
+    response.setErrors(error.body || {});
   }
 
-  const response = new _response.default({}, error.code || 500);
-  response.setErrors(error.body || {});
   return response.generate();
 };
 /**
@@ -118,7 +104,7 @@ const wrapper = (configuration, handler, throwError = false) => {
 
 
     if (request.getIp() !== null) {
-      logger.metric('ipAddress', request.getIp(), true);
+      logger.metric('ip_address', request.getIp(), true);
     } // Add metrics with user browser information for rapid debugging
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@felloh-org/lambda-wrapper",
-  "version": "1.0.22",
+  "version": "1.0.25",
   "description": "Lambda wrapper for all Felloh Serverless Projects",
   "main": "dist/index.js",
   "scripts": {