@opengis/fastify-table 2.0.145 → 2.0.146
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkUserAccess.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/checkUserAccess.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AAEH,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,EACtC,
|
|
1
|
+
{"version":3,"file":"checkUserAccess.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/checkUserAccess.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AAEH,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,EACtC,IAAI,EACJ,KAAK,GACN,EAAE;IACD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;;;EAiBA"}
|
|
@@ -5,12 +5,12 @@ const { accessToken = "0NWcGQxKRP8AsRxD" } = config.auth || {};
|
|
|
5
5
|
* @summary check user access to logger interface - per admin user type or user group
|
|
6
6
|
* @returns {Object} message, status
|
|
7
7
|
*/
|
|
8
|
-
export default function checkUserAccess({ user
|
|
8
|
+
export default function checkUserAccess({ user, token, }) {
|
|
9
9
|
if (token && token === accessToken) {
|
|
10
10
|
return { message: "access granted", status: 200 };
|
|
11
11
|
}
|
|
12
12
|
// console.log(user);
|
|
13
|
-
if (!user.user_type?.includes?.("admin") &&
|
|
13
|
+
if ((!user || !user.user_type?.includes?.("admin")) &&
|
|
14
14
|
!config?.local &&
|
|
15
15
|
!config.auth?.disable) {
|
|
16
16
|
return { message: "access restricted", status: 403 };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/functions/getData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/functions/getData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAgFzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,KAAK,EACL,EAAE,EACF,OAAY,EACZ,KAAU,EACV,IAAS,EACT,YAAY,EACZ,KAAY,EACZ,UAAU,EACV,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,gBAAgB,EAC7B,OAAO,EAAE,YAAY,EACrB,QAAgB,GACjB,EAAE;IACD,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,MAAM,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACxD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,EACD,MAAM,CAAC,EAAE,YAAY,EACrB,MAAM,CAAC,EAAE,GAAG,gBA41Bb"}
|
|
@@ -35,7 +35,7 @@ const mockReply = {
|
|
|
35
35
|
},
|
|
36
36
|
send: (txt) => Object.assign(mockReply.response, txt),
|
|
37
37
|
};
|
|
38
|
-
function getOrder(queryOrder, queryDesc, defaultOrder, columnList, iscalled = false) {
|
|
38
|
+
function getOrder(queryOrder, queryDesc, defaultOrder, columnList, sqlColumns, iscalled = false) {
|
|
39
39
|
if (iscalled && queryOrder) {
|
|
40
40
|
return `order by ${queryOrder}`;
|
|
41
41
|
}
|
|
@@ -44,7 +44,7 @@ function getOrder(queryOrder, queryDesc, defaultOrder, columnList, iscalled = fa
|
|
|
44
44
|
}
|
|
45
45
|
const orderArr = queryOrder.split(/[|]/g).map((el) => el.split(/[-]/));
|
|
46
46
|
const validOrder = orderArr
|
|
47
|
-
.filter((el) => el[0] && (columnList || "").includes(el[0]))
|
|
47
|
+
.filter((el) => el[0] && (columnList || "").concat(sqlColumns || "").includes(el[0]))
|
|
48
48
|
.map((el) => `${el[0]} ${queryDesc || el[1] === "desc" ? "desc" : ""}`)
|
|
49
49
|
.join(",");
|
|
50
50
|
return `order by ${validOrder || "true::boolean"} nulls last`;
|
|
@@ -267,7 +267,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
|
|
|
267
267
|
const offset = query?.page && query?.page > 0 && !objectId
|
|
268
268
|
? ` offset ${(query?.page - 1) * limit}`
|
|
269
269
|
: "";
|
|
270
|
-
const order = getOrder(query?.order, query?.desc, loadTable?.order, columnList, !!called);
|
|
270
|
+
const order = getOrder(query?.order, query?.desc, loadTable?.order, columnList, loadTable?.sqlColumns, !!called);
|
|
271
271
|
if (config.trace)
|
|
272
272
|
console.log(order);
|
|
273
273
|
const search = loadTable?.meta?.search && query?.search
|