From cc80ca326964a2182ccf56166d10cce627f3bd4f Mon Sep 17 00:00:00 2001 From: Edward Fitz Abucay Date: Wed, 27 Nov 2024 23:53:38 +0800 Subject: [PATCH] Add latest migration changes Signed-off-by: Edward Fitz Abucay --- migrations/20221003041349_add_mfa_schema.up.sql | 13 ++++++++----- ...3041400_add_aal_and_factor_id_to_sessions.up.sql | 2 +- .../20230322519590_add_flow_state_table.up.sql | 2 +- .../20240427152123_add_one_time_tokens_table.up.sql | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/migrations/20221003041349_add_mfa_schema.up.sql b/migrations/20221003041349_add_mfa_schema.up.sql index 409a56663..740c8849d 100644 --- a/migrations/20221003041349_add_mfa_schema.up.sql +++ b/migrations/20221003041349_add_mfa_schema.up.sql @@ -1,19 +1,22 @@ -- see: https://stackoverflow.com/questions/7624919/check-if-a-user-defined-type-already-exists-in-postgresql/48382296#48382296 -do $$ begin +do $$ +begin create type {{ index .Options "Namespace" }}.factor_type as enum('totp', 'webauthn'); create type {{ index .Options "Namespace" }}.factor_status as enum('unverified', 'verified'); create type {{ index .Options "Namespace" }}.aal_level as enum('aal1', 'aal2', 'aal3'); exception - when duplicate_object then null; -end $$; + when duplicate_object then raise notice '%, skipping', sqlerrm using errcode = sqlstate; + when others then null; +end +$$; -- auth.mfa_factors definition create table if not exists {{ index .Options "Namespace" }}.mfa_factors( id uuid not null, user_id uuid not null, friendly_name text null, - factor_type factor_type not null, - status factor_status not null, + factor_type {{ index .Options "Namespace" }}.factor_type not null, + status {{ index .Options "Namespace" }}.factor_status not null, created_at timestamptz not null, updated_at timestamptz not null, secret text null, diff --git a/migrations/20221003041400_add_aal_and_factor_id_to_sessions.up.sql b/migrations/20221003041400_add_aal_and_factor_id_to_sessions.up.sql index cc8a2096d..426a42f59 100644 --- a/migrations/20221003041400_add_aal_and_factor_id_to_sessions.up.sql +++ b/migrations/20221003041400_add_aal_and_factor_id_to_sessions.up.sql @@ -1,3 +1,3 @@ -- add factor_id to sessions alter table {{ index .Options "Namespace" }}.sessions add column if not exists factor_id uuid null; - alter table {{ index .Options "Namespace" }}.sessions add column if not exists aal aal_level null; + alter table {{ index .Options "Namespace" }}.sessions add column if not exists aal {{ index .Options "Namespace" }}.aal_level null; diff --git a/migrations/20230322519590_add_flow_state_table.up.sql b/migrations/20230322519590_add_flow_state_table.up.sql index 9f7ef09bb..c54455f90 100644 --- a/migrations/20230322519590_add_flow_state_table.up.sql +++ b/migrations/20230322519590_add_flow_state_table.up.sql @@ -8,7 +8,7 @@ create table if not exists {{ index .Options "Namespace" }}.flow_state( id uuid primary key, user_id uuid null, auth_code text not null, - code_challenge_method code_challenge_method not null, + code_challenge_method {{ index .Options "Namespace" }}.code_challenge_method not null, code_challenge text not null, provider_type text not null, provider_access_token text null, diff --git a/migrations/20240427152123_add_one_time_tokens_table.up.sql b/migrations/20240427152123_add_one_time_tokens_table.up.sql index a0fd4de52..58e17784e 100644 --- a/migrations/20240427152123_add_one_time_tokens_table.up.sql +++ b/migrations/20240427152123_add_one_time_tokens_table.up.sql @@ -16,7 +16,7 @@ do $$ begin create table if not exists {{ index .Options "Namespace" }}.one_time_tokens ( id uuid primary key, user_id uuid not null references {{ index .Options "Namespace" }}.users on delete cascade, - token_type one_time_token_type not null, + token_type {{ index .Options "Namespace" }}.one_time_token_type not null, token_hash text not null, relates_to text not null, created_at timestamp without time zone not null default now(),