@getjones/test-infra 2.12.6 → 2.12.7

package/src/factory/users/users.js

@@ -1,77 +1,77 @@
-const { getEnv } = require('../../env');
-const httpResponseStatusCodes = require('../../common/httpResponseStatusCodes.json');
-
-const { credentials } = getEnv();
-
-const users = require('../../saas/internal-api/users');
-const { InviteUserModel } = users.models;
-
-const defaultsPassword = credentials.strongPassword;
-const roles = {
-	readOnly: 'Read-only User',
-	inviter: 'Inviter',
-	cm: 'Compliance Manager'
-};
-
-const inviteSaasUser = async (username, role, projectIds, context) => {
-	const userResponse = await users.services.getUserByEmail(username, context);
-
-	if (userResponse.data && userResponse.data.subuserId) {
-		return;
-	}
-
-	const inviteUserModel = new InviteUserModel(username, role, projectIds, context);
-	const inviteResponse = await users.services.inviteUser([inviteUserModel], context);
-
-	if (inviteResponse.status !== httpResponseStatusCodes.NO_CONTENT) {
-		throw new Error(`Failed to invite user with email: ${username}\n${inviteResponse}`);
-	}
-};
-
-const signupSaasUser = async (username, role, context) => {
-	const userResponse = await users.services.getUserByEmail(username, context);
-
-	//Already signup user
-	if (userResponse.data.isVerified) {
-		return;
-	}
-
-	const signupUserModel = await users.util.getSignupUserModel(username, role, role, defaultsPassword, context);
-	const signupResponse = await users.services.signupUser(signupUserModel, context);
-
-	if (signupResponse.status !== httpResponseStatusCodes.OK) {
-		throw new Error(`Failed to invite ${role} user with email: ${username}\n${signupResponse}`);
-	}
-};
-
-const prepareUser = async (username, role, projectIds, context, { signup = true } = {}) => {
-	await inviteSaasUser(username, role, projectIds, context);
-
-	signup && await signupSaasUser(username, role, context);
-
-	const userResponse = await users.services.getUserByEmail(username, context);
-
-	if (userResponse.status !== httpResponseStatusCodes.OK) {
-		throw new Error(`Failed to prepare ${role} user with email: ${username}\n${userResponse}`);
-	}
-
-	return userResponse.data;
-};
-
-const prepareComplianceManagerUser = (username, projectIds, context, { signup } = {}) => {
-	return prepareUser(username, roles.cm, projectIds, context, { signup });
-};
-
-const prepareInviterUser = (username, projectIds, context, { signup } = {}) => {
-	return prepareUser(username, roles.inviter, projectIds, context, { signup });
-};
-
-const prepareReadOnlyUser = (username, projectIds, context, { signup } = {}) => {
-	return prepareUser(username, roles.readOnly, projectIds, context, { signup });
-};
-
-module.exports = {
-	prepareComplianceManagerUser,
-	prepareInviterUser,
-	prepareReadOnlyUser
-};
+const { getEnv } = require('../../env');
+const httpResponseStatusCodes = require('../../common/httpResponseStatusCodes.json');
+
+const { credentials } = getEnv();
+
+const users = require('../../saas/internal-api/users');
+const { InviteUserModel } = users.models;
+
+const defaultsPassword = credentials.strongPassword;
+const roles = {
+	readOnly: 'Read-only User',
+	inviter: 'Inviter',
+	cm: 'Compliance Manager'
+};
+
+const inviteSaasUser = async (username, role, projectIds, context) => {
+	const userResponse = await users.services.getUserByEmail(username, context);
+
+	if (userResponse.data && userResponse.data.subuserId) {
+		return;
+	}
+
+	const inviteUserModel = new InviteUserModel(username, role, projectIds, context);
+	const inviteResponse = await users.services.inviteUser([inviteUserModel], context);
+
+	if (inviteResponse.status !== httpResponseStatusCodes.NO_CONTENT) {
+		throw new Error(`Failed to invite user with email: ${username}\n${inviteResponse}`);
+	}
+};
+
+const signupSaasUser = async (username, role, context) => {
+	const userResponse = await users.services.getUserByEmail(username, context);
+
+	//Already signup user
+	if (userResponse.data.isVerified) {
+		return;
+	}
+
+	const signupUserModel = await users.util.getSignupUserModel(username, role, role, defaultsPassword, context);
+	const signupResponse = await users.services.signupUser(signupUserModel, context);
+
+	if (signupResponse.status !== httpResponseStatusCodes.OK) {
+		throw new Error(`Failed to invite ${role} user with email: ${username}\n${signupResponse}`);
+	}
+};
+
+const prepareUser = async (username, role, projectIds, context, { signup = true } = {}) => {
+	await inviteSaasUser(username, role, projectIds, context);
+
+	signup && await signupSaasUser(username, role, context);
+
+	const userResponse = await users.services.getUserByEmail(username, context);
+
+	if (userResponse.status !== httpResponseStatusCodes.OK) {
+		throw new Error(`Failed to prepare ${role} user with email: ${username}\n${userResponse}`);
+	}
+
+	return userResponse.data;
+};
+
+const prepareComplianceManagerUser = (username, projectIds, context, { signup } = {}) => {
+	return prepareUser(username, roles.cm, projectIds, context, { signup });
+};
+
+const prepareInviterUser = (username, projectIds, context, { signup } = {}) => {
+	return prepareUser(username, roles.inviter, projectIds, context, { signup });
+};
+
+const prepareReadOnlyUser = (username, projectIds, context, { signup } = {}) => {
+	return prepareUser(username, roles.readOnly, projectIds, context, { signup });
+};
+
+module.exports = {
+	prepareComplianceManagerUser,
+	prepareInviterUser,
+	prepareReadOnlyUser
+};

