Skip to content

Commit 7cc0da4

Browse files
committed
add IDN tables for token persistence removal.
1 parent f747d03 commit 7cc0da4

File tree

8 files changed

+236
-0
lines changed

8 files changed

+236
-0
lines changed

features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/db2.sql

+28
Original file line numberDiff line numberDiff line change
@@ -2035,6 +2035,34 @@ BEFORE INSERT
20352035
END
20362036
/
20372037

2038+
CREATE TABLE IDN_INVALID_TOKENS (
2039+
UUID VARCHAR(255) NOT NULL,
2040+
TOKEN_IDENTIFIER VARCHAR(2048) NOT NULL,
2041+
CONSUMER_KEY VARCHAR(255) NOT NULL,
2042+
TIME_CREATED TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
2043+
EXPIRY_TIMESTAMP TIMESTAMP NOT NULL,
2044+
PRIMARY KEY (UUID))
2045+
/
2046+
2047+
CREATE TABLE IDN_APP_REVOKED_EVENT (
2048+
EVENT_ID VARCHAR(255) NOT NULL,
2049+
CONSUMER_KEY VARCHAR(255) NOT NULL,
2050+
TIME_REVOKED TIMESTAMP NOT NULL,
2051+
ORGANIZATION VARCHAR(100),
2052+
PRIMARY KEY (EVENT_ID),
2053+
CONSTRAINT CON_APP_EVT_KEY UNIQUE (CONSUMER_KEY, ORGANIZATION))
2054+
/
2055+
2056+
CREATE TABLE IDN_SUBJECT_ENTITY_REVOKED_EVENT (
2057+
EVENT_ID VARCHAR(255) NOT NULL,
2058+
ENTITY_ID VARCHAR(255) NOT NULL,
2059+
ENTITY_TYPE VARCHAR(100) NOT NULL,
2060+
TIME_REVOKED TIMESTAMP NOT NULL,
2061+
ORGANIZATION VARCHAR(100),
2062+
PRIMARY KEY (EVENT_ID),
2063+
CONSTRAINT CON_SUB_EVT_KEY UNIQUE (ENTITY_ID, ENTITY_TYPE, ORGANIZATION))
2064+
/
2065+
20382066
-- End of IDENTITY Tables--
20392067

20402068
-- Start of CONSENT-MGT Tables --

features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/h2.sql

+28
Original file line numberDiff line numberDiff line change
@@ -1273,6 +1273,34 @@ CREATE INDEX IDX_CORS_SP_APP_ID ON IDN_CORS_ASSOCIATION (SP_APP_ID);
12731273
-- IDN_CORS_ASSOCIATION --
12741274
CREATE INDEX IDX_CORS_ORIGIN_ID ON IDN_CORS_ASSOCIATION (IDN_CORS_ORIGIN_ID);
12751275

1276+
CREATE TABLE IF NOT EXISTS IDN_INVALID_TOKENS (
1277+
UUID VARCHAR(255) NOT NULL,
1278+
TOKEN_IDENTIFIER VARCHAR(2048) NOT NULL,
1279+
CONSUMER_KEY VARCHAR(255) NOT NULL,
1280+
TIME_CREATED TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
1281+
EXPIRY_TIMESTAMP TIMESTAMP NOT NULL,
1282+
PRIMARY KEY (UUID)
1283+
);
1284+
1285+
CREATE TABLE IF NOT EXISTS IDN_APP_REVOKED_EVENT (
1286+
EVENT_ID VARCHAR(255) NOT NULL,
1287+
CONSUMER_KEY VARCHAR(255) NOT NULL,
1288+
TIME_REVOKED TIMESTAMP NOT NULL,
1289+
ORGANIZATION VARCHAR(100),
1290+
PRIMARY KEY (EVENT_ID),
1291+
CONSTRAINT CON_APP_EVT_KEY UNIQUE (CONSUMER_KEY, ORGANIZATION)
1292+
);
1293+
1294+
CREATE TABLE IF NOT EXISTS IDN_SUBJECT_ENTITY_REVOKED_EVENT (
1295+
EVENT_ID VARCHAR(255) NOT NULL,
1296+
ENTITY_ID VARCHAR(255) NOT NULL,
1297+
ENTITY_TYPE VARCHAR(100) NOT NULL,
1298+
TIME_REVOKED TIMESTAMP NOT NULL,
1299+
ORGANIZATION VARCHAR(100),
1300+
PRIMARY KEY (EVENT_ID),
1301+
CONSTRAINT CON_SUB_EVT_KEY UNIQUE (ENTITY_ID, ENTITY_TYPE, ORGANIZATION)
1302+
);
1303+
12761304

