Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0

revert-70aa11f8
geethkokila 8 years ago
commit bce1395182

@ -1,185 +1,205 @@
{ {
"appContext": "/devicemgt/", "appContext": "/devicemgt/",
"isCloud": false, "isCloud": false,
"httpsURL" : "https://%iot.gateway.host%:%iot.gateway.https.port%", "cloudConfig": {
"httpURL" : "http://%iot.gateway.host%:%iot.gateway.http.port", "upgradeNowURL": "",
"wssURL" : "https://%iot.analytics.host%:%iot.analytics.https.port%", "monetizationURL": "",
"portalURL": "https://%iot.analytics.host%:%iot.analytics.https.port%", "requestExtensionURL": "",
"dashboardServerURL" : "%https.ip%", "publisherURL": "",
"androidEnrollmentDir": "/android-web-agent/enrollment", "storeURL": "",
"windowsEnrollmentDir": "/windows-web-agent/enrollment", "contactUsURL": "",
"iOSEnrollmentDir": "/ios-web-agent/enrollment", "apiCloudDocURL": "https://docs.wso2.com/display/APICloud/WSO2+API+Cloud+Documentation",
"iOSConfigRoot" : "%https.ip%/ios-enrollment/", "appCloudDocURL": "https://docs.wso2.com/display/AppCloud/WSO2+App+Cloud+Documentation",
"iOSAPIRoot" : "%https.ip%/ios/", "deviceCloudDocURL": "https://docs.wso2.com/display/DeviceCloud/WSO2+Device+Cloud+Documentation",
"adminService": "%https.ip%", "apiCloudWalkthroughURL": "https://api.clouddev.wso2.com/publisher?interactiveTutorial=true",
"gatewayEnabled": true, "profileURL": "https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/user-profile.jag",
"oauthProvider": { "changePasswordURL": "https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/change-password.jag",
"appRegistration": { "logoutURL": "https://api.clouddev.wso2.com/publisher/site/pages/logout.jag",
"appType": "webapp", "apiCloudURL": "",
"clientName": "iot_ui", "appCloudURL": "",
"owner": "admin@carbon.super", "deviceCloudURL": "",
"dynamicClientAppRegistrationServiceURL": "%https.ip%/dynamic-client-web/register", "oraganizationURL": "",
"apiManagerClientAppRegistrationServiceURL": "https://%iot.gateway.host%:%iot.gateway.https.port%/api-application-registration/register/tenants", "membersURL": ""
"grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer", },
"tokenScope": "admin", "httpsURL": "https://%iot.gateway.host%:%iot.gateway.https.port%",
"callbackUrl": "%https.ip%/api/device-mgt/v1.0", "httpURL": "http://%iot.gateway.host%:%iot.gateway.http.port",
"samlGrantTypeName": "urn:ietf:params:oauth:grant-type:saml2-bearer" "wssURL": "https://%iot.analytics.host%:%iot.analytics.https.port%",
}, "portalURL": "https://%iot.analytics.host%:%iot.analytics.https.port%",
"tokenServiceURL": "https://%iot.gateway.host%:%iot.gateway.https.port%/token" "dashboardServerURL": "%https.ip%",
"androidEnrollmentDir": "/android-web-agent/enrollment",
"windowsEnrollmentDir": "/windows-web-agent/enrollment",
"iOSEnrollmentDir": "/ios-web-agent/enrollment",
"iOSConfigRoot": "%https.ip%/ios-enrollment/",
"iOSAPIRoot": "%https.ip%/ios/",
"adminService": "%https.ip%",
"gatewayEnabled": true,
"oauthProvider": {
"appRegistration": {
"appType": "webapp",
"clientName": "iot_ui",
"owner": "admin@carbon.super",
"dynamicClientAppRegistrationServiceURL": "%https.ip%/dynamic-client-web/register",
"apiManagerClientAppRegistrationServiceURL": "https://%iot.gateway.host%:%iot.gateway.https.port%/api-application-registration/register/tenants",
"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",
"samlGrantTypeName": "urn:ietf:params:oauth:grant-type:saml2-bearer"
}, },
"adminUser":"admin@carbon.super", "tokenServiceURL": "https://%iot.gateway.host%:%iot.gateway.https.port%/token"
"adminUserTenantId":"-1234", },
"adminRole":"admin", "adminUser": "admin@carbon.super",
"userValidationConfig" : { "adminUserTenantId": "-1234",
"usernameLength":30, "adminRole": "admin",
"usernameJSRegEx" : "^[\\S]{3,30}$", "userValidationConfig": {
"usernameRegExViolationErrorMsg" : "Provided username is invalid.", "usernameLength": 30,
"usernameHelpMsg" : "Should be in minimum 3 characters long and do not include any whitespaces.", "usernameJSRegEx": "^[\\S]{3,30}$",
"firstnameJSRegEx" : "^.{3,30}$", "usernameRegExViolationErrorMsg": "Provided username is invalid.",
"firstnameRegExViolationErrorMsg" : "Provided first name is invalid.", "usernameHelpMsg": "Should be in minimum 3 characters long and do not include any whitespaces.",
"lastnameJSRegEx" : "^.{3,30}$", "firstnameJSRegEx": "^.{3,30}$",
"lastnameRegExViolationErrorMsg" : "Provided last name is invalid.", "firstnameRegExViolationErrorMsg": "Provided first name is invalid.",
"emailJSRegEx" : "/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/", "lastnameJSRegEx": "^.{3,30}$",
"emailRegExViolationErrorMsg" : "Provided email is invalid." "lastnameRegExViolationErrorMsg": "Provided last name is invalid.",
}, "emailJSRegEx": "/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/",
"groupValidationConfig": { "emailRegExViolationErrorMsg": "Provided email is invalid."
"groupNameJSRegEx": "^[\\S]{3,30}$", },
"groupNameRegExViolationErrorMsg": "Provided group name is invalid.", "groupValidationConfig": {
"groupNameHelpMsg": "Should be in minimum 3 characters long and should not include any whitespaces." "groupNameJSRegEx": "^[\\S]{3,30}$",
}, "groupNameRegExViolationErrorMsg": "Provided group name is invalid.",
"roleValidationConfig" : { "groupNameHelpMsg": "Should be in minimum 3 characters long and should not include any whitespaces."
"roleNameJSRegEx" : "^[\\S]{3,30}$", },
"roleNameRegExViolationErrorMsg" : "Provided role name is invalid.", "roleValidationConfig": {
"roleNameHelpMsg" : "should be in minimum 3 characters long and do not include any whitespaces." "roleNameJSRegEx": "^[\\S]{3,30}$",
}, "roleNameRegExViolationErrorMsg": "Provided role name is invalid.",
"generalConfig" : { "roleNameHelpMsg": "should be in minimum 3 characters long and do not include any whitespaces."
"host" : "%http.ip%", },
"companyName" : "WSO2 Carbon Device Manager", "generalConfig": {
"browserTitle" : "WSO2 Device Manager", "host": "%http.ip%",
"copyrightPrefix" : "\u00A9 %date-year%, ", "companyName": "WSO2 Carbon Device Manager",
"copyrightOwner" : "WSO2 Inc.", "browserTitle": "WSO2 Device Manager",
"copyrightOwnersSite" : "http://www.wso2.org", "copyrightPrefix": "\u00A9 %date-year%, ",
"copyrightSuffix" : " All Rights Reserved." "copyrightOwner": "WSO2 Inc.",
}, "copyrightOwnersSite": "http://www.wso2.org",
"scopes" : [ "copyrightSuffix": " All Rights Reserved."
"perm:sign-csr", },
"perm:admin:devices:view", "scopes": [
"perm:roles:add", "perm:sign-csr",
"perm:roles:add-users", "perm:admin:devices:view",
"perm:roles:update", "perm:roles:add",
"perm:roles:permissions", "perm:roles:add-users",
"perm:roles:details", "perm:roles:update",
"perm:roles:view", "perm:roles:permissions",
"perm:roles:create-combined-role", "perm:roles:details",
"perm:roles:delete", "perm:roles:view",
"perm:dashboard:vulnerabilities", "perm:roles:create-combined-role",
"perm:dashboard:non-compliant-count", "perm:roles:delete",
"perm:dashboard:non-compliant", "perm:dashboard:vulnerabilities",
"perm:dashboard:by-groups", "perm:dashboard:non-compliant-count",
"perm:dashboard:device-counts", "perm:dashboard:non-compliant",
"perm:dashboard:feature-non-compliant", "perm:dashboard:by-groups",
"perm:dashboard:count-overview", "perm:dashboard:device-counts",
"perm:dashboard:filtered-count", "perm:dashboard:feature-non-compliant",
"perm:dashboard:details", "perm:dashboard:count-overview",
"perm:get-activity", "perm:dashboard:filtered-count",
"perm:devices:delete", "perm:dashboard:details",
"perm:devices:applications", "perm:get-activity",
"perm:devices:effective-policy", "perm:devices:delete",
"perm:devices:compliance-data", "perm:devices:applications",
"perm:devices:features", "perm:devices:effective-policy",
"perm:devices:operations", "perm:devices:compliance-data",
"perm:devices:search", "perm:devices:features",
"perm:devices:details", "perm:devices:operations",
"perm:devices:update", "perm:devices:search",
"perm:devices:view", "perm:devices:details",
"perm:view-configuration", "perm:devices:update",
"perm:manage-configuration", "perm:devices:view",
"perm:policies:remove", "perm:view-configuration",
"perm:policies:priorities", "perm:manage-configuration",
"perm:policies:deactivate", "perm:policies:remove",
"perm:policies:get-policy-details", "perm:policies:priorities",
"perm:policies:manage", "perm:policies:deactivate",
"perm:policies:activate", "perm:policies:get-policy-details",
"perm:policies:update", "perm:policies:manage",
"perm:policies:changes", "perm:policies:activate",
"perm:policies:get-details", "perm:policies:update",
"perm:users:add", "perm:policies:changes",
"perm:users:details", "perm:policies:get-details",
"perm:users:count", "perm:users:add",
"perm:users:delete", "perm:users:details",
"perm:users:roles", "perm:users:count",
"perm:users:user-details", "perm:users:delete",
"perm:users:credentials", "perm:users:roles",
"perm:users:search", "perm:users:user-details",
"perm:users:is-exist", "perm:users:credentials",
"perm:users:update", "perm:users:search",
"perm:users:send-invitation", "perm:users:is-exist",
"perm:admin-users:view", "perm:users:update",
"perm:groups:devices", "perm:users:send-invitation",
"perm:groups:update", "perm:admin-users:view",
"perm:groups:add", "perm:groups:devices",
"perm:groups:device", "perm:groups:update",
"perm:groups:devices-count", "perm:groups:add",
"perm:groups:remove", "perm:groups:device",
"perm:groups:groups", "perm:groups:devices-count",
"perm:groups:groups-view", "perm:groups:remove",
"perm:groups:share", "perm:groups:groups",
"perm:groups:count", "perm:groups:groups-view",
"perm:groups:roles", "perm:groups:share",
"perm:groups:devices-remove", "perm:groups:count",
"perm:groups:devices-add", "perm:groups:roles",
"perm:groups:assign", "perm:groups:devices-remove",
"perm:device-types:features", "perm:groups:devices-add",
"perm:device-types:types", "perm:groups:assign",
"perm:applications:install", "perm:device-types:features",
"perm:applications:uninstall", "perm:device-types:types",
"perm:admin-groups:count", "perm:applications:install",
"perm:admin-groups:view", "perm:applications:uninstall",
"perm:notifications:mark-checked", "perm:admin-groups:count",
"perm:notifications:view", "perm:admin-groups:view",
"perm:admin:certificates:delete", "perm:notifications:mark-checked",
"perm:admin:certificates:details", "perm:notifications:view",
"perm:admin:certificates:view", "perm:admin:certificates:delete",
"perm:admin:certificates:add", "perm:admin:certificates:details",
"perm:admin:certificates:verify", "perm:admin:certificates:view",
"perm:ios:enroll", "perm:admin:certificates:add",
"perm:ios:view-device", "perm:admin:certificates:verify",
"perm:ios:apn", "perm:ios:enroll",
"perm:ios:ldap", "perm:ios:view-device",
"perm:ios:enterprise-app", "perm:ios:apn",
"perm:ios:store-application", "perm:ios:ldap",
"perm:ios:remove-application", "perm:ios:enterprise-app",
"perm:ios:app-list", "perm:ios:store-application",
"perm:ios:profile-list", "perm:ios:remove-application",
"perm:ios:lock", "perm:ios:app-list",
"perm:ios:enterprise-wipe", "perm:ios:profile-list",
"perm:ios:device-info", "perm:ios:lock",
"perm:ios:restriction", "perm:ios:enterprise-wipe",
"perm:ios:email", "perm:ios:device-info",
"perm:ios:cellular", "perm:ios:restriction",
"perm:ios:applications", "perm:ios:email",
"perm:ios:wifi", "perm:ios:cellular",
"perm:ios:ring", "perm:ios:applications",
"perm:ios:location", "perm:ios:wifi",
"perm:ios:notification", "perm:ios:ring",
"perm:ios:airplay", "perm:ios:location",
"perm:ios:caldav", "perm:ios:notification",
"perm:ios:cal-subscription", "perm:ios:airplay",
"perm:ios:passcode-policy", "perm:ios:caldav",
"perm:ios:webclip", "perm:ios:cal-subscription",
"perm:ios:vpn", "perm:ios:passcode-policy",
"perm:ios:per-app-vpn", "perm:ios:webclip",
"perm:ios:app-to-per-app-vpn", "perm:ios:vpn",
"perm:ios:app-lock", "perm:ios:per-app-vpn",
"perm:ios:clear-passcode", "perm:ios:app-to-per-app-vpn",
"perm:ios:remove-profile", "perm:ios:app-lock",
"perm:ios:get-restrictions", "perm:ios:clear-passcode",
"perm:ios:wipe-data", "perm:ios:remove-profile",
"perm:admin", "perm:ios:get-restrictions",
"perm:devicetype:deployment" "perm:ios:wipe-data",
], "perm:admin",
"isOAuthEnabled" : true, "perm:devicetype:deployment"
"backendRestEndpoints" : { ],
"deviceMgt" : "/api/device-mgt/v1.0" "isOAuthEnabled": true,
} "backendRestEndpoints": {
"deviceMgt": "/api/device-mgt/v1.0"
}
} }

