Merge pull request 'Revert temp fix done for Windows enrollment and add missing enroll scope' (#202) from navodzoysa/device-mgt-core:issue-10235/windows-auth into master

Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/202
This commit is contained in:
Inosh Perara 2023-08-09 05:36:40 +00:00
commit f87f742262
2 changed files with 2 additions and 6 deletions

View File

@ -79,11 +79,6 @@ public class PermissionAuthorizer {
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) {

View File

@ -215,6 +215,7 @@
<Scope>perm:android:google-account</Scope>
<Scope>perm:android:info</Scope>
<Scope>perm:windows:lock-devices</Scope>
<Scope>perm:windows:enroll</Scope>
<Scope>perm:windows:disenroll</Scope>
<Scope>perm:windows:wipe</Scope>
<Scope>perm:windows:ring</Scope>