package/src/index.js

@@ -1,91 +1,91 @@
-const env = require('./env');
-const init = conf => {
-	env.init(conf);
-	const internalAPI = getInternalAPI();
-	const openAPI = getOpenAPI();
-
-	return { internalAPI, openAPI };
-};
-
-const getInternalAPI = () => {
-	const factory = require('./factory');
-	const defaults = require('./defaults');
-	const auth = require('./saas/internal-api/auth');
-	const accounts = require('./saas/internal-api/accounts');
-
-	const projects = require('./saas/internal-api/projects');
-	const tabs = require('./saas/internal-api/tabs');
-
-	const requirements = require('./saas/internal-api/requirements');
-	const contractors = require('./saas/internal-api/contractors');
-	const requests = require('./saas/internal-api/requests');
-
-	const coi = require('./saas/internal-api/coi');
-	const compliance = require('./saas/internal-api/compliance');
-	const auditNotes = require('./saas/internal-api/auditNotes');
-	const auditCustomerRules = require('./saas/internal-api/auditCustomerRules');
-
-	const users = require('./saas/internal-api/users');
-
-	const reports = require('./saas/internal-api/reports');
-	const charts = require('./saas/internal-api/homepageCharts');
-	const dashboard = require('./saas/internal-api/dashboard');
-
-	const globalRecord = require('./saas/internal-api/globalRecord');
-	const vendorProfile = require('./saas/internal-api/vendorProfile');
-	const serviceArea = require('./saas/internal-api/serviceArea');
-
-	const requestsTable = require('./saas/internal-api/requestsTable');
-
-	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 emailCustomization = require('./saas/internal-api/emailCustomization');
-
-	const internalAPI = {
-		defaults,
-		auth,
-		accounts,
-		projects,
-		tabs,
-		requirements,
-		contractors,
-		requests,
-		coi,
-		compliance,
-		auditNotes,
-		auditCustomerRules,
-		reports,
-		users,
-		charts,
-		dashboard,
-		globalRecord,
-		vendorProfile,
-		serviceArea,
-		requestsTable,
-		threadScheduler,
-		dbEmails,
-		emailCustomization,
-		factory,
-		agreement,
-		uploadFile
-	};
-
-	return internalAPI;
-};
-
-const getOpenAPI = () => {
-	const accounts = require('./saas/openapi/accounts/accounts.service');
-	const projects = require('./saas/openapi/projects/projects.service');
-	const tabs = require('./saas/openapi/tabs');
-	const requirements = require('./saas/openapi/requirements');
-	const requests = require('./saas/openapi/requests');
-	const coi = require('./saas/openapi/coi/coi.service');
-	const users = require('./saas/openapi/users/users.service');
-	const openAPI = { accounts, projects, tabs, requirements, requests, coi, users };
-	return openAPI;
-};
-
-module.exports = init;
+const env = require('./env');
+const init = conf => {
+	env.init(conf);
+	const internalAPI = getInternalAPI();
+	const openAPI = getOpenAPI();
+
+	return { internalAPI, openAPI };
+};
+
+const getInternalAPI = () => {
+	const factory = require('./factory');
+	const defaults = require('./defaults');
+	const auth = require('./saas/internal-api/auth');
+	const accounts = require('./saas/internal-api/accounts');
+
+	const projects = require('./saas/internal-api/projects');
+	const tabs = require('./saas/internal-api/tabs');
+
+	const requirements = require('./saas/internal-api/requirements');
+	const contractors = require('./saas/internal-api/contractors');
+	const requests = require('./saas/internal-api/requests');
+
+	const coi = require('./saas/internal-api/coi');
+	const compliance = require('./saas/internal-api/compliance');
+	const auditNotes = require('./saas/internal-api/auditNotes');
+	const auditCustomerRules = require('./saas/internal-api/auditCustomerRules');
+
+	const users = require('./saas/internal-api/users');
+
+	const reports = require('./saas/internal-api/reports');
+	const charts = require('./saas/internal-api/homepageCharts');
+	const dashboard = require('./saas/internal-api/dashboard');
+
+	const globalRecord = require('./saas/internal-api/globalRecord');
+	const vendorProfile = require('./saas/internal-api/vendorProfile');
+	const serviceArea = require('./saas/internal-api/serviceArea');
+
+	const requestsTable = require('./saas/internal-api/requestsTable');
+
+	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 emailCustomization = require('./saas/internal-api/emailCustomization');
+
+	const internalAPI = {
+		defaults,
+		auth,
+		accounts,
+		projects,
+		tabs,
+		requirements,
+		contractors,
+		requests,
+		coi,
+		compliance,
+		auditNotes,
+		auditCustomerRules,
+		reports,
+		users,
+		charts,
+		dashboard,
+		globalRecord,
+		vendorProfile,
+		serviceArea,
+		requestsTable,
+		threadScheduler,
+		dbEmails,
+		emailCustomization,
+		factory,
+		agreement,
+		uploadFile
+	};
+
+	return internalAPI;
+};
+
+const getOpenAPI = () => {
+	const accounts = require('./saas/openapi/accounts/accounts.service');
+	const projects = require('./saas/openapi/projects/projects.service');
+	const tabs = require('./saas/openapi/tabs');
+	const requirements = require('./saas/openapi/requirements');
+	const requests = require('./saas/openapi/requests');
+	const coi = require('./saas/openapi/coi/coi.service');
+	const users = require('./saas/openapi/users/users.service');
+	const openAPI = { accounts, projects, tabs, requirements, requests, coi, users };
+	return openAPI;
+};
+
+module.exports = init;

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

