community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added new config param to fetch hostname.

Browse Source
This commit is contained in:
Harshan Liyanage 2017-08-31 17:02:13 +05:30
parent 61e0b9da4f
commit dde64e6065
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@
"appContext" : "/android-web-agent/", "appContext" : "/android-web-agent/",
"httpsURL" : "%https.ip%", "httpsURL" : "%https.ip%",
"httpURL" : "%http.ip%", "httpURL" : "%http.ip%",
"managerHTTPSURL": "https://%iot.manager.host%:%iot.manager.https.port%",
"enrollmentDir": "/android-web-agent/enrollment", "enrollmentDir": "/android-web-agent/enrollment",
"adminService":"%https.ip%", "adminService":"%https.ip%",
"callBackUrl":"%https.ip%/mdm-admin", "callBackUrl":"%https.ip%/mdm-admin",

2
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/pages/mdm.page.enrollments.android.download-agent/download-agent.js
View File

@ -25,7 +25,7 @@ function onRequest(context) {
// setting android agent download URL // setting android agent download URL
// Needs host=>http:9763 since self-signed certificates won't allow downloads in android // Needs host=>http:9763 since self-signed certificates won't allow downloads in android
//TODO: try to retrieve page name from UUF //TODO: try to retrieve page name from UUF
viewModel.agentDownloadURL = mdmProps["generalConfig"]["host"] + mdmProps["appContext"] + "public/mdm.page.enrollments.android.download-agent/asset/" + mdmProps["androidAgentApp"]; viewModel.agentDownloadURL = mdmProps["managerHTTPSURL"] + mdmProps["appContext"] + "public/mdm.page.enrollments.android.download-agent/asset/" + mdmProps["androidAgentApp"];
var companyProps = session.get("COMPANY_DETAILS"); var companyProps = session.get("COMPANY_DETAILS");
if (!companyProps) { if (!companyProps) {
viewModel.companyName = mdmProps.generalConfig.companyName; viewModel.companyName = mdmProps.generalConfig.companyName;