chyz 1.0.13-rc.10 → 1.0.13-rc.11
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/Examples/Controllers/ApiController.ts +9 -6
- package/Examples/Controllers/BasicApiController.ts +121 -0
- package/Examples/Controllers/SiteController.ts +26 -9
- package/Examples/Models/KeycloakUser.ts +4 -0
- package/Examples/Models/User.ts +8 -1
- package/Examples/log/app.log +723 -0
- package/Examples/log/errors.log +85 -0
- package/Examples/yarn.lock +2549 -0
- package/base/Model.ts +24 -23
- package/base/ModelManager.ts +6 -1
- package/dist/base/Model.js.map +1 -1
- package/dist/base/ModelManager.js +0 -8
- package/dist/base/ModelManager.js.map +1 -1
- package/dist/filters/auth/HttpBasicAuth.js +65 -0
- package/dist/filters/auth/HttpBasicAuth.js.map +1 -1
- package/dist/package.json +2 -2
- package/dist/rbac/AuthManager.js.map +1 -1
- package/filters/auth/HttpBasicAuth.ts +68 -0
- package/package.json +2 -2
- package/rbac/AuthManager.ts +2 -0
- package/web/IdentityInterface.ts +6 -0
- package/package-lock.json +0 -5259
package/base/Model.ts
CHANGED
|
@@ -14,15 +14,15 @@ import {Exception} from "./db/Exception";
|
|
|
14
14
|
|
|
15
15
|
export {DataTypes, NOW} from "sequelize";
|
|
16
16
|
|
|
17
|
-
export interface Relation{
|
|
18
|
-
type:
|
|
19
|
-
allowNull?:boolean,
|
|
20
|
-
sourceKey?:string,
|
|
21
|
-
model:SModel,
|
|
22
|
-
foreignKey:string,
|
|
23
|
-
name?:string,
|
|
24
|
-
through?:any,
|
|
25
|
-
as?:string
|
|
17
|
+
export interface Relation {
|
|
18
|
+
type: "hasOne" | "hasMany" | "belongsToMany" | "belongsTo",
|
|
19
|
+
allowNull?: boolean,
|
|
20
|
+
sourceKey?: string,
|
|
21
|
+
model: SModel,
|
|
22
|
+
foreignKey: string,
|
|
23
|
+
name?: string,
|
|
24
|
+
through?: any,
|
|
25
|
+
as?: string
|
|
26
26
|
}
|
|
27
27
|
|
|
28
28
|
/**
|
|
@@ -80,7 +80,8 @@ export interface Relation{
|
|
|
80
80
|
*/
|
|
81
81
|
|
|
82
82
|
export class Model extends Component {
|
|
83
|
-
_sequelize: any
|
|
83
|
+
_sequelize: any;
|
|
84
|
+
_register: any;
|
|
84
85
|
private _tableName: string;
|
|
85
86
|
private _model: any;
|
|
86
87
|
private _attributes: any = {};
|
|
@@ -101,7 +102,7 @@ export class Model extends Component {
|
|
|
101
102
|
tableName: this.tableName(),
|
|
102
103
|
timestamps: false,
|
|
103
104
|
createdAt: false,
|
|
104
|
-
updateAt:false
|
|
105
|
+
updateAt: false
|
|
105
106
|
});
|
|
106
107
|
|
|
107
108
|
} else {
|
|
@@ -119,8 +120,7 @@ export class Model extends Component {
|
|
|
119
120
|
* You may override this method if you want to use a different database connection.
|
|
120
121
|
* @return Connection the database connection used by this AR class.
|
|
121
122
|
*/
|
|
122
|
-
public static getDb()
|
|
123
|
-
{
|
|
123
|
+
public static getDb() {
|
|
124
124
|
return BaseChyz.getComponent("db").db
|
|
125
125
|
}
|
|
126
126
|
|
|
@@ -153,28 +153,28 @@ export class Model extends Component {
|
|
|
153
153
|
for (const relation of this.relations()) {
|
|
154
154
|
let m = relation.model;
|
|
155
155
|
|
|
156
|
-
if(relation.type=="hasOne"
|
|
156
|
+
if (relation.type == "hasOne") {
|
|
157
157
|
// @ts-ignore
|
|
158
158
|
delete relation.model
|
|
159
|
-
this.model().hasOne(m, relation
|
|
159
|
+
this.model().hasOne(m, relation);
|
|
160
160
|
}
|
|
161
|
-
|
|
162
|
-
if(relation.type=="hasMany"
|
|
161
|
+
//
|
|
162
|
+
if (relation.type == "hasMany") {
|
|
163
163
|
// @ts-ignore
|
|
164
164
|
delete relation.model;
|
|
165
|
-
this.model().hasMany(m, relation
|
|
165
|
+
this.model().hasMany(m, relation);
|
|
166
166
|
}
|
|
167
167
|
|
|
168
|
-
if(relation.type=="belongsTo"
|
|
168
|
+
if (relation.type == "belongsTo") {
|
|
169
169
|
// @ts-ignore
|
|
170
170
|
delete relation.model;
|
|
171
|
-
this.model().belongsTo(m, relation
|
|
171
|
+
this.model().belongsTo(m, relation);
|
|
172
172
|
}
|
|
173
173
|
|
|
174
|
-
if(relation.type=="belongsToMany"
|
|
174
|
+
if (relation.type == "belongsToMany") {
|
|
175
175
|
// @ts-ignore
|
|
176
176
|
delete relation.model;
|
|
177
|
-
this.model().belongsToMany(m, relation
|
|
177
|
+
this.model().belongsToMany(m, relation);
|
|
178
178
|
}
|
|
179
179
|
}
|
|
180
180
|
|
|
@@ -348,7 +348,8 @@ export class Model extends Component {
|
|
|
348
348
|
*
|
|
349
349
|
* ]
|
|
350
350
|
*/
|
|
351
|
-
public relations():Relation[]{
|
|
351
|
+
public relations(): Relation[] {
|
|
352
352
|
return []
|
|
353
353
|
}
|
|
354
|
+
|
|
354
355
|
}
|
package/base/ModelManager.ts
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import {Model} from "./Model"
|
|
2
|
+
|
|
1
3
|
/*
|
|
2
4
|
*
|
|
3
5
|
* Copyright (c) 2021.. Chy Bilgisayar Bilisim
|
|
@@ -6,9 +8,12 @@
|
|
|
6
8
|
* Github:https://github.com/cihan53/
|
|
7
9
|
*
|
|
8
10
|
*/
|
|
11
|
+
interface ObjectConstructor {
|
|
12
|
+
_register(o: Model): void;
|
|
13
|
+
}
|
|
9
14
|
|
|
10
15
|
export const ModelManager: any = {
|
|
11
|
-
_register(map:
|
|
16
|
+
_register(map: Model) {
|
|
12
17
|
Object.assign(this, map)
|
|
13
18
|
}
|
|
14
19
|
}
|
package/dist/base/Model.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
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;
|
|
1
|
+
{"version":3,"file":"Model.js","sourceRoot":"","sources":["../../base/Model.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
/*
|
|
3
|
-
*
|
|
4
|
-
* Copyright (c) 2021.. Chy Bilgisayar Bilisim
|
|
5
|
-
* Author: Cihan Ozturk
|
|
6
|
-
* E-mail: cihan@chy.com.tr
|
|
7
|
-
* Github:https://github.com/cihan53/
|
|
8
|
-
*
|
|
9
|
-
*/
|
|
10
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
11
3
|
exports.ModelManager = void 0;
|
|
12
4
|
exports.ModelManager = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModelManager.js","sourceRoot":"","sources":["../../base/ModelManager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ModelManager.js","sourceRoot":"","sources":["../../base/ModelManager.ts"],"names":[],"mappings":";;;AAca,QAAA,YAAY,GAAQ;IAC7B,SAAS,CAAC,GAAU;QAChB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;IAC5B,CAAC;CACJ,CAAA"}
|
|
@@ -5,4 +5,69 @@
|
|
|
5
5
|
* E-mail: cihan@chy.com.tr
|
|
6
6
|
* Github:https://github.com/cihan53/
|
|
7
7
|
*/
|
|
8
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
9
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
10
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
11
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
12
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
13
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
14
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
15
|
+
});
|
|
16
|
+
};
|
|
17
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
18
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
19
|
+
};
|
|
20
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
21
|
+
exports.HttpBasicAuth = void 0;
|
|
22
|
+
const AuthMethod_1 = require("./AuthMethod");
|
|
23
|
+
const base_1 = require("../../base");
|
|
24
|
+
const BaseChyz_1 = __importDefault(require("../../BaseChyz"));
|
|
25
|
+
class HttpBasicAuth extends AuthMethod_1.AuthMethod {
|
|
26
|
+
constructor() {
|
|
27
|
+
super(...arguments);
|
|
28
|
+
/**
|
|
29
|
+
* @var string the HTTP header name
|
|
30
|
+
*/
|
|
31
|
+
this.header = 'Authorization';
|
|
32
|
+
/**
|
|
33
|
+
* @var string a pattern to use to extract the HTTP authentication value
|
|
34
|
+
*/
|
|
35
|
+
this.pattern = /^Basic\s+(.*?)$/;
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* @throws InvalidConfigException
|
|
39
|
+
*/
|
|
40
|
+
init() {
|
|
41
|
+
var _a;
|
|
42
|
+
super.init();
|
|
43
|
+
if (!this.pattern) {
|
|
44
|
+
throw new base_1.InvalidConfigException('You must provide pattern to use to extract the HTTP authentication value!');
|
|
45
|
+
}
|
|
46
|
+
this.user = (_a = BaseChyz_1.default.getComponent("user")) !== null && _a !== void 0 ? _a : null;
|
|
47
|
+
}
|
|
48
|
+
authenticate(user, request, response) {
|
|
49
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
50
|
+
let autHeader = this.getHeaderByKey(request.headers, this.header);
|
|
51
|
+
if (autHeader == null || (autHeader = this.patternCheck(autHeader, this.pattern)) == null) {
|
|
52
|
+
return null;
|
|
53
|
+
}
|
|
54
|
+
let basicauth = autHeader[1].split(":");
|
|
55
|
+
let identity = yield user.loginByAccessToken(basicauth, "HttpBasicAuth");
|
|
56
|
+
if (identity === null) {
|
|
57
|
+
this.challenge(response);
|
|
58
|
+
this.handleFailure(response);
|
|
59
|
+
}
|
|
60
|
+
return identity;
|
|
61
|
+
return null;
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
/**
|
|
65
|
+
* @throws UnauthorizedHttpException
|
|
66
|
+
*/
|
|
67
|
+
fail(response) {
|
|
68
|
+
this.challenge(response);
|
|
69
|
+
this.handleFailure(response);
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
exports.HttpBasicAuth = HttpBasicAuth;
|
|
8
73
|
//# sourceMappingURL=HttpBasicAuth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpBasicAuth.js","sourceRoot":"","sources":["../../../filters/auth/HttpBasicAuth.ts"],"names":[],"mappings":";AAAA;;;;;GAKG"}
|
|
1
|
+
{"version":3,"file":"HttpBasicAuth.js","sourceRoot":"","sources":["../../../filters/auth/HttpBasicAuth.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;AAMH,6CAAwC;AACxC,qCAAkD;AAClD,8DAAsC;AAEtC,MAAa,aAAc,SAAQ,uBAAU;IAA7C;;QAEI;;WAEG;QACI,WAAM,GAAG,eAAe,CAAC;QAGhC;;WAEG;QAEI,YAAO,GAAG,iBAAiB,CAAC;IA+CvC,CAAC;IA5CG;;OAEG;IACI,IAAI;;QACP,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,MAAM,IAAI,6BAAsB,CAAC,2EAA2E,CAAC,CAAC;SACjH;QAED,IAAI,CAAC,IAAI,GAAG,MAAA,kBAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,mCAAI,IAAI,CAAC;IACtD,CAAC;IAGK,YAAY,CAAC,IAAa,EAAE,OAAe,EAAE,QAAiB;;YAGhE,IAAI,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;YACjE,IAAI,SAAS,IAAI,IAAI,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,IAAI,EAAE;gBACvF,OAAO,IAAI,CAAC;aACf;YAED,IAAI,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAEvC,IAAI,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;YACzE,IAAI,QAAQ,KAAK,IAAI,EAAE;gBACnB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;gBACzB,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;aAChC;YAED,OAAO,QAAQ,CAAC;YAGhB,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IAGD;;OAEG;IACI,IAAI,CAAC,QAAiB;QACzB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;QACxB,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IACjC,CAAC;CACJ;AA3DD,sCA2DC"}
|
package/dist/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "chyz",
|
|
3
|
-
"version": " 1.0.13-rc.
|
|
3
|
+
"version": " 1.0.13-rc.11",
|
|
4
4
|
"description": "Nodejs Micro service Framework",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
7
7
|
"dev": "nodemon -t --trace-warnings index.ts",
|
|
8
8
|
"debug": "ts-node index.ts",
|
|
9
9
|
"build": "rmdir /S /Q .\\dist && npx tsc && xcopy .\\log .\\dist\\log /e /i /h /Y && copy .\\package.json .\\dist\\package.json",
|
|
10
|
-
"publish": "
|
|
10
|
+
"publish": "npm publish",
|
|
11
11
|
"test": "echo \"Error: no test specified\" && exit 1",
|
|
12
12
|
"postversion": "git push && git push --tags"
|
|
13
13
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthManager.js","sourceRoot":"","sources":["../../rbac/AuthManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kCAAgD;AAChD,oCAA4D;AAC5D,gEAAwC;
|
|
1
|
+
{"version":3,"file":"AuthManager.js","sourceRoot":"","sources":["../../rbac/AuthManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,3 +5,71 @@
|
|
|
5
5
|
* Github:https://github.com/cihan53/
|
|
6
6
|
*/
|
|
7
7
|
|
|
8
|
+
import {HttpHeaderAuth} from "./HttpHeaderAuth";
|
|
9
|
+
import {Request, Response} from "express";
|
|
10
|
+
import {WebUser} from "../../web/WebUser";
|
|
11
|
+
import Utils from "../../requiments/Utils";
|
|
12
|
+
import {AuthMethod} from "./AuthMethod";
|
|
13
|
+
import {InvalidConfigException} from "../../base";
|
|
14
|
+
import BaseChyz from "../../BaseChyz";
|
|
15
|
+
|
|
16
|
+
export class HttpBasicAuth extends AuthMethod {
|
|
17
|
+
|
|
18
|
+
/**
|
|
19
|
+
* @var string the HTTP header name
|
|
20
|
+
*/
|
|
21
|
+
public header = 'Authorization';
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* @var string a pattern to use to extract the HTTP authentication value
|
|
26
|
+
*/
|
|
27
|
+
|
|
28
|
+
public pattern = /^Basic\s+(.*?)$/;
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
/**
|
|
32
|
+
* @throws InvalidConfigException
|
|
33
|
+
*/
|
|
34
|
+
public init(): void {
|
|
35
|
+
super.init();
|
|
36
|
+
|
|
37
|
+
if (!this.pattern) {
|
|
38
|
+
throw new InvalidConfigException('You must provide pattern to use to extract the HTTP authentication value!');
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
this.user = BaseChyz.getComponent("user") ?? null;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
|
|
45
|
+
async authenticate(user: WebUser, request:Request, response:Response) {
|
|
46
|
+
|
|
47
|
+
|
|
48
|
+
let autHeader = this.getHeaderByKey(request.headers, this.header)
|
|
49
|
+
if (autHeader == null || (autHeader = this.patternCheck(autHeader, this.pattern)) == null) {
|
|
50
|
+
return null;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
let basicauth = autHeader[1].split(":")
|
|
54
|
+
|
|
55
|
+
let identity = await user.loginByAccessToken(basicauth, "HttpBasicAuth");
|
|
56
|
+
if (identity === null) {
|
|
57
|
+
this.challenge(response);
|
|
58
|
+
this.handleFailure(response);
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
return identity;
|
|
62
|
+
|
|
63
|
+
|
|
64
|
+
return null;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
|
|
68
|
+
/**
|
|
69
|
+
* @throws UnauthorizedHttpException
|
|
70
|
+
*/
|
|
71
|
+
public fail(response:Response): void {
|
|
72
|
+
this.challenge(response)
|
|
73
|
+
this.handleFailure(response);
|
|
74
|
+
}
|
|
75
|
+
}
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "chyz",
|
|
3
|
-
"version": " 1.0.13-rc.
|
|
3
|
+
"version": " 1.0.13-rc.11",
|
|
4
4
|
"description": "Nodejs Micro service Framework",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
7
7
|
"dev": "nodemon -t --trace-warnings index.ts",
|
|
8
8
|
"debug": "ts-node index.ts",
|
|
9
9
|
"build": "rmdir /S /Q .\\dist && npx tsc && xcopy .\\log .\\dist\\log /e /i /h /Y && copy .\\package.json .\\dist\\package.json",
|
|
10
|
-
"publish": "
|
|
10
|
+
"publish": "npm publish",
|
|
11
11
|
"test": "echo \"Error: no test specified\" && exit 1",
|
|
12
12
|
"postversion": "git push && git push --tags"
|
|
13
13
|
},
|
package/rbac/AuthManager.ts
CHANGED
|
@@ -9,6 +9,7 @@ interface Role {
|
|
|
9
9
|
description: string;
|
|
10
10
|
ruleName: string;
|
|
11
11
|
data: string;
|
|
12
|
+
params:string;
|
|
12
13
|
}
|
|
13
14
|
|
|
14
15
|
interface Permission {
|
|
@@ -17,6 +18,7 @@ interface Permission {
|
|
|
17
18
|
description: string;
|
|
18
19
|
ruleName: string;
|
|
19
20
|
data: string;
|
|
21
|
+
params:string;
|
|
20
22
|
}
|
|
21
23
|
|
|
22
24
|
|
package/web/IdentityInterface.ts
CHANGED