Merge pull request #166 from BuckinghamAJ/dev

121: Adding ability to track Login.gov logins on admin page
GSA · May 28, 2024 · 878a74c · 878a74c
2 parents bb67264 + 894d7c1
commit 878a74c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/certs/prod/prod_cert_location.txt b/certs/prod/prod_cert_location.txt
diff --git a/server/routes/admin.report.routes.js b/server/routes/admin.report.routes.js
@@ -213,7 +213,7 @@ module.exports = {
   userLogin : async function (req, res) {
     logger.log("debug", "Running user login report")
     let userLogins = {}
-    let sql = `select timestamp, message, meta#>>'{cas_userinfo, email-address}' as email from winston_logs where message like '%authenticated with MAX CAS ID%'`
+    let sql = `select timestamp, message, COALESCE(meta#>>'{cas_userinfo, user, email}', meta#>>'{cas_userinfo, email-address}') as email from winston_logs where message like '%authenticated with%'`
     let rows = await db.sequelize.query(sql, { type: db.sequelize.QueryTypes.SELECT })
 
     for (let r of rows) {

diff --git a/server/routes/auth.routes.js b/server/routes/auth.routes.js
@@ -545,7 +545,7 @@ module.exports = {
               srt_userinfo.user = stored_user.dataValues
               srt_userinfo.user.sessionEnd = Math.floor ((new Date().getTime() + ms(getConfig('sessionLength')) )/ 1000)
 
-
+              logger.log('info', (srt_userinfo.email || userInfo.email) + ' authenticated with LOGIN.GOV', {cas_userinfo: srt_userinfo, tag: 'Login.gov Auth Token'})
 
               let uri_components = {
                 token: jwt.sign({access_token: accessToken, user: srt_userinfo.user, sessionEnd: srt_userinfo.sessionEnd, token_life_in_seconds: getConfig('renewTokenLife')}, common.jwtSecret, { expiresIn: getConfig('renewTokenLife') }),