@felloh-org/lambda-wrapper 1.1.76 → 1.2.0

package/.eslintrc.yml

@@ -8,6 +8,9 @@ plugins:
 extends:
   - "@felloh-org/eslint-config/mixins/base"
 
+parserOptions:
+  ecmaVersion: 11
+
 ignorePatterns:
   - dist
   - tests
@@ -19,4 +22,3 @@ rules:
   camelcase: "off"
   import/no-dynamic-require: "off"
   global-require: "off"
-

package/dist/entity/payment/organisation-payment-provider/index.js

@@ -15,7 +15,9 @@ var _paymentProvider = _interopRequireDefault(require("../payment-provider"));
 
 var _transactionMethod = _interopRequireDefault(require("../transaction-method"));
 
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _dec14, _dec15, _dec16, _dec17, _dec18, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14;
+var _organisationPaymentProviderMethod = _interopRequireDefault(require("../organisation-payment-provider-method"));
+
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _dec14, _dec15, _dec16, _dec17, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -37,37 +39,24 @@ let OrganisationPaymentProvider = (_dec = (0, _typeorm.Entity)({
 }), _dec6 = (0, _typeorm.ManyToOne)(() => _paymentProvider.default), _dec7 = (0, _typeorm.JoinColumn)({
   name: 'payment_provider_id',
   referencedColumnName: 'id'
-}), _dec8 = (0, _typeorm.ManyToMany)(() => _transactionMethod.default, {
-  cascade: true
-}), _dec9 = (0, _typeorm.JoinTable)({
-  name: "organisation_payment_provider_method",
-  schema: "payment",
-  joinColumn: {
-    name: "organisation_payment_provider_id",
-    referencedColumnName: "id"
-  },
-  inverseJoinColumn: {
-    name: "transaction_method_id",
-    referencedColumnName: "id"
-  }
-}), _dec10 = (0, _typeorm.Column)({
+}), _dec8 = (0, _typeorm.OneToMany)(() => _organisationPaymentProviderMethod.default, transactionMethod => transactionMethod.payment_provider), _dec9 = (0, _typeorm.Column)({
   type: "varchar",
   length: "150"
-}), _dec11 = (0, _typeorm.Column)({
+}), _dec10 = (0, _typeorm.Column)({
   type: "json",
   nullable: true
-}), _dec12 = (0, _typeorm.Column)({
+}), _dec11 = (0, _typeorm.Column)({
   type: "varchar",
   length: "512"
-}), _dec13 = (0, _typeorm.Column)({
+}), _dec12 = (0, _typeorm.Column)({
   type: "varchar",
   length: "4"
-}), _dec14 = (0, _typeorm.Column)({
+}), _dec13 = (0, _typeorm.Column)({
   type: "boolean",
   default: false
-}), _dec15 = (0, _typeorm.Column)({
+}), _dec14 = (0, _typeorm.Column)({
   type: "int"
-}), _dec16 = (0, _typeorm.CreateDateColumn)(), _dec17 = (0, _typeorm.UpdateDateColumn)(), _dec18 = (0, _typeorm.DeleteDateColumn)(), _dec(_class = (_class2 = class OrganisationPaymentProvider {
+}), _dec15 = (0, _typeorm.CreateDateColumn)(), _dec16 = (0, _typeorm.UpdateDateColumn)(), _dec17 = (0, _typeorm.DeleteDateColumn)(), _dec(_class = (_class2 = class OrganisationPaymentProvider {
   constructor() {
     _initializerDefineProperty(this, "id", _descriptor, this);
 
@@ -126,60 +115,60 @@ let OrganisationPaymentProvider = (_dec = (0, _typeorm.Entity)({
   initializer: function () {
     return _paymentProvider.default;
   }
-}), _descriptor5 = _applyDecoratedDescriptor(_class2.prototype, "transaction_methods", [_dec8, _dec9], {
+}), _descriptor5 = _applyDecoratedDescriptor(_class2.prototype, "transaction_methods", [_dec8], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor6 = _applyDecoratedDescriptor(_class2.prototype, "public_key", [_dec10], {
+}), _descriptor6 = _applyDecoratedDescriptor(_class2.prototype, "public_key", [_dec9], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: function () {
     return "";
   }
-}), _descriptor7 = _applyDecoratedDescriptor(_class2.prototype, "public_creds", [_dec11], {
+}), _descriptor7 = _applyDecoratedDescriptor(_class2.prototype, "public_creds", [_dec10], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor8 = _applyDecoratedDescriptor(_class2.prototype, "secret_key", [_dec12], {
+}), _descriptor8 = _applyDecoratedDescriptor(_class2.prototype, "secret_key", [_dec11], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: function () {
     return "";
   }
-}), _descriptor9 = _applyDecoratedDescriptor(_class2.prototype, "secret_key_last_four", [_dec13], {
+}), _descriptor9 = _applyDecoratedDescriptor(_class2.prototype, "secret_key_last_four", [_dec12], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: function () {
     return "";
   }
-}), _descriptor10 = _applyDecoratedDescriptor(_class2.prototype, "is_active", [_dec14], {
+}), _descriptor10 = _applyDecoratedDescriptor(_class2.prototype, "is_active", [_dec13], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: function () {
     return false;
   }
-}), _descriptor11 = _applyDecoratedDescriptor(_class2.prototype, "weight", [_dec15], {
+}), _descriptor11 = _applyDecoratedDescriptor(_class2.prototype, "weight", [_dec14], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor12 = _applyDecoratedDescriptor(_class2.prototype, "created_at", [_dec16], {
+}), _descriptor12 = _applyDecoratedDescriptor(_class2.prototype, "created_at", [_dec15], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor13 = _applyDecoratedDescriptor(_class2.prototype, "updated_at", [_dec17], {
+}), _descriptor13 = _applyDecoratedDescriptor(_class2.prototype, "updated_at", [_dec16], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor14 = _applyDecoratedDescriptor(_class2.prototype, "deleted_at", [_dec18], {
+}), _descriptor14 = _applyDecoratedDescriptor(_class2.prototype, "deleted_at", [_dec17], {
   configurable: true,
   enumerable: true,
   writable: true,

package/dist/entity/payment/organisation-payment-provider-method/index.js

@@ -0,0 +1,64 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _typeorm = require("typeorm");
+
+var _organisationPaymentProvider = _interopRequireDefault(require("../organisation-payment-provider"));
+
+var _transactionMethod = _interopRequireDefault(require("../transaction-method"));
+
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _class, _class2, _descriptor, _descriptor2, _descriptor3;
+
+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 OrganisationPaymentProviderMethod = (_dec = (0, _typeorm.Entity)({
+  name: 'organisation_payment_provider_method',
+  schema: 'payment'
+}), _dec2 = (0, _typeorm.ManyToOne)(() => _organisationPaymentProvider.default, {
+  primary: true
+}), _dec3 = (0, _typeorm.JoinColumn)({
+  name: 'organisation_payment_provider_id',
+  referencedColumnName: 'id'
+}), _dec4 = (0, _typeorm.ManyToOne)(() => _transactionMethod.default, {
+  primary: true
+}), _dec5 = (0, _typeorm.JoinColumn)({
+  name: 'transaction_method_id',
+  referencedColumnName: 'id'
+}), _dec6 = (0, _typeorm.Column)({
+  type: 'int'
+}), _dec(_class = (_class2 = class OrganisationPaymentProviderMethod {
+  constructor() {
+    _initializerDefineProperty(this, "payment_provider", _descriptor, this);
+
+    _initializerDefineProperty(this, "transaction_method", _descriptor2, this);
+
+    _initializerDefineProperty(this, "weight", _descriptor3, this);
+  }
+
+}, (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "payment_provider", [_dec2, _dec3], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, "transaction_method", [_dec4, _dec5], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor3 = _applyDecoratedDescriptor(_class2.prototype, "weight", [_dec6], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+})), _class2)) || _class);
+exports.default = OrganisationPaymentProviderMethod;

package/dist/migration/1661262743555-organisation-payment-provider-method-weight.js

@@ -0,0 +1,25 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class organisationPaymentProviderMethodWeight1661262743555 {
+    name = 'organisationPaymentProviderMethodWeight1661262743555'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "payment"."organisation_payment_provider_method" DROP CONSTRAINT "FK_5c73d00c542e73bc44fc84f5e1e"`);
+        await queryRunner.query(`ALTER TABLE "payment"."organisation_payment_provider_method" DROP CONSTRAINT "FK_1027b1f5301948b2c8dc5121017"`);
+        await queryRunner.query(`DROP INDEX "payment"."IDX_1027b1f5301948b2c8dc512101"`);
+        await queryRunner.query(`DROP INDEX "payment"."IDX_5c73d00c542e73bc44fc84f5e1"`);
+        await queryRunner.query(`ALTER TABLE "payment"."organisation_payment_provider_method" ADD "weight" integer NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "payment"."organisation_payment_provider_method" ADD CONSTRAINT "FK_1027b1f5301948b2c8dc5121017" FOREIGN KEY ("organisation_payment_provider_id") REFERENCES "payment"."organisation_payment_provider"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "payment"."organisation_payment_provider_method" ADD CONSTRAINT "FK_5c73d00c542e73bc44fc84f5e1e" FOREIGN KEY ("transaction_method_id") REFERENCES "payment"."transaction_method"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "payment"."organisation_payment_provider_method" DROP CONSTRAINT "FK_5c73d00c542e73bc44fc84f5e1e"`);
+        await queryRunner.query(`ALTER TABLE "payment"."organisation_payment_provider_method" DROP CONSTRAINT "FK_1027b1f5301948b2c8dc5121017"`);
+        await queryRunner.query(`ALTER TABLE "payment"."organisation_payment_provider_method" DROP COLUMN "weight"`);
+        await queryRunner.query(`CREATE INDEX "IDX_5c73d00c542e73bc44fc84f5e1" ON "payment"."organisation_payment_provider_method" ("transaction_method_id") `);
+        await queryRunner.query(`CREATE INDEX "IDX_1027b1f5301948b2c8dc512101" ON "payment"."organisation_payment_provider_method" ("organisation_payment_provider_id") `);
+        await queryRunner.query(`ALTER TABLE "payment"."organisation_payment_provider_method" ADD CONSTRAINT "FK_1027b1f5301948b2c8dc5121017" FOREIGN KEY ("organisation_payment_provider_id") REFERENCES "payment"."organisation_payment_provider"("id") ON DELETE CASCADE ON UPDATE CASCADE`);
+        await queryRunner.query(`ALTER TABLE "payment"."organisation_payment_provider_method" ADD CONSTRAINT "FK_5c73d00c542e73bc44fc84f5e1e" FOREIGN KEY ("transaction_method_id") REFERENCES "payment"."transaction_method"("id") ON DELETE CASCADE ON UPDATE CASCADE`);
+    }
+}

package/dist/service/user.js

@@ -43,12 +43,27 @@ class User extends _dependencyAware.default {
     await this.initialise();
 
     if (typeof process.env.IS_OFFLINE !== 'undefined') {
-      const sub = this.di.getEvent().requestContext.authorizer.claims.sub;
-      return this.userRepository.findOne({
-        cognito_sub: sub
-      }, {
-        relations: ['organisations']
-      });
+      var _this$di$getEvent$req, _this$di$getEvent$req2, _this$di$getEvent$req3, _this$di$getEvent$req4, _this$di$getEvent$req5, _this$di$getEvent$req6;
+
+      const sub = (_this$di$getEvent$req = this.di.getEvent().requestContext) === null || _this$di$getEvent$req === void 0 ? void 0 : (_this$di$getEvent$req2 = _this$di$getEvent$req.authorizer) === null || _this$di$getEvent$req2 === void 0 ? void 0 : (_this$di$getEvent$req3 = _this$di$getEvent$req2.claims) === null || _this$di$getEvent$req3 === void 0 ? void 0 : _this$di$getEvent$req3.sub;
+
+      if (typeof sub !== 'undefined') {
+        return this.userRepository.findOne({
+          cognito_sub: sub
+        }, {
+          relations: ['organisations']
+        });
+      }
+
+      const userID = (_this$di$getEvent$req4 = this.di.getEvent().requestContext) === null || _this$di$getEvent$req4 === void 0 ? void 0 : (_this$di$getEvent$req5 = _this$di$getEvent$req4.authorizer) === null || _this$di$getEvent$req5 === void 0 ? void 0 : (_this$di$getEvent$req6 = _this$di$getEvent$req5.claims) === null || _this$di$getEvent$req6 === void 0 ? void 0 : _this$di$getEvent$req6.user_id;
+
+      if (typeof userID !== 'undefined') {
+        return this.userRepository.findOne({
+          id: userID
+        }, {
+          relations: ['organisations']
+        });
+      }
     }
 
     return JSON.parse(this.di.getEvent().requestContext.authorizer.user);

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "@felloh-org/lambda-wrapper",
-  "version": "1.1.76",
+  "version": "1.2.0",
   "description": "Lambda wrapper for all Felloh Serverless Projects",
   "main": "dist/index.js",
+  "engines": {
+    "node": ">=14"
+  },
   "scripts": {
     "build": "./node_modules/.bin/babel src --out-dir dist --copy-files --ignore src/migration",
     "build:orm": "./node_modules/.bin/babel src --out-dir dist --copy-files --ignore src/migration",