@opengis/fastify-table 2.4.1 → 2.4.2

package/dist/server/migrations/template.sql

@@ -1,44 +1,44 @@
-create schema if not exists admin;
-
--- DROP TABLE is exists admin.templates;
-CREATE TABLE if not exists admin.templates();
-ALTER TABLE admin.templates add column if not exists template_id text NOT NULL DEFAULT next_id();
-ALTER TABLE admin.templates DROP CONSTRAINT if exists admin_templates_template_id_pkey cascade;
-ALTER TABLE admin.templates DROP CONSTRAINT if exists admin_templates_name_type_unique;
-
-ALTER TABLE admin.templates add column if not exists name text;
-ALTER TABLE admin.templates add column if not exists title text;
-ALTER TABLE admin.templates add column if not exists type text;
-ALTER TABLE admin.templates add column if not exists category text;
-ALTER TABLE admin.templates add column if not exists route_id text;
-ALTER TABLE admin.templates add column if not exists is_active boolean;
-ALTER TABLE admin.templates alter column is_active   set default true;
-ALTER TABLE admin.templates add column if not exists body text;
-ALTER TABLE admin.templates add column if not exists description text;
-ALTER TABLE admin.templates add column if not exists placeholders json;
-ALTER TABLE admin.templates add column if not exists version numeric;
-
-ALTER TABLE admin.templates add column if not exists created_by text;
-ALTER TABLE admin.templates add column if not exists created_at timestamp without time zone;
-ALTER TABLE admin.templates alter column created_at set DEFAULT date_trunc('seconds'::text, now());
-ALTER TABLE admin.templates add column if not exists updated_by text;
-ALTER TABLE admin.templates add column if not exists updated_at timestamp without time zone;
-ALTER TABLE admin.templates alter column updated_at set DEFAULT date_trunc('seconds'::text, now());
-
-ALTER TABLE admin.templates add CONSTRAINT admin_templates_template_id_pkey PRIMARY KEY (template_id);
-ALTER TABLE admin.templates add CONSTRAINT admin_templates_name_type_unique UNIQUE (name, type);
-
-COMMENT ON TABLE admin.templates IS 'Шаблони для друку';
-
-COMMENT ON COLUMN admin.templates.created_by IS 'ID користувача';
-
-COMMENT ON COLUMN admin.templates.name IS 'Систамна назва шаблону';
-COMMENT ON COLUMN admin.templates.title IS 'Назва шаблону українською';
-COMMENT ON COLUMN admin.templates.type IS 'Тип вихідних даних шаблону (demo/user)';
-COMMENT ON COLUMN admin.templates.category IS 'Категорія або тип документа';
-COMMENT ON COLUMN admin.templates.route_id IS 'ID інтерфейсу';
-COMMENT ON COLUMN admin.templates.is_active IS 'Чи доступний шаблон для використання';
-COMMENT ON COLUMN admin.templates.body IS 'Body HTML';
-COMMENT ON COLUMN admin.templates.description IS 'Короткий опис шаблону';
-COMMENT ON COLUMN admin.templates.placeholders IS 'Список змінних, які можна вставляти';
+create schema if not exists admin;
+
+-- DROP TABLE is exists admin.templates;
+CREATE TABLE if not exists admin.templates();
+ALTER TABLE admin.templates add column if not exists template_id text NOT NULL DEFAULT next_id();
+ALTER TABLE admin.templates DROP CONSTRAINT if exists admin_templates_template_id_pkey cascade;
+ALTER TABLE admin.templates DROP CONSTRAINT if exists admin_templates_name_type_unique;
+
+ALTER TABLE admin.templates add column if not exists name text;
+ALTER TABLE admin.templates add column if not exists title text;
+ALTER TABLE admin.templates add column if not exists type text;
+ALTER TABLE admin.templates add column if not exists category text;
+ALTER TABLE admin.templates add column if not exists route_id text;
+ALTER TABLE admin.templates add column if not exists is_active boolean;
+ALTER TABLE admin.templates alter column is_active   set default true;
+ALTER TABLE admin.templates add column if not exists body text;
+ALTER TABLE admin.templates add column if not exists description text;
+ALTER TABLE admin.templates add column if not exists placeholders json;
+ALTER TABLE admin.templates add column if not exists version numeric;
+
+ALTER TABLE admin.templates add column if not exists created_by text;
+ALTER TABLE admin.templates add column if not exists created_at timestamp without time zone;
+ALTER TABLE admin.templates alter column created_at set DEFAULT date_trunc('seconds'::text, now());
+ALTER TABLE admin.templates add column if not exists updated_by text;
+ALTER TABLE admin.templates add column if not exists updated_at timestamp without time zone;
+ALTER TABLE admin.templates alter column updated_at set DEFAULT date_trunc('seconds'::text, now());
+
+ALTER TABLE admin.templates add CONSTRAINT admin_templates_template_id_pkey PRIMARY KEY (template_id);
+ALTER TABLE admin.templates add CONSTRAINT admin_templates_name_type_unique UNIQUE (name, type);
+
+COMMENT ON TABLE admin.templates IS 'Шаблони для друку';
+
+COMMENT ON COLUMN admin.templates.created_by IS 'ID користувача';
+
+COMMENT ON COLUMN admin.templates.name IS 'Систамна назва шаблону';
+COMMENT ON COLUMN admin.templates.title IS 'Назва шаблону українською';
+COMMENT ON COLUMN admin.templates.type IS 'Тип вихідних даних шаблону (demo/user)';
+COMMENT ON COLUMN admin.templates.category IS 'Категорія або тип документа';
+COMMENT ON COLUMN admin.templates.route_id IS 'ID інтерфейсу';
+COMMENT ON COLUMN admin.templates.is_active IS 'Чи доступний шаблон для використання';
+COMMENT ON COLUMN admin.templates.body IS 'Body HTML';
+COMMENT ON COLUMN admin.templates.description IS 'Короткий опис шаблону';
+COMMENT ON COLUMN admin.templates.placeholders IS 'Список змінних, які можна вставляти';
 COMMENT ON COLUMN admin.templates.version IS 'Версія шаблону';

