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: community/device-mgt-core#202

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

@@ -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) {

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

@@ -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>