12771305
-- Start of CONSENT-MGT Tables --
12781306

features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/mssql.sql

+31
Original file line numberDiff line numberDiff line change
@@ -1313,6 +1313,37 @@ CREATE TABLE SP_SHARED_APP(
13131313
UNIQUE (SHARED_APP_ID)
13141314
);
13151315

1316+
IF NOT EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDN_INVALID_TOKENS]') AND TYPE IN (N'U'))
1317+
CREATE TABLE IDN_INVALID_TOKENS (
1318+
UUID VARCHAR(255) NOT NULL,
1319+
TOKEN_IDENTIFIER VARCHAR(2048) NOT NULL,
1320+
CONSUMER_KEY VARCHAR(255) NOT NULL,
1321+
TIME_CREATED DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
1322+
EXPIRY_TIMESTAMP DATETIME NOT NULL,
1323+
PRIMARY KEY (UUID)
1324+
);
1325+
1326+
IF NOT EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDN_APP_REVOKED_EVENT]') AND TYPE IN (N'U'))
1327+
CREATE TABLE IDN_APP_REVOKED_EVENT (
1328+
EVENT_ID VARCHAR(255) NOT NULL,
1329+
CONSUMER_KEY VARCHAR(255) NOT NULL,
1330+
TIME_REVOKED DATETIME NOT NULL,
1331+
ORGANIZATION VARCHAR(100),
1332+
PRIMARY KEY (EVENT_ID),
1333+
CONSTRAINT CON_APP_EVT_KEY UNIQUE (CONSUMER_KEY, ORGANIZATION)
1334+
);
1335+
1336+
IF NOT EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDN_SUBJECT_ENTITY_REVOKED_EVENT]') AND TYPE IN (N'U'))
1337+
CREATE TABLE IDN_SUBJECT_ENTITY_REVOKED_EVENT (
1338+
EVENT_ID VARCHAR(255) NOT NULL,
1339+
ENTITY_ID VARCHAR(255) NOT NULL,
1340+
ENTITY_TYPE VARCHAR(100) NOT NULL,
1341+
TIME_REVOKED DATETIME NOT NULL,
1342+
ORGANIZATION VARCHAR(100),
1343+
PRIMARY KEY (EVENT_ID),
1344+
CONSTRAINT CON_SUB_EVT_KEY UNIQUE (ENTITY_ID, ENTITY_TYPE, ORGANIZATION)
1345+
);
1346+
13161347
-- --------------------------- INDEX CREATION -----------------------------
13171348
-- IDN_OAUTH2_ACCESS_TOKEN --
13181349
CREATE INDEX IDX_TC ON IDN_OAUTH2_ACCESS_TOKEN(TIME_CREATED);

features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/mysql.sql

+28
Original file line numberDiff line numberDiff line change
@@ -1205,6 +1205,34 @@ CREATE TABLE IF NOT EXISTS SP_SHARED_APP (
12051205
UNIQUE (SHARED_APP_ID)
12061206
)ENGINE INNODB;
12071207

