@things-factory/auth-base 4.0.0-y.0 → 4.0.5
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/service/appliance/appliance.js +10 -3
- package/dist-server/service/appliance/appliance.js.map +1 -1
- package/dist-server/service/application/application.js +13 -5
- package/dist-server/service/application/application.js.map +1 -1
- package/dist-server/service/index.js +25 -15
- package/dist-server/service/index.js.map +1 -1
- package/dist-server/service/user/user.js +12 -7
- package/dist-server/service/user/user.js.map +1 -1
- package/dist-server/utils/get-domain-users.js +2 -2
- package/dist-server/utils/get-domain-users.js.map +1 -1
- package/package.json +9 -8
- package/server/service/appliance/appliance.ts +16 -6
- package/server/service/application/application.ts +17 -6
- package/server/service/index.ts +26 -16
- package/server/service/user/user.ts +18 -11
- package/server/utils/get-domain-users.ts +3 -3
|
@@ -14,13 +14,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
var _a;
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
16
|
exports.Appliance = void 0;
|
|
17
|
-
const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
|
|
18
|
-
const shell_1 = require("@things-factory/shell");
|
|
19
17
|
const typeorm_1 = require("typeorm");
|
|
20
18
|
const type_graphql_1 = require("type-graphql");
|
|
21
19
|
const user_1 = require("../user/user");
|
|
20
|
+
const shell_1 = require("@things-factory/shell");
|
|
22
21
|
const get_secret_1 = require("../../utils/get-secret");
|
|
23
22
|
const env_1 = require("@things-factory/env");
|
|
23
|
+
const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
|
|
24
|
+
const ORMCONFIG = env_1.config.get('ormconfig', {});
|
|
25
|
+
const DATABASE_TYPE = ORMCONFIG.type;
|
|
24
26
|
let Appliance = class Appliance {
|
|
25
27
|
/* signing for jsonwebtoken */
|
|
26
28
|
static sign(subject, expiresIn, domain, user, appliance) {
|
|
@@ -98,7 +100,12 @@ __decorate([
|
|
|
98
100
|
], Appliance.prototype, "description", void 0);
|
|
99
101
|
__decorate([
|
|
100
102
|
(0, typeorm_1.Column)({
|
|
101
|
-
nullable: true
|
|
103
|
+
nullable: true,
|
|
104
|
+
type: DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
|
|
105
|
+
? 'longtext'
|
|
106
|
+
: DATABASE_TYPE == 'oracle'
|
|
107
|
+
? 'clob'
|
|
108
|
+
: 'varchar'
|
|
102
109
|
}),
|
|
103
110
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
104
111
|
__metadata("design:type", String)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appliance.js","sourceRoot":"","sources":["../../../server/service/appliance/appliance.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"appliance.js","sourceRoot":"","sources":["../../../server/service/appliance/appliance.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,13 +14,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
var _a;
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
16
|
exports.Application = exports.ApplicationStatus = void 0;
|
|
17
|
-
const shell_1 = require("@things-factory/shell");
|
|
18
|
-
const crypto_1 = __importDefault(require("crypto"));
|
|
19
|
-
const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
|
|
20
17
|
const typeorm_1 = require("typeorm");
|
|
21
18
|
const type_graphql_1 = require("type-graphql");
|
|
22
|
-
const get_secret_1 = require("../../utils/get-secret");
|
|
23
19
|
const user_1 = require("../user/user");
|
|
20
|
+
const shell_1 = require("@things-factory/shell");
|
|
21
|
+
const get_secret_1 = require("../../utils/get-secret");
|
|
22
|
+
const env_1 = require("@things-factory/env");
|
|
23
|
+
const crypto_1 = __importDefault(require("crypto"));
|
|
24
|
+
const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
|
|
25
|
+
const ORMCONFIG = env_1.config.get('ormconfig', {});
|
|
26
|
+
const DATABASE_TYPE = ORMCONFIG.type;
|
|
24
27
|
var ApplicationStatus;
|
|
25
28
|
(function (ApplicationStatus) {
|
|
26
29
|
ApplicationStatus["DRAFT"] = "DRAFT";
|
|
@@ -147,7 +150,12 @@ __decorate([
|
|
|
147
150
|
], Application.prototype, "appKey", void 0);
|
|
148
151
|
__decorate([
|
|
149
152
|
(0, typeorm_1.Column)({
|
|
150
|
-
nullable: true
|
|
153
|
+
nullable: true,
|
|
154
|
+
type: DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
|
|
155
|
+
? 'longtext'
|
|
156
|
+
: DATABASE_TYPE == 'oracle'
|
|
157
|
+
? 'clob'
|
|
158
|
+
: 'varchar'
|
|
151
159
|
}),
|
|
152
160
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
153
161
|
__metadata("design:type", String)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../server/service/application/application.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../server/service/application/application.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,21 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
11
11
|
};
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
exports.schema = exports.entities = void 0;
|
|
14
|
+
/* IMPORT ENTITIES AND RESOLVERS */
|
|
15
|
+
const app_binding_1 = require("./app-binding");
|
|
16
|
+
const appliance_1 = require("./appliance");
|
|
17
|
+
const application_1 = require("./application");
|
|
18
|
+
const domain_generator_1 = require("./domain-generator");
|
|
19
|
+
const granted_role_1 = require("./granted-role");
|
|
20
|
+
const invitation_1 = require("./invitation");
|
|
21
|
+
const login_history_1 = require("./login-history");
|
|
22
|
+
const partner_1 = require("./partner");
|
|
23
|
+
const password_history_1 = require("./password-history");
|
|
24
|
+
const privilege_1 = require("./privilege");
|
|
25
|
+
const privilege_directive_1 = require("./privilege/privilege-directive");
|
|
26
|
+
const role_1 = require("./role");
|
|
27
|
+
const user_1 = require("./user");
|
|
28
|
+
const verification_token_1 = require("./verification-token");
|
|
14
29
|
/* EXPORT ENTITY TYPES */
|
|
15
30
|
__exportStar(require("./application/application"), exports);
|
|
16
31
|
__exportStar(require("./appliance/appliance"), exports);
|
|
@@ -24,21 +39,16 @@ __exportStar(require("./app-binding/app-binding"), exports);
|
|
|
24
39
|
__exportStar(require("./password-history/password-history"), exports);
|
|
25
40
|
__exportStar(require("./verification-token/verification-token"), exports);
|
|
26
41
|
__exportStar(require("./login-history/login-history"), exports);
|
|
27
|
-
/*
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
const domain_generator_1 = require("./domain-generator");
|
|
38
|
-
const password_history_1 = require("./password-history");
|
|
39
|
-
const verification_token_1 = require("./verification-token");
|
|
40
|
-
const login_history_1 = require("./login-history");
|
|
41
|
-
const privilege_directive_1 = require("./privilege/privilege-directive");
|
|
42
|
+
/* EXPORT TYPES */
|
|
43
|
+
__exportStar(require("./app-binding/app-binding-types"), exports);
|
|
44
|
+
__exportStar(require("./appliance/appliance-types"), exports);
|
|
45
|
+
__exportStar(require("./application/application-types"), exports);
|
|
46
|
+
__exportStar(require("./domain-generator/domain-generator-types"), exports);
|
|
47
|
+
__exportStar(require("./invitation/invitation-types"), exports);
|
|
48
|
+
__exportStar(require("./partner/partner-types"), exports);
|
|
49
|
+
__exportStar(require("./privilege/privilege-types"), exports);
|
|
50
|
+
__exportStar(require("./role/role-types"), exports);
|
|
51
|
+
__exportStar(require("./user/user-types"), exports);
|
|
42
52
|
exports.entities = [
|
|
43
53
|
/* ENTITIES */
|
|
44
54
|
...application_1.entities,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/service/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,yBAAyB;AACzB,4DAAyC;AACzC,wDAAqC;AACrC,wDAAqC;AACrC,8CAA2B;AAC3B,8CAA2B;AAC3B,oDAAiC;AACjC,8DAA2C;AAC3C,0DAAuC;AACvC,4DAAyC;AACzC,sEAAmD;AACnD,0EAAuD;AACvD,gEAA6C;AAE7C,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/service/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,mCAAmC;AACnC,+CAA+D;AAC/D,2CAA4F;AAC5F,+CAAkG;AAClG,yDAAyE;AACzE,iDAAkG;AAClG,6CAA8F;AAC9F,mDAAqG;AACrG,uCAAsF;AACtF,yDAAwE;AACxE,2CAA4F;AAC5F,yEAAwG;AACxG,iCAA6E;AAC7E,iCAA6E;AAC7E,6DAA4E;AAE5E,yBAAyB;AACzB,4DAAyC;AACzC,wDAAqC;AACrC,wDAAqC;AACrC,8CAA2B;AAC3B,8CAA2B;AAC3B,oDAAiC;AACjC,8DAA2C;AAC3C,0DAAuC;AACvC,4DAAyC;AACzC,sEAAmD;AACnD,0EAAuD;AACvD,gEAA6C;AAE7C,kBAAkB;AAClB,kEAA+C;AAC/C,8DAA2C;AAC3C,kEAA+C;AAC/C,4EAAyD;AACzD,gEAA6C;AAC7C,0DAAuC;AACvC,8DAA2C;AAC3C,oDAAiC;AACjC,oDAAiC;AAEpB,QAAA,QAAQ,GAAG;IACtB,cAAc;IACd,GAAG,sBAAmB;IACtB,GAAG,oBAAiB;IACpB,GAAG,oBAAiB;IACpB,GAAG,eAAY;IACf,GAAG,eAAY;IACf,GAAG,kBAAe;IAClB,GAAG,uBAAmB;IACtB,GAAG,qBAAkB;IACrB,GAAG,2BAAuB;IAC1B,GAAG,6BAAyB;IAC5B,GAAG,wBAAoB;CACxB,CAAA;AAEY,QAAA,MAAM,GAAG;IACpB,QAAQ,EAAE;QACR,0BAA0B,EAA1B,gDAA0B;KAC3B;IAED,eAAe,EAAE;QACf,sBAAsB;QACtB,GAAG,uBAAoB;QACvB,GAAG,qBAAkB;QACrB,GAAG,qBAAkB;QACrB,GAAG,gBAAa;QAChB,GAAG,gBAAa;QAChB,GAAG,mBAAgB;QACnB,GAAG,wBAAmB;QACtB,GAAG,sBAAkB;QACrB,GAAG,uBAAkB;QACrB,GAAG,4BAAuB;QAC1B,GAAG,yBAAoB;KACxB;IACD,UAAU,EAAE;QACV,SAAS,EAAE,gDAA0B;KACtC;CACF,CAAA"}
|
|
@@ -14,16 +14,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
var User_1;
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
16
|
exports.User = exports.UserStatus = void 0;
|
|
17
|
-
const env_1 = require("@things-factory/env");
|
|
18
|
-
const shell_1 = require("@things-factory/shell");
|
|
19
|
-
const crypto_1 = __importDefault(require("crypto"));
|
|
20
|
-
const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
|
|
21
17
|
const typeorm_1 = require("typeorm");
|
|
22
18
|
const type_graphql_1 = require("type-graphql");
|
|
23
|
-
const password_rule_1 = require("../../controllers/utils/password-rule");
|
|
24
19
|
const auth_error_1 = require("../../errors/auth-error");
|
|
25
|
-
const
|
|
20
|
+
const shell_1 = require("@things-factory/shell");
|
|
26
21
|
const role_1 = require("../role/role");
|
|
22
|
+
const get_secret_1 = require("../../utils/get-secret");
|
|
23
|
+
const env_1 = require("@things-factory/env");
|
|
24
|
+
const crypto_1 = __importDefault(require("crypto"));
|
|
25
|
+
const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
|
|
26
|
+
const password_rule_1 = require("../../controllers/utils/password-rule");
|
|
27
27
|
const ORMCONFIG = env_1.config.get('ormconfig', {});
|
|
28
28
|
const DATABASE_TYPE = ORMCONFIG.type;
|
|
29
29
|
var UserStatus;
|
|
@@ -150,7 +150,12 @@ __decorate([
|
|
|
150
150
|
], User.prototype, "email", void 0);
|
|
151
151
|
__decorate([
|
|
152
152
|
(0, typeorm_1.Column)({
|
|
153
|
-
nullable: true
|
|
153
|
+
nullable: true,
|
|
154
|
+
type: DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
|
|
155
|
+
? 'longtext'
|
|
156
|
+
: DATABASE_TYPE == 'oracle'
|
|
157
|
+
? 'clob'
|
|
158
|
+
: 'varchar'
|
|
154
159
|
}),
|
|
155
160
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
156
161
|
__metadata("design:type", String)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../server/service/user/user.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../server/service/user/user.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,9 +21,9 @@ function buildDomainUsersQueryBuilder(domainId, alias = 'USER', trxMgr) {
|
|
|
21
21
|
const qb = userRepo.createQueryBuilder(alias);
|
|
22
22
|
qb.select().where(`${alias}.id IN ${qb
|
|
23
23
|
.subQuery()
|
|
24
|
-
.select('
|
|
24
|
+
.select('USERS_DOMAINS.users_id')
|
|
25
25
|
.from('users_domains', 'USERS_DOMAINS')
|
|
26
|
-
.where('
|
|
26
|
+
.where('USERS_DOMAINS.domains_id = :domainId', { domainId })
|
|
27
27
|
.getQuery()}`);
|
|
28
28
|
return qb;
|
|
29
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-domain-users.js","sourceRoot":"","sources":["../../server/utils/get-domain-users.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"get-domain-users.js","sourceRoot":"","sources":["../../server/utils/get-domain-users.ts"],"names":[],"mappings":";;;AAAA,iDAA8C;AAC9C,qCAAsF;AACtF,+CAA2C;AAEpC,KAAK,UAAU,cAAc,CAAC,MAAuB,EAAE,MAAsB;IAClF,MAAM,UAAU,GAAuB,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC,cAAM,CAAC,KAAI,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAA;IAE7F,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE;QACd,MAAM,WAAW,GAAW,MAAM,UAAU,CAAC,OAAO,CAAC,EAAE,KAAK,oBAAO,MAAM,CAAE,EAAE,CAAC,CAAA;QAC9E,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,KAAK,CAAC,8CAA8C,MAAM,EAAE,CAAC,CAAA;QAEzF,MAAM,GAAG,WAAW,CAAA;KACrB;IAED,MAAM,EAAE,GAA6B,4BAA4B,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAC5E,OAAO,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;AAC3B,CAAC;AAZD,wCAYC;AAED,SAAgB,4BAA4B,CAC1C,QAAgB,EAChB,QAAgB,MAAM,EACtB,MAAsB;IAEtB,MAAM,QAAQ,GAAqB,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC,WAAI,CAAC,KAAI,IAAA,uBAAa,EAAC,WAAI,CAAC,CAAA;IACrF,MAAM,EAAE,GAA6B,QAAQ,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAA;IACvE,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,CACf,GAAG,KAAK,UAAU,EAAE;SACjB,QAAQ,EAAE;SACV,MAAM,CAAC,wBAAwB,CAAC;SAChC,IAAI,CAAC,eAAe,EAAE,eAAe,CAAC;SACtC,KAAK,CAAC,sCAAsC,EAAE,EAAE,QAAQ,EAAE,CAAC;SAC3D,QAAQ,EAAE,EAAE,CAChB,CAAA;IAED,OAAO,EAAE,CAAA;AACX,CAAC;AAjBD,oEAiBC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/auth-base",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.5",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -27,17 +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": "^4.0.
|
|
31
|
-
"@things-factory/env": "^4.0.
|
|
32
|
-
"@things-factory/i18n-base": "^4.0.
|
|
33
|
-
"@things-factory/shell": "^4.0.
|
|
30
|
+
"@things-factory/email-base": "^4.0.5",
|
|
31
|
+
"@things-factory/env": "^4.0.5",
|
|
32
|
+
"@things-factory/i18n-base": "^4.0.5",
|
|
33
|
+
"@things-factory/shell": "^4.0.5",
|
|
34
34
|
"jsonwebtoken": "^8.5.1",
|
|
35
|
-
"koa-passport": "^4.1.
|
|
35
|
+
"koa-passport": "^4.1.4",
|
|
36
36
|
"koa-session": "^6.0.0",
|
|
37
37
|
"oauth2orize-koa": "^1.3.2",
|
|
38
38
|
"passport": "^0.4.1",
|
|
39
39
|
"passport-jwt": "^4.0.0",
|
|
40
|
-
"passport-local": "^1.0.0"
|
|
40
|
+
"passport-local": "^1.0.0",
|
|
41
|
+
"uuid": "^3.4.0"
|
|
41
42
|
},
|
|
42
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "b7b2976818dceab74a34903499d408eed5d45b04"
|
|
43
44
|
}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import jwt from 'jsonwebtoken'
|
|
2
|
-
import { Domain } from '@things-factory/shell'
|
|
3
1
|
import {
|
|
4
2
|
Column,
|
|
5
3
|
CreateDateColumn,
|
|
@@ -7,13 +5,19 @@ import {
|
|
|
7
5
|
Index,
|
|
8
6
|
ManyToOne,
|
|
9
7
|
PrimaryGeneratedColumn,
|
|
10
|
-
|
|
11
|
-
|
|
8
|
+
RelationId,
|
|
9
|
+
UpdateDateColumn
|
|
12
10
|
} from 'typeorm'
|
|
13
|
-
import {
|
|
11
|
+
import { Field, ID, ObjectType } from 'type-graphql'
|
|
14
12
|
import { User, UserStatus } from '../user/user'
|
|
13
|
+
|
|
14
|
+
import { Domain } from '@things-factory/shell'
|
|
15
15
|
import { SECRET } from '../../utils/get-secret'
|
|
16
16
|
import { config } from '@things-factory/env'
|
|
17
|
+
import jwt from 'jsonwebtoken'
|
|
18
|
+
|
|
19
|
+
const ORMCONFIG = config.get('ormconfig', {})
|
|
20
|
+
const DATABASE_TYPE = ORMCONFIG.type
|
|
17
21
|
|
|
18
22
|
@Entity()
|
|
19
23
|
@Index('ix_appliance_0', (appliance: Appliance) => [appliance.domain, appliance.name], {
|
|
@@ -62,7 +66,13 @@ export class Appliance {
|
|
|
62
66
|
description: string
|
|
63
67
|
|
|
64
68
|
@Column({
|
|
65
|
-
nullable: true
|
|
69
|
+
nullable: true,
|
|
70
|
+
type:
|
|
71
|
+
DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
|
|
72
|
+
? 'longtext'
|
|
73
|
+
: DATABASE_TYPE == 'oracle'
|
|
74
|
+
? 'clob'
|
|
75
|
+
: 'varchar'
|
|
66
76
|
})
|
|
67
77
|
@Field({ nullable: true })
|
|
68
78
|
accessToken: string
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
import { Domain } from '@things-factory/shell'
|
|
2
|
-
import crypto from 'crypto'
|
|
3
|
-
import jwt from 'jsonwebtoken'
|
|
4
1
|
import {
|
|
5
2
|
Column,
|
|
6
3
|
CreateDateColumn,
|
|
@@ -11,10 +8,18 @@ import {
|
|
|
11
8
|
RelationId,
|
|
12
9
|
UpdateDateColumn
|
|
13
10
|
} from 'typeorm'
|
|
14
|
-
import {
|
|
15
|
-
import { SECRET } from '../../utils/get-secret'
|
|
11
|
+
import { Field, ID, ObjectType, registerEnumType } from 'type-graphql'
|
|
16
12
|
import { User, UserStatus } from '../user/user'
|
|
17
13
|
|
|
14
|
+
import { Domain } from '@things-factory/shell'
|
|
15
|
+
import { SECRET } from '../../utils/get-secret'
|
|
16
|
+
import { config } from '@things-factory/env'
|
|
17
|
+
import crypto from 'crypto'
|
|
18
|
+
import jwt from 'jsonwebtoken'
|
|
19
|
+
|
|
20
|
+
const ORMCONFIG = config.get('ormconfig', {})
|
|
21
|
+
const DATABASE_TYPE = ORMCONFIG.type
|
|
22
|
+
|
|
18
23
|
export enum ApplicationStatus {
|
|
19
24
|
DRAFT = 'DRAFT',
|
|
20
25
|
ACTIVATED = 'ACTIVATED'
|
|
@@ -80,7 +85,13 @@ export class Application {
|
|
|
80
85
|
appKey: string
|
|
81
86
|
|
|
82
87
|
@Column({
|
|
83
|
-
nullable: true
|
|
88
|
+
nullable: true,
|
|
89
|
+
type:
|
|
90
|
+
DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
|
|
91
|
+
? 'longtext'
|
|
92
|
+
: DATABASE_TYPE == 'oracle'
|
|
93
|
+
? 'clob'
|
|
94
|
+
: 'varchar'
|
|
84
95
|
})
|
|
85
96
|
@Field({ nullable: true })
|
|
86
97
|
appSecret: string
|
package/server/service/index.ts
CHANGED
|
@@ -1,3 +1,19 @@
|
|
|
1
|
+
/* IMPORT ENTITIES AND RESOLVERS */
|
|
2
|
+
import { resolvers as AppbindingResolver } from './app-binding'
|
|
3
|
+
import { entities as ApplianceEntities, resolvers as ApplianceResolvers } from './appliance'
|
|
4
|
+
import { entities as ApplicationEntities, resolvers as ApplicationResolvers } from './application'
|
|
5
|
+
import { resolvers as DomainGeneratorResolver } from './domain-generator'
|
|
6
|
+
import { entities as GrantedRoleEntities, resolvers as GrantedRoleResolver } from './granted-role'
|
|
7
|
+
import { entities as InvitationEntities, resolvers as InvitationResolver } from './invitation'
|
|
8
|
+
import { entities as LoginHistoryEntities, resolvers as LoginHistoryResolver } from './login-history'
|
|
9
|
+
import { entities as PartnerEntities, resolvers as PartnerResolvers } from './partner'
|
|
10
|
+
import { entities as PasswordHistoryEntities } from './password-history'
|
|
11
|
+
import { entities as PrivilegeEntities, resolvers as PrivilegeResolvers } from './privilege'
|
|
12
|
+
import { privilegeDirectiveResolver, privilegeDirectiveTypeDefs } from './privilege/privilege-directive'
|
|
13
|
+
import { entities as RoleEntities, resolvers as RoleResolvers } from './role'
|
|
14
|
+
import { entities as UserEntities, resolvers as UserResolvers } from './user'
|
|
15
|
+
import { entities as VerificationTokenEntities } from './verification-token'
|
|
16
|
+
|
|
1
17
|
/* EXPORT ENTITY TYPES */
|
|
2
18
|
export * from './application/application'
|
|
3
19
|
export * from './appliance/appliance'
|
|
@@ -12,22 +28,16 @@ export * from './password-history/password-history'
|
|
|
12
28
|
export * from './verification-token/verification-token'
|
|
13
29
|
export * from './login-history/login-history'
|
|
14
30
|
|
|
15
|
-
/*
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
import { resolvers as DomainGeneratorResolver } from './domain-generator'
|
|
26
|
-
import { entities as PasswordHistoryEntities } from './password-history'
|
|
27
|
-
import { entities as VerificationTokenEntities } from './verification-token'
|
|
28
|
-
import { entities as LoginHistoryEntities, resolvers as LoginHistoryResolver } from './login-history'
|
|
29
|
-
|
|
30
|
-
import { privilegeDirectiveTypeDefs, privilegeDirectiveResolver } from './privilege/privilege-directive'
|
|
31
|
+
/* EXPORT TYPES */
|
|
32
|
+
export * from './app-binding/app-binding-types'
|
|
33
|
+
export * from './appliance/appliance-types'
|
|
34
|
+
export * from './application/application-types'
|
|
35
|
+
export * from './domain-generator/domain-generator-types'
|
|
36
|
+
export * from './invitation/invitation-types'
|
|
37
|
+
export * from './partner/partner-types'
|
|
38
|
+
export * from './privilege/privilege-types'
|
|
39
|
+
export * from './role/role-types'
|
|
40
|
+
export * from './user/user-types'
|
|
31
41
|
|
|
32
42
|
export const entities = [
|
|
33
43
|
/* ENTITIES */
|
|
@@ -1,25 +1,26 @@
|
|
|
1
|
-
import { config } from '@things-factory/env'
|
|
2
|
-
import { Domain } from '@things-factory/shell'
|
|
3
|
-
import crypto from 'crypto'
|
|
4
|
-
import jwt from 'jsonwebtoken'
|
|
5
1
|
import {
|
|
6
2
|
Column,
|
|
7
3
|
CreateDateColumn,
|
|
8
4
|
Entity,
|
|
9
|
-
getRepository,
|
|
10
5
|
Index,
|
|
11
6
|
JoinTable,
|
|
12
7
|
ManyToMany,
|
|
13
8
|
ManyToOne,
|
|
14
|
-
RelationId,
|
|
15
9
|
PrimaryGeneratedColumn,
|
|
16
|
-
|
|
10
|
+
RelationId,
|
|
11
|
+
UpdateDateColumn,
|
|
12
|
+
getRepository
|
|
17
13
|
} from 'typeorm'
|
|
18
|
-
import {
|
|
19
|
-
|
|
14
|
+
import { Field, ID, ObjectType } from 'type-graphql'
|
|
15
|
+
|
|
20
16
|
import { AuthError } from '../../errors/auth-error'
|
|
21
|
-
import {
|
|
17
|
+
import { Domain } from '@things-factory/shell'
|
|
22
18
|
import { Role } from '../role/role'
|
|
19
|
+
import { SECRET } from '../../utils/get-secret'
|
|
20
|
+
import { config } from '@things-factory/env'
|
|
21
|
+
import crypto from 'crypto'
|
|
22
|
+
import jwt from 'jsonwebtoken'
|
|
23
|
+
import { validatePasswordByRule } from '../../controllers/utils/password-rule'
|
|
23
24
|
|
|
24
25
|
const ORMCONFIG = config.get('ormconfig', {})
|
|
25
26
|
const DATABASE_TYPE = ORMCONFIG.type
|
|
@@ -61,7 +62,13 @@ export class User {
|
|
|
61
62
|
email: string
|
|
62
63
|
|
|
63
64
|
@Column({
|
|
64
|
-
nullable: true
|
|
65
|
+
nullable: true,
|
|
66
|
+
type:
|
|
67
|
+
DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
|
|
68
|
+
? 'longtext'
|
|
69
|
+
: DATABASE_TYPE == 'oracle'
|
|
70
|
+
? 'clob'
|
|
71
|
+
: 'varchar'
|
|
65
72
|
})
|
|
66
73
|
@Field({ nullable: true })
|
|
67
74
|
password: string
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Domain } from '@things-factory/shell'
|
|
2
2
|
import { EntityManager, getRepository, Repository, SelectQueryBuilder } from 'typeorm'
|
|
3
3
|
import { User } from '../service/user/user'
|
|
4
4
|
|
|
@@ -26,9 +26,9 @@ export function buildDomainUsersQueryBuilder(
|
|
|
26
26
|
qb.select().where(
|
|
27
27
|
`${alias}.id IN ${qb
|
|
28
28
|
.subQuery()
|
|
29
|
-
.select('
|
|
29
|
+
.select('USERS_DOMAINS.users_id')
|
|
30
30
|
.from('users_domains', 'USERS_DOMAINS')
|
|
31
|
-
.where('
|
|
31
|
+
.where('USERS_DOMAINS.domains_id = :domainId', { domainId })
|
|
32
32
|
.getQuery()}`
|
|
33
33
|
)
|
|
34
34
|
|