Merged with CDM master

modules/distribution/src/repository/conf/identity.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
   ~ WSO2 Inc. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
@@ -82,9 +82,7 @@
         <SessionTimeout>36000</SessionTimeout>
         <!-- skips authentication if valid SAML2 Web SSO browser session available -->
         <AcceptSAMLSSOLogin>false</AcceptSAMLSSOLogin>
-        <ClaimsRetrieverImplClass>
+        <ClaimsRetrieverImplClass>org.wso2.carbon.identity.provider.openid.claims.DefaultClaimsRetriever</ClaimsRetrieverImplClass>
-            org.wso2.carbon.identity.provider.openid.claims.DefaultClaimsRetriever
-        </ClaimsRetrieverImplClass>
     </OpenID>
 
     <OAuth>
@@ -109,8 +107,7 @@
         <TokenPersistenceProcessor>org.wso2.carbon.identity.oauth.tokenprocessor.PlainTextPersistenceProcessor</TokenPersistenceProcessor>
         <!-- Supported Client Autnetication Methods -->
         <ClientAuthHandlers>
-            <ClientAuthHandler
+            <ClientAuthHandler Class="org.wso2.carbon.identity.oauth2.token.handlers.clientauth.BasicAuthClientAuthHandler">
-                    Class="org.wso2.carbon.identity.oauth2.token.handlers.clientauth.BasicAuthClientAuthHandler">
                 <Property Name="StrictClientCredentialValidation">false</Property>
             </ClientAuthHandler>
         </ClientAuthHandlers>
@@ -158,14 +155,11 @@
             </SupportedGrantType>
         </SupportedGrantTypes>
         <OAuthCallbackHandlers>
-            <OAuthCallbackHandler
+            <OAuthCallbackHandler Class="org.wso2.carbon.device.mgt.oauth.extensions.handlers.DeviceMgtOAuthCallbackHandler"/>
-                    Class="org.wso2.carbon.device.mgt.oauth.extensions.handlers.DeviceMgtOAuthCallbackHandler"/>
         </OAuthCallbackHandlers>
-        <OAuthScopeValidator
+        <OAuthScopeValidator class="org.wso2.carbon.device.mgt.oauth.extensions.validators.PermissionBasedScopeValidator"/>
-                class="org.wso2.carbon.device.mgt.oauth.extensions.validators.PermissionBasedScopeValidator"/>
         <TokenValidators>
-            <TokenValidator type="bearer"
+            <TokenValidator type="bearer" class="org.wso2.carbon.identity.oauth2.validators.DefaultOAuth2TokenValidator"/>
-                            class="org.wso2.carbon.identity.oauth2.validators.DefaultOAuth2TokenValidator"/>
         </TokenValidators>
         <!-- Assertions can be used to embedd parameters into access token. -->
         <EnableAssertions>
@@ -185,11 +179,8 @@
         </AccessTokenPartitioningDomains>
         <AuthorizationContextTokenGeneration>
             <Enabled>false</Enabled>
-            <TokenGeneratorImplClass>org.wso2.carbon.identity.oauth2.authcontext.JWTTokenGenerator
+            <TokenGeneratorImplClass>org.wso2.carbon.identity.oauth2.authcontext.JWTTokenGenerator</TokenGeneratorImplClass>
-            </TokenGeneratorImplClass>
+            <ClaimsRetrieverImplClass>org.wso2.carbon.identity.oauth2.authcontext.DefaultClaimsRetriever</ClaimsRetrieverImplClass>
-            <ClaimsRetrieverImplClass>
-                org.wso2.carbon.identity.oauth2.authcontext.DefaultClaimsRetriever
-            </ClaimsRetrieverImplClass>
             <ConsumerDialectURI>http://wso2.org/claims</ConsumerDialectURI>
             <SignatureAlgorithm>SHA256withRSA</SignatureAlgorithm>
             <AuthorizationContextTTL>15</AuthorizationContextTTL>
@@ -198,27 +189,16 @@
             <!--SAML2TokenHandler></SAML2TokenHandler-->
         </SAML2Grant>
         <OpenIDConnect>
-            <IDTokenBuilder>org.wso2.carbon.identity.openidconnect.DefaultIDTokenBuilder
+            <IDTokenBuilder>org.wso2.carbon.identity.openidconnect.DefaultIDTokenBuilder</IDTokenBuilder>
-            </IDTokenBuilder>
             <IDTokenIssuerID>https://localhost:9443/oauth2endpoints/token</IDTokenIssuerID>
             <IDTokenSubjectClaim>http://wso2.org/claims/givenname</IDTokenSubjectClaim>
-            <IDTokenCustomClaimsCallBackHandler>
+            <IDTokenCustomClaimsCallBackHandler>org.wso2.carbon.identity.openidconnect.SAMLAssertionClaimsCallback</IDTokenCustomClaimsCallBackHandler>
-                org.wso2.carbon.identity.openidconnect.SAMLAssertionClaimsCallback
-            </IDTokenCustomClaimsCallBackHandler>
             <IDTokenExpiration>3600</IDTokenExpiration>
             <UserInfoEndpointClaimDialect>http://wso2.org/claims</UserInfoEndpointClaimDialect>
-            <UserInfoEndpointClaimRetriever>
+            <UserInfoEndpointClaimRetriever>org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInfoUserStoreClaimRetriever</UserInfoEndpointClaimRetriever>
-                org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInfoUserStoreClaimRetriever
+            <UserInfoEndpointRequestValidator>org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInforRequestDefaultValidator</UserInfoEndpointRequestValidator>
-            </UserInfoEndpointClaimRetriever>
+            <UserInfoEndpointAccessTokenValidator>org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInfoISAccessTokenValidator</UserInfoEndpointAccessTokenValidator>
-            <UserInfoEndpointRequestValidator>
+            <UserInfoEndpointResponseBuilder>org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInfoJSONResponseBuilder</UserInfoEndpointResponseBuilder>
-                org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInforRequestDefaultValidator
-            </UserInfoEndpointRequestValidator>
-            <UserInfoEndpointAccessTokenValidator>
-                org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInfoISAccessTokenValidator
-            </UserInfoEndpointAccessTokenValidator>
-            <UserInfoEndpointResponseBuilder>
-                org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInfoJSONResponseBuilder
-            </UserInfoEndpointResponseBuilder>
             <SkipUserConsent>false</SkipUserConsent>
         </OpenIDConnect>
     </OAuth>
