Merge pull request #1044 from AtlasOfLivingAustralia/feature/pwa2

fix for issue with not finding monitor user
AtlasOfLivingAustralia · Dec 3, 2024 · ad8d821 · ad8d821
2 parents 23ca722 + b50ebab
commit ad8d821
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/grails-app/services/au/org/ala/ecodata/UserService.groovy b/grails-app/services/au/org/ala/ecodata/UserService.groovy
@@ -225,7 +225,7 @@ class UserService {
 
         // userId is set from either the request param userId or failing that it tries to get it from
         // the UserPrincipal (assumes ecodata is being accessed directly via admin page)
-        userId = getUserFromJWT() ?: authService.getUserId() ?: request.getHeader(AuditInterceptor.httpRequestHeaderForUserId)
+        userId = getUserFromJWT()?.userId ?: authService.getUserId() ?: request.getHeader(AuditInterceptor.httpRequestHeaderForUserId)
 
         if (userId) {
             userDetails = setCurrentUser(userId)