@adaptivestone/framework 5.0.0-beta.12 → 5.0.0-beta.13
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/CHANGELOG.md +4 -0
- package/dist/helpers/files.js +3 -0
- package/dist/helpers/files.js.map +1 -1
- package/dist/models/Migration.d.ts +6 -4
- package/dist/models/Migration.js.map +1 -1
- package/dist/models/Sequence.d.ts +12 -5
- package/dist/models/Sequence.js.map +1 -1
- package/dist/models/User.d.ts +106 -29
- package/dist/models/User.js +25 -11
- package/dist/models/User.js.map +1 -1
- package/dist/modules/AbstractModel.d.ts +2 -5
- package/dist/modules/AbstractModel.js +1 -1
- package/dist/modules/AbstractModel.js.map +1 -1
- package/package.json +3 -2
package/CHANGELOG.md
CHANGED
package/dist/helpers/files.js
CHANGED
|
@@ -21,6 +21,9 @@ const getFilesPathWithInheritance = async ({ internalFolder, externalFolder, log
|
|
|
21
21
|
file.endsWith('.d.ts'))) {
|
|
22
22
|
return false;
|
|
23
23
|
}
|
|
24
|
+
if (!file.endsWith('.js') && !file.endsWith('.ts')) {
|
|
25
|
+
return false;
|
|
26
|
+
}
|
|
24
27
|
if (notHidden && file[0] === '.') {
|
|
25
28
|
// not start with dot
|
|
26
29
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files.js","sourceRoot":"","sources":["../../src/helpers/files.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"files.js","sourceRoot":"","sources":["../../src/helpers/files.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
import AbstractModel from '../modules/AbstractModel.ts';
|
|
2
|
+
interface IMigration {
|
|
3
|
+
migrationFile: string;
|
|
4
|
+
}
|
|
5
|
+
declare class Migration extends AbstractModel<IMigration> {
|
|
4
6
|
get modelSchema(): {
|
|
5
7
|
migrationFile: {
|
|
6
8
|
type: StringConstructor;
|
|
@@ -8,4 +10,4 @@ declare class Migration extends AbstractModel<any, import("../modules/AbstractMo
|
|
|
8
10
|
};
|
|
9
11
|
};
|
|
10
12
|
}
|
|
11
|
-
|
|
13
|
+
export default Migration;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Migration.js","sourceRoot":"","sources":["../../src/models/Migration.
|
|
1
|
+
{"version":3,"file":"Migration.js","sourceRoot":"","sources":["../../src/models/Migration.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,6BAA6B,CAAC;AAMxD,MAAM,SAAU,SAAQ,aAAyB;IAC/C,kDAAkD;IAClD,IAAI,WAAW;QACb,OAAO;YACL,aAAa,EAAE;gBACb,IAAI,EAAE,MAAM;gBACZ,MAAM,EAAE,IAAI;aACb;SACF,CAAC;IACJ,CAAC;CACF;AAED,eAAe,SAAS,CAAC"}
|
|
@@ -1,7 +1,13 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
import AbstractModel from '../modules/AbstractModel.ts';
|
|
2
|
+
import type { IAbstractModel, IAbstractModelMethods } from '../modules/AbstractModel.ts';
|
|
3
|
+
interface ISequence {
|
|
4
|
+
_id: string;
|
|
5
|
+
seq: Number;
|
|
6
|
+
}
|
|
7
|
+
interface IStatic extends IAbstractModel<ISequence, IAbstractModelMethods<ISequence>> {
|
|
8
|
+
getSequence(forType: string): Promise<number>;
|
|
9
|
+
}
|
|
10
|
+
declare class Sequence extends AbstractModel<ISequence, IAbstractModelMethods<ISequence>, IStatic> {
|
|
5
11
|
get modelSchema(): {
|
|
6
12
|
_id: {
|
|
7
13
|
type: StringConstructor;
|
|
@@ -12,5 +18,6 @@ declare class Sequence extends AbstractModel<any, import("../modules/AbstractMod
|
|
|
12
18
|
default: number;
|
|
13
19
|
};
|
|
14
20
|
};
|
|
21
|
+
static getSequence(this: Sequence['mongooseModel'], forType: string): Promise<Number>;
|
|
15
22
|
}
|
|
16
|
-
|
|
23
|
+
export default Sequence;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Sequence.js","sourceRoot":"","sources":["../../src/models/Sequence.
|
|
1
|
+
{"version":3,"file":"Sequence.js","sourceRoot":"","sources":["../../src/models/Sequence.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,6BAA6B,CAAC;AAiBxD,MAAM,QAAS,SAAQ,aAItB;IACC,kDAAkD;IAClD,IAAI,WAAW;QACb,OAAO;YACL,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;YACrC,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE;SAClC,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,WAAW,CAAkC,OAAe;QACvE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAC3C,EAAE,GAAG,EAAE,OAAO,EAAE,EAChB,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EACpB,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAC5B,CAAC;QACF,OAAO,QAAQ,CAAC,GAAG,CAAC;IACtB,CAAC;CACF;AAED,eAAe,QAAQ,CAAC"}
|
package/dist/models/User.d.ts
CHANGED
|
@@ -1,22 +1,55 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
1
|
+
import AbstractModel from '../modules/AbstractModel.ts';
|
|
2
|
+
import type { TFunction } from 'i18next';
|
|
3
|
+
import type { IApp } from '../server.ts';
|
|
4
|
+
import type { IAbstractModel, IAbstractModelMethods } from '../modules/AbstractModel.ts';
|
|
5
|
+
interface IUser {
|
|
6
|
+
avatar: string;
|
|
7
|
+
name: {
|
|
8
|
+
first: string;
|
|
9
|
+
last: string;
|
|
10
|
+
nick: string;
|
|
11
|
+
};
|
|
12
|
+
password: string;
|
|
13
|
+
email: string;
|
|
14
|
+
sessionTokens: {
|
|
15
|
+
token: string;
|
|
16
|
+
valid: Date;
|
|
17
|
+
}[];
|
|
18
|
+
verificationTokens: {
|
|
19
|
+
until: Date;
|
|
20
|
+
token: string;
|
|
21
|
+
}[];
|
|
22
|
+
passwordRecoveryTokens: {
|
|
23
|
+
until: Date;
|
|
24
|
+
token: string;
|
|
25
|
+
}[];
|
|
26
|
+
permissions: string[];
|
|
27
|
+
roles: string[];
|
|
28
|
+
isVerified: boolean;
|
|
29
|
+
locale: string;
|
|
30
|
+
languages: string[];
|
|
31
|
+
}
|
|
32
|
+
interface IStatic extends IAbstractModel<IUser, IAbstractModelMethods<IUser>> {
|
|
33
|
+
getUserByEmailAndPassword(email: string, password: string): Promise<InstanceType<User['mongooseModel']> | false>;
|
|
34
|
+
hashPassword(password: string): Promise<string>;
|
|
35
|
+
getUserByToken(token: string): Promise<InstanceType<User['mongooseModel']> | false>;
|
|
36
|
+
getUserByEmail(email: string): Promise<InstanceType<User['mongooseModel']> | false>;
|
|
37
|
+
getUserByPasswordRecoveryToken(token: string): Promise<InstanceType<User['mongooseModel']> | false>;
|
|
38
|
+
generateUserPasswordRecoveryToken(user: InstanceType<User['mongooseModel']>): Promise<{
|
|
39
|
+
token: string;
|
|
40
|
+
until: Date;
|
|
10
41
|
}>;
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
token:
|
|
14
|
-
until:
|
|
42
|
+
getUserByVerificationToken(token: string): Promise<InstanceType<User['mongooseModel']> | false>;
|
|
43
|
+
generateUserVerificationToken(user: InstanceType<User['mongooseModel']>): Promise<{
|
|
44
|
+
token: string;
|
|
45
|
+
until: Date;
|
|
15
46
|
}>;
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
hashRounds:
|
|
19
|
-
saltSecret:
|
|
47
|
+
}
|
|
48
|
+
declare class User extends AbstractModel<IUser, IAbstractModelMethods<IUser>, IStatic> {
|
|
49
|
+
hashRounds: number;
|
|
50
|
+
saltSecret: string;
|
|
51
|
+
constructor(app: IApp);
|
|
52
|
+
initHooks(): void;
|
|
20
53
|
get modelSchema(): {
|
|
21
54
|
avatar: {
|
|
22
55
|
type: StringConstructor;
|
|
@@ -82,20 +115,64 @@ declare class User extends AbstractModel<any, import("../modules/AbstractModel.t
|
|
|
82
115
|
};
|
|
83
116
|
languages: StringConstructor[];
|
|
84
117
|
};
|
|
85
|
-
|
|
86
|
-
|
|
118
|
+
static getUserByEmailAndPassword(this: User['mongooseModel'], email: string, password: string): Promise<false | (import("mongoose").Document<unknown, {}, IUser> & Omit<IUser & {
|
|
119
|
+
_id: import("mongoose").Types.ObjectId;
|
|
120
|
+
} & {
|
|
121
|
+
__v: number;
|
|
122
|
+
}, "getSuper"> & IAbstractModelMethods<IUser>)>;
|
|
123
|
+
generateToken(this: InstanceType<User['mongooseModel']>): Promise<{
|
|
124
|
+
token: string;
|
|
87
125
|
valid: Date;
|
|
88
126
|
}>;
|
|
89
|
-
getPublic(): {
|
|
90
|
-
avatar:
|
|
91
|
-
name:
|
|
92
|
-
|
|
127
|
+
getPublic(this: InstanceType<User['mongooseModel']>): {
|
|
128
|
+
avatar: string;
|
|
129
|
+
name: {
|
|
130
|
+
first: string;
|
|
131
|
+
last: string;
|
|
132
|
+
nick: string;
|
|
133
|
+
};
|
|
134
|
+
email: string;
|
|
93
135
|
id: any;
|
|
94
|
-
isVerified:
|
|
95
|
-
permissions:
|
|
96
|
-
locale:
|
|
136
|
+
isVerified: boolean;
|
|
137
|
+
permissions: string[];
|
|
138
|
+
locale: string;
|
|
97
139
|
};
|
|
98
|
-
|
|
99
|
-
|
|
140
|
+
static hashPassword(this: User['mongooseModel'], password: string): Promise<string>;
|
|
141
|
+
static getUserByToken(this: User['mongooseModel'], token: string): Promise<false | (import("mongoose").Document<unknown, {}, IUser> & Omit<IUser & {
|
|
142
|
+
_id: import("mongoose").Types.ObjectId;
|
|
143
|
+
} & {
|
|
144
|
+
__v: number;
|
|
145
|
+
}, "getSuper"> & IAbstractModelMethods<IUser>)>;
|
|
146
|
+
static getUserByEmail(this: User['mongooseModel'], email: string): Promise<false | (import("mongoose").Document<unknown, {}, IUser> & Omit<IUser & {
|
|
147
|
+
_id: import("mongoose").Types.ObjectId;
|
|
148
|
+
} & {
|
|
149
|
+
__v: number;
|
|
150
|
+
}, "getSuper"> & IAbstractModelMethods<IUser>)>;
|
|
151
|
+
static generateUserPasswordRecoveryToken(userMongoose: InstanceType<User['mongooseModel']>): Promise<{
|
|
152
|
+
token: string;
|
|
153
|
+
until: number;
|
|
154
|
+
}>;
|
|
155
|
+
static getUserByPasswordRecoveryToken(this: User['mongooseModel'], passwordRecoveryToken: string): Promise<import("mongoose").Document<unknown, {}, IUser> & Omit<IUser & {
|
|
156
|
+
_id: import("mongoose").Types.ObjectId;
|
|
157
|
+
} & {
|
|
158
|
+
__v: number;
|
|
159
|
+
}, "getSuper"> & IAbstractModelMethods<IUser>>;
|
|
160
|
+
sendPasswordRecoveryEmail(this: InstanceType<User['mongooseModel']>, i18n: {
|
|
161
|
+
t: TFunction;
|
|
162
|
+
language: string;
|
|
163
|
+
}): Promise<any>;
|
|
164
|
+
static generateUserVerificationToken(userMongoose: InstanceType<User['mongooseModel']>): Promise<{
|
|
165
|
+
token: string;
|
|
166
|
+
until: number;
|
|
167
|
+
}>;
|
|
168
|
+
static getUserByVerificationToken(this: User['mongooseModel'], verificationToken: string): Promise<import("mongoose").Document<unknown, {}, IUser> & Omit<IUser & {
|
|
169
|
+
_id: import("mongoose").Types.ObjectId;
|
|
170
|
+
} & {
|
|
171
|
+
__v: number;
|
|
172
|
+
}, "getSuper"> & IAbstractModelMethods<IUser>>;
|
|
173
|
+
sendVerificationEmail(this: InstanceType<User['mongooseModel']>, i18n: {
|
|
174
|
+
t: TFunction;
|
|
175
|
+
language: string;
|
|
176
|
+
}): Promise<any>;
|
|
100
177
|
}
|
|
101
|
-
|
|
178
|
+
export default User;
|
package/dist/models/User.js
CHANGED
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
import { scrypt } from 'node:crypto';
|
|
2
2
|
import { promisify } from 'node:util';
|
|
3
3
|
import AbstractModel from "../modules/AbstractModel.js";
|
|
4
|
+
const scryptAsync = promisify(scrypt);
|
|
4
5
|
class User extends AbstractModel {
|
|
6
|
+
hashRounds;
|
|
7
|
+
saltSecret;
|
|
5
8
|
constructor(app) {
|
|
6
9
|
super(app);
|
|
7
10
|
const authConfig = this.app.getConfig('auth');
|
|
@@ -75,8 +78,11 @@ class User extends AbstractModel {
|
|
|
75
78
|
async generateToken() {
|
|
76
79
|
const timestamp = new Date();
|
|
77
80
|
timestamp.setDate(timestamp.getDate() + 30);
|
|
78
|
-
const
|
|
79
|
-
|
|
81
|
+
const data = await scryptAsync(this.email + Date.now(),
|
|
82
|
+
// @ts-ignore
|
|
83
|
+
this.getSuper().saltSecret,
|
|
84
|
+
// @ts-ignore
|
|
85
|
+
this.getSuper().hashRounds);
|
|
80
86
|
const token = data.toString('base64url');
|
|
81
87
|
this.sessionTokens.push({ token, valid: timestamp });
|
|
82
88
|
await this.save();
|
|
@@ -94,8 +100,11 @@ class User extends AbstractModel {
|
|
|
94
100
|
};
|
|
95
101
|
}
|
|
96
102
|
static async hashPassword(password) {
|
|
97
|
-
const
|
|
98
|
-
|
|
103
|
+
const data = await scryptAsync(String(password),
|
|
104
|
+
// @ts-ignore
|
|
105
|
+
this.getSuper().saltSecret,
|
|
106
|
+
// @ts-ignore
|
|
107
|
+
this.getSuper().hashRounds);
|
|
99
108
|
return data.toString('base64url');
|
|
100
109
|
}
|
|
101
110
|
static async getUserByToken(token) {
|
|
@@ -112,8 +121,11 @@ class User extends AbstractModel {
|
|
|
112
121
|
static async generateUserPasswordRecoveryToken(userMongoose) {
|
|
113
122
|
const date = new Date();
|
|
114
123
|
date.setDate(date.getDate() + 14);
|
|
115
|
-
const
|
|
116
|
-
|
|
124
|
+
const data = await scryptAsync(userMongoose.email + Date.now(),
|
|
125
|
+
// @ts-ignore
|
|
126
|
+
userMongoose.getSuper().saltSecret,
|
|
127
|
+
// @ts-ignore
|
|
128
|
+
userMongoose.getSuper().hashRounds);
|
|
117
129
|
const token = data.toString('base64url');
|
|
118
130
|
// if (err) {
|
|
119
131
|
// this.logger.error("Hash 2 error ", err);
|
|
@@ -153,7 +165,7 @@ class User extends AbstractModel {
|
|
|
153
165
|
}
|
|
154
166
|
catch {
|
|
155
167
|
const error = 'Mailer not found. Please install @adaptivestone/framework-module-email in order to use it';
|
|
156
|
-
this.getSuper().logger
|
|
168
|
+
this.getSuper().logger?.error(error);
|
|
157
169
|
return false;
|
|
158
170
|
}
|
|
159
171
|
const mail = new Mailer(this.getSuper().app, 'recovery', {
|
|
@@ -165,8 +177,11 @@ class User extends AbstractModel {
|
|
|
165
177
|
static async generateUserVerificationToken(userMongoose) {
|
|
166
178
|
const date = new Date();
|
|
167
179
|
date.setDate(date.getDate() + 14);
|
|
168
|
-
const
|
|
169
|
-
|
|
180
|
+
const data = await scryptAsync(userMongoose.email + Date.now(),
|
|
181
|
+
// @ts-ignore
|
|
182
|
+
userMongoose.getSuper().saltSecret,
|
|
183
|
+
// @ts-ignore
|
|
184
|
+
userMongoose.getSuper().hashRounds);
|
|
170
185
|
const token = data.toString('base64url');
|
|
171
186
|
// if (err) {
|
|
172
187
|
// this.logger.error("Hash 2 error ", err);
|
|
@@ -211,12 +226,11 @@ class User extends AbstractModel {
|
|
|
211
226
|
let Mailer;
|
|
212
227
|
try {
|
|
213
228
|
// @ts-ignore
|
|
214
|
-
// eslint-disable-next-line import-x/no-unresolved
|
|
215
229
|
Mailer = (await import('@adaptivestone/framework-module-email')).default;
|
|
216
230
|
}
|
|
217
231
|
catch {
|
|
218
232
|
const error = 'Mailer not found. Please install @adaptivestone/framework-module-email in order to use it';
|
|
219
|
-
this.getSuper().logger
|
|
233
|
+
this.getSuper().logger?.error(error);
|
|
220
234
|
return false;
|
|
221
235
|
}
|
|
222
236
|
const mail = new Mailer(this.getSuper().app, 'verification', {
|
package/dist/models/User.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"User.js","sourceRoot":"","sources":["../../src/models/User.
|
|
1
|
+
{"version":3,"file":"User.js","sourceRoot":"","sources":["../../src/models/User.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,11 @@
|
|
|
1
1
|
import Base from './Base.ts';
|
|
2
2
|
import type { IApp } from '../server.ts';
|
|
3
3
|
import type { Schema, Model } from 'mongoose';
|
|
4
|
-
export interface IAbstractModelStatics<T> {
|
|
5
|
-
getSuper(): AbstractModel<T>;
|
|
6
|
-
}
|
|
7
4
|
export interface IAbstractModelMethods<T> {
|
|
8
|
-
getSuper(): AbstractModel<T
|
|
5
|
+
getSuper(): AbstractModel<T> & this;
|
|
9
6
|
}
|
|
10
7
|
export interface IAbstractModel<IDocument, IMethods> extends Model<IDocument, {}, IMethods> {
|
|
11
|
-
getSuper(): AbstractModel<IDocument
|
|
8
|
+
getSuper(): AbstractModel<IDocument> & this;
|
|
12
9
|
}
|
|
13
10
|
declare class AbstractModel<IDocument = {}, IMethods extends IAbstractModelMethods<IDocument> = IAbstractModelMethods<IDocument>, IModel extends IAbstractModel<IDocument, IMethods> = IAbstractModel<IDocument, IMethods>> extends Base {
|
|
14
11
|
mongooseSchema: Schema<IDocument, IModel, IMethods>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractModel.js","sourceRoot":"","sources":["../../src/modules/AbstractModel.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"AbstractModel.js","sourceRoot":"","sources":["../../src/modules/AbstractModel.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@adaptivestone/framework",
|
|
3
|
-
"version": "5.0.0-beta.
|
|
3
|
+
"version": "5.0.0-beta.13",
|
|
4
4
|
"description": "Adaptive stone node js framework",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"engines": {
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
},
|
|
13
13
|
"repository": {
|
|
14
14
|
"type": "git",
|
|
15
|
-
"url": "https://github.com/adaptivestone/framework"
|
|
15
|
+
"url": "git+https://github.com/adaptivestone/framework.git"
|
|
16
16
|
},
|
|
17
17
|
"homepage": "https://framework.adaptivestone.com/",
|
|
18
18
|
"scripts": {
|
|
@@ -27,6 +27,7 @@
|
|
|
27
27
|
"lint:fix": "eslint --fix",
|
|
28
28
|
"codestyle": "npm run prettier && npm run lint",
|
|
29
29
|
"prepare": "husky",
|
|
30
|
+
"prepublishOnly": "npm run build",
|
|
30
31
|
"cli": "node cliCommand.ts",
|
|
31
32
|
"benchmark": "h2load -n 10000 -c 50 -p 'http/1.1' http://localhost:3300/",
|
|
32
33
|
"benchmark2": "h2load -n 10000 -c 50 https://localhost:3300/",
|