@volcanicminds/typeorm 0.0.14 → 0.0.16

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.
Files changed (19) hide show
  1. package/dist/lib/entities/user.e.d.ts +4 -1
  2. package/dist/lib/entities/user.e.js +16 -1
  3. package/dist/lib/entities/user.e.js.map +1 -1
  4. package/dist/lib/loader/userManager.d.ts +11 -6
  5. package/dist/lib/loader/userManager.js +153 -21
  6. package/dist/lib/loader/userManager.js.map +1 -1
  7. package/dist/lib/query.d.ts +3 -2
  8. package/dist/lib/query.js +8 -7
  9. package/dist/lib/query.js.map +1 -1
  10. package/esm/lib/entities/user.e.d.ts +4 -1
  11. package/esm/lib/entities/user.e.js +16 -1
  12. package/esm/lib/entities/user.e.js.map +1 -1
  13. package/esm/lib/loader/userManager.d.ts +11 -6
  14. package/esm/lib/loader/userManager.js +135 -16
  15. package/esm/lib/loader/userManager.js.map +1 -1
  16. package/esm/lib/query.d.ts +3 -2
  17. package/esm/lib/query.js +8 -7
  18. package/esm/lib/query.js.map +1 -1
  19. package/package.json +1 -1
package/dist/lib/entities/user.e.d.ts CHANGED
@@ -1,9 +1,12 @@
1
1
  import { BaseEntity } from 'typeorm';
