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

Merge pull request 'Modify permission scope keys' (#31) from viranga/device-mgt-plugins:scope-fixes into master

Browse Source 
Reviewed-on: community/device-mgt-plugins#31
apim420^2^2
Inosh Perara 1 year ago
parent 83cdc19262 939b2c7e83
commit 92d1f88ac1
11 changed files with 110 additions and 110 deletions
Show Stats Download Patch File Download Diff File

8
components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/VirtualFireAlarmService.java
Unescape View File

@ -53,7 +53,7 @@ import javax.ws.rs.core.Response;
@Scope( @Scope(
name = "Enroll device", name = "Enroll device",
description = "", description = "",
key = "perm:firealarm:enroll", key = "dm:firealarm:enroll",
permissions = {"/device-mgt/devices/enroll/firealarm"}, permissions = {"/device-mgt/devices/enroll/firealarm"},
roles = {"Internal/devicemgt-user"} roles = {"Internal/devicemgt-user"}
) )
@ -83,7 +83,7 @@ public interface VirtualFireAlarmService {
tags = "virtual_firealarm", tags = "virtual_firealarm",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = SCOPE, value = "perm:firealarm:enroll") @ExtensionProperty(name = SCOPE, value = "dm:firealarm:enroll")
}) })
} }
) )
@ -104,7 +104,7 @@ public interface VirtualFireAlarmService {
tags = "virtual_firealarm", tags = "virtual_firealarm",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = SCOPE, value = "perm:firealarm:enroll") @ExtensionProperty(name = SCOPE, value = "dm:firealarm:enroll")
}) })
} }
) )
@ -125,7 +125,7 @@ public interface VirtualFireAlarmService {
tags = "virtual_firealarm", tags = "virtual_firealarm",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = SCOPE, value = "perm:firealarm:enroll") @ExtensionProperty(name = SCOPE, value = "dm:firealarm:enroll")
}) })
} }
) )

2
components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/src/main/java/io/entgra/device/mgt/plugins/input/adapter/http/authorization/client/OAuthRequestInterceptor.java
Unescape View File

@ -58,7 +58,7 @@ public class OAuthRequestInterceptor implements RequestInterceptor {
private static final String APPLICATION_NAME = "websocket-app"; private static final String APPLICATION_NAME = "websocket-app";
private static final String PASSWORD_GRANT_TYPE = "password"; private static final String PASSWORD_GRANT_TYPE = "password";
private static final String REFRESH_GRANT_TYPE = "refresh_token"; private static final String REFRESH_GRANT_TYPE = "refresh_token";
private static final String REQUIRED_SCOPE = "perm:authorization:verify"; private static final String REQUIRED_SCOPE = "dm:authorization:verify";
private ApiApplicationRegistrationService apiApplicationRegistrationService; private ApiApplicationRegistrationService apiApplicationRegistrationService;
private TokenIssuerService tokenIssuerService; private TokenIssuerService tokenIssuerService;

2
components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/authorization/client/OAuthRequestInterceptor.java
Unescape View File

@ -70,7 +70,7 @@ public class OAuthRequestInterceptor implements RequestInterceptor {
private static final String APPLICATION_NAME = "websocket-app"; private static final String APPLICATION_NAME = "websocket-app";
private static final String PASSWORD_GRANT_TYPE = "password"; private static final String PASSWORD_GRANT_TYPE = "password";
private static final String REFRESH_GRANT_TYPE = "refresh_token"; private static final String REFRESH_GRANT_TYPE = "refresh_token";
private static final String REQUIRED_SCOPE = "perm:authorization:verify"; private static final String REQUIRED_SCOPE = "dm:authorization:verify";
private ApiApplicationRegistrationService apiApplicationRegistrationService; private ApiApplicationRegistrationService apiApplicationRegistrationService;
private TokenIssuerService tokenIssuerService; private TokenIssuerService tokenIssuerService;
private ApiApplicationKey apiApplicationKey; private ApiApplicationKey apiApplicationKey;

4
components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/jaxrs/service/MQTTManagementAdminService.java
Unescape View File

@ -64,7 +64,7 @@ import javax.ws.rs.core.Response;
@Scope( @Scope(
name = "Getting Details of Topics", name = "Getting Details of Topics",
description = "Getting Details of Topics", description = "Getting Details of Topics",
key = "perm:admin:topics:view", key = "dm:admin:topics:view",
permissions = {"/device-mgt/topics/view"} permissions = {"/device-mgt/topics/view"}
) )
} }
@ -82,7 +82,7 @@ public interface MQTTManagementAdminService {
tags = "MQTT Management Administrative Service", tags = "MQTT Management Administrative Service",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = Constants.SCOPE, value = "perm:admin:topics:view") @ExtensionProperty(name = Constants.SCOPE, value = "dm:admin:topics:view")
}) })
} }
) )

