Migrate sentryuser setting to current user middleware

services/backend/src/middleware/currentUserMiddleware.js

@@ -1,3 +1,4 @@
+const Sentry = require('@sentry/node')
 const { ApplicationError } = require('../util/customErrors')
 const { getUser, getUserDataFor, getMockedUser } = require('../services/userService')
 const { requiredGroup } = require('../conf-backend')
@@ -42,6 +43,8 @@ const currentUserMiddleware = async (req, _, next) => {
   }
   req.logoutUrl = logoutUrl
 
+  Sentry.setUser({ username: req.decodedToken.mockedBy || req.decodedToken.userId })
+
   // TODO: remove this garbo
   const userData = await getUserDataFor(req.decodedToken.userId)
   Object.assign(req, userData)

services/backend/src/middleware/sentryUserId.js

@@ -1,13 +0,0 @@
-const Sentry = require('@sentry/node')
-
-const sentryUserIdMiddleware = (req, res, next) => {
-  Sentry.getCurrentHub().configureScope(scope => {
-    scope.setUser({
-      username: req.decodedToken && req.decodedToken.userId,
-    })
-  })
-
-  next()
-}
-
-module.exports = sentryUserIdMiddleware

services/backend/src/routes.js

@@ -6,7 +6,6 @@ const shibbolethCharsetMiddleware = require('./middleware/shibbolethCharsetMiddl
 const matomoInit = require('./routes/matomo-init')
 const currentUserMiddleware = require('./middleware/currentUserMiddleware')
 const accessLogger = require('./middleware/accessLogger')
-const sentryUserId = require('./middleware/sentryUserId')
 const auth = require('./middleware/auth')
 
 const courses = require('./routes/courses')
@@ -47,7 +46,6 @@ module.exports = (app, url) => {
   app.use(url, matomoInit)
   app.use(currentUserMiddleware)
   app.use(accessLogger)
-  app.use(sentryUserId)
   app.use(url, login)
   app.use(url, elementdetails)
   app.use(url, courses)

services/backend/src/routes/login.js

@@ -1,7 +1,7 @@
 const router = require('express').Router()
+const { ApplicationError } = require('../util/customErrors')
 
 router.get('/login', async (req, res) => {
-  logger.info(JSON.stringify(req.headers, null, 2))
   const { decodedToken, logoutUrl } = req
 
   if (!decodedToken) {