@felloh-org/lambda-wrapper 1.11.24 → 1.11.25

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

@@ -7,7 +7,11 @@ exports.default = void 0;
 
 var _typeorm = require("typeorm");
 
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8;
+var _feature = _interopRequireDefault(require("../feature"));
+
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _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 }); }
 
@@ -36,7 +40,12 @@ let Role = (_dec = (0, _typeorm.Entity)({
 }), _dec8 = (0, _typeorm.Column)({
   type: "varchar",
   length: "100"
-}), _dec9 = (0, _typeorm.CreateDateColumn)(), _dec(_class = (_class2 = class Role {
+}), _dec9 = (0, _typeorm.ManyToOne)(() => _feature.default, {
+  nullable: true
+}), _dec10 = (0, _typeorm.JoinColumn)({
+  name: 'dependent_feature_id',
+  referencedColumnName: 'id'
+}), _dec11 = (0, _typeorm.CreateDateColumn)(), _dec(_class = (_class2 = class Role {
   constructor() {
     _initializerDefineProperty(this, "id", _descriptor, this);
 
@@ -52,7 +61,9 @@ let Role = (_dec = (0, _typeorm.Entity)({
 
     _initializerDefineProperty(this, "group", _descriptor7, this);
 
-    _initializerDefineProperty(this, "created_at", _descriptor8, this);
+    _initializerDefineProperty(this, "feature", _descriptor8, this);
+
+    _initializerDefineProperty(this, "created_at", _descriptor9, this);
   }
 
 }, (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "id", [_dec2], {
@@ -98,7 +109,14 @@ let Role = (_dec = (0, _typeorm.Entity)({
   initializer: function () {
     return "";
   }
-}), _descriptor8 = _applyDecoratedDescriptor(_class2.prototype, "created_at", [_dec9], {
+}), _descriptor8 = _applyDecoratedDescriptor(_class2.prototype, "feature", [_dec9, _dec10], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: function () {
+    return _feature.default;
+  }
+}), _descriptor9 = _applyDecoratedDescriptor(_class2.prototype, "created_at", [_dec11], {
   configurable: true,
   enumerable: true,
   writable: true,

package/dist/migration/1695127749722-dependent_feature.js

@@ -0,0 +1,13 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class dependentFeature1695127749722 {
+    name = 'dependentFeature1695127749722'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user"."role" ADD "dependent_feature_id" uuid`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user"."role" DROP COLUMN "dependent_feature_id"`);
+    }
+}

package/dist/service/authentication.js

@@ -132,16 +132,16 @@ class AuthenticationService extends _dependencyAware.default {
       // Fetch the users assigned roles
       const userRoles = await this.fetchUserRoles(this.user.id); // Loop through the roles and determine match count
 
-      let roleCount = 0;
+      const rolesMatching = {};
 
       for (const userRole of userRoles) {
         if (roles.indexOf(userRole) !== -1) {
-          roleCount += 1;
+          rolesMatching[userRole] = 1;
         }
       } // Throw an error if the user does not have all the roles
 
 
-      if (roleCount !== roles.length) {
+      if (Object.keys(rolesMatching).length !== roles.length) {
         const notFoundResponse = new _response.default(null, 401);
         notFoundResponse.addError({
           title: 'Unauthorized',

package/package.json

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