From 72329d93f030e3f6dd2bb70426abff1814e5054e Mon Sep 17 00:00:00 2001 From: Milan Perera Date: Thu, 6 Oct 2016 17:36:13 +0530 Subject: [PATCH 1/3] Added pulse secure payload to UI --- .../public/js/operation-mod.js | 11 ++++++++++- .../mdm.unit.policy.create/public/js/policy-create.js | 9 +++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js index 0672461471..bc3d155748 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js @@ -478,6 +478,8 @@ var operationModule = function () { var ppp = {}; var ipSec = {}; var ikev2 = {}; + var pulseSecure = {}; + if (operationData["vpnType"] == "PPTP") { ppp = { "authName": operationData["pptpAuthName"], @@ -523,6 +525,12 @@ var operationModule = function () { "serverCertificateIssuerCommonName" : operationData["ikev2ServerCertificateIssuerCommonName"], "serverCertificateCommonName" : operationData["ikev2ServerCertificateCommonName"] }; + } else if (operationData["vpnType"] == "PulseSecure") { + pulseSecure = { + "remoteAddress" : operationData["pulsesecureRemoteAddress"], + "userName" : operationData["pulsesecureName"], + "sharedSecret" : operationData["pulsesecureSharedSecret"] + }; } var domainsAlways = new Array(); @@ -553,7 +561,8 @@ var operationModule = function () { "vpnType" : operationData["vpnType"], "ppp": ppp, "ipSec": ipSec, - "ikEv2": ikev2 + "ikEv2": ikev2, + "pulseSecure" : pulseSecure } }; break; diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js index 6ee4e6d822..d0598ea6f7 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js @@ -1,5 +1,4 @@ /* - * 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 @@ -610,7 +609,8 @@ validateStep["policy-profile"] = function () { } } - }if (policy["platform"] == platformTypeConstants["WINDOWS"]) { + } + if (policy["platform"] == platformTypeConstants["WINDOWS"]) { if (configuredOperations.length == 0) { // updating validationStatus validationStatus = { @@ -708,7 +708,8 @@ validateStep["policy-profile"] = function () { } } - } else if (policy["platform"] == platformTypeConstants["IOS"]) { + } + else if (policy["platform"] == platformTypeConstants["IOS"]) { if (configuredOperations.length == 0) { // updating validationStatus validationStatus = { @@ -1257,7 +1258,7 @@ validateStep["policy-profile"] = function () { } if ($.inArray(iosOperationConstants["VPN_OPERATION_CODE"], configuredOperations) != -1) { - // if WIFI is configured + // if VPN is configured operation = iosOperationConstants["VPN_OPERATION"]; // initializing continueToCheckNextInputs to true continueToCheckNextInputs = true; From 75f4e910041233a422532fc5690461ab72d86450 Mon Sep 17 00:00:00 2001 From: Milan Perera Date: Thu, 6 Oct 2016 17:39:37 +0530 Subject: [PATCH 2/3] Fixed conflicts and merged --- .../iot/carbon/wso2/org/wso2_senseagent/BuildConfig.java | 8 ++++++++ .../iot/carbon/wso2/org/wso2_senseagent/Manifest.java | 7 +++++++ .../android/iot/carbon/wso2/org/wso2_senseagent/R.java | 7 +++++++ 3 files changed, 22 insertions(+) create mode 100644 components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/gen/agent/sense/android/iot/carbon/wso2/org/wso2_senseagent/BuildConfig.java create mode 100644 components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/gen/agent/sense/android/iot/carbon/wso2/org/wso2_senseagent/Manifest.java create mode 100644 components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/gen/agent/sense/android/iot/carbon/wso2/org/wso2_senseagent/R.java diff --git a/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/gen/agent/sense/android/iot/carbon/wso2/org/wso2_senseagent/BuildConfig.java b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/gen/agent/sense/android/iot/carbon/wso2/org/wso2_senseagent/BuildConfig.java new file mode 100644 index 0000000000..5032b19a1d --- /dev/null +++ b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/gen/agent/sense/android/iot/carbon/wso2/org/wso2_senseagent/BuildConfig.java @@ -0,0 +1,8 @@ +/*___Generated_by_IDEA___*/ + +package agent.sense.android.iot.carbon.wso2.org.wso2_senseagent; + +/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */ +public final class BuildConfig { + public final static boolean DEBUG = Boolean.parseBoolean(null); +} \ No newline at end of file diff --git a/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/gen/agent/sense/android/iot/carbon/wso2/org/wso2_senseagent/Manifest.java b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/gen/agent/sense/android/iot/carbon/wso2/org/wso2_senseagent/Manifest.java new file mode 100644 index 0000000000..6e03df3ca0 --- /dev/null +++ b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/gen/agent/sense/android/iot/carbon/wso2/org/wso2_senseagent/Manifest.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package agent.sense.android.iot.carbon.wso2.org.wso2_senseagent; + +/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */ +public final class Manifest { +} \ No newline at end of file diff --git a/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/gen/agent/sense/android/iot/carbon/wso2/org/wso2_senseagent/R.java b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/gen/agent/sense/android/iot/carbon/wso2/org/wso2_senseagent/R.java new file mode 100644 index 0000000000..b047be4fc9 --- /dev/null +++ b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/gen/agent/sense/android/iot/carbon/wso2/org/wso2_senseagent/R.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package agent.sense.android.iot.carbon.wso2.org.wso2_senseagent; + +/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */ +public final class R { +} \ No newline at end of file From f43ba554d51a97274a8b5598ab1dd4d73ea5b1d0 Mon Sep 17 00:00:00 2001 From: harshanl Date: Thu, 6 Oct 2016 19:44:47 +0530 Subject: [PATCH 3/3] EMM-1678:Updated the oauth component versions --- .../resources/jaggeryapps/devicemgt/app/conf/config.json | 2 +- .../jaggeryapps/emm-web-agent/app/conf/config.json | 2 +- pom.xml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json index 8eb7bfc3cb..06417b7e8b 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json @@ -19,7 +19,7 @@ "owner": "admin@carbon.super", "dynamicClientAppRegistrationServiceURL": "%https.ip%/dynamic-client-web/register", "apiManagerClientAppRegistrationServiceURL": "%https.ip%/api-application-registration/register/tenants", - "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer", + "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer", "tokenScope": "admin", "callbackUrl": "%https.ip%/api/device-mgt/v1.0" }, diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/conf/config.json b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/conf/config.json index 2400b07308..8e2b80c9f6 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/conf/config.json +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/conf/config.json @@ -17,7 +17,7 @@ "owner": "admin@carbon.super", "dynamicClientAppRegistrationServiceURL": "%https.ip%/dynamic-client-web/register", "apiManagerClientAppRegistrationServiceURL": "%https.ip%/api-application-registration/register/tenants", - "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer", + "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer", "tokenScope": "admin", "callbackUrl": "%https.ip%/api/device-mgt/v1.0" }, diff --git a/pom.xml b/pom.xml index d88b8d24b6..d680053cda 100644 --- a/pom.xml +++ b/pom.xml @@ -1219,10 +1219,10 @@ 4.7.0 - 5.2.0 - 5.1.2 + 5.2.1 + 5.1.3 5.1.1 - [5.0.7, 6.0.0) + [5.2.1, 6.0.0) 4.6.0