@things-factory/auth-base 5.0.0-alpha.5 → 5.0.0-alpha.52
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/dist-server/migrations/1548206416130-SeedUser.js +3 -3
- package/dist-server/migrations/1548206416130-SeedUser.js.map +1 -1
- package/dist-server/migrations/1566805283882-SeedPrivilege.js +2 -1
- package/dist-server/migrations/1566805283882-SeedPrivilege.js.map +1 -1
- package/dist-server/router/oauth2/oauth2-server.js +10 -9
- package/dist-server/router/oauth2/oauth2-server.js.map +1 -1
- package/dist-server/service/app-binding/app-binding-query.js +4 -4
- package/dist-server/service/app-binding/app-binding-query.js.map +1 -1
- package/dist-server/service/appliance/appliance-mutation.js +2 -5
- package/dist-server/service/appliance/appliance-mutation.js.map +1 -1
- package/dist-server/service/partner/partner-query.js +4 -4
- package/dist-server/service/partner/partner-query.js.map +1 -1
- package/dist-server/service/privilege/privilege-query.js +2 -2
- package/dist-server/service/privilege/privilege-query.js.map +1 -1
- package/package.json +8 -9
- package/server/migrations/1548206416130-SeedUser.ts +5 -3
- package/server/migrations/1566805283882-SeedPrivilege.ts +4 -1
- package/server/router/oauth2/oauth2-server.ts +12 -11
- package/server/service/app-binding/app-binding-query.ts +7 -5
- package/server/service/appliance/appliance-mutation.ts +6 -4
- package/server/service/partner/partner-query.ts +8 -6
- package/server/service/privilege/privilege-query.ts +6 -4
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SeedUsers1548206416130 = void 0;
|
|
4
|
-
const shell_1 = require("@things-factory/shell");
|
|
5
|
-
const env_1 = require("@things-factory/env");
|
|
6
4
|
const typeorm_1 = require("typeorm");
|
|
5
|
+
const env_1 = require("@things-factory/env");
|
|
6
|
+
const shell_1 = require("@things-factory/shell");
|
|
7
7
|
const user_1 = require("../service/user/user");
|
|
8
8
|
const ADMIN_ACCOUNT = env_1.config.get('adminAccount', {
|
|
9
9
|
name: 'Admin',
|
|
@@ -28,7 +28,7 @@ class SeedUsers1548206416130 {
|
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
30
|
catch (e) {
|
|
31
|
-
|
|
31
|
+
env_1.logger.error(e);
|
|
32
32
|
}
|
|
33
33
|
const admin = await userRepository.findOne({ where: { email: 'admin@hatiolab.com' } });
|
|
34
34
|
domain.owner = admin.id;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"1548206416130-SeedUser.js","sourceRoot":"","sources":["../../server/migrations/1548206416130-SeedUser.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"1548206416130-SeedUser.js","sourceRoot":"","sources":["../../server/migrations/1548206416130-SeedUser.ts"],"names":[],"mappings":";;;AAAA,qCAAwE;AAExE,6CAAoD;AACpD,iDAA8C;AAE9C,+CAAuD;AAEvD,MAAM,aAAa,GAAG,YAAM,CAAC,GAAG,CAAC,cAAc,EAAE;IAC/C,IAAI,EAAE,OAAO;IACb,KAAK,EAAE,oBAAoB;IAC3B,QAAQ,EAAE,OAAO;CAClB,CAAC,CAAA;AAEF,MAAM,UAAU,GAAG;oCAEZ,aAAa,KAChB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,iBAAU,CAAC,SAAS;CAE/B,CAAA;AACD,MAAa,sBAAsB;IAC1B,KAAK,CAAC,EAAE,CAAC,WAAwB;QACtC,MAAM,cAAc,GAAG,IAAA,uBAAa,EAAC,WAAI,CAAC,CAAA;QAC1C,MAAM,gBAAgB,GAAG,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAA;QAE9C,MAAM,MAAM,GAAW,MAAM,gBAAgB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAA;QAEpF,IAAI;YACF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC1C,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAA;gBAC1B,MAAM,IAAI,GAAG,WAAI,CAAC,YAAY,EAAE,CAAA;gBAChC,MAAM,QAAQ,GAAG,WAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;gBAEjD,MAAM,cAAc,CAAC,IAAI,iCACpB,IAAI,KACP,IAAI;oBACJ,QAAQ,EACR,OAAO,EAAE,CAAC,MAAM,CAAC,IACjB,CAAA;aACH;SACF;QAAC,OAAO,CAAC,EAAE;YACV,YAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;SAChB;QAED,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,oBAAoB,EAAE,EAAE,CAAC,CAAA;QACtF,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC,EAAE,CAAA;QAEvB,MAAM,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACrC,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,WAAwB;QACxC,MAAM,UAAU,GAAG,IAAA,uBAAa,EAAC,WAAI,CAAC,CAAA;QAEtC,UAAU,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,EAAC,IAAI,EAAC,EAAE;YACxC,IAAI,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAA;YAC5D,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QACjC,CAAC,CAAC,CAAA;IACJ,CAAC;CACF;AAtCD,wDAsCC"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SeedPrivilege1566805283882 = void 0;
|
|
4
4
|
const typeorm_1 = require("typeorm");
|
|
5
|
+
const env_1 = require("@things-factory/env");
|
|
5
6
|
const privilege_1 = require("../service/privilege/privilege");
|
|
6
7
|
class SeedPrivilege1566805283882 {
|
|
7
8
|
async up(queryRunner) {
|
|
@@ -17,7 +18,7 @@ class SeedPrivilege1566805283882 {
|
|
|
17
18
|
}
|
|
18
19
|
}
|
|
19
20
|
catch (e) {
|
|
20
|
-
|
|
21
|
+
env_1.logger.error(e);
|
|
21
22
|
}
|
|
22
23
|
}
|
|
23
24
|
async down(queryRunner) { }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"1566805283882-SeedPrivilege.js","sourceRoot":"","sources":["../../server/migrations/1566805283882-SeedPrivilege.ts"],"names":[],"mappings":";;;AAAA,qCAAwE;
|
|
1
|
+
{"version":3,"file":"1566805283882-SeedPrivilege.js","sourceRoot":"","sources":["../../server/migrations/1566805283882-SeedPrivilege.ts"],"names":[],"mappings":";;;AAAA,qCAAwE;AAExE,6CAA4C;AAE5C,8DAA0D;AAE1D,MAAa,0BAA0B;IAC9B,KAAK,CAAC,EAAE,CAAC,WAAwB;QACtC,MAAM,mBAAmB,GAAG,IAAA,uBAAa,EAAC,qBAAS,CAAC,CAAA;QAEpD,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,0CAA0C,CAAC,CAAA;QACtE,MAAM,MAAM,EAAE,CAAA;QACd,MAAM,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;QAExC,IAAI;YACF,KAAK,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,UAA8B,CAAC,EAAE;gBAC5E,IAAI,CAAC,IAAI,CAAC,MAAM,mBAAmB,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE;oBACzE,MAAM,mBAAmB,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;iBACnD;aACF;SACF;QAAC,OAAO,CAAC,EAAE;YACV,YAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;SAChB;IACH,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,WAAwB,IAAiB,CAAC;CAC7D;AApBD,gEAoBC"}
|
|
@@ -5,12 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.server = exports.NonClient = exports.NOTFOUND = void 0;
|
|
7
7
|
const oauth2orize_koa_1 = __importDefault(require("oauth2orize-koa"));
|
|
8
|
-
const v4_1 = __importDefault(require("uuid/v4"));
|
|
9
8
|
const typeorm_1 = require("typeorm");
|
|
9
|
+
const env_1 = require("@things-factory/env");
|
|
10
10
|
const shell_1 = require("@things-factory/shell");
|
|
11
|
+
const application_1 = require("../../service/application/application");
|
|
11
12
|
const role_1 = require("../../service/role/role");
|
|
12
13
|
const user_1 = require("../../service/user/user");
|
|
13
|
-
const
|
|
14
|
+
const crypto = require('crypto');
|
|
14
15
|
const debug = require('debug')('things-factory:auth-base:oauth2-server');
|
|
15
16
|
exports.NOTFOUND = 'NOTFOUND';
|
|
16
17
|
exports.NonClient = {
|
|
@@ -85,7 +86,7 @@ exports.server.exchange(oauth2orize_koa_1.default.exchange.code(async (client, c
|
|
|
85
86
|
debug('exchange code - application', application);
|
|
86
87
|
/* DONT-FORGET uncomment after test */
|
|
87
88
|
// if (redirectUrl !== application.redirectUrl && redirectUrl.indexOf(application.redirectUrl) != 0) {
|
|
88
|
-
//
|
|
89
|
+
// logger.error(
|
|
89
90
|
// 'oauth2 exchange error - redirectUrl should begins with the application setting',
|
|
90
91
|
// redirectUrl,
|
|
91
92
|
// application.redirectUrl
|
|
@@ -99,7 +100,7 @@ exports.server.exchange(oauth2orize_koa_1.default.exchange.code(async (client, c
|
|
|
99
100
|
subdomain
|
|
100
101
|
});
|
|
101
102
|
const creator = await (0, typeorm_1.getRepository)(user_1.User).findOne({ email });
|
|
102
|
-
const appuserEmail = `${
|
|
103
|
+
const appuserEmail = `${crypto.randomUUID()}@${subdomain}`;
|
|
103
104
|
var appuser = await (0, typeorm_1.getRepository)(user_1.User).findOne({
|
|
104
105
|
email: appuserEmail,
|
|
105
106
|
reference: application.id,
|
|
@@ -136,7 +137,7 @@ exports.server.exchange(oauth2orize_koa_1.default.exchange.refreshToken(async (c
|
|
|
136
137
|
debug('exchange refresh-token - decoded', decoded);
|
|
137
138
|
}
|
|
138
139
|
catch (e) {
|
|
139
|
-
|
|
140
|
+
env_1.logger.error(e);
|
|
140
141
|
return false;
|
|
141
142
|
}
|
|
142
143
|
const { id, userType, email, application: { appKey }, domain: { subdomain }, scope: originalScope, exp: expires_in } = decoded;
|
|
@@ -144,12 +145,12 @@ exports.server.exchange(oauth2orize_koa_1.default.exchange.refreshToken(async (c
|
|
|
144
145
|
appKey
|
|
145
146
|
});
|
|
146
147
|
if (!application) {
|
|
147
|
-
|
|
148
|
+
env_1.logger.error('application is not exist');
|
|
148
149
|
return false;
|
|
149
150
|
}
|
|
150
151
|
debug('exchange refresh-token - application', application === null || application === void 0 ? void 0 : application.name);
|
|
151
152
|
if (Date.now() > expires_in * 1000) {
|
|
152
|
-
|
|
153
|
+
env_1.logger.error('refresh token is expired');
|
|
153
154
|
return false;
|
|
154
155
|
}
|
|
155
156
|
const domain = await (0, typeorm_1.getRepository)(shell_1.Domain).findOne({
|
|
@@ -168,7 +169,7 @@ exports.server.exchange(oauth2orize_koa_1.default.exchange.refreshToken(async (c
|
|
|
168
169
|
relations: ['domain', 'creator', 'updater']
|
|
169
170
|
});
|
|
170
171
|
if (!appuser) {
|
|
171
|
-
|
|
172
|
+
env_1.logger.error('application is not bound');
|
|
172
173
|
return false;
|
|
173
174
|
}
|
|
174
175
|
/*
|
|
@@ -179,7 +180,7 @@ exports.server.exchange(oauth2orize_koa_1.default.exchange.refreshToken(async (c
|
|
|
179
180
|
const originalScopes = (originalScope || '').split(',');
|
|
180
181
|
const additionalScope = scopes.find(scope => originalScopes.indexOf(scope) === -1);
|
|
181
182
|
if (additionalScope) {
|
|
182
|
-
|
|
183
|
+
env_1.logger.error(`additional scope(${additionalScope}) required`);
|
|
183
184
|
return false;
|
|
184
185
|
}
|
|
185
186
|
const roles = await (0, typeorm_1.getRepository)(role_1.Role).find({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth2-server.js","sourceRoot":"","sources":["../../../server/router/oauth2/oauth2-server.ts"],"names":[],"mappings":";;;;;;AAAA,sEAAyC;
|
|
1
|
+
{"version":3,"file":"oauth2-server.js","sourceRoot":"","sources":["../../../server/router/oauth2/oauth2-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,13 +14,13 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
var _a;
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
16
|
exports.AppBindingQuery = void 0;
|
|
17
|
+
const type_graphql_1 = require("type-graphql");
|
|
17
18
|
const typeorm_1 = require("typeorm");
|
|
18
19
|
const shell_1 = require("@things-factory/shell");
|
|
19
|
-
const type_graphql_1 = require("type-graphql");
|
|
20
|
-
const app_binding_1 = require("./app-binding");
|
|
21
|
-
const user_1 = require("../user/user");
|
|
22
20
|
const get_domain_users_1 = require("../../utils/get-domain-users");
|
|
23
21
|
const application_1 = require("../application/application");
|
|
22
|
+
const user_1 = require("../user/user");
|
|
23
|
+
const app_binding_1 = require("./app-binding");
|
|
24
24
|
const app_binding_types_1 = require("./app-binding-types");
|
|
25
25
|
let AppBindingQuery = class AppBindingQuery {
|
|
26
26
|
async appBinding(id, context) {
|
|
@@ -34,7 +34,7 @@ let AppBindingQuery = class AppBindingQuery {
|
|
|
34
34
|
convertedParams.where = Object.assign(Object.assign({}, convertedParams.where), { userType: 'application' });
|
|
35
35
|
const alias = 'USER';
|
|
36
36
|
const qb = (0, get_domain_users_1.buildDomainUsersQueryBuilder)(domain.id, alias);
|
|
37
|
-
(0, shell_1.buildQuery)(qb, params, null, false);
|
|
37
|
+
(0, shell_1.buildQuery)(qb, params, null, { domainRef: false });
|
|
38
38
|
var [items] = await qb
|
|
39
39
|
// .leftJoinAndSelect(`${alias}.roles`, 'ROLES')
|
|
40
40
|
// .leftJoinAndSelect(`${alias}.creator`, 'CREATOR')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-binding-query.js","sourceRoot":"","sources":["../../../server/service/app-binding/app-binding-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA
|
|
1
|
+
{"version":3,"file":"app-binding-query.js","sourceRoot":"","sources":["../../../server/service/app-binding/app-binding-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,17 +11,14 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
12
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
13
|
};
|
|
14
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
15
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
16
|
-
};
|
|
17
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
15
|
exports.ApplianceMutation = void 0;
|
|
19
16
|
const type_graphql_1 = require("type-graphql");
|
|
20
17
|
const typeorm_1 = require("typeorm");
|
|
21
18
|
const user_1 = require("../user/user");
|
|
22
19
|
const appliance_1 = require("./appliance");
|
|
23
|
-
const v4_1 = __importDefault(require("uuid/v4"));
|
|
24
20
|
const appliance_types_1 = require("./appliance-types");
|
|
21
|
+
const crypto = require('crypto');
|
|
25
22
|
const debug = require('debug')('things-factory:auth-base:appliance');
|
|
26
23
|
let ApplianceMutation = class ApplianceMutation {
|
|
27
24
|
async createAppliance(appliance, context) {
|
|
@@ -41,7 +38,7 @@ let ApplianceMutation = class ApplianceMutation {
|
|
|
41
38
|
async generateApplianceSecret(id, context) {
|
|
42
39
|
const { domain, user } = context.state;
|
|
43
40
|
const appliance = await (0, typeorm_1.getRepository)(appliance_1.Appliance).findOne({ id, domain });
|
|
44
|
-
const appuserEmail = `${
|
|
41
|
+
const appuserEmail = `${crypto.randomUUID()}@${domain === null || domain === void 0 ? void 0 : domain.subdomain}`;
|
|
45
42
|
let appuser = await (0, typeorm_1.getRepository)(user_1.User).findOne({
|
|
46
43
|
where: {
|
|
47
44
|
reference: id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appliance-mutation.js","sourceRoot":"","sources":["../../../server/service/appliance/appliance-mutation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"appliance-mutation.js","sourceRoot":"","sources":["../../../server/service/appliance/appliance-mutation.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,13 +14,13 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
var _a, _b;
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
16
|
exports.PartnerQuery = void 0;
|
|
17
|
-
const partner_1 = require("./partner");
|
|
18
17
|
const type_graphql_1 = require("type-graphql");
|
|
19
|
-
const
|
|
18
|
+
const typeorm_1 = require("typeorm");
|
|
20
19
|
const shell_1 = require("@things-factory/shell");
|
|
21
20
|
const check_user_belongs_domain_1 = require("../../utils/check-user-belongs-domain");
|
|
22
|
-
const typeorm_1 = require("typeorm");
|
|
23
21
|
const user_1 = require("../user/user");
|
|
22
|
+
const partner_1 = require("./partner");
|
|
23
|
+
const partner_types_1 = require("./partner-types");
|
|
24
24
|
let PartnerQuery = class PartnerQuery {
|
|
25
25
|
async partners(params, context) {
|
|
26
26
|
if (await (0, check_user_belongs_domain_1.checkUserBelongsDomain)(context.state.domain, context.state.user)) {
|
|
@@ -48,7 +48,7 @@ let PartnerQuery = class PartnerQuery {
|
|
|
48
48
|
relations: ['partnerDomain']
|
|
49
49
|
});
|
|
50
50
|
const qb = (0, typeorm_1.getRepository)(shell_1.Domain).createQueryBuilder('DOMAIN');
|
|
51
|
-
(0, shell_1.buildQuery)(qb, params, context, false);
|
|
51
|
+
(0, shell_1.buildQuery)(qb, params, context, { domainRef: false });
|
|
52
52
|
qb.andWhereInIds(partners.map((p) => p.partnerDomain.id));
|
|
53
53
|
const [items, total] = await qb.getManyAndCount();
|
|
54
54
|
return { items, total };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"partner-query.js","sourceRoot":"","sources":["../../../server/service/partner/partner-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA
|
|
1
|
+
{"version":3,"file":"partner-query.js","sourceRoot":"","sources":["../../../server/service/partner/partner-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,8 +17,8 @@ exports.PrivilegeQuery = void 0;
|
|
|
17
17
|
const type_graphql_1 = require("type-graphql");
|
|
18
18
|
const typeorm_1 = require("typeorm");
|
|
19
19
|
const shell_1 = require("@things-factory/shell");
|
|
20
|
-
const user_1 = require("../user/user");
|
|
21
20
|
const role_1 = require("../role/role");
|
|
21
|
+
const user_1 = require("../user/user");
|
|
22
22
|
const privilege_1 = require("./privilege");
|
|
23
23
|
const privilege_types_1 = require("./privilege-types");
|
|
24
24
|
let PrivilegeQuery = class PrivilegeQuery {
|
|
@@ -29,7 +29,7 @@ let PrivilegeQuery = class PrivilegeQuery {
|
|
|
29
29
|
}
|
|
30
30
|
async privileges(params, context) {
|
|
31
31
|
const queryBuilder = (0, typeorm_1.getRepository)(privilege_1.Privilege).createQueryBuilder();
|
|
32
|
-
(0, shell_1.buildQuery)(queryBuilder, params, context, false);
|
|
32
|
+
(0, shell_1.buildQuery)(queryBuilder, params, context, { domainRef: false });
|
|
33
33
|
const [items, total] = await queryBuilder.getManyAndCount();
|
|
34
34
|
return { items, total };
|
|
35
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"privilege-query.js","sourceRoot":"","sources":["../../../server/service/privilege/privilege-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAAmF;AACnF,qCAAuC;
|
|
1
|
+
{"version":3,"file":"privilege-query.js","sourceRoot":"","sources":["../../../server/service/privilege/privilege-query.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/auth-base",
|
|
3
|
-
"version": "5.0.0-alpha.
|
|
3
|
+
"version": "5.0.0-alpha.52",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -27,19 +27,18 @@
|
|
|
27
27
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@things-factory/email-base": "^5.0.0-alpha.
|
|
31
|
-
"@things-factory/env": "^5.0.0-alpha.
|
|
32
|
-
"@things-factory/i18n-base": "^5.0.0-alpha.
|
|
33
|
-
"@things-factory/shell": "^5.0.0-alpha.
|
|
34
|
-
"@things-factory/utils": "^5.0.0-alpha.
|
|
30
|
+
"@things-factory/email-base": "^5.0.0-alpha.52",
|
|
31
|
+
"@things-factory/env": "^5.0.0-alpha.52",
|
|
32
|
+
"@things-factory/i18n-base": "^5.0.0-alpha.52",
|
|
33
|
+
"@things-factory/shell": "^5.0.0-alpha.52",
|
|
34
|
+
"@things-factory/utils": "^5.0.0-alpha.52",
|
|
35
35
|
"jsonwebtoken": "^8.5.1",
|
|
36
36
|
"koa-passport": "^4.1.4",
|
|
37
37
|
"koa-session": "^6.0.0",
|
|
38
38
|
"oauth2orize-koa": "^1.3.2",
|
|
39
39
|
"passport": "^0.4.1",
|
|
40
40
|
"passport-jwt": "^4.0.0",
|
|
41
|
-
"passport-local": "^1.0.0"
|
|
42
|
-
"uuid": "^3.4.0"
|
|
41
|
+
"passport-local": "^1.0.0"
|
|
43
42
|
},
|
|
44
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "dd9c8f2e256e256e42bd9bd26db5eaa955f85620"
|
|
45
44
|
}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
-
import { Domain } from '@things-factory/shell'
|
|
2
|
-
import { config } from '@things-factory/env'
|
|
3
1
|
import { getRepository, MigrationInterface, QueryRunner } from 'typeorm'
|
|
2
|
+
|
|
3
|
+
import { config, logger } from '@things-factory/env'
|
|
4
|
+
import { Domain } from '@things-factory/shell'
|
|
5
|
+
|
|
4
6
|
import { User, UserStatus } from '../service/user/user'
|
|
5
7
|
|
|
6
8
|
const ADMIN_ACCOUNT = config.get('adminAccount', {
|
|
@@ -37,7 +39,7 @@ export class SeedUsers1548206416130 implements MigrationInterface {
|
|
|
37
39
|
})
|
|
38
40
|
}
|
|
39
41
|
} catch (e) {
|
|
40
|
-
|
|
42
|
+
logger.error(e)
|
|
41
43
|
}
|
|
42
44
|
|
|
43
45
|
const admin = await userRepository.findOne({ where: { email: 'admin@hatiolab.com' } })
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
import { getRepository, MigrationInterface, QueryRunner } from 'typeorm'
|
|
2
|
+
|
|
3
|
+
import { logger } from '@things-factory/env'
|
|
4
|
+
|
|
2
5
|
import { Privilege } from '../service/privilege/privilege'
|
|
3
6
|
|
|
4
7
|
export class SeedPrivilege1566805283882 implements MigrationInterface {
|
|
@@ -16,7 +19,7 @@ export class SeedPrivilege1566805283882 implements MigrationInterface {
|
|
|
16
19
|
}
|
|
17
20
|
}
|
|
18
21
|
} catch (e) {
|
|
19
|
-
|
|
22
|
+
logger.error(e)
|
|
20
23
|
}
|
|
21
24
|
}
|
|
22
25
|
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import oauth2orize from 'oauth2orize-koa'
|
|
2
|
-
|
|
3
|
-
import uuidv4 from 'uuid/v4'
|
|
4
|
-
|
|
5
2
|
import { getRepository, In } from 'typeorm'
|
|
3
|
+
|
|
4
|
+
import { logger } from '@things-factory/env'
|
|
6
5
|
import { Domain } from '@things-factory/shell'
|
|
6
|
+
|
|
7
|
+
import { Application } from '../../service/application/application'
|
|
7
8
|
import { Role } from '../../service/role/role'
|
|
8
9
|
import { User, UserStatus } from '../../service/user/user'
|
|
9
|
-
import { Application } from '../../service/application/application'
|
|
10
10
|
|
|
11
|
+
const crypto = require('crypto')
|
|
11
12
|
const debug = require('debug')('things-factory:auth-base:oauth2-server')
|
|
12
13
|
|
|
13
14
|
export const NOTFOUND = 'NOTFOUND'
|
|
@@ -100,7 +101,7 @@ server.exchange(
|
|
|
100
101
|
|
|
101
102
|
/* DONT-FORGET uncomment after test */
|
|
102
103
|
// if (redirectUrl !== application.redirectUrl && redirectUrl.indexOf(application.redirectUrl) != 0) {
|
|
103
|
-
//
|
|
104
|
+
// logger.error(
|
|
104
105
|
// 'oauth2 exchange error - redirectUrl should begins with the application setting',
|
|
105
106
|
// redirectUrl,
|
|
106
107
|
// application.redirectUrl
|
|
@@ -117,7 +118,7 @@ server.exchange(
|
|
|
117
118
|
|
|
118
119
|
const creator: User = await getRepository(User).findOne({ email })
|
|
119
120
|
|
|
120
|
-
const appuserEmail = `${
|
|
121
|
+
const appuserEmail = `${crypto.randomUUID()}@${subdomain}`
|
|
121
122
|
|
|
122
123
|
var appuser: User = await getRepository(User).findOne(
|
|
123
124
|
{
|
|
@@ -180,7 +181,7 @@ server.exchange(
|
|
|
180
181
|
var decoded = Application.verifyAuthCode(refreshToken)
|
|
181
182
|
debug('exchange refresh-token - decoded', decoded)
|
|
182
183
|
} catch (e) {
|
|
183
|
-
|
|
184
|
+
logger.error(e)
|
|
184
185
|
return false
|
|
185
186
|
}
|
|
186
187
|
const {
|
|
@@ -198,14 +199,14 @@ server.exchange(
|
|
|
198
199
|
})
|
|
199
200
|
|
|
200
201
|
if (!application) {
|
|
201
|
-
|
|
202
|
+
logger.error('application is not exist')
|
|
202
203
|
return false
|
|
203
204
|
}
|
|
204
205
|
|
|
205
206
|
debug('exchange refresh-token - application', application?.name)
|
|
206
207
|
|
|
207
208
|
if (Date.now() > expires_in * 1000) {
|
|
208
|
-
|
|
209
|
+
logger.error('refresh token is expired')
|
|
209
210
|
return false
|
|
210
211
|
}
|
|
211
212
|
|
|
@@ -232,7 +233,7 @@ server.exchange(
|
|
|
232
233
|
)
|
|
233
234
|
|
|
234
235
|
if (!appuser) {
|
|
235
|
-
|
|
236
|
+
logger.error('application is not bound')
|
|
236
237
|
return false
|
|
237
238
|
}
|
|
238
239
|
|
|
@@ -246,7 +247,7 @@ server.exchange(
|
|
|
246
247
|
const originalScopes = (originalScope || '').split(',')
|
|
247
248
|
const additionalScope = scopes.find(scope => originalScopes.indexOf(scope) === -1)
|
|
248
249
|
if (additionalScope) {
|
|
249
|
-
|
|
250
|
+
logger.error(`additional scope(${additionalScope}) required`)
|
|
250
251
|
return false
|
|
251
252
|
}
|
|
252
253
|
|
|
@@ -1,12 +1,14 @@
|
|
|
1
|
+
import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
|
|
1
2
|
import { getRepository, SelectQueryBuilder } from 'typeorm'
|
|
3
|
+
|
|
2
4
|
import { buildQuery, convertListParams, ListParam } from '@things-factory/shell'
|
|
3
|
-
|
|
4
|
-
import { AppBinding } from './app-binding'
|
|
5
|
-
import { User } from '../user/user'
|
|
5
|
+
|
|
6
6
|
import { buildDomainUsersQueryBuilder } from '../../utils/get-domain-users'
|
|
7
7
|
import { Application } from '../application/application'
|
|
8
|
-
import {
|
|
8
|
+
import { User } from '../user/user'
|
|
9
9
|
import { UserList } from '../user/user-types'
|
|
10
|
+
import { AppBinding } from './app-binding'
|
|
11
|
+
import { AppBindingList } from './app-binding-types'
|
|
10
12
|
|
|
11
13
|
@Resolver(AppBinding)
|
|
12
14
|
export class AppBindingQuery {
|
|
@@ -30,7 +32,7 @@ export class AppBindingQuery {
|
|
|
30
32
|
|
|
31
33
|
const alias: string = 'USER'
|
|
32
34
|
const qb: SelectQueryBuilder<User> = buildDomainUsersQueryBuilder(domain.id, alias)
|
|
33
|
-
buildQuery(qb, params, null, false)
|
|
35
|
+
buildQuery(qb, params, null, { domainRef: false })
|
|
34
36
|
var [items] = await qb
|
|
35
37
|
// .leftJoinAndSelect(`${alias}.roles`, 'ROLES')
|
|
36
38
|
// .leftJoinAndSelect(`${alias}.creator`, 'CREATOR')
|
|
@@ -1,10 +1,12 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Arg, Ctx, Mutation, Resolver } from 'type-graphql'
|
|
2
2
|
import { getRepository } from 'typeorm'
|
|
3
|
+
|
|
3
4
|
import { User, UserStatus } from '../user/user'
|
|
4
5
|
import { Appliance } from './appliance'
|
|
5
|
-
|
|
6
|
-
import uuidv4 from 'uuid/v4'
|
|
7
6
|
import { AppliancePatch, NewAppliance } from './appliance-types'
|
|
7
|
+
|
|
8
|
+
const crypto = require('crypto')
|
|
9
|
+
|
|
8
10
|
const debug = require('debug')('things-factory:auth-base:appliance')
|
|
9
11
|
|
|
10
12
|
@Resolver(Appliance)
|
|
@@ -40,7 +42,7 @@ export class ApplianceMutation {
|
|
|
40
42
|
|
|
41
43
|
const appliance: Appliance = await getRepository(Appliance).findOne({ id, domain })
|
|
42
44
|
|
|
43
|
-
const appuserEmail = `${
|
|
45
|
+
const appuserEmail = `${crypto.randomUUID()}@${domain?.subdomain}`
|
|
44
46
|
let appuser: User = await getRepository(User).findOne({
|
|
45
47
|
where: {
|
|
46
48
|
reference: id,
|
|
@@ -1,10 +1,12 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { Resolver, Query, Ctx, Args, FieldResolver, Root, Directive } from 'type-graphql'
|
|
3
|
-
import { PartnerList } from './partner-types'
|
|
4
|
-
import { ListParam, buildQuery, Domain, DomainList } from '@things-factory/shell'
|
|
5
|
-
import { checkUserBelongsDomain } from '../../utils/check-user-belongs-domain'
|
|
1
|
+
import { Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
|
|
6
2
|
import { getRepository, SelectQueryBuilder } from 'typeorm'
|
|
3
|
+
|
|
4
|
+
import { buildQuery, Domain, DomainList, ListParam } from '@things-factory/shell'
|
|
5
|
+
|
|
6
|
+
import { checkUserBelongsDomain } from '../../utils/check-user-belongs-domain'
|
|
7
7
|
import { User } from '../user/user'
|
|
8
|
+
import { Partner } from './partner'
|
|
9
|
+
import { PartnerList } from './partner-types'
|
|
8
10
|
|
|
9
11
|
@Resolver(Partner)
|
|
10
12
|
export class PartnerQuery {
|
|
@@ -44,7 +46,7 @@ export class PartnerQuery {
|
|
|
44
46
|
})
|
|
45
47
|
|
|
46
48
|
const qb: SelectQueryBuilder<Domain> = getRepository(Domain).createQueryBuilder('DOMAIN')
|
|
47
|
-
buildQuery(qb, params, context, false)
|
|
49
|
+
buildQuery(qb, params, context, { domainRef: false })
|
|
48
50
|
qb.andWhereInIds(partners.map((p: Partner) => p.partnerDomain.id))
|
|
49
51
|
const [items, total] = await qb.getManyAndCount()
|
|
50
52
|
return { items, total }
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
|
|
2
2
|
import { getRepository } from 'typeorm'
|
|
3
|
-
|
|
4
|
-
import {
|
|
3
|
+
|
|
4
|
+
import { buildQuery, ListParam } from '@things-factory/shell'
|
|
5
|
+
|
|
5
6
|
import { Role } from '../role/role'
|
|
7
|
+
import { User } from '../user/user'
|
|
6
8
|
import { Privilege } from './privilege'
|
|
7
9
|
import { PrivilegeList } from './privilege-types'
|
|
8
10
|
|
|
@@ -18,7 +20,7 @@ export class PrivilegeQuery {
|
|
|
18
20
|
@Query(returns => PrivilegeList, { description: 'To fetch multiple privileges' })
|
|
19
21
|
async privileges(@Args() params: ListParam, @Ctx() context: any): Promise<PrivilegeList> {
|
|
20
22
|
const queryBuilder = getRepository(Privilege).createQueryBuilder()
|
|
21
|
-
buildQuery(queryBuilder, params, context, false)
|
|
23
|
+
buildQuery(queryBuilder, params, context, { domainRef: false })
|
|
22
24
|
|
|
23
25
|
const [items, total] = await queryBuilder.getManyAndCount()
|
|
24
26
|
|