@getjones/test-infra 1.8.0 → 1.8.1

package/package.json

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

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

@@ -38,7 +38,13 @@ const getOrCreateAccount = async (createAccountModel, context) => {
 		return existingAccount;
 	}
 
-	return createAccount(createAccountModel, context);
+	const response = await accountsAPI.create(createAccountModel, context);
+
+	if (!response.data) {
+		throw new Error(`Account by the name ${createAccountModel.companyName} did not crate`);
+	}
+
+	return response.data;
 };
 
 const getAccountId = async (accountName, context) => {

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

@@ -12,7 +12,8 @@ const Endpoints = {
 	deleteSingleProject: (userId, projectId) => `${backendUrl}/saas/project/${projectId}/sub-account/${userId}`,
 	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`
+	signupUser: `${backendUrl}/_saas/guests/signup`,
+	removeAllUserTraceFromDb: userId => `${backendUrl}/saas/user/automation/${userId}`
 };
 
 const invite = (invitedUser, context) => {
@@ -53,6 +54,10 @@ const deleteUserFromSingleProject = (userId, projectId, context) => {
 	return requests.deleteRequestHandler(Endpoints.deleteSingleProject(userId, projectId), context);
 };
 
+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);
@@ -66,6 +71,7 @@ module.exports = {
 	getUserEncryptedData,
 	deleteUser,
 	deleteUserFromSingleProject,
+	removeAllUserTraceFromDb,
 	editUserRole,
 	editUserProjects,
 	reinviteUser

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

@@ -35,7 +35,7 @@ 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.subuserId) {
+	if (userResponse.data && userResponse.data.subuserId && userResponse.data.isVerified) {
 		return userResponse.data;
 	}
 
@@ -72,6 +72,15 @@ const deleteUserFromSingleProject = (userId, projectId, context) => {
 	return userAPI.deleteUserFromSingleProject(userId, projectId, context);
 };
 
+const removeAllUserTraceFromDb = (userId, context) => {
+	return userAPI.removeAllUserTraceFromDb(userId, context);
+};
+
+const deleteUserByEmail = async (userEmail, context) => {
+	const { data: user } = await getUserByEmail(userEmail, context);
+	return deleteUser(user.subuserId, context);
+};
+
 const reinviteUser = (userId, context) => {
 	return userAPI.reinviteUser(userId, context);
 };
@@ -84,6 +93,8 @@ module.exports = {
 	getOrCreateUser,
 	deleteUser,
 	deleteUserFromSingleProject,
+	deleteUserByEmail,
+	removeAllUserTraceFromDb,
 	editUserRole,
 	editUserProjects,
 	reinviteUser

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

@@ -1,8 +1,4 @@
-const { EditUserModel } = require('./models/users.model');
-const coreModels = { EditUserModel };
-
-const models = { core: coreModels };
-
+const models = require('./models/users.model');
 const services = require('./api/users.service');
 
 module.exports = { services, models };