From c92dfef10bee7d1fa5f62f8af34a96460febe295 Mon Sep 17 00:00:00 2001
From: chmaurer <chmaurer@iu.edu>
Date: Wed, 5 Feb 2025 16:08:39 -0500
Subject: [PATCH 1/2] LMSA-9606 - Adding logback config for tests Minor method
 name updates that were in the latest embedded services

---
 pom.xml                                          |  3 ++-
 .../config/CustomRoleMapper.java                 |  2 +-
 src/test/resources/logback-test.xml              | 16 ++++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 src/test/resources/logback-test.xml

diff --git a/pom.xml b/pom.xml
index 07a21d4..d4fcd52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
         <jdk.target>21</jdk.target>
         <jquery.version>3.7.1</jquery.version>
         <lms-canvas-rivet.version>6.2.8.1_1</lms-canvas-rivet.version>
-        <lms-embedded-services.version>6.1.1</lms-embedded-services.version>
+        <lms-embedded-services.version>6.1.3-SNAPSHOT</lms-embedded-services.version>
         <lms-team-spring-boot-it12>6.5.0</lms-team-spring-boot-it12>
         <spring-cloud.version>2023.0.5</spring-cloud.version>
         <webjars-locator.version>0.52</webjars-locator.version>
@@ -295,6 +295,7 @@
                     <excludes>
                         <exclude>**/env.properties</exclude>
                         <exclude>**/messages.properties</exclude>
+                        <exclude>**/logback-test.xml</exclude>
                     </excludes>
                 </configuration>
             </plugin>
diff --git a/src/main/java/edu/iu/uits/lms/courseattributeeditor/config/CustomRoleMapper.java b/src/main/java/edu/iu/uits/lms/courseattributeeditor/config/CustomRoleMapper.java
index 3f91524..9b99869 100644
--- a/src/main/java/edu/iu/uits/lms/courseattributeeditor/config/CustomRoleMapper.java
+++ b/src/main/java/edu/iu/uits/lms/courseattributeeditor/config/CustomRoleMapper.java
@@ -75,7 +75,7 @@ public Collection<? extends GrantedAuthority> mapAuthorities(Collection<? extend
 
             ArrayList<String> roles = new ArrayList<>();
 
-            AuthorizedUser user = authorizedUserService.findByUsernameAndToolPermission(userId, AUTH_USER_TOOL_PERMISSION);
+            AuthorizedUser user = authorizedUserService.findByActiveUsernameAndToolPermission(userId, AUTH_USER_TOOL_PERMISSION);
 
             if (user != null) {
                 rolesString = LTIConstants.CANVAS_INSTRUCTOR_ROLE;
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..58590ea
--- /dev/null
+++ b/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="CONSOLE" />
+    </root>
+
+    <logger name="edu.iu.uits.lms" level="DEBUG" additivity="false">
+        <appender-ref ref="CONSOLE" />
+    </logger>
+</configuration>
\ No newline at end of file

From ab651c166664813d47c6a3df508087ba16f8d799 Mon Sep 17 00:00:00 2001
From: chmaurer <chmaurer@iu.edu>
Date: Thu, 6 Feb 2025 12:33:28 -0500
Subject: [PATCH 2/2] LMSA-9606 - released embedded services version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d4fcd52..03cd6ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
         <jdk.target>21</jdk.target>
         <jquery.version>3.7.1</jquery.version>
         <lms-canvas-rivet.version>6.2.8.1_1</lms-canvas-rivet.version>
-        <lms-embedded-services.version>6.1.3-SNAPSHOT</lms-embedded-services.version>
+        <lms-embedded-services.version>6.1.3</lms-embedded-services.version>
         <lms-team-spring-boot-it12>6.5.0</lms-team-spring-boot-it12>
         <spring-cloud.version>2023.0.5</spring-cloud.version>
         <webjars-locator.version>0.52</webjars-locator.version>