2
components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/client/OAuthRequestInterceptor.java
Unescape View File

@ -58,7 +58,7 @@ public class OAuthRequestInterceptor implements RequestInterceptor {
private static final String APPLICATION_NAME = "mqtt_broker"; private static final String APPLICATION_NAME = "mqtt_broker";
private static final String PASSWORD_GRANT_TYPE = "password"; private static final String PASSWORD_GRANT_TYPE = "password";
private static final String REFRESH_GRANT_TYPE = "refresh_token"; private static final String REFRESH_GRANT_TYPE = "refresh_token";
private static final String REQUIRED_SCOPE = "perm:authorization:verify"; private static final String REQUIRED_SCOPE = "dm:authorization:verify";
private ApiApplicationRegistrationService apiApplicationRegistrationService; private ApiApplicationRegistrationService apiApplicationRegistrationService;
private TokenIssuerService tokenIssuerService; private TokenIssuerService tokenIssuerService;
private static Log log = LogFactory.getLog(OAuthRequestInterceptor.class); private static Log log = LogFactory.getLog(OAuthRequestInterceptor.class);

2
components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/OAuthRequestInterceptor.java
Unescape View File

@ -50,7 +50,7 @@ import io.entgra.device.mgt.plugins.extension.siddhi.device.utils.DeviceUtils;
public class OAuthRequestInterceptor implements RequestInterceptor { public class OAuthRequestInterceptor implements RequestInterceptor {
private static final String APPLICATION_NAME = "siddhi_extension_client"; private static final String APPLICATION_NAME = "siddhi_extension_client";
private static final String REQUIRED_SCOPES = "perm:devices:operations"; private static final String REQUIRED_SCOPES = "dm:devices:ops:view";
private static final String[] API_TAGS = {"device_management"}; private static final String[] API_TAGS = {"device_management"};
private DCRService dcrService; private DCRService dcrService;
private static OAuthApplication oAuthApplication; private static OAuthApplication oAuthApplication;

104
components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceManagementAdminService.java
Unescape View File

@ -71,182 +71,182 @@ import java.util.List;
@Scope( @Scope(
name = "Lock Device", name = "Lock Device",
description = "Hard lock own device", description = "Hard lock own device",
key = "perm:android:lock-devices", key = "and:ops:lock-devices",
roles = {"Internal/devicemgt-admin"}, roles = {"Internal/devicemgt-admin"},
permissions = {"/device-mgt/devices/owning-device/operations/android/lock"} permissions = {"/device-mgt/devices/owning-device/operations/android/lock"}
), ),
@Scope( @Scope(
name = "Unlock Device", name = "Unlock Device",
description = "Unlock permanently locked device", description = "Unlock permanently locked device",
key = "perm:android:unlock-devices", key = "and:ops:unlock-devices",
roles = {"Internal/devicemgt-admin"}, roles = {"Internal/devicemgt-admin"},
permissions = {"/device-mgt/devices/owning-device/operations/android/unlock"} permissions = {"/device-mgt/devices/owning-device/operations/android/unlock"}
), ),
@Scope( @Scope(
name = "Get Location", name = "Get Location",
description = "Request device location coordinates", description = "Request device location coordinates",
key = "perm:android:location", key = "and:ops:location",
roles = {"Internal/devicemgt-admin"}, roles = {"Internal/devicemgt-admin"},
permissions = {"/device-mgt/devices/owning-device/operations/android/location"} permissions = {"/device-mgt/devices/owning-device/operations/android/location"}
), ),
@Scope( @Scope(
name = "Clear Password", name = "Clear Password",
description = "Clear the password on Android devices", description = "Clear the password on Android devices",
key = "perm:android:clear-password", key = "and:ops:clear-password",
roles = {"Internal/devicemgt-admin"}, roles = {"Internal/devicemgt-admin"},
permissions = {"/device-mgt/devices/owning-device/operations/android/clear-password"} permissions = {"/device-mgt/devices/owning-device/operations/android/clear-password"}
), ),
@Scope( @Scope(
name = "Control Camera", name = "Control Camera",
description = "Enabling or Disabling the Camera on Android Devices", description = "Enabling or Disabling the Camera on Android Devices",
key = "perm:android:control-camera", key = "and:ops:control-camera",
roles = {"Internal/devicemgt-admin"}, roles = {"Internal/devicemgt-admin"},
permissions = {"/device-mgt/devices/owning-device/operations/android/camera"} permissions = {"/device-mgt/devices/owning-device/operations/android/camera"}
), ),
@Scope( @Scope(
name = "Get Info", name = "Get Info",
description = "Requesting device information from Android Devices", description = "Requesting device information from Android Devices",
key = "perm:android:info", key = "and:ops:device-info",
roles = {"Internal/devicemgt-admin"}, roles = {"Internal/devicemgt-admin"},
permissions = {"/device-mgt/devices/owning-device/operations/android/info"} permissions = {"/device-mgt/devices/owning-device/operations/android/info"}
), ),
@Scope( @Scope(
name = "Get Logs", name = "Get Logs",
description = "Requesting Logcat Details from Android Devices", description = "Requesting Logcat Details from Android Devices",
key = "perm:android:logcat", key = "and:ops:logcat",
roles = {"Internal/devicemgt-admin"}, roles = {"Internal/devicemgt-admin"},
permissions = {"/device-mgt/devices/owning-device/operations/android/logcat"} permissions = {"/device-mgt/devices/owning-device/operations/android/logcat"}
), ),
@Scope( @Scope(
name = "Enterprise Wipe", name = "Enterprise Wipe",
description = "Enterprise Wiping Android Devices", description = "Enterprise Wiping Android Devices",
key = "perm:android:enterprise-wipe", key = "and:ops:enterprise-wipe",
roles = {"Internal/devicemgt-admin"}, roles = {"Internal/devicemgt-admin"},
permissions = {"/device-mgt/devices/owning-device/operations/android/enterprise-wipe"} permissions = {"/device-mgt/devices/owning-device/operations/android/enterprise-wipe"}
), ),
@Scope( @Scope(
name = "Factory Reset", name = "Factory Reset",
description = "Factory Resetting Android Devices", description = "Factory Resetting Android Devices",
key = "perm:android:wipe", key = "and:ops:wipe",
roles = {"Internal/devicemgt-admin"}, roles = {"Internal/devicemgt-admin"},
permissions = {"/device-mgt/devices/owning-device/operations/android/wipe"} permissions = {"/device-mgt/devices/owning-device/operations/android/wipe"}
), ),
@Scope( @Scope(
name = "Get Installed Applications", name = "Get Installed Applications",
description = "Get list of installed applications", description = "Get list of installed applications",
key = "perm:android:applications", key = "and:ops:app-list",
roles = {"Internal/devicemgt-admin"}, roles = {"Internal/devicemgt-admin"},
permissions = {"/device-mgt/devices/owning-device/operations/android/applications"} permissions = {"/device-mgt/devices/owning-device/operations/android/applications"}
), ),
@Scope( @Scope(
name = "Ring Device", name = "Ring Device",
description = "Ring Android devices", description = "Ring Android devices",
key = "perm:android:ring", key = "and:ops:ring",
roles = {"Internal/devicemgt-admin"}, roles = {"Internal/devicemgt-admin"},
permissions = {"/device-mgt/devices/owning-device/operations/android/ring"} permissions = {"/device-mgt/devices/owning-device/operations/android/ring"}
), ),
@Scope( @Scope(
name = "Reboot Device", name = "Reboot Device",
description = "Reboot Android devices", description = "Reboot Android devices",
key = "perm:android:reboot", key = "and:ops:reboot",
roles = {"Internal/devicemgt-admin"}, roles = {"Internal/devicemgt-admin"},
permissions = {"/device-mgt/devices/owning-device/operations/android/reboot"} permissions = {"/device-mgt/devices/owning-device/operations/android/reboot"}
), ),
@Scope( @Scope(
name = "Mute Device", name = "Mute Device",
description = "Mute Android devices", description = "Mute Android devices",
key = "perm:android:mute", key = "and:ops:mute",
roles = {"Internal/devicemgt-admin"}, roles = {"Internal/devicemgt-admin"},
permissions = {"/device-mgt/devices/owning-device/operations/android/mute"} permissions = {"/device-mgt/devices/owning-device/operations/android/mute"}
), ),
@Scope( @Scope(
name = "Install Applications", name = "Install Applications",
description = "Installing an Application on Android Devices", description = "Installing an Application on Android Devices",
key = "perm:android:install-application", key = "and:ops:install-app",
roles = {"Internal/devicemgt-admin"}, roles = {"Internal/devicemgt-admin"},
permissions = {"/device-mgt/devices/owning-device/operations/android/install-app"} permissions = {"/device-mgt/devices/owning-device/operations/android/install-app"}
), ),
@Scope( @Scope(
name = "Update Applications", name = "Update Applications",
description = "Updating an Application on Android Devices", description = "Updating an Application on Android Devices",
key = "perm:android:update-application", key = "and:ops:update-app",
roles = {"Internal/devicemgt-admin"}, roles = {"Internal/devicemgt-admin"},
permissions = {"/device-mgt/devices/owning-device/operations/android/update-app"} permissions = {"/device-mgt/devices/owning-device/operations/android/update-app"}
), ),
@Scope( @Scope(
name = "Uninstall Applications", name = "Uninstall Applications",
description = "Uninstalling an Application on Android Devices", description = "Uninstalling an Application on Android Devices",
key = "perm:android:uninstall-application", key = "and:ops:uninstall-app",
roles = {"Internal/devicemgt-admin"}, roles = {"Internal/devicemgt-admin"},
permissions = {"/device-mgt/devices/owning-device/operations/android/uninstall-app"} permissions = {"/device-mgt/devices/owning-device/operations/android/uninstall-app"}
), ),
@Scope( @Scope(
name = "Blacklist Applications", name = "Blacklist Applications",
description = "Blacklisting applications on Android Devices", description = "Blacklisting applications on Android Devices",
key = "perm:android:blacklist-applications", key = "and:ops:blacklist-app",
roles = {"Internal/devicemgt-admin"}, roles = {"Internal/devicemgt-admin"},
permissions = {"/device-mgt/devices/owning-device/operations/android/blacklist-app"} permissions = {"/device-mgt/devices/owning-device/operations/android/blacklist-app"}
), ),
@Scope( @Scope(
name = "Upgrade Firmware", name = "Upgrade Firmware",
description = "Upgrading Firmware of Android Devices", description = "Upgrading Firmware of Android Devices",
key = "perm:android:upgrade-firmware", key = "and:ops:upgrade-firmware",
roles = {"Internal/devicemgt-admin"}, roles = {"Internal/devicemgt-admin"},
permissions = {"/device-mgt/devices/owning-device/operations/android/upgrade"} permissions = {"/device-mgt/devices/owning-device/operations/android/upgrade"}
), ),
@Scope( @Scope(
name = "Configure VPN", name = "Configure VPN",
description = "Configure VPN on Android Device", description = "Configure VPN on Android Device",
key = "perm:android:configure-vpn", key = "and:ops:configure-vpn",
roles = {"Internal/devicemgt-admin"}, roles = {"Internal/devicemgt-admin"},
permissions = {"/device-mgt/devices/owning-device/operations/android/vpn"} permissions = {"/device-mgt/devices/owning-device/operations/android/vpn"}
), ),
@Scope( @Scope(
name = "Send Notification", name = "Send Notification",
description = "Sending a notification to Android Device", description = "Sending a notification to Android Device",
key = "perm:android:send-notification", key = "and:ops:send-notif",
roles = {"Internal/devicemgt-admin"}, roles = {"Internal/devicemgt-admin"},
permissions = {"/device-mgt/devices/owning-device/operations/android/send-notification"} permissions = {"/device-mgt/devices/owning-device/operations/android/send-notification"}
), ),
@Scope( @Scope(
name = "Configure Wi-Fi", name = "Configure Wi-Fi",
description = "Configure Wi-Fi on Android Device", description = "Configure Wi-Fi on Android Device",
key = "perm:android:configure-wifi", key = "and:ops:configure-wifi",
roles = {"Internal/devicemgt-admin"}, roles = {"Internal/devicemgt-admin"},
permissions = {"/device-mgt/devices/owning-device/operations/android/wifi"} permissions = {"/device-mgt/devices/owning-device/operations/android/wifi"}
), ),
@Scope( @Scope(
name = "Encrypt Storage", name = "Encrypt Storage",
description = "Encrypting storage on Android Device", description = "Encrypting storage on Android Device",
key = "perm:android:encrypt-storage", key = "and:ops:encrypt-storage",
roles = {"Internal/devicemgt-admin"}, roles = {"Internal/devicemgt-admin"},
permissions = {"/device-mgt/devices/owning-device/operations/android/encrypt"} permissions = {"/device-mgt/devices/owning-device/operations/android/encrypt"}
), ),
@Scope( @Scope(
name = "Change Password", name = "Change Password",
description = "Changing the lock code of an Android Device", description = "Changing the lock code of an Android Device",
key = "perm:android:change-lock-code", key = "and:ops:change-lock-code",
roles = {"Internal/devicemgt-admin"}, roles = {"Internal/devicemgt-admin"},
permissions = {"/device-mgt/devices/owning-device/operations/android/change-lock-code"} permissions = {"/device-mgt/devices/owning-device/operations/android/change-lock-code"}
), ),
@Scope( @Scope(
name = "Password Policy", name = "Password Policy",
description = "Set password policy of an Android Device", description = "Set password policy of an Android Device",
key = "perm:android:set-password-policy", key = "and:ops:password-policy",
roles = {"Internal/devicemgt-admin"}, roles = {"Internal/devicemgt-admin"},
permissions = {"/device-mgt/devices/owning-device/operations/android/password-policy"} permissions = {"/device-mgt/devices/owning-device/operations/android/password-policy"}
), ),
@Scope( @Scope(
name = "Add Web clip", name = "Add Web clip",
description = "Setting a Web Clip on Android Devices", description = "Setting a Web Clip on Android Devices",
key = "perm:android:set-webclip", key = "and:ops:set-webclip",
roles = {"Internal/devicemgt-admin"}, roles = {"Internal/devicemgt-admin"},
permissions = {"/device-mgt/devices/owning-device/operations/android/webclip"} permissions = {"/device-mgt/devices/owning-device/operations/android/webclip"}
), ),
@Scope( @Scope(
name = "File Transfer", name = "File Transfer",
description = "Transferring a file to android devices", description = "Transferring a file to android devices",
key = "perm:android:file-transfer", key = "and:ops:file-transfer",
roles = {"Internal/devicemgt-admin"}, roles = {"Internal/devicemgt-admin"},
permissions = {"/device-mgt/devices/owning-device/operations/android/file-transfer"} permissions = {"/device-mgt/devices/owning-device/operations/android/file-transfer"}
) )
@ -266,7 +266,7 @@ public interface DeviceManagementAdminService {
tags = "Android Device Management Administrative Service", tags = "Android Device Management Administrative Service",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:file-transfer") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:file-transfer")
}) })
} }
) )
@ -327,7 +327,7 @@ public interface DeviceManagementAdminService {
tags = "Android Device Management Administrative Service", tags = "Android Device Management Administrative Service",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:lock-devices") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:lock-devices")
}) })
} }
) )
@ -390,7 +390,7 @@ public interface DeviceManagementAdminService {
tags = "Android Device Management Administrative Service", tags = "Android Device Management Administrative Service",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:unlock-devices") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:unlock-devices")
}) })
} }
) )
@ -453,7 +453,7 @@ public interface DeviceManagementAdminService {
tags = "Android Device Management Administrative Service", tags = "Android Device Management Administrative Service",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:location") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:location")
}) })
} }
) )
@ -512,7 +512,7 @@ public interface DeviceManagementAdminService {
tags = "Android Device Management Administrative Service", tags = "Android Device Management Administrative Service",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:clear-password") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:clear-password")
}) })
} }
) )
@ -570,7 +570,7 @@ public interface DeviceManagementAdminService {
tags = "Android Device Management Administrative Service", tags = "Android Device Management Administrative Service",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:control-camera") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:control-camera")
}) })
}) })
@ApiResponses(value = { @ApiResponses(value = {
@ -635,7 +635,7 @@ public interface DeviceManagementAdminService {
tags = "Android Device Management Administrative Service", tags = "Android Device Management Administrative Service",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:info") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:device-info")
}) })
} }
) )
@ -698,7 +698,7 @@ public interface DeviceManagementAdminService {
tags = "Android Device Management Administrative Service", tags = "Android Device Management Administrative Service",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:logcat") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:logcat")
}) })
} }
) )
@ -760,7 +760,7 @@ public interface DeviceManagementAdminService {
tags = "Android Device Management Administrative Service", tags = "Android Device Management Administrative Service",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:enterprise-wipe") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:enterprise-wipe")
}) })
} }
) )
@ -820,7 +820,7 @@ public interface DeviceManagementAdminService {
tags = "Android Device Management Administrative Service", tags = "Android Device Management Administrative Service",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:wipe") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:wipe")
}) })
} }
) )
@ -884,7 +884,7 @@ public interface DeviceManagementAdminService {
tags = "Android Device Management Administrative Service", tags = "Android Device Management Administrative Service",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:applications") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:app-list")
}) })
} }
) )
@ -944,7 +944,7 @@ public interface DeviceManagementAdminService {
tags = "Android Device Management Administrative Service", tags = "Android Device Management Administrative Service",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:ring") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:ring")
}) })
} }
) )
@ -1004,7 +1004,7 @@ public interface DeviceManagementAdminService {
tags = "Android Device Management Administrative Service", tags = "Android Device Management Administrative Service",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:reboot") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:reboot")
}) })
} }
) )
@ -1064,7 +1064,7 @@ public interface DeviceManagementAdminService {
tags = "Android Device Management Administrative Service", tags = "Android Device Management Administrative Service",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:mute") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:mute")
}) })
} }
) )
@ -1126,7 +1126,7 @@ public interface DeviceManagementAdminService {
tags = "Android Device Management Administrative Service", tags = "Android Device Management Administrative Service",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:install-application") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:install-app")
}) })
} }
) )
@ -1191,7 +1191,7 @@ public interface DeviceManagementAdminService {
tags = "Android Device Management Administrative Service", tags = "Android Device Management Administrative Service",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:update-application") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:update-app")
}) })
} }
) )
@ -1253,7 +1253,7 @@ public interface DeviceManagementAdminService {
tags = "Android Device Management Administrative Service", tags = "Android Device Management Administrative Service",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:uninstall-application") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:uninstall-app")
}) })
} }
) )
@ -1319,7 +1319,7 @@ public interface DeviceManagementAdminService {
tags = "Android Device Management Administrative Service", tags = "Android Device Management Administrative Service",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:blacklist-applications") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:blacklist-app")
}) })
} }
) )
@ -1381,7 +1381,7 @@ public interface DeviceManagementAdminService {
tags = "Android Device Management Administrative Service", tags = "Android Device Management Administrative Service",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:upgrade-firmware") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:upgrade-firmware")
}) })
} }
) )
@ -1445,7 +1445,7 @@ public interface DeviceManagementAdminService {
tags = "Android Device Management Administrative Service", tags = "Android Device Management Administrative Service",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:configure-vpn") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:configure-vpn")
}) })
} }
) )
@ -1505,7 +1505,7 @@ public interface DeviceManagementAdminService {
tags = "Android Device Management Administrative Service", tags = "Android Device Management Administrative Service",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:send-notification") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:send-notif")
}) })
} }
) )
@ -1566,7 +1566,7 @@ public interface DeviceManagementAdminService {
tags = "Android Device Management Administrative Service", tags = "Android Device Management Administrative Service",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:configure-wifi") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:configure-wifi")
}) })
} }
) )
@ -1628,7 +1628,7 @@ public interface DeviceManagementAdminService {
tags = "Android Device Management Administrative Service", tags = "Android Device Management Administrative Service",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:encrypt-storage") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:encrypt-storage")
}) })
} }
) )
@ -1690,7 +1690,7 @@ public interface DeviceManagementAdminService {
tags = "Android Device Management Administrative Service", tags = "Android Device Management Administrative Service",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:change-lock-code") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:change-lock-code")
}) })
} }
) )
@ -1752,7 +1752,7 @@ public interface DeviceManagementAdminService {
tags = "Android Device Management Administrative Service", tags = "Android Device Management Administrative Service",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:set-password-policy") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:password-policy")
}) })
} }
) )
@ -1812,7 +1812,7 @@ public interface DeviceManagementAdminService {
tags = "Android Device Management Administrative Service", tags = "Android Device Management Administrative Service",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:set-webclip") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:set-webclip")
}) })
} }
) )

