@opengis/fastify-table 2.6.2 → 2.6.4

package/dist/server/helpers/utils/buttonDel.js

@@ -7,22 +7,22 @@ export default function button(token, title, icon, permission = '') {
     const permissionAttr = handlePermission
         ? `v-permission="${handlePermission}"`
         : '';
-    const apiCall = `window.v3plugin.$api({
-        api: '/api/table/${token}',
-        method: 'delete',
-        confirm: {
-            title: 'Підтвердити операцію',
-            text: 'Ви впевнені що хочете вилучити запис?',
-            cancel: 'Скасувати',
-            confirm: 'Виконати'
-        }
+    const apiCall = `window.v3plugin.$api({
+        api: '/api/table/${token}',
+        method: 'delete',
+        confirm: {
+            title: 'Підтвердити операцію',
+            text: 'Ви впевнені що хочете вилучити запис?',
+            cancel: 'Скасувати',
+            confirm: 'Виконати'
+        }
     })`;
     const buttonClass = icon
         ? `size-8 inline-flex justify-center items-center gap-x-2 rounded-e-lg border border-stone-200  bg-${COLOR}-100 text-stone-800 shadow-sm hover:bg-${COLOR}-200 disabled:opacity-50 disabled:pointer-events-none focus:outline-none focus:bg-stone-50 dark:bg-neutral-800 dark:border-neutral-700 dark:text-neutral-300 dark:hover:bg-neutral-700 dark:focus:bg-neutral-700`
         : `px-2 py-1 inline-flex border-solid justify-center items-center gap-2 rounded-md font-semibold focus:outline-none text-sm transition-all border border-transparent hover:text-white ring-offset-white bg-${COLOR}-100 text-${COLOR}-500 hover:bg-${COLOR}-500 focus:ring-${COLOR}-500`;
     const buttonContent = icon
-        ? `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="${COLOR}" class="size-3.5">
-            <path stroke-linecap="round" stroke-linejoin="round" d="m14.74 9-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 0 0-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 0 0-7.5 0"/>
+        ? `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="${COLOR}" class="size-3.5">
+            <path stroke-linecap="round" stroke-linejoin="round" d="m14.74 9-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 0 0-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 0 0-7.5 0"/>
         </svg>`
         : `${title || "Вилучити"}`;
     return `<button ${permissionAttr} onclick="${apiCall}" class="${buttonClass}">${buttonContent}</button>`;

package/dist/server/helpers/utils/buttonEdit.js

@@ -12,9 +12,9 @@ export default function button(token, title, icon, permission = '') {
         ? `size-8 inline-flex justify-center items-center gap-x-2 font-medium rounded-s-lg border border-stone-200 bg-${COLOR}-100 text-stone-800 shadow-sm hover:bg-${COLOR}-200 disabled:opacity-50 disabled:pointer-events-none focus:outline-none focus:bg-${COLOR}-50 dark:bg-neutral-800 dark:border-neutral-700 dark:text-neutral-300 dark:hover:bg-neutral-700 dark:focus:bg-neutral-700 `
         : `px-2 py-1 inline-flex border-solid justify-center items-center gap-2 rounded-md font-semibold focus:outline-none text-sm transition-all border border-transparent hover:text-white ring-offset-white bg-${COLOR}-100 text-${COLOR}-500 hover:bg-${COLOR}-500 focus:ring-${COLOR}-500`;
     const buttonContent = icon
-        ? `<svg class="shrink-0 size-3.5" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="${COLOR}" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-            <path d="M17 3a2.85 2.83 0 1 1 4 4L7.5 20.5 2 22l1.5-5.5Z"></path>
-            <path d="m15 5 4 4"></path>
+        ? `<svg class="shrink-0 size-3.5" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="${COLOR}" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+            <path d="M17 3a2.85 2.83 0 1 1 4 4L7.5 20.5 2 22l1.5-5.5Z"></path>
+            <path d="m15 5 4 4"></path>
         </svg>`
         : `${title || "Редагувати"}`;
     return `<button ${permissionAttr} onclick="${formCall}" class="${buttonClass}">${buttonContent}</button>`;

package/dist/server/migrations/0.sql

@@ -1,100 +1,100 @@
--- fix error if function exists and return type not text i.e bigint
-
-do $$
-
-declare
-m record;
-_pk text;
-_tables json;
-_returnType text;
-
-begin
-
-select format_type(p.prorettype, null) as return_type
-from pg_proc p
-where p.proname = 'next_id'
-and p.pronamespace = 'public'::regnamespace into _returnType;
-
-if (_returnType != 'text') then
-	raise notice 'default reassign start: % -> text', _returnType;
-
-	CREATE EXTENSION if not exists "uuid-ossp";
-
-	SELECT json_object_agg(a.attrelid::regclass, a.attname)
-	FROM   pg_catalog.pg_attribute    a
-	LEFT   JOIN pg_catalog.pg_attrdef d ON (a.attrelid, a.attnum) = (d.adrelid, d.adnum)
-	WHERE  NOT a.attisdropped           -- no dropped (dead) columns
-	AND    a.attnum   > 0               -- no system columns
-	AND pg_get_expr(d.adbin, d.adrelid) = 'next_id()' into _tables;
-
-	FOR m in (select json_object_keys(_tables) as table) loop
-		_pk = _tables->>m.table;
-		raise notice 'drop default: %,%', m.table, _pk;
-		EXECUTE('alter table '|| m.table || ' alter column ' || _pk || ' set default null;');
-	end loop;
-
-	DROP FUNCTION IF EXISTS next_id();
-
-	/* CREATE EXTENSION if not exists "uuid-ossp";
-	ALTER EXTENSION "uuid-ossp" SET SCHEMA public; */
-
-	CREATE OR REPLACE FUNCTION next_id()
-	  RETURNS text AS
-	$BODY$
-	DECLARE
-
-	BEGIN
-	    -- return replace(public.uuid_generate_v4()::text, '-', '');
-		-- return replace(gen_random_uuid()::text, '-', ''); -- native from postgres 13 onward
-		return encode(public.gen_random_bytes(6), 'hex');
-	END;
-	$BODY$
-	  LANGUAGE plpgsql VOLATILE
-	  COST 100;
-
-	FOR m in (select json_object_keys(_tables) as table) loop
-		_pk = _tables->>m.table;
-		raise notice 'reassign default: %, %', m.table, _pk;
-		EXECUTE('alter table '|| m.table || ' alter column ' || _pk || ' set default next_id();');
-	end loop;
-
-	raise notice 'reassign default finish: %', _tables;
-
-else
-	raise notice 'skip default reassign';
-
-		/* CREATE EXTENSION if not exists "uuid-ossp";
-		ALTER EXTENSION "uuid-ossp" SET SCHEMA public; */
-
-	CREATE OR REPLACE FUNCTION next_id()
-	  RETURNS text AS
-	$BODY$
-	DECLARE
-
-	BEGIN
-	    -- return replace(public.uuid_generate_v4()::text, '-', '');
-		-- return replace(gen_random_uuid()::text, '-', ''); -- native from postgres 13 onward
-		return encode(public.gen_random_bytes(6), 'hex');
-	END;
-	$BODY$
-	  LANGUAGE plpgsql VOLATILE
-	  COST 100;
-end if;
-
-end $$;
-
-CREATE OR REPLACE FUNCTION array_intersect(
-	anyarray,
-	anyarray)
-    RETURNS anyarray
-    LANGUAGE 'sql'
-    COST 100
-    VOLATILE PARALLEL UNSAFE
-AS $BODY$
-
-    SELECT ARRAY(
-        SELECT UNNEST($1)
-        INTERSECT
-        SELECT UNNEST($2)
-    );
+-- fix error if function exists and return type not text i.e bigint
+
+do $$
+
+declare
+m record;
+_pk text;
+_tables json;
+_returnType text;
+
+begin
+
+select format_type(p.prorettype, null) as return_type
+from pg_proc p
+where p.proname = 'next_id'
+and p.pronamespace = 'public'::regnamespace into _returnType;
+
+if (_returnType != 'text') then
+	raise notice 'default reassign start: % -> text', _returnType;
+
+	CREATE EXTENSION if not exists "uuid-ossp";
+
+	SELECT json_object_agg(a.attrelid::regclass, a.attname)
+	FROM   pg_catalog.pg_attribute    a
+	LEFT   JOIN pg_catalog.pg_attrdef d ON (a.attrelid, a.attnum) = (d.adrelid, d.adnum)
+	WHERE  NOT a.attisdropped           -- no dropped (dead) columns
+	AND    a.attnum   > 0               -- no system columns
+	AND pg_get_expr(d.adbin, d.adrelid) = 'next_id()' into _tables;
+
+	FOR m in (select json_object_keys(_tables) as table) loop
+		_pk = _tables->>m.table;
+		raise notice 'drop default: %,%', m.table, _pk;
+		EXECUTE('alter table '|| m.table || ' alter column ' || _pk || ' set default null;');
+	end loop;
+
+	DROP FUNCTION IF EXISTS next_id();
+
+	/* CREATE EXTENSION if not exists "uuid-ossp";
+	ALTER EXTENSION "uuid-ossp" SET SCHEMA public; */
+
+	CREATE OR REPLACE FUNCTION next_id()
+	  RETURNS text AS
+	$BODY$
+	DECLARE
+
+	BEGIN
+	    -- return replace(public.uuid_generate_v4()::text, '-', '');
+		-- return replace(gen_random_uuid()::text, '-', ''); -- native from postgres 13 onward
+		return encode(public.gen_random_bytes(6), 'hex');
+	END;
+	$BODY$
+	  LANGUAGE plpgsql VOLATILE
+	  COST 100;
+
+	FOR m in (select json_object_keys(_tables) as table) loop
+		_pk = _tables->>m.table;
+		raise notice 'reassign default: %, %', m.table, _pk;
+		EXECUTE('alter table '|| m.table || ' alter column ' || _pk || ' set default next_id();');
+	end loop;
+
+	raise notice 'reassign default finish: %', _tables;
+
+else
+	raise notice 'skip default reassign';
+
+		/* CREATE EXTENSION if not exists "uuid-ossp";
+		ALTER EXTENSION "uuid-ossp" SET SCHEMA public; */
+
+	CREATE OR REPLACE FUNCTION next_id()
+	  RETURNS text AS
+	$BODY$
+	DECLARE
+
+	BEGIN
+	    -- return replace(public.uuid_generate_v4()::text, '-', '');
+		-- return replace(gen_random_uuid()::text, '-', ''); -- native from postgres 13 onward
+		return encode(public.gen_random_bytes(6), 'hex');
+	END;
+	$BODY$
+	  LANGUAGE plpgsql VOLATILE
+	  COST 100;
+end if;
+
+end $$;
+
+CREATE OR REPLACE FUNCTION array_intersect(
+	anyarray,
+	anyarray)
+    RETURNS anyarray
+    LANGUAGE 'sql'
+    COST 100
+    VOLATILE PARALLEL UNSAFE
+AS $BODY$
+
+    SELECT ARRAY(
+        SELECT UNNEST($1)
+        INTERSECT
+        SELECT UNNEST($2)
+    );
 $BODY$;

package/dist/server/migrations/1_users.sql

@@ -1,146 +1,146 @@
--- file name changed to 1_users.sql for order reasons - drop of constraints in current file affects other migrations and should be done first to ensure expected db structure
-
-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 false;
-alter table admin.users alter column twofa set default false;
-
-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";
-
-alter table admin.users add column if not exists password_new_hash_algorithm boolean;
-update admin.users set password_new_hash_algorithm = false where password_new_hash_algorithm is null;
-
--- 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
-	-- new passwords would use more secure hashing algorithm
-	IF TG_OP = 'INSERT' OR (TG_OP = 'UPDATE' AND NEW.password <> OLD.password) THEN
-
-		NEW.salt = public.gen_salt('bf', 12);
-
-		IF length(NEW.password) > 0 THEN
-			NEW.password = public.crypt(NEW.password, NEW.salt);
-			NEW.password_new_hash_algorithm = true;
-		END IF;
-
-	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';
-
+-- file name changed to 1_users.sql for order reasons - drop of constraints in current file affects other migrations and should be done first to ensure expected db structure
+
+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 false;
+alter table admin.users alter column twofa set default false;
+
+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";
+
+alter table admin.users add column if not exists password_new_hash_algorithm boolean;
+update admin.users set password_new_hash_algorithm = false where password_new_hash_algorithm is null;
+
+-- 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
+	-- new passwords would use more secure hashing algorithm
+	IF TG_OP = 'INSERT' OR (TG_OP = 'UPDATE' AND NEW.password <> OLD.password) THEN
+
+		NEW.salt = public.gen_salt('bf', 12);
+
+		IF length(NEW.password) > 0 THEN
+			NEW.password = public.crypt(NEW.password, NEW.salt);
+			NEW.password_new_hash_algorithm = true;
+		END IF;
+
+	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';