feat(auth): merge reporter, supervisor, capa_owner into ssa role
Add Site Safety Assistant (ssa) role replacing reporter, supervisor and capa_owner. Portals move under /ssa (overview, my-reports, incidents, capas). Update RLS, schema, API role checks, notification recipients, nav and tests. Add db/ops/2026-11-06-merge-roles-into-ssa.sql (not yet applied; needs owner go-ahead and a pg_dump first). Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Sonnet 5.5
parent
701fefd286
commit
813395700f
@@ -0,0 +1,37 @@
|
||||
-- Merge reporter + supervisor + capa_owner into one role: ssa (Site Safety Assistant).
|
||||
-- Run by hand on the production DB with the owner's go-ahead. Take a pg_dump first.
|
||||
-- After this, re-apply db/rls.sql policies that reference role names (drop + recreate; see below).
|
||||
BEGIN;
|
||||
|
||||
ALTER TYPE user_role ADD VALUE IF NOT EXISTS 'ssa';
|
||||
COMMIT; -- new enum value must be committed before use
|
||||
|
||||
BEGIN;
|
||||
UPDATE users SET role = 'ssa' WHERE role IN ('reporter', 'supervisor', 'capa_owner');
|
||||
|
||||
-- Recreate enum without legacy values.
|
||||
ALTER TYPE user_role RENAME TO user_role_old;
|
||||
CREATE TYPE user_role AS ENUM ('ssa', 'hse', 'management', 'admin');
|
||||
|
||||
-- Policies reference auth_user_role() (returns user_role); drop them so the column/function can switch type.
|
||||
-- Easiest: drop all policies from db/rls.sql, change types, then re-run db/rls.sql (policies are recreated).
|
||||
-- 1) DROP POLICY ... for every policy in db/rls.sql (or: DROP OWNED-style loop below)
|
||||
DO $$
|
||||
DECLARE r record;
|
||||
BEGIN
|
||||
FOR r IN SELECT schemaname, tablename, policyname FROM pg_policies WHERE schemaname = 'public' LOOP
|
||||
EXECUTE format('DROP POLICY %I ON %I.%I', r.policyname, r.schemaname, r.tablename);
|
||||
END LOOP;
|
||||
END $$;
|
||||
|
||||
ALTER TABLE users ALTER COLUMN role DROP DEFAULT;
|
||||
ALTER TABLE users ALTER COLUMN role TYPE user_role USING role::text::user_role;
|
||||
ALTER TABLE users ALTER COLUMN role SET DEFAULT 'ssa';
|
||||
|
||||
-- If auth_user_role() is declared RETURNS user_role, recreate it after the type swap
|
||||
-- (copy its definition from db/schema.sql), then DROP TYPE user_role_old.
|
||||
-- DROP TYPE user_role_old; -- only after nothing depends on it
|
||||
COMMIT;
|
||||
|
||||
-- Finally: psql -f db/rls.sql (recreates all policies with 'ssa')
|
||||
-- Users also need their ims_session cookie refreshed (role is in the JWT): ask them to log out and in.
|
||||
+11
-11
@@ -56,7 +56,7 @@ CREATE POLICY "trucks_admin_all" ON trucks FOR ALL USING (auth_user_role() =
|
||||
-- users
|
||||
CREATE POLICY "users_read_own" ON users FOR SELECT USING (id = app_current_user_id());
|
||||
CREATE POLICY "users_read_elevated" ON users FOR SELECT
|
||||
USING (auth_user_role() IN ('hse', 'admin', 'management', 'supervisor'));
|
||||
USING (auth_user_role() IN ('hse', 'admin', 'management', 'ssa'));
|
||||
CREATE POLICY "users_update_own" ON users FOR UPDATE
|
||||
USING (id = app_current_user_id())
|
||||
WITH CHECK (
|
||||
@@ -70,12 +70,12 @@ CREATE POLICY "incidents_insert" ON incidents FOR INSERT
|
||||
WITH CHECK (reported_by = app_current_user_id());
|
||||
CREATE POLICY "incidents_read_reporter" ON incidents FOR SELECT
|
||||
USING (reported_by = app_current_user_id());
|
||||
CREATE POLICY "incidents_read_supervisor" ON incidents FOR SELECT
|
||||
USING (auth_user_role() = 'supervisor' AND site_id = auth_user_site_id());
|
||||
CREATE POLICY "incidents_read_ssa" ON incidents FOR SELECT
|
||||
USING (auth_user_role() = 'ssa' AND site_id = auth_user_site_id());
|
||||
CREATE POLICY "incidents_read_elevated" ON incidents FOR SELECT
|
||||
USING (auth_user_role() IN ('hse', 'admin', 'management'));
|
||||
CREATE POLICY "incidents_update_elevated" ON incidents FOR UPDATE
|
||||
USING (auth_user_role() IN ('hse', 'admin', 'supervisor'));
|
||||
USING (auth_user_role() IN ('hse', 'admin', 'ssa'));
|
||||
|
||||
-- evidence_files
|
||||
CREATE POLICY "evidence_insert" ON evidence_files FOR INSERT
|
||||
@@ -83,14 +83,14 @@ CREATE POLICY "evidence_insert" ON evidence_files FOR INSERT
|
||||
CREATE POLICY "evidence_read_uploader" ON evidence_files FOR SELECT
|
||||
USING (uploaded_by = app_current_user_id());
|
||||
CREATE POLICY "evidence_read_elevated" ON evidence_files FOR SELECT
|
||||
USING (auth_user_role() IN ('hse', 'admin', 'management', 'supervisor'));
|
||||
USING (auth_user_role() IN ('hse', 'admin', 'management', 'ssa'));
|
||||
-- No DELETE policy: files are never deleted (soft-delete only via `deleted` flag)
|
||||
|
||||
-- investigations
|
||||
CREATE POLICY "investigations_hse_admin" ON investigations FOR ALL
|
||||
USING (auth_user_role() IN ('hse', 'admin'));
|
||||
CREATE POLICY "investigations_read_supervisor" ON investigations FOR SELECT
|
||||
USING (auth_user_role() = 'supervisor');
|
||||
CREATE POLICY "investigations_read_ssa" ON investigations FOR SELECT
|
||||
USING (auth_user_role() = 'ssa');
|
||||
|
||||
-- capa_actions (capa_update_owner is tightened — no department clause)
|
||||
CREATE POLICY "capa_read_owner" ON capa_actions FOR SELECT
|
||||
@@ -98,7 +98,7 @@ CREATE POLICY "capa_read_owner" ON capa_actions FOR SELECT
|
||||
CREATE POLICY "capa_update_owner" ON capa_actions FOR UPDATE
|
||||
USING (owner_user_id = app_current_user_id());
|
||||
CREATE POLICY "capa_read_elevated" ON capa_actions FOR SELECT
|
||||
USING (auth_user_role() IN ('hse', 'admin', 'management', 'supervisor'));
|
||||
USING (auth_user_role() IN ('hse', 'admin', 'management', 'ssa'));
|
||||
CREATE POLICY "capa_hse_admin_all" ON capa_actions FOR ALL
|
||||
USING (auth_user_role() IN ('hse', 'admin'));
|
||||
|
||||
@@ -108,7 +108,7 @@ CREATE POLICY "dosh_hse_admin" ON dosh_reports FOR ALL
|
||||
|
||||
-- notifications_log (final state after migration 19 fix)
|
||||
CREATE POLICY "notifications_insert_elevated" ON notifications_log FOR INSERT
|
||||
WITH CHECK (auth_user_role() IN ('hse', 'admin', 'supervisor'));
|
||||
WITH CHECK (auth_user_role() IN ('hse', 'admin', 'ssa'));
|
||||
CREATE POLICY "notifications_read_own" ON notifications_log FOR SELECT
|
||||
USING (recipient_user_id = app_current_user_id());
|
||||
CREATE POLICY "notifications_read_admin" ON notifications_log FOR SELECT
|
||||
@@ -130,7 +130,7 @@ CREATE POLICY "admin_update_settings" ON app_settings FOR ALL
|
||||
-- incident_addenda
|
||||
CREATE POLICY "addenda_read" ON incident_addenda FOR SELECT
|
||||
USING (
|
||||
auth_user_role() IN ('hse', 'admin', 'supervisor', 'management')
|
||||
auth_user_role() IN ('hse', 'admin', 'ssa', 'management')
|
||||
OR EXISTS (
|
||||
SELECT 1 FROM incidents i
|
||||
WHERE i.id = incident_id AND i.reported_by = app_current_user_id()
|
||||
@@ -139,5 +139,5 @@ CREATE POLICY "addenda_read" ON incident_addenda FOR SELECT
|
||||
CREATE POLICY "addenda_insert" ON incident_addenda FOR INSERT
|
||||
WITH CHECK (
|
||||
author = app_current_user_id()
|
||||
AND auth_user_role() IN ('hse', 'admin', 'supervisor')
|
||||
AND auth_user_role() IN ('hse', 'admin', 'ssa')
|
||||
);
|
||||
|
||||
+2
-2
@@ -16,7 +16,7 @@ CREATE EXTENSION IF NOT EXISTS pgcrypto;
|
||||
-- Enums
|
||||
-- ---------------------------------------------------------------------------
|
||||
CREATE TYPE user_role AS ENUM (
|
||||
'reporter', 'supervisor', 'hse', 'capa_owner', 'management', 'admin'
|
||||
'ssa', 'hse', 'management', 'admin'
|
||||
);
|
||||
|
||||
CREATE TYPE incident_type AS ENUM (
|
||||
@@ -80,7 +80,7 @@ CREATE TABLE users (
|
||||
name TEXT NOT NULL DEFAULT '',
|
||||
email TEXT NOT NULL DEFAULT '' UNIQUE,
|
||||
phone TEXT,
|
||||
role user_role NOT NULL DEFAULT 'reporter',
|
||||
role user_role NOT NULL DEFAULT 'ssa',
|
||||
department TEXT,
|
||||
site_id UUID REFERENCES sites(id),
|
||||
active BOOLEAN NOT NULL DEFAULT true,
|
||||
|
||||
Reference in New Issue
Block a user