diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index e1acdd5a..ff7181d3 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -2060,5 +2060,12 @@ 644 + + + + src/core/resources/dbscripts/storage/resource.sql + ${pom.artifactId}-${pom.version}/dbscripts/storage/postgresql + + diff --git a/modules/distribution/src/core/resources/dbscripts/storage/resource.sql b/modules/distribution/src/core/resources/dbscripts/storage/resource.sql new file mode 100644 index 00000000..7ec87c48 --- /dev/null +++ b/modules/distribution/src/core/resources/dbscripts/storage/resource.sql @@ -0,0 +1,9 @@ +CREATE TABLE IF NOT EXISTS resource ( + uuid VARCHAR(250), + tenantId VARCHAR(250), + fileName VARCHAR(250), + contentLength INT, + contentType VARCHAR(150), + content BYTEA +) +; diff --git a/modules/integration/tests-integration/src/test/resources/jmeter-scripts/AppManagerTest.jmx b/modules/integration/tests-integration/src/test/resources/jmeter-scripts/AppManagerTest.jmx index c56a953b..a632ea4c 100644 --- a/modules/integration/tests-integration/src/test/resources/jmeter-scripts/AppManagerTest.jmx +++ b/modules/integration/tests-integration/src/test/resources/jmeter-scripts/AppManagerTest.jmx @@ -91,6 +91,12 @@ Created Date = + + superTenantDomain + carbon.super + Super Tenant Domain + = + @@ -438,22 +444,15 @@ vars.put("encoded", encoded); - + - + false - ${RelayState} + true = true - RelayState - - - false - ${sessionDataKey} - = - true - sessionDataKey + tocommonauth false @@ -469,6 +468,75 @@ vars.put("encoded", encoded); true password + + false + ${sessionDataKey} + = + true + sessionDataKey + + + + ${server} + ${port} + + + https + + samlsso + POST + true + false + true + false + HttpClient4 + false + + + + + + sessionDataKey + //input[@type='hidden'][@name='sessionDataKey']/@value + false + true + false + all + -1 + + + + + + + + false + on + = + true + consent_select_all + + + false + on + = + true + consent_0 + + + false + ${sessionDataKey} + = + true + sessionDataKey + + + false + approve + = + true + consent + ${server} @@ -478,7 +546,7 @@ vars.put("encoded", encoded); https commonauth - GET + POST true false true @@ -2607,6 +2675,180 @@ vars.put("encoded", encoded); + + + + + ${server} + ${port} + + + https + + publisher + GET + true + false + true + false + false + + + + + + SAMLRequest + //input[@type='hidden'][@name='SAMLRequest']/@value + false + true + false + -1 + + + + + RelayState + //input[@type='hidden'][@name='RelayState']/@value + false + true + false + -1 + + + + + SSOAuthSessionID + //input[@type='hidden'][@name='SSOAuthSessionID']/@value + false + true + false + -1 + + + + + + + + ${server} + ${port} + + + https + + publisher + GET + true + false + true + false + false + + + + + + SAMLRequest + //input[@type='hidden'][@name='SAMLRequest']/@value + false + true + false + -1 + + + + + RelayState + //input[@type='hidden'][@name='RelayState']/@value + false + true + false + -1 + + + + + SSOAuthSessionID + //input[@type='hidden'][@name='SSOAuthSessionID']/@value + false + true + false + -1 + + + + + + + + false + true + = + true + tocommonauth + + + false + ${username} + = + true + username + + + false + ${password} + = + true + password + + + false + ${sessionDataKey} + = + true + sessionDataKey + + + + ${server} + ${port} + + + https + + samlsso + POST + true + false + true + false + HttpClient4 + false + + + + + + SAMLResponse + //input[@type='hidden'][@name='SAMLResponse']/@value + false + true + false + -1 + + + + + sessionDataKey + //input[@type='hidden'][@name='sessionDataKey']/@value + false + true + false + all + -1 + + + continue @@ -2762,26 +3004,19 @@ vars.put("encoded", encoded); - + - + false - ${RelayState} + true = true - RelayState - - - false - ${sessionDataKey} - = - true - sessionDataKey + tocommonauth false - ${username}@${domain_name} + ${username} = true username @@ -2793,6 +3028,94 @@ vars.put("encoded", encoded); true password + + false + ${sessionDataKey} + = + true + sessionDataKey + + + + ${server} + ${port} + + + https + + samlsso + POST + true + false + true + false + HttpClient4 + false + + + + + + SAMLResponse + //input[@type='hidden'][@name='SAMLResponse']/@value + false + true + false + -1 + + + + + You are now redirected back to + + Assertion.response_data + false + 16 + + + + + sessionDataKey + //input[@type='hidden'][@name='sessionDataKey']/@value + false + true + false + all + -1 + + + + + + + + false + on + = + true + consent_select_all + + + false + on + = + true + consent_0 + + + false + ${sessionDataKey} + = + true + sessionDataKey + + + false + approve + = + true + consent + ${server} @@ -2821,25 +3144,6 @@ vars.put("encoded", encoded); -1 - - - SAMLResponse - //input[@type='hidden'][@name='SAMLResponse']/@value - false - true - false - -1 - - - - - You are now redirected back to - - Assertion.response_data - false - 16 - - diff --git a/pom.xml b/pom.xml index 49a9dd19..89265a7e 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ modules/cxf-filters modules/p2-profile modules/distribution - + modules/integration