2
2
  export declare class User extends BaseEntity {
3
- id: number;
3
+ id: string;
4
+ externalId: string;
4
5
  username: string;
5
6
  email: string;
6
7
  password: string;
8
+ enabled: boolean;
9
+ enabledAt: Date;
7
10
  roles: string[];
8
11
  version: number;
9
12
  createdAt: Date;
package/dist/lib/entities/user.e.js CHANGED
@@ -11,12 +11,18 @@ var __metadata = (this && this.__metadata) || function (k, v) {
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.User = void 0;
13
13
  const typeorm_1 = require("typeorm");
14
+ const Crypto = require('crypto');
14
15
  let User = class User extends typeorm_1.BaseEntity {
15
16
  };
16
17
  __decorate([
17
18
  (0, typeorm_1.PrimaryGeneratedColumn)('uuid'),
18
- __metadata("design:type", Number)
19
+ __metadata("design:type", String)
19
20
  ], User.prototype, "id", void 0);
21
+ __decorate([
22
+ (0, typeorm_1.Index)(),
23
+ (0, typeorm_1.Column)(),
24
+ __metadata("design:type", String)
25
+ ], User.prototype, "externalId", void 0);
20
26
  __decorate([
21
27
  (0, typeorm_1.Index)(),
22
28
  (0, typeorm_1.Column)(),
@@ -31,6 +37,14 @@ __decorate([
31
37
  (0, typeorm_1.Column)(),
32
38
  __metadata("design:type", String)
33
39
  ], User.prototype, "password", void 0);
40
+ __decorate([
41
+ (0, typeorm_1.Column)(),
42
+ __metadata("design:type", Boolean)
43
+ ], User.prototype, "enabled", void 0);
44
+ __decorate([
45
+ (0, typeorm_1.Column)(),
46
+ __metadata("design:type", Date)
47
+ ], User.prototype, "enabledAt", void 0);
34
48
  __decorate([
35
49
  (0, typeorm_1.Column)({ type: 'simple-array', nullable: true }),
36
50
  __metadata("design:type", Array)
@@ -53,6 +67,7 @@ __decorate([
53
67
  ], User.prototype, "deletedAt", void 0);
54
68
  User = __decorate([
55
69
  (0, typeorm_1.Entity)(),
70
+ (0, typeorm_1.Unique)(['externalId']),
56
71
  (0, typeorm_1.Unique)(['username']),
57
72
  (0, typeorm_1.Unique)(['email']),
58
73
  (0, typeorm_1.TableInheritance)({ column: { type: 'varchar', name: 'type', default: 'user' } })
package/dist/lib/entities/user.e.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"user.e.js","sourceRoot":"","sources":["../../../lib/entities/user.e.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAYgB;AAMT,IAAM,IAAI,GAAV,MAAM,IAAK,SAAQ,oBAAU;CA6BnC,CAAA;AA5BC;IAAC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;gCACrB;AAEV;IAAC,IAAA,eAAK,GAAE;IACP,IAAA,gBAAM,GAAE;;sCACO;AAEhB;IAAC,IAAA,eAAK,GAAE;IACP,IAAA,gBAAM,GAAE;;mCACI;AAEb;IAAC,IAAA,gBAAM,GAAE;;sCACO;AAEhB;IAAC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mCAClC;AAEf;IAAC,IAAA,uBAAa,GAAE;;qCACD;AAEf;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;uCAAA;AAEf;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;uCAAA;AAEf;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;uCAAA;AA5BJ,IAAI;IAJhB,IAAA,gBAAM,GAAE;IACR,IAAA,gBAAM,EAAC,CAAC,UAAU,CAAC,CAAC;IACpB,IAAA,gBAAM,EAAC,CAAC,OAAO,CAAC,CAAC;IACjB,IAAA,0BAAgB,EAAC,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC;GACpE,IAAI,CA6BhB;AA7BY,oBAAI"}
1
+ {"version":3,"file":"user.e.js","sourceRoot":"","sources":["../../../lib/entities/user.e.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAYgB;AAEhB,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;AAOzB,IAAM,IAAI,GAAV,MAAM,IAAK,SAAQ,oBAAU;CAuCnC,CAAA;AAtCC;IAAC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;gCACrB;AAEV;IAAC,IAAA,eAAK,GAAE;IACP,IAAA,gBAAM,GAAE;;wCACS;AAElB;IAAC,IAAA,eAAK,GAAE;IACP,IAAA,gBAAM,GAAE;;sCACO;AAEhB;IAAC,IAAA,eAAK,GAAE;IACP,IAAA,gBAAM,GAAE;;mCACI;AAEb;IAAC,IAAA,gBAAM,GAAE;;sCACO;AAEhB;IAAC,IAAA,gBAAM,GAAE;;qCACO;AAEhB;IAAC,IAAA,gBAAM,GAAE;8BACE,IAAI;uCAAA;AAEf;IAAC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mCAClC;AAEf;IAAC,IAAA,uBAAa,GAAE;;qCACD;AAEf;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;uCAAA;AAEf;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;uCAAA;AAEf;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;uCAAA;AAtCJ,IAAI;IALhB,IAAA,gBAAM,GAAE;IACR,IAAA,gBAAM,EAAC,CAAC,YAAY,CAAC,CAAC;IACtB,IAAA,gBAAM,EAAC,CAAC,UAAU,CAAC,CAAC;IACpB,IAAA,gBAAM,EAAC,CAAC,OAAO,CAAC,CAAC;IACjB,IAAA,0BAAgB,EAAC,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC;GACpE,IAAI,CAuChB;AAvCY,oBAAI"}
package/dist/lib/loader/userManager.d.ts CHANGED
@@ -1,9 +1,14 @@
1
1
  declare const User: any;
2
2
  export declare function demo(): Promise<never[]>;
3
- export declare function register(data: typeof User): Promise<any>;
4
- export declare function login(data: typeof User): Promise<any>;
5
- export declare function logout(data: typeof User): Promise<void>;
6
- export declare function forgotPassword(data: typeof User): Promise<void>;
7
- export declare function resetPassword(data: typeof User): Promise<void>;
8
- export declare function unregister(data: typeof User): Promise<void>;
3
+ export declare function isValidUser(data: typeof User): Promise<boolean>;
4
+ export declare function createUser(data: typeof User): Promise<any>;
5
+ export declare function resetExternalId(id: string): Promise<any>;
6
+ export declare function updateUserById(id: string, user: typeof User): Promise<any>;
7
+ export declare function retrieveUserById(id: string): Promise<any>;
8
+ export declare function retrieveUserByEmail(email: string): Promise<any>;
9
+ export declare function retrieveUserByExternalId(externalId: string): Promise<any>;
10
+ export declare function retrieveUserByPassword(email: string, password: string): Promise<any>;
11
+ export declare function changePassword(email: string, password: string, oldPassword: string): Promise<any>;
12
+ export declare function enableUserById(id: string): Promise<any>;
13
+ export declare function disableUserById(id: string): Promise<any>;
9
14
  export {};
package/dist/lib/loader/userManager.js CHANGED
@@ -31,9 +31,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
31
31
  step((generator = generator.apply(thisArg, _arguments || [])).next());
32
32
  });
33
33
  };
34
+ var __rest = (this && this.__rest) || function (s, e) {
35
+ var t = {};
36
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
37
+ t[p] = s[p];
38
+ if (s != null && typeof Object.getOwnPropertySymbols === "function")
39
+ for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
40
+ if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
41
+ t[p[i]] = s[p[i]];
42
+ }
43
+ return t;
44
+ };
34
45
  Object.defineProperty(exports, "__esModule", { value: true });
35
- exports.unregister = exports.resetPassword = exports.forgotPassword = exports.logout = exports.login = exports.register = exports.demo = void 0;
46
+ exports.disableUserById = exports.enableUserById = exports.changePassword = exports.retrieveUserByPassword = exports.retrieveUserByExternalId = exports.retrieveUserByEmail = exports.retrieveUserById = exports.updateUserById = exports.resetExternalId = exports.createUser = exports.isValidUser = exports.demo = void 0;
36
47
  const bcrypt = __importStar(require("bcrypt"));
48
+ const Crypto = require('crypto');
37
49
  const { User } = require('../entities/user.e');
38
50
  function demo() {
39
51
  return __awaiter(this, void 0, void 0, function* () {
@@ -41,13 +53,27 @@ function demo() {
41
53
  });
42
54
  }
43
55
  exports.demo = demo;
44
- function register(data) {
56
+ function isValidUser(data) {
57
+ return __awaiter(this, void 0, void 0, function* () {
58
+ return !!data && !!data.id && !!data.externalId && !!data.email && !!data.password;
59
+ });
60
+ }
61
+ exports.isValidUser = isValidUser;
62
+ function createUser(data) {
45
63
  return __awaiter(this, void 0, void 0, function* () {
46
- const { name, email, password } = data;
64
+ const { username, email, password } = data;
65
+ if (!email || !password) {
66
+ return null;
67
+ }
47
68
  const salt = yield bcrypt.genSalt(12);
48
69
  const hashedPassword = yield bcrypt.hash(password, salt);
49
70
  try {
50
- let user = Object.assign(Object.assign({}, data), { name: name || email, password: hashedPassword });
71
+ let externalId, user;
72
+ do {
73
+ externalId = Crypto.randomUUID({ disableEntropyCache: true });
74
+ user = yield global.repository.users.findOneBy({ externalId: externalId });
75
+ } while (user != null);
76
+ user = yield User.create(Object.assign(Object.assign({}, data), { enabled: true, enabledAt: new Date(), externalId: externalId, email: email, username: username || email, password: hashedPassword }));
51
77
  return yield User.save(user);
52
78
  }
53
79
  catch (error) {
@@ -58,12 +84,101 @@ function register(data) {
58
84
  }
59
85
  });
60
86
  }
61
- exports.register = register;
62
- function login(data) {
87
+ exports.createUser = createUser;
88
+ function resetExternalId(id) {
89
+ return __awaiter(this, void 0, void 0, function* () {
90
+ if (!id) {
91
+ return null;
92
+ }
93
+ try {
94
+ let externalId, user;
95
+ do {
96
+ externalId = Crypto.randomUUID({ disableEntropyCache: true });
97
+ user = yield global.repository.users.findOneBy({ externalId: externalId });
98
+ } while (user != null);
99
+ return yield updateUserById(id, { externalId: externalId });
100
+ }
101
+ catch (error) {
102
+ if ((error === null || error === void 0 ? void 0 : error.code) == 23505) {
103
+ throw Error('External ID not reset');
104
+ }
105
+ throw error;
106
+ }
107
+ });
108
+ }
109
+ exports.resetExternalId = resetExternalId;
110
+ function updateUserById(id, user) {
111
+ return __awaiter(this, void 0, void 0, function* () {
112
+ if (!id || !user) {
113
+ return null;
114
+ }
115
+ try {
116
+ const { id: userId } = user, userNew = __rest(user, ["id"]);
117
+ const userEx = yield global.repository.users.findOneBy({ id: id });
118
+ if (!userEx) {
119
+ return null;
120
+ }
121
+ const merged = global.repository.users.merge(userEx, userNew);
122
+ return yield User.save(Object.assign(Object.assign({}, merged), { id: id }));
123
+ }
124
+ catch (error) {
125
+ throw error;
126
+ }
127
+ });
128
+ }
129
+ exports.updateUserById = updateUserById;
130
+ function retrieveUserById(id) {
63
131
  return __awaiter(this, void 0, void 0, function* () {
64
- const { email, password } = data;
132
+ if (!id) {
133
+ return null;
134
+ }
135
+ try {
136
+ return yield global.repository.users.findOneBy({ id: id });
137
+ }
138
+ catch (error) {
139
+ throw error;
140
+ }
141
+ });
142
+ }
143
+ exports.retrieveUserById = retrieveUserById;
144
+ function retrieveUserByEmail(email) {
145
+ return __awaiter(this, void 0, void 0, function* () {
146
+ if (!email) {
147
+ return null;
148
+ }
149
+ try {
150
+ return yield global.repository.users.findOneBy({ email: email });
151
+ }
152
+ catch (error) {
153
+ throw error;
154
+ }
155
+ });
156
+ }
157
+ exports.retrieveUserByEmail = retrieveUserByEmail;
158
+ function retrieveUserByExternalId(externalId) {
159
+ return __awaiter(this, void 0, void 0, function* () {
160
+ if (!externalId) {
161
+ return null;
162
+ }
163
+ try {
164
+ return yield global.repository.users.findOneBy({ externalId: externalId });
165
+ }
166
+ catch (error) {
167
+ throw error;
168
+ }
169
+ });
170
+ }
171
+ exports.retrieveUserByExternalId = retrieveUserByExternalId;
172
+ function retrieveUserByPassword(email, password) {
173
+ return __awaiter(this, void 0, void 0, function* () {
174
+ if (!email || !password) {
175
+ return null;
176
+ }
65
177
  try {
66
178
  const user = yield global.repository.users.findOneBy({ email: email });
179
+ if (!user) {
180
+ return null;
181
+ }
67
182
  const match = yield bcrypt.compare(password, user.password);
68
183
  return match ? user : null;
69
184
  }
@@ -72,21 +187,38 @@ function login(data) {
72
187
  }
73
188
  });
74
189
  }
75
- exports.login = login;
76
- function logout(data) {
77
- return __awaiter(this, void 0, void 0, function* () { });
78
- }
79
- exports.logout = logout;
80
- function forgotPassword(data) {
81
- return __awaiter(this, void 0, void 0, function* () { });
190
+ exports.retrieveUserByPassword = retrieveUserByPassword;
191
+ function changePassword(email, password, oldPassword) {
192
+ return __awaiter(this, void 0, void 0, function* () {
193
+ if (!email || !password || !oldPassword) {
194
+ return null;
195
+ }
196
+ try {
197
+ const user = yield global.repository.users.findOneBy({ email: email });
198
+ const match = yield bcrypt.compare(oldPassword, user.password);
199
+ if (match) {
200
+ const salt = yield bcrypt.genSalt(12);
201
+ const hashedPassword = yield bcrypt.hash(password, salt);
202
+ return yield User.save(Object.assign(Object.assign({}, user), { password: hashedPassword }));
203
+ }
204
+ return null;
205
+ }
206
+ catch (error) {
207
+ throw error;
208
+ }
209
+ });
82
210
  }
83
- exports.forgotPassword = forgotPassword;
84
- function resetPassword(data) {
85
- return __awaiter(this, void 0, void 0, function* () { });
211
+ exports.changePassword = changePassword;
212
+ function enableUserById(id) {
213
+ return __awaiter(this, void 0, void 0, function* () {
214
+ return updateUserById(id, { enabled: true, enabledAt: new Date() });
215
+ });
86
216
  }
87
- exports.resetPassword = resetPassword;
88
- function unregister(data) {
89
- return __awaiter(this, void 0, void 0, function* () { });
217
+ exports.enableUserById = enableUserById;
218
+ function disableUserById(id) {
219
+ return __awaiter(this, void 0, void 0, function* () {
220
+ return updateUserById(id, { enabled: false, enabledAt: new Date() });
221
+ });
90
222
  }
91
- exports.unregister = unregister;
223
+ exports.disableUserById = disableUserById;
92
224
  //# sourceMappingURL=userManager.js.map
package/dist/lib/loader/userManager.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"userManager.js","sourceRoot":"","sources":["../../../lib/loader/userManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAgC;AAChC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAE9C,SAAsB,IAAI;;QAGxB,OAAO,EAAE,CAAA;IACX,CAAC;CAAA;AAJD,oBAIC;AAED,SAAsB,QAAQ,CAAC,IAAiB;;QAC9C,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;QACtC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QACrC,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;QAExD,IAAI;YACF,IAAI,IAAI,GAAG,gCAAK,IAAI,KAAE,IAAI,EAAE,IAAI,IAAI,KAAK,EAAE,QAAQ,EAAE,cAAc,GAAiB,CAAA;YACpF,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;SAC7B;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,KAAI,KAAK,EAAE;gBACxB,MAAM,KAAK,CAAC,0BAA0B,CAAC,CAAA;aACxC;YACD,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CAAA;AAdD,4BAcC;AAED,SAAsB,KAAK,CAAC,IAAiB;;QAC3C,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;QAEhC,IAAI;YACF,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAA;YACtE,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;YAC3D,OAAO,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAA;SAC3B;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CAAA;AAVD,sBAUC;AAED,SAAsB,MAAM,CAAC,IAAiB;0DAAG,CAAC;CAAA;AAAlD,wBAAkD;AAElD,SAAsB,cAAc,CAAC,IAAiB;0DAAG,CAAC;CAAA;AAA1D,wCAA0D;AAE1D,SAAsB,aAAa,CAAC,IAAiB;0DAAG,CAAC;CAAA;AAAzD,sCAAyD;AAEzD,SAAsB,UAAU,CAAC,IAAiB;0DAAG,CAAC;CAAA;AAAtD,gCAAsD"}
1
+ {"version":3,"file":"userManager.js","sourceRoot":"","sources":["../../../lib/loader/userManager.ts"],"names":[],"mappings":"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"}
package/dist/lib/query.d.ts CHANGED
@@ -9,10 +9,11 @@ export declare function applyQuery(data: any, extraWhere: any): {
9
9
  export declare function executeFindQuery(repo: any, relations?: {}, data?: any, extraWhere?: any): Promise<{
10
10
  records: any;
11
11
  headers: {
12
- 'v-total': any;
13
12
  'v-count': any;
14
- 'v-pagesize': number | undefined;
13
+ 'v-total': any;
15
14
  'v-page': any;
15
+ 'v-pageSize': number | undefined;
16
+ 'v-pageCount': number;
16
17
  };
17
18
  }>;
18
19
  export declare function executeCountQuery(repo: any, data?: {}, extraWhere?: any): Promise<any>;
package/dist/lib/query.js CHANGED
@@ -112,9 +112,10 @@ const useWhere = (where) => {
112
112
  };
113
113
  exports.useWhere = useWhere;
114
114
  function applyQuery(data, extraWhere) {
115
- const { page = 1, pageSize = 0, skip: sk = 0, take: tk = 0, sort: s } = data, where = __rest(data, ["page", "pageSize", "skip", "take", "sort"]);
116
- const take = tk || pageSize || 50;
117
- const skip = sk || (page - 1) * pageSize || 0;
115
+ const { page: p = 1, pageSize = 25, skip: sk = 0, take: tk = 0, sort: s } = data, where = __rest(data, ["page", "pageSize", "skip", "take", "sort"]);
116
+ const page = (p < 1 ? 1 : p) - 1;
117
+ const take = tk || pageSize;
118
+ const skip = sk || page * pageSize;
118
119
  const order = !Array.isArray(s) ? [s] : s;
119
120
  const query = {};
120
121
  if (skip)
@@ -130,7 +131,6 @@ function applyQuery(data, extraWhere) {
130
131
  extra = Array.isArray(extraWhere) ? extraWhere.map((w) => (0, exports.useWhere)(w)) : (0, exports.useWhere)(extraWhere);
131
132
  }
132
133
  query.where = Array.isArray(extra) ? extra.map((w) => (Object.assign(Object.assign({}, w), query.where))) : Object.assign(Object.assign({}, extra), query.where);
133
- log.debug('FINAL WHERE: ' + JSON.stringify(query.where));
134
134
  return query;
135
135
  }
136
136
  exports.applyQuery = applyQuery;
@@ -141,10 +141,11 @@ function executeFindQuery(repo, relations = {}, data = {}, extraWhere = {}) {
141
141
  return {
142
142
  records,
143
143
  headers: {
144
- 'v-total': totalCount,
145
144
  'v-count': records.length,
146
- 'v-pagesize': extra.take,
147
- 'v-page': data.page || 1
145
+ 'v-total': totalCount,
146
+ 'v-page': data.page || 1,
147
+ 'v-pageSize': extra.take,
148
+ 'v-pageCount': Math.ceil(extra.take ? totalCount / extra.take : 1)
148
149
  }
149
150
  };
150
151
  });
package/dist/lib/query.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"query.js","sourceRoot":"","sources":["../../lib/query.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"query.js","sourceRoot":"","sources":["../../lib/query.ts"],"names":[],"mappings":"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"}
package/esm/lib/entities/user.e.d.ts CHANGED
@@ -1,9 +1,12 @@
1
1
  import { BaseEntity } from 'typeorm';
2
2
  export declare class User extends BaseEntity {
3
- id: number;
3
+ id: string;
4
+ externalId: string;
4
5
  username: string;
5
6
  email: string;
6
7
  password: string;
8
+ enabled: boolean;
9
+ enabledAt: Date;
7
10
  roles: string[];
8
11
  version: number;
9
12
  createdAt: Date;
package/esm/lib/entities/user.e.js CHANGED
@@ -11,12 +11,18 @@ var __metadata = (this && this.__metadata) || function (k, v) {
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.User = void 0;
13
13
  const typeorm_1 = require("typeorm");
14
+ const Crypto = require('crypto');
14
15
  let User = class User extends typeorm_1.BaseEntity {
15
16
  };
16
17
  __decorate([
17
18
  (0, typeorm_1.PrimaryGeneratedColumn)('uuid'),
18
- __metadata("design:type", Number)
19
+ __metadata("design:type", String)
19
20
  ], User.prototype, "id", void 0);
21
+ __decorate([
22
+ (0, typeorm_1.Index)(),
23
+ (0, typeorm_1.Column)(),
24
+ __metadata("design:type", String)
25
+ ], User.prototype, "externalId", void 0);
20
26
  __decorate([
21
27
  (0, typeorm_1.Index)(),
22
28
  (0, typeorm_1.Column)(),
@@ -31,6 +37,14 @@ __decorate([
31
37
  (0, typeorm_1.Column)(),
32
38
  __metadata("design:type", String)
33
39
  ], User.prototype, "password", void 0);
40
+ __decorate([
41
+ (0, typeorm_1.Column)(),
42
+ __metadata("design:type", Boolean)
43
+ ], User.prototype, "enabled", void 0);
44
+ __decorate([
45
+ (0, typeorm_1.Column)(),
46
+ __metadata("design:type", Date)
47
+ ], User.prototype, "enabledAt", void 0);
34
48
  __decorate([
35
49
  (0, typeorm_1.Column)({ type: 'simple-array', nullable: true }),
36
50
  __metadata("design:type", Array)
@@ -53,6 +67,7 @@ __decorate([
53
67
  ], User.prototype, "deletedAt", void 0);
54
68
  User = __decorate([
55
69
  (0, typeorm_1.Entity)(),
70
+ (0, typeorm_1.Unique)(['externalId']),
56
71
  (0, typeorm_1.Unique)(['username']),
57
72
  (0, typeorm_1.Unique)(['email']),
58
73
  (0, typeorm_1.TableInheritance)({ column: { type: 'varchar', name: 'type', default: 'user' } })
package/esm/lib/entities/user.e.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"user.e.js","sourceRoot":"","sources":["../../../lib/entities/user.e.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAYgB;AAMT,IAAM,IAAI,GAAV,MAAM,IAAK,SAAQ,oBAAU;CA6BnC,CAAA;AA5BC;IAAC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;gCACrB;AAEV;IAAC,IAAA,eAAK,GAAE;IACP,IAAA,gBAAM,GAAE;;sCACO;AAEhB;IAAC,IAAA,eAAK,GAAE;IACP,IAAA,gBAAM,GAAE;;mCACI;AAEb;IAAC,IAAA,gBAAM,GAAE;;sCACO;AAEhB;IAAC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mCAClC;AAEf;IAAC,IAAA,uBAAa,GAAE;;qCACD;AAEf;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;uCAAA;AAEf;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;uCAAA;AAEf;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;uCAAA;AA5BJ,IAAI;IAJhB,IAAA,gBAAM,GAAE;IACR,IAAA,gBAAM,EAAC,CAAC,UAAU,CAAC,CAAC;IACpB,IAAA,gBAAM,EAAC,CAAC,OAAO,CAAC,CAAC;IACjB,IAAA,0BAAgB,EAAC,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC;GACpE,IAAI,CA6BhB;AA7BY,oBAAI"}
1
+ {"version":3,"file":"user.e.js","sourceRoot":"","sources":["../../../lib/entities/user.e.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAYgB;AAEhB,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;AAOzB,IAAM,IAAI,GAAV,MAAM,IAAK,SAAQ,oBAAU;CAuCnC,CAAA;AAtCC;IAAC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;gCACrB;AAEV;IAAC,IAAA,eAAK,GAAE;IACP,IAAA,gBAAM,GAAE;;wCACS;AAElB;IAAC,IAAA,eAAK,GAAE;IACP,IAAA,gBAAM,GAAE;;sCACO;AAEhB;IAAC,IAAA,eAAK,GAAE;IACP,IAAA,gBAAM,GAAE;;mCACI;AAEb;IAAC,IAAA,gBAAM,GAAE;;sCACO;AAEhB;IAAC,IAAA,gBAAM,GAAE;;qCACO;AAEhB;IAAC,IAAA,gBAAM,GAAE;8BACE,IAAI;uCAAA;AAEf;IAAC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mCAClC;AAEf;IAAC,IAAA,uBAAa,GAAE;;qCACD;AAEf;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;uCAAA;AAEf;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;uCAAA;AAEf;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;uCAAA;AAtCJ,IAAI;IALhB,IAAA,gBAAM,GAAE;IACR,IAAA,gBAAM,EAAC,CAAC,YAAY,CAAC,CAAC;IACtB,IAAA,gBAAM,EAAC,CAAC,UAAU,CAAC,CAAC;IACpB,IAAA,gBAAM,EAAC,CAAC,OAAO,CAAC,CAAC;IACjB,IAAA,0BAAgB,EAAC,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC;GACpE,IAAI,CAuChB;AAvCY,oBAAI"}
package/esm/lib/loader/userManager.d.ts CHANGED
@@ -1,9 +1,14 @@
1
1
  declare const User: any;
2
2
  export declare function demo(): Promise<never[]>;
3
- export declare function register(data: typeof User): Promise<any>;
4
- export declare function login(data: typeof User): Promise<any>;
5
- export declare function logout(data: typeof User): Promise<void>;
6
- export declare function forgotPassword(data: typeof User): Promise<void>;
7
- export declare function resetPassword(data: typeof User): Promise<void>;
8
- export declare function unregister(data: typeof User): Promise<void>;
3
+ export declare function isValidUser(data: typeof User): Promise<boolean>;
4
+ export declare function createUser(data: typeof User): Promise<any>;
5
+ export declare function resetExternalId(id: string): Promise<any>;
6
+ export declare function updateUserById(id: string, user: typeof User): Promise<any>;
7
+ export declare function retrieveUserById(id: string): Promise<any>;
8
+ export declare function retrieveUserByEmail(email: string): Promise<any>;
9
+ export declare function retrieveUserByExternalId(externalId: string): Promise<any>;
10
+ export declare function retrieveUserByPassword(email: string, password: string): Promise<any>;
11
+ export declare function changePassword(email: string, password: string, oldPassword: string): Promise<any>;
12
+ export declare function enableUserById(id: string): Promise<any>;
13
+ export declare function disableUserById(id: string): Promise<any>;
9
14
  export {};
package/esm/lib/loader/userManager.js CHANGED
@@ -23,19 +23,40 @@ var __importStar = (this && this.__importStar) || function (mod) {
23
23
  return result;
24
24
  };
25
25
  Object.defineProperty(exports, "__esModule", { value: true });
26
- exports.unregister = exports.resetPassword = exports.forgotPassword = exports.logout = exports.login = exports.register = exports.demo = void 0;
26
+ exports.disableUserById = exports.enableUserById = exports.changePassword = exports.retrieveUserByPassword = exports.retrieveUserByExternalId = exports.retrieveUserByEmail = exports.retrieveUserById = exports.updateUserById = exports.resetExternalId = exports.createUser = exports.isValidUser = exports.demo = void 0;
27
27
  const bcrypt = __importStar(require("bcrypt"));
28
+ const Crypto = require('crypto');
28
29
  const { User } = require('../entities/user.e');
29
30
  async function demo() {
30
31
  return [];
31
32
  }
32
33
  exports.demo = demo;
33
- async function register(data) {
34
- const { name, email, password } = data;
34
+ async function isValidUser(data) {
35
+ return !!data && !!data.id && !!data.externalId && !!data.email && !!data.password;
36
+ }
37
+ exports.isValidUser = isValidUser;
38
+ async function createUser(data) {
39
+ const { username, email, password } = data;
40
+ if (!email || !password) {
41
+ return null;
42
+ }
35
43
  const salt = await bcrypt.genSalt(12);
36
44
  const hashedPassword = await bcrypt.hash(password, salt);
37
45
  try {
38
- let user = { ...data, name: name || email, password: hashedPassword };
46
+ let externalId, user;
47
+ do {
48
+ externalId = Crypto.randomUUID({ disableEntropyCache: true });
49
+ user = await global.repository.users.findOneBy({ externalId: externalId });
50
+ } while (user != null);
51
+ user = await User.create({
52
+ ...data,
53
+ enabled: true,
54
+ enabledAt: new Date(),
55
+ externalId: externalId,
56
+ email: email,
57
+ username: username || email,
58
+ password: hashedPassword
59
+ });
39
60
  return await User.save(user);
40
61
  }
41
62
  catch (error) {
@@ -45,11 +66,90 @@ async function register(data) {
45
66
  throw error;
46
67
  }
47
68
  }
48
- exports.register = register;
49
- async function login(data) {
50
- const { email, password } = data;
69
+ exports.createUser = createUser;
70
+ async function resetExternalId(id) {
71
+ if (!id) {
72
+ return null;
73
+ }
74
+ try {
75
+ let externalId, user;
76
+ do {
77
+ externalId = Crypto.randomUUID({ disableEntropyCache: true });
78
+ user = await global.repository.users.findOneBy({ externalId: externalId });
79
+ } while (user != null);
80
+ return await updateUserById(id, { externalId: externalId });
81
+ }
82
+ catch (error) {
83
+ if ((error === null || error === void 0 ? void 0 : error.code) == 23505) {
84
+ throw Error('External ID not reset');
85
+ }
86
+ throw error;
87
+ }
88
+ }
89
+ exports.resetExternalId = resetExternalId;
90
+ async function updateUserById(id, user) {
91
+ if (!id || !user) {
92
+ return null;
93
+ }
94
+ try {
95
+ const { id: userId, ...userNew } = user;
96
+ const userEx = await global.repository.users.findOneBy({ id: id });
97
+ if (!userEx) {
98
+ return null;
99
+ }
100
+ const merged = global.repository.users.merge(userEx, userNew);
101
+ return await User.save({ ...merged, id: id });
102
+ }
103
+ catch (error) {
104
+ throw error;
105
+ }
106
+ }
107
+ exports.updateUserById = updateUserById;
108
+ async function retrieveUserById(id) {
109
+ if (!id) {
110
+ return null;
111
+ }
112
+ try {
113
+ return await global.repository.users.findOneBy({ id: id });
114
+ }
115
+ catch (error) {
116
+ throw error;
117
+ }
118
+ }
119
+ exports.retrieveUserById = retrieveUserById;
120
+ async function retrieveUserByEmail(email) {
121
+ if (!email) {
122
+ return null;
123
+ }
124
+ try {
125
+ return await global.repository.users.findOneBy({ email: email });
126
+ }
127
+ catch (error) {
128
+ throw error;
129
+ }
130
+ }
131
+ exports.retrieveUserByEmail = retrieveUserByEmail;
132
+ async function retrieveUserByExternalId(externalId) {
133
+ if (!externalId) {
134
+ return null;
135
+ }
136
+ try {
137
+ return await global.repository.users.findOneBy({ externalId: externalId });
138
+ }
139
+ catch (error) {
140
+ throw error;
141
+ }
142
+ }
143
+ exports.retrieveUserByExternalId = retrieveUserByExternalId;
144
+ async function retrieveUserByPassword(email, password) {
145
+ if (!email || !password) {
146
+ return null;
147
+ }
51
148
  try {
52
149
  const user = await global.repository.users.findOneBy({ email: email });
150
+ if (!user) {
151
+ return null;
152
+ }
53
153
  const match = await bcrypt.compare(password, user.password);
54
154
  return match ? user : null;
55
155
  }
@@ -57,13 +157,32 @@ async function login(data) {
57
157
  throw error;
58
158
  }
59
159
  }
60
- exports.login = login;
61
- async function logout(data) { }
62
- exports.logout = logout;
63
- async function forgotPassword(data) { }
64
- exports.forgotPassword = forgotPassword;
65
- async function resetPassword(data) { }
66
- exports.resetPassword = resetPassword;
67
- async function unregister(data) { }
68
- exports.unregister = unregister;
160
+ exports.retrieveUserByPassword = retrieveUserByPassword;
161
+ async function changePassword(email, password, oldPassword) {
162
+ if (!email || !password || !oldPassword) {
163
+ return null;
164
+ }
165
+ try {
166
+ const user = await global.repository.users.findOneBy({ email: email });
167
+ const match = await bcrypt.compare(oldPassword, user.password);
168
+ if (match) {
169
+ const salt = await bcrypt.genSalt(12);
170
+ const hashedPassword = await bcrypt.hash(password, salt);
171
+ return await User.save({ ...user, password: hashedPassword });
172
+ }
173
+ return null;
174
+ }
175
+ catch (error) {
176
+ throw error;
177
+ }
178
+ }
179
+ exports.changePassword = changePassword;
180
+ async function enableUserById(id) {
181
+ return updateUserById(id, { enabled: true, enabledAt: new Date() });
182
+ }
183
+ exports.enableUserById = enableUserById;
184
+ async function disableUserById(id) {
185
+ return updateUserById(id, { enabled: false, enabledAt: new Date() });
186
+ }
187
+ exports.disableUserById = disableUserById;
69
188
  //# sourceMappingURL=userManager.js.map
package/esm/lib/loader/userManager.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"userManager.js","sourceRoot":"","sources":["../../../lib/loader/userManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAgC;AAChC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAEvC,KAAK,UAAU,IAAI;IAGxB,OAAO,EAAE,CAAA;AACX,CAAC;AAJD,oBAIC;AAEM,KAAK,UAAU,QAAQ,CAAC,IAAiB;IAC9C,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;IACtC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IACrC,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IAExD,IAAI;QACF,IAAI,IAAI,GAAG,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAiB,CAAA;QACpF,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;KAC7B;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,KAAI,KAAK,EAAE;YACxB,MAAM,KAAK,CAAC,0BAA0B,CAAC,CAAA;SACxC;QACD,MAAM,KAAK,CAAA;KACZ;AACH,CAAC;AAdD,4BAcC;AAEM,KAAK,UAAU,KAAK,CAAC,IAAiB;IAC3C,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;IAEhC,IAAI;QACF,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAA;QACtE,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC3D,OAAO,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAA;KAC3B;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,KAAK,CAAA;KACZ;AACH,CAAC;AAVD,sBAUC;AAEM,KAAK,UAAU,MAAM,CAAC,IAAiB,IAAG,CAAC;AAAlD,wBAAkD;AAE3C,KAAK,UAAU,cAAc,CAAC,IAAiB,IAAG,CAAC;AAA1D,wCAA0D;AAEnD,KAAK,UAAU,aAAa,CAAC,IAAiB,IAAG,CAAC;AAAzD,sCAAyD;AAElD,KAAK,UAAU,UAAU,CAAC,IAAiB,IAAG,CAAC;AAAtD,gCAAsD"}
1
+ {"version":3,"file":"userManager.js","sourceRoot":"","sources":["../../../lib/loader/userManager.ts"],"names":[],"mappings":"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"}
package/esm/lib/query.d.ts CHANGED
@@ -9,10 +9,11 @@ export declare function applyQuery(data: any, extraWhere: any): {
9
9
  export declare function executeFindQuery(repo: any, relations?: {}, data?: any, extraWhere?: any): Promise<{
10
10
  records: any;
11
11
  headers: {
12
- 'v-total': any;
13
12
  'v-count': any;
14
- 'v-pagesize': number | undefined;
13
+ 'v-total': any;
15
14
  'v-page': any;
15
+ 'v-pageSize': number | undefined;
16
+ 'v-pageCount': number;
16
17
  };
17
18
  }>;
18
19
  export declare function executeCountQuery(repo: any, data?: {}, extraWhere?: any): Promise<any>;
package/esm/lib/query.js CHANGED
@@ -92,9 +92,10 @@ const useWhere = (where) => {
92
92
  };
93
93
  exports.useWhere = useWhere;
94
94
  function applyQuery(data, extraWhere) {
95
- const { page = 1, pageSize = 0, skip: sk = 0, take: tk = 0, sort: s, ...where } = data;
96
- const take = tk || pageSize || 50;
97
- const skip = sk || (page - 1) * pageSize || 0;
95
+ const { page: p = 1, pageSize = 25, skip: sk = 0, take: tk = 0, sort: s, ...where } = data;
96
+ const page = (p < 1 ? 1 : p) - 1;
97
+ const take = tk || pageSize;
98
+ const skip = sk || page * pageSize;
98
99
  const order = !Array.isArray(s) ? [s] : s;
99
100
  const query = {};
100
101
  if (skip)
@@ -110,7 +111,6 @@ function applyQuery(data, extraWhere) {
110
111
  extra = Array.isArray(extraWhere) ? extraWhere.map((w) => (0, exports.useWhere)(w)) : (0, exports.useWhere)(extraWhere);
111
112
  }
112
113
  query.where = Array.isArray(extra) ? extra.map((w) => ({ ...w, ...query.where })) : { ...extra, ...query.where };
113
- log.debug('FINAL WHERE: ' + JSON.stringify(query.where));
114
114
  return query;
115
115
  }
116
116
  exports.applyQuery = applyQuery;
@@ -123,10 +123,11 @@ async function executeFindQuery(repo, relations = {}, data = {}, extraWhere = {}
123
123
  return {
124
124
  records,
125
125
  headers: {
126
- 'v-total': totalCount,
127
126
  'v-count': records.length,
128
- 'v-pagesize': extra.take,
129
- 'v-page': data.page || 1
127
+ 'v-total': totalCount,
128
+ 'v-page': data.page || 1,
129
+ 'v-pageSize': extra.take,
130
+ 'v-pageCount': Math.ceil(extra.take ? totalCount / extra.take : 1)
130
131
  }
131
132
  };
132
133
  }
package/esm/lib/query.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"query.js","sourceRoot":"","sources":["../../lib/query.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"query.js","sourceRoot":"","sources":["../../lib/query.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@volcanicminds/typeorm",
3
- "version": "0.0.14",
3
+ "version": "0.0.16",
4
4
  "license": "MIT",
5
5
  "description": "TypeORM for the volcanic (minds) backend",
6
6
  "keywords": [