From b49dc38fd067028b37b3fda2f89b3be91b6651d0 Mon Sep 17 00:00:00 2001 From: WSO2 Cloud Date: Wed, 29 Jul 2015 22:54:17 +0530 Subject: [PATCH 1/2] Fixing username issue in domain mapping --- .../s4/integration/utils/DomainMappingUtils.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/components/org.wso2.carbon.appfactory.s4.integration/src/main/java/org/wso2/carbon/appfactory/s4/integration/utils/DomainMappingUtils.java b/modules/components/org.wso2.carbon.appfactory.s4.integration/src/main/java/org/wso2/carbon/appfactory/s4/integration/utils/DomainMappingUtils.java index 3b8d8a286..8b8f0113f 100644 --- a/modules/components/org.wso2.carbon.appfactory.s4.integration/src/main/java/org/wso2/carbon/appfactory/s4/integration/utils/DomainMappingUtils.java +++ b/modules/components/org.wso2.carbon.appfactory.s4.integration/src/main/java/org/wso2/carbon/appfactory/s4/integration/utils/DomainMappingUtils.java @@ -41,6 +41,8 @@ import org.wso2.carbon.appfactory.s4.integration.DomainMapperEventHandler; import org.wso2.carbon.appfactory.s4.integration.internal.ServiceReferenceHolder; import org.wso2.carbon.context.CarbonContext; +import org.wso2.carbon.user.core.UserCoreConstants; +import org.wso2.carbon.utils.multitenancy.MultitenantUtils; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -117,8 +119,10 @@ public static DomainMappingResponse sendPostRequest(String stage, String body, S * @return auth header in basic encode */ private static String getAuthHeaderValue() { - String userName = CarbonContext.getThreadLocalCarbonContext().getUsername() + "@" - + CarbonContext.getThreadLocalCarbonContext().getTenantDomain(); + String usernameInContext = CarbonContext.getThreadLocalCarbonContext().getUsername(); + String tenantLessUserName = MultitenantUtils.getTenantAwareUsername(usernameInContext); + String userName = tenantLessUserName+ UserCoreConstants.TENANT_DOMAIN_COMBINER+ + CarbonContext.getThreadLocalCarbonContext().getTenantDomain(); // password as garbage value since we authenticate with mutual ssl. // We need to set the auth header for requests with the username. From 424b22a269266359ffa99846c4c5cfb9a0645805 Mon Sep 17 00:00:00 2001 From: WSO2 Cloud Date: Wed, 29 Jul 2015 22:59:38 +0530 Subject: [PATCH 2/2] Adding custom URL pages --- .../src/modules/application/get/list.jag | 36 +++ .../appmgt/src/modules/application/module.jag | 4 + .../site/blocks/application/get/ajax/list.jag | 37 +++ .../src/site/blocks/urlmapper/add/block.jag | 41 +++- .../site/blocks/urlmapper/get/ajax/get.jag | 91 ++++++++ .../blocks/urlmapper/update/ajax/update.jag | 68 ++++++ .../appmgt/src/site/pages/customurl.jag | 87 +++++++ .../templates/application/get/template.jag | 3 +- .../default/templates/tablinks/template.jag | 6 + .../templates/urlmapper/add/initializer.jag | 26 +++ .../templates/urlmapper/add/js/customurl.js | 218 ++++++++++++++++++ .../templates/urlmapper/add/template.jag | 182 +++++++++++++++ 12 files changed, 794 insertions(+), 5 deletions(-) create mode 100755 modules/jaggery-apps/appmgt/src/site/blocks/urlmapper/get/ajax/get.jag create mode 100644 modules/jaggery-apps/appmgt/src/site/pages/customurl.jag create mode 100755 modules/jaggery-apps/appmgt/src/site/themes/default/templates/urlmapper/add/initializer.jag create mode 100644 modules/jaggery-apps/appmgt/src/site/themes/default/templates/urlmapper/add/js/customurl.js create mode 100755 modules/jaggery-apps/appmgt/src/site/themes/default/templates/urlmapper/add/template.jag diff --git a/modules/jaggery-apps/appmgt/src/modules/application/get/list.jag b/modules/jaggery-apps/appmgt/src/modules/application/get/list.jag index 74face407..67be23d25 100755 --- a/modules/jaggery-apps/appmgt/src/modules/application/get/list.jag +++ b/modules/jaggery-apps/appmgt/src/modules/application/get/list.jag @@ -956,6 +956,42 @@ } }; + var getAppVersionsByStage = function(applicationKey, stage){ + var allResults = getAppVersionsInStages(applicationKey); + return generateCustomUrlResponse(parse(allResults),stage); + }; + + function generateCustomUrlResponse(allResults, stage){ + var simplifiedAppInfo = {}; + if(allResults.length > 0){ + var appinfo = allResults[0]; + simplifiedAppInfo["key"] = appinfo.key; + simplifiedAppInfo["type"] = appinfo.type; + simplifiedAppInfo["mappedSubDomain"] = appinfo.mappedSubDomain; + simplifiedAppInfo["customUrl"] = appinfo.customUrl; + simplifiedAppInfo["customUrlVerificationCode"] = appinfo.customUrlVerificationCode; + simplifiedAppInfo["isUploadable"] = appinfo.isUploadable; + simplifiedAppInfo["name"] = appinfo.name; + simplifiedAppInfo["versions"] = getSimplifiedVersionArray(appinfo.versions, stage); + } + return simplifiedAppInfo; + } + + function getSimplifiedVersionArray(versionsArray, stage){ + var simplifiedVersionArray = []; + for (var i = 0; i < versionsArray.length; i++) { + var version = versionsArray[i]; + if (0 == version.stage.localeCompare(stage)) { + simplifiedVersionArray.push( + { + "version": version.version, + "productionMappedDomain": version.productionMappedDomain + }); + } + } + return simplifiedVersionArray; + } + var getStage = function(applicationKey, version) { jagg.module("permission").checkUserAuthenticated(); var tenantDomain = modManager.getTenantDomain(); diff --git a/modules/jaggery-apps/appmgt/src/modules/application/module.jag b/modules/jaggery-apps/appmgt/src/modules/application/module.jag index b6f55c084..e9872a2a0 100755 --- a/modules/jaggery-apps/appmgt/src/modules/application/module.jag +++ b/modules/jaggery-apps/appmgt/src/modules/application/module.jag @@ -94,6 +94,10 @@ jagg.module("application", { return jagg.require(jagg.getModulesDir() + "application/get/list.jag").getAppVersionsInStages.apply(this, arguments); }, + getAppVersionsByStage:function () { + return jagg.require(jagg.getModulesDir() + "application/get/list.jag").getAppVersionsByStage.apply(this, arguments); + }, + getAppCountInStage:function () { return jagg.require(jagg.getModulesDir() + "application/get/list.jag").getAppCountInStage.apply(this, arguments); }, diff --git a/modules/jaggery-apps/appmgt/src/site/blocks/application/get/ajax/list.jag b/modules/jaggery-apps/appmgt/src/site/blocks/application/get/ajax/list.jag index 232df7c07..e811ae570 100755 --- a/modules/jaggery-apps/appmgt/src/site/blocks/application/get/ajax/list.jag +++ b/modules/jaggery-apps/appmgt/src/site/blocks/application/get/ajax/list.jag @@ -252,6 +252,11 @@ var log=new Log(); var metaDataNeed = request.getParameter("metaDataNeed"); var buildable = request.getParameter("buildable"); print(mod.getAppVersionsInStages(applicationKey, userName, metaDataNeed, buildable, isRoleBasedPermissionAllowed)); + } else if (action === "getAppVersionsByStage") { + mod = jagg.module("application"); + var applicationKey = request.getParameter("applicationKey"); + var stage = request.getParameter("stage"); + print(mod.getAppVersionsByStage(applicationKey,stage)); } else if (action === "getAppVersionsInStagesWithMetaData") { mod = jagg.module("application"); var userName = request.getParameter("userName"); @@ -361,4 +366,36 @@ var log=new Log(); }()); +function generateCustomUrlResponse(allResults, stage){ + var simplifiedAppInfo = {}; + if(allResults.length > 0){ + var appinfo = allResults[0]; + simplifiedAppInfo["key"] = appinfo.key; + simplifiedAppInfo["type"] = appinfo.type; + simplifiedAppInfo["mappedSubDomain"] = appinfo.mappedSubDomain; + simplifiedAppInfo["customUrl"] = appinfo.customUrl; + simplifiedAppInfo["customUrlVerificationCode"] = appinfo.customUrlVerificationCode; + simplifiedAppInfo["isUploadable"] = appinfo.isUploadable; + simplifiedAppInfo["name"] = appinfo.name; + simplifiedAppInfo["versions"] = getSimplifiedVersionArray(appinfo.versions, stage); + } + return simplifiedAppInfo; +} + +function getSimplifiedVersionArray(versionsArray, stage){ + var simplifiedVersionArray = []; + log.info(versionsArray); + for (var i = 0; i < versionsArray.length; i++) { + var version = versionsArray[i]; + if (0 == version.stage.localeCompare(stage)) { + simplifiedVersionArray.push( + { + "version": version.version, + "productionMappedDomain": version.productionMappedDomain + }); + } + } + return simplifiedVersionArray; +} + %> \ No newline at end of file diff --git a/modules/jaggery-apps/appmgt/src/site/blocks/urlmapper/add/block.jag b/modules/jaggery-apps/appmgt/src/site/blocks/urlmapper/add/block.jag index d52eca2d3..16cda9da2 100755 --- a/modules/jaggery-apps/appmgt/src/site/blocks/urlmapper/add/block.jag +++ b/modules/jaggery-apps/appmgt/src/site/blocks/urlmapper/add/block.jag @@ -20,15 +20,48 @@ jagg.block("urlmapper/add", { initialize:function (data) { - } - - - + }, + getInputs:function () { + return { + "applicationKey":null + } + }, + getOutputs:function (inputs) { + var applicationKey = request.getParameter("applicationKey"); + var mod = jagg.module("manager"); + var modApplication = jagg.module("application"); + var userName = jagg.getUser(); + if(userName) { + var permissionModule = jagg.module("permission"); + var isTenantAdmin = permissionModule.hasTenantLevelUserMgtPermission(); + var tenantDomain = mod.getTenantDomain(); + var fineGrainedDomainMappingAllowedStage = getProperty(FINE_GRAINED_DOMAIN_MAPPING); + var hasDomainMappingPermission = jagg.module("permission").isUserAccessGranted(inputs.applicationKey, + PERMISSION_DOMAIN_MAPPING); + var applicationType = mod.getApplicationType(applicationKey); + var isAllowDomainMapping = mod.getApplicationTypeBean(applicationType).isAllowDomainMapping(); + var hasAppCreationPermission = jagg.module("permission").hasAppCreationPermission(); + var isUploadableAppType = mod.getApplicationTypeBean(applicationType).isUploadableAppType(); + var initialAppVersionInfo = modApplication.getAppVersionsByStage(applicationKey, + fineGrainedDomainMappingAllowedStage); + } + return { + "tenantDomain": tenantDomain, + "hasDomainMappingPermission": hasDomainMappingPermission, + "fineGrainedDomainMappingAllowedStage": fineGrainedDomainMappingAllowedStage, + "isAllowDomainMapping": isAllowDomainMapping, + "hasAppCreationPermission": hasAppCreationPermission, + "isUploadableAppType": isUploadableAppType, + "isTenantAdmin":isTenantAdmin, + "initialAppVersionInfo": initialAppVersionInfo + }; + } }); %> + diff --git a/modules/jaggery-apps/appmgt/src/site/blocks/urlmapper/get/ajax/get.jag b/modules/jaggery-apps/appmgt/src/site/blocks/urlmapper/get/ajax/get.jag new file mode 100755 index 000000000..7ff436a94 --- /dev/null +++ b/modules/jaggery-apps/appmgt/src/site/blocks/urlmapper/get/ajax/get.jag @@ -0,0 +1,91 @@ +<% +/* + * Copyright (c) 2014, 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +include("/jagg/jagg.jag"); +include("/jagg/constants.jag"); +include("/jagg/config_reader.jag"); + +var lifeCycleModule = jagg.module("lifecycle"); +var log=new Log(); +var mod = jagg.module("urlmapper"); +var permission = jagg.module("permission"); +var manager = jagg.module("manager"); + +(function () { + action = request.getParameter("action"), + site = require("/site/conf/site.json"); + if (!jagg.getUser()) { + print(UNAUTHORIZED_ERROR_RESPONSE); + return; + } + if(action == "addNewCustomUrl"){ + var newCustomUrl = request.getParameter("newCustomUrl"); + newCustomUrl = newCustomUrl.toLowerCase(); + var applicationKey = request.getParameter("applicationKey"); + if (permission.isUserAccessGranted(applicationKey, PERMISSION_DOMAIN_MAPPING)){ + var stage = getProperty(FINE_GRAINED_DOMAIN_MAPPING); + try { + mod.addNewCustomUrl(stage, newCustomUrl, applicationKey, null, true); + } catch (e) { + // we are logging this as warn messages since this is caused, due a to user error. For example if the + // user entered a rubbish custom url(Or a url which CNAME record is not propagated at the time of + // adding the url), then url validation will fail but it is not an system error + var msg = "Error while adding new customer url: "+ newCustomUrl +" for application: "+applicationKey + +" in stage: " + stage+". New custom url: "+newCustomUrl+" might not a valid url(or non existing)"; + log.warn(msg); + log.warn(e); + response.status = 400; + response.content = e; + } + + } else { + response.status = 401; + response.content = "Unauthorized!!! Only Application Owner has permission to complete this action"; + } + } else if (action == "addDefaultProdUrl") { + var appKey = request.getParameter("applicationKey"); + var version = null; + var applicationType = manager.getApplicationType(appKey); + var isUploadableAppType = manager.getApplicationTypeBean(applicationType).isUploadableAppType(); + if (isUploadableAppType) { + version = UPLOADABLE_APPLICATION_INITIAL_VERSION; + } + try { + if(manager.getApplicationTypeBean(applicationType).isAllowDomainMapping()) { + mod.addDefaultProdUrl(appKey, version); + print(true); + } + print(false); + } catch (e) { + var msg = "Error while adding default production url"; + log.error(msg); + log.error(e); + response.status = 400; + response.content = e; + } + } + else { + throw new Error("No action specified"); + } +}()); + + + +%> + diff --git a/modules/jaggery-apps/appmgt/src/site/blocks/urlmapper/update/ajax/update.jag b/modules/jaggery-apps/appmgt/src/site/blocks/urlmapper/update/ajax/update.jag index 951e7d50c..7a6964f1f 100755 --- a/modules/jaggery-apps/appmgt/src/site/blocks/urlmapper/update/ajax/update.jag +++ b/modules/jaggery-apps/appmgt/src/site/blocks/urlmapper/update/ajax/update.jag @@ -100,6 +100,29 @@ var permission = jagg.module("permission"); } else { response.sendError(401, "Unauthorized!!! Only Application Owner has permission to complete this action"); } + } else if(action == "updateDomainMapping"){ + + var newCustomUrl = request.getParameter("productionCustom"); + newCustomUrl = newCustomUrl.toLowerCase(); + var newVersionToMap = request.getParameter("productionVersion"); + var applicationKey = request.getParameter("applicationKey"); + if (permission.isUserAccessGranted(applicationKey, PERMISSION_DOMAIN_MAPPING)){ + try { + changeDomainMapping(applicationKey, newVersionToMap, newCustomUrl); + } catch (e) { + var msg = "Error while updating the production/customer url(s) " + +( (newVersionToMap) ? " to version:"+newVersionToMap:"") + +( (newCustomUrl) ?" to new custom URL:"+newCustomUrl:"") + +" for application: "+applicationKey + +", tenantDomain:"+jagg.module("manager").getTenantDomain(); + log.error(msg); + log.error(e); + response.status = 400; + response.content = e; + } + } else { + response.sendError(401, "Unauthorized!!! Only Application Owner has permission to complete this action"); + } } else if(action == "removeCustomUrl"){ var applicationKey = request.getParameter("applicationKey"); var stage = getProperty(FINE_GRAINED_DOMAIN_MAPPING); @@ -122,6 +145,51 @@ var permission = jagg.module("permission"); }()); +function changeDomainMapping(applicationKey, newVersionToMap, newCustomUrl){ + var modApplication = jagg.module("application"); + var modUrlMapper = jagg.module("urlmapper"); + var domainMappingAllowedStage = getProperty(FINE_GRAINED_DOMAIN_MAPPING); + var initialAppVersionInfo = modApplication.getAppVersionsByStage(applicationKey, domainMappingAllowedStage); + + var existingCustomUrl = initialAppVersionInfo.customUrl; + var existingMappedVersion = getExistingMappedVersion(initialAppVersionInfo.versions); + if(newCustomUrl == existingCustomUrl && (existingMappedVersion) && ! newVersionToMap){ + throw "Cannot remove existing mapped version"; + } + if(newCustomUrl) { // if new custom Url is defined + if(existingMappedVersion){ // if there is already existing mapped version + modUrlMapper.mapNewCustomUrlToVersion( + domainMappingAllowedStage,newCustomUrl,applicationKey,newVersionToMap,true); + } else { // if there is no already existing mapped version + if(existingCustomUrl){ // if there is existing custom url + modUrlMapper.updateExistingUnmappedCustomUrl(domainMappingAllowedStage,newCustomUrl,applicationKey); + } else { // if there is no existing custom url + modUrlMapper.addNewCustomUrl(domainMappingAllowedStage, newCustomUrl, applicationKey, null, true); + } + modUrlMapper.remapDomainToVersion( + domainMappingAllowedStage, applicationKey, newVersionToMap,existingMappedVersion); + } + } else { // if new custom url is not defined + if(existingCustomUrl){ + modUrlMapper.removeDomainMappingFromApplication(domainMappingAllowedStage,applicationKey,null,true); + } else { + modUrlMapper.remapDomainToVersion( + domainMappingAllowedStage, applicationKey, newVersionToMap,existingMappedVersion); + } + + } +} + +function getExistingMappedVersion(versionsArray){ + for (var i = 0; i < versionsArray.length; i++) { + var version = versionsArray[i]; + if(version.productionMappedDomain){ + return version.version; + } + } + return null; +} + %> diff --git a/modules/jaggery-apps/appmgt/src/site/pages/customurl.jag b/modules/jaggery-apps/appmgt/src/site/pages/customurl.jag new file mode 100644 index 000000000..deb46087e --- /dev/null +++ b/modules/jaggery-apps/appmgt/src/site/pages/customurl.jag @@ -0,0 +1,87 @@ +<% +/* + * Copyright (c) 2014, 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +include("/jagg/jagg.jag"); +var site = require("/site/conf/site.json"); + +(function () { + var applicationName = request.getParameter("applicationName"); + var applicationKey = request.getParameter("applicationKey"); + jagg.render({ + "name":"page/master", + "inputs":{ + "title":"WSO2 App Factory", + "pagePath":"/site/pages/customurl.jag", + "pageName":"Custom URL", + "body":[ + { + "name":"layout/master", + "inputs":{ + "title":"WSO2 App Factory", + "middle":[ + { + "name":"urlmapper/add", + "inputs":{ + "applicationKey":applicationKey, + "applicationName": applicationName + } + } + ], + "breadcrumb":[ + { + "name":"breadcrumb", + "inputs":{ + "linkParams": [ + { + "basePath":"/site/pages/application.jag", + "displayName": applicationName, + "params": { + "applicationKey":applicationKey, + "applicationName":applicationName + } + }, + { + "basePath":"/site/pages/customurl.jag", + "displayName": "Custom URL", + "params": { + "applicationKey":applicationKey, + "applicationName":applicationName + } + } + ] + } + } + ], + "tablinks":[ + { + "name":"tablinks", + "inputs":{ + "applicationKey":applicationKey, + "applicationName":applicationName, + "pageName":"CustomURL" + } + } + ] + } + } + ] + } + }); +}()); +%> \ No newline at end of file diff --git a/modules/jaggery-apps/appmgt/src/site/themes/default/templates/application/get/template.jag b/modules/jaggery-apps/appmgt/src/site/themes/default/templates/application/get/template.jag index 039a376c7..ef4fc331f 100755 --- a/modules/jaggery-apps/appmgt/src/site/themes/default/templates/application/get/template.jag +++ b/modules/jaggery-apps/appmgt/src/site/themes/default/templates/application/get/template.jag @@ -83,7 +83,8 @@ if (customUrl) { %>
<%=customUrl%> - + ?applicationName=<%=applicationName%>&applicationKey=<%=applicationKey%>"> +
<%}%> diff --git a/modules/jaggery-apps/appmgt/src/site/themes/default/templates/tablinks/template.jag b/modules/jaggery-apps/appmgt/src/site/themes/default/templates/tablinks/template.jag index bb4d55880..e1819da52 100755 --- a/modules/jaggery-apps/appmgt/src/site/themes/default/templates/tablinks/template.jag +++ b/modules/jaggery-apps/appmgt/src/site/themes/default/templates/tablinks/template.jag @@ -96,6 +96,12 @@ include("/jagg/constants.jag"); <% } %> + +
  • selected<%}%>"> + ?applicationName=<%=applicationName%>&applicationKey=<%=applicationKey%>" title="Custom URL"> + Custom URL + +
    • diff --git a/modules/jaggery-apps/appmgt/src/site/themes/default/templates/urlmapper/add/initializer.jag b/modules/jaggery-apps/appmgt/src/site/themes/default/templates/urlmapper/add/initializer.jag new file mode 100755 index 000000000..357ac0a40 --- /dev/null +++ b/modules/jaggery-apps/appmgt/src/site/themes/default/templates/urlmapper/add/initializer.jag @@ -0,0 +1,26 @@ +<% +/* + * Copyright (c) 2014, 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +jagg.initializer("urlmapper/add", { + + preInitialize:function () { + + } +}); +%> \ No newline at end of file diff --git a/modules/jaggery-apps/appmgt/src/site/themes/default/templates/urlmapper/add/js/customurl.js b/modules/jaggery-apps/appmgt/src/site/themes/default/templates/urlmapper/add/js/customurl.js new file mode 100644 index 000000000..bb2024f14 --- /dev/null +++ b/modules/jaggery-apps/appmgt/src/site/themes/default/templates/urlmapper/add/js/customurl.js @@ -0,0 +1,218 @@ +/* + * + * Copyright (c) 2015, 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * / + */ + +// Required global variables +var urlPatternErrorMsg = ""; + +// page initialization +$(document).ready(function () { + var productionVersionElem = $('#productionVersion'); + $('.loader').loading('hide'); + $('.loading-cover').overlay('hide'); + productionVersionElem.select2({placeholder: "Select a version", allowClear: hasDomainMappingPermission}); + $.validator.addMethod("validateCustomUrlPattern", validateCustomUrlPattern, getCustomUrlPatternErrMsg); + var creationFormValidationOpts = getValidationOptions(); + $("#customUrlForm").validate(creationFormValidationOpts); + $("#customUrlForm").ajaxForm({ + complete: function (result, status) { // on complete + $("#addCustomUrl").prop("disabled", true); + if (status == "error") { + jagg.message({ + content: result.responseText, + type: 'error', + id: 'myuniqeid' + }); + } else { + jagg.message({ + content: "Custom URL updated successfully", + type: 'success', + id: 'myuniqeid' + }); + } + getAppVersionsByStage(applicationKey, $('#domainMappingAllowedStage').val()); + } + }); + productionVersionElem.on("change", function (e) { + var validator = $("#customUrlForm").validate(); + validator.form(); + }); + +}); + +function verifyCustomUrl() { + if (hasDomainMappingPermission) { + var customUrlForm = $("#customUrlForm"); + $('.loader').loading('show'); + $('.loading-cover').overlay('show'); + customUrlForm.submit(); + } + +} + +function submitForm() { + if (hasDomainMappingPermission) { + $("#addCustomUrl").prop("disabled", true); + var customUrlForm = $("#customUrlForm"); + var validator = customUrlForm.validate(); + var formValidated = validator.form(); + if (formValidated) { + $('.loader').loading('show'); + $('.loading-cover').overlay('show'); + customUrlForm.submit(); + } + } +} + +function validateCustomUrlPattern() { + var tempCustUrl = $("#productionCustom").val().trim(); + var existingProdUrl = $("#existingProdUrl").val().trim(); + var defaultProdUrl = $("#production-url").val().trim(); + var pattern = /[\w-]+(\.[\w-]+)+/; + var validated = true; + if (!tempCustUrl.length || tempCustUrl == 'null' || !pattern.test(tempCustUrl)) { //if new custom url has not valid text + var validator = $("#customUrlForm").validate(); + if (!existingProdUrl && !tempCustUrl && validator.element("#productionVersion")) { + validated = true; + } else { + urlPatternErrorMsg = "Please specify a valid url"; + validated = false; + } + } else if ((defaultProdUrl == tempCustUrl)) { // if new url is equal to default url + urlPatternErrorMsg = "Please specify different url than default url"; + validated = false; + } else if (existingProdUrl && (existingProdUrl == tempCustUrl)) { // if new url is equal to existing custom url + urlPatternErrorMsg = "Please specify different url than existing url"; + validated = false; + } + return validated; +} + +function getCustomUrlPatternErrMsg() { + return urlPatternErrorMsg; +} + +function getValidationOptions() { + var errorFormGroupClasses = "has-error"; // if validation is failed + var successFormGroupClasses = "has-success"; // if validation is successful + var feedBack = "has-feedback"; + return { + rules: { // validation rules + productionCustom: { // custom Url filed + //validateCustomUrlPattern: true, + require_from_group: [1, '.mygroup'] + }, + productionVersion: { + require_from_group: [1, '.mygroup'] + } + }, + highlight: function (element, errorClass, validClass) { // this is triggered when the "element" is invalid + $(element).addClass(errorClass).removeClass(validClass); + $(element.form).find("div[for=" + element.id + "]").addClass(errorFormGroupClasses) + .removeClass(successFormGroupClasses).addClass(feedBack); + }, + unhighlight: function (element, errorClass, validClass) { // this is triggered when the "element" is valid + $(element).removeClass(errorClass).addClass(validClass); + $(element.form).find("div[for=" + element.id + "]").addClass(successFormGroupClasses).removeClass(errorFormGroupClasses) + .addClass(feedBack); + }, + showErrors: function (event, validator) { + // Disable url update button if the form is not valid + if (this.numberOfInvalids() > 0) { + $("#addCustomUrl").prop("disabled", true); + } else { + $("#addCustomUrl").prop("disabled", false); + } + this.defaultShowErrors(); + }, + errorPlacement: function (error, element) { + if ($(element).parent().closest('div').hasClass("input-group")) { + error.insertAfter($(element).closest('div')); + } else if ($(element).is($("#productionVersion"))) { + error.insertAfter($(element).next('span')); + } + } + }; +} + +function getAppVersionsByStage(applicationKey, stage) { + jagg.post("../blocks/application/get/ajax/list.jag", { + action: "getAppVersionsByStage", + stage: stage, + applicationKey: applicationKey + }, function (result) { + $('.loader').loading('hide'); + $('.loading-cover').overlay('hide'); + var applicationInfo = jQuery.parseJSON(result); + initialAppVersionInfo = applicationInfo; + redrawPageElements(applicationInfo); + }, function (jqXHR, textStatus, errorThrown) { + jagg.message({ + content: "Error occurred while getting data", + type: 'error', + id: 'myuniqeid' + }); + }); +} + +function redrawPageElements(applicationInfo) { + $("#production-url").val(getDefaultProdUrl(applicationInfo.mappedSubDomain)); + if (applicationInfo.customUrl) { + $("#productionCustom").val(applicationInfo.customUrl); + $("#existingProdUrl").val(applicationInfo.customUrl); + if (applicationInfo.customUrlVerificationCode != null) { + $("#verifyUrl").prop("disabled", true); + } else { + $("#verifyUrl").prop("disabled", false); + } + } else { + $("#verifyUrl").prop("disabled", true); + $("#productionCustom").val(''); + $("#existingProdUrl").val(''); + } + drawVersionList(applicationInfo.versions); + $("#addCustomUrl").prop("disabled", true); +} + +function getDefaultProdUrl(mappedSubDomain) { + return mappedSubDomain + "." + defaultDomainName; +} + +function drawVersionList(versionsArray) { + var versionString = ""; + var mappedVersionExists = false; + for (var i = 0; i < versionsArray.length; i++) { + var version = versionsArray[i]; + if (version.productionMappedDomain) { + versionString += ""; + } else { + versionString += "" + version.version + ""; + } + } + if (!mappedVersionExists) { + versionString = "" + versionString; + } + var productionVersionElement = $("#productionVersion"); + if (productionVersionElement.length) { + productionVersionElement.select2('destroy') + .html(versionString).select2({placeholder: "Select a version", allowClear: true}); + } + +} + diff --git a/modules/jaggery-apps/appmgt/src/site/themes/default/templates/urlmapper/add/template.jag b/modules/jaggery-apps/appmgt/src/site/themes/default/templates/urlmapper/add/template.jag new file mode 100755 index 000000000..6de2e0aa5 --- /dev/null +++ b/modules/jaggery-apps/appmgt/src/site/themes/default/templates/urlmapper/add/template.jag @@ -0,0 +1,182 @@ +<% +/* + * Copyright (c) 2014, 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +include("/jagg/constants.jag"); +jagg.template("urlmapper/add", function (inputs, outputs, jagg) { %> +<% +var applicationName = request.getParameter("applicationName"); +var applicationKey = request.getParameter("applicationKey"); +var hasDomainMappingPermission = outputs.hasDomainMappingPermission; +var domainMappingAllowedStage = outputs.fineGrainedDomainMappingAllowedStage; +var initialAppVersionInfo = outputs.initialAppVersionInfo; +var defaultDomainName = getProperty(DOMAIN_NAME); +var mappedVersion = ""; + +if (initialAppVersionInfo.versions.length > 0 ) { + var versionString = "" ; + var mappedVersionExists = false; + for (var i = 0; i < initialAppVersionInfo.versions.length; i++) { + var version = initialAppVersionInfo.versions[i]; + if(version.productionMappedDomain){ + mappedVersionExists = true; + mappedVersion= version.version; + versionString +=""; + } else { + versionString +=""+version.version+""; + } + } + if(!mappedVersionExists){ + versionString = "" + versionString; + } +} + +%> + + + + +
    +
    +
    + Most domain registrars provide step-by-step instructions in their Web sites. For your convenience, we have listed the general steps below.
    +
      +
    • Sign in to the domain registrar’s site.
      • +
    • Navigate to your Domain Name Server (DNS) management page. The location and name of this page vary by the host, but can generally be found under the 'Domain Management' or 'Advanced Settings' section.
      • +
    • Find the CNAME settings. Under the 'CNAME value or alias,' enter the subdomain you'd like to map the URL to. The subdomain for bar.foo.com is bar.
      • +
    • Set the CNAME destination to the production URL bar.foo.wso2apps.com and save the changes.
      • +
    +
    +
    +
    +
    +
    +
    + + + + +
    +
    +
    +
    +
    +
    + + + +
    + + + <% if (hasDomainMappingPermission) {%> +
    + + +
    + + + + +
    + +
    + + <% if (initialAppVersionInfo.versions.length > 0 ) {%> +
    + + +
    + <% } else {%> +
    + + +
    + <% }%> + +
    + +
    + <% } else { %> +
    + + + +
    + + <% if (initialAppVersionInfo.versions.length > 0 ) { %> +
    + + +
    + <% } else {%> +
    + + +
    + <% }%> + <% }%> + +
    +
    +
    +
    +
    +
    +<% jagg.includeBlock("page/notification-wall", {"wall_name" : applicationKey + " - App Wall","applicationKey" : applicationKey, "pageName":"App Home"});%> + + + + + + + + <% +}); %>