@getjones/test-infra 5.2.10 → 5.2.11

package/src/saas/internal-api/users/api/tenantApp/tenant.app.service.js

@@ -1,109 +1,109 @@
-const { expect } = require('chai');
-
-const { getEnv } = require('../../../../../env');
-const httpResponseStatusCodes = require('../../../../../common/httpResponseStatusCodes.json');
-
-const { credentials } = getEnv();
-
-const { InviteTenantUserModel } = require('../../models/tenant.user.model');
-const { validateType } = require('../../../../../common/validations/typeValidations');
-const tenantAPI = require('./tenant.app.api');
-const util = require('../../utils/util');
-const users = require('../users.service');
-
-const inviteTenantUser = (projectId, invitedTenantUser, context) => {
-	validateType(invitedTenantUser, InviteTenantUserModel);
-	return tenantAPI.invite(projectId, invitedTenantUser, context);
-};
-
-const signupUser = (signupUserModel, context) => {
-	return tenantAPI.signupUser(signupUserModel, context);
-};
-
-const removeTenantUser = (projectId, tenantId, context) => {
-	return tenantAPI.removeTenantUser(projectId, tenantId, context);
-};
-
-const getTenantUsersByProjectId = async (projectId, context) => {
-	const tenantResponse = await tenantAPI.getTenantUsersByProjectId(projectId, context);
-
-	if (tenantResponse.status !== httpResponseStatusCodes.OK) {
-		throw new Error(`Failed to retrieve tenants users from project\n${tenantResponse.status}`);
-	}
-
-	return tenantResponse.data;
-};
-
-const getTenantsByAccountIdAndProjectId = async (accountId, projectId, context) => {
-	const tenantResponse = await tenantAPI.getTenantsByAccountIdAndProjectId(accountId, projectId, context);
-
-	if (tenantResponse.status !== httpResponseStatusCodes.OK) {
-		throw new Error(`Failed to retrieve tenants users from tenant account, accountId - ${accountId} response status - \n${tenantResponse.status}`);
-	}
-
-	return tenantResponse.data;
-};
-
-const getTenantUserByEmail = async (projectId, email, context) => {
-	const allTenants = await getTenantUsersByProjectId(projectId, context);
-
-	const tenant = allTenants.find(tenant => tenant.email === email);
-	return tenant;
-};
-
-const getOrCreateTenantUser = async (projectId, email, company, requestId, context, { fullName = 'Tenant User', password = credentials.strongPassword, toSignUp = true, expectError } = {}) => {
-	let tenantUser = await getTenantUserByEmail(projectId, email, context);
-
-	if (tenantUser && tenantUser.id && tenantUser.isVerified) {
-		return tenantUser;
-	}
-
-	const inviteUserModel = new InviteTenantUserModel(email, company, requestId);
-	const inviteResponse = await inviteTenantUser(projectId, inviteUserModel, context);
-
-	if (inviteResponse.status !== httpResponseStatusCodes.OK) {
-		if (expectError) {
-			return inviteResponse;
-		} else {
-			throw new Error(`Failed to invite tenant user with email: ${email}\n${inviteResponse}`);
-		}
-	}
-
-	tenantUser = await getTenantUserByEmail(projectId, email, context);
-
-	//Already signup tenant user or pending user needed
-	if (tenantUser.isVerified || !toSignUp) {
-		return tenantUser;
-	}
-
-	const signupUserModel = await util.getSignupUserModel(email, 'Admin', fullName, password, context);
-	const signupResponse = await signupUser(signupUserModel, context);
-
-	if (signupResponse.status !== httpResponseStatusCodes.OK) {
-		throw new Error(`Failed to signup tenant user with email: ${email}\n${signupResponse}`);
-	}
-
-	tenantUser = await getTenantUserByEmail(projectId, email, context);
-	return tenantUser;
-};
-
-const removeAllTenantUsersFromProject = async (projectId, context) => {
-	const tenantsListInProjects = await getTenantUsersByProjectId(projectId, context);
-	for (const tenant of tenantsListInProjects) {
-		const deleteInviteResponse = await removeTenantUser(projectId, tenant.id, context);
-		expect(deleteInviteResponse.status, 'Failed to delete user invite').to.equal(httpResponseStatusCodes.OK);
-
-		const deleteUserResponse = await users.removeAllUserTraceFromDb(tenant.id, context);
-		expect(deleteUserResponse.status, 'Failed to completely delete user from DB').to.equal(httpResponseStatusCodes.NO_CONTENT);
-	}
-};
-
-module.exports = {
-	inviteTenantUser,
-	getTenantUsersByProjectId,
-	getOrCreateTenantUser,
-	getTenantsByAccountIdAndProjectId,
-	getTenantUserByEmail,
-	removeTenantUser,
-	removeAllTenantUsersFromProject
-};
+const { expect } = require('chai');
+
+const { getEnv } = require('../../../../../env');
+const httpResponseStatusCodes = require('../../../../../common/httpResponseStatusCodes.json');
+
+const { credentials } = getEnv();
+
+const { InviteTenantUserModel } = require('../../models/tenant.user.model');
+const { validateType } = require('../../../../../common/validations/typeValidations');
+const tenantAPI = require('./tenant.app.api');
+const util = require('../../utils/util');
+const users = require('../users.service');
+
+const inviteTenantUser = (projectId, invitedTenantUser, context) => {
+	validateType(invitedTenantUser, InviteTenantUserModel);
+	return tenantAPI.invite(projectId, invitedTenantUser, context);
+};
+
+const signupUser = (signupUserModel, context) => {
+	return tenantAPI.signupUser(signupUserModel, context);
+};
+
+const removeTenantUser = (projectId, tenantId, context) => {
+	return tenantAPI.removeTenantUser(projectId, tenantId, context);
+};
+
+const getTenantUsersByProjectId = async (projectId, context) => {
+	const tenantResponse = await tenantAPI.getTenantUsersByProjectId(projectId, context);
+
+	if (tenantResponse.status !== httpResponseStatusCodes.OK) {
+		throw new Error(`Failed to retrieve tenants users from project\n${tenantResponse.status}`);
+	}
+
+	return tenantResponse.data;
+};
+
+const getTenantsByAccountIdAndProjectId = async (accountId, projectId, context) => {
+	const tenantResponse = await tenantAPI.getTenantsByAccountIdAndProjectId(accountId, projectId, context);
+
+	if (tenantResponse.status !== httpResponseStatusCodes.OK) {
+		throw new Error(`Failed to retrieve tenants users from tenant account, accountId - ${accountId} response status - \n${tenantResponse.status}`);
+	}
+
+	return tenantResponse.data;
+};
+
+const getTenantUserByEmail = async (projectId, email, context) => {
+	const allTenants = await getTenantUsersByProjectId(projectId, context);
+
+	const tenant = allTenants.find(tenant => tenant.email === email);
+	return tenant;
+};
+
+const getOrCreateTenantUser = async (projectId, email, company, requestId, context, { fullName = 'Tenant User', password = credentials.strongPassword, toSignUp = true, expectError } = {}) => {
+	let tenantUser = await getTenantUserByEmail(projectId, email, context);
+
+	if (tenantUser && tenantUser.id && tenantUser.isVerified) {
+		return tenantUser;
+	}
+
+	const inviteUserModel = new InviteTenantUserModel(email, company, requestId);
+	const inviteResponse = await inviteTenantUser(projectId, inviteUserModel, context);
+
+	if (inviteResponse.status !== httpResponseStatusCodes.OK) {
+		if (expectError) {
+			return inviteResponse;
+		} else {
+			throw new Error(`Failed to invite tenant user with email: ${email}\n${inviteResponse}`);
+		}
+	}
+
+	tenantUser = await getTenantUserByEmail(projectId, email, context);
+
+	//Already signup tenant user or pending user needed
+	if (tenantUser.isVerified || !toSignUp) {
+		return tenantUser;
+	}
+
+	const signupUserModel = await util.getSignupUserModel(email, 'Admin', fullName, password, context);
+	const signupResponse = await signupUser(signupUserModel, context);
+
+	if (signupResponse.status !== httpResponseStatusCodes.OK) {
+		throw new Error(`Failed to signup tenant user with email: ${email}\n${signupResponse}`);
+	}
+
+	tenantUser = await getTenantUserByEmail(projectId, email, context);
+	return tenantUser;
+};
+
+const removeAllTenantUsersFromProject = async (projectId, context) => {
+	const tenantsListInProjects = await getTenantUsersByProjectId(projectId, context);
+	for (const tenant of tenantsListInProjects) {
+		const deleteInviteResponse = await removeTenantUser(projectId, tenant.id, context);
+		expect(deleteInviteResponse.status, 'Failed to delete user invite').to.equal(httpResponseStatusCodes.OK);
+
+		const deleteUserResponse = await users.removeAllUserTraceFromDb(tenant.id, context);
+		expect(deleteUserResponse.status, 'Failed to completely delete user from DB').to.equal(httpResponseStatusCodes.NO_CONTENT);
+	}
+};
+
+module.exports = {
+	inviteTenantUser,
+	getTenantUsersByProjectId,
+	getOrCreateTenantUser,
+	getTenantsByAccountIdAndProjectId,
+	getTenantUserByEmail,
+	removeTenantUser,
+	removeAllTenantUsersFromProject
+};

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

