From 09c513cb79920de02bd89fd7a95583c979f8444e Mon Sep 17 00:00:00 2001 From: Nikos Date: Mon, 27 Jan 2025 15:58:52 +0100 Subject: [PATCH] fixup! 92f3baa2 --- ...9000001000000_device_flow.cockroach.up.sql | 47 ------------------- .../20241609000001000000_device_flow.down.sql | 19 -------- ...41609000001000000_device_flow.mysql.up.sql | 45 ------------------ ...09000001000000_device_flow.postgres.up.sql | 45 ------------------ .../20241609000001000000_device_flow.up.sql | 40 ---------------- 5 files changed, 196 deletions(-) delete mode 100644 persistence/sql/src/YYYYMMDD000001_device_flow/20241609000001000000_device_flow.cockroach.up.sql delete mode 100644 persistence/sql/src/YYYYMMDD000001_device_flow/20241609000001000000_device_flow.down.sql delete mode 100644 persistence/sql/src/YYYYMMDD000001_device_flow/20241609000001000000_device_flow.mysql.up.sql delete mode 100644 persistence/sql/src/YYYYMMDD000001_device_flow/20241609000001000000_device_flow.postgres.up.sql delete mode 100644 persistence/sql/src/YYYYMMDD000001_device_flow/20241609000001000000_device_flow.up.sql diff --git a/persistence/sql/src/YYYYMMDD000001_device_flow/20241609000001000000_device_flow.cockroach.up.sql b/persistence/sql/src/YYYYMMDD000001_device_flow/20241609000001000000_device_flow.cockroach.up.sql deleted file mode 100644 index b548c37b7e1..00000000000 --- a/persistence/sql/src/YYYYMMDD000001_device_flow/20241609000001000000_device_flow.cockroach.up.sql +++ /dev/null @@ -1,47 +0,0 @@ -CREATE TABLE IF NOT EXISTS hydra_oauth2_device_auth_codes -( - device_code_signature VARCHAR(255) NOT NULL, - user_code_signature VARCHAR(255) NOT NULL, - request_id VARCHAR(40) NOT NULL, - requested_at TIMESTAMP NOT NULL DEFAULT NOW(), - client_id VARCHAR(255) NOT NULL, - scope TEXT NOT NULL, - granted_scope TEXT NOT NULL, - form_data TEXT NOT NULL, - session_data TEXT NOT NULL, - subject VARCHAR(255) NOT NULL DEFAULT '', - device_code_active BOOL NOT NULL DEFAULT true, - user_code_state SMALLINT NOT NULL DEFAULT 0, - requested_audience TEXT NULL DEFAULT '', - granted_audience TEXT NULL DEFAULT '', - challenge_id VARCHAR(40) NULL, - expires_at TIMESTAMP NULL, - nid UUID NULL, - - FOREIGN KEY (client_id, nid) REFERENCES hydra_client(id, nid) ON DELETE CASCADE, - FOREIGN KEY (nid) REFERENCES networks(id) ON UPDATE RESTRICT ON DELETE CASCADE, - FOREIGN KEY (challenge_id) REFERENCES hydra_oauth2_flow(consent_challenge_id) ON DELETE CASCADE, - PRIMARY KEY (device_code_signature, nid) -); - -CREATE INDEX hydra_oauth2_device_auth_codes_request_id_idx ON hydra_oauth2_device_auth_codes (request_id, nid); -CREATE INDEX hydra_oauth2_device_auth_codes_client_id_idx ON hydra_oauth2_device_auth_codes (client_id, nid); -CREATE INDEX hydra_oauth2_device_auth_codes_challenge_id_idx ON hydra_oauth2_device_auth_codes (challenge_id); -CREATE UNIQUE INDEX hydra_oauth2_device_auth_codes_user_code_signature_idx ON hydra_oauth2_device_auth_codes (user_code_signature, nid); - -ALTER TABLE ONLY hydra_oauth2_access ADD CONSTRAINT hydra_oauth2_access_challenge_id_fk FOREIGN KEY (challenge_id) REFERENCES hydra_oauth2_flow(consent_challenge_id) ON DELETE CASCADE; - -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_challenge_id VARCHAR(255) NULL; -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_code_request_id VARCHAR(255) NULL; -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_verifier VARCHAR(40) NULL; -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_csrf VARCHAR(40) NULL; -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_user_code_accepted_at TIMESTAMP NULL; -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_was_used BOOL NULL; -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_handled_at TIMESTAMP NULL; -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_error TEXT NULL; - -CREATE INDEX hydra_oauth2_flow_device_challenge_idx ON hydra_oauth2_flow (device_challenge_id); - -ALTER TABLE hydra_client ADD COLUMN device_authorization_grant_id_token_lifespan BIGINT NULL DEFAULT NULL; -ALTER TABLE hydra_client ADD COLUMN device_authorization_grant_access_token_lifespan BIGINT NULL DEFAULT NULL; -ALTER TABLE hydra_client ADD COLUMN device_authorization_grant_refresh_token_lifespan BIGINT NULL DEFAULT NULL; diff --git a/persistence/sql/src/YYYYMMDD000001_device_flow/20241609000001000000_device_flow.down.sql b/persistence/sql/src/YYYYMMDD000001_device_flow/20241609000001000000_device_flow.down.sql deleted file mode 100644 index d40f5b1ced4..00000000000 --- a/persistence/sql/src/YYYYMMDD000001_device_flow/20241609000001000000_device_flow.down.sql +++ /dev/null @@ -1,19 +0,0 @@ -ALTER TABLE hydra_oauth2_device_auth_codes DROP FOREIGN KEY IF EXISTS hydra_oauth2_device_auth_codes_challenge_id_fk; -ALTER TABLE hydra_oauth2_device_auth_codes DROP FOREIGN KEY IF EXISTS hydra_oauth2_device_auth_codes_client_id_fk; -ALTER TABLE hydra_oauth2_device_auth_codes DROP FOREIGN KEY IF EXISTS hydra_oauth2_device_auth_codes_nid_fk_idx; - -DROP TABLE IF EXISTS hydra_oauth2_device_auth_codes; - -ALTER TABLE hydra_oauth2_flow DROP COLUMN IF EXISTS device_challenge_id; -ALTER TABLE hydra_oauth2_flow DROP COLUMN IF EXISTS device_code_request_id; -ALTER TABLE hydra_oauth2_flow DROP COLUMN IF EXISTS device_verifier; -ALTER TABLE hydra_oauth2_flow DROP COLUMN IF EXISTS device_csrf; -ALTER TABLE hydra_oauth2_flow DROP COLUMN IF EXISTS device_user_code_accepted_at; -ALTER TABLE hydra_oauth2_flow DROP COLUMN IF EXISTS device_was_used; -ALTER TABLE hydra_oauth2_flow DROP COLUMN IF EXISTS device_handled_at; -ALTER TABLE hydra_oauth2_flow DROP COLUMN IF EXISTS device_error; - - -ALTER TABLE hydra_client DROP COLUMN device_authorization_grant_id_token_lifespan; -ALTER TABLE hydra_client DROP COLUMN device_authorization_grant_access_token_lifespan; -ALTER TABLE hydra_client DROP COLUMN device_authorization_grant_refresh_token_lifespan; \ No newline at end of file diff --git a/persistence/sql/src/YYYYMMDD000001_device_flow/20241609000001000000_device_flow.mysql.up.sql b/persistence/sql/src/YYYYMMDD000001_device_flow/20241609000001000000_device_flow.mysql.up.sql deleted file mode 100644 index 52fd72620d3..00000000000 --- a/persistence/sql/src/YYYYMMDD000001_device_flow/20241609000001000000_device_flow.mysql.up.sql +++ /dev/null @@ -1,45 +0,0 @@ -CREATE TABLE IF NOT EXISTS hydra_oauth2_device_auth_codes -( - device_code_signature VARCHAR(255) NOT NULL, - user_code_signature VARCHAR(255) NOT NULL, - request_id VARCHAR(40) NOT NULL DEFAULT '', - requested_at TIMESTAMP NOT NULL DEFAULT NOW(), - client_id VARCHAR(255) NOT NULL, - scope TEXT NOT NULL, - granted_scope TEXT NOT NULL, - form_data TEXT NOT NULL, - session_data TEXT NOT NULL, - subject VARCHAR(255) NOT NULL DEFAULT '', - device_code_active BOOL NOT NULL DEFAULT true, - user_code_state SMALLINT NOT NULL DEFAULT 0, - requested_audience TEXT NOT NULL, - granted_audience TEXT NOT NULL, - challenge_id VARCHAR(40) NULL, - expires_at TIMESTAMP NULL, - nid CHAR(36) NOT NULL, - - FOREIGN KEY (client_id, nid) REFERENCES hydra_client(id, nid) ON DELETE CASCADE, - FOREIGN KEY (nid) REFERENCES networks(id) ON UPDATE RESTRICT ON DELETE CASCADE, - FOREIGN KEY (challenge_id) REFERENCES hydra_oauth2_flow(consent_challenge_id) ON DELETE CASCADE, - PRIMARY KEY (device_code_signature, nid) -); - -CREATE INDEX hydra_oauth2_device_auth_codes_request_id_idx ON hydra_oauth2_device_auth_codes (request_id, nid); -CREATE INDEX hydra_oauth2_device_auth_codes_client_id_idx ON hydra_oauth2_device_auth_codes (client_id, nid); -CREATE INDEX hydra_oauth2_device_auth_codes_challenge_id_idx ON hydra_oauth2_device_auth_codes (challenge_id); -CREATE UNIQUE INDEX hydra_oauth2_device_auth_codes_user_code_signature_idx ON hydra_oauth2_device_auth_codes (user_code_signature, nid); - -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_challenge_id VARCHAR(255) NULL; -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_code_request_id VARCHAR(255) NULL; -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_verifier VARCHAR(40) NULL; -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_csrf VARCHAR(40) NULL; -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_user_code_accepted_at TIMESTAMP NULL; -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_was_used BOOL NULL; -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_handled_at TIMESTAMP NULL; -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_error TEXT NULL; - -CREATE INDEX hydra_oauth2_flow_device_challenge_idx ON hydra_oauth2_flow (device_challenge_id); - -ALTER TABLE hydra_client ADD COLUMN device_authorization_grant_id_token_lifespan BIGINT NULL DEFAULT NULL; -ALTER TABLE hydra_client ADD COLUMN device_authorization_grant_access_token_lifespan BIGINT NULL DEFAULT NULL; -ALTER TABLE hydra_client ADD COLUMN device_authorization_grant_refresh_token_lifespan BIGINT NULL DEFAULT NULL; diff --git a/persistence/sql/src/YYYYMMDD000001_device_flow/20241609000001000000_device_flow.postgres.up.sql b/persistence/sql/src/YYYYMMDD000001_device_flow/20241609000001000000_device_flow.postgres.up.sql deleted file mode 100644 index 14ed9662324..00000000000 --- a/persistence/sql/src/YYYYMMDD000001_device_flow/20241609000001000000_device_flow.postgres.up.sql +++ /dev/null @@ -1,45 +0,0 @@ -CREATE TABLE IF NOT EXISTS hydra_oauth2_device_auth_codes -( - device_code_signature VARCHAR(255) NOT NULL, - user_code_signature VARCHAR(255) NOT NULL, - request_id VARCHAR(40) NOT NULL, - requested_at TIMESTAMP NOT NULL DEFAULT NOW(), - client_id VARCHAR(255) NOT NULL, - scope TEXT NOT NULL, - granted_scope TEXT NOT NULL, - form_data TEXT NOT NULL, - session_data TEXT NOT NULL, - subject VARCHAR(255) NOT NULL DEFAULT '', - device_code_active BOOL NOT NULL DEFAULT true, - user_code_state SMALLINT NOT NULL DEFAULT 0, - requested_audience TEXT NULL DEFAULT '', - granted_audience TEXT NULL DEFAULT '', - challenge_id VARCHAR(40) NULL, - expires_at TIMESTAMP NULL, - nid UUID NULL, - - FOREIGN KEY (client_id, nid) REFERENCES hydra_client(id, nid) ON DELETE CASCADE, - FOREIGN KEY (nid) REFERENCES networks(id) ON UPDATE RESTRICT ON DELETE CASCADE, - FOREIGN KEY (challenge_id) REFERENCES hydra_oauth2_flow(consent_challenge_id) ON DELETE CASCADE, - PRIMARY KEY (device_code_signature, nid) -); - -CREATE INDEX hydra_oauth2_device_auth_codes_request_id_idx ON hydra_oauth2_device_auth_codes (request_id, nid); -CREATE INDEX hydra_oauth2_device_auth_codes_client_id_idx ON hydra_oauth2_device_auth_codes (client_id, nid); -CREATE INDEX hydra_oauth2_device_auth_codes_challenge_id_idx ON hydra_oauth2_device_auth_codes (challenge_id); -CREATE UNIQUE INDEX hydra_oauth2_device_auth_codes_user_code_signature_idx ON hydra_oauth2_device_auth_codes (user_code_signature, nid); - -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_challenge_id VARCHAR(255) NULL; -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_code_request_id VARCHAR(255) NULL; -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_verifier VARCHAR(40) NULL; -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_csrf VARCHAR(40) NULL; -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_user_code_accepted_at TIMESTAMP NULL; -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_was_used BOOLEAN NULL; -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_handled_at TIMESTAMP NULL; -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_error TEXT NULL; - -CREATE INDEX hydra_oauth2_flow_device_challenge_idx ON hydra_oauth2_flow (device_challenge_id); - -ALTER TABLE hydra_client ADD COLUMN device_authorization_grant_id_token_lifespan BIGINT NULL DEFAULT NULL; -ALTER TABLE hydra_client ADD COLUMN device_authorization_grant_access_token_lifespan BIGINT NULL DEFAULT NULL; -ALTER TABLE hydra_client ADD COLUMN device_authorization_grant_refresh_token_lifespan BIGINT NULL DEFAULT NULL; diff --git a/persistence/sql/src/YYYYMMDD000001_device_flow/20241609000001000000_device_flow.up.sql b/persistence/sql/src/YYYYMMDD000001_device_flow/20241609000001000000_device_flow.up.sql deleted file mode 100644 index 9327ef347ff..00000000000 --- a/persistence/sql/src/YYYYMMDD000001_device_flow/20241609000001000000_device_flow.up.sql +++ /dev/null @@ -1,40 +0,0 @@ -CREATE TABLE IF NOT EXISTS hydra_oauth2_device_auth_codes -( - device_code_signature VARCHAR(255) NOT NULL PRIMARY KEY, - user_code_signature VARCHAR(255) NOT NULL, - request_id VARCHAR(40) NOT NULL, - requested_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, - client_id VARCHAR(255) NOT NULL, - scope TEXT NOT NULL, - granted_scope TEXT NOT NULL, - form_data TEXT NOT NULL, - session_data TEXT NOT NULL, - subject VARCHAR(255) NOT NULL DEFAULT '', - device_code_active BOOL NOT NULL DEFAULT true, - user_code_state SMALLINT NOT NULL DEFAULT 0, - requested_audience TEXT NULL DEFAULT '', - granted_audience TEXT NULL DEFAULT '', - challenge_id VARCHAR(40) NULL, - expires_at TIMESTAMP NULL, - nid UUID NULL -); - -CREATE INDEX hydra_oauth2_device_auth_codes_request_id_idx ON hydra_oauth2_device_auth_codes (request_id, nid); -CREATE INDEX hydra_oauth2_device_auth_codes_client_id_idx ON hydra_oauth2_device_auth_codes (client_id, nid); -CREATE INDEX hydra_oauth2_device_auth_codes_challenge_id_idx ON hydra_oauth2_device_auth_codes (challenge_id); -CREATE UNIQUE INDEX hydra_oauth2_device_auth_codes_user_code_signature_idx ON hydra_oauth2_device_auth_codes (user_code_signature, nid); - -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_challenge_id VARCHAR(255) NULL; -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_code_request_id VARCHAR(255) NULL; -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_verifier VARCHAR(40) NULL; -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_csrf VARCHAR(40) NULL; -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_user_code_accepted_at TIMESTAMP NULL; -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_was_used BOOLEAN NULL; -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_handled_at TIMESTAMP NULL; -ALTER TABLE hydra_oauth2_flow ADD COLUMN device_error TEXT NULL; - -CREATE INDEX hydra_oauth2_flow_device_challenge_idx ON hydra_oauth2_flow (device_challenge_id); - -ALTER TABLE hydra_client ADD COLUMN device_authorization_grant_id_token_lifespan BIGINT NULL DEFAULT NULL; -ALTER TABLE hydra_client ADD COLUMN device_authorization_grant_access_token_lifespan BIGINT NULL DEFAULT NULL; -ALTER TABLE hydra_client ADD COLUMN device_authorization_grant_refresh_token_lifespan BIGINT NULL DEFAULT NULL;