From 453034c0e2980ff6b37e8bc9356e8cd02e876ef8 Mon Sep 17 00:00:00 2001
From: navodzoysa <navod@entgra.io>
Date: Fri, 4 Aug 2023 00:32:56 +0530
Subject: [PATCH 1/2] Revert Windows permission temp fix

---
 .../framework/authorizer/PermissionAuthorizer.java           | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/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 b/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
index 3cddf49e292..0d509200e4f 100644
--- a/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
+++ b/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) {

From 607b11a224e7bba8f84bc3b8778c34e68fc7bccf Mon Sep 17 00:00:00 2001
From: navodzoysa <navod@entgra.io>
Date: Tue, 8 Aug 2023 23:41:06 +0530
Subject: [PATCH 2/2] Add missing Windows enroll scope

---
 .../src/main/resources/conf/mdm-ui-config.xml                  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml
index b16935562de..4e7b97fc6e2 100644
--- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml
+++ b/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>
@@ -227,7 +228,7 @@
         <Scope>perm:android:clear-application</Scope>
         <Scope>perm:android:suspend-package</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:ring</Scope>
         <Scope>perm:ios:clear-passcode</Scope>