Skip to content

Commit

Permalink
Merge pull request #16 from indiana-university/extra_swagger_endpoints
Browse files Browse the repository at this point in the history
LMSA-9606 - Adding logback config for tests
  • Loading branch information
maurercw authored Feb 6, 2025
2 parents 836a7aa + ab651c1 commit 3e93c26
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 2 deletions.
3 changes: 2 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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</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>
Expand Down Expand Up @@ -295,6 +295,7 @@
<excludes>
<exclude>**/env.properties</exclude>
<exclude>**/messages.properties</exclude>
<exclude>**/logback-test.xml</exclude>
</excludes>
</configuration>
</plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
16 changes: 16 additions & 0 deletions src/test/resources/logback-test.xml
Original file line number Diff line number Diff line change
@@ -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>

0 comments on commit 3e93c26

Please sign in to comment.