1208+
CREATE TABLE IF NOT EXISTS IDN_INVALID_TOKENS (
1209+
UUID VARCHAR(255) NOT NULL,
1210+
TOKEN_IDENTIFIER VARCHAR(2048) NOT NULL,
1211+
CONSUMER_KEY VARCHAR(255) NOT NULL,
1212+
TIME_CREATED TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
1213+
EXPIRY_TIMESTAMP TIMESTAMP NOT NULL,
1214+
PRIMARY KEY (UUID)
1215+
)ENGINE=InnoDB;
1216+
1217+
CREATE TABLE IF NOT EXISTS IDN_APP_REVOKED_EVENT (
1218+
EVENT_ID VARCHAR(255) NOT NULL,
1219+
CONSUMER_KEY VARCHAR(255) NOT NULL,
1220+
TIME_REVOKED TIMESTAMP NOT NULL,
1221+
ORGANIZATION VARCHAR(100),
1222+
PRIMARY KEY (EVENT_ID),
1223+
CONSTRAINT CON_APP_EVT_KEY UNIQUE (CONSUMER_KEY, ORGANIZATION)
1224+
)ENGINE=InnoDB;
1225+
1226+
CREATE TABLE IF NOT EXISTS IDN_SUBJECT_ENTITY_REVOKED_EVENT (
1227+
EVENT_ID VARCHAR(255) NOT NULL,
1228+
ENTITY_ID VARCHAR(255) NOT NULL,
1229+
ENTITY_TYPE VARCHAR(100) NOT NULL,
1230+
TIME_REVOKED TIMESTAMP NOT NULL,
1231+
ORGANIZATION VARCHAR(100),
1232+
PRIMARY KEY (EVENT_ID),
1233+
CONSTRAINT CON_SUB_EVT_KEY UNIQUE (ENTITY_ID, ENTITY_TYPE, ORGANIZATION)
1234+
)ENGINE=InnoDB;
1235+
12081236
-- --------------------------- INDEX CREATION -----------------------------
12091237
-- IDN_OAUTH2_ACCESS_TOKEN --
12101238
CREATE INDEX IDX_TC ON IDN_OAUTH2_ACCESS_TOKEN(TIME_CREATED);

features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/mysql_cluster.sql

+28
Original file line numberDiff line numberDiff line change
@@ -1351,6 +1351,34 @@ CREATE TABLE IF NOT EXISTS SP_SHARED_APP (
13511351
UNIQUE (SHARED_APP_ID)
13521352
)ENGINE NDB;
13531353

1354+
CREATE TABLE IF NOT EXISTS IDN_INVALID_TOKENS (
1355+
UUID VARCHAR(255) NOT NULL,
1356+
TOKEN_IDENTIFIER VARCHAR(2048) NOT NULL,
1357+
CONSUMER_KEY VARCHAR(255) NOT NULL,
1358+
TIME_CREATED TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
1359+
EXPIRY_TIMESTAMP TIMESTAMP NOT NULL,
1360+
PRIMARY KEY (UUID)
1361+
)ENGINE NDB;
1362+
1363+
CREATE TABLE IF NOT EXISTS IDN_APP_REVOKED_EVENT (
1364+
EVENT_ID VARCHAR(255) NOT NULL,
1365+
CONSUMER_KEY VARCHAR(255) NOT NULL,
1366+
TIME_REVOKED TIMESTAMP NOT NULL,
1367+
ORGANIZATION VARCHAR(100),
1368+
PRIMARY KEY (EVENT_ID),
1369+
CONSTRAINT CON_APP_EVT_KEY UNIQUE (CONSUMER_KEY, ORGANIZATION)
1370+
)ENGINE NDB;
1371+
1372+
CREATE TABLE IF NOT EXISTS IDN_SUBJECT_ENTITY_REVOKED_EVENT (
1373+
EVENT_ID VARCHAR(255) NOT NULL,
1374+
ENTITY_ID VARCHAR(255) NOT NULL,
1375+
ENTITY_TYPE VARCHAR(100) NOT NULL,
1376+
TIME_REVOKED TIMESTAMP NOT NULL,
1377+
ORGANIZATION VARCHAR(100),
1378+
PRIMARY KEY (EVENT_ID),
1379+
CONSTRAINT CON_SUB_EVT_KEY UNIQUE (ENTITY_ID, ENTITY_TYPE, ORGANIZATION)
1380+
)ENGINE NDB;
1381+
13541382
-- --------------------------- INDEX CREATION -----------------------------
13551383
-- IDN_OAUTH2_ACCESS_TOKEN --
13561384
CREATE INDEX IDX_TC

