@opengis/admin 0.4.22 → 0.4.23

package/dist/{profile-page-CrxFfeAq.js → profile-page-CBSCi6Db.js}

@@ -1,4 +1,4 @@
-import { _ as n, f as m } from "./import-file-DcpjZvgK.js";
+import { _ as n, f as m } from "./import-file-DJR1XXLF.js";
 import { u as p } from "./user-B_2kh6ic.js";
 import { resolveComponent as f, createElementBlock as d, openBlock as u, createElementVNode as o, createBlock as h, createCommentVNode as b } from "vue";
 const x = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/admin",
-  "version": "0.4.22",
+  "version": "0.4.23",
   "description": "This project Softpro Admin",
   "main": "dist/admin.js",
   "type": "module",
@@ -49,8 +49,6 @@
     "@fullcalendar/list": "^6.1.15",
     "@fullcalendar/timegrid": "^6.1.15",
     "@fullcalendar/vue3": "^6.1.15",
-    "@opengis/fastify-auth": "1.1.x",
-    "@opengis/fastify-table": "1.4.x",
     "@opengis/v3-core": "^0.3.213",
     "@opengis/v3-filter": "0.1.30",
     "@turf/turf": "^7.1.0",
@@ -70,6 +68,8 @@
     "vuedraggable": "^4.1.0"
   },
   "devDependencies": {
+    "@opengis/fastify-auth": "1.1.x",
+    "@opengis/fastify-table": "1.4.x",
     "@opengis/table-builder": "^1.1.1",
     "@vue/eslint-config-typescript": "^12.0.0",
     "eslint": "^8.49.0",

package/plugin.js

@@ -12,7 +12,7 @@ async function plugin(fastify, opts = config) {
 
   fastify.register(import('./server/plugins/cron.js'), opts); // cron / scheduler
   fastify.register(import('./server/plugins/hook.js'), opts); // data / template hooks
-  fastify.register(import('./server/plugins/access/index.mjs'), opts); // check access / analogue of policy
+  // fastify.register(import('./server/plugins/access/index.mjs'), opts); // check access / analogue of policy
 
   // API
   // fastify.register(import('./server/routes/properties/index.mjs'), opts);
@@ -23,9 +23,9 @@ async function plugin(fastify, opts = config) {
   // fastify.register(import('./server/routes/data/index.mjs'), opts);
   fastify.register(import('./server/routes/user/index.mjs'), opts);
   // fastify.register(import('./server/routes/widget/index.mjs'), opts); // moved to core
-  fastify.register(import('./server/routes/access/index.mjs'), opts);
+  // fastify.register(import('./server/routes/access/index.mjs'), opts); // moved to core
   // fastify.register(import('./server/routes/report/index.mjs'), opts);
   // fastify.register(import('./server/routes/print/index.mjs'), opts);
-  fastify.register(import('./server/routes/util/index.mjs'), opts);
+  // fastify.register(import('./server/routes/util/index.mjs'), opts); // moved to core
 }
 export default fp(plugin)

package/utils.js

@@ -1,13 +1,24 @@
 import yamlSafe from 'js-yaml';
 
-import { handlebars, handlebarsSync, addTemplateDir } from '@opengis/fastify-table/utils.js';
+import { config, handlebars, handlebarsSync, addTemplateDir } from '@opengis/fastify-table/utils.js';
 
 
 import isAdmin from './server/utils/isAdmin.js';
 import addNotification from './server/utils/addNotification.js';
 import sendNotification from './server/utils/sendNotification.js';
 
-import getAdminAccess from './server/plugins/access/funcs/getAdminAccess.js';
+async function getAdminAccess({
+  id, user = {},
+}) {
+  if (!id) {
+    return { message: 'not enough params: id', status: 400 };
+  }
+
+  if (!config?.local && !['admin'].includes(user.user_type, user.type)) {
+    return { message: 'access restricted: admin', status: 403 };
+  }
+  return null;
+}
 
 function loadSafe(yml) {
   try {

package/server/plugins/access/funcs/getAdminAccess.js

@@ -1,13 +0,0 @@
-import { config } from '@opengis/fastify-table/utils.js';
-
-export default async function getAdminAccess({
-    id, user = {},
-}) {
-    if (!id) {
-        return { message: 'not enough params: id', status: 400 };
-    }
-
-    if (!config?.local && !['admin'].includes(user.user_type, user.type)) {
-        return { message: 'access restricted: admin', status: 403 };
-    }
-}

package/server/plugins/access/index.mjs

@@ -1,6 +0,0 @@
-import getAdminAccess from './funcs/getAdminAccess.js';
-
-async function plugin(fastify) {
-//   fastify.decorate('getAdminAccess', getAdminAccess);
-}
-export default plugin;

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

@@ -1,29 +0,0 @@
-import { pgClients } from '@opengis/fastify-table/utils.js';
-
-import { getAdminAccess } from '../../../../utils.js';
-
-export default async function accessGroup({
-    pg = pgClients.client, params = {}, user = {},
-}) {
-
-    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,54 +0,0 @@
-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 = {}, user = {}, body = {},
-}) {
-    const { id } = params;
-    if (!user?.uid) 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, "''")}','${user?.uid?.replace(/'/g, "''")}')`)}`;
-
-    await pg.query(q);
-
-    const res = await accessGroup({ pg, params, session });
-
-    return res;
-}

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

@@ -1,34 +0,0 @@
-import { pgClients, metaFormat } from '@opengis/fastify-table/utils.js';
-import { getAdminAccess } from '../../../../utils.js';
-
-const q = `select a.route_id as id, coalesce(b.user_uid, d.user_uid) as user_uid, coalesce(d.actions, b.actions, array['view']) as actions, b.scope, c.role_id
-from admin.routes a 
-left join admin.role_access b on 
-  a.route_id=b.route_id
-left join admin.roles c on 
-  b.role_id=c.role_id 
-  and c.enabled
-left join admin.user_roles d on 
-  c.role_id=d.role_id 
-  and ( case when 
-            d.expiration is not null 
-            then d.expiration > CURRENT_DATE 
-            else 1=1 
-        end )
-where $1 in (a.route_id, a.alias, a.table_name) and coalesce(b.user_uid, d.user_uid) is not null`;
-
-export default async function accessInterface(req) {
-    const { pg = pgClients.client, params = {}, user = {} } = req;
-
-    // restrict access - admin only
-    const check = await getAdminAccess({
-        id: params.name, user,
-    });
-    if (check) return check;
-
-    const { rows = [] } = await pg.query(q, [params.name]);
-
-    const cls = { user_uid: 'core.user_uid', actions: 'core.actions', role_id: 'core.roles' };
-    await metaFormat({ rows, cls, sufix: false });
-    return { rows };
-}

package/server/routes/access/index.mjs

@@ -1,11 +0,0 @@
-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 +0,0 @@
-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'],
-                            },
-                        },
-                    },
-                },*/
-            },
-        },
-    },
-};

