inosh
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins

Browse Source
revert-dabc3590
charitha 8 years ago
parent bfba008218 617849c053
commit 44ae50cc95
8 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File

4
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/policies.hbs
Unescape View File

@ -174,8 +174,8 @@
<tr data-type="selectable" data-id="{{id}}" data-status="{{status}}">
<td class="remove-padding icon-only content-fill viewEnabledIcon"
data-url="{{@app.context}}/policy/view?id={{id}}" data-id="{{id}}">
<div class="thumbnail icon">
<img src="{{icon}}"/>
<div class="thumbnail icon" style="padding-top: 30px; padding-bottom: 30px;">
<i class="fw fw-{{deviceTypeIcon}}" style="font-size: 59px"></i>
</div>
</td>
<td class="fade-edge"

4
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/public/js/policy-list.js
Unescape View File

@ -215,7 +215,7 @@ $(document).ready(function () {
// on-click function for policy un-publishing "yes" button
$("a#unpublish-policy-yes-link").click(function () {
invokerUtil.put(
invokerUtil.post(
serviceURL,
policyList,
// on success
@ -268,7 +268,7 @@ $(document).ready(function () {
// on-click function for policy removing "yes" button
$("a#publish-policy-yes-link").click(function () {
invokerUtil.put(
invokerUtil.post(
serviceURL,
policyList,
// on success

5
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/create.hbs
Unescape View File

@ -265,8 +265,8 @@
data-next="policy-profile"
data-platform="{{name}}"
data-validate="false">
<img src="{{icon}}" width="50px" height="50px" />
<br><br>
<!--<img src="{{icon}}" width="50px" height="50px" />-->
<i class="fw fw-{{deviceTypeIcon}}"></i>
<b>{{label}}</b>
</a>
</li>
@ -295,4 +295,3 @@
type="text/x-handlebars-template"></script>
{{js "/js/policy-create.js"}}
{{/zone}}

9
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/create.js
Unescape View File

@ -17,7 +17,7 @@
*/
function onRequest() {
var log = new Log("/app/units/mdm.unit.policy.create");
// var log = new Log("/app/units/mdm.unit.policy.create");
var CONF_DEVICE_TYPE_KEY = "deviceType";
var CONF_DEVICE_TYPE_LABEL_KEY = "label";
@ -35,6 +35,11 @@ function onRequest() {
var content = {};
var deviceType = deviceTypes[i];
content["name"] = deviceType;
if (deviceType == "ios") {
content["deviceTypeIcon"] = "apple";
} else {
content["deviceTypeIcon"] = deviceType;
}
var configs = utility.getDeviceTypeConfig(deviceType);
var deviceTypeLabel = deviceType;
if (configs && configs[CONF_DEVICE_TYPE_KEY][CONF_DEVICE_TYPE_LABEL_KEY]) {
@ -43,7 +48,7 @@ function onRequest() {
var policyWizard = new File("/app/units/" + utility.getTenantedDeviceUnitName(deviceType, "policy-wizard"));
if (policyWizard.isExists()) {
content["icon"] = utility.getDeviceThumb(deviceType);
// content["icon"] = utility.getDeviceThumb(deviceType);
content["label"] = deviceTypeLabel;
viewModelData["types"].push(content);
}

4
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js
Unescape View File

@ -2038,7 +2038,7 @@ var updatePolicy = function (policy, state) {
policyList.push(getParameterByName("id"));
if (state == "save") {
serviceURL = "/api/device-mgt/v1.0/policies/deactivate-policy";
invokerUtil.put(
invokerUtil.post(
serviceURL,
policyList,
// on success
@ -2055,7 +2055,7 @@ var updatePolicy = function (policy, state) {
);
} else if (state == "publish") {
serviceURL = "/api/device-mgt/v1.0/policies/activate-policy";
invokerUtil.put(
invokerUtil.post(
serviceURL,
policyList,
// on success

4
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/js/view.js
Unescape View File

@ -1824,7 +1824,7 @@ var updatePolicy = function (policy, state) {
var policyList = [];
policyList.push(getParameterByName("id"));
serviceURL = base_api_url + "/policies/deactivate-policy";
invokerUtil.put(
invokerUtil.post(
serviceURL,
policyList,
// on success
@ -1841,7 +1841,7 @@ var updatePolicy = function (policy, state) {
var policyList = [];
policyList.push(getParameterByName("id"));
serviceURL = base_api_url + "/policies/activate-policy";
invokerUtil.put(
invokerUtil.post(
serviceURL,
policyList,
// on success

2
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/conf/config.json
Unescape View File

@ -5,7 +5,7 @@
"httpURL" : "%http.ip%",
"enrollmentDir": "/emm-web-agent/enrollment",
"iOSConfigRoot" : "%https.ip%/ios-enrollment/",
"iOSAPIRoot" : "%https.ip%/ios/",
"iOSAPIRoot" : "%https.ip%/api/device-mgt/ios/v1.0/",
"dynamicClientRegistrationEndPoint" : "%https.ip%/dynamic-client-web/register/",
"adminService":"%https.ip%",
"idPServer":"%https.ip%",

27
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/modules/enrollments/ios/agent-check.jag
Unescape View File

@ -22,6 +22,9 @@ var log = new Log("/modules/enrollments/ios/agent-check.jag");
var mdmProps = require("/app/modules/conf-reader/main.js")["conf"];
var UAParser = require("/app/modules/ua-parser.min.js")["UAParser"];
var tokenUtil = require("/app/modules/oauth/token-handlers.js")["handlers"];
var serviceInvokers = require("/app/modules/oauth/token-protected-service-invokers.js")["invokers"];
var parser = new UAParser();
var userAgent = request.getHeader("User-Agent");
parser.setUA(userAgent);
@ -39,25 +42,25 @@ if (platform != "iOS") {
response["status"] = 200;
response["content"] = {"deviceID" : null};
} else {
var deviceCheckURL = mdmProps["iOSAPIRoot"] + "device/deviceid";
var xhr = new XMLHttpRequest();
xhr.open("POST", deviceCheckURL);
var deviceCheckURL = mdmProps["iOSAPIRoot"] + "devices/udid";
var challengeToken = session.get("iOSChallengeToken");
var inputs = {"challengeToken" : challengeToken};
xhr.setRequestHeader("Content-Type", "application/json");
xhr.setRequestHeader("Accept", "application/json");
xhr.send(stringify(inputs));
var payload = {"challengeToken" : challengeToken};
if (xhr.status == 200) {
var responseObject = parse(xhr["responseText"]);
serviceInvokers.XMLHttp.post(
deviceCheckURL,
stringify(payload),
function (restAPIResponse) {
var status = restAPIResponse["status"];
if (status == 200) {
var responseContent = parse(restAPIResponse.responseText);
response["status"] = 200;
response["content"] = responseObject;
response["content"] = responseContent;
} else {
// server only returns 400 in case of bad request
response["status"] = 200;
response["content"] = {"deviceID" : null};
}
}
);
}
}
%>
Write Preview
Loading…
Cancel
Save