chyz 1.0.13-rc.18 → 1.0.13-rc.21
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/BaseChyz.ts +15 -11
- package/Doc/Moel kullanma.md +13 -0
- package/Examples/Controllers/SiteController.ts +2 -9
- package/Examples/index.ts +17 -4
- package/README.md +265 -12
- package/base/BaseError.ts +1 -1
- package/base/Model.ts +24 -4
- package/base/RestClient.ts +1 -1
- package/base/ValidationHttpException.ts +1 -1
- package/dist/base/Model.js +7 -0
- package/dist/base/Model.js.map +1 -1
- package/dist/base/ValidationHttpException.js +1 -1
- package/dist/package.json +1 -2
- package/package.json +1 -2
package/BaseChyz.ts
CHANGED
|
@@ -3,7 +3,8 @@ import {RouteDefinition} from "./model/RouteDefinition";
|
|
|
3
3
|
import {NextFunction, Request, Response} from "express";
|
|
4
4
|
import {Controller} from "./base/Controller";
|
|
5
5
|
import Utils from "./requiments/Utils";
|
|
6
|
-
import {ModelManager} from "./base";
|
|
6
|
+
import {BaseError, ModelManager} from "./base";
|
|
7
|
+
import {Exception} from "./base/db/Exception";
|
|
7
8
|
|
|
8
9
|
|
|
9
10
|
const express = require("express");
|
|
@@ -23,7 +24,7 @@ export default class BaseChyz {
|
|
|
23
24
|
private _port: number = 3001;
|
|
24
25
|
static db: any;
|
|
25
26
|
static routes: any;
|
|
26
|
-
private static _validate:any=validate;
|
|
27
|
+
private static _validate: any = validate;
|
|
27
28
|
private _logConfig: any = require('./log/config/log4js.json') ?? {}
|
|
28
29
|
private _controllerpath: string = "Controllers"
|
|
29
30
|
private static controllers: Array<Controller> = []
|
|
@@ -48,8 +49,7 @@ export default class BaseChyz {
|
|
|
48
49
|
}
|
|
49
50
|
|
|
50
51
|
init() {
|
|
51
|
-
|
|
52
|
-
this.logProvider().configure(this._logConfig);
|
|
52
|
+
|
|
53
53
|
|
|
54
54
|
/**
|
|
55
55
|
* set request id
|
|
@@ -140,16 +140,21 @@ export default class BaseChyz {
|
|
|
140
140
|
this.config = config;
|
|
141
141
|
|
|
142
142
|
|
|
143
|
+
// logger settin
|
|
144
|
+
this.logProvider().level = log4js.levels.ALL;
|
|
145
|
+
this.logProvider().configure(this._logConfig);
|
|
146
|
+
|
|
143
147
|
let components = Utils.findKeyValue(config, "components")
|
|
144
148
|
if (components) {
|
|
145
149
|
for (const componentsKey in components) {
|
|
150
|
+
|
|
146
151
|
let comp = components[componentsKey];
|
|
147
|
-
BaseChyz.
|
|
152
|
+
BaseChyz.debug("Create Component ", componentsKey)
|
|
148
153
|
try {
|
|
149
154
|
BaseChyz.components[componentsKey] = Utils.createObject(new comp.class, comp);
|
|
150
155
|
BaseChyz.components[componentsKey]?.init();
|
|
151
|
-
}catch (e) {
|
|
152
|
-
|
|
156
|
+
} catch (e) {
|
|
157
|
+
BaseChyz.error("Create Component ", e)
|
|
153
158
|
}
|
|
154
159
|
|
|
155
160
|
}
|
|
@@ -166,7 +171,6 @@ export default class BaseChyz {
|
|
|
166
171
|
}
|
|
167
172
|
}
|
|
168
173
|
|
|
169
|
-
|
|
170
174
|
this.init();
|
|
171
175
|
|
|
172
176
|
return this;
|
|
@@ -263,14 +267,14 @@ export default class BaseChyz {
|
|
|
263
267
|
// @ts-ignore
|
|
264
268
|
let className = file.split(".")[0] + "Class";
|
|
265
269
|
if (model[className])
|
|
266
|
-
models[className.replace("Class","")] = new model[className];
|
|
270
|
+
models[className.replace("Class", "")] = new model[className];
|
|
267
271
|
}
|
|
268
272
|
})
|
|
269
273
|
|
|
270
274
|
ModelManager._register(models);
|
|
271
275
|
|
|
272
276
|
for (const key of Object.keys(ModelManager)) {
|
|
273
|
-
if(key!="_register"){
|
|
277
|
+
if (key != "_register") {
|
|
274
278
|
ModelManager[key].init();
|
|
275
279
|
}
|
|
276
280
|
}
|
|
@@ -310,7 +314,7 @@ export default class BaseChyz {
|
|
|
310
314
|
BaseChyz.debug(`Call Request id ${instance.id}`)
|
|
311
315
|
await instance.beforeAction(route, req, res)
|
|
312
316
|
next()
|
|
313
|
-
} catch (e) {
|
|
317
|
+
} catch (e: any) {
|
|
314
318
|
BaseChyz.error(e);
|
|
315
319
|
|
|
316
320
|
res.status(e.statusCode || 500)
|
|
@@ -102,15 +102,8 @@ class SiteController extends Controller {
|
|
|
102
102
|
"admin"
|
|
103
103
|
],
|
|
104
104
|
permissions: [
|
|
105
|
-
"
|
|
106
|
-
|
|
107
|
-
"hubboxkoli",
|
|
108
|
-
"edisboxold",
|
|
109
|
-
"edisboxnew",
|
|
110
|
-
"hubboxold",
|
|
111
|
-
"hubboxnew",
|
|
112
|
-
"alprboxold",
|
|
113
|
-
"alprboxnew"
|
|
105
|
+
"xxxx",
|
|
106
|
+
|
|
114
107
|
],
|
|
115
108
|
}, user.authkey, null);
|
|
116
109
|
|
package/Examples/index.ts
CHANGED
|
@@ -18,11 +18,9 @@ import {AuthManager} from "../rbac/AuthManager";
|
|
|
18
18
|
|
|
19
19
|
let config = {
|
|
20
20
|
port: process.env.PORT,
|
|
21
|
-
controllerpath:
|
|
21
|
+
controllerpath:process.env.CONTROLLER_PATH,
|
|
22
22
|
components: {
|
|
23
|
-
|
|
24
|
-
class: AuthManager,
|
|
25
|
-
},
|
|
23
|
+
|
|
26
24
|
db: {
|
|
27
25
|
class: DbConnection,
|
|
28
26
|
database: process.env.DBDATABASE,
|
|
@@ -35,6 +33,21 @@ let config = {
|
|
|
35
33
|
logging: (msg: any) => BaseChyz.debug(msg)
|
|
36
34
|
}
|
|
37
35
|
},
|
|
36
|
+
db2: {
|
|
37
|
+
class: DbConnection,
|
|
38
|
+
database: process.env.DBDATABASE,
|
|
39
|
+
username: process.env.DBUSER,
|
|
40
|
+
password: process.env.DBPASS,
|
|
41
|
+
options: {
|
|
42
|
+
host: process.env.DBHOST,
|
|
43
|
+
dialect: 'postgres', /* one of 'mysql' | 'mariadb' | 'postgres' | 'mssql' */
|
|
44
|
+
// disable logging; default: console.log
|
|
45
|
+
logging: (msg:any) => BaseChyz.debug('DB2',msg)
|
|
46
|
+
}
|
|
47
|
+
},
|
|
48
|
+
authManager: {
|
|
49
|
+
class: AuthManager,
|
|
50
|
+
},
|
|
38
51
|
user: {
|
|
39
52
|
'class': WebUser,
|
|
40
53
|
'identityClass': User
|
package/README.md
CHANGED
|
@@ -8,7 +8,6 @@ Klasör Yapısı<br>
|
|
|
8
8
|
*---Controllers <br>
|
|
9
9
|
*---Models<br>
|
|
10
10
|
*---Log<br>
|
|
11
|
-
*---Framework<br>
|
|
12
11
|
index.ts<br>
|
|
13
12
|
|
|
14
13
|
`##Başlangıç<br>
|
|
@@ -17,15 +16,23 @@ yarn start
|
|
|
17
16
|
## index.ts alanlar düzenlenmeli.
|
|
18
17
|
|
|
19
18
|
```typescript
|
|
19
|
+
|
|
20
|
+
import {BaseChyz} from "../index";
|
|
21
|
+
|
|
20
22
|
require('dotenv-flow').config();
|
|
23
|
+
import Chyz ,{ DbConnection, BaseChyz} from "chyz/dist/";
|
|
24
|
+
import {AuthManager} from "chyz/dist/rbac/AuthManager"
|
|
25
|
+
import {WebUser} from "chyz/dist/web/WebUser";
|
|
26
|
+
import {User as Identity} from "./Models/User";
|
|
21
27
|
|
|
22
|
-
import BaseChyz from "chyz/dist/BaseChyz";
|
|
23
|
-
import Chyz, {DbConnection} from "chyz/dist";
|
|
24
|
-
import {WebUser} from "../web/WebUser";
|
|
25
|
-
import {User} from "./Models/User";
|
|
26
28
|
|
|
27
29
|
let config = {
|
|
30
|
+
port: process.env.PORT || 8870,
|
|
31
|
+
controllerpath: "Examples\\Controllers",
|
|
28
32
|
components: {
|
|
33
|
+
authManager: {
|
|
34
|
+
class: AuthManager,
|
|
35
|
+
},
|
|
29
36
|
db: {
|
|
30
37
|
class: DbConnection,
|
|
31
38
|
database: process.env.DBDATABASE,
|
|
@@ -35,7 +42,7 @@ let config = {
|
|
|
35
42
|
host: process.env.DBHOST,
|
|
36
43
|
dialect: 'postgres', /* one of 'mysql' | 'mariadb' | 'postgres' | 'mssql' */
|
|
37
44
|
// disable logging; default: console.log
|
|
38
|
-
logging:
|
|
45
|
+
logging: (msg: any) => BaseChyz.debug(msg)
|
|
39
46
|
}
|
|
40
47
|
},
|
|
41
48
|
user: {
|
|
@@ -43,14 +50,168 @@ let config = {
|
|
|
43
50
|
'identityClass': User
|
|
44
51
|
}
|
|
45
52
|
}
|
|
53
|
+
|
|
46
54
|
}
|
|
47
55
|
Chyz.app(config).Start();
|
|
48
56
|
```
|
|
49
57
|
|
|
58
|
+
##Controller
|
|
59
|
+
Basit şekilde kontroller oluşturulabilir.
|
|
60
|
+
```typescript
|
|
61
|
+
/*
|
|
62
|
+
*
|
|
63
|
+
* Copyright (c) 2021-2021.. Chy Bilgisayar Bilisim
|
|
64
|
+
* Author: Cihan Ozturk
|
|
65
|
+
* E-mail: cihan@chy.com.tr
|
|
66
|
+
* Github:https://github.com/cihan53/
|
|
67
|
+
*
|
|
68
|
+
*/
|
|
69
|
+
|
|
70
|
+
import {AccessControl, BaseChyz, JwtHttpBearerAuth, ModelManager, Request, Response,} from "chyz/dist";
|
|
71
|
+
import {ForbiddenHttpException, Model, NotFoundHttpException, ValidationHttpException} from "chyz/dist/base";
|
|
72
|
+
|
|
73
|
+
import Utils from 'chyz/dist/requiments/Utils';
|
|
74
|
+
import {controller, get, post} from "chyz/dist/decorator";
|
|
75
|
+
import {Controller} from "chyz/dist/base/Controller";
|
|
76
|
+
import * as Util from "util";
|
|
77
|
+
import {uid} from "uid";
|
|
78
|
+
|
|
79
|
+
import {User} from "../Models/User";
|
|
80
|
+
import {AuthManager} from "../Lib/AuthManager";
|
|
81
|
+
import {CategoriesClass} from "../Models/Categories";
|
|
82
|
+
|
|
83
|
+
|
|
84
|
+
const keygen = require('ssh-keygen');
|
|
85
|
+
const os = require('os');
|
|
86
|
+
const bcrypt = require('bcrypt');
|
|
87
|
+
const JsonWebToken = require("jsonwebtoken");
|
|
88
|
+
const {Op} = require("sequelize");
|
|
89
|
+
|
|
90
|
+
|
|
91
|
+
@controller("/api")
|
|
92
|
+
class ApiController extends Controller {
|
|
93
|
+
|
|
94
|
+
public myCheck(token) {
|
|
95
|
+
console.log("myyyyyyyyyyyyyyyyyyyyy")
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
public behaviors(): any[] {
|
|
99
|
+
|
|
100
|
+
return [{
|
|
101
|
+
'authenticator': {
|
|
102
|
+
"class": JwtHttpBearerAuth,
|
|
103
|
+
// "auth": this.myCheck
|
|
104
|
+
},
|
|
105
|
+
'access': {
|
|
106
|
+
'class': AccessControl,
|
|
107
|
+
'only': ['order/list' ],
|
|
108
|
+
'rules': [
|
|
109
|
+
|
|
110
|
+
{
|
|
111
|
+
'allow': true,
|
|
112
|
+
'actions': ['order/list' ],
|
|
113
|
+
'roles': ['editor'],
|
|
114
|
+
}
|
|
115
|
+
]
|
|
116
|
+
}
|
|
117
|
+
}]
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
@get("/")
|
|
121
|
+
Index(req: Request, res: Response) {
|
|
122
|
+
|
|
123
|
+
BaseChyz.logs().info("Site Controller Burası", this.id)
|
|
124
|
+
return res.json({message: "index sayfası"})
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
@post("orderCreate")
|
|
128
|
+
async Login(req: Request, res: Response) {
|
|
129
|
+
let data = req.body;
|
|
130
|
+
data.Customer.status = "true";
|
|
131
|
+
|
|
132
|
+
//Customer Model Create
|
|
133
|
+
let customer = ModelManager.Customer.save();
|
|
134
|
+
//Order Model Create
|
|
135
|
+
let order = ModelManager.Order;
|
|
136
|
+
|
|
137
|
+
|
|
138
|
+
let transaction
|
|
139
|
+
try {
|
|
140
|
+
// get transaction
|
|
141
|
+
transaction = await BaseChyz.getComponent("db").transaction();
|
|
142
|
+
customer.load(data, "Customer");//load customer data
|
|
143
|
+
let cus: any = await customer.save({}, {transaction});
|
|
144
|
+
|
|
145
|
+
if (!cus) {
|
|
146
|
+
throw new ValidationHttpException(customer.errors);
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
data.Order.customer_id = cus.id;
|
|
150
|
+
|
|
151
|
+
order.load(data, "Order");
|
|
152
|
+
let res1 = await order.save({}, {transaction});
|
|
153
|
+
if (!res1) {
|
|
154
|
+
throw new ValidationHttpException(order.errors);
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
// commit
|
|
158
|
+
await transaction.commit();
|
|
159
|
+
|
|
160
|
+
} catch (e) {
|
|
161
|
+
if (transaction) {
|
|
162
|
+
await transaction.rollback();
|
|
163
|
+
BaseChyz.warn("Rollback transaction")
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
if (e instanceof ValidationHttpException)
|
|
167
|
+
throw new ValidationHttpException(e.message)
|
|
168
|
+
else
|
|
169
|
+
throw new ForbiddenHttpException(e.message)
|
|
170
|
+
}
|
|
171
|
+
return res.send("Post Controller")
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
|
|
175
|
+
@get("order/list")
|
|
176
|
+
async listOrder(req: Request, res: Response) {
|
|
177
|
+
const {Products}: { Products: ProductsClass } = ModelManager;
|
|
178
|
+
let product = await Products.findAll( );
|
|
179
|
+
return res.json(product)
|
|
180
|
+
|
|
181
|
+
}
|
|
182
|
+
|
|
183
|
+
@get("categories")
|
|
184
|
+
async Categories(req: Request, res: Response) {
|
|
185
|
+
let product = await ModelManager.Categories.findAll({
|
|
186
|
+
include: [
|
|
187
|
+
{
|
|
188
|
+
model: ModelManager.Products.model(),
|
|
189
|
+
}
|
|
190
|
+
]
|
|
191
|
+
});
|
|
192
|
+
return res.json(product)
|
|
193
|
+
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
error(req: Request, res: Response) {
|
|
197
|
+
BaseChyz.logs().info("Error Sayfası")
|
|
198
|
+
return res.send("Post Controller")
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
module.exports = ApiController
|
|
203
|
+
|
|
204
|
+
```
|
|
205
|
+
|
|
206
|
+
|
|
50
207
|
## Create Model
|
|
51
208
|
|
|
52
209
|
Veritabanı işlemleri için model oluşturma, sequelize desteklidir.
|
|
53
210
|
|
|
211
|
+
Model adı "**Class**" şeklinde bitmeli.
|
|
212
|
+
|
|
213
|
+
Örnek = "ModelName**Class**"
|
|
214
|
+
|
|
54
215
|
```typescript
|
|
55
216
|
import {Model, DataTypes} from "chyz/base/Model";
|
|
56
217
|
|
|
@@ -90,6 +251,7 @@ export class CustomerCLass extends Model {
|
|
|
90
251
|
|
|
91
252
|
```
|
|
92
253
|
````typescript
|
|
254
|
+
|
|
93
255
|
export class ProductsClass extends Model {
|
|
94
256
|
[x: string]: any;
|
|
95
257
|
|
|
@@ -128,6 +290,48 @@ export class ProductsClass extends Model {
|
|
|
128
290
|
}
|
|
129
291
|
}
|
|
130
292
|
|
|
293
|
+
/**
|
|
294
|
+
*
|
|
295
|
+
*/
|
|
296
|
+
export class CategoriesClass extends Model {
|
|
297
|
+
[x: string]: any;
|
|
298
|
+
|
|
299
|
+
alias() {
|
|
300
|
+
return "c"
|
|
301
|
+
}
|
|
302
|
+
|
|
303
|
+
tableName() {
|
|
304
|
+
return 'categories';
|
|
305
|
+
}
|
|
306
|
+
attributes() {
|
|
307
|
+
return {
|
|
308
|
+
// Model attributes are defined here
|
|
309
|
+
title: {
|
|
310
|
+
type: DataTypes.STRING,
|
|
311
|
+
allowNull: false
|
|
312
|
+
},
|
|
313
|
+
properties: {
|
|
314
|
+
type: DataTypes.STRING,
|
|
315
|
+
allowNull: false
|
|
316
|
+
}
|
|
317
|
+
|
|
318
|
+
}
|
|
319
|
+
}
|
|
320
|
+
relations(): Relation[] {
|
|
321
|
+
return [
|
|
322
|
+
{
|
|
323
|
+
type: "belongsToMany",
|
|
324
|
+
foreignKey: "category_id",
|
|
325
|
+
sourceKey: "id",
|
|
326
|
+
as: 'product',
|
|
327
|
+
model: ModelManager.Products.model(),
|
|
328
|
+
through: ModelManager.ProductToCategories.model()
|
|
329
|
+
}
|
|
330
|
+
]
|
|
331
|
+
}
|
|
332
|
+
|
|
333
|
+
}
|
|
334
|
+
|
|
131
335
|
|
|
132
336
|
````
|
|
133
337
|
|
|
@@ -146,9 +350,11 @@ export class ProductsClass extends Model {
|
|
|
146
350
|
* }
|
|
147
351
|
* @type {Customer}
|
|
148
352
|
*/
|
|
353
|
+
import { ModelManager} from "chyz/dist";
|
|
149
354
|
import {Customer} from "./Customer";
|
|
355
|
+
|
|
150
356
|
//Customer Model Create
|
|
151
|
-
let customer: Customer = Customer;
|
|
357
|
+
let customer: Customer = ModelManager.Customer;
|
|
152
358
|
customer.load(req.body, "Customer");//load customer data
|
|
153
359
|
let cus: any = await customer.save();
|
|
154
360
|
|
|
@@ -164,7 +370,7 @@ Transaction oluşturma
|
|
|
164
370
|
// get transaction
|
|
165
371
|
transaction = await BaseChyz.getComponent("db").transaction();
|
|
166
372
|
//Customer Model Create
|
|
167
|
-
let customer: Customer =
|
|
373
|
+
let customer: Customer = ModelManager.Customer;
|
|
168
374
|
customer.load(data, "Customer");//load customer data
|
|
169
375
|
let cus: any = await customer.save({}, {transaction});
|
|
170
376
|
if (!cus) {
|
|
@@ -173,9 +379,9 @@ Transaction oluşturma
|
|
|
173
379
|
} catch (e) {
|
|
174
380
|
if (transaction) {
|
|
175
381
|
await transaction.rollback();
|
|
176
|
-
BaseChyz.warn("Rollback transaction")
|
|
382
|
+
BaseChyz.warn("Rollback transaction");
|
|
177
383
|
}
|
|
178
|
-
|
|
384
|
+
|
|
179
385
|
}
|
|
180
386
|
```
|
|
181
387
|
|
|
@@ -217,6 +423,44 @@ export class User extends Model implements IdentityInterface {
|
|
|
217
423
|
throw new Error("Method not implemented.");
|
|
218
424
|
}
|
|
219
425
|
|
|
426
|
+
/**
|
|
427
|
+
* Returns auth manager associated with the user component.
|
|
428
|
+
*
|
|
429
|
+
* By default this is the `authManager` application component.
|
|
430
|
+
* You may override this method to return a different auth manager instance if needed.
|
|
431
|
+
*/
|
|
432
|
+
protected getAuthManager() {
|
|
433
|
+
return BaseChyz.getComponent("authManager");
|
|
434
|
+
}
|
|
435
|
+
|
|
436
|
+
/**
|
|
437
|
+
* Returns the access checker used for checking access.
|
|
438
|
+
* @return CheckAccessInterface
|
|
439
|
+
*/
|
|
440
|
+
protected getAccessChecker() {
|
|
441
|
+
return this.accessChecker !== null ? this.accessChecker : this.getAuthManager();
|
|
442
|
+
}
|
|
443
|
+
|
|
444
|
+
/**
|
|
445
|
+
*
|
|
446
|
+
* @param permissionName
|
|
447
|
+
* @param params
|
|
448
|
+
* @param allowCaching
|
|
449
|
+
*/
|
|
450
|
+
public async can(permissionName, params: any[] = [], allowCaching: boolean = true) {
|
|
451
|
+
let accessChecker;
|
|
452
|
+
if ((accessChecker = this.getAccessChecker()) === null) {
|
|
453
|
+
return false;
|
|
454
|
+
}
|
|
455
|
+
|
|
456
|
+
let access = await accessChecker.checkAccess(this.getId(), permissionName, params);
|
|
457
|
+
this._access[permissionName] = access;
|
|
458
|
+
if (allowCaching && Utils.isEmpty(params)) {
|
|
459
|
+
|
|
460
|
+
}
|
|
461
|
+
return access;
|
|
462
|
+
}
|
|
463
|
+
|
|
220
464
|
public attributes() {
|
|
221
465
|
return {
|
|
222
466
|
// Model attributes are defined here
|
|
@@ -240,16 +484,25 @@ export class User extends Model implements IdentityInterface {
|
|
|
240
484
|
}
|
|
241
485
|
|
|
242
486
|
async findIdentityByAccessToken(token, type) {
|
|
487
|
+
|
|
488
|
+
|
|
243
489
|
let decoded = JsonWebToken.decode(token, {complete: true})
|
|
490
|
+
if (!decoded.payload.user) {
|
|
491
|
+
return null;
|
|
492
|
+
}
|
|
244
493
|
let identity = await this.findOne({where: {id: parseInt(decoded.payload.user)}});
|
|
245
494
|
if(identity){
|
|
246
495
|
BaseChyz.debug("Find Identity By AccessToken: User Found", decoded.payload)
|
|
247
496
|
try {
|
|
248
497
|
JsonWebToken.verify(token, identity.salt_text);
|
|
498
|
+
this.setIdentity(identity);
|
|
249
499
|
BaseChyz.debug("Find Identity By AccessToken: User Verify Success")
|
|
250
|
-
return
|
|
500
|
+
return this;
|
|
251
501
|
} catch(err) {
|
|
252
|
-
|
|
502
|
+
if (err.name == "TokenExpiredError")
|
|
503
|
+
BaseChyz.debug("Find Identity By AccessToken: Token Expired")
|
|
504
|
+
else
|
|
505
|
+
BaseChyz.debug("Find Identity By AccessToken: User Verify Failed")
|
|
253
506
|
return null;
|
|
254
507
|
}
|
|
255
508
|
}
|
package/base/BaseError.ts
CHANGED
|
@@ -15,7 +15,7 @@ export class BaseError extends Error {
|
|
|
15
15
|
this.message= Utils.isString(message)?message: JSON.stringify(message);
|
|
16
16
|
this.name = this.constructor.name // good practice
|
|
17
17
|
this.statusCode = statusCode // error code for responding to client
|
|
18
|
-
Error.captureStackTrace(this)
|
|
18
|
+
//Error.captureStackTrace(this)
|
|
19
19
|
}
|
|
20
20
|
|
|
21
21
|
toString(){
|
package/base/Model.ts
CHANGED
|
@@ -9,7 +9,16 @@ import BaseChyz from "../BaseChyz";
|
|
|
9
9
|
import Utils from "../requiments/Utils";
|
|
10
10
|
import {Component} from "./Component";
|
|
11
11
|
import {InvalidConfigException} from "./InvalidConfigException";
|
|
12
|
-
import {
|
|
12
|
+
import {
|
|
13
|
+
DatabaseError,
|
|
14
|
+
DataTypes,
|
|
15
|
+
ExclusionConstraintError,
|
|
16
|
+
ForeignKeyConstraintError,
|
|
17
|
+
Model as SModel,
|
|
18
|
+
TimeoutError,
|
|
19
|
+
UniqueConstraintError,
|
|
20
|
+
ValidationError,
|
|
21
|
+
} from "sequelize";
|
|
13
22
|
import {Exception} from "./db/Exception";
|
|
14
23
|
|
|
15
24
|
export {DataTypes, NOW} from "sequelize";
|
|
@@ -91,11 +100,13 @@ export class Model extends Component {
|
|
|
91
100
|
constructor(sequelize?: IDBDatabase) {
|
|
92
101
|
super();
|
|
93
102
|
this._tableName = this.alias();
|
|
103
|
+
|
|
104
|
+
BaseChyz.debug("Model constructor", this._tableName)
|
|
94
105
|
// this._sequelize = BaseChyz.getComponent("db").db;
|
|
95
106
|
if (sequelize != null)
|
|
96
107
|
this._sequelize = sequelize;
|
|
97
108
|
else
|
|
98
|
-
this._sequelize =
|
|
109
|
+
this._sequelize = Model.getDb();
|
|
99
110
|
|
|
100
111
|
if (!Utils.isEmpty(this.attributes())) {
|
|
101
112
|
|
|
@@ -208,7 +219,7 @@ export class Model extends Component {
|
|
|
208
219
|
let result: any;
|
|
209
220
|
try {
|
|
210
221
|
result = await this.model().create(p, options)
|
|
211
|
-
} catch (e) {
|
|
222
|
+
} catch (e: any) {
|
|
212
223
|
BaseChyz.debug(`Model[${this.constructor.name}].create`, e)
|
|
213
224
|
if (e instanceof ValidationError) {
|
|
214
225
|
let validationErrorItems = e.errors;
|
|
@@ -242,7 +253,7 @@ export class Model extends Component {
|
|
|
242
253
|
let result: any;
|
|
243
254
|
try {
|
|
244
255
|
result = await this.model().bulkCreate(p, options)
|
|
245
|
-
} catch (e) {
|
|
256
|
+
} catch (e: any) {
|
|
246
257
|
BaseChyz.debug(`Model[${this.constructor.name}].bulkCreate`, e)
|
|
247
258
|
if (e instanceof ValidationError) {
|
|
248
259
|
let validationErrorItems = e.errors;
|
|
@@ -296,6 +307,14 @@ export class Model extends Component {
|
|
|
296
307
|
return this._model.findAll(...arguments)
|
|
297
308
|
}
|
|
298
309
|
|
|
310
|
+
/**
|
|
311
|
+
* return {count : number , rows: any}
|
|
312
|
+
* @param args
|
|
313
|
+
*/
|
|
314
|
+
public findAndCountAll(...args: any[]) {
|
|
315
|
+
return this._model.findAndCountAll(...arguments)
|
|
316
|
+
}
|
|
317
|
+
|
|
299
318
|
|
|
300
319
|
public validate() {
|
|
301
320
|
|
|
@@ -357,4 +376,5 @@ export class Model extends Component {
|
|
|
357
376
|
return []
|
|
358
377
|
}
|
|
359
378
|
|
|
379
|
+
|
|
360
380
|
}
|
package/base/RestClient.ts
CHANGED
package/dist/base/Model.js
CHANGED
|
@@ -263,6 +263,13 @@ class Model extends Component_1.Component {
|
|
|
263
263
|
findAll(...args) {
|
|
264
264
|
return this._model.findAll(...arguments);
|
|
265
265
|
}
|
|
266
|
+
/**
|
|
267
|
+
* return {count : number , rows: any}
|
|
268
|
+
* @param args
|
|
269
|
+
*/
|
|
270
|
+
findAndCountAll(...args) {
|
|
271
|
+
return this._model.findAndCountAll(...arguments);
|
|
272
|
+
}
|
|
266
273
|
validate() {
|
|
267
274
|
}
|
|
268
275
|
/**
|
package/dist/base/Model.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Model.js","sourceRoot":"","sources":["../../base/Model.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Model.js","sourceRoot":"","sources":["../../base/Model.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;AAEH,2DAAmC;AACnC,gEAAwC;AACxC,2CAAsC;AACtC,qEAAgE;AAChE,yCAAgL;AAChL,8CAAyC;AAEzC,uCAAyC;AAAjC,sGAAA,SAAS,OAAA;AAAE,gGAAA,GAAG,OAAA;AAatB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoDG;AAEH,MAAa,KAAM,SAAQ,qBAAS;IAShC,YAAY,SAAuB;QAC/B,KAAK,EAAE,CAAC;QALJ,gBAAW,GAAQ,EAAE,CAAC;QACtB,YAAO,GAAQ,EAAE,CAAA;QAKrB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QAC/B,oDAAoD;QACpD,IAAI,SAAS,IAAI,IAAI;YACjB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;;YAE5B,IAAI,CAAC,UAAU,GAAG,kBAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QAErD,IAAI,CAAC,eAAK,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,EAAE;YAEnC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,EAAE;gBACrE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE;gBAC3B,UAAU,EAAE,KAAK;gBACjB,SAAS,EAAE,KAAK;gBAChB,QAAQ,EAAE,KAAK;aAClB,CAAC,CAAC;SAEN;aAAM;YACH,MAAM,IAAI,+CAAsB,CAAC,kBAAQ,CAAC,CAAC,CAAC,qDAAqD,CAAC,CAAC,CAAA;SACtG;QAED,eAAe;IAEnB,CAAC;IAGD;;;;;OAKG;IACI,MAAM,CAAC,KAAK;QACf,OAAO,kBAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,EAAE,CAAA;IACzC,CAAC;IAED,IAAI,SAAS;QACT,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IAED,IAAI,SAAS,CAAC,KAAU;QACpB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;IAC5B,CAAC;IAGD;;OAEG;IACH,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAED,IAAI,MAAM,CAAC,KAAU;QACjB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;IACzB,CAAC;IAEM,IAAI;QACP,kBAAQ,CAAC,KAAK,CAAC,gBAAgB,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QACvD;;WAEG;QACH,kBAAQ,CAAC,KAAK,CAAC,mBAAmB,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QAC1D,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE;YACrC,IAAI,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC;YAEvB,IAAI,QAAQ,CAAC,IAAI,IAAI,QAAQ,EAAE;gBAC3B,aAAa;gBACb,OAAO,QAAQ,CAAC,KAAK,CAAA;gBACrB,IAAI,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;aACpC;YACD,EAAE;YACF,IAAI,QAAQ,CAAC,IAAI,IAAI,SAAS,EAAE;gBAC5B,aAAa;gBACb,OAAO,QAAQ,CAAC,KAAK,CAAC;gBACtB,IAAI,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;aACrC;YAED,IAAI,QAAQ,CAAC,IAAI,IAAI,WAAW,EAAE;gBAC9B,aAAa;gBACb,OAAO,QAAQ,CAAC,KAAK,CAAC;gBACtB,IAAI,CAAC,KAAK,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;aACvC;YAED,IAAI,QAAQ,CAAC,IAAI,IAAI,eAAe,EAAE;gBAClC,aAAa;gBACb,OAAO,QAAQ,CAAC,KAAK,CAAC;gBACtB,IAAI,CAAC,KAAK,EAAE,CAAC,aAAa,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;aAC3C;SACJ;IAEL,CAAC;IAGM,KAAK;QACR,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;IACjC,CAAC;IAEM,SAAS;QACZ,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IAEM,QAAQ;QACX,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;IACjC,CAAC;IAEM,KAAK;QACR,OAAO,EAAE,CAAA;IACb,CAAC;IAEM,KAAK;QACR,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAEY,IAAI,CAAC,MAAM,GAAG,EAAE,EAAE,OAAO,GAAG,EAAE;;YACvC,4BAA4B;YAC5B,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;YAC/C,IAAI,MAAW,CAAC;YAChB,IAAI;gBACA,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;aACjD;YAAC,OAAO,CAAC,EAAE;gBACR,kBAAQ,CAAC,KAAK,CAAC,SAAS,IAAI,CAAC,WAAW,CAAC,IAAI,UAAU,EAAE,CAAC,CAAC,CAAA;gBAC3D,IAAI,CAAC,YAAY,2BAAe,EAAE;oBAC9B,IAAI,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;oBACpC,oBAAoB,CAAC,OAAO,CAAC,CAAC,EAAC,OAAO,EAAE,IAAI,EAAC,EAAE,EAAE;wBAC7C,aAAa;wBACb,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAA;oBAChC,CAAC,CAAC,CAAA;oBAEF,OAAO,KAAK,CAAC;iBAChB;qBAAM,IAAI,CAAC,YAAY,yBAAa,EAAE;iBAEtC;qBAAM,IAAI,CAAC,YAAY,wBAAY,EAAE;iBAErC;qBAAM,IAAI,CAAC,YAAY,iCAAqB,EAAE;iBAE9C;qBAAM,IAAI,CAAC,YAAY,qCAAyB,EAAE;iBAElD;qBAAM,IAAI,CAAC,YAAY,oCAAwB,EAAE;iBAEjD;gBACD,MAAM,IAAI,qBAAS,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;aACvD;YAED,OAAO,MAAM,CAAC;QAElB,CAAC;KAAA;IAEY,UAAU,CAAC,MAAM,GAAG,EAAE,EAAE,OAAO,GAAG,EAAE;;YAC7C,4BAA4B;YAC5B,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;YAC/C,IAAI,MAAW,CAAC;YAChB,IAAI;gBACA,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;aACrD;YAAC,OAAO,CAAC,EAAE;gBACR,kBAAQ,CAAC,KAAK,CAAC,SAAS,IAAI,CAAC,WAAW,CAAC,IAAI,cAAc,EAAE,CAAC,CAAC,CAAA;gBAC/D,IAAI,CAAC,YAAY,2BAAe,EAAE;oBAC9B,IAAI,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;oBACpC,oBAAoB,CAAC,OAAO,CAAC,CAAC,EAAC,OAAO,EAAE,IAAI,EAAC,EAAE,EAAE;wBAC7C,aAAa;wBACb,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAA;oBAChC,CAAC,CAAC,CAAA;oBAEF,OAAO,KAAK,CAAC;iBAChB;qBAAM,IAAI,CAAC,YAAY,yBAAa,EAAE;iBAEtC;qBAAM,IAAI,CAAC,YAAY,wBAAY,EAAE;iBAErC;qBAAM,IAAI,CAAC,YAAY,iCAAqB,EAAE;iBAE9C;qBAAM,IAAI,CAAC,YAAY,qCAAyB,EAAE;iBAElD;qBAAM,IAAI,CAAC,YAAY,oCAAwB,EAAE;iBAEjD;gBACD,MAAM,IAAI,qBAAS,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;aACvD;YAED,OAAO,MAAM,CAAC;QAElB,CAAC;KAAA;IAEM,MAAM,CAAC,MAAM,GAAG,EAAE,EAAE,OAAO,GAAG,EAAE;QACnC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;QAC/C,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;IAC1C,CAAC;IAEM,MAAM,CAAC,MAAM,GAAG,EAAE,EAAE,OAAO,GAAG,EAAE;QACnC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;QAC/C,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;IAC1C,CAAC;IAED;;;OAGG;IACI,OAAO,CAAC,GAAG,IAAW;QACzB,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC,CAAA;IAC5C,CAAC;IAED;;;OAGG;IACI,OAAO,CAAC,GAAG,IAAW;QACzB,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC,CAAA;IAC5C,CAAC;IAED;;;OAGG;IACI,eAAe,CAAC,GAAG,IAAW;QACjC,OAAO,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,GAAG,SAAS,CAAC,CAAA;IACpD,CAAC;IAIM,QAAQ;IAEf,CAAC;IAED;;;;OAIG;IACI,IAAI,CAAC,IAAS,EAAE,WAAgB,IAAI;QACvC,IAAI,KAAK,GAAG,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;QAC3D,IAAI,KAAK,KAAK,EAAE,IAAI,CAAC,eAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACtC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACxB,OAAO,IAAI,CAAC;SACf;aAAM,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE;YACpB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YAC/B,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,QAAQ,CAAC,IAAS,EAAE,WAAgB,IAAI;QAC3C,IAAI,KAAK,GAAG,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;QAC3D,IAAI,KAAK,KAAK,EAAE,IAAI,CAAC,eAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACtC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACxB,OAAO,IAAI,CAAC;SACf;aAAM,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE;YACpB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YAC/B,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,YAAY,CAAC,MAAW,EAAE,QAAQ,GAAG,IAAI;QAC5C,IAAI,MAAM,YAAY,MAAM,EAAE;YAC1B,IAAI,UAAU,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YACnC,KAAK,MAAM,QAAQ,IAAI,MAAM,EAAE;gBAC3B,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE;oBACjD,aAAa;oBACb,kBAAQ,CAAC,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,yBAAyB,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAA;oBAClG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;iBACjD;aACJ;SACJ;IACL,CAAC;IAEM,UAAU;QACb,OAAO,EAAE,CAAA;IACb,CAAC;IAED;;;;;OAKG;IACI,SAAS;QACZ,OAAO,EAAE,CAAA;IACb,CAAC;CAKJ;AAlSD,sBAkSC"}
|
|
@@ -10,7 +10,7 @@ exports.ValidationHttpException = void 0;
|
|
|
10
10
|
const BaseError_1 = require("./BaseError");
|
|
11
11
|
class ValidationHttpException extends BaseError_1.BaseError {
|
|
12
12
|
constructor(message) {
|
|
13
|
-
super(message,
|
|
13
|
+
super(message, 403);
|
|
14
14
|
this.message = message;
|
|
15
15
|
}
|
|
16
16
|
}
|
package/dist/package.json
CHANGED
package/package.json
CHANGED