@felloh-org/lambda-wrapper 1.1.46 → 1.1.49

package/dist/config/dependencies.js

@@ -15,6 +15,8 @@ var _logger = _interopRequireDefault(require("../service/logger"));
 
 var _request = _interopRequireDefault(require("../service/request"));
 
+var _user = _interopRequireDefault(require("../service/user"));
+
 var _warehouse = _interopRequireDefault(require("../service/warehouse"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -25,6 +27,7 @@ const DEFINITIONS = {
   HTTP: 'HTTP',
   LOGGER: 'LOGGER',
   REQUEST: 'REQUEST',
+  USER: 'USER',
   WAREHOUSE: 'WAREHOUSE'
 };
 exports.DEFINITIONS = DEFINITIONS;
@@ -34,7 +37,8 @@ const Dependencies = {
   [DEFINITIONS.LOGGER]: _logger.default,
   [DEFINITIONS.REQUEST]: _request.default,
   [DEFINITIONS.WAREHOUSE]: _warehouse.default,
-  [DEFINITIONS.AUTHENTICATION]: _authentication.default
+  [DEFINITIONS.AUTHENTICATION]: _authentication.default,
+  [DEFINITIONS.USER]: _user.default
 };
 exports.Dependencies = Dependencies;
 var _default = {

package/dist/service/authentication.js

@@ -36,7 +36,7 @@ class AuthenticationService extends _dependencyAware.default {
         this.initialised = true;
         this.userRoleRepository = await that.connection.getRepository(_userRole.default);
         this.organisationRepository = await that.connection.getRepository(_organisation.default);
-        this.user = JSON.parse(di.getEvent().requestContext.authorizer.user);
+        this.user = await di.get(_dependencies.DEFINITIONS.USER).getUser();
       }
     };
   }
@@ -51,7 +51,7 @@ class AuthenticationService extends _dependencyAware.default {
     await this.initialise();
     const response = [];
 
-    for await (const organisation of user.organisations) {
+    for (const organisation of user.organisations) {
       const orgs = await this.organisationRepository.findDescendants(organisation, {
         relations: ['parent']
       });
@@ -64,7 +64,33 @@ class AuthenticationService extends _dependencyAware.default {
     return response;
   }
   /**
-   * Check user role and organisation access
+   * Fetch roles for a user
+   * @param userID
+   * @returns {Promise<any[]>}
+   */
+
+
+  async fetchUserRoles(userID = null) {
+    await this.initialise();
+    const roles = await this.userRoleRepository.createQueryBuilder('user_roles').leftJoinAndSelect('user_roles.role', 'role').where('user_id = :userID', {
+      userID: userID !== null ? userID : this.user.id
+    }).getMany();
+    return roles.map(role => role.role.machine_name);
+  }
+  /**
+   * Check to see if user has a role
+   * @param role
+   * @param userID
+   * @returns {Promise<boolean>}
+   */
+
+
+  async hasRole(role, userID = null) {
+    const roles = await this.fetchUserRoles(userID);
+    return roles.indexOf(role) !== -1;
+  }
+  /**
+   * Check a users role and organisation access
    * @param organisationID
    * @param roles
    * @returns {Promise<boolean>}
@@ -103,14 +129,12 @@ class AuthenticationService extends _dependencyAware.default {
 
     if (roles.length >= 1) {
       // Fetch the users assigned roles
-      const userRoles = await this.userRoleRepository.createQueryBuilder('user_roles').leftJoinAndSelect('user_roles.role', 'role').where('user_id = :userID', {
-        userID: this.user.id
-      }).getMany(); // Loop through the roles and determine match count
+      const userRoles = await this.fetchUserRoles(this.user.id); // Loop through the roles and determine match count
 
       let roleCount = 0;
 
       for (const userRole of userRoles) {
-        if (roles.indexOf(userRole.role.machine_name) !== -1) {
+        if (roles.indexOf(userRole) !== -1) {
           roleCount += 1;
         }
       } // Throw an error if the user does not have all the roles

package/dist/service/user.js

@@ -0,0 +1,59 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _dependencies = require("../config/dependencies");
+
+var _dependencyAware = _interopRequireDefault(require("../dependency-injection/dependency-aware"));
+
+var _user = _interopRequireDefault(require("../entity/user/user"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// eslint-disable-next-line import/no-named-as-default,import/no-named-as-default-member
+
+/**
+ * User Service class
+ */
+class User extends _dependencyAware.default {
+  constructor(di) {
+    super(di);
+    this.initialised = false;
+    const that = this;
+
+    this.initialise = async () => {
+      if (that.initialised === false) {
+        const warehouse = di.get(_dependencies.DEFINITIONS.WAREHOUSE);
+        that.connection = await warehouse.connect();
+        this.initialised = true;
+        this.userRepository = await that.connection.getRepository(_user.default);
+      }
+    };
+  }
+  /**
+   * Fetch
+   * @returns {Promise<*>}
+   */
+
+
+  async getUser() {
+    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']
+      });
+    }
+
+    return this.di.getEvent().requestContext.authorizer.user;
+  }
+
+}
+
+exports.default = User;

package/package.json

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