package/dist/server/migrations/users.sql

@@ -1,152 +1,152 @@
-create schema if not exists admin;
-
--- DROP TABLE is exists admin.users;
-CREATE TABLE if not exists admin.users();
-ALTER TABLE admin.users add column if not exists uid text NOT NULL DEFAULT next_id();
-ALTER TABLE admin.users DROP CONSTRAINT if exists admin_user_uid_pkey cascade;
-ALTER TABLE admin.users DROP CONSTRAINT if exists user_pk cascade;
-ALTER TABLE admin.users DROP CONSTRAINT if exists admin_user_user_rnokpp;
-ALTER TABLE admin.users DROP CONSTRAINT if exists admin_user_type_check;
-
-ALTER TABLE admin.users add column if not exists login text;
-ALTER TABLE admin.users add column if not exists password text NOT NULL DEFAULT ''::text;
-ALTER TABLE admin.users add column if not exists user_name text;
-ALTER TABLE admin.users add column if not exists sur_name text;
-ALTER TABLE admin.users add column if not exists father_name text;
-ALTER TABLE admin.users add column if not exists email text;
-ALTER TABLE admin.users add column if not exists phone text;
-ALTER TABLE admin.users add column if not exists avatar text;
-ALTER TABLE admin.users add column if not exists enabled boolean;
-ALTER TABLE admin.users add column if not exists user_personal_code text;
-ALTER TABLE admin.users add column if not exists last_activity_date timestamp without time zone;
-ALTER TABLE admin.users add column if not exists user_type text DEFAULT 'regular'::text;
-ALTER TABLE admin.users add column if not exists user_rnokpp text;
-ALTER TABLE admin.users alter column user_rnokpp drop not null;
-ALTER TABLE admin.users add column if not exists social_auth_id text;
-ALTER TABLE admin.users add column if not exists social_auth_type text;
-ALTER TABLE admin.users add column if not exists salt text;
-ALTER TABLE admin.users add column if not exists cdate timestamp without time zone DEFAULT date_trunc('seconds'::text, now());
-ALTER TABLE admin.users add column if not exists editor_id text;
-ALTER TABLE admin.users add column if not exists editor_date timestamp without time zone;
-ALTER TABLE admin.users add column if not exists twofa boolean not null DEFAULT true;
-
-ALTER TABLE admin.users add CONSTRAINT admin_user_uid_pkey PRIMARY KEY (uid);
-ALTER TABLE admin.users add CONSTRAINT admin_user_user_rnokpp UNIQUE (user_rnokpp);
-
--- update admin.users set user_type='regular' where user_type not in ('viewer', 'regular','admin','superadmin');
--- ALTER TABLE admin.users add constraint admin_user_type_check CHECK (user_type=any(array['viewer', 'regular','admin','superadmin']));
-insert into admin.users (uid,login,user_name,email,sur_name,password,user_type,enabled)values('viewer','viewer','viewer','viewer','viewer','viewer','viewer', false) on conflict (uid) do update set enabled=excluded.enabled, sur_name=excluded.sur_name;
--- update admin.users set enabled=true where uid='viewer';
-
-COMMENT ON TABLE admin.users IS 'Користувачі';
-
-COMMENT ON COLUMN admin.users.uid IS 'ID користувача';
-COMMENT ON COLUMN admin.users.login IS 'Логін користувача';
-COMMENT ON COLUMN admin.users.password IS 'Пароль користувача';
-COMMENT ON COLUMN admin.users.user_name IS 'Ім''я користувача';
-COMMENT ON COLUMN admin.users.sur_name IS 'Прізвище користувача';
-COMMENT ON COLUMN admin.users.father_name IS 'По-батькові користувача';
-COMMENT ON COLUMN admin.users.email IS 'Ел. пошта користувача';
-COMMENT ON COLUMN admin.users.phone IS 'Номер телефону користувача';
-COMMENT ON COLUMN admin.users.avatar IS 'Аватар';
-COMMENT ON COLUMN admin.users.enabled IS 'On / Off';
-COMMENT ON COLUMN admin.users.last_activity_date IS 'Дата останньої активності';
-COMMENT ON COLUMN admin.users.user_type IS 'Тип користувача';
-COMMENT ON COLUMN admin.users.salt IS 'Сіль';
-COMMENT ON COLUMN admin.users.twofa IS 'Двофакторна авторизація';
-
-CREATE EXTENSION if not exists pgcrypto SCHEMA public VERSION "1.3";
-CREATE OR REPLACE FUNCTION admin.crypt(text, text) RETURNS text AS '$libdir/pgcrypto', 'pg_crypt' LANGUAGE c IMMUTABLE STRICT COST 1;
-
--- DROP FUNCTION admin.insert_update_user_before();
-CREATE OR REPLACE FUNCTION admin.insert_update_user_before()
-RETURNS trigger AS
-
-$BODY$
-DECLARE 
-
-iterations  int;
-hash character varying;
-
-BEGIN
-
- if(TG_OP='INSERT' or (TG_OP='UPDATE' and new.password<>old.password)) then
-	if(char_length(new.password) <> 0 and char_length(new.password) < 8) then
-		--raise exception 'password must be longer than 8 characters';
-	end if;
-	new.salt=md5(now()::text);
-	--raise exception '%','change pass';
-	if(new.salt ='') then
-		new.salt=gen_salt('md5');	
-	end if;	
-	iterations = 10;
-	hash=''; 
-	
-	loop   		
-		if iterations=0 then
-			exit;
-		end if;
-		hash = md5(new.password||hash||new.salt);
-		iterations=iterations-1;
-	end loop;
-	new.password=admin.crypt(hash,new.salt);
-	
- end if;
- RETURN new;
-END
-$BODY$
-
-LANGUAGE plpgsql VOLATILE COST 100;
-  
-DROP TRIGGER if exists insert_update_user_before on admin.users;
-CREATE TRIGGER insert_update_user_before BEFORE INSERT OR UPDATE ON admin.users FOR EACH ROW 
-EXECUTE PROCEDURE admin.insert_update_user_before();
-
--- DROP TABLE is exists admin.users_social_auth;
-CREATE TABLE if not exists admin.users_social_auth();
-ALTER TABLE admin.users_social_auth add column if not exists users_social_auth_id text NOT NULL DEFAULT next_id();
-ALTER TABLE admin.users_social_auth alter column users_social_auth_id set DEFAULT next_id();
-ALTER TABLE admin.users_social_auth DROP CONSTRAINT if exists users_social_auth_pk cascade;
-ALTER TABLE admin.users_social_auth DROP CONSTRAINT if exists users_social_auth_users_fk cascade;
-ALTER TABLE admin.users_social_auth DROP CONSTRAINT if exists users_social_auth_social_id_email_unique;
-
-ALTER TABLE admin.users_social_auth add column if not exists uid text not null;
-ALTER TABLE admin.users_social_auth add column if not exists user_name text;
-ALTER TABLE admin.users_social_auth add column if not exists sur_name text;
-ALTER TABLE admin.users_social_auth add column if not exists email text;
-ALTER TABLE admin.users_social_auth add column if not exists city text;
-ALTER TABLE admin.users_social_auth add column if not exists phone text;
-ALTER TABLE admin.users_social_auth add column if not exists social_auth_id text;
-ALTER TABLE admin.users_social_auth add column if not exists social_auth_type text;
-ALTER TABLE admin.users_social_auth add column if not exists social_auth_code text;
-ALTER TABLE admin.users_social_auth add column if not exists social_auth_obj json;
-ALTER TABLE admin.users_social_auth add column if not exists social_auth_date timestamp without time zone;
-ALTER TABLE admin.users_social_auth add column if not exists social_auth_softpro_code text;
-ALTER TABLE admin.users_social_auth add column if not exists enabled boolean;
-ALTER TABLE admin.users_social_auth add column if not exists cdate timestamp without time zone;
-ALTER TABLE admin.users_social_auth alter column cdate SET DEFAULT date_trunc('seconds'::text, now());
-
-ALTER TABLE admin.users_social_auth add column if not exists editor_id text;
-ALTER TABLE admin.users_social_auth add column if not exists lang text;
-ALTER TABLE admin.users_social_auth add column if not exists editor_date timestamp without time zone;
-ALTER TABLE admin.users_social_auth add column if not exists social_auth_url text;
-ALTER TABLE admin.users_social_auth add CONSTRAINT users_social_auth_pk PRIMARY KEY (users_social_auth_id);
-ALTER TABLE admin.users_social_auth add CONSTRAINT users_social_auth_users_fk FOREIGN KEY (uid) REFERENCES admin.users (uid) MATCH SIMPLE on delete cascade;
-ALTER TABLE admin.users_social_auth add CONSTRAINT users_social_auth_social_id_email_unique UNIQUE (social_auth_id,email);
-
-COMMENT ON COLUMN admin.users_social_auth.uid IS 'id пользователя';
-COMMENT ON COLUMN admin.users_social_auth.user_name IS 'Имя пользователя';
-COMMENT ON COLUMN admin.users_social_auth.sur_name IS 'Фамилия';
-COMMENT ON COLUMN admin.users_social_auth.email IS 'email пользователя';
-COMMENT ON COLUMN admin.users_social_auth.city IS 'Місто';
-COMMENT ON COLUMN admin.users_social_auth.phone IS 'Телефон';
-COMMENT ON COLUMN admin.users_social_auth.social_auth_id IS 'ID в соцсети';
-COMMENT ON COLUMN admin.users_social_auth.social_auth_type IS 'тип соцсети';
-COMMENT ON COLUMN admin.users_social_auth.social_auth_code IS 'код обьекта соцсети, используеться соцсетью';
-COMMENT ON COLUMN admin.users_social_auth.social_auth_obj IS 'обьект соцсети';
-COMMENT ON COLUMN admin.users_social_auth.social_auth_date IS 'время получение последнего обьекта соцсети';
-COMMENT ON COLUMN admin.users_social_auth.social_auth_softpro_code IS 'код обьекта соцсети, создаваемый и используемый сервером авторизации';
-COMMENT ON COLUMN admin.users_social_auth.enabled IS 'Выключатель';
-COMMENT ON COLUMN admin.users_social_auth.social_auth_url IS 'URL для QR code';
-
+create schema if not exists admin;
+
+-- DROP TABLE is exists admin.users;
+CREATE TABLE if not exists admin.users();
+ALTER TABLE admin.users add column if not exists uid text NOT NULL DEFAULT next_id();
+ALTER TABLE admin.users DROP CONSTRAINT if exists admin_user_uid_pkey cascade;
+ALTER TABLE admin.users DROP CONSTRAINT if exists user_pk cascade;
+ALTER TABLE admin.users DROP CONSTRAINT if exists admin_user_user_rnokpp;
+ALTER TABLE admin.users DROP CONSTRAINT if exists admin_user_type_check;
+
+ALTER TABLE admin.users add column if not exists login text;
+ALTER TABLE admin.users add column if not exists password text NOT NULL DEFAULT ''::text;
+ALTER TABLE admin.users add column if not exists user_name text;
+ALTER TABLE admin.users add column if not exists sur_name text;
+ALTER TABLE admin.users add column if not exists father_name text;
+ALTER TABLE admin.users add column if not exists email text;
+ALTER TABLE admin.users add column if not exists phone text;
+ALTER TABLE admin.users add column if not exists avatar text;
+ALTER TABLE admin.users add column if not exists enabled boolean;
+ALTER TABLE admin.users add column if not exists user_personal_code text;
+ALTER TABLE admin.users add column if not exists last_activity_date timestamp without time zone;
+ALTER TABLE admin.users add column if not exists user_type text DEFAULT 'regular'::text;
+ALTER TABLE admin.users add column if not exists user_rnokpp text;
+ALTER TABLE admin.users alter column user_rnokpp drop not null;
+ALTER TABLE admin.users add column if not exists social_auth_id text;
+ALTER TABLE admin.users add column if not exists social_auth_type text;
+ALTER TABLE admin.users add column if not exists salt text;
+ALTER TABLE admin.users add column if not exists cdate timestamp without time zone DEFAULT date_trunc('seconds'::text, now());
+ALTER TABLE admin.users add column if not exists editor_id text;
+ALTER TABLE admin.users add column if not exists editor_date timestamp without time zone;
+ALTER TABLE admin.users add column if not exists twofa boolean not null DEFAULT true;
+
+ALTER TABLE admin.users add CONSTRAINT admin_user_uid_pkey PRIMARY KEY (uid);
+ALTER TABLE admin.users add CONSTRAINT admin_user_user_rnokpp UNIQUE (user_rnokpp);
+
+-- update admin.users set user_type='regular' where user_type not in ('viewer', 'regular','admin','superadmin');
+-- ALTER TABLE admin.users add constraint admin_user_type_check CHECK (user_type=any(array['viewer', 'regular','admin','superadmin']));
+insert into admin.users (uid,login,user_name,email,sur_name,password,user_type,enabled)values('viewer','viewer','viewer','viewer','viewer','viewer','viewer', false) on conflict (uid) do update set enabled=excluded.enabled, sur_name=excluded.sur_name;
+-- update admin.users set enabled=true where uid='viewer';
+
+COMMENT ON TABLE admin.users IS 'Користувачі';
+
+COMMENT ON COLUMN admin.users.uid IS 'ID користувача';
+COMMENT ON COLUMN admin.users.login IS 'Логін користувача';
+COMMENT ON COLUMN admin.users.password IS 'Пароль користувача';
+COMMENT ON COLUMN admin.users.user_name IS 'Ім''я користувача';
+COMMENT ON COLUMN admin.users.sur_name IS 'Прізвище користувача';
+COMMENT ON COLUMN admin.users.father_name IS 'По-батькові користувача';
+COMMENT ON COLUMN admin.users.email IS 'Ел. пошта користувача';
+COMMENT ON COLUMN admin.users.phone IS 'Номер телефону користувача';
+COMMENT ON COLUMN admin.users.avatar IS 'Аватар';
+COMMENT ON COLUMN admin.users.enabled IS 'On / Off';
+COMMENT ON COLUMN admin.users.last_activity_date IS 'Дата останньої активності';
+COMMENT ON COLUMN admin.users.user_type IS 'Тип користувача';
+COMMENT ON COLUMN admin.users.salt IS 'Сіль';
+COMMENT ON COLUMN admin.users.twofa IS 'Двофакторна авторизація';
+
+CREATE EXTENSION if not exists pgcrypto SCHEMA public VERSION "1.3";
+CREATE OR REPLACE FUNCTION admin.crypt(text, text) RETURNS text AS '$libdir/pgcrypto', 'pg_crypt' LANGUAGE c IMMUTABLE STRICT COST 1;
+
+-- DROP FUNCTION admin.insert_update_user_before();
+CREATE OR REPLACE FUNCTION admin.insert_update_user_before()
+RETURNS trigger AS
+
+$BODY$
+DECLARE 
+
+iterations  int;
+hash character varying;
+
+BEGIN
+
+ if(TG_OP='INSERT' or (TG_OP='UPDATE' and new.password<>old.password)) then
+	if(char_length(new.password) <> 0 and char_length(new.password) < 8) then
+		--raise exception 'password must be longer than 8 characters';
+	end if;
+	new.salt=md5(now()::text);
+	--raise exception '%','change pass';
+	if(new.salt ='') then
+		new.salt=gen_salt('md5');	
+	end if;	
+	iterations = 10;
+	hash=''; 
+	
+	loop   		
+		if iterations=0 then
+			exit;
+		end if;
+		hash = md5(new.password||hash||new.salt);
+		iterations=iterations-1;
+	end loop;
+	new.password=admin.crypt(hash,new.salt);
+	
+ end if;
+ RETURN new;
+END
+$BODY$
+
+LANGUAGE plpgsql VOLATILE COST 100;
+  
+DROP TRIGGER if exists insert_update_user_before on admin.users;
+CREATE TRIGGER insert_update_user_before BEFORE INSERT OR UPDATE ON admin.users FOR EACH ROW 
+EXECUTE PROCEDURE admin.insert_update_user_before();
+
+-- DROP TABLE is exists admin.users_social_auth;
+CREATE TABLE if not exists admin.users_social_auth();
+ALTER TABLE admin.users_social_auth add column if not exists users_social_auth_id text NOT NULL DEFAULT next_id();
+ALTER TABLE admin.users_social_auth alter column users_social_auth_id set DEFAULT next_id();
+ALTER TABLE admin.users_social_auth DROP CONSTRAINT if exists users_social_auth_pk cascade;
+ALTER TABLE admin.users_social_auth DROP CONSTRAINT if exists users_social_auth_users_fk cascade;
+ALTER TABLE admin.users_social_auth DROP CONSTRAINT if exists users_social_auth_social_id_email_unique;
+
+ALTER TABLE admin.users_social_auth add column if not exists uid text not null;
+ALTER TABLE admin.users_social_auth add column if not exists user_name text;
+ALTER TABLE admin.users_social_auth add column if not exists sur_name text;
+ALTER TABLE admin.users_social_auth add column if not exists email text;
+ALTER TABLE admin.users_social_auth add column if not exists city text;
+ALTER TABLE admin.users_social_auth add column if not exists phone text;
+ALTER TABLE admin.users_social_auth add column if not exists social_auth_id text;
+ALTER TABLE admin.users_social_auth add column if not exists social_auth_type text;
+ALTER TABLE admin.users_social_auth add column if not exists social_auth_code text;
+ALTER TABLE admin.users_social_auth add column if not exists social_auth_obj json;
+ALTER TABLE admin.users_social_auth add column if not exists social_auth_date timestamp without time zone;
+ALTER TABLE admin.users_social_auth add column if not exists social_auth_softpro_code text;
+ALTER TABLE admin.users_social_auth add column if not exists enabled boolean;
+ALTER TABLE admin.users_social_auth add column if not exists cdate timestamp without time zone;
+ALTER TABLE admin.users_social_auth alter column cdate SET DEFAULT date_trunc('seconds'::text, now());
+
+ALTER TABLE admin.users_social_auth add column if not exists editor_id text;
+ALTER TABLE admin.users_social_auth add column if not exists lang text;
+ALTER TABLE admin.users_social_auth add column if not exists editor_date timestamp without time zone;
+ALTER TABLE admin.users_social_auth add column if not exists social_auth_url text;
+ALTER TABLE admin.users_social_auth add CONSTRAINT users_social_auth_pk PRIMARY KEY (users_social_auth_id);
+ALTER TABLE admin.users_social_auth add CONSTRAINT users_social_auth_users_fk FOREIGN KEY (uid) REFERENCES admin.users (uid) MATCH SIMPLE on delete cascade;
+ALTER TABLE admin.users_social_auth add CONSTRAINT users_social_auth_social_id_email_unique UNIQUE (social_auth_id,email);
+
+COMMENT ON COLUMN admin.users_social_auth.uid IS 'id пользователя';
+COMMENT ON COLUMN admin.users_social_auth.user_name IS 'Имя пользователя';
+COMMENT ON COLUMN admin.users_social_auth.sur_name IS 'Фамилия';
+COMMENT ON COLUMN admin.users_social_auth.email IS 'email пользователя';
+COMMENT ON COLUMN admin.users_social_auth.city IS 'Місто';
+COMMENT ON COLUMN admin.users_social_auth.phone IS 'Телефон';
+COMMENT ON COLUMN admin.users_social_auth.social_auth_id IS 'ID в соцсети';
+COMMENT ON COLUMN admin.users_social_auth.social_auth_type IS 'тип соцсети';
+COMMENT ON COLUMN admin.users_social_auth.social_auth_code IS 'код обьекта соцсети, используеться соцсетью';
+COMMENT ON COLUMN admin.users_social_auth.social_auth_obj IS 'обьект соцсети';
+COMMENT ON COLUMN admin.users_social_auth.social_auth_date IS 'время получение последнего обьекта соцсети';
+COMMENT ON COLUMN admin.users_social_auth.social_auth_softpro_code IS 'код обьекта соцсети, создаваемый и используемый сервером авторизации';
+COMMENT ON COLUMN admin.users_social_auth.enabled IS 'Выключатель';
+COMMENT ON COLUMN admin.users_social_auth.social_auth_url IS 'URL для QR code';
+
 update admin.users set twofa=false where uid='1';

