From 4eaf2b41c86e461b20e92a4748f34f674cb59247 Mon Sep 17 00:00:00 2001 From: kamidu Date: Thu, 9 Feb 2017 20:02:28 +0530 Subject: [PATCH] enable cloud related configurations to the devicemgt application --- .../devicemgt/app/conf/config.json | 384 +++++++++--------- .../user-menu.hbs | 40 +- 2 files changed, 222 insertions(+), 202 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json index fdd95504397..83e03ee7100 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json @@ -1,185 +1,205 @@ { - "appContext": "/devicemgt/", - "isCloud": false, - "httpsURL" : "https://%iot.gateway.host%:%iot.gateway.https.port%", - "httpURL" : "http://%iot.gateway.host%:%iot.gateway.http.port", - "wssURL" : "https://%iot.analytics.host%:%iot.analytics.https.port%", - "portalURL": "https://%iot.analytics.host%:%iot.analytics.https.port%", - "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" - }, - "tokenServiceURL": "https://%iot.gateway.host%:%iot.gateway.https.port%/token" + "appContext": "/devicemgt/", + "isCloud": false, + "cloudConfig": { + "upgradeNowURL": "", + "monetizationURL": "", + "requestExtensionURL": "", + "publisherURL": "", + "storeURL": "", + "contactUsURL": "", + "apiCloudDocURL": "https://docs.wso2.com/display/APICloud/WSO2+API+Cloud+Documentation", + "appCloudDocURL": "https://docs.wso2.com/display/AppCloud/WSO2+App+Cloud+Documentation", + "deviceCloudDocURL": "https://docs.wso2.com/display/DeviceCloud/WSO2+Device+Cloud+Documentation", + "apiCloudWalkthroughURL": "https://api.clouddev.wso2.com/publisher?interactiveTutorial=true", + "profileURL": "https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/user-profile.jag", + "changePasswordURL": "https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/change-password.jag", + "logoutURL": "https://api.clouddev.wso2.com/publisher/site/pages/logout.jag", + "apiCloudURL": "", + "appCloudURL": "", + "deviceCloudURL": "", + "oraganizationURL": "", + "membersURL": "" + }, + "httpsURL": "https://%iot.gateway.host%:%iot.gateway.https.port%", + "httpURL": "http://%iot.gateway.host%:%iot.gateway.http.port", + "wssURL": "https://%iot.analytics.host%:%iot.analytics.https.port%", + "portalURL": "https://%iot.analytics.host%:%iot.analytics.https.port%", + "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", - "adminUserTenantId":"-1234", - "adminRole":"admin", - "userValidationConfig" : { - "usernameLength":30, - "usernameJSRegEx" : "^[\\S]{3,30}$", - "usernameRegExViolationErrorMsg" : "Provided username is invalid.", - "usernameHelpMsg" : "Should be in minimum 3 characters long and do not include any whitespaces.", - "firstnameJSRegEx" : "^.{3,30}$", - "firstnameRegExViolationErrorMsg" : "Provided first name is invalid.", - "lastnameJSRegEx" : "^.{3,30}$", - "lastnameRegExViolationErrorMsg" : "Provided last name is invalid.", - "emailJSRegEx" : "/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/", - "emailRegExViolationErrorMsg" : "Provided email is invalid." - }, - "groupValidationConfig": { - "groupNameJSRegEx": "^[\\S]{3,30}$", - "groupNameRegExViolationErrorMsg": "Provided group name is invalid.", - "groupNameHelpMsg": "Should be in minimum 3 characters long and should not include any whitespaces." - }, - "roleValidationConfig" : { - "roleNameJSRegEx" : "^[\\S]{3,30}$", - "roleNameRegExViolationErrorMsg" : "Provided role name is invalid.", - "roleNameHelpMsg" : "should be in minimum 3 characters long and do not include any whitespaces." - }, - "generalConfig" : { - "host" : "%http.ip%", - "companyName" : "WSO2 Carbon Device Manager", - "browserTitle" : "WSO2 Device Manager", - "copyrightPrefix" : "\u00A9 %date-year%, ", - "copyrightOwner" : "WSO2 Inc.", - "copyrightOwnersSite" : "http://www.wso2.org", - "copyrightSuffix" : " All Rights Reserved." - }, - "scopes" : [ - "perm:sign-csr", - "perm:admin:devices:view", - "perm:roles:add", - "perm:roles:add-users", - "perm:roles:update", - "perm:roles:permissions", - "perm:roles:details", - "perm:roles:view", - "perm:roles:create-combined-role", - "perm:roles:delete", - "perm:dashboard:vulnerabilities", - "perm:dashboard:non-compliant-count", - "perm:dashboard:non-compliant", - "perm:dashboard:by-groups", - "perm:dashboard:device-counts", - "perm:dashboard:feature-non-compliant", - "perm:dashboard:count-overview", - "perm:dashboard:filtered-count", - "perm:dashboard:details", - "perm:get-activity", - "perm:devices:delete", - "perm:devices:applications", - "perm:devices:effective-policy", - "perm:devices:compliance-data", - "perm:devices:features", - "perm:devices:operations", - "perm:devices:search", - "perm:devices:details", - "perm:devices:update", - "perm:devices:view", - "perm:view-configuration", - "perm:manage-configuration", - "perm:policies:remove", - "perm:policies:priorities", - "perm:policies:deactivate", - "perm:policies:get-policy-details", - "perm:policies:manage", - "perm:policies:activate", - "perm:policies:update", - "perm:policies:changes", - "perm:policies:get-details", - "perm:users:add", - "perm:users:details", - "perm:users:count", - "perm:users:delete", - "perm:users:roles", - "perm:users:user-details", - "perm:users:credentials", - "perm:users:search", - "perm:users:is-exist", - "perm:users:update", - "perm:users:send-invitation", - "perm:admin-users:view", - "perm:groups:devices", - "perm:groups:update", - "perm:groups:add", - "perm:groups:device", - "perm:groups:devices-count", - "perm:groups:remove", - "perm:groups:groups", - "perm:groups:groups-view", - "perm:groups:share", - "perm:groups:count", - "perm:groups:roles", - "perm:groups:devices-remove", - "perm:groups:devices-add", - "perm:groups:assign", - "perm:device-types:features", - "perm:device-types:types", - "perm:applications:install", - "perm:applications:uninstall", - "perm:admin-groups:count", - "perm:admin-groups:view", - "perm:notifications:mark-checked", - "perm:notifications:view", - "perm:admin:certificates:delete", - "perm:admin:certificates:details", - "perm:admin:certificates:view", - "perm:admin:certificates:add", - "perm:admin:certificates:verify", - "perm:ios:enroll", - "perm:ios:view-device", - "perm:ios:apn", - "perm:ios:ldap", - "perm:ios:enterprise-app", - "perm:ios:store-application", - "perm:ios:remove-application", - "perm:ios:app-list", - "perm:ios:profile-list", - "perm:ios:lock", - "perm:ios:enterprise-wipe", - "perm:ios:device-info", - "perm:ios:restriction", - "perm:ios:email", - "perm:ios:cellular", - "perm:ios:applications", - "perm:ios:wifi", - "perm:ios:ring", - "perm:ios:location", - "perm:ios:notification", - "perm:ios:airplay", - "perm:ios:caldav", - "perm:ios:cal-subscription", - "perm:ios:passcode-policy", - "perm:ios:webclip", - "perm:ios:vpn", - "perm:ios:per-app-vpn", - "perm:ios:app-to-per-app-vpn", - "perm:ios:app-lock", - "perm:ios:clear-passcode", - "perm:ios:remove-profile", - "perm:ios:get-restrictions", - "perm:ios:wipe-data", - "perm:admin", - "perm:devicetype:deployment" - ], - "isOAuthEnabled" : true, - "backendRestEndpoints" : { - "deviceMgt" : "/api/device-mgt/v1.0" - } + "tokenServiceURL": "https://%iot.gateway.host%:%iot.gateway.https.port%/token" + }, + "adminUser": "admin@carbon.super", + "adminUserTenantId": "-1234", + "adminRole": "admin", + "userValidationConfig": { + "usernameLength": 30, + "usernameJSRegEx": "^[\\S]{3,30}$", + "usernameRegExViolationErrorMsg": "Provided username is invalid.", + "usernameHelpMsg": "Should be in minimum 3 characters long and do not include any whitespaces.", + "firstnameJSRegEx": "^.{3,30}$", + "firstnameRegExViolationErrorMsg": "Provided first name is invalid.", + "lastnameJSRegEx": "^.{3,30}$", + "lastnameRegExViolationErrorMsg": "Provided last name is invalid.", + "emailJSRegEx": "/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/", + "emailRegExViolationErrorMsg": "Provided email is invalid." + }, + "groupValidationConfig": { + "groupNameJSRegEx": "^[\\S]{3,30}$", + "groupNameRegExViolationErrorMsg": "Provided group name is invalid.", + "groupNameHelpMsg": "Should be in minimum 3 characters long and should not include any whitespaces." + }, + "roleValidationConfig": { + "roleNameJSRegEx": "^[\\S]{3,30}$", + "roleNameRegExViolationErrorMsg": "Provided role name is invalid.", + "roleNameHelpMsg": "should be in minimum 3 characters long and do not include any whitespaces." + }, + "generalConfig": { + "host": "%http.ip%", + "companyName": "WSO2 Carbon Device Manager", + "browserTitle": "WSO2 Device Manager", + "copyrightPrefix": "\u00A9 %date-year%, ", + "copyrightOwner": "WSO2 Inc.", + "copyrightOwnersSite": "http://www.wso2.org", + "copyrightSuffix": " All Rights Reserved." + }, + "scopes": [ + "perm:sign-csr", + "perm:admin:devices:view", + "perm:roles:add", + "perm:roles:add-users", + "perm:roles:update", + "perm:roles:permissions", + "perm:roles:details", + "perm:roles:view", + "perm:roles:create-combined-role", + "perm:roles:delete", + "perm:dashboard:vulnerabilities", + "perm:dashboard:non-compliant-count", + "perm:dashboard:non-compliant", + "perm:dashboard:by-groups", + "perm:dashboard:device-counts", + "perm:dashboard:feature-non-compliant", + "perm:dashboard:count-overview", + "perm:dashboard:filtered-count", + "perm:dashboard:details", + "perm:get-activity", + "perm:devices:delete", + "perm:devices:applications", + "perm:devices:effective-policy", + "perm:devices:compliance-data", + "perm:devices:features", + "perm:devices:operations", + "perm:devices:search", + "perm:devices:details", + "perm:devices:update", + "perm:devices:view", + "perm:view-configuration", + "perm:manage-configuration", + "perm:policies:remove", + "perm:policies:priorities", + "perm:policies:deactivate", + "perm:policies:get-policy-details", + "perm:policies:manage", + "perm:policies:activate", + "perm:policies:update", + "perm:policies:changes", + "perm:policies:get-details", + "perm:users:add", + "perm:users:details", + "perm:users:count", + "perm:users:delete", + "perm:users:roles", + "perm:users:user-details", + "perm:users:credentials", + "perm:users:search", + "perm:users:is-exist", + "perm:users:update", + "perm:users:send-invitation", + "perm:admin-users:view", + "perm:groups:devices", + "perm:groups:update", + "perm:groups:add", + "perm:groups:device", + "perm:groups:devices-count", + "perm:groups:remove", + "perm:groups:groups", + "perm:groups:groups-view", + "perm:groups:share", + "perm:groups:count", + "perm:groups:roles", + "perm:groups:devices-remove", + "perm:groups:devices-add", + "perm:groups:assign", + "perm:device-types:features", + "perm:device-types:types", + "perm:applications:install", + "perm:applications:uninstall", + "perm:admin-groups:count", + "perm:admin-groups:view", + "perm:notifications:mark-checked", + "perm:notifications:view", + "perm:admin:certificates:delete", + "perm:admin:certificates:details", + "perm:admin:certificates:view", + "perm:admin:certificates:add", + "perm:admin:certificates:verify", + "perm:ios:enroll", + "perm:ios:view-device", + "perm:ios:apn", + "perm:ios:ldap", + "perm:ios:enterprise-app", + "perm:ios:store-application", + "perm:ios:remove-application", + "perm:ios:app-list", + "perm:ios:profile-list", + "perm:ios:lock", + "perm:ios:enterprise-wipe", + "perm:ios:device-info", + "perm:ios:restriction", + "perm:ios:email", + "perm:ios:cellular", + "perm:ios:applications", + "perm:ios:wifi", + "perm:ios:ring", + "perm:ios:location", + "perm:ios:notification", + "perm:ios:airplay", + "perm:ios:caldav", + "perm:ios:cal-subscription", + "perm:ios:passcode-policy", + "perm:ios:webclip", + "perm:ios:vpn", + "perm:ios:per-app-vpn", + "perm:ios:app-to-per-app-vpn", + "perm:ios:app-lock", + "perm:ios:clear-passcode", + "perm:ios:remove-profile", + "perm:ios:get-restrictions", + "perm:ios:wipe-data", + "perm:admin", + "perm:devicetype:deployment" + ], + "isOAuthEnabled": true, + "backendRestEndpoints": { + "deviceMgt": "/api/device-mgt/v1.0" + } } \ No newline at end of file diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/user-menu.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/user-menu.hbs index a9379d3435a..b28e0ae5dfd 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/user-menu.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/user-menu.hbs @@ -48,7 +48,7 @@
  • Upgrade Now @@ -56,7 +56,7 @@
  • Monetization @@ -64,7 +64,7 @@
  • Request Extension @@ -82,20 +82,20 @@ - +