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

Commit e721d7a

Browse files
author
Dominik Frantisek Bucik
committed
refactor: 💡 Removed UMA package (not used)
Several tables have been dropped from the database. Also, access_token does not contain permissions anymore. To update the DB accordingly, run following: ```sql DROP TABLE access_token_permissions; DROP TABLE resource_set; DROP TABLE resource_set_scope; DROP TABLE permission_ticket; DROP TABLE permission; DROP TABLE permission_scope; DROP TABLE claim; DROP TABLE claim_to_policy; DROP TABLE claim_to_permission_ticket; DROP TABLE policy; DROP TABLE policy_scope; DROP TABLE claim_token_format; DROP TABLE claim_issuer; DROP TABLE saved_registered_client; ```
1 parent a445565 commit e721d7a

27 files changed

+23
-1741
lines changed

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

Lines changed: 0 additions & 82 deletions
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

Lines changed: 1 addition & 83 deletions
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

Lines changed: 1 addition & 84 deletions
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-

‎perun-oidc-server/src/main/java/cz/muni/ics/oauth2/model/OAuth2AccessTokenEntity.java

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,29 @@
2020
*/
2121
package cz.muni.ics.oauth2.model;
2222

23-
import static cz.muni.ics.oauth2.model.OAuth2AccessTokenEntity.*;
23+
import static cz.muni.ics.oauth2.model.OAuth2AccessTokenEntity.PARAM_APPROVED_SITE;
24+
import static cz.muni.ics.oauth2.model.OAuth2AccessTokenEntity.PARAM_CLIENT;
25+
import static cz.muni.ics.oauth2.model.OAuth2AccessTokenEntity.PARAM_DATE;
26+
import static cz.muni.ics.oauth2.model.OAuth2AccessTokenEntity.PARAM_NAME;
27+
import static cz.muni.ics.oauth2.model.OAuth2AccessTokenEntity.PARAM_REFRESH_TOKEN;
28+
import static cz.muni.ics.oauth2.model.OAuth2AccessTokenEntity.PARAM_TOKEN_VALUE;
29+
import static cz.muni.ics.oauth2.model.OAuth2AccessTokenEntity.QUERY_ALL;
30+
import static cz.muni.ics.oauth2.model.OAuth2AccessTokenEntity.QUERY_BY_APPROVED_SITE;
31+
import static cz.muni.ics.oauth2.model.OAuth2AccessTokenEntity.QUERY_BY_CLIENT;
32+
import static cz.muni.ics.oauth2.model.OAuth2AccessTokenEntity.QUERY_BY_NAME;
33+
import static cz.muni.ics.oauth2.model.OAuth2AccessTokenEntity.QUERY_BY_REFRESH_TOKEN;
34+
import static cz.muni.ics.oauth2.model.OAuth2AccessTokenEntity.QUERY_BY_TOKEN_VALUE;
35+
import static cz.muni.ics.oauth2.model.OAuth2AccessTokenEntity.QUERY_EXPIRED_BY_DATE;
2436

2537
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
2638
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
2739
import com.nimbusds.jwt.JWT;
2840
import cz.muni.ics.oauth2.model.convert.JWTStringConverter;
2941
import cz.muni.ics.openid.connect.model.ApprovedSite;
30-
import cz.muni.ics.uma.model.Permission;
3142
import java.util.Date;
3243
import java.util.HashMap;
3344
import java.util.Map;
3445
import java.util.Set;
35-
import javax.persistence.Basic;
36-
import javax.persistence.CascadeType;
3746
import javax.persistence.CollectionTable;
3847
import javax.persistence.Column;
3948
import javax.persistence.Convert;
@@ -44,11 +53,9 @@
4453
import javax.persistence.GenerationType;
4554
import javax.persistence.Id;
4655
import javax.persistence.JoinColumn;
47-
import javax.persistence.JoinTable;
4856
import javax.persistence.ManyToOne;
4957
import javax.persistence.NamedQueries;
5058
import javax.persistence.NamedQuery;
51-
import javax.persistence.OneToMany;
5259
import javax.persistence.Table;
5360
import javax.persistence.Temporal;
5461
import javax.persistence.TemporalType;
@@ -96,9 +103,6 @@
96103
@NamedQuery(name = QUERY_BY_APPROVED_SITE,
97104
query = "SELECT a FROM OAuth2AccessTokenEntity a " +
98105
"WHERE a.approvedSite = :" + PARAM_APPROVED_SITE),
99-
@NamedQuery(name = QUERY_BY_RESOURCE_SET,
100-
query = "SELECT a FROM OAuth2AccessTokenEntity a JOIN a.permissions p " +
101-
"WHERE p.resourceSet.id = :" + PARAM_RESOURCE_SET_ID),
102106
@NamedQuery(name = QUERY_BY_NAME,
103107
query = "SELECT r FROM OAuth2AccessTokenEntity r " +
104108
"WHERE r.authenticationHolder.userAuth.name = :" + PARAM_NAME)
@@ -160,12 +164,6 @@ public class OAuth2AccessTokenEntity implements OAuth2AccessToken {
160164
@CascadeOnDelete
161165
private Set<String> scope;
162166

163-
@OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
164-
@JoinTable(name = "access_token_permissions", joinColumns = @JoinColumn(name = "access_token_id"),
165-
inverseJoinColumns = @JoinColumn(name = "permission_id"))
166-
@CascadeOnDelete
167-
private Set<Permission> permissions;
168-
169167
@ManyToOne
170168
@JoinColumn(name = "approved_site_id")
171169
private ApprovedSite approvedSite;

‎perun-oidc-server/src/main/java/cz/muni/ics/oauth2/repository/OAuth2TokenRepository.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import cz.muni.ics.oauth2.model.OAuth2AccessTokenEntity;
2323
import cz.muni.ics.oauth2.model.OAuth2RefreshTokenEntity;
2424
import cz.muni.ics.openid.connect.model.ApprovedSite;
25-
import cz.muni.ics.uma.model.ResourceSet;
2625
import java.util.List;
2726
import java.util.Set;
2827

@@ -68,8 +67,6 @@ public interface OAuth2TokenRepository {
6867

6968
Set<OAuth2RefreshTokenEntity> getAllExpiredRefreshTokens(PageCriteria pageCriteria);
7069

71-
Set<OAuth2AccessTokenEntity> getAccessTokensForResourceSet(ResourceSet rs);
72-
7370
/**
7471
* removes duplicate access tokens.
7572
*

0 commit comments

Comments
 (0)