Merge branch 'master' of https://gitlab.com/entgra/product-iots into entgra-master

357-notification-for-kiosk-mode
Charitha Goonetilleke 5 years ago
commit 3eba25f1e4

@ -382,22 +382,21 @@
</excludes>
</fileSet>
<!-- Copying APP Manager Publisher and Store Jaggery apps -->
<!--<fileSet>-->
<!--<directory>-->
<!--../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/publisher/-->
<!--</directory>-->
<!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/publisher-->
<!--</outputDirectory>-->
<!--<excludes>-->
<!--<exclude>publisherLogo/**</exclude>-->
<!--<exclude>publisherTheme/**</exclude>-->
<!--<exclude>publisherSite/**</exclude>-->
<!--<exclude>footer/**</exclude>-->
<!--<exclude>localstyles.css</exclude>-->
<!-- Copying API Manager Publisher and Store Jaggery apps -->
<fileSet>
<directory>
../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/api-publisher
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/api-publisher</outputDirectory>
<excludes>
<exclude>publisherLogo/**</exclude>
<exclude>publisherTheme/**</exclude>
<exclude>publisherSite/**</exclude>
<exclude>footer/**</exclude>
<exclude>localstyles.css</exclude>
<!-- <exclude>**/jaggery.conf</exclude>-->
<!--</excludes>-->
<!--</fileSet>-->
</excludes>
</fileSet>
<!--<fileSet>-->
<!--<directory>-->
<!--../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/store/-->
@ -1111,6 +1110,15 @@
<fileMode>755</fileMode>
</file>
<!-- Copying config file for enabling sso in api-publisher-->
<file>
<source>src/core/jaggeryapps/api-publisher/site/conf/site.json</source>
<outputDirectory>
${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/api-publisher/site/conf
</outputDirectory>
<fileMode>755</fileMode>
</file>
<!-- Copying synapse.properties file -->
<file>
<source>src/core/conf/synapse.properties</source>

@ -0,0 +1,59 @@
{
"theme" : {
"base" : "wso2",
"subtheme" : "modern"
},
"context" : "/api-publisher",
"enableRestrictByRoles" : "true",
"enableSelectedTenantSubscription" : "true",
"ssoConfiguration" : {
"enabled" : "false",
"issuer" : "API_PUBLISHER",
"identityProviderURL" : "https://localhost:9443/samlsso",
"keyStorePassword" : "",
"identityAlias" : "",
"verifyAssertionValidityPeriod":"true",
"timestampSkewInSeconds":"300",
"audienceRestrictionsEnabled":"true",
"responseSigningEnabled":"true",
"assertionSigningEnabled":"true",
"keyStoreName" :"",
"signRequests" : "true",
"assertionEncryptionEnabled" : "false",
"idpInit" : "false",
"idpInitSSOURL" : "https://localhost:9443/samlsso?spEntityID=API_PUBLISHER",
"loginUserNameAttribute" : ""
//"identityProviderLogoutURL" : "https://localhost:9443/samlsso",
//"externalLogoutPage" : "https://localhost:9443/samlsso?slo=true"
//"acsURL" : "https://localhost:9443/publisher/jagg/jaggery_acs.jag", //use only if Assertion Consumer Service URL needs to be sent along with SAML request
//"nameIdPolicy" : "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", //If not specified, 'urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified' will be used
},
"oidcConfiguration" : {
"enabled" : "false",
"issuer" : "API_PUBLISHER",
"identityProviderURI" : "http://localhost:8080/openid-connect-server-webapp/",
"authorizationEndpointURI" : "http://localhost:8080/openid-connect-server-webapp/authorize",
"tokenEndpointURI" : "http://localhost:8080/openid-connect-server-webapp/token",
"userInfoURI" : "http://localhost:8080/openid-connect-server-webapp/userinfo",
"jwksURI" : "http://localhost:8080/openid-connect-server-webapp/jwk",
"logoutEndpointURI" : "http://localhost:8080/openid-connect-server-webapp/logout",
"authHttpMethod": "POST",
"clientConfiguration" : {
"clientId" : "client_am_publisher",
"clientSecret" : "secret",
"responseType" : "code",
"authorizationType" : "authorization_code",
"scope" : "phone email address openid profile",
"redirectURI" : "https://localhost:9443/publisher/jagg/jaggery_oidc_acs.jag",
"postLogoutRedirectURI" : "https://localhost:9443/store/"
}
},
"reverseProxy" : {
"enabled" : false, // values true , false , "auto" - will look for X-Forwarded-* headers
"host" : "sample.proxydomain.com", // If reverse proxy do not have a domain name use IP
"context":"",
//"regContext":"" // Use only if different path is used for registry
},
}

@ -600,6 +600,9 @@
<featureArtifactDef>
org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.store.feature:${carbon.api.mgt.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.publisher.feature:${carbon.api.mgt.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.authenticator.oidc.feature:${carbon.api.mgt.version}
</featureArtifactDef>
@ -1476,6 +1479,10 @@
<id>org.wso2.carbon.apimgt.store.feature.group</id>
<version>${carbon.api.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.apimgt.publisher.feature.group</id>
<version>${carbon.api.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.apimgt.authenticator.oidc.feature.group</id>
<version>${carbon.api.mgt.version}</version>
@ -2241,6 +2248,10 @@
<id>org.wso2.carbon.apimgt.store.feature.group</id>
<version>${carbon.api.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.apimgt.publisher.feature.group</id>
<version>${carbon.api.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.registry.extensions.feature.group</id>
<version>${carbon.governance.version}</version>
@ -2829,6 +2840,10 @@
<id>org.wso2.carbon.apimgt.store.feature.group</id>
<version>${carbon.api.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.apimgt.publisher.feature.group</id>
<version>${carbon.api.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.apimgt.rest.api.dcr.feature.group</id>
<version>${carbon.api.mgt.version}</version>

Loading…
Cancel
Save