@ -48,7 +48,7 @@
<li> <li>
<a title="Upgrade Now" <a title="Upgrade Now"
href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/payment-plans.jag?cloud-type=device_cloud" href="{{upgradeNowURL}}"
target="_self"> target="_self">
<i class="fw fw-export" title="Upgrade Now"></i> Upgrade Now <i class="fw fw-export" title="Upgrade Now"></i> Upgrade Now
</a> </a>
@ -56,7 +56,7 @@
<li> <li>
<a title="Monetization" <a title="Monetization"
href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/monetization-dashboard.jag" href="{{monetizationURL}}"
target="_self"> target="_self">
<i class="fa fa-money fa-lg" title="Monetization"></i> Monetization <i class="fa fa-money fa-lg" title="Monetization"></i> Monetization
</a> </a>
@ -64,7 +64,7 @@
<li> <li>
<a title="Request Extension" <a title="Request Extension"
href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/contact-us.jag?cloud-type=device_cloud&amp;request-extension=true" href="{{requestExtensionURL}}"
target="_blank"> target="_blank">
<i class="fw fw-mail" title="Request Extension"></i> Request Extension <i class="fw fw-mail" title="Request Extension"></i> Request Extension
</a> </a>
@ -82,20 +82,20 @@
<span class="hidden-xs"> <span class="hidden-xs">
App Management App Management
</span> </span>
<!--<span class="caret"></span>--> <span class="caret"></span>
</a> </a>
<ul class="dropdown-menu dropdown-menu-right float-remove-xs position-static-xs text-center-xs remove-margin-xs slideInDown" <ul class="dropdown-menu dropdown-menu-right float-remove-xs position-static-xs text-center-xs remove-margin-xs slideInDown"
role="menu"> role="menu">
<li class="visible-inline-block"> <li class="visible-inline-block">
<a title="Mobile App Publisher" href="https://devicemgt.clouddev.wso2.com/publisher" <a title="Mobile App Publisher" href="{{publisherURL}}"
target="_self"> target="_self">
<i class="fw fw-user" title="Mobilr App Publisher"></i> App Publisher <i class="fw fw-user" title="Mobilr App Publisher"></i> App Publisher
</a> </a>
</li> </li>
<li class="visible-inline-block"> <li class="visible-inline-block">
<a title="App Store " href="https://devicemgt.clouddev.wso2.com/store" <a title="App Store " href="{{storeURL}}"
target="_self"> target="_self">
<i class="fw fw-store" title="App Store"></i> App Store <i class="fw fw-store" title="App Store"></i> App Store
</a> </a>
@ -105,7 +105,7 @@
</li> </li>
<li class="visible-inline-block"> <li class="visible-inline-block">
<a href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/contact-us.jag" target="_self" <a href="{{contactUsURL}}" target="_self"
title="Support"> title="Support">
@ -136,7 +136,7 @@
<li> <li>
<a title="API Cloud" <a title="API Cloud"
href="https://docs.wso2.com/display/APICloud/WSO2+API+Cloud+Documentation" href="{{apiCloudDocURL}}"
target="_blank"> target="_blank">
<i class="fw fw-api" title="API Cloud"></i> API Cloud <i class="fw fw-api" title="API Cloud"></i> API Cloud
</a> </a>
@ -144,15 +144,15 @@
<li> <li>
<a title="App Cloud" <a title="App Cloud"
href="https://docs.wso2.com/display/AppCloud/WSO2+App+Cloud+Documentation" href="{{appCloudDocURL}}"
target="_blank"> target="_blank">
<i class="fw fw-application" title="App Cloud"></i> App Cloud <i class="fw fw-application" title="App Cloud"></i> App Cloud
</a> </a>
</li> </li>
<li> <li>
<a title="App Cloud" <a title="Device Cloud"
href="https://docs.wso2.com/display/AppCloud/WSO2+Device+Cloud+Documentation" href="{{deviceCloudDocURL}}"
target="_blank"> target="_blank">
<i class="fw fw-application" title="App Cloud"></i> Device Cloud <i class="fw fw-application" title="App Cloud"></i> Device Cloud
</a> </a>
@ -160,7 +160,7 @@
<li> <li>
<a title="API Cloud Walkthrough" <a title="API Cloud Walkthrough"
href="https://api.clouddev.wso2.com/publisher?interactiveTutorial=true" href="{{apiCloudWalkthroughURL}}"
target="_self"> target="_self">
<i class="fw fw-document" title="API Cloud Walkthrough"></i> API Cloud Walkthrough <i class="fw fw-document" title="API Cloud Walkthrough"></i> API Cloud Walkthrough
</a> </a>
@ -187,7 +187,7 @@
<li> <li>
<a title="Profile" <a title="Profile"
href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/user-profile.jag" href="{{profileURL}}"
target="_self"> target="_self">
<i class="fw fw-user" title="Profile"></i> Profile <i class="fw fw-user" title="Profile"></i> Profile
</a> </a>
@ -195,14 +195,14 @@
<li> <li>
<a title="Change Password" <a title="Change Password"
href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/change-password.jag" href="{{changePasswordURL}}"
target="_self"> target="_self">
<i class="fw fw-lock" title="Change Password"></i> Change Password <i class="fw fw-lock" title="Change Password"></i> Change Password
</a> </a>
</li> </li>
<li> <li>
<a title="Logout" href="https://api.clouddev.wso2.com/publisher/site/pages/logout.jag" <a title="Logout" href="{{logoutURL}}"
target="_self"> target="_self">
<i class="fw fw-sign-out" title="Logout"></i> Logout <i class="fw fw-sign-out" title="Logout"></i> Logout
</a> </a>
@ -229,17 +229,17 @@
<div id="popover-content" class="hide"> <div id="popover-content" class="hide">
<div class="cloud-apps"> <div class="cloud-apps">
<a href="https://api.cloud.wso2.com/publisher" target="_self" class="cloud-block add-padding-top-3x"> <a href="{{apiCloudURL}}https://api.cloud.wso2.com/publisher" target="_self" class="cloud-block add-padding-top-3x">
<i class="fw fw-api fw-3x"></i> <i class="fw fw-api fw-3x"></i>
<div class="cloud-name">API Cloud</div> <div class="cloud-name">API Cloud</div>
</a> </a>
<a href="https://apps.cloud.wso2.com/appmgt" target="_self" class="cloud-block add-padding-top-3x"> <a href="{{appCloudURL}}https://apps.cloud.wso2.com/appmgt" target="_self" class="cloud-block add-padding-top-3x">
<i class="fw fw-application fw-3x"></i> <i class="fw fw-application fw-3x"></i>
<div class="cloud-name">App Cloud</div> <div class="cloud-name">App Cloud</div>
</a> </a>
<a href="https://devicemgt.cloud.wso2.com/devicemgt" target="_self" class="cloud-block add-padding-top-3x"> <a href="{{deviceCloudURL}}https://devicemgt.cloud.wso2.com/devicemgt" target="_self" class="cloud-block add-padding-top-3x">
<i class="fw fw-mobile fw-3x"></i> <i class="fw fw-mobile fw-3x"></i>
<div class="cloud-name">Device Cloud</div> <div class="cloud-name">Device Cloud</div>
</a> </a>
@ -249,12 +249,12 @@
<div class="cloud-actions"> <div class="cloud-actions">
<h3>Manage your cloud</h3> <h3>Manage your cloud</h3>
<a href="https://cloudmgt.cloud.wso2.com/cloudmgt/site/pages/organization.jag" target="_self" class="cloud-block-invert add-padding-top-3x"> <a href="{{oraganizationURL}}https://cloudmgt.cloud.wso2.com/cloudmgt/site/pages/organization.jag" target="_self" class="cloud-block-invert add-padding-top-3x">
<i class="fw fw-organization fw-3x"></i> <i class="fw fw-organization fw-3x"></i>
<div class="cloud-name">Organization</div> <div class="cloud-name">Organization</div>
</a> </a>
<a href="https://cloudmgt.cloud.wso2.com/cloudmgt/site/pages/user.jag" target="_self" class="cloud-block-invert add-padding-top-3x"> <a href="{{membersURL}}https://cloudmgt.cloud.wso2.com/cloudmgt/site/pages/user.jag" target="_self" class="cloud-block-invert add-padding-top-3x">
<i class="fa fa-users fa-3x"></i> <i class="fa fa-users fa-3x"></i>
<div class="cloud-name">Members</div> <div class="cloud-name">Members</div>
</a> </a>

Loading…
Cancel
Save