@openinc/parse-server-opendash 3.23.1 → 3.23.3
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/features/openservice/functions/assignUsersAndRoles.js +4 -4
- package/dist/functions/openinc-openservice-save-ticket-data.d.ts +2 -2
- package/dist/functions/openinc-openservice-save-ticket-data.js +16 -8
- package/dist/hooks/OWPlcDevice.js +0 -4
- package/dist/hooks/OWPlcItem.js +2 -10
- package/package.json +1 -1
|
@@ -108,7 +108,7 @@ async function assignUsersAndRoles(ticket, assignedTo, fetchOptions, assigningUs
|
|
|
108
108
|
acl.setWriteAccess(assignedUser, true);
|
|
109
109
|
}
|
|
110
110
|
// get the parent roles of the assigned roles
|
|
111
|
-
const rolesWithParents = await addParentRoles(newRoles);
|
|
111
|
+
const rolesWithParents = await addParentRoles(newRoles, fetchOptions);
|
|
112
112
|
// remove duplicates from the array
|
|
113
113
|
const distinctRolesWithParents = (0, openinc_openservice_ticket_data_1.arrayToDistinct)(rolesWithParents, (obj) => obj.id);
|
|
114
114
|
for (const assignedRole of distinctRolesWithParents) {
|
|
@@ -152,14 +152,14 @@ async function assignUsersAndRoles(ticket, assignedTo, fetchOptions, assigningUs
|
|
|
152
152
|
}).save(null, fetchOptions);
|
|
153
153
|
await ticket.save(null, fetchOptions);
|
|
154
154
|
}
|
|
155
|
-
async function addParentRoles(roles) {
|
|
155
|
+
async function addParentRoles(roles, fetchOptions) {
|
|
156
156
|
for (const role of roles) {
|
|
157
157
|
const roleQuery = new Parse.Query(parse_1.Role).equalTo("objectId", role.id);
|
|
158
158
|
const parentRoles = await new Parse.Query(parse_1.Role)
|
|
159
159
|
.matchesQuery("roles", roleQuery)
|
|
160
|
-
.find();
|
|
160
|
+
.find(fetchOptions);
|
|
161
161
|
if (parentRoles.length > 0) {
|
|
162
|
-
roles.push(...(await addParentRoles(parentRoles)));
|
|
162
|
+
roles.push(...(await addParentRoles(parentRoles, fetchOptions)));
|
|
163
163
|
}
|
|
164
164
|
}
|
|
165
165
|
return roles;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { SaveValues } from "../features/openservice";
|
|
1
|
+
import { FetchOptions, SaveValues } from "../features/openservice";
|
|
2
2
|
import { _User, Maintenance_Ticket } from "../types";
|
|
3
3
|
export declare function getUsername(user: _User | undefined): string;
|
|
4
4
|
export declare function init(name: string): Promise<void>;
|
|
5
|
-
export declare function saveTicketData(data: SaveValues, user?: _User): Promise<Maintenance_Ticket>;
|
|
5
|
+
export declare function saveTicketData(data: SaveValues, user?: _User, overrideFetchOptions?: FetchOptions): Promise<Maintenance_Ticket>;
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getUsername = getUsername;
|
|
4
4
|
exports.init = init;
|
|
5
5
|
exports.saveTicketData = saveTicketData;
|
|
6
|
+
const parse_1 = require("parse");
|
|
6
7
|
const openservice_1 = require("../features/openservice");
|
|
7
8
|
const openware_1 = require("../features/openware");
|
|
8
9
|
const catchError_1 = require("../helper/catchError");
|
|
@@ -23,9 +24,7 @@ function getUsername(user) {
|
|
|
23
24
|
return username ?? "System";
|
|
24
25
|
}
|
|
25
26
|
async function init(name) {
|
|
26
|
-
Parse.Cloud.define(name, handleRequest, {
|
|
27
|
-
requireUser: true,
|
|
28
|
-
});
|
|
27
|
+
Parse.Cloud.define(name, handleRequest, { requireUser: false });
|
|
29
28
|
}
|
|
30
29
|
async function handleRequest(request) {
|
|
31
30
|
const result = {
|
|
@@ -34,7 +33,16 @@ async function handleRequest(request) {
|
|
|
34
33
|
try {
|
|
35
34
|
const session = request.user?.getSessionToken();
|
|
36
35
|
if (!session) {
|
|
37
|
-
|
|
36
|
+
const adminUser = (await new Parse.Query(parse_1.User)
|
|
37
|
+
.include("session")
|
|
38
|
+
.ascending("createdAt")
|
|
39
|
+
.first({ useMasterKey: true }));
|
|
40
|
+
// adminUser was fetched with master privileges; ensure subsequent operations run with master as well
|
|
41
|
+
const ticket = await saveTicketData(request.params, adminUser, {
|
|
42
|
+
useMasterKey: true,
|
|
43
|
+
});
|
|
44
|
+
result.ticket = ticket;
|
|
45
|
+
return result;
|
|
38
46
|
}
|
|
39
47
|
const ticket = await saveTicketData(request.params, request.user);
|
|
40
48
|
result.success = true;
|
|
@@ -48,10 +56,10 @@ async function handleRequest(request) {
|
|
|
48
56
|
return result;
|
|
49
57
|
}
|
|
50
58
|
}
|
|
51
|
-
async function saveTicketData(data, user) {
|
|
52
|
-
const fetchOptions =
|
|
53
|
-
? { sessionToken: user.getSessionToken() }
|
|
54
|
-
|
|
59
|
+
async function saveTicketData(data, user, overrideFetchOptions) {
|
|
60
|
+
const fetchOptions = overrideFetchOptions ??
|
|
61
|
+
(user ? { sessionToken: user.getSessionToken() } : { useMasterKey: true });
|
|
62
|
+
console.log("[saveTicketData] effective fetchOptions:", fetchOptions);
|
|
55
63
|
const ticket = await (0, openservice_1.getTicketObject)(data, user, fetchOptions);
|
|
56
64
|
const owticketobj = {
|
|
57
65
|
ticket: ticket,
|
|
@@ -6,12 +6,8 @@ const types_1 = require("../types");
|
|
|
6
6
|
async function init() {
|
|
7
7
|
(0, __1.beforeSaveHook)(types_1.OWPlcDevice, async (request) => {
|
|
8
8
|
const { object, original, user } = request;
|
|
9
|
-
await (0, __1.defaultHandler)(request);
|
|
10
|
-
await (0, __1.defaultAclHandler)(request);
|
|
11
|
-
// TODO
|
|
12
9
|
});
|
|
13
10
|
(0, __1.afterSaveHook)(types_1.OWPlcDevice, async (request) => {
|
|
14
11
|
const { object, original, user } = request;
|
|
15
|
-
// TODO
|
|
16
12
|
});
|
|
17
13
|
}
|
package/dist/hooks/OWPlcItem.js
CHANGED
|
@@ -4,14 +4,6 @@ exports.init = init;
|
|
|
4
4
|
const __1 = require("..");
|
|
5
5
|
const types_1 = require("../types");
|
|
6
6
|
async function init() {
|
|
7
|
-
(0, __1.beforeSaveHook)(types_1.OWPlcItem, async (request) => {
|
|
8
|
-
|
|
9
|
-
await (0, __1.defaultHandler)(request);
|
|
10
|
-
await (0, __1.defaultAclHandler)(request);
|
|
11
|
-
// TODO
|
|
12
|
-
});
|
|
13
|
-
(0, __1.afterSaveHook)(types_1.OWPlcItem, async (request) => {
|
|
14
|
-
const { object, original, user } = request;
|
|
15
|
-
// TODO
|
|
16
|
-
});
|
|
7
|
+
(0, __1.beforeSaveHook)(types_1.OWPlcItem, async (request) => { });
|
|
8
|
+
(0, __1.afterSaveHook)(types_1.OWPlcItem, async (request) => { });
|
|
17
9
|
}
|