@getjones/test-infra 4.4.14 → 4.4.15

package/package.json

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

package/src/factory/users/users.js

@@ -17,7 +17,7 @@ const roles = {
 const inviteSaasUser = async (username, role, projectIds, context, { hasCompleteAccessPermission } = {}) => {
 	const userResponse = await users.services.getUserByEmail(username, context);
 
-	if (userResponse.data && userResponse.data.subuserId) {
+	if (userResponse.data && userResponse.data.id) {
 		const { projectPermissions } = userResponse.data;
 		const projectPermissionsIds = projectPermissions.map(projectPermission => projectPermission.projectId);
 

package/src/saas/internal-api/policyFile/api/policy.file.api.js

@@ -4,7 +4,8 @@ const { backendUrl } = require('../../../../env').getEnv();
 const Endpoints = {
 	getPolicyFilesForVendorReport: requestId => `${backendUrl}/saas/request/${requestId}/policy-files`,
 	getPreSignedUrlByPolicyId: policyFileId => `${backendUrl}/saas/policy-file/${policyFileId}`,
-	getAuditPolicyFilesByAuditId: (recordId, auditId) => `${backendUrl}/saas/integration-tests/record/${recordId}/audit/${auditId}/policy-files`
+	getAuditPolicyFilesByAuditId: (recordId, auditId) => `${backendUrl}/saas/integration-tests/record/${recordId}/audit/${auditId}/policy-files`,
+	getPolicyFilesRequireAudit: recordId => `${backendUrl}/saas/integration-tests/record/${recordId}/policy-files-to-audit`
 };
 const getPolicyFilesForVendorReport = async (requestId, context) => {
 	return requests.getRequestHandler(Endpoints.getPolicyFilesForVendorReport(requestId), {}, context);
@@ -18,8 +19,13 @@ const getAuditPolicyFiles = async (recordId, auditId, context) => {
 	return requests.getRequestHandler(Endpoints.getAuditPolicyFilesByAuditId(recordId, auditId), {}, context);
 };
 
+const getPolicyFilesRequireAudit = async (recordId, context) => {
+	return requests.getRequestHandler(Endpoints.getPolicyFilesRequireAudit(recordId), {}, context);
+};
+
 module.exports = {
 	getPolicyFilesForVendorReport,
 	getPreSignedUrlByPolicyId,
-	getAuditPolicyFiles
+	getAuditPolicyFiles,
+	getPolicyFilesRequireAudit
 };

package/src/saas/internal-api/policyFile/api/policy.file.service.js

@@ -1,4 +1,5 @@
 const policyFileApi = require('./policy.file.api');
+const timeUtils = require('../../../../common/utils/timeUtils');
 
 const httpResponseStatusCodes = require('../../../../common/httpResponseStatusCodes.json');
 
@@ -32,8 +33,41 @@ const getAuditPolicyFiles = async (recordId, auditId, context) => {
 	return getAuditPolicyFilesResponse;
 };
 
+const getPolicyFilesIfExist = async (recordId, context) => {
+	let retries = 10;
+	let policiesToReviewResponse;
+	let policyFiles = [];
+
+	while (policyFiles.length === 0 && retries > 0) {
+		//Busy wait for it takes time to get policy file to review
+		await timeUtils.waitFor(0.5).seconds;
+
+		policiesToReviewResponse = await policyFileApi.getPolicyFilesRequireAudit(recordId, context);
+		policyFiles = policiesToReviewResponse.data;
+
+		retries--;
+	}
+
+	if (policyFiles.length === 0) {
+		throw new Error(`No policy files to review where found for record ${recordId}`);
+	}
+
+	return policiesToReviewResponse;
+};
+
+const getPolicyFilesRequireAudit = async (recordId, context) => {
+	const getPolicyFilesResponse = await getPolicyFilesIfExist(recordId, context);
+
+	if (getPolicyFilesResponse.status !== httpResponseStatusCodes.OK) {
+		throw new Error('Failed to get policy files that require audit');
+	}
+
+	return getPolicyFilesResponse;
+};
+
 module.exports = {
 	getPolicyFilesForVendorReport,
 	getPreSignedUrlByPolicyId,
-	getAuditPolicyFiles
+	getAuditPolicyFiles,
+	getPolicyFilesRequireAudit
 };

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

@@ -24,11 +24,23 @@ const editUserRole = async (userId, data, context) => {
 	return userAPI.editUserRole(userId, data, context);
 };
 
-const editUserProjects = async (editUserModel, context) => {
+const editUserProjectsByModel = async (editUserModel, context) => {
 	validateType(editUserModel, EditUserModel);
 	return userAPI.editUserProjects([editUserModel], context);
 };
 
+const editUserProjects = async (userId, userEmail, role, projectsIds, context, { hasCompleteAccessPermission } = {}) => {
+	const editUserModel = new EditUserModel(userId, userEmail, role, projectsIds, hasCompleteAccessPermission);
+
+	const response = await editUserProjectsByModel(editUserModel, context);
+
+	if (response.status !== httpResponseStatusCodes.NO_CONTENT) {
+		throw new Error('Failed to edit user projects');
+	}
+
+	return response;
+};
+
 const getUsersByProjectId = async (projectId, context) => {
 	return userAPI.getUsersByProjectId(projectId, context);
 };
@@ -57,7 +69,7 @@ const getEnabledAndDisabledByEmail = async (email, context) => {
 	return response.data;
 };
 
-const getOrCreateUser = async (email, role, projectsIds, context, { fullName = role, password = credentials.strongPassword } = {}) => {
+const getOrCreateUser = async (email, role, projectsIds, context, { fullName = role, password = credentials.strongPassword, expectError, hasCompleteAccessPermission } = {}) => {
 	let userResponse = await getUserByEmail(email, context);
 
 	if (userResponse.data !== '' && userResponse.status === httpResponseStatusCodes.OK) {
@@ -66,16 +78,18 @@ const getOrCreateUser = async (email, role, projectsIds, context, { fullName = r
 
 		projectsIds = projectsIds.filter(projectId => !projectPermissionsIds.includes(projectId));
 
-		if (userResponse.data && userResponse.data.subuserId && userResponse.data.isVerified && !projectsIds.length) {
+		if (userResponse.data && userResponse.data.id && userResponse.data.isVerified && !projectsIds.length) {
 			return userResponse.data;
 		}
 	}
 
-	const inviteUserModel = new InviteUserModel(email, role, projectsIds);
+	const inviteUserModel = new InviteUserModel(email, role, projectsIds, hasCompleteAccessPermission);
 	const inviteResponse = await inviteUser([inviteUserModel], context);
 
-	if (inviteResponse.status !== httpResponseStatusCodes.NO_CONTENT) {
+	if (inviteResponse.status !== httpResponseStatusCodes.NO_CONTENT && !expectError) {
 		throw new Error(`Failed to invite user with email: ${email}\n${inviteResponse}`);
+	} else if (expectError) {
+		return inviteResponse;
 	}
 
 	userResponse = await getUserByEmail(email, context);
@@ -126,7 +140,7 @@ const removeAllUserTraceFromDb = (userId, context) => {
 
 const deleteUserByEmail = async (userEmail, context) => {
 	const { data: user } = await getUserByEmail(userEmail, context);
-	return user ? deleteUser(user.subuserId, context) : null;
+	return user ? deleteUser(user.id, context) : null;
 };
 
 const reinviteUser = (userId, context) => {
@@ -232,6 +246,7 @@ module.exports = {
 	removeAllUserTraceFromDb,
 	editUserRole,
 	editUserProjects,
+	editUserProjectsByModel,
 	reinviteUser,
 	editUserEmailNotificationsSettings,
 	sendForgetPasswordMail,

package/src/saas/internal-api/users/models/users.model.js

@@ -17,11 +17,12 @@ class SignupUserModel {
 }
 
 class EditUserModel {
-	constructor(subUserId, email, role, projects = []) {
+	constructor(subUserId, email, role, projects = [], hasCompleteAccessPermission) {
 		this.subUserId = subUserId;
 		this.email = email;
 		this.role = role;
 		this.projects = projects;
+		this.hasCompleteAccessPermission = hasCompleteAccessPermission;
 	}
 }