@@ -1,158 +1,158 @@
-const requests = require('../../../../common/requests/cookieAuth/requests');
-const internalRequests = require('../../../../common/requests/internalAuth/requests');
-const { backendUrl } = require('../../../../env').getEnv();
-
-const Endpoints = {
-	invite: `${backendUrl}/saas/project/team-member`,
-	editUserProjects: (accountId, userId) => `${backendUrl}/saas/accounts/${accountId}/users/${userId}/projects`,
-	editUserRole: userId => `${backendUrl}/secured/users/${userId}/change-role`,
-	editUserProfile: `${backendUrl}/saas/user/update`,
-	getByProjectId: projectId =>
-		`${backendUrl}/saas/project/${projectId}/team-members`,
-	getByEmail: email => `${backendUrl}/saas/integration-tests/user/by-email/${email}`,
-	getUserByEmailForAutoReplyEmails: email => `${backendUrl}/jcsc/user/by-email/${email}`,
-	getTeamMemberByEmail: (email, accountId) => `${backendUrl}/saas/team-member/account/${accountId}/email/${email}`,
-	getEnabledAndDisabledByEmail: email => `${backendUrl}/saas/user/automation/email/${email}`,
-	delete: userId => `${backendUrl}/saas/users/${userId}`,
-	getUserListByRecordId: recordId => `${backendUrl}/saas/users/record/${recordId}`,
-	reinvite: `${backendUrl}/saas/project/team-member/reinvite`,
-	getUserEncryptedData: (email, userRole) => `${backendUrl}/saas/team-member/email/${email}/role/${userRole}/signup-data`,
-	signupUser: `${backendUrl}/_saas/guests/signup`,
-	removeAllUserTraceFromDb: userId => `${backendUrl}/saas/user/automation/${userId}`,
-	userEmailNotificationsSettings: `${backendUrl}/saas/account/notification/set`,
-	requestPasswordReset: `${backendUrl}/_saas/forgotPassword`,
-	verifyResetLink: `${backendUrl}/reset-password/verify-link`,
-	backdateResetTokens: `${backendUrl}/saas/integration-tests/password-reset-tokens/offset`,
-	getResetTokens: `${backendUrl}/saas/integration-tests/password-reset-tokens`,
-	createInnerSystemUser: `${backendUrl}/saas/superuser/user`,
-	getInnerSystemUsersPerRole: `${backendUrl}/saas/users`,
-	deactivateInnerSystemUser: userId => `${backendUrl}/saas/user/deactivate/${userId}`,
-	activateInnerSystemUser: userId => `${backendUrl}/saas/user/activate/${userId}`
-};
-
-const invite = (invitedUser, context, { disableSendMail = true } = {}) => {
-	return requests.putRequestHandler(Endpoints.invite, invitedUser, context, {}, { disableSendMail });
-};
-
-const signupUser = (signupUserModel, context) => {
-	return requests.postRequestHandler(Endpoints.signupUser, signupUserModel, context, {}, {});
-};
-
-const editUserRole = (userId, data, context) => {
-	return requests.patchRequestHandler(Endpoints.editUserRole(userId), context, data);
-};
-
-const getUsersByProjectId = (projectId, context) => {
-	return requests.getRequestHandler(Endpoints.getByProjectId(projectId), null, context);
-};
-
-const getUserByEmail = (email, context) => {
-	return requests.getRequestHandler(Endpoints.getByEmail(email), null, context);
-};
-
-const getUserByEmailForAutoReplyEmails = email => {
-	return internalRequests.getRequestHandler(Endpoints.getUserByEmailForAutoReplyEmails(email));
-};
-
-const getTeamMemberByEmail = (email, accountId, context) => {
-	return requests.getRequestHandler(Endpoints.getTeamMemberByEmail(email, accountId), null, context);
-};
-
-const getEnabledAndDisabledByEmail = (email, context) => {
-	return requests.getRequestHandler(Endpoints.getEnabledAndDisabledByEmail(email), null, context);
-};
-
-const getUserEncryptedData = (email, role, context) => {
-	return requests.getRequestHandler(Endpoints.getUserEncryptedData(email, role), null, context);
-};
-
-const deleteUser = (userId, context) => {
-	return requests.deleteRequestHandler(Endpoints.delete(userId), context);
-};
-
-const editUserProjects = (accountId, userId, addedProjectIds, removedProjectIds, context, { hasCompleteAccessPermission = false } = {}) => {
-	const body = { addedProjectIds, removedProjectIds, hasCompleteAccessPermission };
-	return requests.patchRequestHandler(Endpoints.editUserProjects(accountId, userId), context, body);
-};
-
-const removeAllUserTraceFromDb = (userId, context) => {
-	return requests.deleteRequestHandler(Endpoints.removeAllUserTraceFromDb(userId), context);
-};
-
-const reinviteUser = (userId, context) => {
-	const params = { id: userId };
-	return requests.postRequestHandler(Endpoints.reinvite, {}, context, {}, params);
-};
-
-const editUserEmailNotificationsSettings = (notificationSettingsModel, context) => {
-	return requests.postRequestHandler(Endpoints.userEmailNotificationsSettings, notificationSettingsModel, context);
-};
-
-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 deactivateInnerSystemUser = (userId, icsContext) => {
-	return requests.deleteRequestHandler(Endpoints.deactivateInnerSystemUser(userId), icsContext);
-};
-
-const activateInnerSystemUser = (userId, icsContext) => {
-	return requests.postRequestHandler(Endpoints.activateInnerSystemUser(userId), null, icsContext);
-};
-
-const requestPasswordReset = userEmail => {
-	const body = { email: userEmail };
-	return requests.postRequestHandler(Endpoints.requestPasswordReset, body);
-};
-
-const verifyResetLink = rawToken => {
-	return requests.getRequestHandler(Endpoints.verifyResetLink, { data: rawToken });
-};
-
-const backdateResetTokens = (email, offsetInMinutes, context) => {
-	const body = { email, offsetInMinutes };
-	return requests.postRequestHandler(Endpoints.backdateResetTokens, body, context);
-};
-
-const getResetTokens = (email, context) => {
-	return requests.getRequestHandler(Endpoints.getResetTokens, { email }, context);
-};
-const editUserProfile = (editUserProfileModel, context) => {
-	return requests.postRequestHandler(Endpoints.editUserProfile, editUserProfileModel, context);
-};
-
-const getUserListByRecordId = (recordId, context, { searchTerm } = {}) => {
-	return requests.getRequestHandler(Endpoints.getUserListByRecordId(recordId), { searchTerm }, context);
-};
-
-module.exports = {
-	invite,
-	signupUser,
-	getUsersByProjectId,
-	getEnabledAndDisabledByEmail,
-	getUserByEmail,
-	getUserByEmailForAutoReplyEmails,
-	getTeamMemberByEmail,
-	getUserEncryptedData,
-	getUserListByRecordId,
-	deleteUser,
-	editUserProjects,
-	removeAllUserTraceFromDb,
-	editUserRole,
-	reinviteUser,
-	editUserEmailNotificationsSettings,
-	requestPasswordReset,
-	verifyResetLink,
-	backdateResetTokens,
-	getResetTokens,
-	createInnerSystemUser,
-	getInnerSystemUsersPerRole,
-	deactivateInnerSystemUser,
-	activateInnerSystemUser,
-	editUserProfile
-};
+const requests = require('../../../../common/requests/cookieAuth/requests');
+const internalRequests = require('../../../../common/requests/internalAuth/requests');
+const { backendUrl } = require('../../../../env').getEnv();
+
+const Endpoints = {
+	invite: `${backendUrl}/saas/project/team-member`,
+	editUserProjects: (accountId, userId) => `${backendUrl}/saas/accounts/${accountId}/users/${userId}/projects`,
+	editUserRole: userId => `${backendUrl}/secured/users/${userId}/change-role`,
+	editUserProfile: `${backendUrl}/saas/user/update`,
+	getByProjectId: projectId =>
+		`${backendUrl}/saas/project/${projectId}/team-members`,
+	getByEmail: email => `${backendUrl}/saas/integration-tests/user/by-email/${email}`,
+	getUserByEmailForAutoReplyEmails: email => `${backendUrl}/jcsc/user/by-email/${email}`,
+	getTeamMemberByEmail: (email, accountId) => `${backendUrl}/saas/team-member/account/${accountId}/email/${email}`,
+	getEnabledAndDisabledByEmail: email => `${backendUrl}/saas/user/automation/email/${email}`,
+	delete: userId => `${backendUrl}/saas/users/${userId}`,
+	getUserListByRecordId: recordId => `${backendUrl}/saas/users/record/${recordId}`,
+	reinvite: `${backendUrl}/saas/project/team-member/reinvite`,
+	getUserEncryptedData: (email, userRole) => `${backendUrl}/saas/team-member/email/${email}/role/${userRole}/signup-data`,
+	signupUser: `${backendUrl}/_saas/guests/signup`,
+	removeAllUserTraceFromDb: userId => `${backendUrl}/saas/user/automation/${userId}`,
+	userEmailNotificationsSettings: `${backendUrl}/saas/account/notification/set`,
+	requestPasswordReset: `${backendUrl}/_saas/forgotPassword`,
+	verifyResetLink: `${backendUrl}/reset-password/verify-link`,
+	backdateResetTokens: `${backendUrl}/saas/integration-tests/password-reset-tokens/offset`,
+	getResetTokens: `${backendUrl}/saas/integration-tests/password-reset-tokens`,
+	createInnerSystemUser: `${backendUrl}/saas/superuser/user`,
+	getInnerSystemUsersPerRole: `${backendUrl}/saas/users`,
+	deactivateInnerSystemUser: userId => `${backendUrl}/saas/user/deactivate/${userId}`,
+	activateInnerSystemUser: userId => `${backendUrl}/saas/user/activate/${userId}`
+};
+
+const invite = (invitedUser, context, { disableSendMail = true } = {}) => {
+	return requests.putRequestHandler(Endpoints.invite, invitedUser, context, {}, { disableSendMail });
+};
+
+const signupUser = (signupUserModel, context) => {
+	return requests.postRequestHandler(Endpoints.signupUser, signupUserModel, context, {}, {});
+};
+
+const editUserRole = (userId, data, context) => {
+	return requests.patchRequestHandler(Endpoints.editUserRole(userId), context, data);
+};
+
+const getUsersByProjectId = (projectId, context) => {
+	return requests.getRequestHandler(Endpoints.getByProjectId(projectId), null, context);
+};
+
+const getUserByEmail = (email, context) => {
+	return requests.getRequestHandler(Endpoints.getByEmail(email), null, context);
+};
+
+const getUserByEmailForAutoReplyEmails = email => {
+	return internalRequests.getRequestHandler(Endpoints.getUserByEmailForAutoReplyEmails(email));
+};
+
+const getTeamMemberByEmail = (email, accountId, context) => {
+	return requests.getRequestHandler(Endpoints.getTeamMemberByEmail(email, accountId), null, context);
+};
+
+const getEnabledAndDisabledByEmail = (email, context) => {
+	return requests.getRequestHandler(Endpoints.getEnabledAndDisabledByEmail(email), null, context);
+};
+
+const getUserEncryptedData = (email, role, context) => {
+	return requests.getRequestHandler(Endpoints.getUserEncryptedData(email, role), null, context);
+};
+
+const deleteUser = (userId, context) => {
+	return requests.deleteRequestHandler(Endpoints.delete(userId), context);
+};
+
+const editUserProjects = (accountId, userId, addedProjectIds, removedProjectIds, context, { hasCompleteAccessPermission = false } = {}) => {
+	const body = { addedProjectIds, removedProjectIds, hasCompleteAccessPermission };
+	return requests.patchRequestHandler(Endpoints.editUserProjects(accountId, userId), context, body);
+};
+
+const removeAllUserTraceFromDb = (userId, context) => {
+	return requests.deleteRequestHandler(Endpoints.removeAllUserTraceFromDb(userId), context);
+};
+
+const reinviteUser = (userId, context) => {
+	const params = { id: userId };
+	return requests.postRequestHandler(Endpoints.reinvite, {}, context, {}, params);
+};
+
+const editUserEmailNotificationsSettings = (notificationSettingsModel, context) => {
+	return requests.postRequestHandler(Endpoints.userEmailNotificationsSettings, notificationSettingsModel, context);
+};
+
+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 deactivateInnerSystemUser = (userId, icsContext) => {
+	return requests.deleteRequestHandler(Endpoints.deactivateInnerSystemUser(userId), icsContext);
+};
+
+const activateInnerSystemUser = (userId, icsContext) => {
+	return requests.postRequestHandler(Endpoints.activateInnerSystemUser(userId), null, icsContext);
+};
+
+const requestPasswordReset = userEmail => {
+	const body = { email: userEmail };
+	return requests.postRequestHandler(Endpoints.requestPasswordReset, body);
+};
+
+const verifyResetLink = rawToken => {
+	return requests.getRequestHandler(Endpoints.verifyResetLink, { data: rawToken });
+};
+
+const backdateResetTokens = (email, offsetInMinutes, context) => {
+	const body = { email, offsetInMinutes };
+	return requests.postRequestHandler(Endpoints.backdateResetTokens, body, context);
+};
+
+const getResetTokens = (email, context) => {
+	return requests.getRequestHandler(Endpoints.getResetTokens, { email }, context);
+};
+const editUserProfile = (editUserProfileModel, context) => {
+	return requests.postRequestHandler(Endpoints.editUserProfile, editUserProfileModel, context);
+};
+
+const getUserListByRecordId = (recordId, context, { searchTerm } = {}) => {
+	return requests.getRequestHandler(Endpoints.getUserListByRecordId(recordId), { searchTerm }, context);
+};
+
+module.exports = {
+	invite,
+	signupUser,
+	getUsersByProjectId,
+	getEnabledAndDisabledByEmail,
+	getUserByEmail,
+	getUserByEmailForAutoReplyEmails,
+	getTeamMemberByEmail,
+	getUserEncryptedData,
+	getUserListByRecordId,
+	deleteUser,
+	editUserProjects,
+	removeAllUserTraceFromDb,
+	editUserRole,
+	reinviteUser,
+	editUserEmailNotificationsSettings,
+	requestPasswordReset,
+	verifyResetLink,
+	backdateResetTokens,
+	getResetTokens,
+	createInnerSystemUser,
+	getInnerSystemUsersPerRole,
+	deactivateInnerSystemUser,
+	activateInnerSystemUser,
+	editUserProfile
+};