@@ -240,38 +220,25 @@
         <EntityId>localhost</EntityId>
         <IdentityProviderURL>https://localhost:9443/samlsso</IdentityProviderURL>
         <SingleLogoutRetryCount>5</SingleLogoutRetryCount>
-        <SingleLogoutRetryInterval>60000</SingleLogoutRetryInterval>
+        <SingleLogoutRetryInterval>60000</SingleLogoutRetryInterval> <!-- in milli seconds -->
-        <!-- in milli seconds -->
         <TenantPartitioningEnabled>false</TenantPartitioningEnabled>
         <PersistanceCacheTimeout>157680000</PersistanceCacheTimeout>
         <SessionIndexCacheTimeout>157680000</SessionIndexCacheTimeout>
-        <SessionTimeout>36000</SessionTimeout>
+        <SessionTimeout>36000</SessionTimeout> <!-- remember me session timeout in seconds -->
-        <!-- remember me session timeout in seconds -->
         <!-- skips authentication if valid SAML2 Web SSO browser session available -->
-        <AttributeStatementBuilder>
+        <AttributeStatementBuilder>org.wso2.carbon.identity.sso.saml.attributes.UserAttributeStatementBuilder</AttributeStatementBuilder>
-            org.wso2.carbon.identity.sso.saml.attributes.UserAttributeStatementBuilder
-        </AttributeStatementBuilder>
         <AttributesClaimDialect>http://wso2.org/claims</AttributesClaimDialect>
         <AcceptOpenIDLogin>false</AcceptOpenIDLogin>
-        <ClaimsRetrieverImplClass>
+        <ClaimsRetrieverImplClass>org.wso2.carbon.identity.sso.saml.builders.claims.DefaultClaimsRetriever</ClaimsRetrieverImplClass>
-            org.wso2.carbon.identity.sso.saml.builders.claims.DefaultClaimsRetriever
+        <SAMLSSOAssertionBuilder>org.wso2.carbon.identity.sso.saml.builders.assertion.DefaultSAMLAssertionBuilder</SAMLSSOAssertionBuilder>
-        </ClaimsRetrieverImplClass>
+        <SAMLSSOEncrypter>org.wso2.carbon.identity.sso.saml.builders.encryption.DefaultSSOEncrypter</SAMLSSOEncrypter>
-        <SAMLSSOAssertionBuilder>
+        <SAMLSSOSigner>org.wso2.carbon.identity.sso.saml.builders.signature.DefaultSSOSigner</SAMLSSOSigner>
-            org.wso2.carbon.identity.sso.saml.builders.assertion.DefaultSAMLAssertionBuilder
+        <SAML2HTTPRedirectSignatureValidator>org.wso2.carbon.identity.sso.saml.validators.SAML2HTTPRedirectDeflateSignatureValidator</SAML2HTTPRedirectSignatureValidator>
-        </SAMLSSOAssertionBuilder>
-        <SAMLSSOEncrypter>
-            org.wso2.carbon.identity.sso.saml.builders.encryption.DefaultSSOEncrypter
-        </SAMLSSOEncrypter>
-        <SAMLSSOSigner>org.wso2.carbon.identity.sso.saml.builders.signature.DefaultSSOSigner
-        </SAMLSSOSigner>
-        <SAML2HTTPRedirectSignatureValidator>
-            org.wso2.carbon.identity.sso.saml.validators.SAML2HTTPRedirectDeflateSignatureValidator
-        </SAML2HTTPRedirectSignatureValidator>
         <!--SAMLSSOResponseBuilder>org.wso2.carbon.identity.sso.saml.builders.DefaultResponseBuilder</SAMLSSOResponseBuilder-->
 
         <!-- SAML Token validity period in minutes -->
         <SAMLResponseValidityPeriod>5</SAMLResponseValidityPeriod>
-        <UseAuthenticatedUserDomainCrypto>false</UseAuthenticatedUserDomainCrypto>
+        <UseAuthenticatedUserDomainCrypto>true</UseAuthenticatedUserDomainCrypto>
     </SSOService>
 
     <EntitlementSettings>

modules/distribution/src/repository/conf/security/authenticators.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!--
-  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
   ~ WSO2 Inc. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
@@ -24,31 +24,30 @@
 -->
 <Authenticators xmlns="http://wso2.org/projects/carbon/authenticators.xml">
 
-    <!-- Authenticator Configurations for OAuthAuthenticator -->
+    <!-- authenticator Configurations for OAuthAuthenticator -->
-    <Authenticator name="BackEndOAuthAuthenticator" disabled="false">
+    <Authenticator name="OAuthAuthenticator" disabled="false">
         <Priority>10</Priority>
         <Config>
             <Parameter name="isRemote">false</Parameter>
             <Parameter name="hostURL">https://localhost:9443</Parameter>
+            <Parameter name="adminUsername">admin</Parameter>
+            <Parameter name="adminPassword">admin</Parameter>
         </Config>
     </Authenticator>
 
-    <!-- Authenticator Configurations for TokenUIAuthenticator -->
+    <!-- authenticator Configurations for TokenUIAuthenticator -->
     <Authenticator name="TokenUIAuthenticator" disabled="false">
         <Priority>5</Priority>
     </Authenticator>
 
-    <!-- Authenticator Configurations for SAML2SSOAuthenticator -->
+    <!-- authenticator Configurations for SAML2SSOAuthenticator -->
     <Authenticator name="SAML2SSOAuthenticator" disabled="true">
         <Priority>10</Priority>
         <Config>
             <Parameter name="LoginPage">/carbon/admin/login.jsp</Parameter>
             <Parameter name="ServiceProviderID">carbonServer</Parameter>
-            <Parameter name="IdentityProviderSSOServiceURL">https://localhost:9443/samlsso
+            <Parameter name="IdentityProviderSSOServiceURL">https://localhost:9443/samlsso</Parameter>
-            </Parameter>
+            <Parameter name="NameIDPolicyFormat">urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</Parameter>
-            <Parameter name="NameIDPolicyFormat">
-                urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified
-            </Parameter>
         </Config>
 
         <!-- If this authenticator should skip any URI from authentication, specify it under "SkipAuthentication"