package/dist/server/plugins/access/funcs/getUserPermissions.js

@@ -1,11 +1,11 @@
 import pgClients from "../../pg/pgClients.js";
 import { resourcesList } from "./getResources.js";
-const q = `select resource_id as name,
-        array_intersect(coalesce(a.actions, array['read']), coalesce(c.actions, array['create', 'read', 'update', 'delete'])) as actions,
-        b.name as role
-from admin.role_access a
-left join admin.roles b on a.role_id=b.role_id and b.enabled
-left join admin.user_roles c on a.role_id=c.role_id
+const q = `select resource_id as name,
+        array_intersect(coalesce(a.actions, array['read']), coalesce(c.actions, array['create', 'read', 'update', 'delete'])) as actions,
+        b.name as role
+from admin.role_access a
+left join admin.roles b on a.role_id=b.role_id and b.enabled
+left join admin.user_roles c on a.role_id=c.role_id
 where resource_id is not null and $1 in (a.user_uid, c.user_uid)`;
 export default async function getUserPermissions({ uid, resource, table, userType, }, pg = pgClients.client) {
     if (!uid)
@@ -15,7 +15,7 @@ export default async function getUserPermissions({ uid, resource, table, userTyp
     }
     // ? in case pg.pk not set yet
     const pks = await pg
-        .query(`SELECT json_object_agg(conrelid::regclass, (SELECT attname FROM pg_attribute WHERE attrelid = c.conrelid AND attnum = c.conkey[1]) ) 
+        .query(`SELECT json_object_agg(conrelid::regclass, (SELECT attname FROM pg_attribute WHERE attrelid = c.conrelid AND attnum = c.conkey[1]) ) 
       FROM pg_constraint c WHERE contype = 'p' AND connamespace::regnamespace::text = 'admin'`)
         .then((el) => el.rows?.[0]?.json_object_agg || {});
     const permissions = pks["admin.role_access"] &&

