@getjones/test-infra 2.7.15 → 2.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/index.js +2 -4
- package/src/saas/internal-api/users/api/tenantApp/tenant.app.api.js +32 -0
- package/src/saas/internal-api/users/api/tenantApp/tenant.app.service.js +78 -0
- package/src/saas/internal-api/users/index.js +7 -1
- package/src/saas/internal-api/users/models/tenent.user.model.js +11 -0
- package/src/saas/openapi/tabs/tabs.api.js +3 -8
- package/src/saas/openapi/tabs/tabs.service.js +2 -6
- package/src/saas/internal-api/agreement/api/agreement.api.js +0 -22
- package/src/saas/internal-api/agreement/api/agreement.service.js +0 -17
- package/src/saas/internal-api/agreement/consts/consts.js +0 -8
- package/src/saas/internal-api/agreement/index.js +0 -11
- package/src/saas/internal-api/agreement/models/create.agreement.model.js +0 -12
- package/src/saas/openapi/tabs/index.js +0 -6
- package/src/saas/openapi/tabs/models/create.tab.model.js +0 -6
package/package.json
CHANGED
package/src/index.js
CHANGED
|
@@ -38,7 +38,6 @@ const getInternalAPI = () => {
|
|
|
38
38
|
|
|
39
39
|
const threadScheduler = require('./saas/internal-api/thread-scheduler/runner');
|
|
40
40
|
const dbEmails = require('./saas/internal-api/dbEmails/index');
|
|
41
|
-
const agreement = require('./saas/internal-api/agreement/index');
|
|
42
41
|
|
|
43
42
|
const internalAPI = {
|
|
44
43
|
defaults,
|
|
@@ -62,8 +61,7 @@ const getInternalAPI = () => {
|
|
|
62
61
|
requestsTable,
|
|
63
62
|
threadScheduler,
|
|
64
63
|
dbEmails,
|
|
65
|
-
factory
|
|
66
|
-
agreement
|
|
64
|
+
factory
|
|
67
65
|
};
|
|
68
66
|
|
|
69
67
|
return internalAPI;
|
|
@@ -72,7 +70,7 @@ const getInternalAPI = () => {
|
|
|
72
70
|
const getOpenAPI = () => {
|
|
73
71
|
const accounts = require('./saas/openapi/accounts/accounts.service');
|
|
74
72
|
const projects = require('./saas/openapi/projects/projects.service');
|
|
75
|
-
const tabs = require('./saas/openapi/tabs');
|
|
73
|
+
const tabs = require('./saas/openapi/tabs/tabs.service');
|
|
76
74
|
const requirements = require('./saas/openapi/requirements');
|
|
77
75
|
const requests = require('./saas/openapi/requests');
|
|
78
76
|
const coi = require('./saas/openapi/coi/coi.service');
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
const requests = require('../../../../../common/requests/cookieAuth/requests');
|
|
2
|
+
const { backendUrl } = require('../../../../../env').getEnv();
|
|
3
|
+
|
|
4
|
+
const Endpoints = {
|
|
5
|
+
invite: projectId => `${backendUrl}/saas/project/${projectId}/tenants`,
|
|
6
|
+
getTenantsByProjectId: projectId => `${backendUrl}/saas/project/${projectId}/tenants`,
|
|
7
|
+
signupUser: `${backendUrl}/_saas/guests/signup`,
|
|
8
|
+
removeTenantUser: (projectId, userId) => `${backendUrl}/saas/project/${projectId}/tenant/${userId}`
|
|
9
|
+
};
|
|
10
|
+
|
|
11
|
+
const invite = (projectId, invitedTenantUser, context) => {
|
|
12
|
+
return requests.putRequestHandler(Endpoints.invite(projectId), invitedTenantUser, context, {}, { disableSendMail });
|
|
13
|
+
};
|
|
14
|
+
|
|
15
|
+
const getTenantUsersByProjectId = (projectId, context) => {
|
|
16
|
+
return requests.getRequestHandler(Endpoints.getTenantsByProjectId(projectId), {}, context, {});
|
|
17
|
+
};
|
|
18
|
+
|
|
19
|
+
const signupUser = (signupUserModel, context) => {
|
|
20
|
+
return requests.postRequestHandler(Endpoints.signupUser, signupUserModel, context, {}, {});
|
|
21
|
+
};
|
|
22
|
+
|
|
23
|
+
const removeTenantUser = (projectId, tenantId, context) => {
|
|
24
|
+
return requests.deleteRequestHandler(Endpoints.removeTenantUser(projectId, tenantId), context);
|
|
25
|
+
};
|
|
26
|
+
|
|
27
|
+
module.exports = {
|
|
28
|
+
invite,
|
|
29
|
+
getTenantUsersByProjectId,
|
|
30
|
+
signupUser,
|
|
31
|
+
removeTenantUser
|
|
32
|
+
};
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
const { getEnv } = require('../../../../../env');
|
|
2
|
+
const httpResponseStatusCodes = require('../../../../../common/httpResponseStatusCodes.json');
|
|
3
|
+
|
|
4
|
+
const { credentials } = getEnv();
|
|
5
|
+
|
|
6
|
+
const { InviteTenantUserModel } = require('../../models/tenent.user.model');
|
|
7
|
+
const { validateType } = require('../../../../../common/validations/typeValidations');
|
|
8
|
+
const tenantAPI = require('./tenant.app.api');
|
|
9
|
+
const util = require('../../utils/util');
|
|
10
|
+
|
|
11
|
+
const inviteTenantUser = (projectId, invitedTenantUser, context) => {
|
|
12
|
+
validateType(invitedTenantUser, InviteTenantUserModel);
|
|
13
|
+
return tenantAPI.invite(projectId, invitedTenantUser, context);
|
|
14
|
+
};
|
|
15
|
+
|
|
16
|
+
const signupUser = (signupUserModel, context) => {
|
|
17
|
+
return tenantAPI.signupUser(signupUserModel, context);
|
|
18
|
+
};
|
|
19
|
+
|
|
20
|
+
const removeTenantUser = (projectId, tenantId, context) => {
|
|
21
|
+
return tenantAPI.removeTenantUser(projectId, tenantId, context);
|
|
22
|
+
};
|
|
23
|
+
|
|
24
|
+
const getTenantUsersByProjectId = async (projectId, context) => {
|
|
25
|
+
const tenantResponse = await tenantAPI.getTenantsUserByProjectId(projectId, context);
|
|
26
|
+
|
|
27
|
+
if (tenantResponse.status !== httpResponseStatusCodes.OK) {
|
|
28
|
+
throw new Error(`Failed to retrieve tenants users from project\n${tenantResponse.status}`);
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
return tenantResponse.data;
|
|
32
|
+
};
|
|
33
|
+
|
|
34
|
+
const getTenantUserByEmail = async (projectId, email, context) => {
|
|
35
|
+
const allTenants = await getTenantUsersByProjectId(projectId, context);
|
|
36
|
+
|
|
37
|
+
const tenant = allTenants.find(tenant => tenant.email === email);
|
|
38
|
+
return tenant;
|
|
39
|
+
};
|
|
40
|
+
|
|
41
|
+
const getOrCreateTenantUser = async (projectId, email, company, requestId, context, { fullName = 'Tenant User', password = credentials.strongPassword } = {}) => {
|
|
42
|
+
let tenantUser = await getTenantUserByEmail(projectId, email, context);
|
|
43
|
+
|
|
44
|
+
if (tenantUser && tenantUser.subuserId && tenantUser.isVerified) {
|
|
45
|
+
return tenantUser;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
const inviteUserModel = new InviteTenantUserModel(email, company, requestId);
|
|
49
|
+
const inviteResponse = await inviteTenantUser(projectId, inviteUserModel, context);
|
|
50
|
+
|
|
51
|
+
if (inviteResponse.status !== httpResponseStatusCodes.OK) {
|
|
52
|
+
throw new Error(`Failed to invite tenant user with email: ${email}\n${inviteResponse}`);
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
tenantUser = await getTenantUserByEmail(projectId, email, context);
|
|
56
|
+
|
|
57
|
+
//Already signup tenant user
|
|
58
|
+
if (tenantUser.isVerified) {
|
|
59
|
+
return tenantUser;
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
const signupUserModel = await util.getSignupUserModel(email, 'Admin', fullName, password, context);
|
|
63
|
+
const signupResponse = await signupUser(signupUserModel, context);
|
|
64
|
+
|
|
65
|
+
if (signupResponse.status !== httpResponseStatusCodes.OK) {
|
|
66
|
+
throw new Error(`Failed to signup tenant user with email: ${email}\n${signupResponse}`);
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
tenantUser = await getTenantUserByEmail(projectId, email, context);
|
|
70
|
+
return tenantUser;
|
|
71
|
+
};
|
|
72
|
+
|
|
73
|
+
module.exports = {
|
|
74
|
+
inviteTenantUser,
|
|
75
|
+
getTenantUsersByProjectId,
|
|
76
|
+
getOrCreateTenantUser,
|
|
77
|
+
removeTenantUser
|
|
78
|
+
};
|
|
@@ -2,4 +2,10 @@ const models = require('./models/users.model');
|
|
|
2
2
|
const services = require('./api/users.service');
|
|
3
3
|
const util = require('./utils/util');
|
|
4
4
|
|
|
5
|
-
|
|
5
|
+
const tenantUserService = require('./api/tenantApp/tenant.app.service');
|
|
6
|
+
|
|
7
|
+
const tenants = {
|
|
8
|
+
services: tenantUserService
|
|
9
|
+
};
|
|
10
|
+
|
|
11
|
+
module.exports = { services, models, util, tenants };
|
|
@@ -3,16 +3,11 @@ const { openapiUrl, backendUrl } = require('../../../env').getEnv();
|
|
|
3
3
|
|
|
4
4
|
const Endpoints = {
|
|
5
5
|
delete: tabId => `${openapiUrl}/tabs/${tabId}`,
|
|
6
|
-
get: tabId => `${backendUrl}/tabs/${tabId}
|
|
7
|
-
create: projectId => `${openapiUrl}/properties/${projectId}/tab`
|
|
6
|
+
get: tabId => `${backendUrl}/tabs/${tabId}`
|
|
8
7
|
};
|
|
9
8
|
|
|
10
|
-
const deleteTabById = (tabId, apiKey) => {
|
|
9
|
+
const deleteTabById = async (tabId, apiKey) => {
|
|
11
10
|
return requests.deleteRequestHandler(Endpoints.delete(tabId), apiKey);
|
|
12
11
|
};
|
|
13
12
|
|
|
14
|
-
|
|
15
|
-
return requests.postRequestHandler(Endpoints.create(projectId), apiKey, createTabModel);
|
|
16
|
-
};
|
|
17
|
-
|
|
18
|
-
module.exports = { deleteTabById, createTab };
|
|
13
|
+
module.exports = { deleteTabById };
|
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
const tabsApi = require('./tabs.api');
|
|
2
2
|
|
|
3
|
-
const deleteTabById = (tabId, apiKey) => {
|
|
3
|
+
const deleteTabById = async (tabId, apiKey) => {
|
|
4
4
|
return tabsApi.deleteTabById(tabId, apiKey);
|
|
5
5
|
};
|
|
6
6
|
|
|
7
|
-
|
|
8
|
-
return tabsApi.createTab(projectId, createTabModel, apiKey);
|
|
9
|
-
};
|
|
10
|
-
|
|
11
|
-
module.exports = { deleteTabById, createTab };
|
|
7
|
+
module.exports = { deleteTabById };
|
|
@@ -1,22 +0,0 @@
|
|
|
1
|
-
const requests = require('../../../../common/requests/cookieAuth/requests');
|
|
2
|
-
const { backendUrl } = require('../../../../env').getEnv();
|
|
3
|
-
|
|
4
|
-
const Endpoints = {
|
|
5
|
-
create: `${backendUrl}/saas/contractor/agreement`,
|
|
6
|
-
delete: `${backendUrl}/saas/contractor/agreement`
|
|
7
|
-
};
|
|
8
|
-
|
|
9
|
-
const createAgreement = (createAgreementModel, context) => {
|
|
10
|
-
return requests.postRequestHandler(Endpoints.create, createAgreementModel, context);
|
|
11
|
-
};
|
|
12
|
-
|
|
13
|
-
const deleteAgreement = (recordId, context) => {
|
|
14
|
-
const headers = {};
|
|
15
|
-
const params = { contractorId: recordId };
|
|
16
|
-
return requests.deleteRequestHandler(Endpoints.delete, context, headers, params);
|
|
17
|
-
};
|
|
18
|
-
|
|
19
|
-
module.exports = {
|
|
20
|
-
createAgreement,
|
|
21
|
-
deleteAgreement
|
|
22
|
-
};
|
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
const agreementAPI = require('./agreement.api');
|
|
2
|
-
const { CreateAgreementModel } = require('../models/create.agreement.model');
|
|
3
|
-
const { validateType } = require('../../../../common/validations/typeValidations');
|
|
4
|
-
|
|
5
|
-
const createAgreement = (createAgreementModel, context) => {
|
|
6
|
-
validateType(createAgreementModel, CreateAgreementModel);
|
|
7
|
-
return agreementAPI.createAgreement(createAgreementModel, context);
|
|
8
|
-
};
|
|
9
|
-
|
|
10
|
-
const deleteAgreement = (recordId, context) => {
|
|
11
|
-
return agreementAPI.deleteAgreement(recordId, context);
|
|
12
|
-
};
|
|
13
|
-
|
|
14
|
-
module.exports = {
|
|
15
|
-
createAgreement,
|
|
16
|
-
deleteAgreement
|
|
17
|
-
};
|
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
const createModel = require('./models/create.agreement.model');
|
|
2
|
-
const services = require('./api/agreement.service');
|
|
3
|
-
const agreementConsts = require('./consts/consts');
|
|
4
|
-
|
|
5
|
-
const models = { create: createModel };
|
|
6
|
-
|
|
7
|
-
const consts = {
|
|
8
|
-
audit: agreementConsts
|
|
9
|
-
};
|
|
10
|
-
|
|
11
|
-
module.exports = { services, models, consts };
|
|
@@ -1,12 +0,0 @@
|
|
|
1
|
-
const { UPLOADER_TYPE } = require('../consts/consts');
|
|
2
|
-
|
|
3
|
-
class CreateAgreementModel {
|
|
4
|
-
constructor({ contractorId, contractorDateModified, uploaderId, signedContractName, uploaderType = UPLOADER_TYPE.USER }) {
|
|
5
|
-
this.contractorId = contractorId;
|
|
6
|
-
this.contractorDateModified = contractorDateModified;
|
|
7
|
-
this.uploaderId = uploaderId;
|
|
8
|
-
this.signedContractName = signedContractName;
|
|
9
|
-
this.uploaderType = uploaderType;
|
|
10
|
-
}
|
|
11
|
-
}
|
|
12
|
-
module.exports = { CreateAgreementModel };
|