Skip to content
This repository was archived by the owner on Sep 28, 2022. It is now read-only.

Commit 809e731

Browse files
author
Dominik František Bučík
authored
Merge pull request #47 from dBucik/refactor_models
Refactor
2 parents 7155e4a + e721d7a commit 809e731

File tree

61 files changed

+717
-3650
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+717
-3650
lines changed

‎perun-oidc-server-webapp/src/main/resources/db/hsql/hsql_database_tables.sql

-82
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ CREATE TABLE IF NOT EXISTS access_token (
1414
UNIQUE(token_value)
1515
);
1616

17-
CREATE TABLE IF NOT EXISTS access_token_permissions (
18-
access_token_id BIGINT NOT NULL,
19-
permission_id BIGINT NOT NULL
20-
);
21-
2217
CREATE TABLE IF NOT EXISTS address (
2318
id BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1) PRIMARY KEY,
2419
formatted VARCHAR(256),
@@ -284,83 +279,6 @@ CREATE TABLE IF NOT EXISTS pairwise_identifier (
284279
sector_identifier VARCHAR(2048)
285280
);
286281

287-
CREATE TABLE IF NOT EXISTS resource_set (
288-
id BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1) PRIMARY KEY,
289-
name VARCHAR(1024) NOT NULL,
290-
uri VARCHAR(1024),
291-
icon_uri VARCHAR(1024),
292-
rs_type VARCHAR(256),
293-
owner VARCHAR(256) NOT NULL,
294-
client_id VARCHAR(256)
295-
);
296-
297-
CREATE TABLE IF NOT EXISTS resource_set_scope (
298-
owner_id BIGINT NOT NULL,
299-
scope VARCHAR(256) NOT NULL
300-
);
301-
302-
CREATE TABLE IF NOT EXISTS permission_ticket (
303-
id BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1) PRIMARY KEY,
304-
ticket VARCHAR(256) NOT NULL,
305-
permission_id BIGINT NOT NULL,
306-
expiration TIMESTAMP
307-
);
308-
309-
CREATE TABLE IF NOT EXISTS permission (
310-
id BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1) PRIMARY KEY,
311-
resource_set_id BIGINT
312-
);
313-
314-
CREATE TABLE IF NOT EXISTS permission_scope (
315-
owner_id BIGINT NOT NULL,
316-
scope VARCHAR(256) NOT NULL
317-
);
318-
319-
CREATE TABLE IF NOT EXISTS claim (
320-
id BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1) PRIMARY KEY,
321-
name VARCHAR(256),
322-
friendly_name VARCHAR(1024),
323-
claim_type VARCHAR(1024),
324-
claim_value VARCHAR(1024)
325-
);
326-
327-
CREATE TABLE IF NOT EXISTS claim_to_policy (
328-
policy_id BIGINT NOT NULL,
329-
claim_id BIGINT NOT NULL
330-
);
331-
332-
CREATE TABLE IF NOT EXISTS claim_to_permission_ticket (
333-
permission_ticket_id BIGINT NOT NULL,
334-
claim_id BIGINT NOT NULL
335-
);
336-
337-
CREATE TABLE IF NOT EXISTS policy (
338-
id BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1) PRIMARY KEY,
339-
name VARCHAR(1024),
340-
resource_set_id BIGINT
341-
);
342-
343-
CREATE TABLE IF NOT EXISTS policy_scope (
344-
owner_id BIGINT NOT NULL,
345-
scope VARCHAR(256) NOT NULL
346-
);
347-
348-
CREATE TABLE IF NOT EXISTS claim_token_format (
349-
owner_id BIGINT NOT NULL,
350-
claim_token_format VARCHAR(1024)
351-
);
352-
353-
CREATE TABLE IF NOT EXISTS claim_issuer (
354-
owner_id BIGINT NOT NULL,
355-
issuer VARCHAR(1024)
356-
);
357-
358-
CREATE TABLE IF NOT EXISTS saved_registered_client (
359-
id BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1) PRIMARY KEY,
360-
issuer VARCHAR(1024),
361-
registered_client VARCHAR(8192)
362-
);
363-
364282
CREATE TABLE IF NOT EXISTS device_code (
365283
id BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1) PRIMARY KEY,
366284
device_code VARCHAR(1024),

‎perun-oidc-server-webapp/src/main/resources/db/mysql/mysql_database_tables.sql

+1-83
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@ CREATE TABLE IF NOT EXISTS access_token (
1313
approved_site_id BIGINT
1414
);
1515

