diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index ea2b6594..45a59d8f 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -382,22 +382,21 @@ - - - - - - - - - - - - - - - - + + + + ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/api-publisher + + ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/api-publisher + + publisherLogo/** + publisherTheme/** + publisherSite/** + footer/** + localstyles.css + + + @@ -1111,6 +1110,15 @@ 755 + + + src/core/jaggeryapps/api-publisher/site/conf/site.json + + ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/api-publisher/site/conf + + 755 + + src/core/conf/synapse.properties diff --git a/modules/distribution/src/core/jaggeryapps/api-publisher/site/conf/site.json b/modules/distribution/src/core/jaggeryapps/api-publisher/site/conf/site.json new file mode 100644 index 00000000..9f82ee1d --- /dev/null +++ b/modules/distribution/src/core/jaggeryapps/api-publisher/site/conf/site.json @@ -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 + }, +} diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index b9793dff..8ea7959e 100644 --- a/modules/p2-profile/iot-core-profile/pom.xml +++ b/modules/p2-profile/iot-core-profile/pom.xml @@ -597,6 +597,9 @@ org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.store.feature:${carbon.api.mgt.version} + + org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.publisher.feature:${carbon.api.mgt.version} + org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.authenticator.oidc.feature:${carbon.api.mgt.version} @@ -1469,6 +1472,10 @@ org.wso2.carbon.apimgt.store.feature.group ${carbon.api.mgt.version} + + org.wso2.carbon.apimgt.publisher.feature.group + ${carbon.api.mgt.version} + org.wso2.carbon.apimgt.authenticator.oidc.feature.group ${carbon.api.mgt.version} @@ -2230,6 +2237,10 @@ org.wso2.carbon.apimgt.store.feature.group ${carbon.api.mgt.version} + + org.wso2.carbon.apimgt.publisher.feature.group + ${carbon.api.mgt.version} + org.wso2.carbon.registry.extensions.feature.group ${carbon.governance.version} @@ -2814,6 +2825,10 @@ org.wso2.carbon.apimgt.store.feature.group ${carbon.api.mgt.version} + + org.wso2.carbon.apimgt.publisher.feature.group + ${carbon.api.mgt.version} + org.wso2.carbon.apimgt.rest.api.dcr.feature.group ${carbon.api.mgt.version}