v2: fixed oauth errors, oauth clients native control added

This commit is contained in:
Ivan Rezchikov
2026-09-15 16:21:53 +03:00
parent 83e1849d73
commit 8b0a3d143b
51 changed files with 1392 additions and 3216 deletions
+14 -184
View File
@@ -1,5 +1,19 @@
CREATE EXTENSION IF NOT EXISTS pgcrypto;
-- Cleanup: tables from an earlier "multi-tenant RBAC" design (regions,
-- citizenship, positions, permissions) that was never wired up to any
-- backend code. Safe to drop — nothing in this codebase reads or writes them.
DROP TABLE IF EXISTS public.user_positions CASCADE;
DROP TABLE IF EXISTS public.position_permissions CASCADE;
DROP TABLE IF EXISTS public.permission_translations CASCADE;
DROP TABLE IF EXISTS public.permissions CASCADE;
DROP TABLE IF EXISTS public.position_translations CASCADE;
DROP TABLE IF EXISTS public.positions CASCADE;
DROP TABLE IF EXISTS public.citizens CASCADE;
DROP TABLE IF EXISTS public.citizenship_applications CASCADE;
DROP TABLE IF EXISTS public.region_translations CASCADE;
DROP TABLE IF EXISTS public.regions CASCADE;
CREATE TABLE IF NOT EXISTS public.users (
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
created_at timestamptz NOT NULL DEFAULT now(),
@@ -94,112 +108,6 @@ CREATE INDEX IF NOT EXISTS idx_user_consents_revoked
ON public.user_consents (revoked_at)
WHERE revoked_at IS NOT NULL;
CREATE TABLE IF NOT EXISTS public.regions (
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
code char(2) NOT NULL UNIQUE,
created_at timestamptz NOT NULL DEFAULT now()
);
CREATE TABLE IF NOT EXISTS public.region_translations (
region_id uuid NOT NULL REFERENCES public.regions(id) ON DELETE CASCADE,
locale text NOT NULL,
name text NOT NULL,
PRIMARY KEY (region_id, locale)
);
CREATE INDEX IF NOT EXISTS idx_region_translations_region_id
ON public.region_translations (region_id);
CREATE TABLE IF NOT EXISTS public.citizenship_applications (
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
user_id uuid NOT NULL UNIQUE REFERENCES public.users(id) ON DELETE CASCADE,
status text NOT NULL DEFAULT 'pending',
region_id uuid REFERENCES public.regions(id),
reviewed_by uuid REFERENCES public.users(id),
reviewed_at timestamptz,
reject_reason text,
created_at timestamptz NOT NULL DEFAULT now()
);
CREATE TABLE IF NOT EXISTS public.citizens (
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
user_id uuid NOT NULL UNIQUE REFERENCES public.users(id),
application_id uuid NOT NULL REFERENCES public.citizenship_applications(id),
number text NOT NULL UNIQUE,
issued_at timestamptz NOT NULL DEFAULT now(),
region_id uuid REFERENCES public.regions(id)
);
CREATE TABLE IF NOT EXISTS public.positions (
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
code text NOT NULL UNIQUE,
created_at timestamptz NOT NULL DEFAULT now(),
updated_at timestamptz NOT NULL DEFAULT now()
);
CREATE TABLE IF NOT EXISTS public.position_translations (
position_id uuid NOT NULL REFERENCES public.positions(id) ON DELETE CASCADE,
locale text NOT NULL DEFAULT 'en',
name text NOT NULL,
description text,
PRIMARY KEY (position_id, locale)
);
CREATE INDEX IF NOT EXISTS idx_position_translations_position_id
ON public.position_translations (position_id);
CREATE INDEX IF NOT EXISTS idx_position_translations_locale
ON public.position_translations (locale);
CREATE TABLE IF NOT EXISTS public.permissions (
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
code text NOT NULL UNIQUE,
description text,
created_at timestamptz NOT NULL DEFAULT now()
);
CREATE TABLE IF NOT EXISTS public.permission_translations (
permission_id uuid NOT NULL REFERENCES public.permissions(id) ON DELETE CASCADE,
locale text NOT NULL DEFAULT 'en',
name text NOT NULL,
description text,
PRIMARY KEY (permission_id, locale)
);
CREATE INDEX IF NOT EXISTS idx_permission_translations_permission_id
ON public.permission_translations (permission_id);
CREATE INDEX IF NOT EXISTS idx_permission_translations_locale
ON public.permission_translations (locale);
CREATE TABLE IF NOT EXISTS public.position_permissions (
position_id uuid NOT NULL REFERENCES public.positions(id) ON DELETE CASCADE,
permission_id uuid NOT NULL REFERENCES public.permissions(id) ON DELETE CASCADE,
PRIMARY KEY (position_id, permission_id)
);
CREATE INDEX IF NOT EXISTS idx_position_permissions_position_id
ON public.position_permissions (position_id);
CREATE INDEX IF NOT EXISTS idx_position_permissions_permission_id
ON public.position_permissions (permission_id);
CREATE TABLE IF NOT EXISTS public.user_positions (
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
user_id uuid NOT NULL REFERENCES public.users(id) ON DELETE CASCADE,
position_id uuid NOT NULL REFERENCES public.positions(id) ON DELETE CASCADE,
valid_from timestamptz NOT NULL DEFAULT now(),
valid_to timestamptz,
assigned_by uuid REFERENCES public.users(id) ON DELETE SET NULL
);
CREATE INDEX IF NOT EXISTS idx_user_positions_user_id
ON public.user_positions (user_id);
CREATE INDEX IF NOT EXISTS idx_user_positions_position_id
ON public.user_positions (position_id);
CREATE UNIQUE INDEX IF NOT EXISTS idx_user_positions_unique_active
ON public.user_positions (user_id, position_id)
WHERE valid_to IS NULL;
CREATE INDEX IF NOT EXISTS idx_permissions_code
ON public.permissions (code);
CREATE INDEX IF NOT EXISTS idx_users_is_admin
ON public.users (is_admin)
WHERE is_admin = TRUE;
@@ -221,81 +129,3 @@ DROP TRIGGER IF EXISTS oauth_clients_updated_at ON public.oauth_clients;
CREATE TRIGGER oauth_clients_updated_at
BEFORE UPDATE ON public.oauth_clients
FOR EACH ROW EXECUTE FUNCTION public.set_updated_at();
DROP TRIGGER IF EXISTS positions_updated_at ON public.positions;
CREATE TRIGGER positions_updated_at
BEFORE UPDATE ON public.positions
FOR EACH ROW EXECUTE FUNCTION public.set_updated_at();
INSERT INTO public.permissions (code, description) VALUES
('positions.manage', 'Create and edit positions'),
('positions.assign', 'Assign positions to users'),
('positions.revoke', 'Revoke positions from users')
ON CONFLICT (code) DO NOTHING;
INSERT INTO public.permission_translations (permission_id, locale, name, description)
SELECT id, 'en', code, description FROM public.permissions
ON CONFLICT (permission_id, locale) DO NOTHING;
INSERT INTO public.permission_translations (permission_id, locale, name, description)
SELECT id,
'ru',
CASE code
WHEN 'positions.manage' THEN 'Управление должностями'
WHEN 'positions.assign' THEN 'Назначение должностей'
WHEN 'positions.revoke' THEN 'Отзыв должностей'
ELSE code
END,
CASE code
WHEN 'positions.manage' THEN 'Создание и редактирование должностей'
WHEN 'positions.assign' THEN 'Назначение должностей пользователям'
WHEN 'positions.revoke' THEN 'Отзыв должностей у пользователей'
ELSE description
END
FROM public.permissions
ON CONFLICT (permission_id, locale) DO NOTHING;
INSERT INTO public.permission_translations (permission_id, locale, name, description)
SELECT id,
'it',
CASE code
WHEN 'positions.manage' THEN 'Gestione posizioni'
WHEN 'positions.assign' THEN 'Assegnazione posizioni'
WHEN 'positions.revoke' THEN 'Revoca posizioni'
ELSE code
END,
CASE code
WHEN 'positions.manage' THEN 'Creazione e modifica delle posizioni'
WHEN 'positions.assign' THEN 'Assegnazione delle posizioni agli utenti'
WHEN 'positions.revoke' THEN 'Revoca delle posizioni dagli utenti'
ELSE description
END
FROM public.permissions
ON CONFLICT (permission_id, locale) DO NOTHING;
INSERT INTO public.positions (code)
VALUES ('kotosoft_id_staff')
ON CONFLICT (code) DO NOTHING;
INSERT INTO public.position_translations (position_id, locale, name, description)
SELECT id, 'en', 'Kotosoft ID Staff', 'Default staff position for Kotosoft ID operators'
FROM public.positions WHERE code = 'kotosoft_id_staff'
ON CONFLICT (position_id, locale) DO NOTHING;
INSERT INTO public.position_translations (position_id, locale, name, description)
SELECT id, 'ru', 'Сотрудник Kotosoft ID', 'Базовая должность сотрудника Kotosoft ID'
FROM public.positions WHERE code = 'kotosoft_id_staff'
ON CONFLICT (position_id, locale) DO NOTHING;
INSERT INTO public.position_translations (position_id, locale, name, description)
SELECT id, 'it', 'Operatore Kotosoft ID', 'Posizione predefinita per operatori Kotosoft ID'
FROM public.positions WHERE code = 'kotosoft_id_staff'
ON CONFLICT (position_id, locale) DO NOTHING;
INSERT INTO public.position_permissions (position_id, permission_id)
SELECT p.id, perm.id
FROM public.positions p
JOIN public.permissions perm
ON perm.code IN ('positions.manage', 'positions.assign', 'positions.revoke')
WHERE p.code = 'kotosoft_id_staff'
ON CONFLICT (position_id, permission_id) DO NOTHING;