18
components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceManagementService.java
Unescape View File

@ -70,14 +70,14 @@ import java.util.List;
@Scope( @Scope(
name = "Enroll Device", name = "Enroll Device",
description = "Register an Android device", description = "Register an Android device",
key = "perm:android:enroll", key = "and:devices:enroll",
roles = {"Internal/devicemgt-user"}, roles = {"Internal/devicemgt-user"},
permissions = {"/device-mgt/devices/enroll/android"} permissions = {"/device-mgt/devices/enroll/android"}
), ),
@Scope( @Scope(
name = "Un-enroll Device", name = "Un-enroll Device",
description = "Unregister an Android device", description = "Unregister an Android device",
key = "perm:android:disenroll", key = "and:devices:disenroll",
roles = {"Internal/devicemgt-user"}, roles = {"Internal/devicemgt-user"},
permissions = {"/device-mgt/devices/disenroll/android"} permissions = {"/device-mgt/devices/disenroll/android"}
) )
@ -96,7 +96,7 @@ public interface DeviceManagementService {
tags = "Android Device Management", tags = "Android Device Management",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:enroll") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:devices:enroll")
}) })
} }
) )
@ -161,7 +161,7 @@ public interface DeviceManagementService {
tags = "Android Device Management", tags = "Android Device Management",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:enroll") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:devices:enroll")
}) })
} }
) )
@ -222,7 +222,7 @@ public interface DeviceManagementService {
tags = "Android Device Management", tags = "Android Device Management",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:enroll") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:devices:enroll")
}) })
} }
) )
@ -284,7 +284,7 @@ public interface DeviceManagementService {
tags = "Android Device Management", tags = "Android Device Management",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:enroll") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:devices:enroll")
}) })
} }
) )
@ -339,7 +339,7 @@ public interface DeviceManagementService {
tags = "Android Device Management", tags = "Android Device Management",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:enroll") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:devices:enroll")
}) })
} }
) )
@ -392,7 +392,7 @@ public interface DeviceManagementService {
tags = "Android Device Management", tags = "Android Device Management",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:enroll") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:devices:enroll")
}) })
} }
) )
@ -448,7 +448,7 @@ public interface DeviceManagementService {
tags = "Android Device Management", tags = "Android Device Management",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:disenroll") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:devices:disenroll")
}) })
} }
) )