@@ -63,4 +62,3 @@
     </Authenticator>
 
 </Authenticators>
-

modules/distribution/src/repository/resources/dbscripts/apimgt/h2.sql

@@ -63,6 +63,7 @@ CREATE TABLE IF NOT EXISTS 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),
 	    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,
@@ -74,6 +75,7 @@ CREATE INDEX IDX_AT_CK_AU ON IDN_OAUTH2_ACCESS_TOKEN(CONSUMER_KEY_ID, AUTHZ_USER
 CREATE INDEX IDX_TC ON IDN_OAUTH2_ACCESS_TOKEN(TIME_CREATED);
 
 CREATE TABLE IF NOT EXISTS IDN_OAUTH2_AUTHORIZATION_CODE (
+            CODE_ID VARCHAR (255),
             AUTHORIZATION_CODE VARCHAR (512),
             CONSUMER_KEY_ID INTEGER,
             CALLBACK_URL VARCHAR (1024),
@@ -85,7 +87,7 @@ CREATE TABLE IF NOT EXISTS IDN_OAUTH2_AUTHORIZATION_CODE (
             VALIDITY_PERIOD BIGINT,
             STATE VARCHAR (25) DEFAULT 'ACTIVE',
             TOKEN_ID VARCHAR(255),
-            PRIMARY KEY (AUTHORIZATION_CODE),
+            PRIMARY KEY (CODE_ID),
             FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE
 );
 
@@ -112,7 +114,7 @@ CREATE TABLE IF NOT EXISTS IDN_OAUTH2_RESOURCE_SCOPE (
             SCOPE_ID INTEGER (11) NOT NULL,
             TENANT_ID INTEGER DEFAULT -1,
             PRIMARY KEY (RESOURCE_PATH),
-            FOREIGN KEY (SCOPE_ID) REFERENCES IDN_OAUTH2_SCOPE (SCOPE_ID)
+            FOREIGN KEY (SCOPE_ID) REFERENCES IDN_OAUTH2_SCOPE (SCOPE_ID) ON DELETE CASCADE
 );
 
 CREATE TABLE IF NOT EXISTS IDN_SCIM_GROUP (
@@ -234,7 +236,7 @@ CREATE TABLE IF NOT EXISTS SP_METADATA (
 CREATE TABLE IF NOT EXISTS SP_INBOUND_AUTH (
             ID INTEGER NOT NULL AUTO_INCREMENT,
             TENANT_ID INTEGER NOT NULL,
-            INBOUND_AUTH_KEY VARCHAR (255) NOT NULL,
+            INBOUND_AUTH_KEY VARCHAR (255),
             INBOUND_AUTH_TYPE VARCHAR (255) NOT NULL,
             PROP_NAME VARCHAR (255),
             PROP_VALUE VARCHAR (1024) ,
@@ -328,7 +330,6 @@ CREATE TABLE IF NOT EXISTS IDP (
  			DISPLAY_NAME VARCHAR(255),
 			PRIMARY KEY (ID),
 			UNIQUE (TENANT_ID, NAME));
-
 INSERT INTO IDP (TENANT_ID, NAME, HOME_REALM_ID) VALUES (-1234, 'LOCAL', 'localhost');
 
 CREATE TABLE IF NOT EXISTS IDP_ROLE (
@@ -408,7 +409,8 @@ CREATE TABLE IF NOT EXISTS IDP_AUTHENTICATOR_PROPERTY (
             IS_SECRET CHAR (1) DEFAULT '0',
             PRIMARY KEY (ID),
             UNIQUE (TENANT_ID, AUTHENTICATOR_ID, PROPERTY_KEY),
-            FOREIGN KEY (AUTHENTICATOR_ID) REFERENCES IDP_AUTHENTICATOR(ID) ON DELETE CASCADE);
+            FOREIGN KEY (AUTHENTICATOR_ID) REFERENCES IDP_AUTHENTICATOR(ID) ON DELETE CASCADE
+);
 
 INSERT INTO  IDP_AUTHENTICATOR_PROPERTY (TENANT_ID, AUTHENTICATOR_ID, PROPERTY_KEY,PROPERTY_VALUE, IS_SECRET ) VALUES (-1234, 1 , 'IdPEntityId', 'localhost', '0');
 INSERT INTO  IDP_AUTHENTICATOR_PROPERTY (TENANT_ID, AUTHENTICATOR_ID, PROPERTY_KEY,PROPERTY_VALUE, IS_SECRET ) VALUES (-1234, 3 , 'IdPEntityId', 'localhost', '0');
@@ -462,6 +464,7 @@ CREATE TABLE IF NOT EXISTS IDP_LOCAL_CLAIM (
             UNIQUE (TENANT_ID, IDP_ID, CLAIM_URI),
             FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE);
 
+
 CREATE TABLE IF NOT EXISTS IDN_ASSOCIATED_ID (
 	    ID INTEGER AUTO_INCREMENT,
 	    IDP_USER_ID VARCHAR(255) NOT NULL,
@@ -509,8 +512,6 @@ CREATE TABLE IF NOT EXISTS WF_BPS_PROFILE (
     USERNAME VARCHAR(45),
     PASSWORD VARCHAR(255),
     CALLBACK_HOST VARCHAR (45),
-    CALLBACK_USERNAME VARCHAR (45),
-    CALLBACK_PASSWORD VARCHAR (255),
     TENANT_ID INTEGER DEFAULT -1,
     PRIMARY KEY (PROFILE_NAME, TENANT_ID)
 );
@@ -568,7 +569,6 @@ CREATE TABLE IF NOT EXISTS WF_WORKFLOW_REQUEST_RELATION(
   FOREIGN KEY (WORKFLOW_ID) REFERENCES WF_WORKFLOW(ID)ON DELETE CASCADE,
   FOREIGN KEY (REQUEST_ID) REFERENCES WF_REQUEST(UUID)ON DELETE CASCADE
 );
-
 -- Start of API-MGT Tables --
 
 CREATE TABLE IF NOT EXISTS AM_SUBSCRIBER (

modules/distribution/src/repository/resources/dbscripts/apimgt/mssql.sql

@@ -68,6 +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),
             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,
@@ -83,6 +84,7 @@ DROP INDEX IDN_OAUTH2_ACCESS_TOKEN.IDX_AT_CK_AU
 
 IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDN_OAUTH2_AUTHORIZATION_CODE]') AND TYPE IN (N'U'))
 CREATE TABLE IDN_OAUTH2_AUTHORIZATION_CODE (
+            CODE_ID VARCHAR (255),
             AUTHORIZATION_CODE VARCHAR(512),
             CONSUMER_KEY_ID INTEGER,
 	          CALLBACK_URL VARCHAR(1024),
@@ -94,7 +96,7 @@ CREATE TABLE IDN_OAUTH2_AUTHORIZATION_CODE (
             VALIDITY_PERIOD BIGINT,
             STATE VARCHAR (25) DEFAULT 'ACTIVE',
             TOKEN_ID VARCHAR(255),
-            PRIMARY KEY (AUTHORIZATION_CODE),
+            PRIMARY KEY (CODE_ID),
             FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE
 );
 
@@ -124,7 +126,7 @@ CREATE TABLE IDN_OAUTH2_RESOURCE_SCOPE (
             SCOPE_ID INTEGER NOT NULL,
             TENANT_ID INTEGER DEFAULT -1,
             PRIMARY KEY (RESOURCE_PATH),
-            FOREIGN KEY (SCOPE_ID) REFERENCES IDN_OAUTH2_SCOPE (SCOPE_ID)
+            FOREIGN KEY (SCOPE_ID) REFERENCES IDN_OAUTH2_SCOPE (SCOPE_ID) ON DELETE CASCADE ON UPDATE CASCADE
 );
 
 IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDN_SCIM_GROUP]') AND TYPE IN (N'U'))
@@ -259,7 +261,7 @@ IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[S
 CREATE TABLE SP_INBOUND_AUTH (
             ID INTEGER NOT NULL IDENTITY,
             TENANT_ID INTEGER NOT NULL,
-            INBOUND_AUTH_KEY VARCHAR (255) NOT NULL,
+            INBOUND_AUTH_KEY VARCHAR (255),
             INBOUND_AUTH_TYPE VARCHAR (255) NOT NULL,
             PROP_NAME VARCHAR (255),
             PROP_VALUE VARCHAR (1024) ,
@@ -650,13 +652,16 @@ CREATE TABLE AM_APPLICATION (
     CALLBACK_URL VARCHAR(512),
     DESCRIPTION VARCHAR(512),
     APPLICATION_STATUS VARCHAR(50) DEFAULT 'APPROVED',
+    GROUP_ID VARCHAR(100),
     CREATED_BY VARCHAR(100),
     CREATED_TIME DATETIME,
     UPDATED_BY VARCHAR(100),
     UPDATED_TIME DATETIME,
+    UUID VARCHAR(256),
     FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON UPDATE CASCADE,
     PRIMARY KEY(APPLICATION_ID),
-    UNIQUE (NAME,SUBSCRIBER_ID)
+    UNIQUE (NAME,SUBSCRIBER_ID),
+    UNIQUE (UUID)
 );
 
 IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[AM_API]') AND TYPE IN (N'U'))
@@ -703,9 +708,11 @@ CREATE TABLE AM_SUBSCRIPTION (
     CREATED_TIME DATETIME,
     UPDATED_BY VARCHAR(100),
     UPDATED_TIME DATETIME,
+    UUID VARCHAR(256),
     FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON UPDATE CASCADE,
     FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE,
-    PRIMARY KEY (SUBSCRIPTION_ID)
+    PRIMARY KEY (SUBSCRIPTION_ID),
+    UNIQUE (UUID)
 );
 
 IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[AM_SUBSCRIPTION_KEY_MAPPING]') AND TYPE IN (N'U'))
@@ -725,6 +732,7 @@ CREATE TABLE AM_APPLICATION_KEY_MAPPING (
     CONSUMER_KEY VARCHAR(512),
     KEY_TYPE VARCHAR(512) NOT NULL,
     STATE VARCHAR(30) NOT NULL,
+    CREATE_MODE VARCHAR(30) DEFAULT 'CREATED',
     FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON UPDATE CASCADE,
     PRIMARY KEY(APPLICATION_ID,KEY_TYPE)
 );
@@ -738,6 +746,7 @@ CREATE TABLE AM_APPLICATION_REGISTRATION (
     APP_ID INTEGER,
     TOKEN_TYPE VARCHAR(30),
     TOKEN_SCOPE VARCHAR(256) DEFAULT 'default',
+    INPUTS VARCHAR(1000),
     ALLOWED_DOMAINS VARCHAR(256),
     VALIDITY_PERIOD BIGINT,
     UNIQUE (SUBSCRIBER_ID,APP_ID,TOKEN_TYPE),
@@ -815,7 +824,7 @@ CREATE TABLE AM_EXTERNAL_STORES (
     STORE_ENDPOINT VARCHAR(255) NOT NULL,
     STORE_TYPE VARCHAR(255) NOT NULL,
     FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE,
-    PRIMARY KEY (API_ID)
+    PRIMARY KEY (APISTORE_ID)
 );
 
 IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[AM_WORKFLOWS]') AND TYPE IN (N'U'))

modules/distribution/src/repository/resources/dbscripts/apimgt/mysql.sql

@@ -64,6 +64,7 @@ CREATE TABLE IF NOT EXISTS 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),
 	    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,
@@ -75,6 +76,7 @@ CREATE INDEX IDX_AT_CK_AU ON IDN_OAUTH2_ACCESS_TOKEN(CONSUMER_KEY_ID, AUTHZ_USER
 CREATE INDEX IDX_TC ON IDN_OAUTH2_ACCESS_TOKEN(TIME_CREATED);
 
 CREATE TABLE IF NOT EXISTS IDN_OAUTH2_AUTHORIZATION_CODE (
+            CODE_ID VARCHAR (255),
             AUTHORIZATION_CODE VARCHAR(512),
             CONSUMER_KEY_ID INTEGER,
             CALLBACK_URL VARCHAR(1024),
@@ -86,7 +88,7 @@ CREATE TABLE IF NOT EXISTS IDN_OAUTH2_AUTHORIZATION_CODE (
             VALIDITY_PERIOD BIGINT,
             STATE VARCHAR (25) DEFAULT 'ACTIVE',
             TOKEN_ID VARCHAR(255),
-            PRIMARY KEY (AUTHORIZATION_CODE),
+            PRIMARY KEY (CODE_ID),
             FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE
 )ENGINE INNODB;
 
@@ -113,7 +115,7 @@ CREATE TABLE IF NOT EXISTS IDN_OAUTH2_RESOURCE_SCOPE (
             SCOPE_ID INTEGER (11) NOT NULL,
             TENANT_ID INTEGER DEFAULT -1,
             PRIMARY KEY (RESOURCE_PATH),
-            FOREIGN KEY (SCOPE_ID) REFERENCES IDN_OAUTH2_SCOPE (SCOPE_ID)
+            FOREIGN KEY (SCOPE_ID) REFERENCES IDN_OAUTH2_SCOPE (SCOPE_ID) ON DELETE CASCADE ON UPDATE CASCADE
 )ENGINE INNODB;
 
 CREATE TABLE IF NOT EXISTS IDN_SCIM_GROUP (
@@ -238,7 +240,7 @@ CREATE TABLE IF NOT EXISTS SP_METADATA (
 CREATE TABLE IF NOT EXISTS SP_INBOUND_AUTH (
             ID INTEGER NOT NULL AUTO_INCREMENT,
             TENANT_ID INTEGER NOT NULL,
-            INBOUND_AUTH_KEY VARCHAR (255) NOT NULL,
+            INBOUND_AUTH_KEY VARCHAR (255),
             INBOUND_AUTH_TYPE VARCHAR (255) NOT NULL,
             PROP_NAME VARCHAR (255),
             PROP_VALUE VARCHAR (1024) ,
@@ -624,9 +626,11 @@ CREATE TABLE IF NOT EXISTS AM_APPLICATION (
     CREATED_TIME TIMESTAMP,
     UPDATED_BY VARCHAR(100),
     UPDATED_TIME TIMESTAMP,
+    UUID VARCHAR(256),
     FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
     PRIMARY KEY(APPLICATION_ID),
-    UNIQUE (NAME,SUBSCRIBER_ID)
+    UNIQUE (NAME,SUBSCRIBER_ID),
+    UNIQUE (UUID)
 )ENGINE INNODB;
 
 CREATE TABLE IF NOT EXISTS AM_API (
@@ -667,9 +671,11 @@ CREATE TABLE IF NOT EXISTS AM_SUBSCRIPTION (
     CREATED_TIME TIMESTAMP,
     UPDATED_BY VARCHAR(100),
     UPDATED_TIME TIMESTAMP,
+    UUID VARCHAR(256),
     FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
     FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
-    PRIMARY KEY (SUBSCRIPTION_ID)
+    PRIMARY KEY (SUBSCRIPTION_ID),
+    UNIQUE (UUID)
 )ENGINE INNODB;
 
 CREATE TABLE IF NOT EXISTS AM_SUBSCRIPTION_KEY_MAPPING (

modules/distribution/src/repository/resources/dbscripts/apimgt/oracle.sql

@@ -78,6 +78,7 @@ 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),
             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,
@@ -88,6 +89,7 @@ CREATE INDEX IDX_TC ON IDN_OAUTH2_ACCESS_TOKEN(TIME_CREATED)
 CREATE INDEX IDX_AT_CK_AU ON IDN_OAUTH2_ACCESS_TOKEN(CONSUMER_KEY_ID, AUTHZ_USER, TOKEN_STATE, USER_TYPE)
 /
 CREATE TABLE IDN_OAUTH2_AUTHORIZATION_CODE (
+            CODE_ID VARCHAR (255),
             AUTHORIZATION_CODE VARCHAR2 (512),
             CONSUMER_KEY_ID INTEGER,
 	          CALLBACK_URL VARCHAR2 (1024),
@@ -99,7 +101,7 @@ CREATE TABLE IDN_OAUTH2_AUTHORIZATION_CODE (
             VALIDITY_PERIOD NUMBER(19),
             STATE VARCHAR (25) DEFAULT 'ACTIVE',
             TOKEN_ID VARCHAR(255),
-            PRIMARY KEY (AUTHORIZATION_CODE),
+            PRIMARY KEY (CODE_ID),
             FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE)
 /
 CREATE TABLE IDN_OAUTH2_ACCESS_TOKEN_SCOPE (
@@ -134,7 +136,7 @@ CREATE TABLE IDN_OAUTH2_RESOURCE_SCOPE (
             SCOPE_ID INTEGER NOT NULL,
             TENANT_ID INTEGER DEFAULT -1,
             PRIMARY KEY (RESOURCE_PATH),
-            FOREIGN KEY (SCOPE_ID) REFERENCES IDN_OAUTH2_SCOPE (SCOPE_ID))
+            FOREIGN KEY (SCOPE_ID) REFERENCES IDN_OAUTH2_SCOPE (SCOPE_ID) ON DELETE CASCADE)
 /
 CREATE TABLE IDN_SCIM_GROUP (
 			ID INTEGER,
@@ -298,7 +300,7 @@ CREATE OR REPLACE TRIGGER SP_METADATA_TRIG
 CREATE TABLE SP_INBOUND_AUTH (
             ID INTEGER,
             TENANT_ID INTEGER NOT NULL,
-            INBOUND_AUTH_KEY VARCHAR (255) NOT NULL,
+            INBOUND_AUTH_KEY VARCHAR (255),
             INBOUND_AUTH_TYPE VARCHAR (255) NOT NULL,
             PROP_NAME VARCHAR (255),
             PROP_VALUE VARCHAR (1024) ,
@@ -470,8 +472,6 @@ CREATE OR REPLACE TRIGGER IDP_TRIG
                    SELECT IDP_SEQ.nextval INTO :NEW.ID FROM dual;
                END;
 /
-INSERT INTO IDP (TENANT_ID, NAME, HOME_REALM_ID) VALUES (-1234, 'LOCAL', 'localhost')
-/
 CREATE TABLE IDP_ROLE (
 			ID INTEGER,
 			IDP_ID INTEGER,
@@ -483,6 +483,8 @@ CREATE TABLE IDP_ROLE (
 /
 CREATE SEQUENCE IDP_ROLE_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
 /
+INSERT INTO IDP (TENANT_ID, NAME, HOME_REALM_ID) VALUES (-1234, 'LOCAL', 'localhost')
+/
 CREATE OR REPLACE TRIGGER IDP_ROLE_TRIG
             BEFORE INSERT
             ON IDP_ROLE
@@ -583,7 +585,6 @@ INSERT INTO IDP_AUTHENTICATOR (TENANT_ID, IDP_ID, NAME) VALUES (-1234, 1, 'IDPPr
 /
 INSERT INTO IDP_AUTHENTICATOR (TENANT_ID, IDP_ID, NAME) VALUES (-1234, 1, 'passivests')
 /
-
 CREATE TABLE IDP_METADATA (
             ID INTEGER,
             IDP_ID INTEGER,
@@ -611,7 +612,6 @@ INSERT INTO IDP_METADATA (IDP_ID, NAME, VALUE, DISPLAY_NAME) VALUES (1, 'Session
 /
 INSERT INTO IDP_METADATA (IDP_ID, NAME, VALUE, DISPLAY_NAME) VALUES (1, 'RememberMeTimeout', '15', 'RememberMe Timeout')
 /
-
 CREATE TABLE IDP_AUTHENTICATOR_PROPERTY (
             ID INTEGER,
             TENANT_ID INTEGER,
@@ -638,7 +638,6 @@ INSERT INTO  IDP_AUTHENTICATOR_PROPERTY (TENANT_ID, AUTHENTICATOR_ID, PROPERTY_K
 /
 INSERT INTO  IDP_AUTHENTICATOR_PROPERTY (TENANT_ID, AUTHENTICATOR_ID, PROPERTY_KEY,PROPERTY_VALUE, IS_SECRET ) VALUES (-1234, 3 , 'IdPEntityId', 'localhost', '0')
 /
-
 CREATE TABLE IDP_PROVISIONING_CONFIG (
             ID INTEGER,
             TENANT_ID INTEGER,
@@ -793,8 +792,6 @@ CREATE TABLE WF_BPS_PROFILE (
     USERNAME VARCHAR2(45),
     PASSWORD VARCHAR2(255),
     CALLBACK_HOST VARCHAR2 (45),
-    CALLBACK_USERNAME VARCHAR2 (45),
-    CALLBACK_PASSWORD VARCHAR2 (255),
     TENANT_ID INTEGER DEFAULT -1,
     PRIMARY KEY (PROFILE_NAME, TENANT_ID))
 /
@@ -905,13 +902,16 @@ CREATE TABLE AM_APPLICATION (
     CALLBACK_URL VARCHAR2(512),
     DESCRIPTION VARCHAR2(512),
     APPLICATION_STATUS VARCHAR2(50) DEFAULT 'APPROVED',
+    GROUP_ID VARCHAR2(100),
     CREATED_BY VARCHAR2(100),
     CREATED_TIME DATE,
     UPDATED_BY VARCHAR2(100),
     UPDATED_TIME DATE,
+    UUID VARCHAR2(256),
     FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON DELETE CASCADE,
     PRIMARY KEY(APPLICATION_ID),
-    UNIQUE (NAME,SUBSCRIBER_ID)
+    UNIQUE (NAME,SUBSCRIBER_ID),
+    UNIQUE (UUID)
 )
 /
 
@@ -995,9 +995,11 @@ CREATE TABLE AM_SUBSCRIPTION (
     CREATED_TIME DATE,
     UPDATED_BY VARCHAR2(100),
     UPDATED_TIME DATE,
+    UUID VARCHAR2(256),
     FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON DELETE CASCADE,
     FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON DELETE CASCADE,
-    PRIMARY KEY (SUBSCRIPTION_ID)
+    PRIMARY KEY (SUBSCRIPTION_ID),
+    UNIQUE (UUID)
 )
 /
 
@@ -1027,6 +1029,7 @@ CREATE TABLE AM_APPLICATION_KEY_MAPPING (
     APPLICATION_ID INTEGER,
     CONSUMER_KEY VARCHAR2(512),
     KEY_TYPE VARCHAR2(512) NOT NULL,
+    CREATE_MODE VARCHAR2(30) DEFAULT 'CREATED',
     STATE VARCHAR2(30) NOT NULL,
     FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON DELETE CASCADE,
     PRIMARY KEY(APPLICATION_ID,KEY_TYPE)
@@ -1040,6 +1043,7 @@ CREATE TABLE AM_APPLICATION_REGISTRATION (
     APP_ID INTEGER,
     TOKEN_TYPE VARCHAR2(30),
     TOKEN_SCOPE VARCHAR2(256) DEFAULT 'default',
+    INPUTS VARCHAR2(1024),
     ALLOWED_DOMAINS VARCHAR2(256),
     VALIDITY_PERIOD NUMBER(19),
     UNIQUE (SUBSCRIBER_ID,APP_ID,TOKEN_TYPE),
@@ -1253,4 +1257,3 @@ CREATE OR REPLACE TRIGGER AM_API_DEFAULT_VERSION_TRG
 /
 CREATE INDEX IDX_SUB_APP_ID ON AM_SUBSCRIPTION (APPLICATION_ID, SUBSCRIPTION_ID)
 /
-

modules/distribution/src/repository/resources/dbscripts/apimgt/oracle_rac.sql

@@ -77,6 +77,7 @@ 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),
             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,
@@ -87,6 +88,7 @@ CREATE INDEX IDX_AT_CK_AU ON IDN_OAUTH2_ACCESS_TOKEN(CONSUMER_KEY_ID, AUTHZ_USER
 CREATE INDEX IDX_TC ON IDN_OAUTH2_ACCESS_TOKEN(TIME_CREATED)
 /
 CREATE TABLE IDN_OAUTH2_AUTHORIZATION_CODE (
+            CODE_ID VARCHAR (255),
             AUTHORIZATION_CODE VARCHAR2 (512),
             CONSUMER_KEY_ID INTEGER,
 	          CALLBACK_URL VARCHAR2 (1024),
@@ -98,7 +100,7 @@ CREATE TABLE IDN_OAUTH2_AUTHORIZATION_CODE (
             VALIDITY_PERIOD NUMBER(19),
             STATE VARCHAR (25) DEFAULT 'ACTIVE',
             TOKEN_ID VARCHAR(255),
-            PRIMARY KEY (AUTHORIZATION_CODE),
+            PRIMARY KEY (CODE_ID),
             FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE)
 /
 CREATE TABLE IDN_OAUTH2_ACCESS_TOKEN_SCOPE (
@@ -133,7 +135,7 @@ CREATE TABLE IDN_OAUTH2_RESOURCE_SCOPE (
             SCOPE_ID INTEGER NOT NULL,
             TENANT_ID INTEGER DEFAULT -1,
             PRIMARY KEY (RESOURCE_PATH),
-            FOREIGN KEY (SCOPE_ID) REFERENCES IDN_OAUTH2_SCOPE (SCOPE_ID))
+            FOREIGN KEY (SCOPE_ID) REFERENCES IDN_OAUTH2_SCOPE (SCOPE_ID) ON DELETE CASCADE)
 /
 CREATE TABLE IDN_SCIM_GROUP (
 			ID INTEGER,
@@ -296,7 +298,7 @@ CREATE OR REPLACE TRIGGER SP_METADATA_TRIG
 CREATE TABLE SP_INBOUND_AUTH (
             ID INTEGER,
             TENANT_ID INTEGER NOT NULL,
-            INBOUND_AUTH_KEY VARCHAR (255) NOT NULL,
+            INBOUND_AUTH_KEY VARCHAR (255),
             INBOUND_AUTH_TYPE VARCHAR (255) NOT NULL,
             PROP_NAME VARCHAR (255),
             PROP_VALUE VARCHAR (1024) ,
@@ -581,7 +583,6 @@ INSERT INTO IDP_AUTHENTICATOR (TENANT_ID, IDP_ID, NAME) VALUES (-1234, 1, 'IDPPr
 /
 INSERT INTO IDP_AUTHENTICATOR (TENANT_ID, IDP_ID, NAME) VALUES (-1234, 1, 'passivests')
 /
-
 CREATE TABLE IDP_METADATA (
             ID INTEGER,
             IDP_ID INTEGER,
@@ -609,7 +610,6 @@ INSERT INTO IDP_METADATA (IDP_ID, NAME, VALUE, DISPLAY_NAME) VALUES (1, 'Session
 /
 INSERT INTO IDP_METADATA (IDP_ID, NAME, VALUE, DISPLAY_NAME) VALUES (1, 'RememberMeTimeout', '15', 'RememberMe Timeout')
 /
-
 CREATE TABLE IDP_AUTHENTICATOR_PROPERTY (
             ID INTEGER,
             TENANT_ID INTEGER,
@@ -788,8 +788,6 @@ CREATE TABLE WF_BPS_PROFILE (
     USERNAME VARCHAR2(45),
     PASSWORD VARCHAR2(255),
     CALLBACK_HOST VARCHAR2 (45),
-    CALLBACK_USERNAME VARCHAR2 (45),
-    CALLBACK_PASSWORD VARCHAR2 (255),
     TENANT_ID INTEGER DEFAULT -1,
     PRIMARY KEY (PROFILE_NAME, TENANT_ID))
 /
@@ -862,7 +860,6 @@ CREATE TABLE WF_WORKFLOW_REQUEST_RELATION(
   FOREIGN KEY (WORKFLOW_ID) REFERENCES WF_WORKFLOW(ID)ON DELETE CASCADE,
   FOREIGN KEY (REQUEST_ID) REFERENCES WF_REQUEST(UUID)ON DELETE CASCADE)
 /
-
 -- End of IDENTITY Tables--
 
 -- Start of API-MGT Tables--
@@ -902,13 +899,16 @@ CREATE TABLE AM_APPLICATION (
     CALLBACK_URL VARCHAR2(512),
     DESCRIPTION VARCHAR2(512),
     APPLICATION_STATUS VARCHAR2(50) DEFAULT 'APPROVED',
+    GROUP_ID VARCHAR2(100),
     CREATED_BY VARCHAR2(100),
     CREATED_TIME DATE,
     UPDATED_BY VARCHAR2(100),
     UPDATED_TIME DATE,
+    UUID VARCHAR2(256),
     FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON DELETE CASCADE,
     PRIMARY KEY(APPLICATION_ID),
-    UNIQUE (NAME,SUBSCRIBER_ID)
+    UNIQUE (NAME,SUBSCRIBER_ID),
+    UNIQUE (UUID)
 )
 /
 
@@ -931,7 +931,7 @@ CREATE TABLE AM_API (
     API_NAME VARCHAR2(256),
     API_VERSION VARCHAR2(30),
     CONTEXT VARCHAR2(256),
-    CONTEXT VARCHAR2(256),
+    CONTEXT_TEMPLATE VARCHAR2(256),
     CREATED_BY VARCHAR2(100),
     CREATED_TIME DATE,
     UPDATED_BY VARCHAR2(100),
@@ -992,9 +992,11 @@ CREATE TABLE AM_SUBSCRIPTION (
     CREATED_TIME DATE,
     UPDATED_BY VARCHAR2(100),
     UPDATED_TIME DATE,
+    UUID VARCHAR2(256),
     FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON DELETE CASCADE,
     FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON DELETE CASCADE,
-    PRIMARY KEY (SUBSCRIPTION_ID)
+    PRIMARY KEY (SUBSCRIPTION_ID),
+    UNIQUE (UUID)
 )
 /
 
@@ -1024,6 +1026,7 @@ CREATE TABLE AM_APPLICATION_KEY_MAPPING (
     APPLICATION_ID INTEGER,
     CONSUMER_KEY VARCHAR2(512),
     KEY_TYPE VARCHAR2(512) NOT NULL,
+    CREATE_MODE VARCHAR2(30) DEFAULT 'CREATED',
     STATE VARCHAR2(30) NOT NULL,
     FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON DELETE CASCADE,
     PRIMARY KEY(APPLICATION_ID,KEY_TYPE)
@@ -1037,6 +1040,7 @@ CREATE TABLE AM_APPLICATION_REGISTRATION (
     APP_ID INTEGER,
     TOKEN_TYPE VARCHAR2(30),
     TOKEN_SCOPE VARCHAR2(256) DEFAULT 'default',
+    INPUTS VARCHAR2(1000),
     ALLOWED_DOMAINS VARCHAR2(256),
     VALIDITY_PERIOD NUMBER(19),
     UNIQUE (SUBSCRIBER_ID,APP_ID,TOKEN_TYPE),
@@ -1250,4 +1254,3 @@ CREATE OR REPLACE TRIGGER AM_API_DEFAULT_VERSION_TRG
 /
 CREATE INDEX IDX_SUB_APP_ID ON AM_SUBSCRIPTION (APPLICATION_ID, SUBSCRIPTION_ID)
 /
-

modules/distribution/src/repository/resources/dbscripts/apimgt/postgresql.sql

@@ -72,6 +72,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),
 	    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,
@@ -84,6 +85,7 @@ CREATE INDEX IDX_TC ON IDN_OAUTH2_ACCESS_TOKEN(TIME_CREATED);
 
 DROP TABLE IF EXISTS IDN_OAUTH2_AUTHORIZATION_CODE;
 CREATE TABLE IDN_OAUTH2_AUTHORIZATION_CODE (
+            CODE_ID VARCHAR (255),
             AUTHORIZATION_CODE VARCHAR(512),
             CONSUMER_KEY_ID INTEGER,
 	          CALLBACK_URL VARCHAR(1024),
@@ -95,7 +97,7 @@ CREATE TABLE IDN_OAUTH2_AUTHORIZATION_CODE (
 	          VALIDITY_PERIOD BIGINT,
             STATE VARCHAR (25) DEFAULT 'ACTIVE',
             TOKEN_ID VARCHAR(255),
-            PRIMARY KEY (AUTHORIZATION_CODE),
+            PRIMARY KEY (CODE_ID),
             FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE
 );
 
@@ -126,7 +128,7 @@ CREATE TABLE IF NOT EXISTS IDN_OAUTH2_RESOURCE_SCOPE (
             SCOPE_ID INTEGER NOT NULL,
             TENANT_ID INTEGER DEFAULT -1,
             PRIMARY KEY (RESOURCE_PATH),
-            FOREIGN KEY (SCOPE_ID) REFERENCES IDN_OAUTH2_SCOPE (SCOPE_ID)
+            FOREIGN KEY (SCOPE_ID) REFERENCES IDN_OAUTH2_SCOPE (SCOPE_ID) ON DELETE CASCADE ON UPDATE CASCADE
 );
 
 DROP TABLE IF EXISTS IDN_SCIM_GROUP;
@@ -271,7 +273,7 @@ CREATE SEQUENCE SP_INBOUND_AUTH_SEQ;
 CREATE TABLE SP_INBOUND_AUTH (
             ID INTEGER DEFAULT NEXTVAL('SP_INBOUND_AUTH_SEQ'),
             TENANT_ID INTEGER NOT NULL,
-            INBOUND_AUTH_KEY VARCHAR (255) NOT NULL,
+            INBOUND_AUTH_KEY VARCHAR (255),
             INBOUND_AUTH_TYPE VARCHAR (255) NOT NULL,
             PROP_NAME VARCHAR (255),
             PROP_VALUE VARCHAR (1024) ,
@@ -700,13 +702,16 @@ CREATE TABLE AM_APPLICATION (
     CALLBACK_URL VARCHAR(512),
     DESCRIPTION VARCHAR(512),
     APPLICATION_STATUS VARCHAR(50) DEFAULT 'APPROVED',
+    GROUP_ID VARCHAR(100),
     CREATED_BY VARCHAR(100),
     CREATED_TIME DATE,
     UPDATED_BY VARCHAR(100),
     UPDATED_TIME DATE,
+    UUID VARCHAR(256),
     FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
     PRIMARY KEY(APPLICATION_ID),
-    UNIQUE (NAME,SUBSCRIBER_ID)
+    UNIQUE (NAME,SUBSCRIBER_ID),
+    UNIQUE (UUID)
 )
 ;
 
@@ -753,9 +758,11 @@ CREATE TABLE AM_SUBSCRIPTION (
     CREATED_TIME DATE,
     UPDATED_BY VARCHAR(100),
     UPDATED_TIME DATE,
+    UUID VARCHAR(256),
     FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
     FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
-    PRIMARY KEY (SUBSCRIPTION_ID)
+    PRIMARY KEY (SUBSCRIPTION_ID),
+    UNIQUE (UUID)
 )
 ;
 
@@ -773,6 +780,7 @@ CREATE TABLE AM_APPLICATION_KEY_MAPPING (
     CONSUMER_KEY VARCHAR(512),
     KEY_TYPE VARCHAR(512) NOT NULL,
     STATE VARCHAR(30),
+    CREATE_MODE VARCHAR(30) DEFAULT 'CREATED',
     FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
     PRIMARY KEY(APPLICATION_ID,KEY_TYPE)
 )
@@ -786,6 +794,7 @@ CREATE TABLE IF NOT EXISTS AM_APPLICATION_REGISTRATION (
     APP_ID INT,
     TOKEN_TYPE VARCHAR(30),
     TOKEN_SCOPE VARCHAR(256) DEFAULT 'default',
+    INPUTS VARCHAR(1000),
     ALLOWED_DOMAINS VARCHAR(256),
     VALIDITY_PERIOD BIGINT,
     UNIQUE (SUBSCRIBER_ID,APP_ID,TOKEN_TYPE),

pom.xml

@@ -1013,7 +1013,7 @@
 
         <!--Eclipse Osgi-->
         <eclipse.equinox.common.version>3.6.100.v20120522-1841</eclipse.equinox.common.version>
-        <eclipse.osgi.version>3.8.1.v20120830-144521</eclipse.osgi.version>
+        <eclipse.osgi.version>3.9.1.v20130814-1242</eclipse.osgi.version>
 
         <!--Orbit versions-->
 
@@ -1034,7 +1034,7 @@
         <carbon.deployment.version>4.6.0</carbon.deployment.version>
 
         <!-- Carbon Identity -->
-        <carbon.identity.version>5.0.3</carbon.identity.version>
+        <carbon.identity.version>5.0.7</carbon.identity.version>
 
         <!-- Carbon Multi-tenancy -->
         <carbon.multitenancy.version>4.5.0</carbon.multitenancy.version>
@@ -1046,7 +1046,7 @@
         <carbon.governance.version>4.5.8</carbon.governance.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>0.9.2-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version>1.1.0-SNAPSHOT</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[0.8.0, 2.0.0)</carbon.device.mgt.version.range>
 
         <!-- Carbon Mobile Device Management -->