16-
CREATE TABLE IF NOT EXISTS access_token_permissions (
17-
access_token_id BIGINT NOT NULL,
18-
permission_id BIGINT NOT NULL
19-
);
20-
2116
CREATE TABLE IF NOT EXISTS address (
2217
id BIGINT AUTO_INCREMENT PRIMARY KEY,
2318
formatted VARCHAR(256),
@@ -87,7 +82,7 @@ CREATE TABLE IF NOT EXISTS saved_user_auth (
8782
id BIGINT AUTO_INCREMENT PRIMARY KEY,
8883
acr VARCHAR(1024),
8984
name VARCHAR(1024),
90-
authenticated BOOLEAN,
85+
authenticated BOOLEAN
9186
);
9287

9388
CREATE TABLE IF NOT EXISTS saved_user_auth_authority (
@@ -283,83 +278,6 @@ CREATE TABLE IF NOT EXISTS pairwise_identifier (
283278
sector_identifier VARCHAR(2048)
284279
);
285280

286-
CREATE TABLE IF NOT EXISTS resource_set (
287-
id BIGINT AUTO_INCREMENT PRIMARY KEY,
288-
name VARCHAR(1024) NOT NULL,
289-
uri VARCHAR(1024),
290-
icon_uri VARCHAR(1024),
291-
rs_type VARCHAR(256),
292-
owner VARCHAR(256) NOT NULL,
293-
client_id VARCHAR(256)
294-
);
295-
296-
CREATE TABLE IF NOT EXISTS resource_set_scope (
297-
owner_id BIGINT NOT NULL,
298-
scope VARCHAR(256) NOT NULL
299-
);
300-
301-
CREATE TABLE IF NOT EXISTS permission_ticket (
302-
id BIGINT AUTO_INCREMENT PRIMARY KEY,
303-
ticket VARCHAR(256) NOT NULL,
304-
permission_id BIGINT NOT NULL,
305-
expiration TIMESTAMP NULL
306-
);
307-
308-
CREATE TABLE IF NOT EXISTS permission (
309-
id BIGINT AUTO_INCREMENT PRIMARY KEY,
310-
resource_set_id BIGINT
311-
);
312-
313-
CREATE TABLE IF NOT EXISTS permission_scope (
314-
owner_id BIGINT NOT NULL,
315-
scope VARCHAR(256) NOT NULL
316-
);
317-
318-
CREATE TABLE IF NOT EXISTS claim (
319-
id BIGINT AUTO_INCREMENT PRIMARY KEY,
320-
name VARCHAR(256),
321-
friendly_name VARCHAR(1024),
322-
claim_type VARCHAR(1024),
323-
claim_value VARCHAR(1024)
324-
);
325-
326-
CREATE TABLE IF NOT EXISTS claim_to_policy (
327-
policy_id BIGINT NOT NULL,
328-
claim_id BIGINT NOT NULL
329-
);
330-
331-
CREATE TABLE IF NOT EXISTS claim_to_permission_ticket (
332-
permission_ticket_id BIGINT NOT NULL,
333-
claim_id BIGINT NOT NULL
334-
);
335-
336-
CREATE TABLE IF NOT EXISTS policy (
337-
id BIGINT AUTO_INCREMENT PRIMARY KEY,
338-
name VARCHAR(1024),
339-
resource_set_id BIGINT
340-
);
341-
342-
CREATE TABLE IF NOT EXISTS policy_scope (
343-
owner_id BIGINT NOT NULL,
344-
scope VARCHAR(256) NOT NULL
345-
);
346-
347-
CREATE TABLE IF NOT EXISTS claim_token_format (
348-
owner_id BIGINT NOT NULL,
349-
claim_token_format VARCHAR(1024)
350-
);
351-
352-
CREATE TABLE IF NOT EXISTS claim_issuer (
353-
owner_id BIGINT NOT NULL,
354-
issuer VARCHAR(1024)
355-
);
356-
357-
CREATE TABLE IF NOT EXISTS saved_registered_client (
358-
id BIGINT AUTO_INCREMENT PRIMARY KEY,
359-
issuer VARCHAR(1024),
360-
registered_client VARCHAR(8192)
361-
);
362-
363281
CREATE TABLE IF NOT EXISTS device_code (
364282
id BIGINT AUTO_INCREMENT PRIMARY KEY,
365283
device_code VARCHAR(1024),

‎perun-oidc-server-webapp/src/main/resources/db/psql/psql_database_tables.sql

+1-84
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ CREATE TABLE IF NOT EXISTS access_token (
1414
UNIQUE(token_value)
1515
);
1616

17-
CREATE TABLE IF NOT EXISTS access_token_permissions (
18-
access_token_id BIGINT NOT NULL,
19-
permission_id BIGINT NOT NULL
20-
);
21-
2217
CREATE TABLE IF NOT EXISTS address (
2318
id BIGSERIAL PRIMARY KEY,
2419
formatted VARCHAR(256),
@@ -88,7 +83,7 @@ CREATE TABLE IF NOT EXISTS saved_user_auth (
8883
id BIGSERIAL PRIMARY KEY,
8984
acr VARCHAR(1024),
9085
name VARCHAR(1024),
91-
authenticated BOOLEAN,
86+
authenticated BOOLEAN
9287
);
9388

9489
CREATE TABLE IF NOT EXISTS saved_user_auth_authority (
@@ -284,83 +279,6 @@ CREATE TABLE IF NOT EXISTS pairwise_identifier (
284279
sector_identifier VARCHAR(2048)
285280
);
286281

287-
CREATE TABLE IF NOT EXISTS resource_set (
288-
id BIGSERIAL PRIMARY KEY,
289-
name VARCHAR(1024) NOT NULL,
290-
uri VARCHAR(1024),
291-
icon_uri VARCHAR(1024),
292-
rs_type VARCHAR(256),
293-
owner VARCHAR(256) NOT NULL,
294-
client_id VARCHAR(256)
295-
);
296-
297-
CREATE TABLE IF NOT EXISTS resource_set_scope (
298-
owner_id BIGINT NOT NULL,
299-
scope VARCHAR(256) NOT NULL
300-
);
301-
302-
CREATE TABLE IF NOT EXISTS permission_ticket (
303-
id BIGSERIAL PRIMARY KEY,
304-
ticket VARCHAR(256) NOT NULL,
305-
permission_id BIGINT NOT NULL,
306-
expiration TIMESTAMP
307-
);
308-
309-
CREATE TABLE IF NOT EXISTS permission (
310-
id BIGSERIAL PRIMARY KEY,
311-
resource_set_id BIGINT
312-
);
313-
314-
CREATE TABLE IF NOT EXISTS permission_scope (
315-
owner_id BIGINT NOT NULL,
316-
scope VARCHAR(256) NOT NULL
317-
);
318-
319-
CREATE TABLE IF NOT EXISTS claim (
320-
id BIGSERIAL PRIMARY KEY,
321-
name VARCHAR(256),
322-
friendly_name VARCHAR(1024),
323-
claim_type VARCHAR(1024),
324-
claim_value VARCHAR(1024)
325-
);
326-
327-
CREATE TABLE IF NOT EXISTS claim_to_policy (
328-
policy_id BIGINT NOT NULL,
329-
claim_id BIGINT NOT NULL
330-
);
331-
332-
CREATE TABLE IF NOT EXISTS claim_to_permission_ticket (
333-
permission_ticket_id BIGINT NOT NULL,
334-
claim_id BIGINT NOT NULL
335-
);
336-
337-
CREATE TABLE IF NOT EXISTS policy (
338-
id BIGSERIAL PRIMARY KEY,
339-
name VARCHAR(1024),
340-
resource_set_id BIGINT
341-
);
342-
343-
CREATE TABLE IF NOT EXISTS policy_scope (
344-
owner_id BIGINT NOT NULL,
345-
scope VARCHAR(256) NOT NULL
346-
);
347-
348-
CREATE TABLE IF NOT EXISTS claim_token_format (
349-
owner_id BIGINT NOT NULL,
350-
claim_token_format VARCHAR(1024)
351-
);
352-
353-
CREATE TABLE IF NOT EXISTS claim_issuer (
354-
owner_id BIGINT NOT NULL,
355-
issuer VARCHAR(1024)
356-
);
357-
358-
CREATE TABLE IF NOT EXISTS saved_registered_client (
359-
id BIGSERIAL PRIMARY KEY,
360-
issuer VARCHAR(1024),
361-
registered_client VARCHAR(8192)
362-
);
363-
364282
CREATE TABLE IF NOT EXISTS device_code (
365283
id BIGSERIAL PRIMARY KEY,
366284
device_code VARCHAR(1024),
@@ -381,4 +299,3 @@ CREATE TABLE IF NOT EXISTS device_code_request_parameter (
381299
param VARCHAR(2048),
382300
val VARCHAR(2048)
383301
);
384-

0 commit comments

Comments
 (0)