community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into app-install-9211

Browse Source
This commit is contained in:
osh 2023-08-09 15:03:36 +05:30
commit 1d712e1bc2
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/src/main/java/io/entgra/device/mgt/core/webapp/authenticator/framework/authorizer/PermissionAuthorizer.java
View File

@ -79,11 +79,6 @@ public class PermissionAuthorizer {
matchingResources.add(new MatchingResource(permission.getUrlPattern().replace(context, ""), permission.getPath())); matchingResources.add(new MatchingResource(permission.getUrlPattern().replace(context, ""), permission.getPath()));
} }
} }
//TODO :: Temporary fix for windows bst api url mismatch error
else if ("/api/device-mgt/windows/v1.0/bst/authentication".equals(permission.getUrl())) {
requiredPermission = "/permission/admin/device-mgt/devices/enroll/windows";
break;
}
} }
if (requiredPermission == null) { if (requiredPermission == null) {

3
features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml
View File

@ -215,6 +215,7 @@
<Scope>perm:android:google-account</Scope> <Scope>perm:android:google-account</Scope>
<Scope>perm:android:info</Scope> <Scope>perm:android:info</Scope>
<Scope>perm:windows:lock-devices</Scope> <Scope>perm:windows:lock-devices</Scope>
<Scope>perm:windows:enroll</Scope>
<Scope>perm:windows:disenroll</Scope> <Scope>perm:windows:disenroll</Scope>
<Scope>perm:windows:wipe</Scope> <Scope>perm:windows:wipe</Scope>
<Scope>perm:windows:ring</Scope> <Scope>perm:windows:ring</Scope>
@ -227,7 +228,7 @@
<Scope>perm:android:clear-application</Scope> <Scope>perm:android:clear-application</Scope>
<Scope>perm:android:suspend-package</Scope> <Scope>perm:android:suspend-package</Scope>
<Scope>perm:android:alternate-install</Scope> <Scope>perm:android:alternate-install</Scope>
<Scope>perm:ios:lock</Scope> <Scope>perm:ios:lock</Scope>
<Scope>perm:ios:location</Scope> <Scope>perm:ios:location</Scope>
<Scope>perm:ios:ring</Scope> <Scope>perm:ios:ring</Scope>
<Scope>perm:ios:clear-passcode</Scope> <Scope>perm:ios:clear-passcode</Scope>