12
components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceTypeConfigurationService.java
Unescape View File

@ -67,21 +67,21 @@ import javax.ws.rs.core.Response;
@Scope( @Scope(
name = "Enroll Device", name = "Enroll Device",
description = "Register an Android device", description = "Register an Android device",
key = "perm:android:enroll", key = "and:devices:enroll",
roles = {"Internal/devicemgt-user"}, roles = {"Internal/devicemgt-user"},
permissions = {"/device-mgt/devices/enroll/android"} permissions = {"/device-mgt/devices/enroll/android"}
), ),
@Scope( @Scope(
name = "View Configurations", name = "View Configurations",
description = "Getting Android Platform Configurations", description = "Getting Android Platform Configurations",
key = "perm:android:view-configuration", key = "and:conf:view",
roles = {"Internal/devicemgt-user"}, roles = {"Internal/devicemgt-user"},
permissions = {"/device-mgt/devices/enroll/android"} permissions = {"/device-mgt/devices/enroll/android"}
), ),
@Scope( @Scope(
name = "Manage Configurations", name = "Manage Configurations",
description = "Updating Android Platform Configurations", description = "Updating Android Platform Configurations",
key = "perm:android:manage-configuration", key = "and:conf:manage",
roles = {"Internal/devicemgt-user"}, roles = {"Internal/devicemgt-user"},
permissions = {"/device-mgt/platform-configurations/manage"} permissions = {"/device-mgt/platform-configurations/manage"}
) )
@ -99,7 +99,7 @@ public interface DeviceTypeConfigurationService {
tags = "Android Configuration Management", tags = "Android Configuration Management",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:view-configuration") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:conf:view")
}) })
} }
) )
@ -153,7 +153,7 @@ public interface DeviceTypeConfigurationService {
tags = "Android Configuration Management", tags = "Android Configuration Management",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:manage-configuration") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:conf:manage")
}) })
} }
) )
@ -208,7 +208,7 @@ public interface DeviceTypeConfigurationService {
tags = "Android Configuration Management", tags = "Android Configuration Management",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:enroll") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:devices:enroll")
}) })
} }
) )

