@things-factory/operato-hub 4.3.239 → 4.3.240
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/config.development.js +1 -1
- package/dist-server/routers/internal/apis/invite-user.js +20 -4
- package/dist-server/routers/internal/apis/invite-user.js.map +1 -1
- package/dist-server/routers/internal/apis/terminate-user.js +20 -4
- package/dist-server/routers/internal/apis/terminate-user.js.map +1 -1
- package/package.json +2 -2
- package/server/routers/internal/apis/invite-user.ts +24 -5
- package/server/routers/internal/apis/terminate-user.ts +26 -5
package/config.development.js
CHANGED
|
@@ -10,17 +10,33 @@ async function inviteUser(request, context, tx) {
|
|
|
10
10
|
if (!user) {
|
|
11
11
|
throw new error_util_1.ApiError('E04', `${userId} does not exist`);
|
|
12
12
|
}
|
|
13
|
+
let companyBizplace;
|
|
13
14
|
const bizplace = await tx
|
|
14
15
|
.getRepository(biz_base_1.Bizplace)
|
|
15
16
|
.findOne({ where: { id: bizplaceId }, relations: ['domain'] });
|
|
16
17
|
if (!bizplace) {
|
|
17
|
-
|
|
18
|
+
let company = await tx.getRepository(biz_base_1.Company).findOne(bizplaceId);
|
|
19
|
+
if (!company) {
|
|
20
|
+
throw new error_util_1.ApiError('E04', `${bizplaceId} does not exist`);
|
|
21
|
+
}
|
|
22
|
+
let qb = tx
|
|
23
|
+
.getRepository(biz_base_1.Bizplace)
|
|
24
|
+
.createQueryBuilder('bizplace')
|
|
25
|
+
.leftJoinAndSelect('bizplace.company', 'company')
|
|
26
|
+
.leftJoinAndSelect('bizplace.domain', 'domain')
|
|
27
|
+
.where('"domain"."ext_type" = :extType')
|
|
28
|
+
.andWhere('"company"."id" = :companyId')
|
|
29
|
+
.setParameters({ extType: 'company', companyId: company.id });
|
|
30
|
+
companyBizplace = await qb.getOne();
|
|
31
|
+
}
|
|
32
|
+
else {
|
|
33
|
+
companyBizplace = bizplace;
|
|
18
34
|
}
|
|
19
35
|
const existingDomains = user.domains;
|
|
20
|
-
if (existingDomains.find((d) => d.id ===
|
|
21
|
-
throw new error_util_1.ApiError('E04', `user already exists in ${
|
|
36
|
+
if (existingDomains.find((d) => d.id === companyBizplace.domain.id)) {
|
|
37
|
+
throw new error_util_1.ApiError('E04', `user already exists in ${companyBizplace.name}`);
|
|
22
38
|
}
|
|
23
|
-
user.domains = [...existingDomains,
|
|
39
|
+
user.domains = [...existingDomains, companyBizplace.domain];
|
|
24
40
|
await tx.getRepository(auth_base_1.User).save(user);
|
|
25
41
|
let data = {
|
|
26
42
|
bizplaceId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invite-user.js","sourceRoot":"","sources":["../../../../server/routers/internal/apis/invite-user.ts"],"names":[],"mappings":";;;AAAA,yDAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"invite-user.js","sourceRoot":"","sources":["../../../../server/routers/internal/apis/invite-user.ts"],"names":[],"mappings":";;;AAAA,yDAAgD;AAChD,uDAA4D;AAG5D,oDAA8C;AAEvC,KAAK,UAAU,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;IACnD,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,IAAI,CAAA;IAE3C,MAAM,IAAI,GAAS,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;IAE1G,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,GAAG,MAAM,iBAAiB,CAAC,CAAA;KACtD;IAED,IAAI,eAAyB,CAAA;IAE7B,MAAM,QAAQ,GAAa,MAAM,EAAE;SAChC,aAAa,CAAC,mBAAQ,CAAC;SACvB,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IAEhE,IAAI,CAAC,QAAQ,EAAE;QACb,IAAI,OAAO,GAAY,MAAM,EAAE,CAAC,aAAa,CAAC,kBAAO,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;QAE1E,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,GAAG,UAAU,iBAAiB,CAAC,CAAA;SAC1D;QAED,IAAI,EAAE,GAAG,EAAE;aACR,aAAa,CAAC,mBAAQ,CAAC;aACvB,kBAAkB,CAAC,UAAU,CAAC;aAC9B,iBAAiB,CAAC,kBAAkB,EAAE,SAAS,CAAC;aAChD,iBAAiB,CAAC,iBAAiB,EAAE,QAAQ,CAAC;aAC9C,KAAK,CAAC,gCAAgC,CAAC;aACvC,QAAQ,CAAC,6BAA6B,CAAC;aACvC,aAAa,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAA;QAE/D,eAAe,GAAG,MAAM,EAAE,CAAC,MAAM,EAAE,CAAA;KACpC;SAAM;QACL,eAAe,GAAG,QAAQ,CAAA;KAC3B;IAED,MAAM,eAAe,GAAa,IAAI,CAAC,OAAO,CAAA;IAC9C,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;QAC3E,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,0BAA0B,eAAe,CAAC,IAAI,EAAE,CAAC,CAAA;KAC5E;IAED,IAAI,CAAC,OAAO,GAAG,CAAC,GAAG,eAAe,EAAE,eAAe,CAAC,MAAM,CAAC,CAAA;IAC3D,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAEvC,IAAI,IAAI,GAAG;QACT,UAAU;QACV,MAAM;KACP,CAAA;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AAlDD,gCAkDC"}
|
|
@@ -12,20 +12,36 @@ async function terminateUser(request, context, tx) {
|
|
|
12
12
|
if (!user) {
|
|
13
13
|
throw new error_util_1.ApiError('E04', `${userId} does not exist`);
|
|
14
14
|
}
|
|
15
|
+
let companyBizplace;
|
|
15
16
|
const bizplace = await tx
|
|
16
17
|
.getRepository(biz_base_1.Bizplace)
|
|
17
18
|
.findOne({ where: { id: bizplaceId }, relations: ['domain'] });
|
|
18
19
|
if (!bizplace) {
|
|
19
|
-
|
|
20
|
+
let company = await tx.getRepository(biz_base_1.Company).findOne(bizplaceId);
|
|
21
|
+
if (!company) {
|
|
22
|
+
throw new error_util_1.ApiError('E04', `${bizplaceId} does not exist`);
|
|
23
|
+
}
|
|
24
|
+
let qb = tx
|
|
25
|
+
.getRepository(biz_base_1.Bizplace)
|
|
26
|
+
.createQueryBuilder('bizplace')
|
|
27
|
+
.leftJoinAndSelect('bizplace.company', 'company')
|
|
28
|
+
.leftJoinAndSelect('bizplace.domain', 'domain')
|
|
29
|
+
.where('"domain"."ext_type" = :extType')
|
|
30
|
+
.andWhere('"company"."id" = :companyId')
|
|
31
|
+
.setParameters({ extType: 'company', companyId: company.id });
|
|
32
|
+
companyBizplace = await qb.getOne();
|
|
20
33
|
}
|
|
21
|
-
|
|
34
|
+
else {
|
|
35
|
+
companyBizplace = bizplace;
|
|
36
|
+
}
|
|
37
|
+
const targetDomainIdx = user.domains.findIndex((userDomain) => userDomain.id === companyBizplace.domain.id);
|
|
22
38
|
if (targetDomainIdx < 0) {
|
|
23
|
-
throw new error_util_1.ApiError('E04', `${user.name} is not a member of ${
|
|
39
|
+
throw new error_util_1.ApiError('E04', `${user.name} is not a member of ${companyBizplace.name}`);
|
|
24
40
|
}
|
|
25
41
|
// Remove domain relation with user
|
|
26
42
|
user.domains.splice(targetDomainIdx, 1);
|
|
27
43
|
// Remove domain's roles that user has
|
|
28
|
-
user.roles = user.roles.filter((role) => role.domain.id !==
|
|
44
|
+
user.roles = user.roles.filter((role) => role.domain.id !== companyBizplace.domain.id);
|
|
29
45
|
await tx.getRepository(auth_base_1.User).save(user);
|
|
30
46
|
let data = {
|
|
31
47
|
userId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminate-user.js","sourceRoot":"","sources":["../../../../server/routers/internal/apis/terminate-user.ts"],"names":[],"mappings":";;;AAAA,yDAAsD;AACtD,
|
|
1
|
+
{"version":3,"file":"terminate-user.js","sourceRoot":"","sources":["../../../../server/routers/internal/apis/terminate-user.ts"],"names":[],"mappings":";;;AAAA,yDAAsD;AACtD,uDAA4D;AAG5D,oDAA8C;AAEvC,KAAK,UAAU,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;IACtD,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,IAAI,CAAA;IAE3C,MAAM,IAAI,GAAS,MAAM,EAAE;SACxB,aAAa,CAAC,gBAAI,CAAC;SACnB,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,cAAc,CAAC,EAAE,CAAC,CAAA;IAEtF,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,GAAG,MAAM,iBAAiB,CAAC,CAAA;KACtD;IAED,IAAI,eAAyB,CAAA;IAE7B,MAAM,QAAQ,GAAa,MAAM,EAAE;SAChC,aAAa,CAAC,mBAAQ,CAAC;SACvB,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IAEhE,IAAI,CAAC,QAAQ,EAAE;QACb,IAAI,OAAO,GAAY,MAAM,EAAE,CAAC,aAAa,CAAC,kBAAO,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;QAE1E,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,GAAG,UAAU,iBAAiB,CAAC,CAAA;SAC1D;QAED,IAAI,EAAE,GAAG,EAAE;aACR,aAAa,CAAC,mBAAQ,CAAC;aACvB,kBAAkB,CAAC,UAAU,CAAC;aAC9B,iBAAiB,CAAC,kBAAkB,EAAE,SAAS,CAAC;aAChD,iBAAiB,CAAC,iBAAiB,EAAE,QAAQ,CAAC;aAC9C,KAAK,CAAC,gCAAgC,CAAC;aACvC,QAAQ,CAAC,6BAA6B,CAAC;aACvC,aAAa,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAA;QAE/D,eAAe,GAAG,MAAM,EAAE,CAAC,MAAM,EAAE,CAAA;KACpC;SAAM;QACL,eAAe,GAAG,QAAQ,CAAA;KAC3B;IAED,MAAM,eAAe,GAAW,IAAI,CAAC,OAAO,CAAC,SAAS,CACpD,CAAC,UAAkB,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,eAAe,CAAC,MAAM,CAAC,EAAE,CACpE,CAAA;IACD,IAAI,eAAe,GAAG,CAAC,EAAE;QACvB,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,IAAI,uBAAuB,eAAe,CAAC,IAAI,EAAE,CAAC,CAAA;KACrF;IAED,mCAAmC;IACnC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC,CAAA;IAEvC,sCAAsC;IACtC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAU,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,KAAK,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAE5F,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAEvC,IAAI,IAAI,GAAG;QACT,MAAM;QACN,UAAU;KACX,CAAA;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AA3DD,sCA2DC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/operato-hub",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.240",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -120,5 +120,5 @@
|
|
|
120
120
|
"resolutions": {
|
|
121
121
|
"core-js": "^3.16.0"
|
|
122
122
|
},
|
|
123
|
-
"gitHead": "
|
|
123
|
+
"gitHead": "346622dbd9fd4824ad82a7ed6b50a8cec52e4e5d"
|
|
124
124
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { User } from '@things-factory/auth-base'
|
|
2
|
-
import { Bizplace } from '@things-factory/biz-base'
|
|
2
|
+
import { Bizplace, Company } from '@things-factory/biz-base'
|
|
3
3
|
import { Domain } from '@things-factory/shell'
|
|
4
4
|
|
|
5
5
|
import { ApiError } from '../utils/error-util'
|
|
@@ -13,20 +13,39 @@ export async function inviteUser(request, context, tx) {
|
|
|
13
13
|
throw new ApiError('E04', `${userId} does not exist`)
|
|
14
14
|
}
|
|
15
15
|
|
|
16
|
+
let companyBizplace: Bizplace
|
|
17
|
+
|
|
16
18
|
const bizplace: Bizplace = await tx
|
|
17
19
|
.getRepository(Bizplace)
|
|
18
20
|
.findOne({ where: { id: bizplaceId }, relations: ['domain'] })
|
|
19
21
|
|
|
20
22
|
if (!bizplace) {
|
|
21
|
-
|
|
23
|
+
let company: Company = await tx.getRepository(Company).findOne(bizplaceId)
|
|
24
|
+
|
|
25
|
+
if (!company) {
|
|
26
|
+
throw new ApiError('E04', `${bizplaceId} does not exist`)
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
let qb = tx
|
|
30
|
+
.getRepository(Bizplace)
|
|
31
|
+
.createQueryBuilder('bizplace')
|
|
32
|
+
.leftJoinAndSelect('bizplace.company', 'company')
|
|
33
|
+
.leftJoinAndSelect('bizplace.domain', 'domain')
|
|
34
|
+
.where('"domain"."ext_type" = :extType')
|
|
35
|
+
.andWhere('"company"."id" = :companyId')
|
|
36
|
+
.setParameters({ extType: 'company', companyId: company.id })
|
|
37
|
+
|
|
38
|
+
companyBizplace = await qb.getOne()
|
|
39
|
+
} else {
|
|
40
|
+
companyBizplace = bizplace
|
|
22
41
|
}
|
|
23
42
|
|
|
24
43
|
const existingDomains: Domain[] = user.domains
|
|
25
|
-
if (existingDomains.find((d: Domain) => d.id ===
|
|
26
|
-
throw new ApiError('E04', `user already exists in ${
|
|
44
|
+
if (existingDomains.find((d: Domain) => d.id === companyBizplace.domain.id)) {
|
|
45
|
+
throw new ApiError('E04', `user already exists in ${companyBizplace.name}`)
|
|
27
46
|
}
|
|
28
47
|
|
|
29
|
-
user.domains = [...existingDomains,
|
|
48
|
+
user.domains = [...existingDomains, companyBizplace.domain]
|
|
30
49
|
await tx.getRepository(User).save(user)
|
|
31
50
|
|
|
32
51
|
let data = {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Role, User } from '@things-factory/auth-base'
|
|
2
|
-
import { Bizplace } from '@things-factory/biz-base'
|
|
2
|
+
import { Bizplace, Company } from '@things-factory/biz-base'
|
|
3
3
|
import { Domain } from '@things-factory/shell'
|
|
4
4
|
|
|
5
5
|
import { ApiError } from '../utils/error-util'
|
|
@@ -15,24 +15,45 @@ export async function terminateUser(request, context, tx) {
|
|
|
15
15
|
throw new ApiError('E04', `${userId} does not exist`)
|
|
16
16
|
}
|
|
17
17
|
|
|
18
|
+
let companyBizplace: Bizplace
|
|
19
|
+
|
|
18
20
|
const bizplace: Bizplace = await tx
|
|
19
21
|
.getRepository(Bizplace)
|
|
20
22
|
.findOne({ where: { id: bizplaceId }, relations: ['domain'] })
|
|
21
23
|
|
|
22
24
|
if (!bizplace) {
|
|
23
|
-
|
|
25
|
+
let company: Company = await tx.getRepository(Company).findOne(bizplaceId)
|
|
26
|
+
|
|
27
|
+
if (!company) {
|
|
28
|
+
throw new ApiError('E04', `${bizplaceId} does not exist`)
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
let qb = tx
|
|
32
|
+
.getRepository(Bizplace)
|
|
33
|
+
.createQueryBuilder('bizplace')
|
|
34
|
+
.leftJoinAndSelect('bizplace.company', 'company')
|
|
35
|
+
.leftJoinAndSelect('bizplace.domain', 'domain')
|
|
36
|
+
.where('"domain"."ext_type" = :extType')
|
|
37
|
+
.andWhere('"company"."id" = :companyId')
|
|
38
|
+
.setParameters({ extType: 'company', companyId: company.id })
|
|
39
|
+
|
|
40
|
+
companyBizplace = await qb.getOne()
|
|
41
|
+
} else {
|
|
42
|
+
companyBizplace = bizplace
|
|
24
43
|
}
|
|
25
44
|
|
|
26
|
-
const targetDomainIdx: number = user.domains.findIndex(
|
|
45
|
+
const targetDomainIdx: number = user.domains.findIndex(
|
|
46
|
+
(userDomain: Domain) => userDomain.id === companyBizplace.domain.id
|
|
47
|
+
)
|
|
27
48
|
if (targetDomainIdx < 0) {
|
|
28
|
-
throw new ApiError('E04', `${user.name} is not a member of ${
|
|
49
|
+
throw new ApiError('E04', `${user.name} is not a member of ${companyBizplace.name}`)
|
|
29
50
|
}
|
|
30
51
|
|
|
31
52
|
// Remove domain relation with user
|
|
32
53
|
user.domains.splice(targetDomainIdx, 1)
|
|
33
54
|
|
|
34
55
|
// Remove domain's roles that user has
|
|
35
|
-
user.roles = user.roles.filter((role: Role) => role.domain.id !==
|
|
56
|
+
user.roles = user.roles.filter((role: Role) => role.domain.id !== companyBizplace.domain.id)
|
|
36
57
|
|
|
37
58
|
await tx.getRepository(User).save(user)
|
|
38
59
|
|