@volcanicminds/typeorm 0.1.3 → 0.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/entities/user.d.ts +2 -1
- package/dist/lib/entities/user.js.map +1 -1
- package/dist/lib/loader/userManager.d.ts +3 -0
- package/dist/lib/loader/userManager.js +49 -19
- package/dist/lib/loader/userManager.js.map +1 -1
- package/esm/lib/entities/user.d.ts +2 -1
- package/esm/lib/entities/user.js.map +1 -1
- package/esm/lib/loader/userManager.d.ts +3 -0
- package/esm/lib/loader/userManager.js +43 -8
- package/esm/lib/loader/userManager.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { BaseEntity } from 'typeorm';
|
|
2
2
|
export declare abstract class User extends BaseEntity {
|
|
3
|
-
abstract id: any;
|
|
4
3
|
abstract externalId: string;
|
|
5
4
|
abstract username: string;
|
|
6
5
|
abstract email: string;
|
|
@@ -17,4 +16,6 @@ export declare abstract class User extends BaseEntity {
|
|
|
17
16
|
abstract createdAt: Date;
|
|
18
17
|
abstract updatedAt: Date;
|
|
19
18
|
abstract deletedAt: Date;
|
|
19
|
+
abstract setId(id: any): any;
|
|
20
|
+
abstract getId(): any;
|
|
20
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../lib/entities/user.ts"],"names":[],"mappings":";;;AAAA,qCAAoC;AAEpC,MAAsB,IAAK,SAAQ,oBAAU;
|
|
1
|
+
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../lib/entities/user.ts"],"names":[],"mappings":";;;AAAA,qCAAoC;AAEpC,MAAsB,IAAK,SAAQ,oBAAU;CAoB5C;AApBD,oBAoBC"}
|
|
@@ -4,6 +4,9 @@ export declare function resetExternalId(id: string): Promise<any>;
|
|
|
4
4
|
export declare function updateUserById(id: string, user: typeof global.entity.User): Promise<any>;
|
|
5
5
|
export declare function retrieveUserById(id: string): Promise<any>;
|
|
6
6
|
export declare function retrieveUserByEmail(email: string): Promise<any>;
|
|
7
|
+
export declare function retrieveUserByUsername(username: string): Promise<any>;
|
|
8
|
+
export declare function retrieveUserByConfirmationToken(code: string): Promise<any>;
|
|
9
|
+
export declare function retrieveUserByResetPasswordToken(code: string): Promise<any>;
|
|
7
10
|
export declare function retrieveUserByExternalId(externalId: string): Promise<any>;
|
|
8
11
|
export declare function retrieveUserByPassword(email: string, password: string): Promise<any>;
|
|
9
12
|
export declare function changePassword(email: string, password: string, oldPassword: string): Promise<any>;
|
|
@@ -31,24 +31,13 @@ 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
|
-
};
|
|
45
34
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
46
|
-
exports.unblockUserById = exports.blockUserById = exports.userConfirmation = exports.resetPassword = exports.forgotPassword = exports.changePassword = exports.retrieveUserByPassword = exports.retrieveUserByExternalId = exports.retrieveUserByEmail = exports.retrieveUserById = exports.updateUserById = exports.resetExternalId = exports.createUser = exports.isValidUser = void 0;
|
|
35
|
+
exports.unblockUserById = exports.blockUserById = exports.userConfirmation = exports.resetPassword = exports.forgotPassword = exports.changePassword = exports.retrieveUserByPassword = exports.retrieveUserByExternalId = exports.retrieveUserByResetPasswordToken = exports.retrieveUserByConfirmationToken = exports.retrieveUserByUsername = exports.retrieveUserByEmail = exports.retrieveUserById = exports.updateUserById = exports.resetExternalId = exports.createUser = exports.isValidUser = void 0;
|
|
47
36
|
const bcrypt = __importStar(require("bcrypt"));
|
|
48
37
|
const Crypto = require('crypto');
|
|
49
38
|
function isValidUser(data) {
|
|
50
39
|
return __awaiter(this, void 0, void 0, function* () {
|
|
51
|
-
return !!data && !!data.id && !!data.externalId && !!data.email && !!data.password;
|
|
40
|
+
return !!data && (!!data._id || !!data.id) && !!data.externalId && !!data.email && !!data.password;
|
|
52
41
|
});
|
|
53
42
|
}
|
|
54
43
|
exports.isValidUser = isValidUser;
|
|
@@ -93,7 +82,7 @@ function resetExternalId(id) {
|
|
|
93
82
|
}
|
|
94
83
|
catch (error) {
|
|
95
84
|
if ((error === null || error === void 0 ? void 0 : error.code) == 23505) {
|
|
96
|
-
throw Error('External ID not
|
|
85
|
+
throw Error('External ID not changed');
|
|
97
86
|
}
|
|
98
87
|
throw error;
|
|
99
88
|
}
|
|
@@ -106,13 +95,12 @@ function updateUserById(id, user) {
|
|
|
106
95
|
return null;
|
|
107
96
|
}
|
|
108
97
|
try {
|
|
109
|
-
const
|
|
110
|
-
const userEx = yield global.repository.users.findOneBy({ id: id });
|
|
98
|
+
const userEx = yield global.repository.users.findOneById(id);
|
|
111
99
|
if (!userEx) {
|
|
112
100
|
return null;
|
|
113
101
|
}
|
|
114
|
-
const merged = global.repository.users.merge(userEx,
|
|
115
|
-
return yield global.entity.User.save(
|
|
102
|
+
const merged = global.repository.users.merge(userEx, user);
|
|
103
|
+
return yield global.entity.User.save(merged);
|
|
116
104
|
}
|
|
117
105
|
catch (error) {
|
|
118
106
|
throw error;
|
|
@@ -126,7 +114,7 @@ function retrieveUserById(id) {
|
|
|
126
114
|
return null;
|
|
127
115
|
}
|
|
128
116
|
try {
|
|
129
|
-
return yield global.repository.users.
|
|
117
|
+
return yield global.repository.users.findOneById(id);
|
|
130
118
|
}
|
|
131
119
|
catch (error) {
|
|
132
120
|
throw error;
|
|
@@ -148,6 +136,48 @@ function retrieveUserByEmail(email) {
|
|
|
148
136
|
});
|
|
149
137
|
}
|
|
150
138
|
exports.retrieveUserByEmail = retrieveUserByEmail;
|
|
139
|
+
function retrieveUserByUsername(username) {
|
|
140
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
141
|
+
if (!username) {
|
|
142
|
+
return null;
|
|
143
|
+
}
|
|
144
|
+
try {
|
|
145
|
+
return yield global.repository.users.findOneBy({ username });
|
|
146
|
+
}
|
|
147
|
+
catch (error) {
|
|
148
|
+
throw error;
|
|
149
|
+
}
|
|
150
|
+
});
|
|
151
|
+
}
|
|
152
|
+
exports.retrieveUserByUsername = retrieveUserByUsername;
|
|
153
|
+
function retrieveUserByConfirmationToken(code) {
|
|
154
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
155
|
+
if (!code) {
|
|
156
|
+
return null;
|
|
157
|
+
}
|
|
158
|
+
try {
|
|
159
|
+
return yield global.repository.users.findOneBy({ confirmationToken: code });
|
|
160
|
+
}
|
|
161
|
+
catch (error) {
|
|
162
|
+
throw error;
|
|
163
|
+
}
|
|
164
|
+
});
|
|
165
|
+
}
|
|
166
|
+
exports.retrieveUserByConfirmationToken = retrieveUserByConfirmationToken;
|
|
167
|
+
function retrieveUserByResetPasswordToken(code) {
|
|
168
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
169
|
+
if (!code) {
|
|
170
|
+
return null;
|
|
171
|
+
}
|
|
172
|
+
try {
|
|
173
|
+
return yield global.repository.users.findOneBy({ resetPasswordToken: code });
|
|
174
|
+
}
|
|
175
|
+
catch (error) {
|
|
176
|
+
throw error;
|
|
177
|
+
}
|
|
178
|
+
});
|
|
179
|
+
}
|
|
180
|
+
exports.retrieveUserByResetPasswordToken = retrieveUserByResetPasswordToken;
|
|
151
181
|
function retrieveUserByExternalId(externalId) {
|
|
152
182
|
return __awaiter(this, void 0, void 0, function* () {
|
|
153
183
|
if (!externalId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userManager.js","sourceRoot":"","sources":["../../../lib/loader/userManager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"userManager.js","sourceRoot":"","sources":["../../../lib/loader/userManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { BaseEntity } from 'typeorm';
|
|
2
2
|
export declare abstract class User extends BaseEntity {
|
|
3
|
-
abstract id: any;
|
|
4
3
|
abstract externalId: string;
|
|
5
4
|
abstract username: string;
|
|
6
5
|
abstract email: string;
|
|
@@ -17,4 +16,6 @@ export declare abstract class User extends BaseEntity {
|
|
|
17
16
|
abstract createdAt: Date;
|
|
18
17
|
abstract updatedAt: Date;
|
|
19
18
|
abstract deletedAt: Date;
|
|
19
|
+
abstract setId(id: any): any;
|
|
20
|
+
abstract getId(): any;
|
|
20
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../lib/entities/user.ts"],"names":[],"mappings":";;;AAAA,qCAAoC;AAEpC,MAAsB,IAAK,SAAQ,oBAAU;
|
|
1
|
+
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../lib/entities/user.ts"],"names":[],"mappings":";;;AAAA,qCAAoC;AAEpC,MAAsB,IAAK,SAAQ,oBAAU;CAoB5C;AApBD,oBAoBC"}
|
|
@@ -4,6 +4,9 @@ export declare function resetExternalId(id: string): Promise<any>;
|
|
|
4
4
|
export declare function updateUserById(id: string, user: typeof global.entity.User): Promise<any>;
|
|
5
5
|
export declare function retrieveUserById(id: string): Promise<any>;
|
|
6
6
|
export declare function retrieveUserByEmail(email: string): Promise<any>;
|
|
7
|
+
export declare function retrieveUserByUsername(username: string): Promise<any>;
|
|
8
|
+
export declare function retrieveUserByConfirmationToken(code: string): Promise<any>;
|
|
9
|
+
export declare function retrieveUserByResetPasswordToken(code: string): Promise<any>;
|
|
7
10
|
export declare function retrieveUserByExternalId(externalId: string): Promise<any>;
|
|
8
11
|
export declare function retrieveUserByPassword(email: string, password: string): Promise<any>;
|
|
9
12
|
export declare function changePassword(email: string, password: string, oldPassword: string): Promise<any>;
|
|
@@ -23,11 +23,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.unblockUserById = exports.blockUserById = exports.userConfirmation = exports.resetPassword = exports.forgotPassword = exports.changePassword = exports.retrieveUserByPassword = exports.retrieveUserByExternalId = exports.retrieveUserByEmail = exports.retrieveUserById = exports.updateUserById = exports.resetExternalId = exports.createUser = exports.isValidUser = void 0;
|
|
26
|
+
exports.unblockUserById = exports.blockUserById = exports.userConfirmation = exports.resetPassword = exports.forgotPassword = exports.changePassword = exports.retrieveUserByPassword = exports.retrieveUserByExternalId = exports.retrieveUserByResetPasswordToken = exports.retrieveUserByConfirmationToken = exports.retrieveUserByUsername = exports.retrieveUserByEmail = exports.retrieveUserById = exports.updateUserById = exports.resetExternalId = exports.createUser = exports.isValidUser = void 0;
|
|
27
27
|
const bcrypt = __importStar(require("bcrypt"));
|
|
28
28
|
const Crypto = require('crypto');
|
|
29
29
|
async function isValidUser(data) {
|
|
30
|
-
return !!data && !!data.id && !!data.externalId && !!data.email && !!data.password;
|
|
30
|
+
return !!data && (!!data._id || !!data.id) && !!data.externalId && !!data.email && !!data.password;
|
|
31
31
|
}
|
|
32
32
|
exports.isValidUser = isValidUser;
|
|
33
33
|
async function createUser(data) {
|
|
@@ -78,7 +78,7 @@ async function resetExternalId(id) {
|
|
|
78
78
|
}
|
|
79
79
|
catch (error) {
|
|
80
80
|
if ((error === null || error === void 0 ? void 0 : error.code) == 23505) {
|
|
81
|
-
throw Error('External ID not
|
|
81
|
+
throw Error('External ID not changed');
|
|
82
82
|
}
|
|
83
83
|
throw error;
|
|
84
84
|
}
|
|
@@ -89,13 +89,12 @@ async function updateUserById(id, user) {
|
|
|
89
89
|
return null;
|
|
90
90
|
}
|
|
91
91
|
try {
|
|
92
|
-
const
|
|
93
|
-
const userEx = await global.repository.users.findOneBy({ id: id });
|
|
92
|
+
const userEx = await global.repository.users.findOneById(id);
|
|
94
93
|
if (!userEx) {
|
|
95
94
|
return null;
|
|
96
95
|
}
|
|
97
|
-
const merged = global.repository.users.merge(userEx,
|
|
98
|
-
return await global.entity.User.save(
|
|
96
|
+
const merged = global.repository.users.merge(userEx, user);
|
|
97
|
+
return await global.entity.User.save(merged);
|
|
99
98
|
}
|
|
100
99
|
catch (error) {
|
|
101
100
|
throw error;
|
|
@@ -107,7 +106,7 @@ async function retrieveUserById(id) {
|
|
|
107
106
|
return null;
|
|
108
107
|
}
|
|
109
108
|
try {
|
|
110
|
-
return await global.repository.users.
|
|
109
|
+
return await global.repository.users.findOneById(id);
|
|
111
110
|
}
|
|
112
111
|
catch (error) {
|
|
113
112
|
throw error;
|
|
@@ -126,6 +125,42 @@ async function retrieveUserByEmail(email) {
|
|
|
126
125
|
}
|
|
127
126
|
}
|
|
128
127
|
exports.retrieveUserByEmail = retrieveUserByEmail;
|
|
128
|
+
async function retrieveUserByUsername(username) {
|
|
129
|
+
if (!username) {
|
|
130
|
+
return null;
|
|
131
|
+
}
|
|
132
|
+
try {
|
|
133
|
+
return await global.repository.users.findOneBy({ username });
|
|
134
|
+
}
|
|
135
|
+
catch (error) {
|
|
136
|
+
throw error;
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
exports.retrieveUserByUsername = retrieveUserByUsername;
|
|
140
|
+
async function retrieveUserByConfirmationToken(code) {
|
|
141
|
+
if (!code) {
|
|
142
|
+
return null;
|
|
143
|
+
}
|
|
144
|
+
try {
|
|
145
|
+
return await global.repository.users.findOneBy({ confirmationToken: code });
|
|
146
|
+
}
|
|
147
|
+
catch (error) {
|
|
148
|
+
throw error;
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
exports.retrieveUserByConfirmationToken = retrieveUserByConfirmationToken;
|
|
152
|
+
async function retrieveUserByResetPasswordToken(code) {
|
|
153
|
+
if (!code) {
|
|
154
|
+
return null;
|
|
155
|
+
}
|
|
156
|
+
try {
|
|
157
|
+
return await global.repository.users.findOneBy({ resetPasswordToken: code });
|
|
158
|
+
}
|
|
159
|
+
catch (error) {
|
|
160
|
+
throw error;
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
exports.retrieveUserByResetPasswordToken = retrieveUserByResetPasswordToken;
|
|
129
164
|
async function retrieveUserByExternalId(externalId) {
|
|
130
165
|
if (!externalId) {
|
|
131
166
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userManager.js","sourceRoot":"","sources":["../../../lib/loader/userManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAgC;AAChC,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;AAEzB,KAAK,UAAU,WAAW,CAAC,IAA+B;
|
|
1
|
+
{"version":3,"file":"userManager.js","sourceRoot":"","sources":["../../../lib/loader/userManager.ts"],"names":[],"mappings":"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"}
|