@@ -1,28 +1,35 @@
-const requests = require('../../../../../common/requests/cookieAuth/requests');
-const { backendUrl } = require('../../../../../env').getEnv();
-
-const Endpoints = {
-	getAccount: `${backendUrl}/saas/accounts`,
-	create: `${backendUrl}/saas/createaccount`,
-	delete: `${backendUrl}/saas/account`,
-	edit: accountId => `${backendUrl}/saas/account/${accountId}/settings`
-};
-
-const create = (account, context) => {
-	return requests.postRequestHandler(Endpoints.create, account, context);
-};
-
-const deleteAccount = (accountId, context) => {
-	return requests.deleteRequestHandler(Endpoints.delete, context, {}, { 'userId': accountId });
-};
-
-const updateAccountSettings = (accountId, settings, context) => {
-	return requests.putRequestHandler(Endpoints.edit(accountId), { accountId, ... settings }, context);
-};
-
-const getByName = (accountName, context) => {
-	const params = { name: accountName };
-	return requests.getRequestHandler(Endpoints.getAccount, params, context);
-};
-
-module.exports = { create, getByName, deleteAccount, updateAccountSettings };
+const requests = require('../../../../../common/requests/cookieAuth/requests');
+const internalRequests = require('../../../../../common/requests/internalAuth/requests');
+
+const { backendUrl } = require('../../../../../env').getEnv();
+
+const Endpoints = {
+	getAccount: `${backendUrl}/saas/accounts`,
+	create: `${backendUrl}/saas/createaccount`,
+	delete: `${backendUrl}/saas/account`,
+	edit: accountId => `${backendUrl}/saas/account/${accountId}/settings`,
+	getFromCertificateHolder: certificateHolder => `${backendUrl}/jcsc/account/certificate-holder-name/${certificateHolder}`
+};
+
+const create = (account, context) => {
+	return requests.postRequestHandler(Endpoints.create, account, context);
+};
+
+const deleteAccount = (accountId, context) => {
+	return requests.deleteRequestHandler(Endpoints.delete, context, {}, { 'userId': accountId });
+};
+
+const updateAccountSettings = (accountId, settings, context) => {
+	return requests.putRequestHandler(Endpoints.edit(accountId), { accountId, ... settings }, context);
+};
+
+const getByName = (accountName, context) => {
+	const params = { name: accountName };
+	return requests.getRequestHandler(Endpoints.getAccount, params, context);
+};
+
+const getFromCertificateHolder = certificateHolder => {
+	return internalRequests.getRequestHandler(Endpoints.getFromCertificateHolder(certificateHolder), {});
+};
+
+module.exports = { create, getByName, deleteAccount, updateAccountSettings, getFromCertificateHolder };

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

