@opengis/admin 0.2.102 → 0.2.104

package/server/plugins/cron.js

@@ -1,11 +1,11 @@
-//import { addCron } from '@opengis/fastify-table/utils.js';
-
-async function deleteOldNotifications({ pg }) {
-    const { rowCount } = pg?.pk?.['crm.notifications'] ? await pg.query('delete from crm.notifications where CURRENT_DATE - \'14 days\'::interval > cdate') : {};
-    return { rowCount };
-}
-
-export default async function cron(fastify) {
-    // addCron(deleteOldNotifications, 60 * 60 * 24, fastify);
-    //  addCron(deleteOldNotifications, 60 * 1, fastify); // debug
+//import { addCron } from '@opengis/fastify-table/utils.js';
+
+async function deleteOldNotifications({ pg }) {
+    const { rowCount } = pg?.pk?.['crm.notifications'] ? await pg.query('delete from crm.notifications where CURRENT_DATE - \'14 days\'::interval > cdate') : {};
+    return { rowCount };
+}
+
+export default async function cron(fastify) {
+    // addCron(deleteOldNotifications, 60 * 60 * 24, fastify);
+    //  addCron(deleteOldNotifications, 60 * 1, fastify); // debug
 }

package/server/plugins/docs.js

@@ -1,28 +1,28 @@
-'use strict'
-
-import path, { dirname } from 'path';
-import { fileURLToPath } from 'url';
-import fs from 'fs';
-
-const dir = dirname(fileURLToPath(import.meta.url));
-const root = `${dir}/../../`;
-
-
-async function plugin(fastify, opts) {
-  fastify.get('/docs*', async (req, reply) => {
-    if (!fs.existsSync(path.join(root, 'docs/.vitepress/dist/'))) {
-      return reply.status(404).send('docs not exists');
-    }
-    const { params } = req;
-    const url = params['*']
-    const filePath = url && url[url.length - 1] !== '/' ? path.join(root, 'docs/.vitepress/dist/', url) : path.join(root, 'docs/.vitepress/dist/', url, 'index.html')
-    const ext = path.extname(filePath);
-    const mime = {
-      '.js': 'text/javascript', '.css': 'text/css', '.woff2': 'application/font-woff', '.png': 'image/png', '.svg': 'image/svg+xml', '.jpg': 'image/jpg'
-    }[ext];
-    const stream = fs.createReadStream(filePath);
-    return mime ? reply.type(mime).send(stream) : stream;
-
-  })
-}
-export default plugin;
+'use strict'
+
+import path, { dirname } from 'path';
+import { fileURLToPath } from 'url';
+import fs from 'fs';
+
+const dir = dirname(fileURLToPath(import.meta.url));
+const root = `${dir}/../../`;
+
+
+async function plugin(fastify, opts) {
+  fastify.get('/docs*', async (req, reply) => {
+    if (!fs.existsSync(path.join(root, 'docs/.vitepress/dist/'))) {
+      return reply.status(404).send('docs not exists');
+    }
+    const { params } = req;
+    const url = params['*']
+    const filePath = url && url[url.length - 1] !== '/' ? path.join(root, 'docs/.vitepress/dist/', url) : path.join(root, 'docs/.vitepress/dist/', url, 'index.html')
+    const ext = path.extname(filePath);
+    const mime = {
+      '.js': 'text/javascript', '.css': 'text/css', '.woff2': 'application/font-woff', '.png': 'image/png', '.svg': 'image/svg+xml', '.jpg': 'image/jpg'
+    }[ext];
+    const stream = fs.createReadStream(filePath);
+    return mime ? reply.type(mime).send(stream) : stream;
+
+  })
+}
+export default plugin;

package/server/routes/access/controllers/access.group.js

@@ -1,30 +1,30 @@
-import { pgClients } from '@opengis/fastify-table/utils.js';
-
-import { getAdminAccess } from '../../../../utils.js';
-
-export default async function accessGroup({
-    pg = pgClients.client, params = {}, session = {},
-}) {
-    const { user = {} } = session?.passport || {};
-
-    if (!params?.id) {
-        return { message: 'not enough params: id', status: 400 };
-    }
-
-    // restrict access - admin only
-    const check = await getAdminAccess({
-        id: params.id, user,
-    });
-    if (check) return check;
-
-    const { rows: routes = [] } = await pg.query(`select a.route_id as path, b.actions from admin.routes a 
-    left join admin.role_access b on a.route_id=b.route_id
-    where b.role_id=$1`, [params.id]);
-
-    const { rows: users = [] } = await pg.query(`select user_uid as id, user_name as name, access_granted, 
-    b.cdate as user_created, b.last_activity_date as last_activity from admin.user_roles a
-    left join admin.users b on a.user_uid=b.uid
-    where a.role_id=$1`, [params.id]);
-
-    return { routes, users };
+import { pgClients } from '@opengis/fastify-table/utils.js';
+
+import { getAdminAccess } from '../../../../utils.js';
+
+export default async function accessGroup({
+    pg = pgClients.client, params = {}, session = {},
+}) {
+    const { user = {} } = session?.passport || {};
+
+    if (!params?.id) {
+        return { message: 'not enough params: id', status: 400 };
+    }
+
+    // restrict access - admin only
+    const check = await getAdminAccess({
+        id: params.id, user,
+    });
+    if (check) return check;
+
+    const { rows: routes = [] } = await pg.query(`select a.route_id as path, b.actions from admin.routes a 
+    left join admin.role_access b on a.route_id=b.route_id
+    where b.role_id=$1`, [params.id]);
+
+    const { rows: users = [] } = await pg.query(`select user_uid as id, user_name as name, access_granted, 
+    b.cdate as user_created, b.last_activity_date as last_activity from admin.user_roles a
+    left join admin.users b on a.user_uid=b.uid
+    where a.role_id=$1`, [params.id]);
+
+    return { routes, users };
 }

package/server/routes/access/controllers/access.group.post.js

@@ -1,55 +1,55 @@
-import { pgClients } from '@opengis/fastify-table/utils.js';
-
-import { getAdminAccess } from '../../../../utils.js';
-import accessGroup from './access.group.js';
-
-export default async function accessGroupPost({
-    pg = pgClients.client, params = {}, session = {}, body = {},
-}) {
-    const { id } = params;
-    const { user } = session?.passport || {};
-    if (!user) return { status: 403, message: 'access restricted' }
-
-    // restrict access - admin only
-    const check = await getAdminAccess({ id, user });
-    if (check) return check;
-
-    const { users = [], routes = [] } = body;
-
-    if (!routes?.length) {
-        // return { message: 'not enough params: users / routes', status: 400 };
-        await pg.query(`delete from admin.role_access where role_id=$1`, [id]);
-
-        if (!users?.length) {
-            return { message: { id, routes }, status: 200 };
-        }
-    }
-
-    if (routes?.length) {
-        const { routesDB = [] } = await pg.query('select array_agg(route_id) as "routesDB" from admin.routes where enabled')
-            .then((res1) => res1.rows?.[0] || {});
-        await pg.query(`delete from admin.role_access where role_id=$1;`, [id]);
-
-
-        const q = `insert into admin.role_access(role_id,route_id,actions)   values ($1,$2,$3)`;
-        await Promise.all(routes.filter(el => routesDB.includes(el.path) && el.actions).map(el => pg.query(q, [id, el.path, el.actions])))
-
-        const { rows } = await pg.query(`select a.route_id as path, b.actions as actions from admin.routes a 
-            left join admin.role_access b on a.route_id=b.route_id
-            where b.role_id=$1`, [id]);
-
-        if (!users?.length) {
-            return { message: { id, routes: rows }, status: 200 };
-        }
-    }
-
-    const q = `delete from admin.user_roles where role_id='${id.replace(/'/g, "''")}';
-    insert into admin.user_roles(role_id,user_uid,access_granted)
-    values ${users.filter((el) => el?.id).map((el) => `('${id.replace(/'/g, "''")}','${el.id.replace(/'/g, "''")}','${uid?.replace(/'/g, "''")}')`)}`;
-
-    await pg.query(q);
-
-    const res = await accessGroup({ pg, params, session });
-
-    return res;
+import { pgClients } from '@opengis/fastify-table/utils.js';
+
+import { getAdminAccess } from '../../../../utils.js';
+import accessGroup from './access.group.js';
+
+export default async function accessGroupPost({
+    pg = pgClients.client, params = {}, session = {}, body = {},
+}) {
+    const { id } = params;
+    const { user } = session?.passport || {};
+    if (!user) return { status: 403, message: 'access restricted' }
+
+    // restrict access - admin only
+    const check = await getAdminAccess({ id, user });
+    if (check) return check;
+
+    const { users = [], routes = [] } = body;
+
+    if (!routes?.length) {
+        // return { message: 'not enough params: users / routes', status: 400 };
+        await pg.query(`delete from admin.role_access where role_id=$1`, [id]);
+
+        if (!users?.length) {
+            return { message: { id, routes }, status: 200 };
+        }
+    }
+
+    if (routes?.length) {
+        const { routesDB = [] } = await pg.query('select array_agg(route_id) as "routesDB" from admin.routes where enabled')
+            .then((res1) => res1.rows?.[0] || {});
+        await pg.query(`delete from admin.role_access where role_id=$1;`, [id]);
+
+
+        const q = `insert into admin.role_access(role_id,route_id,actions)   values ($1,$2,$3)`;
+        await Promise.all(routes.filter(el => routesDB.includes(el.path) && el.actions).map(el => pg.query(q, [id, el.path, el.actions])))
+
+        const { rows } = await pg.query(`select a.route_id as path, b.actions as actions from admin.routes a 
+            left join admin.role_access b on a.route_id=b.route_id
+            where b.role_id=$1`, [id]);
+
+        if (!users?.length) {
+            return { message: { id, routes: rows }, status: 200 };
+        }
+    }
+
+    const q = `delete from admin.user_roles where role_id='${id.replace(/'/g, "''")}';
+    insert into admin.user_roles(role_id,user_uid,access_granted)
+    values ${users.filter((el) => el?.id).map((el) => `('${id.replace(/'/g, "''")}','${el.id.replace(/'/g, "''")}','${uid?.replace(/'/g, "''")}')`)}`;
+
+    await pg.query(q);
+
+    const res = await accessGroup({ pg, params, session });
+
+    return res;
 }

package/server/routes/access/index.mjs

@@ -1,11 +1,11 @@
-import accessGroup from "./controllers/access.group.js";
-import accessGroupPost from "./controllers/access.group.post.js";
-import accessInterface from "./controllers/access.interface.js";
-
-import { accessGroupPostSchema, accessGroupSchema, accessInterfaceSchema } from "./schema.mjs";
-
-export default async function route(fastify) {
-    fastify.get('/access-group/:id', { schema: accessGroupSchema }, accessGroup);
-    fastify.post('/access-group/:id', { schema: accessGroupPostSchema }, accessGroupPost);
-    fastify.get('/access-interface/:name', { schema: accessInterfaceSchema }, accessInterface);
-}
+import accessGroup from "./controllers/access.group.js";
+import accessGroupPost from "./controllers/access.group.post.js";
+import accessInterface from "./controllers/access.interface.js";
+
+import { accessGroupPostSchema, accessGroupSchema, accessInterfaceSchema } from "./schema.mjs";
+
+export default async function route(fastify) {
+    fastify.get('/access-group/:id', { schema: accessGroupSchema }, accessGroup);
+    fastify.post('/access-group/:id', { schema: accessGroupPostSchema }, accessGroupPost);
+    fastify.get('/access-interface/:name', { schema: accessInterfaceSchema }, accessInterface);
+}

package/server/routes/access/schema.mjs

@@ -1,68 +1,68 @@
-export default null;
-export { accessGroupSchema, accessGroupPostSchema, accessInterfaceSchema }
-
-const accessGroupSchema = {
-    params: {
-        type: 'object',
-        properties: {
-            id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-        },
-        required: ['id'],
-    },
-};
-
-const accessInterfaceSchema = {
-    params: {
-        type: 'object',
-        properties: {
-            name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-        },
-        required: ['name'],
-    },
-};
-
-const accessGroupPostSchema = {
-    params: {
-        type: 'object',
-        properties: {
-            id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-        },
-        required: ['id'],
-    },
-    body: {
-        type: 'object',
-        properties: {
-            users: {
-                type: 'array',
-                items: {
-                    type: 'object',
-                    properties: {
-                        id: {
-                            type: 'string',
-                            pattern: '^([\\d\\w._-]+)$',
-                        },
-                    },
-                },
-            },
-            routes: {
-                type: 'array',
-                /*items: {
-                    type: 'object',
-                    properties: {
-                        path: {
-                            type: 'string',
-                            pattern: '^([\\d\\w._-]+)$',
-                        },
-                        actions: {
-                            type: 'array',
-                            items: {
-                                type: 'string',
-                                enum: ['get', 'add', 'edit', 'del'],
-                            },
-                        },
-                    },
-                },*/
-            },
-        },
-    },
+export default null;
+export { accessGroupSchema, accessGroupPostSchema, accessInterfaceSchema }
+
+const accessGroupSchema = {
+    params: {
+        type: 'object',
+        properties: {
+            id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+        },
+        required: ['id'],
+    },
+};
+
+const accessInterfaceSchema = {
+    params: {
+        type: 'object',
+        properties: {
+            name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+        },
+        required: ['name'],
+    },
+};
+
+const accessGroupPostSchema = {
+    params: {
+        type: 'object',
+        properties: {
+            id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+        },
+        required: ['id'],
+    },
+    body: {
+        type: 'object',
+        properties: {
+            users: {
+                type: 'array',
+                items: {
+                    type: 'object',
+                    properties: {
+                        id: {
+                            type: 'string',
+                            pattern: '^([\\d\\w._-]+)$',
+                        },
+                    },
+                },
+            },
+            routes: {
+                type: 'array',
+                /*items: {
+                    type: 'object',
+                    properties: {
+                        path: {
+                            type: 'string',
+                            pattern: '^([\\d\\w._-]+)$',
+                        },
+                        actions: {
+                            type: 'array',
+                            items: {
+                                type: 'string',
+                                enum: ['get', 'add', 'edit', 'del'],
+                            },
+                        },
+                    },
+                },*/
+            },
+        },
+    },
 };