scheduler-services 1.3.74 → 1.3.75
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/package.json +1 -1
- package/userService.d.ts +2 -1
- package/userService.js +28 -1
- package/userService.js.map +1 -1
package/package.json
CHANGED
package/userService.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { IUser, User } from "scheduler-models/users";
|
|
1
|
+
import { IUser, Permission, User } from "scheduler-models/users";
|
|
2
2
|
export declare class UserService {
|
|
3
3
|
get(userid: string): Promise<User>;
|
|
4
4
|
getByEmail(email: string): Promise<User>;
|
|
@@ -6,4 +6,5 @@ export declare class UserService {
|
|
|
6
6
|
replace(replace: IUser): Promise<void>;
|
|
7
7
|
remove(userid: string): Promise<void>;
|
|
8
8
|
getAll(): Promise<User[]>;
|
|
9
|
+
getPermission(): Promise<Permission[]>;
|
|
9
10
|
}
|
package/userService.js
CHANGED
|
@@ -4,6 +4,7 @@ exports.UserService = void 0;
|
|
|
4
4
|
const users_1 = require("scheduler-models/users");
|
|
5
5
|
const mongoconnect_1 = require("./mongoconnect");
|
|
6
6
|
const mongodb_1 = require("mongodb");
|
|
7
|
+
const sqldb_1 = require("./sqldb");
|
|
7
8
|
class UserService {
|
|
8
9
|
async get(userid) {
|
|
9
10
|
let user = new users_1.User();
|
|
@@ -55,7 +56,7 @@ class UserService {
|
|
|
55
56
|
if (usr.emailAddress.toLowerCase() === newuser.emailAddress.toLowerCase()
|
|
56
57
|
|| (usr.lastName.toLowerCase() === newuser.lastName.toLowerCase()
|
|
57
58
|
&& usr.firstName.toLowerCase() === newuser.firstName.toLowerCase()
|
|
58
|
-
&& usr.middleName
|
|
59
|
+
&& usr.middleName?.toLowerCase() === newuser.middleName?.toLowerCase())) {
|
|
59
60
|
user = new users_1.User(usr);
|
|
60
61
|
found = true;
|
|
61
62
|
}
|
|
@@ -115,6 +116,32 @@ class UserService {
|
|
|
115
116
|
throw new Error('No user collection');
|
|
116
117
|
}
|
|
117
118
|
}
|
|
119
|
+
async getPermission() {
|
|
120
|
+
let conn;
|
|
121
|
+
const list = [];
|
|
122
|
+
try {
|
|
123
|
+
if (sqldb_1.mdbConnection.pool) {
|
|
124
|
+
conn = await sqldb_1.mdbConnection.pool.getConnection();
|
|
125
|
+
const query = "SELECT * FROM permissions ORDER BY application, job;";
|
|
126
|
+
const result = await conn.query(query);
|
|
127
|
+
result.forEach((row) => {
|
|
128
|
+
list.push(new users_1.Permission({
|
|
129
|
+
application: row.application,
|
|
130
|
+
job: row.job
|
|
131
|
+
}));
|
|
132
|
+
});
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
catch (err) {
|
|
136
|
+
throw err;
|
|
137
|
+
}
|
|
138
|
+
finally {
|
|
139
|
+
if (conn) {
|
|
140
|
+
conn.release();
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
return list;
|
|
144
|
+
}
|
|
118
145
|
}
|
|
119
146
|
exports.UserService = UserService;
|
|
120
147
|
//# sourceMappingURL=userService.js.map
|
package/userService.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userService.js","sourceRoot":"","sources":["../src/userService.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"userService.js","sourceRoot":"","sources":["../src/userService.ts"],"names":[],"mappings":"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"}
|