6
components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/EventReceiverService.java
Unescape View File

@ -67,7 +67,7 @@ import javax.ws.rs.core.Response;
@Scope( @Scope(
name = "Enroll Device", name = "Enroll Device",
description = "Register an Android device", description = "Register an Android device",
key = "perm:android:enroll", key = "and:devices:enroll",
roles = {"Internal/devicemgt-user"}, roles = {"Internal/devicemgt-user"},
permissions = {"/device-mgt/devices/enroll/android"} permissions = {"/device-mgt/devices/enroll/android"}
) )
@ -86,7 +86,7 @@ public interface EventReceiverService {
tags = "Event Receiver", tags = "Event Receiver",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:enroll") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:devices:enroll")
}) })
} }
) )
@ -149,7 +149,7 @@ public interface EventReceiverService {
tags = "Event Receiver", tags = "Event Receiver",
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:enroll") @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:devices:enroll")
}) })
} }
) )

60
components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json
Unescape View File

@ -6,36 +6,36 @@
"analyticsEnabled": "false", "analyticsEnabled": "false",
"groupingEnabled": "true", "groupingEnabled": "true",
"scopes" : [ "scopes" : [
"perm:android:file-transfer", "and:ops:file-transfer",
"perm:android:enroll", "and:devices:enroll",
"perm:android:wipe", "and:ops:wipe",
"perm:android:ring", "and:ops:ring",
"perm:android:lock-devices", "and:ops:lock-devices",
"perm:android:configure-vpn", "and:ops:configure-vpn",
"perm:android:configure-wifi", "and:ops:configure-wifi",
"perm:android:enroll", "and:devices:enroll",
"perm:android:uninstall-application", "and:ops:uninstall-app",
"perm:android:manage-configuration", "and:conf:manage",
"perm:android:location", "and:ops:location",
"perm:android:install-application", "and:ops:install-app",
"perm:android:mute", "and:ops:mute",
"perm:android:change-lock-code", "and:ops:change-lock-code",
"perm:android:blacklist-applications", "and:ops:blacklist-app",
"perm:android:set-password-policy", "and:ops:password-policy",
"perm:android:encrypt-storage", "and:ops:encrypt-storage",
"perm:android:clear-password", "and:ops:clear-password",
"perm:android:enterprise-wipe", "and:ops:enterprise-wipe",
"perm:android:info", "and:ops:device-info",
"perm:android:view-configuration", "and:conf:view",
"perm:android:upgrade-firmware", "and:ops:upgrade-firmware",
"perm:android:set-webclip", "and:ops:set-webclip",
"perm:android:send-notification", "and:ops:send-notif",
"perm:android:disenroll", "and:devices:disenroll",
"perm:android:update-application", "and:ops:update-app",
"perm:android:unlock-devices", "and:ops:unlock-devices",
"perm:android:control-camera", "and:ops:control-camera",
"perm:android:reboot", "and:ops:reboot",
"perm:android:logcat" "and:ops:logcat"
], ],
"features": { "features": {
"DEVICE_RING": { "DEVICE_RING": {

Write Preview
Loading…
Cancel
Save