From b6c4cb66f5dbe9793c381dd92cb5b7b86f525253 Mon Sep 17 00:00:00 2001
From: tcdlpds <tcdlpds@gmail.com>
Date: Sat, 3 Feb 2024 00:23:41 +0530
Subject: [PATCH 1/2] Improve logger dependencies

---
 .../io.entgra.device.mgt.core.notification.logger/pom.xml   | 4 +---
 .../pom.xml                                                 | 2 +-
 pom.xml                                                     | 6 ++++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/components/logger/io.entgra.device.mgt.core.notification.logger/pom.xml b/components/logger/io.entgra.device.mgt.core.notification.logger/pom.xml
index 97e20fdbbd..03bf590308 100644
--- a/components/logger/io.entgra.device.mgt.core.notification.logger/pom.xml
+++ b/components/logger/io.entgra.device.mgt.core.notification.logger/pom.xml
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
-<!--            <scope>provided</scope>-->
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
@@ -48,7 +48,6 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-ext</artifactId>
-            <version>1.7.29</version>
         </dependency>
     </dependencies>
 
@@ -84,7 +83,6 @@
                             io.entgra.device.mgt.core.device.mgt.extensions.logger;version="[5.0,6)",
                             io.entgra.device.mgt.core.device.mgt.extensions.logger.spi;version="[5.0,6)",
                             org.slf4j,
-                            org.slf4j.ext,
                             org.apache.commons.logging;version="[1.2,2)"
                         </Import-Package>
                         <Export-Package>
diff --git a/features/logger/io.entgra.device.mgt.core.notification.logger.feature/pom.xml b/features/logger/io.entgra.device.mgt.core.notification.logger.feature/pom.xml
index da195dae26..70bea2ba1d 100644
--- a/features/logger/io.entgra.device.mgt.core.notification.logger.feature/pom.xml
+++ b/features/logger/io.entgra.device.mgt.core.notification.logger.feature/pom.xml
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
-<!--            <scope>provided</scope>-->
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
diff --git a/pom.xml b/pom.xml
index 044319b315..4b34fddaf4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1823,6 +1823,11 @@
                 <artifactId>org.apache.felix.scr.ds-annotations</artifactId>
                 <version>${apache.felix.scr.ds.annotations.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-ext</artifactId>
+                <version>${slf4j.ext.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -2173,6 +2178,7 @@
         <power.mock.version>2.0.2</power.mock.version>
         <commons.dbcp.version>1.4.0.wso2v1</commons.dbcp.version>
         <slf4j.nop.version>1.7.25</slf4j.nop.version>
+        <slf4j.ext.version>1.7.29</slf4j.ext.version>
 
         <!-- app management related versions -->
         <googlecode.plist.version>1.21</googlecode.plist.version>

From fdf5c622040902de1ea995fcabc9f7c11c8fddd7 Mon Sep 17 00:00:00 2001
From: tcdlpds <tcdlpds@gmail.com>
Date: Tue, 20 Feb 2024 15:38:10 +0530
Subject: [PATCH 2/2] Fix scope issue with code grant type

---
 .../mgt/core/ui/request/interceptor/util/HandlerUtil.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/util/HandlerUtil.java b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/util/HandlerUtil.java
index af1141ceed..3fe3bb381a 100644
--- a/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/util/HandlerUtil.java
+++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/util/HandlerUtil.java
@@ -533,7 +533,7 @@ public class HandlerUtil {
         if (scopes != null && scopes.isArray() && !scopes.isEmpty()) {
             StringBuilder builder = new StringBuilder();
             for (JsonNode objNode : scopes) {
-                builder.append(objNode).append(" ");
+                builder.append(objNode.asText()).append(" ");
             }
             return builder.toString();
         } else {