features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/oracle.sql

+31
Original file line numberDiff line numberDiff line change
@@ -1816,6 +1816,37 @@ CREATE OR REPLACE TRIGGER SP_SHARED_APP_TRIG
18161816
END;
18171817
/
18181818

1819+
CREATE TABLE IDN_INVALID_TOKENS (
1820+
UUID VARCHAR(255) NOT NULL,
1821+
TOKEN_IDENTIFIER VARCHAR(2048) NOT NULL,
1822+
CONSUMER_KEY VARCHAR(255) NOT NULL,
1823+
TIME_CREATED TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
1824+
EXPIRY_TIMESTAMP TIMESTAMP NOT NULL,
1825+
PRIMARY KEY (UUID)
1826+
)
1827+
/
1828+
1829+
CREATE TABLE IDN_APP_REVOKED_EVENT (
1830+
EVENT_ID VARCHAR(255) NOT NULL,
1831+
CONSUMER_KEY VARCHAR(255) NOT NULL,
1832+
TIME_REVOKED TIMESTAMP NOT NULL,
1833+
ORGANIZATION VARCHAR(100),
1834+
PRIMARY KEY (EVENT_ID),
1835+
CONSTRAINT CON_APP_EVT_KEY UNIQUE (CONSUMER_KEY, ORGANIZATION)
1836+
)
1837+
/
1838+
1839+
CREATE TABLE IDN_SUBJECT_ENTITY_REVOKED_EVENT (
1840+
EVENT_ID VARCHAR(255) NOT NULL,
1841+
ENTITY_ID VARCHAR(255) NOT NULL,
1842+
ENTITY_TYPE VARCHAR(100) NOT NULL,
1843+
TIME_REVOKED TIMESTAMP NOT NULL,
1844+
ORGANIZATION VARCHAR(100),
1845+
PRIMARY KEY (EVENT_ID),
1846+
CONSTRAINT CON_SUB_EVT_KEY UNIQUE (ENTITY_ID, ENTITY_TYPE, ORGANIZATION)
1847+
)
1848+
/
1849+
18191850
-- --------------------------- INDEX CREATION -----------------------------
18201851
-- IDN_OAUTH2_ACCESS_TOKEN --
18211852
CREATE INDEX IDX_TC ON IDN_OAUTH2_ACCESS_TOKEN(TIME_CREATED)

features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/oracle_rac.sql

+31
Original file line numberDiff line numberDiff line change
@@ -1806,6 +1806,37 @@ CREATE OR REPLACE TRIGGER SP_SHARED_APP_TRIG
18061806
END;
18071807
/
18081808