package/dist/server/plugins/auth/funcs/authorizeUser.js

@@ -83,10 +83,10 @@ export default async function authorizeUser(user, req, authType = "creds-user",
         twofaEnabled &&
         !req.session?.secondFactorPassed) {
         const verified = await pg
-            .query(`select
-          enabled and social_auth_url is not null as verified
-        from admin.users_social_auth
-        where uid = $1
+            .query(`select
+          enabled and social_auth_url is not null as verified
+        from admin.users_social_auth
+        where uid = $1
         and social_auth_type = $2`, [user.uid, "TOTP"])
             .then((el) => el.rows?.[0]?.verified || false);
         const redirect2fa = `${config.auth?.link?.["2fa"]?.login || "/2factor"}?redirect=${redirectUrl.startsWith("/") ? redirectUrl : "/"}`;

package/dist/server/plugins/auth/funcs/getQuery.js

@@ -1,24 +1,24 @@
-const insertSocialSQL = `insert into admin.users_social_auth(uid, phone, user_name, sur_name, email, social_auth_id, 
-social_auth_type, social_auth_date, social_auth_obj, city, enabled)
-select $9, $1, $2, $3, $4, $5,
-$6, now(), $7, $8, true
-on conflict(social_auth_id,email) do update set
-  phone=excluded.phone, user_name=excluded.user_name,
-  sur_name=excluded.sur_name, email=excluded.email, social_auth_id=excluded.social_auth_id,
-  social_auth_type=excluded.social_auth_type, social_auth_date=excluded.social_auth_date,
+const insertSocialSQL = `insert into admin.users_social_auth(uid, phone, user_name, sur_name, email, social_auth_id, 
+social_auth_type, social_auth_date, social_auth_obj, city, enabled)
+select $9, $1, $2, $3, $4, $5,
+$6, now(), $7, $8, true
+on conflict(social_auth_id,email) do update set
+  phone=excluded.phone, user_name=excluded.user_name,
+  sur_name=excluded.sur_name, email=excluded.email, social_auth_id=excluded.social_auth_id,
+  social_auth_type=excluded.social_auth_type, social_auth_date=excluded.social_auth_date,
   social_auth_obj=excluded.social_auth_obj, city=excluded.city, enabled=excluded.enabled`;
-const insertUserSQL = `insert into admin.users (enabled, phone, user_name, sur_name, father_name, email, user_rnokpp)
-values(true, $1, $2, $3, $4, $5, $6)
-on conflict (user_rnokpp) do update set
-  phone=excluded.phone,
-  user_name=excluded.user_name,
-  sur_name=excluded.sur_name,
-  father_name=excluded.father_name,
-  email=excluded.email
+const insertUserSQL = `insert into admin.users (enabled, phone, user_name, sur_name, father_name, email, user_rnokpp)
+values(true, $1, $2, $3, $4, $5, $6)
+on conflict (user_rnokpp) do update set
+  phone=excluded.phone,
+  user_name=excluded.user_name,
+  sur_name=excluded.sur_name,
+  father_name=excluded.father_name,
+  email=excluded.email
 returning uid`;
-const updateUserSQL = `update admin.users set 
-phone=$1, user_name=$2, sur_name=$3,
-father_name=coalesce($4, father_name), email=$5, social_auth_id=$6,
+const updateUserSQL = `update admin.users set 
+phone=$1, user_name=$2, sur_name=$3,
+father_name=coalesce($4, father_name), email=$5, social_auth_id=$6,
 social_auth_type=$7 where uid=$8 returning uid`;
 const deleteSocialIdSQL = `delete from admin.users_social_auth where social_auth_id=$1 or email=$2`;
 import config from "../../../../config.js";
@@ -121,7 +121,7 @@ export default async function getQuery({ pg, data, }) {
         client.release();
     }
     const result = await pg
-        .query(`select * from admin.users where uid =(select uid from admin.users_social_auth 
+        .query(`select * from admin.users where uid =(select uid from admin.users_social_auth 
   where ${id ? "social_auth_id=$1" : "email=$1"} limit 1)`, [id || email])
         .then((el) => el.rows?.[0] || {});
     return result;

package/dist/server/plugins/crud/funcs/dataUpdate.js

@@ -72,19 +72,19 @@ export default async function dataUpdate({ table: table1, tokenData, referer, id
     // update geometry with srid
     if (!srids[table] && pg.tlist?.includes("public.geometry_columns")) {
         const { srids1 } = await pg
-            .query(`select json_object_agg(_table,rel) as srids1 from (
-      select  f_table_schema||'.'||f_table_name as _table, 
-        json_object_agg(f_geometry_column, case when srid = 0 then 4326 else srid end) as rel 
-      from public.geometry_columns group by f_table_schema||'.'||f_table_name
+            .query(`select json_object_agg(_table,rel) as srids1 from (
+      select  f_table_schema||'.'||f_table_name as _table, 
+        json_object_agg(f_geometry_column, case when srid = 0 then 4326 else srid end) as rel 
+      from public.geometry_columns group by f_table_schema||'.'||f_table_name
       )q`)
             .then((el) => el.rows?.[0] || {});
         Object.assign(srids, srids1);
     }
-    const updateQuery = `UPDATE ${table} SET ${systemColumns ? `${systemColumns}${filterData?.length ? "," : ""}` : ""}
-
+    const updateQuery = `UPDATE ${table} SET ${systemColumns ? `${systemColumns}${filterData?.length ? "," : ""}` : ""}
+
   ${filterData
         ?.map((key, i) => assignValue(key, i, srids[table]?.[key] || 4326, pg.pgType?.[columns.find((col) => col.name === key)?.dataTypeID || ""]))
-        ?.join(",")} 
+        ?.join(",")} 
   WHERE ${pk}::text = $1::text returning *`;
     // console.log(updateQuery, filterValue);
     // for transactions

package/dist/server/plugins/crud/funcs/getAccess.js

@@ -10,20 +10,20 @@ const matches = {
     update: "edit",
     delete: "del",
 };
-const q = `select a.route_id as id, d.actions as user_roles, d.actions as role_actions, coalesce(b.actions, array['view']) as interface_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 )
+const q = `select a.route_id as id, d.actions as user_roles, d.actions as role_actions, coalesce(b.actions, array['view']) as interface_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 $2 in (b.user_uid, d.user_uid)`;
 /**
  * @param {Array} user_roles.actions Actions - user actions <> group actions

package/dist/server/plugins/crud/funcs/utils/getInsertQuery.js

@@ -33,20 +33,20 @@ export default async function getInsertQuery({ pg, table, data, id, uid, }) {
         (["boolean", "number"].includes(typeof data[el]) ? true : data[el]) &&
         names.includes(el))
         .map((el) => [el, data[el]]);
-    const insertQuery = `insert into ${table}
-
+    const insertQuery = `insert into ${table}
+
     ( ${filterData
         ?.map((key) => `"${key[0]}"`)
         .concat(systemColumnNames)
-        .join(",")}) 
-
+        .join(",")}) 
+
     values  (${filterData
         ?.map((key, i) => key[0] === "geom"
         ? `st_setsrid(st_geomfromgeojson($${i + 1}::json),4326)`
         : `$${i + 1}`)
         .concat(systemColumns.map((el) => el[1]))
-        .join(",")}) 
-    
+        .join(",")}) 
+    
     returning *`;
     const args = [
         ...filterData.map((el) => typeof el[1] === "object" &&

package/dist/server/plugins/crud/funcs/utils/logChanges.js

@@ -62,25 +62,25 @@ export default async function logChanges({ pg, table: table1, tokenData, referer
     }
     try {
         const { change_id: changeId } = await pg
-            .query(`insert into log.table_changes(change_date,change_type,change_user_id,entity_type,entity_id) 
+            .query(`insert into log.table_changes(change_date,change_type,change_user_id,entity_type,entity_id) 
     values(CURRENT_DATE, $1, $2, $3, $4) returning change_id`, [type, uid, table, id])
             .then((el) => el.rows?.[0] || {});
-        const q = `select json_object_agg(entity_key, json_build_object('hash',value_hash,'value',value_new)) from (
-      select
-        entity_key,
-        value_hash,
-        value_new,
-        ( rank() over (partition by entity_key order by cdate desc) = 1 ) as is_latest
-      from log.table_changes_data
-
-      where change_id in (
-        select
-          change_id
-        from log.table_changes
-        where entity_id=$1
-        and entity_type=$2
-      )
-
+        const q = `select json_object_agg(entity_key, json_build_object('hash',value_hash,'value',value_new)) from (
+      select
+        entity_key,
+        value_hash,
+        value_new,
+        ( rank() over (partition by entity_key order by cdate desc) = 1 ) as is_latest
+      from log.table_changes_data
+
+      where change_id in (
+        select
+          change_id
+        from log.table_changes
+        where entity_id=$1
+        and entity_type=$2
+      )
+
     )q where is_latest`;
         // console.log(q, type, id);
         const old = type !== "INSERT"
@@ -160,7 +160,7 @@ export default async function logChanges({ pg, table: table1, tokenData, referer
         const res = await Promise.all(changesData.map(async (el) => {
             const insertQuery = `insert into log.table_changes_data (${Object.entries(el)
                 ?.map((key) => `"${key[0]}"`)
-                .join(",")}) 
+                .join(",")}) 
       values (${Object.entries(el)
                 ?.map((key, i) => `$${i + 1}`)
                 .join(",")}) returning *`;