@getjones/test-infra 2.10.6 → 2.10.8

package/package.json

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

package/src/saas/internal-api/accounts/api/core/accounts.core.service.js

@@ -1,7 +1,9 @@
+const { expect } = require('chai');
 const env = require('../../../../../env');
 const accountsAPI = require('./accounts.core.api');
 const CreateAccountModel = require('../../models/core/create.account.model');
 const { validateType } = require('../../../../../common/validations/typeValidations');
+const httpResponseStatusCodes = require('../../../../../../../../packages/test-infra/src/common/httpResponseStatusCodes.json');
 
 const { accountCreationSecret } = env.getEnv();
 
@@ -18,16 +20,19 @@ const createAccount = async (createAccountModel, context) => {
 
 const getAccount = async (accountName, context) => {
 	const response = await accountsAPI.getByName(accountName, context);
+	expect(response.status, 'Failed to get accounts by name').to.equal(httpResponseStatusCodes.OK);
 
-	if (!response.data || !response.data.length) {
+	const existingAccounts = response.data;
+
+	if (!existingAccounts || !existingAccounts.length) {
 		return null;
 	}
 
-	if (response.data.length > 1) {
+	if (existingAccounts.length > 1) {
 		throw new Error(`Got more than one account with the name: ${accountName}. IDs: ${existingAccounts.map(item => item.userId).join(', ')}`);
 	}
 
-	return response.data[0];
+	return existingAccounts[0];
 };
 
 const getOrCreateAccount = async (createAccountModel, context) => {

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

@@ -4,6 +4,10 @@ const { UpdateRequirementModel } = require('../models/update.requirement.model')
 const { AttributeModel, PolicyModel, AttributeTypes } = require('../models/policy.model');
 const { CreateRequirementModel } = require('../models/create.requirement.model');
 
+const customAttributes = {
+	Including: 'multiple'
+};
+
 const convertNumericValuesToNumberType = function(value) {
 	if (dataTypeUtils.isString(value) && value.startsWith('$')) {
 		return Number(value.replace(/[$,]/g, ''));
@@ -46,10 +50,12 @@ const parseRequirementConfig = function(config) {
 
 		if (dataTypeUtils.isObject(config[policy])) {
 			for (const attribute in config[policy]) {
+				const attributeName = customAttributes[attribute] || attribute;
+
 				attributes.push({
-					name: attribute,
+					name: attributeName,
 					type: preparePolicyAttributesTypes(config[policy][attribute]),
-					values: attribute === 'Including' ?
+					values: attributeName === customAttributes.Including ?
 						config[policy][attribute].split(', ') :
 						[convertNumericValuesToNumberType(config[policy][attribute])]
 				});

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

@@ -89,7 +89,7 @@ const removeAllUserTraceFromDb = (userId, context) => {
 
 const deleteUserByEmail = async (userEmail, context) => {
 	const { data: user } = await getUserByEmail(userEmail, context);
-	return deleteUser(user.subuserId, context);
+	return user ? deleteUser(user.subuserId, context) : null;
 };
 
 const reinviteUser = (userId, context) => {