1809+
CREATE TABLE IDN_INVALID_TOKENS (
1810+
UUID VARCHAR(255) NOT NULL,
1811+
TOKEN_IDENTIFIER VARCHAR(2048) NOT NULL,
1812+
CONSUMER_KEY VARCHAR(255) NOT NULL,
1813+
TIME_CREATED TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
1814+
EXPIRY_TIMESTAMP TIMESTAMP NOT NULL,
1815+
PRIMARY KEY (UUID)
1816+
)
1817+
/
1818+
1819+
CREATE TABLE IDN_APP_REVOKED_EVENT (
1820+
EVENT_ID VARCHAR(255) NOT NULL,
1821+
CONSUMER_KEY VARCHAR(255) NOT NULL,
1822+
TIME_REVOKED TIMESTAMP NOT NULL,
1823+
ORGANIZATION VARCHAR(100),
1824+
PRIMARY KEY (EVENT_ID),
1825+
CONSTRAINT CON_APP_EVT_KEY UNIQUE (CONSUMER_KEY, ORGANIZATION)
1826+
)
1827+
/
1828+
1829+
CREATE TABLE IDN_SUBJECT_ENTITY_REVOKED_EVENT (
1830+
EVENT_ID VARCHAR(255) NOT NULL,
1831+
ENTITY_ID VARCHAR(255) NOT NULL,
1832+
ENTITY_TYPE VARCHAR(100) NOT NULL,
1833+
TIME_REVOKED TIMESTAMP NOT NULL,
1834+
ORGANIZATION VARCHAR(100),
1835+
PRIMARY KEY (EVENT_ID),
1836+
CONSTRAINT CON_SUB_EVT_KEY UNIQUE (ENTITY_ID, ENTITY_TYPE, ORGANIZATION)
1837+
)
1838+
/
1839+
18091840
-- --------------------------- INDEX CREATION -----------------------------
18101841
-- IDN_OAUTH2_ACCESS_TOKEN --
18111842
CREATE INDEX IDX_TC ON IDN_OAUTH2_ACCESS_TOKEN(TIME_CREATED)

features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/postgresql.sql

+31
Original file line numberDiff line numberDiff line change
@@ -1407,6 +1407,37 @@ CREATE TABLE SP_SHARED_APP(
14071407
UNIQUE (SHARED_APP_ID)
14081408
);
14091409

1410+
DROP TABLE IF EXISTS IDN_INVALID_TOKENS;
1411+
CREATE TABLE IDN_INVALID_TOKENS (
1412+
UUID VARCHAR(255) NOT NULL,
1413+
TOKEN_IDENTIFIER VARCHAR(2048) NOT NULL,
1414+
CONSUMER_KEY VARCHAR(255) NOT NULL,
1415+
TIME_CREATED TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
1416+
EXPIRY_TIMESTAMP TIMESTAMP NOT NULL,
1417+
PRIMARY KEY (UUID)
1418+
);
1419+
1420+
DROP TABLE IF EXISTS IDN_APP_REVOKED_EVENT;
1421+
CREATE TABLE IDN_APP_REVOKED_EVENT (
1422+
EVENT_ID VARCHAR(255) NOT NULL,
1423+
CONSUMER_KEY VARCHAR(255) NOT NULL,
1424+
TIME_REVOKED TIMESTAMP NOT NULL,
1425+
ORGANIZATION VARCHAR(100),
1426+
PRIMARY KEY (EVENT_ID),
1427+
CONSTRAINT CON_APP_EVT_KEY UNIQUE (CONSUMER_KEY, ORGANIZATION)
1428+
);
1429+
1430+
DROP TABLE IF EXISTS IDN_SUBJECT_ENTITY_REVOKED_EVENT;
1431+
CREATE TABLE IDN_SUBJECT_ENTITY_REVOKED_EVENT (
1432+
EVENT_ID VARCHAR(255) NOT NULL,
1433+
ENTITY_ID VARCHAR(255) NOT NULL,
1434+
ENTITY_TYPE VARCHAR(100) NOT NULL,
1435+
TIME_REVOKED TIMESTAMP NOT NULL,
1436+
ORGANIZATION VARCHAR(100),
1437+
PRIMARY KEY (EVENT_ID),
1438+
CONSTRAINT CON_SUB_EVT_KEY UNIQUE (ENTITY_ID, ENTITY_TYPE, ORGANIZATION)
1439+
);
1440+
14101441
-- --------------------------- INDEX CREATION -----------------------------
14111442
-- IDN_OAUTH2_ACCESS_TOKEN --
14121443
CREATE INDEX IDX_TC ON IDN_OAUTH2_ACCESS_TOKEN(TIME_CREATED);

0 commit comments

Comments
 (0)