package/server/routes/util/controllers/code.generator.js

@@ -1,89 +0,0 @@
-import { getTemplate, handlebarsSync, pgClients, getToken } from "@opengis/fastify-table/utils.js";
-
-function dayOfTheYear(date) {
-  const start = new Date(date.getFullYear(), 0, 0);
-  const diff = (date - start) + ((start.getTimezoneOffset() - date.getTimezoneOffset()) * 60 * 1000);
-  const oneDay = 1000 * 60 * 60 * 24;
-  const day = Math.floor(diff / oneDay);
-  return day;
-}
-
-export default async function codeGenerator({
-  pg = pgClients.client, params = {}, user = {}, query = {},
-}, reply) {
-  const { token, column } = params;
-  const data = query.data?.split?.(';') || [];
-
-  if (!token || !column) {
-    return reply.status(400).send('not enough params: token / column');
-  }
-
-  if (!user?.uid) {
-    return reply.status(401).send('access restricted: token');
-  }
-
-  const tokenData = await getToken({ token, uid: user?.uid, json: 1 }) || {};
-
-  if (!tokenData?.form || !tokenData?.table) {
-    return reply.status(401).send('token not allow');
-  }
-
-  const loadTemplate = await getTemplate('form', tokenData.form);
-  const schema = loadTemplate?.schema || loadTemplate;
-
-  if (!schema) {
-    return reply.status(404).send('form not found');
-  }
-
-  if (!schema?.[column]?.template) {
-    return reply.status(400).send('template not specified');
-  }
-
-  const columnValue = data.find(el => el.startsWith(column))?.split('=')?.pop();
-
-  const loadTable = await getTemplate('table', tokenData.table);
-  const table = loadTable?.table || tokenData.table;
-
-  if (!pg.pk?.[table]) {
-    return reply.status(404).send('table pk not found');
-  }
-
-  const { count = 0 } = await pg.query(
-    `select count(*) from ${table} where ${columnValue ? `${column}::text = '${columnValue}'` : 'true'} limit 1`,
-  ).then(el => el.rows?.[0] || {});
-
-  const { NUMY = 0 } = await pg.query(
-    `select ${column} as "NUMY" from ${table} where ${column} is not null and date_part('year', cdate) = $1 order by cdate desc limit 1`,
-    [(new Date()).getFullYear()]
-  ).then(el => el.rows?.[0] || {});
-
-  const date = new Date();
-
-  const template = schema[column].template.match(/NUM[M|Y] \d/g)
-    .reduce((acc, curr) => acc.replace(
-      curr.startsWith('{{{') ? `{{{${curr}}}}` : `{{${curr}}}`,
-      handlebarsSync.compile(`{{paddingNumber value padding}}`)({ padding: curr.substring(4, curr.length)?.trim?.(), value: curr.startsWith('NUMY') ? NUMY : +count + 1 })),
-      schema[column].template
-    );
-  const result = handlebarsSync.compile(template)({
-    HH: date.getHours(),                      // hours 24h: 14:00 = 14
-    HH12: (date.getHours() + 24) % 12 || 12,  // hours 12h: 14:00 = 2
-    HH24: date.getHours(),                    // hours 24h: 14:00 = 14
-    MI: date.getMinutes(),                    // minutes
-    SS: date.getSeconds(),                    // seconds
-
-    YYYY: date.getFullYear(),                           // full year: 2025
-    YY: date.getFullYear().toString().substring(2, 4),  // last 2 digits of year: 25
-
-    MONTH: date.toLocaleString('en', { month: 'long' }).toUpperCase(),               // month name: MARCH
-    MON: date.toLocaleString('en', { month: 'long' }).substring(0, 3).toUpperCase(), // month name abbrev: MAR
-    MM: date.getMonth() + 1,                                                         // month number: 1 - january, 12 - december
-
-    D: date.getDay(),         // day of the week: 1 - monday, 7 - sunday
-    DD: date.getDate(),       // day of the month: january 4 = 4
-    DDD: dayOfTheYear(date),  // day of the year: march 4 = 63
-    ...data,
-  });
-
-  return reply.status(200).send(result);
-}

package/server/routes/util/index.mjs

@@ -1,5 +0,0 @@
-import codeGenerator from "./controllers/code.generator.js";
-
-export default async function plugin(fastify, opts) {
-  fastify.get('/code-gen/:token/:column/:id?', { config: { policy: ['user'] } }, codeGenerator);
-}