@getjones/test-infra 2.2.0 → 2.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getjones/test-infra",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "Providing internal and openapi interface",
   "main": "src/index.js",
   "scripts": {

package/src/saas/internal-api/accounts/consts/consts.js

@@ -0,0 +1,6 @@
+const ACCOUNT_TYPES = {
+	PROPERTY: 'Property Management',
+	CONSTRUCTION: 'Construction'
+};
+
+module.exports = { ACCOUNT_TYPES };

package/src/saas/internal-api/accounts/index.js

@@ -6,6 +6,7 @@ const settingsModels = { UpdateAccountSettingsModel };
 
 const models = { core: coreModels, settings: settingsModels };
 const utils = require('./utils/utils');
+const consts = require('./consts/consts');
 
 const coreService = require('./api/core/accounts.core.service');
 const openApiServices = require('./api/openapi/accounts.openapi.service');
@@ -17,4 +18,4 @@ const services = {
 	settings: settingsServices
 };
 
-module.exports = { services, models, utils };
+module.exports = { services, models, utils, consts };

package/src/saas/internal-api/accounts/models/core/create.account.model.js

@@ -1,15 +1,16 @@
 const env = require('../../../../../env');
 const { credentials, accountCreationSecret } = env.getEnv();
-const PROPERTY_TYPE = 'Property Management';
+const { ACCOUNT_TYPES } = require('../../consts/consts');
 
-function CreateAccountModel(accountName, email, password = credentials.strongPassword,
-	secret = accountCreationSecret, propertyType = PROPERTY_TYPE) {
-	this.companyName = accountName;
-	this.email = email;
-	this.password = password;
-	this.verifyPassword = password;
-	this.secret = secret;
-	this.userType = propertyType;
+class CreateAccountModel {
+	constructor(accountName, email, password = credentials.strongPassword, propertyType = ACCOUNT_TYPES.PROPERTY) {
+		this.companyName = accountName;
+		this.email = email;
+		this.password = password;
+		this.verifyPassword = password;
+		this.userType = propertyType;
+		this.secret = accountCreationSecret;
+	}
 }
 
 module.exports = CreateAccountModel;

package/src/saas/internal-api/auth/api/auth.api.js

@@ -2,11 +2,17 @@ const requests = require('../../../../common/requests/cookieAuth/requests');
 const { backendUrl } = require('../../../../env').getEnv();
 
 const Endpoints = {
-	login: `${backendUrl}/logincontroller`
+	login: `${backendUrl}/logincontroller`,
+	isHubUser: email => `${backendUrl}/vendor-app/is-hub-user?email=${email}`
+
 };
 
 const login = (email, password) => {
 	return requests.postRequestHandler(Endpoints.login, { email, password });
 };
 
-module.exports = { login };
+const vendorHubLogin = email => {
+	return requests.postRequestHandler(Endpoints.isHubUser(email), { email });
+};
+
+module.exports = { login, vendorHubLogin };

package/src/saas/internal-api/auth/api/auth.service.js

@@ -13,6 +13,17 @@ const getAuthCookie = async (email, password) => {
 	}
 };
 
+const getVendorHubAuthCookie = async email => {
+	try {
+		const response = await authApi.vendorHubLogin(email);
+		const authCookie = response.headers['set-cookie'].find(item => item.startsWith('JonesToken2='));
+
+		return authCookie;
+	} catch (error) {
+		throw new Error(`Failed to login to vendor hub by email:${email}`, error);
+	}
+};
+
 const getIcsCookie = () => {
 	requiredValidation({
 		'credentials.superUser': credentials.superUser,
@@ -56,6 +67,7 @@ const getAuditorId = async () => {
 
 module.exports = {
 	getAuthCookie,
+	getVendorHubAuthCookie,
 	getIcsCookie,
 	getAuditorCookie,
 	getOperatorCookie,

package/src/saas/internal-api/compliance/api/audit/audit.service.js

@@ -1,7 +1,6 @@
 const auditApi = require('./audit.api');
 const { AuditRequestModel, AuditListParametersModel, AuditDatesModel } = require('../../models/audit/audit.model');
 const { validateType } = require('../../../../../common/validations/typeValidations');
-const env = require('../../../../../../../../src/env');
 const util = require('../../utils/util');
 const dataTypeUtils = require('../../../../../common/utils/dataTypeUtils');
 
@@ -61,7 +60,7 @@ const getAuditMetadata = async (
 		contractCreateDate: vendorDetails.contractCreateDate
 	};
 
-	metadata.auditorId = await util.getAuditorId(env);
+	metadata.auditorId = await util.getAuditorId();
 
 	return metadata;
 };

package/src/saas/internal-api/requirements/api/requirements.api.js

@@ -8,8 +8,9 @@ const Endpoints = {
 	delete: requirementId => `${backendUrl}/saas/requirement/${requirementId}`
 };
 
-const createRequirement = (createRequirementModel, context) => {
-	return requests.postRequestHandler(Endpoints.create, createRequirementModel, context);
+const createRequirement = (createRequirementModel, tabId, context) => {
+	const params = { tabId };
+	return requests.postRequestHandler(Endpoints.create, createRequirementModel, context, {}, params);
 };
 
 const getRequirementsByTabId = (tabId, context) => {

package/src/saas/internal-api/requirements/api/requirements.service.js

@@ -4,9 +4,9 @@ const requirementUtils = require('../utils/utils');
 
 const { validateType } = require('../../../../common/validations/typeValidations');
 
-const createRequirement = (createRequirementModel, context) => {
+const createRequirement = (createRequirementModel, tabId, context) => {
 	validateType(createRequirementModel, CreateRequirementModel);
-	return requirementsAPI.createRequirement(createRequirementModel, context);
+	return requirementsAPI.createRequirement(createRequirementModel, tabId, context);
 };
 
 const getRequirementsByTabId = (tabId, context) => {
@@ -35,12 +35,12 @@ const getRequirementIdByName = async (tabId, requirementName, context) => {
 	return requirement ? requirement.id : requirement;
 };
 
-const getOrCreateRequirement = async (accountId, requirement, context, projectId, tabId) => {
+const getOrCreateRequirement = async (requirement, tabId, context) => {
 	let existingRequirement = await getRequirementByName(tabId, requirement.name, context);
 
 	if (!existingRequirement) {
-		const createRequirementModel = getCreateRequirementModel(requirement.policies, requirement.name, accountId, projectId, tabId);
-		await createRequirement(createRequirementModel, context);
+		const createRequirementModel = getCreateRequirementModel(requirement.policies, requirement.name);
+		await createRequirement(createRequirementModel, tabId, context);
 		existingRequirement = await getRequirementByName(tabId, requirement.name, context);
 	}
 
@@ -56,8 +56,8 @@ const deleteRequirementByName = async (requirementName, tabId, context) => {
 	return deleteByRequirementId(requirementToDelete.id, context);
 };
 
-const getCreateRequirementModel = (requirementConfig, requirementName, accountId, projectId, tabId) => {
-	return requirementUtils.getCreateRequirementModel(requirementConfig, requirementName, accountId, projectId, tabId);
+const getCreateRequirementModel = (requirementConfig, requirementName) => {
+	return requirementUtils.getCreateRequirementModel(requirementConfig, requirementName);
 };
 
 module.exports = {

package/src/saas/internal-api/requirements/models/create.requirement.model.js

@@ -3,35 +3,36 @@ const { validateType } = require('../../../../common/validations/typeValidations
 
 const DEFAULT_REQUIREMENT_TYPE = 'REQUIREMENT';
 
-function CreateRequirementModel(accountId, projectId, tabId, name, policies) {
-	this.userId = accountId;
-	this.projectId = projectId;
-	this.tabId = tabId;
-	this.name = name;
-	this.policies = policies;
-	this.requirementType = DEFAULT_REQUIREMENT_TYPE;
-
-	validateType(policies, Array);
-	policies && validateType(policies[0], Policy);
+class CreateRequirementModel {
+	constructor(name, policies) {
+		this.name = name;
+		this.policies = policies;
+		this.requirementType = DEFAULT_REQUIREMENT_TYPE;
+
+		validateType(policies, Array);
+		policies && validateType(policies[0], Policy);
+	}
 }
 
-function Policy(name, attributes) {
-	this.policyName = name;
-	this.attributes = attributes;
+class Policy {
+	constructor(name, attributes) {
+		this.policyName = name;
+		this.attributes = attributes;
 
-	validateType(attributes, Array);
-	attributes && validateType(attributes[0], Attribute);
+		validateType(attributes, Array);
+		attributes && validateType(attributes[0], Attribute);
+	}
 }
 
-function Attribute(name, type, values) {
-	this.attributeName = name;
-	this.type = type.value;
-	this.values = values.map(function(value) {
-		return { value };
-	});
+class Attribute {
+	constructor(name, type, values) {
+		this.attributeName = name;
+		this.type = type.value;
+		this.values = values.map(value => ({ value }));
 
-	if (!AttributeTypes.get(type) || !AttributeTypes.get(type.key)) {
-		throw TypeError(`Expected type to be instance of: ${AttributeTypes.name}`);
+		if (!AttributeTypes.get(type) || !AttributeTypes.get(type.key)) {
+			throw TypeError(`Expected type to be instance of: ${AttributeTypes.name}`);
+		}
 	}
 }
 

package/src/saas/internal-api/requirements/utils/utils.js

@@ -76,11 +76,11 @@ const getPolicyModel = function(policyData) {
 	return new models.Policy(policyData.name, attributeModels);
 };
 
-const getCreateRequirementModel = function(requirementConfig, requirementName, accountId, projectId, tabId) {
+const getCreateRequirementModel = function(requirementConfig, requirementName) {
 	const policies = parseRequirementConfig(requirementConfig);
 	const policyModels = policies.map(policy => getPolicyModel(policy));
 
-	return new models.CreateRequirementModel(accountId, projectId, tabId, requirementName, policyModels);
+	return new models.CreateRequirementModel(requirementName, policyModels);
 };
 
 module.exports = {