@@ -1,82 +1,93 @@
-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('../../../../../common/httpResponseStatusCodes.json');
-
-const { accountCreationSecret } = env.getEnv();
-
-const createAccount = async (createAccountModel, context) => {
-	validateType(createAccountModel, CreateAccountModel);
-
-	env.requiredValidation({
-		accountCreationSecret: accountCreationSecret,
-		'credentials.strongPassword': createAccountModel.password
-	});
-
-	return accountsAPI.create(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);
-
-	const existingAccounts = response.data;
-
-	if (!existingAccounts || !existingAccounts.length) {
-		return null;
-	}
-
-	if (existingAccounts.length > 1) {
-		throw new Error(`Got more than one account with the name: ${accountName}. IDs: ${existingAccounts.map(item => item.userId).join(', ')}`);
-	}
-
-	return existingAccounts[0];
-};
-
-const getOrCreateAccount = async (createAccountModel, context) => {
-	validateType(createAccountModel, CreateAccountModel);
-	const existingAccount = await getAccount(createAccountModel.companyName, context);
-
-	if (existingAccount) {
-		return existingAccount;
-	}
-
-	const response = await accountsAPI.create(createAccountModel, context);
-
-	if (!response.data) {
-		throw new Error(`Account by the name ${createAccountModel.companyName} was not created\n${response}`);
-	}
-
-	return response.data;
-};
-
-const getAccountId = async (accountName, context) => {
-	const account = await getAccount(accountName, context);
-
-	if (!account) {
-		console.error(`Account ${accountName} does not exist`);
-		return null;
-	}
-
-	return account.userId;
-};
-
-const deleteAccountByName = async (accountName, context) => {
-	const accountId = await getAccountId(accountName, context);
-	return accountsAPI.deleteAccount(accountId, context);
-};
-
-const deleteAccountById = async (accountId, context) => {
-	return accountsAPI.deleteAccount(accountId, context);
-};
-
-module.exports = {
-	getAccount,
-	getOrCreateAccount,
-	getAccountId,
-	createAccount,
-	deleteAccountByName,
-	deleteAccountById
-};
+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('../../../../../common/httpResponseStatusCodes.json');
+
+const { accountCreationSecret } = env.getEnv();
+
+const createAccount = async (createAccountModel, context) => {
+	validateType(createAccountModel, CreateAccountModel);
+
+	env.requiredValidation({
+		accountCreationSecret: accountCreationSecret,
+		'credentials.strongPassword': createAccountModel.password
+	});
+
+	return accountsAPI.create(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);
+
+	const existingAccounts = response.data;
+
+	if (!existingAccounts || !existingAccounts.length) {
+		return null;
+	}
+
+	if (existingAccounts.length > 1) {
+		throw new Error(`Got more than one account with the name: ${accountName}. IDs: ${existingAccounts.map(item => item.userId).join(', ')}`);
+	}
+
+	return existingAccounts[0];
+};
+
+const getOrCreateAccount = async (createAccountModel, context) => {
+	validateType(createAccountModel, CreateAccountModel);
+	const existingAccount = await getAccount(createAccountModel.companyName, context);
+
+	if (existingAccount) {
+		return existingAccount;
+	}
+
+	const response = await accountsAPI.create(createAccountModel, context);
+
+	if (!response.data) {
+		throw new Error(`Account by the name ${createAccountModel.companyName} was not created\n${response}`);
+	}
+
+	return response.data;
+};
+
+const getAccountId = async (accountName, context) => {
+	const account = await getAccount(accountName, context);
+
+	if (!account) {
+		console.error(`Account ${accountName} does not exist`);
+		return null;
+	}
+
+	return account.userId;
+};
+
+const deleteAccountByName = async (accountName, context) => {
+	const accountId = await getAccountId(accountName, context);
+	return accountsAPI.deleteAccount(accountId, context);
+};
+
+const deleteAccountById = async (accountId, context) => {
+	return accountsAPI.deleteAccount(accountId, context);
+};
+
+const getFromCertificateHolder = async certificateHolder => {
+	const response = await accountsAPI.getFromCertificateHolder(certificateHolder);
+
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Failed to get account by certificate holder: ${certificateHolder} - Response: ${response.status}`);
+	}
+
+	return response.data;
+};
+
+module.exports = {
+	getAccount,
+	getOrCreateAccount,
+	getAccountId,
+	createAccount,
+	deleteAccountByName,
+	deleteAccountById,
+	getFromCertificateHolder
+};