@getjones/test-infra 2.8.11 → 2.8.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getjones/test-infra",
-  "version": "2.8.11",
+  "version": "2.8.13",
   "description": "Providing internal and openapi interface",
   "main": "src/index.js",
   "scripts": {
@@ -15,6 +15,7 @@
     "chai": "^4.3.4",
     "dotenv": "^8.2.0",
     "enum": "^3.0.4",
+    "form-data": "^4.0.0",
     "mocha": "^8.3.2"
   },
   "devDependencies": {

package/src/common/consts/userTypes.js

@@ -2,5 +2,7 @@ module.exports = {
 	ICS: 'ICS',
 	PM: 'PM',
 	AUDITOR: 'AUDITOR',
-	VENDOR: 'Vendor'
+	VENDOR: 'Vendor',
+	auditor: 'Auditor',
+	operator: 'Operator'
 };

package/src/index.js

@@ -39,6 +39,7 @@ const getInternalAPI = () => {
 	const threadScheduler = require('./saas/internal-api/thread-scheduler/runner');
 	const dbEmails = require('./saas/internal-api/dbEmails/index');
 	const agreement = require('./saas/internal-api/agreement/index');
+	const uploadFile = require('./saas/internal-api/uploadFiles/index');
 
 	const internalAPI = {
 		defaults,
@@ -63,7 +64,8 @@ const getInternalAPI = () => {
 		threadScheduler,
 		dbEmails,
 		factory,
-		agreement
+		agreement,
+		uploadFile
 	};
 
 	return internalAPI;

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

@@ -4,8 +4,6 @@ const { backendUrl } = require('../../../../../env').getEnv();
 const Endpoints = {
 	getAccount: `${backendUrl}/saas/accounts`,
 	create: `${backendUrl}/saas/createaccount`,
-	createInnerSystemAccount: `${backendUrl}/saas/superuser/user`,
-	getInnerSystemAccountsPerRole: `${backendUrl}/saas/users`,
 	delete: `${backendUrl}/saas/account`,
 	edit: accountId => `${backendUrl}/saas/account/${accountId}/settings`
 };
@@ -14,15 +12,6 @@ const create = (account, context) => {
 	return requests.postRequestHandler(Endpoints.create, account, context);
 };
 
-const createInnerSystemAccount = (innerSystemUser, icsContext) => {
-	return requests.postRequestHandler(Endpoints.createInnerSystemAccount, innerSystemUser, icsContext);
-};
-
-const getInnerSystemAccountsPerRole = (roles, icsContext) => {
-	const params = { roles };
-	return requests.getRequestHandler(Endpoints.getInnerSystemAccountsPerRole, params, icsContext);
-};
-
 const deleteAccount = (accountId, context) => {
 	return requests.deleteRequestHandler(Endpoints.delete, context, {}, { 'userId': accountId });
 };
@@ -36,4 +25,4 @@ const getByName = (accountName, context) => {
 	return requests.getRequestHandler(Endpoints.getAccount, params, context);
 };
 
-module.exports = { create, getByName, deleteAccount, updateAccountSettings, createInnerSystemAccount, getInnerSystemAccountsPerRole };
+module.exports = { create, getByName, deleteAccount, updateAccountSettings };

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

@@ -1,11 +1,7 @@
 const env = require('../../../../../env');
 const accountsAPI = require('./accounts.core.api');
 const CreateAccountModel = require('../../models/core/create.account.model');
-const CreateInnerSystemAccountModel = require('../../models/core/create.inner.system.account.model');
 const { validateType } = require('../../../../../common/validations/typeValidations');
-const httpResponseStatusCodes = require('../../../../../common/httpResponseStatusCodes.json');
-const { ROLES } = require('../../../../../../../../src/saas/internal-api/common/users/consts');
-const userTypes = require('../../../../../common/consts/userTypes');
 
 const { accountCreationSecret } = env.getEnv();
 
@@ -20,48 +16,6 @@ const createAccount = async (createAccountModel, context) => {
 	return accountsAPI.create(createAccountModel, context);
 };
 
-const createInnerSystemAccount = async (innerSystemCreateAccountModel, icsContext) => {
-	validateType(innerSystemCreateAccountModel, CreateInnerSystemAccountModel);
-	const response = await accountsAPI.createInnerSystemAccount(innerSystemCreateAccountModel, icsContext);
-
-	if (response.status !== httpResponseStatusCodes.OK) {
-		throw Error(`Create inner system account failed\n${response}`);
-	}
-
-	return response.data;
-};
-
-const getInnerSystemAccountsPerRole = async icsContext => {
-	const roles = `${userTypes.ICS},${ROLES.auditor},${ROLES.operator}`;
-	const response = await accountsAPI.getInnerSystemAccountsPerRole(roles, icsContext);
-
-	if (response.status !== httpResponseStatusCodes.OK) {
-		throw Error(`Get inner system accounts failed\n${response}`);
-	}
-
-	return response.data;
-};
-
-const getOrCreateInnerSystemAccount = async (innerSystemCreateAccountModel, role, icsContext) => {
-	const accountEmail = innerSystemCreateAccountModel.email;
-	const account = await getInnerSystemAccountByEmail(accountEmail, role, icsContext);
-
-	if (account) {
-		return account;
-	}
-
-	await createInnerSystemAccount(innerSystemCreateAccountModel, icsContext);
-	return getInnerSystemAccountByEmail(accountEmail, role, icsContext);
-};
-
-const getInnerSystemAccountByEmail = async (accountEmail, role, icsContext) => {
-	const accountsPerRole = await getInnerSystemAccountsPerRole(icsContext);
-	const accountsOfRole = accountsPerRole[role];
-	const account = accountsOfRole.find(({ email }) => email === accountEmail);
-
-	return account;
-};
-
 const getAccount = async (accountName, context) => {
 	const response = await accountsAPI.getByName(accountName, context);
 
@@ -119,6 +73,5 @@ module.exports = {
 	getAccountId,
 	createAccount,
 	deleteAccountByName,
-	deleteAccountById,
-	getOrCreateInnerSystemAccount
+	deleteAccountById
 };

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

@@ -1,7 +1,5 @@
 const CreateAccountModel = require('./models/core/create.account.model');
-const CreateInnerSystemAccountModel = require('./models/core/create.inner.system.account.model');
-const coreModels = { CreateAccountModel, CreateInnerSystemAccountModel };
-
+const coreModels = { CreateAccountModel };
 const UpdateAccountSettingsModel = require('./models/settings/update.settings.model');
 const settingsModels = { UpdateAccountSettingsModel };
 

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

@@ -25,7 +25,8 @@ const EMAIL_SUBJECT = {
 	sendGapsForTenant: ({ requesterName }) => `New Insurance Docs Required for leased space at ${requesterName} - `,
 	notCompliant: ({ recordCompanyName, requesterName }) => `Please Review COI Gaps - ${recordCompanyName} (${requesterName})`,
 	wrongCoi: ({ recordCompanyName, requesterName }) => `Incorrect File Submission - COI Still Required for ${recordCompanyName} - ${requesterName}`,
-	sendGapsRecordFullName: ({ requesterName, recordFirstName, recordLastName }) => `New Insurance Docs Required for ${requesterName} - ${recordFirstName} ${recordLastName}`,
+	sendGapsVendorFullName: ({ requesterName, recordFirstName, recordLastName }) => `New Insurance Docs Required for ${requesterName} - ${recordFirstName} ${recordLastName}`,
+	sendGapsTenantFullName: ({ requesterName, recordFirstName, recordLastName }) => `New Insurance Docs Required for leased space at ${requesterName} - ${recordFirstName} ${recordLastName}`,
 	requestNewCoiExpired: ({ recordCompanyName }) => `${recordCompanyName}'s COI is`,
 	firstReminder: ({ requesterName }) => `We are still awaiting the Insurance Docs for ${requesterName}`,
 	secondReminder: ({ requesterName }) => `${requesterName} still needs`,
@@ -38,6 +39,7 @@ const EMAIL_SUBJECT = {
 	sameDayExpirationPMAutoRenewal: ({ recordCompanyName }) => `COI expired for ${recordCompanyName} at`,
 	requirementsUpdatedNotification: ({ requesterName }) => `Updated Requirements - Your Insurance Docs are needed for ${requesterName}`,
 	updatedRequirementsSubjectPrefix: () => 'Updated Requirements - ',
+	malwareFileFound: ({ recordCompanyName }) => `File upload failed to pass security scan for ${recordCompanyName}`,
 	fraudAuditorReview: ({ recordCompanyName, requesterName }) => `Authentication check for ${recordCompanyName} at ${requesterName}`,
 	requestNewCoi: ({ recordCompanyName, requesterName, isExpired }) => `${recordCompanyName}'s COI is ${isExpired ? 'expired' : 'about to expire'} - ${requesterName}`,
 	malwareCoiFound: 'COI upload failed to pass security scan',

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

@@ -36,7 +36,8 @@ const XlsxReportTypes = {
 	WAIVERS_REPORT: 'WaiversReport',
 	USER_MANAGEMENT_REPORT: 'UserManagementReport',
 	COVERAGE_GAPS_REPORT: 'CoverageGapsReport',
-	EXPIRING_RECORDS_REPORT: 'ExpiringRecordsReport'
+	EXPIRING_RECORDS_REPORT: 'ExpiringRecordsReport',
+	COMPLIANCE_STATUS_BY_POLICY_REPORT: 'ComplianceStatusByPolicy'
 };
 
 const ScheduledReportFrequency = {

package/src/saas/internal-api/reports/models/report.model.js

@@ -10,7 +10,7 @@ class ReportFilters {
 			isAllProjects,
 			isAllTabTypes,
 			isAllComplianceStatuses
-		}
+		} = {}
 	) {
 		this.projects = projects;
 		this.vendorTabTypes = contractorTypes;

package/src/saas/internal-api/uploadFiles/api/upload.file.api.js

@@ -0,0 +1,25 @@
+const requests = require('../../../../common/requests/cookieAuth/requests');
+const { backendUrl } = require('../../../../env').getEnv();
+
+const Endpoints = {
+	getRelatedDocPreSignedUrl: `${backendUrl}/pre-signed-url/upload/document`,
+	uploadRelatedDoc: recordId => `${backendUrl}/saas/contractor/${recordId}/document`
+};
+
+const getRelatedDocPreSignedUrl = (formData, context) => {
+	return requests.postRequestHandler(Endpoints.getRelatedDocPreSignedUrl, formData, context, formData.getHeaders());
+};
+
+const uploadFileToS3 = (preSignedUrl, file) => {
+	return requests.putRequestHandler(preSignedUrl, file);
+};
+
+const uploadRelatedDoc = (recordId, uploadDocumentModel, context) => {
+	return requests.postRequestHandler(Endpoints.uploadRelatedDoc(recordId), uploadDocumentModel, context);
+};
+
+module.exports = {
+	getRelatedDocPreSignedUrl,
+	uploadRelatedDoc,
+	uploadFileToS3
+};

package/src/saas/internal-api/uploadFiles/api/upload.file.service.js

@@ -0,0 +1,32 @@
+const uploadFileApi = require('./upload.file.api');
+const fs = require('fs');
+const path = require('path');
+const FormData = require('form-data');
+const consts = require('../consts');
+
+const { RELATED_DOC_TYPES, S3_FILE_TYPE } = consts;
+
+const getRelatedDocPreSignedUrl = (recordId, context, { filePath }) => {
+	const formData = new FormData();
+	const file = fs.createReadStream(filePath);
+	formData.append('recordId', recordId);
+	formData.append('fileType', S3_FILE_TYPE.DOCUMENT);
+	formData.append('file', file) ;
+
+	return uploadFileApi.getRelatedDocPreSignedUrl(formData, context);
+};
+
+const uploadFileToS3 = (preSignedUrl, filePath) => {
+	return uploadFileApi.uploadFileToS3(preSignedUrl, fs.readFileSync(filePath));
+};
+
+const uploadRelatedDoc = async (recordId, context, { filePath, type = RELATED_DOC_TYPES.LEASE } = {}) => {
+	const { data: { preSignedUrl, fileName: fullFilePath } } = await getRelatedDocPreSignedUrl(recordId, context, { filePath });
+	await uploadFileToS3(preSignedUrl, filePath);
+	const originalFileName = path.basename(filePath);
+	const file = fs.statSync(filePath);
+	return uploadFileApi.uploadRelatedDoc(recordId, { name: originalFileName, type, fullFilePath, fileSize: file.size }, context);
+};
+module.exports = {
+	uploadRelatedDoc
+};

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

@@ -0,0 +1,25 @@
+const RELATED_DOC_TYPES = {
+	LEASE: 'LEASE',
+	W9: 'W9',
+	SIGNED_AGREEMENT: 'SIGNED_AGREEMENT',
+	WAIVER_APPROVAL: 'WAIVER_APPROVAL',
+	POLICIES: 'POLICIES',
+	OTHER: 'OTHER'
+};
+
+S3_FILE_TYPE = {
+	DOCUMENT: 'DOCUMENT',
+	REPORTS: 'REPORTS',
+	SNIPPET: 'SNIPPET',
+	CONTRACT: 'CONTRACT',
+	TEMPCOI: 'TEMPCOI',
+	COI: 'COI',
+	ATTACHMENT: 'ATTACHMENT',
+	OCRDATA: 'OCRDATA',
+	VENDORREPORT: 'VENDORREPORT'
+};
+
+module.exports = {
+	RELATED_DOC_TYPES,
+	S3_FILE_TYPE
+};

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

@@ -0,0 +1,3 @@
+const services = require('./api/upload.file.service');
+
+module.exports = { services };

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

@@ -15,7 +15,9 @@ const Endpoints = {
 	signupUser: `${backendUrl}/_saas/guests/signup`,
 	removeAllUserTraceFromDb: userId => `${backendUrl}/saas/user/automation/${userId}`,
 	userEmailNotificationsSettings: `${backendUrl}/saas/account/notification/set`,
-	sendForgetPasswordMail: `${backendUrl}/_saas/forgotPassword`
+	sendForgetPasswordMail: `${backendUrl}/_saas/forgotPassword`,
+	createInnerSystemUser: `${backendUrl}/saas/superuser/user`,
+	getInnerSystemUsersPerRole: `${backendUrl}/saas/users`
 };
 
 const invite = (invitedUser, context, { disableSendMail = true } = {}) => {
@@ -69,6 +71,15 @@ const editUserEmailNotificationsSettings = (userId, notificationSettingsModel, c
 	return requests.postRequestHandler(Endpoints.userEmailNotificationsSettings, notificationSettingsModel, context, {}, params);
 };
 
+const createInnerSystemUser = (innerSystemUser, icsContext) => {
+	return requests.postRequestHandler(Endpoints.createInnerSystemUser, innerSystemUser, icsContext);
+};
+
+const getInnerSystemUsersPerRole = (roles, icsContext) => {
+	const params = { roles };
+	return requests.getRequestHandler(Endpoints.getInnerSystemUsersPerRole, params, icsContext);
+};
+
 const sendForgetPasswordMail = userEmail => {
 	const body = { email: userEmail };
 	return requests.postRequestHandler(Endpoints.sendForgetPasswordMail, body);
@@ -87,5 +98,7 @@ module.exports = {
 	editUserProjects,
 	reinviteUser,
 	editUserEmailNotificationsSettings,
-	sendForgetPasswordMail
+	sendForgetPasswordMail,
+	createInnerSystemUser,
+	getInnerSystemUsersPerRole
 };

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

@@ -6,6 +6,9 @@ const userAPI = require('./users.api');
 const util = require('../utils/util');
 const httpResponseStatusCodes = require('../../../../common/httpResponseStatusCodes.json');
 const { NotificationSettingsModel } = require('../models/notification.settings.model');
+const CreateInnerSystemAccountModel = require('../models/create.inner.system.user.model');
+
+const userTypes = require('../../../../common/consts/userTypes');
 
 const inviteUser = async (invitedUser, context, { disableSendMail } = {}) => {
 	return userAPI.invite(invitedUser, context, { disableSendMail });
@@ -36,8 +39,15 @@ const getUserByEmail = async (email, context) => {
 const getOrCreateUser = async (email, role, projectsIds, context, { fullName = role, password = credentials.strongPassword } = {}) => {
 	let userResponse = await getUserByEmail(email, context);
 
-	if (userResponse.data && userResponse.data.subuserId && userResponse.data.isVerified) {
-		return userResponse.data;
+	if (userResponse.data !== '') {
+		const { projectPermissions } = userResponse.data;
+		const projectPermissionsIds = projectPermissions.map(projectPermission => projectPermission.projectId);
+
+		projectsIds = projectsIds.filter(projectId => !projectPermissionsIds.includes(projectId));
+
+		if (userResponse.data && userResponse.data.subuserId && userResponse.data.isVerified && !projectsIds.length) {
+			return userResponse.data;
+		}
 	}
 
 	const inviteUserModel = new InviteUserModel(email, role, projectsIds, context);
@@ -91,6 +101,48 @@ const editUserEmailNotificationsSettings = (userId, notificationSettingsModel, c
 	return userAPI.editUserEmailNotificationsSettings(userId, notificationSettingsModel, context);
 };
 
+const createInnerSystemUser = async (createInnerSystemUserModel, icsContext) => {
+	validateType(createInnerSystemUserModel, CreateInnerSystemAccountModel);
+	const response = await userAPI.createInnerSystemUser(createInnerSystemUserModel, icsContext);
+
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Create inner system account failed\n${response}`);
+	}
+
+	return response.data;
+};
+
+const getInnerSystemUsersPerRole = async icsContext => {
+	const roles = `${userTypes.ICS},${userTypes.auditor},${userTypes.operator}`;
+	const response = await userAPI.getInnerSystemUsersPerRole(roles, icsContext);
+
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Get inner system accounts failed\n${response}`);
+	}
+
+	return response.data;
+};
+
+const getOrCreateInnerSystemUser = async (innerSystemCreateAccountModel, role, icsContext) => {
+	const accountEmail = innerSystemCreateAccountModel.email;
+	const account = await getInnerSystemUserByEmail(accountEmail, role, icsContext);
+
+	if (account) {
+		return account;
+	}
+
+	await createInnerSystemUser(innerSystemCreateAccountModel, icsContext);
+	return getInnerSystemUserByEmail(accountEmail, role, icsContext);
+};
+
+const getInnerSystemUserByEmail = async (accountEmail, role, icsContext) => {
+	const accountsPerRole = await getInnerSystemUsersPerRole(icsContext);
+	const accountsOfRole = accountsPerRole[role];
+	const account = accountsOfRole.find(({ email }) => email === accountEmail);
+
+	return account;
+};
+
 const sendForgetPasswordMail = userEmail => {
 	return userAPI.sendForgetPasswordMail(userEmail);
 };
@@ -109,5 +161,6 @@ module.exports = {
 	editUserProjects,
 	reinviteUser,
 	editUserEmailNotificationsSettings,
-	sendForgetPasswordMail
+	sendForgetPasswordMail,
+	getOrCreateInnerSystemUser
 };

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

@@ -1,5 +1,7 @@
 const userModels = require('./models/users.model');
 const { NotificationSettingsModel } = require('./models/notification.settings.model');
+const CreateInnerSystemUserModel = require('./models/create.inner.system.user.model');
+
 const services = require('./api/users.service');
 const util = require('./utils/util');
 
@@ -9,6 +11,6 @@ const tenants = {
 	services: tenantUserService
 };
 
-const models = { ... userModels, NotificationSettingsModel };
+const models = { ... userModels, NotificationSettingsModel, CreateInnerSystemUserModel };
 
 module.exports = { services, models, util, tenants };

package/src/saas/internal-api/{accounts/models/core/create.inner.system.account.model.js → users/models/create.inner.system.user.model.js}

@@ -1,7 +1,7 @@
-const env = require('../../../../../env');
+const env = require('../../../../env');
 const { credentials } = env.getEnv();
 
-class CreateInnerSystemAccountModel {
+class CreateInnerSystemUserModel {
 	constructor({
 		fullName = '',
 		email = '',
@@ -15,4 +15,4 @@ class CreateInnerSystemAccountModel {
 	}
 }
 
-module.exports = CreateInnerSystemAccountModel;
+module.exports = CreateInnerSystemUserModel;