diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index a1a2cc9d..cff36ccb 100644 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -624,7 +624,7 @@ ${pom.artifactId}-${pom.version}/repository/conf - **/** + **/broker.xml 644 @@ -915,6 +915,7 @@ ${pom.artifactId}-${pom.version}/repository/conf 644 + src/repository/conf/broker.xml ${pom.artifactId}-${pom.version}/repository/conf @@ -1371,6 +1372,14 @@ true 644 + + + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/websocket-validation.properties + + ${pom.artifactId}-${pom.version}/repository/conf/etc + true + 644 + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/device-analytics-config.xml diff --git a/modules/distribution/src/repository/conf/identity/identity.xml b/modules/distribution/src/repository/conf/identity/identity.xml index 6d4288b1..b88ce8ca 100644 --- a/modules/distribution/src/repository/conf/identity/identity.xml +++ b/modules/distribution/src/repository/conf/identity/identity.xml @@ -148,11 +148,11 @@ iwa:ntlm org.wso2.carbon.identity.oauth2.token.handlers.grant.iwa.ntlm.NTLMAuthenticationGrantHandler - - - - - + + urn:ietf:params:oauth:grant-type:jwt-bearer + org.wso2.carbon.identity.oauth2.grant.jwt.JWTBearerGrantHandler + org.wso2.carbon.identity.oauth2.grant.jwt.JWTGrantValidator + diff --git a/modules/distribution/src/repository/resources/dbscripts/apimgt/h2-sample-data.sql b/modules/distribution/src/repository/resources/dbscripts/apimgt/h2-sample-data.sql index 2e83b858..2b96659e 100644 --- a/modules/distribution/src/repository/resources/dbscripts/apimgt/h2-sample-data.sql +++ b/modules/distribution/src/repository/resources/dbscripts/apimgt/h2-sample-data.sql @@ -18,25 +18,25 @@ INSERT INTO AM_SUBSCRIBER ( USER_ID , TENANT_ID , EMAIL_ADDRESS , DATE_SUBSCRIBE INSERT INTO AM_SUBSCRIBER ( USER_ID , TENANT_ID , EMAIL_ADDRESS , DATE_SUBSCRIBED ) VALUES ('UDAYANGA',-1234,'UDAYANGA@WSO2.COM','2012-03-05 12:10:11'); -INSERT INTO AM_APPLICATION (NAME,SUBSCRIBER_ID ) VALUES ('APPLICATION1',1); -INSERT INTO AM_APPLICATION (NAME,SUBSCRIBER_ID ) VALUES ('APPLICATION2',1); -INSERT INTO AM_APPLICATION (NAME,SUBSCRIBER_ID ) VALUES ('APPLICATION3',2); -INSERT INTO AM_APPLICATION (NAME,SUBSCRIBER_ID ) VALUES ('APPLICATION4',2); -INSERT INTO AM_APPLICATION (NAME,SUBSCRIBER_ID ) VALUES ('APPLICATION5',3); -INSERT INTO AM_APPLICATION (NAME,SUBSCRIBER_ID ) VALUES ('DeliciousApp',4); +INSERT INTO AM_APPLICATION (NAME,SUBSCRIBER_ID,UUID ) VALUES ('APPLICATION1',1,'97e5871a-cee9-4c1e-a138-9c3a9038125a'); +INSERT INTO AM_APPLICATION (NAME,SUBSCRIBER_ID,UUID ) VALUES ('APPLICATION2',1,'98841b88-75d9-4ed1-bf2d-bdf7edb837c5'); +INSERT INTO AM_APPLICATION (NAME,SUBSCRIBER_ID,UUID ) VALUES ('APPLICATION3',2,'4d43fe13-366e-455b-8f4e-88ee22015719'); +INSERT INTO AM_APPLICATION (NAME,SUBSCRIBER_ID,UUID ) VALUES ('APPLICATION4',2,'0a43614b-12f5-494d-bb79-edb22fe3360a'); +INSERT INTO AM_APPLICATION (NAME,SUBSCRIBER_ID,UUID ) VALUES ('APPLICATION5',3,'ea069058-6388-40e2-bfec-39365f5333d2'); +INSERT INTO AM_APPLICATION (NAME,SUBSCRIBER_ID,UUID ) VALUES ('DeliciousApp',4,'3f3e4aac-4692-4eea-a31e-7c80ee0454a8'); INSERT INTO AM_API (API_PROVIDER,API_NAME,API_VERSION,CONTEXT) VALUES ('SUMEDHA', 'API1', 'V1.0.0','/context1'); INSERT INTO AM_API (API_PROVIDER,API_NAME,API_VERSION,CONTEXT) VALUES ('PRABATH', 'API2', 'V1.0.0','/deli2'); INSERT INTO AM_API (API_PROVIDER,API_NAME,API_VERSION,CONTEXT) VALUES ('ADMIN', 'API3', 'V1.0.0','/test'); INSERT INTO AM_API (API_PROVIDER,API_NAME,API_VERSION,CONTEXT) VALUES ('DEL', 'Delicious', '1.0.0','/deli'); -INSERT INTO AM_SUBSCRIPTION ( TIER_ID , API_ID , APPLICATION_ID , LAST_ACCESSED ) VALUES ('T1',500,100,'2012-03-05 12:10:11'); -INSERT INTO AM_SUBSCRIPTION ( TIER_ID , API_ID , APPLICATION_ID , LAST_ACCESSED ) VALUES ('T1',501,101,'2012-03-05 12:10:11'); -INSERT INTO AM_SUBSCRIPTION ( TIER_ID , API_ID , APPLICATION_ID , LAST_ACCESSED ) VALUES ('T1',500,102,'2012-03-05 12:10:11'); -INSERT INTO AM_SUBSCRIPTION ( TIER_ID , API_ID , APPLICATION_ID , LAST_ACCESSED ) VALUES ('T1',502,103,'2012-03-05 12:10:11'); -INSERT INTO AM_SUBSCRIPTION ( TIER_ID , API_ID , APPLICATION_ID , LAST_ACCESSED ) VALUES ('T1',501,104,'2012-03-05 12:10:11'); -INSERT INTO AM_SUBSCRIPTION ( TIER_ID , API_ID , APPLICATION_ID , LAST_ACCESSED ) VALUES ('T1',503,105,'2012-03-05 12:10:11'); -INSERT INTO AM_SUBSCRIPTION ( TIER_ID , API_ID , APPLICATION_ID , LAST_ACCESSED ) VALUES ('T1',501,102,'2012-03-05 12:10:11'); +INSERT INTO AM_SUBSCRIPTION ( TIER_ID , API_ID , APPLICATION_ID , LAST_ACCESSED , UUID) VALUES ('T1',500,100,'2012-03-05 12:10:11','7af95c9d-6177-4101-ab3e-d3f6c1cdc4c2'); +INSERT INTO AM_SUBSCRIPTION ( TIER_ID , API_ID , APPLICATION_ID , LAST_ACCESSED , UUID) VALUES ('T1',501,101,'2012-03-05 12:10:11','696430b1-c564-4d82-8ea9-ea1a61db0a60'); +INSERT INTO AM_SUBSCRIPTION ( TIER_ID , API_ID , APPLICATION_ID , LAST_ACCESSED , UUID) VALUES ('T1',500,102,'2012-03-05 12:10:11','2cb4a9c0-7f9d-41fe-bea2-2dc7b9073188'); +INSERT INTO AM_SUBSCRIPTION ( TIER_ID , API_ID , APPLICATION_ID , LAST_ACCESSED , UUID) VALUES ('T1',502,103,'2012-03-05 12:10:11','95556f88-b5ed-41fc-ac83-dc8d4cd6ccae'); +INSERT INTO AM_SUBSCRIPTION ( TIER_ID , API_ID , APPLICATION_ID , LAST_ACCESSED , UUID) VALUES ('T1',501,104,'2012-03-05 12:10:11','f36e661b-6eef-4af2-9927-7d220993aff2'); +INSERT INTO AM_SUBSCRIPTION ( TIER_ID , API_ID , APPLICATION_ID , LAST_ACCESSED , UUID) VALUES ('T1',503,105,'2012-03-05 12:10:11','443afa79-848a-4be6-8fbe-c6d73ed06ced'); +INSERT INTO AM_SUBSCRIPTION ( TIER_ID , API_ID , APPLICATION_ID , LAST_ACCESSED , UUID) VALUES ('T1',501,102,'2012-03-05 12:10:11','821b9664-eeca-4173-9f56-3dc6d46bd6eb'); INSERT INTO AM_SUBSCRIPTION_KEY_MAPPING (SUBSCRIPTION_ID, ACCESS_TOKEN, KEY_TYPE) VALUES (1000, 'SSDCHEJJ-AWUIS-232', 'PRODUCTION'); INSERT INTO AM_SUBSCRIPTION_KEY_MAPPING (SUBSCRIPTION_ID, ACCESS_TOKEN, KEY_TYPE) VALUES (1001, 'a1b2c3d4', 'SANDBOX'); @@ -50,12 +50,18 @@ INSERT INTO IDN_OAUTH_CONSUMER_APPS ( APP_NAME , CALLBACK_URL , CONSUMER_KEY , C INSERT INTO IDN_OAUTH_CONSUMER_APPS ( APP_NAME , CALLBACK_URL , CONSUMER_KEY , CONSUMER_SECRET ,OAUTH_VERSION , TENANT_ID , USERNAME ) VALUES (NULL,NULL,'CON2','MY PEN','2.0',0,'PRABATH'); INSERT INTO IDN_OAUTH_CONSUMER_APPS ( APP_NAME , CALLBACK_URL , CONSUMER_KEY , CONSUMER_SECRET ,OAUTH_VERSION , TENANT_ID , USERNAME ) VALUES (NULL,NULL,'CON3','MY PEN','2.0',0,'admin'); -INSERT INTO IDN_OAUTH2_ACCESS_TOKEN ( ACCESS_TOKEN ,AUTHZ_USER , USER_TYPE , CONSUMER_KEY , REFRESH_TOKEN ,TIME_CREATED , TOKEN_SCOPE , TOKEN_STATE ,VALIDITY_PERIOD ) VALUES ('a1b2c3d4','UDAYANGA','DEVELOPER','CON1',NULL,'2012-01-01','SANDBOX','ACTIVE',1343714931875); -INSERT INTO IDN_OAUTH2_ACCESS_TOKEN ( ACCESS_TOKEN ,AUTHZ_USER , USER_TYPE , CONSUMER_KEY , REFRESH_TOKEN ,TIME_CREATED , TOKEN_SCOPE , TOKEN_STATE ,VALIDITY_PERIOD ) VALUES ('p1q2r3s4','UDAYANGA','DEVELOPER','CON1',NULL,'2012-01-01','PRODUCTION','ACTIVE',1343714931875); -INSERT INTO IDN_OAUTH2_ACCESS_TOKEN ( ACCESS_TOKEN ,AUTHZ_USER , USER_TYPE , CONSUMER_KEY , REFRESH_TOKEN ,TIME_CREATED , TOKEN_SCOPE , TOKEN_STATE ,VALIDITY_PERIOD ) VALUES ('test1','UDAYANGA','DEVELOPER','CON1',NULL,'2012-01-01','PRODUCTION','ACTIVE',1343714931875); -INSERT INTO IDN_OAUTH2_ACCESS_TOKEN ( ACCESS_TOKEN ,AUTHZ_USER , USER_TYPE , CONSUMER_KEY , REFRESH_TOKEN ,TIME_CREATED , TOKEN_SCOPE , TOKEN_STATE ,VALIDITY_PERIOD ) VALUES ('test2','UDAYANGA','DEVELOPER','CON2',NULL,'2012-01-01','SANDBOX','ACTIVE',1343714931875); -INSERT INTO IDN_OAUTH2_ACCESS_TOKEN ( ACCESS_TOKEN ,AUTHZ_USER , USER_TYPE , CONSUMER_KEY , REFRESH_TOKEN ,TIME_CREATED , TOKEN_SCOPE , TOKEN_STATE ,VALIDITY_PERIOD ) VALUES ('test3','UDAYANGA','DEVELOPER','CON3',NULL,'2012-01-01','PRODUCTION','ACTIVE',3600); +INSERT INTO IDN_OAUTH2_ACCESS_TOKEN ( TOKEN_ID, ACCESS_TOKEN ,AUTHZ_USER , USER_TYPE , CONSUMER_KEY , REFRESH_TOKEN ,TIME_CREATED , TOKEN_SCOPE_HASH , TOKEN_STATE ,VALIDITY_PERIOD ) VALUES ('TI1','a1b2c3d4','UDAYANGA','DEVELOPER','CON1',NULL,'2012-01-01','SANDBOXHASH','ACTIVE',1343714931875); +INSERT INTO IDN_OAUTH2_ACCESS_TOKEN ( TOKEN_ID, ACCESS_TOKEN ,AUTHZ_USER , USER_TYPE , CONSUMER_KEY , REFRESH_TOKEN ,TIME_CREATED , TOKEN_SCOPE_HASH , TOKEN_STATE ,VALIDITY_PERIOD ) VALUES ('TI2','p1q2r3s4','UDAYANGA','DEVELOPER','CON1',NULL,'2012-01-01','PRODUCTIONHASH','ACTIVE',1343714931875); +INSERT INTO IDN_OAUTH2_ACCESS_TOKEN ( TOKEN_ID, ACCESS_TOKEN ,AUTHZ_USER , USER_TYPE , CONSUMER_KEY , REFRESH_TOKEN ,TIME_CREATED , TOKEN_SCOPE_HASH , TOKEN_STATE ,VALIDITY_PERIOD ) VALUES ('TI3','test1','UDAYANGA','DEVELOPER','CON1',NULL,'2012-01-01','PRODUCTIONHASH','ACTIVE',1343714931875); +INSERT INTO IDN_OAUTH2_ACCESS_TOKEN ( TOKEN_ID, ACCESS_TOKEN ,AUTHZ_USER , USER_TYPE , CONSUMER_KEY , REFRESH_TOKEN ,TIME_CREATED , TOKEN_SCOPE_HASH , TOKEN_STATE ,VALIDITY_PERIOD ) VALUES ('TI4','test2','UDAYANGA','DEVELOPER','CON2',NULL,'2012-01-01','SANDBOXHASH','ACTIVE',1343714931875); +INSERT INTO IDN_OAUTH2_ACCESS_TOKEN ( TOKEN_ID, ACCESS_TOKEN ,AUTHZ_USER , USER_TYPE , CONSUMER_KEY , REFRESH_TOKEN ,TIME_CREATED , TOKEN_SCOPE_HASH , TOKEN_STATE ,VALIDITY_PERIOD ) VALUES ('TI5','test3','UDAYANGA','DEVELOPER','CON3',NULL,'2012-01-01','PRODUCTIONHASH','ACTIVE',3600); + +INSERT INTO IDN_OAUTH2_SCOPE_ASSOCIATION (TOKEN_ID, TOKEN_SCOPE ) VALUES ('TI1','SANDBOX') +INSERT INTO IDN_OAUTH2_SCOPE_ASSOCIATION (TOKEN_ID, TOKEN_SCOPE ) VALUES ('TI2','PRODUCTION') +INSERT INTO IDN_OAUTH2_SCOPE_ASSOCIATION (TOKEN_ID, TOKEN_SCOPE ) VALUES ('TI3','PRODUCTION') +INSERT INTO IDN_OAUTH2_SCOPE_ASSOCIATION (TOKEN_ID, TOKEN_SCOPE ) VALUES ('TI4','SANDBOX') +INSERT INTO IDN_OAUTH2_SCOPE_ASSOCIATION (TOKEN_ID, TOKEN_SCOPE ) VALUES ('TI5','PRODUCTION') SELECT * FROM AM_SUBSCRIBER; SELECT * FROM AM_APPLICATION; -SELECT * FROM AM_SUBSCRIPTION; +SELECT * FROM AM_SUBSCRIPTION; \ No newline at end of file diff --git a/modules/distribution/src/repository/resources/dbscripts/apimgt/h2.sql b/modules/distribution/src/repository/resources/dbscripts/apimgt/h2.sql index 9eddb20a..5e0695be 100644 --- a/modules/distribution/src/repository/resources/dbscripts/apimgt/h2.sql +++ b/modules/distribution/src/repository/resources/dbscripts/apimgt/h2.sql @@ -64,7 +64,7 @@ CREATE TABLE IF NOT EXISTS IDN_OAUTH2_ACCESS_TOKEN ( TOKEN_STATE VARCHAR (25) DEFAULT 'ACTIVE', TOKEN_STATE_ID VARCHAR (128) DEFAULT 'NONE', SUBJECT_IDENTIFIER VARCHAR(255), - PRIMARY KEY (TOKEN_ID), + PRIMARY KEY (TOKEN_ID), FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE, CONSTRAINT CON_APP_KEY UNIQUE (CONSUMER_KEY_ID,AUTHZ_USER,TENANT_ID,USER_DOMAIN,USER_TYPE,TOKEN_SCOPE_HASH, TOKEN_STATE,TOKEN_STATE_ID) @@ -87,6 +87,7 @@ CREATE TABLE IF NOT EXISTS IDN_OAUTH2_AUTHORIZATION_CODE ( VALIDITY_PERIOD BIGINT, STATE VARCHAR (25) DEFAULT 'ACTIVE', TOKEN_ID VARCHAR(255), + SUBJECT_IDENTIFIER VARCHAR(255), PRIMARY KEY (CODE_ID), FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE ); @@ -492,7 +493,7 @@ CREATE TABLE IF NOT EXISTS FIDO_DEVICE_STORE ( KEY_HANDLE VARCHAR(200) NOT NULL, DEVICE_DATA LONGVARCHAR NOT NULL, PRIMARY KEY (TENANT_ID, DOMAIN_NAME, USER_NAME, KEY_HANDLE)); - + CREATE TABLE IF NOT EXISTS WF_REQUEST ( UUID VARCHAR (45), CREATED_BY VARCHAR (255), @@ -766,14 +767,14 @@ CREATE TABLE IF NOT EXISTS AM_API_SCOPES ( ); CREATE TABLE IF NOT EXISTS AM_API_DEFAULT_VERSION ( - DEFAULT_VERSION_ID INT AUTO_INCREMENT, + DEFAULT_VERSION_ID INT AUTO_INCREMENT, API_NAME VARCHAR(256) NOT NULL , - API_PROVIDER VARCHAR(256) NOT NULL , - DEFAULT_API_VERSION VARCHAR(30) , + API_PROVIDER VARCHAR(256) NOT NULL , + DEFAULT_API_VERSION VARCHAR(30) , PUBLISHED_DEFAULT_API_VERSION VARCHAR(30) , PRIMARY KEY (DEFAULT_VERSION_ID) ); CREATE INDEX IDX_SUB_APP_ID ON AM_SUBSCRIPTION (APPLICATION_ID, SUBSCRIPTION_ID); --- End of API-MGT Tables -- +-- End of API-MGT Tables -- \ No newline at end of file diff --git a/modules/distribution/src/repository/resources/dbscripts/apimgt/mssql.sql b/modules/distribution/src/repository/resources/dbscripts/apimgt/mssql.sql index 9703cbe6..fff85c55 100644 --- a/modules/distribution/src/repository/resources/dbscripts/apimgt/mssql.sql +++ b/modules/distribution/src/repository/resources/dbscripts/apimgt/mssql.sql @@ -68,7 +68,7 @@ CREATE TABLE IDN_OAUTH2_ACCESS_TOKEN ( TOKEN_SCOPE_HASH VARCHAR(32), TOKEN_STATE VARCHAR(25) DEFAULT 'ACTIVE', TOKEN_STATE_ID VARCHAR (128) DEFAULT 'NONE', - SUBJECT_IDENTIFIER VARCHAR(255), + SUBJECT_IDENTIFIER VARCHAR(255), PRIMARY KEY (TOKEN_ID), FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE, CONSTRAINT CON_APP_KEY UNIQUE (CONSUMER_KEY_ID,AUTHZ_USER,TENANT_ID,USER_DOMAIN,USER_TYPE,TOKEN_SCOPE_HASH, @@ -96,6 +96,7 @@ CREATE TABLE IDN_OAUTH2_AUTHORIZATION_CODE ( VALIDITY_PERIOD BIGINT, STATE VARCHAR (25) DEFAULT 'ACTIVE', TOKEN_ID VARCHAR(255), + SUBJECT_IDENTIFIER VARCHAR(255), PRIMARY KEY (CODE_ID), FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE ); @@ -537,7 +538,7 @@ CREATE TABLE FIDO_DEVICE_STORE ( KEY_HANDLE VARCHAR(200) NOT NULL, DEVICE_DATA VARCHAR(2048) NOT NULL, PRIMARY KEY (TENANT_ID, DOMAIN_NAME, USER_NAME, KEY_HANDLE)); - + IF NOT EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[WF_REQUEST]') AND TYPE IN (N'U')) CREATE TABLE WF_REQUEST ( UUID VARCHAR (45), @@ -855,13 +856,13 @@ CREATE TABLE AM_API_SCOPES ( IF NOT EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[AM_API_DEFAULT_VERSION]') AND TYPE IN (N'U')) CREATE TABLE AM_API_DEFAULT_VERSION ( - DEFAULT_VERSION_ID INTEGER NOT NULL IDENTITY, + DEFAULT_VERSION_ID INTEGER NOT NULL IDENTITY, API_NAME VARCHAR(256) NOT NULL , - API_PROVIDER VARCHAR(256) NOT NULL , - DEFAULT_API_VERSION VARCHAR(30) , + API_PROVIDER VARCHAR(256) NOT NULL , + DEFAULT_API_VERSION VARCHAR(30) , PUBLISHED_DEFAULT_API_VERSION VARCHAR(30) , PRIMARY KEY (DEFAULT_VERSION_ID) ); -CREATE INDEX IDX_SUB_APP_ID ON AM_SUBSCRIPTION (APPLICATION_ID, SUBSCRIPTION_ID); +CREATE INDEX IDX_SUB_APP_ID ON AM_SUBSCRIPTION (APPLICATION_ID, SUBSCRIPTION_ID); \ No newline at end of file diff --git a/modules/distribution/src/repository/resources/dbscripts/apimgt/mysql.sql b/modules/distribution/src/repository/resources/dbscripts/apimgt/mysql.sql index 69386779..72362b84 100644 --- a/modules/distribution/src/repository/resources/dbscripts/apimgt/mysql.sql +++ b/modules/distribution/src/repository/resources/dbscripts/apimgt/mysql.sql @@ -65,7 +65,7 @@ CREATE TABLE IF NOT EXISTS IDN_OAUTH2_ACCESS_TOKEN ( TOKEN_STATE VARCHAR(25) DEFAULT 'ACTIVE', TOKEN_STATE_ID VARCHAR (128) DEFAULT 'NONE', SUBJECT_IDENTIFIER VARCHAR(255), - PRIMARY KEY (TOKEN_ID), + PRIMARY KEY (TOKEN_ID), FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE, CONSTRAINT CON_APP_KEY UNIQUE (CONSUMER_KEY_ID,AUTHZ_USER,TENANT_ID,USER_DOMAIN,USER_TYPE,TOKEN_SCOPE_HASH, TOKEN_STATE,TOKEN_STATE_ID) @@ -88,6 +88,7 @@ CREATE TABLE IF NOT EXISTS IDN_OAUTH2_AUTHORIZATION_CODE ( VALIDITY_PERIOD BIGINT, STATE VARCHAR (25) DEFAULT 'ACTIVE', TOKEN_ID VARCHAR(255), + SUBJECT_IDENTIFIER VARCHAR(255), PRIMARY KEY (CODE_ID), FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE )ENGINE INNODB; @@ -516,7 +517,7 @@ CREATE TABLE IF NOT EXISTS FIDO_DEVICE_STORE ( DEVICE_DATA VARCHAR(2048) NOT NULL, PRIMARY KEY (TENANT_ID, DOMAIN_NAME, USER_NAME, KEY_HANDLE) )ENGINE INNODB; - + CREATE TABLE IF NOT EXISTS WF_REQUEST ( UUID VARCHAR (45), CREATED_BY VARCHAR (255), @@ -793,12 +794,12 @@ CREATE TABLE IF NOT EXISTS AM_API_SCOPES ( )ENGINE = INNODB; CREATE TABLE IF NOT EXISTS AM_API_DEFAULT_VERSION ( - DEFAULT_VERSION_ID INT AUTO_INCREMENT, + DEFAULT_VERSION_ID INT AUTO_INCREMENT, API_NAME VARCHAR(256) NOT NULL , - API_PROVIDER VARCHAR(256) NOT NULL , - DEFAULT_API_VERSION VARCHAR(30) , + API_PROVIDER VARCHAR(256) NOT NULL , + DEFAULT_API_VERSION VARCHAR(30) , PUBLISHED_DEFAULT_API_VERSION VARCHAR(30) , PRIMARY KEY (DEFAULT_VERSION_ID) ); -CREATE INDEX IDX_SUB_APP_ID ON AM_SUBSCRIPTION (APPLICATION_ID, SUBSCRIPTION_ID); +CREATE INDEX IDX_SUB_APP_ID ON AM_SUBSCRIPTION (APPLICATION_ID, SUBSCRIPTION_ID); \ No newline at end of file diff --git a/modules/distribution/src/repository/resources/dbscripts/apimgt/oracle.sql b/modules/distribution/src/repository/resources/dbscripts/apimgt/oracle.sql index 7c272d10..10137dd9 100644 --- a/modules/distribution/src/repository/resources/dbscripts/apimgt/oracle.sql +++ b/modules/distribution/src/repository/resources/dbscripts/apimgt/oracle.sql @@ -1,7 +1,7 @@ -- Create Oracle New User and Connect -------------------------------------- --- CREATE USER apimuser IDENTIFIED BY wso2; --- GRANT CONNECT,RESOURCE to apimuser WITH ADMIN OPTION; +-- CREATE USER apimuser IDENTIFIED BY wso2; +-- GRANT CONNECT,RESOURCE to apimuser WITH ADMIN OPTION; -- CONNECT apimuser/wso2 -- @@ -78,8 +78,8 @@ CREATE TABLE IDN_OAUTH2_ACCESS_TOKEN ( TOKEN_SCOPE_HASH VARCHAR2 (32), TOKEN_STATE VARCHAR2 (25) DEFAULT 'ACTIVE', TOKEN_STATE_ID VARCHAR (128) DEFAULT 'NONE', - SUBJECT_IDENTIFIER VARCHAR2(255), - PRIMARY KEY (TOKEN_ID), + SUBJECT_IDENTIFIER VARCHAR(255), + PRIMARY KEY (TOKEN_ID), FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE, CONSTRAINT CON_APP_KEY UNIQUE (CONSUMER_KEY_ID,AUTHZ_USER,TOKEN_ID,USER_DOMAIN,USER_TYPE,TOKEN_SCOPE_HASH, TOKEN_STATE,TOKEN_STATE_ID)) @@ -101,6 +101,7 @@ CREATE TABLE IDN_OAUTH2_AUTHORIZATION_CODE ( VALIDITY_PERIOD NUMBER(19), STATE VARCHAR (25) DEFAULT 'ACTIVE', TOKEN_ID VARCHAR(255), + SUBJECT_IDENTIFIER VARCHAR(255), PRIMARY KEY (CODE_ID), FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE) / @@ -1236,10 +1237,10 @@ CREATE OR REPLACE TRIGGER AM_EXTERNAL_STORES_TRIGGER / CREATE TABLE AM_API_DEFAULT_VERSION ( - DEFAULT_VERSION_ID NUMBER, + DEFAULT_VERSION_ID NUMBER, API_NAME VARCHAR(256) NOT NULL , - API_PROVIDER VARCHAR(256) NOT NULL , - DEFAULT_API_VERSION VARCHAR(30) , + API_PROVIDER VARCHAR(256) NOT NULL , + DEFAULT_API_VERSION VARCHAR(30) , PUBLISHED_DEFAULT_API_VERSION VARCHAR(30) , PRIMARY KEY (DEFAULT_VERSION_ID) ) diff --git a/modules/distribution/src/repository/resources/dbscripts/apimgt/oracle_rac.sql b/modules/distribution/src/repository/resources/dbscripts/apimgt/oracle_rac.sql index 478782d5..00e07c87 100644 --- a/modules/distribution/src/repository/resources/dbscripts/apimgt/oracle_rac.sql +++ b/modules/distribution/src/repository/resources/dbscripts/apimgt/oracle_rac.sql @@ -1,7 +1,7 @@ -- Create Oracle New User and Connect -------------------------------------- --- CREATE USER apimuser IDENTIFIED BY wso2; --- GRANT CONNECT,RESOURCE to apimuser WITH ADMIN OPTION; +-- CREATE USER apimuser IDENTIFIED BY wso2; +-- GRANT CONNECT,RESOURCE to apimuser WITH ADMIN OPTION; -- CONNECT apimuser/wso2 -- @@ -77,8 +77,8 @@ CREATE TABLE IDN_OAUTH2_ACCESS_TOKEN ( TOKEN_SCOPE_HASH VARCHAR2 (32), TOKEN_STATE VARCHAR2 (25) DEFAULT 'ACTIVE', TOKEN_STATE_ID VARCHAR (128) DEFAULT 'NONE', - SUBJECT_IDENTIFIER VARCHAR2(255), - PRIMARY KEY (TOKEN_ID), + SUBJECT_IDENTIFIER VARCHAR(255), + PRIMARY KEY (TOKEN_ID), FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE, CONSTRAINT CON_APP_KEY UNIQUE (CONSUMER_KEY_ID,AUTHZ_USER,TOKEN_ID,USER_DOMAIN,USER_TYPE,TOKEN_SCOPE_HASH, TOKEN_STATE,TOKEN_STATE_ID)) @@ -100,6 +100,7 @@ CREATE TABLE IDN_OAUTH2_AUTHORIZATION_CODE ( VALIDITY_PERIOD NUMBER(19), STATE VARCHAR (25) DEFAULT 'ACTIVE', TOKEN_ID VARCHAR(255), + SUBJECT_IDENTIFIER VARCHAR(255), PRIMARY KEY (CODE_ID), FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE) / @@ -1233,10 +1234,10 @@ CREATE OR REPLACE TRIGGER AM_EXTERNAL_STORES_TRIGGER / CREATE TABLE AM_API_DEFAULT_VERSION ( - DEFAULT_VERSION_ID NUMBER, + DEFAULT_VERSION_ID NUMBER, API_NAME VARCHAR(256) NOT NULL , - API_PROVIDER VARCHAR(256) NOT NULL , - DEFAULT_API_VERSION VARCHAR(30) , + API_PROVIDER VARCHAR(256) NOT NULL , + DEFAULT_API_VERSION VARCHAR(30) , PUBLISHED_DEFAULT_API_VERSION VARCHAR(30) , PRIMARY KEY (DEFAULT_VERSION_ID) ) diff --git a/modules/distribution/src/repository/resources/dbscripts/apimgt/postgresql.sql b/modules/distribution/src/repository/resources/dbscripts/apimgt/postgresql.sql index 9a304df9..157bc90a 100644 --- a/modules/distribution/src/repository/resources/dbscripts/apimgt/postgresql.sql +++ b/modules/distribution/src/repository/resources/dbscripts/apimgt/postgresql.sql @@ -73,7 +73,7 @@ CREATE TABLE IDN_OAUTH2_ACCESS_TOKEN ( TOKEN_STATE VARCHAR(25) DEFAULT 'ACTIVE', TOKEN_STATE_ID VARCHAR (128) DEFAULT 'NONE', SUBJECT_IDENTIFIER VARCHAR(255), - PRIMARY KEY (TOKEN_ID), + PRIMARY KEY (TOKEN_ID), FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE, CONSTRAINT CON_APP_KEY UNIQUE (CONSUMER_KEY_ID,AUTHZ_USER,TOKEN_ID,USER_DOMAIN,USER_TYPE,TOKEN_SCOPE_HASH, TOKEN_STATE,TOKEN_STATE_ID) @@ -97,6 +97,7 @@ CREATE TABLE IDN_OAUTH2_AUTHORIZATION_CODE ( VALIDITY_PERIOD BIGINT, STATE VARCHAR (25) DEFAULT 'ACTIVE', TOKEN_ID VARCHAR(255), + SUBJECT_IDENTIFIER VARCHAR(255), PRIMARY KEY (CODE_ID), FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE ); @@ -903,10 +904,10 @@ DROP TABLE IF EXISTS AM_API_DEFAULT_VERSION; DROP SEQUENCE IF EXISTS AM_API_DEFAULT_VERSION_PK_SEQ; CREATE SEQUENCE AM_API_DEFAULT_VERSION_PK_SEQ; CREATE TABLE AM_API_DEFAULT_VERSION ( - DEFAULT_VERSION_ID INTEGER DEFAULT NEXTVAL('am_api_default_version_pk_seq'), + DEFAULT_VERSION_ID INTEGER DEFAULT NEXTVAL('am_api_default_version_pk_seq'), API_NAME VARCHAR(256) NOT NULL , - API_PROVIDER VARCHAR(256) NOT NULL , - DEFAULT_API_VERSION VARCHAR(30) , + API_PROVIDER VARCHAR(256) NOT NULL , + DEFAULT_API_VERSION VARCHAR(30) , PUBLISHED_DEFAULT_API_VERSION VARCHAR(30) , PRIMARY KEY (DEFAULT_VERSION_ID) ); @@ -914,4 +915,4 @@ CREATE TABLE AM_API_DEFAULT_VERSION ( CREATE INDEX IDX_SUB_APP_ID ON AM_SUBSCRIPTION (APPLICATION_ID, SUBSCRIPTION_ID) ; -commit; +commit; \ No newline at end of file