From 4c56fd9f5d442767483e0a7fc3c3577f43d72d5b Mon Sep 17 00:00:00 2001
From: Ersun Warncke <ersun.warncke@overleaf.com>
Date: Thu, 7 Nov 2019 09:29:24 -0400
Subject: [PATCH] pr fixes

GitOrigin-RevId: ca0529fe1df2ce7c5c1bc3d1d99044a54ce4ec88
---
 services/web/app/src/Features/Errors/ErrorController.js | 4 +---
 services/web/app/src/Features/SamlLog/SamlLogHandler.js | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/services/web/app/src/Features/Errors/ErrorController.js b/services/web/app/src/Features/Errors/ErrorController.js
index a18ff5a0f3..83bf92d85a 100644
--- a/services/web/app/src/Features/Errors/ErrorController.js
+++ b/services/web/app/src/Features/Errors/ErrorController.js
@@ -3,7 +3,6 @@ const Errors = require('./Errors')
 const logger = require('logger-sharelatex')
 const AuthenticationController = require('../Authentication/AuthenticationController')
 const SamlLogHandler = require('../SamlLog/SamlLogHandler')
-const _ = require('lodash')
 
 module.exports = ErrorController = {
   notFound(req, res) {
@@ -25,8 +24,7 @@ module.exports = ErrorController = {
     const user = AuthenticationController.getSessionUser(req)
     // log errors related to SAML flow
     if (req.session.saml) {
-      const providerId = _.get(req.session.saml, 'universityId', '').toString()
-      SamlLogHandler.log(providerId, req.sessionID, {
+      SamlLogHandler.log(req.session.saml.universityId, req.sessionID, {
         error: {
           message: error && error.message,
           stack: error && error.stack
diff --git a/services/web/app/src/Features/SamlLog/SamlLogHandler.js b/services/web/app/src/Features/SamlLog/SamlLogHandler.js
index 13a31ddf8e..9ccb7b3da9 100644
--- a/services/web/app/src/Features/SamlLog/SamlLogHandler.js
+++ b/services/web/app/src/Features/SamlLog/SamlLogHandler.js
@@ -3,12 +3,12 @@ const logger = require('logger-sharelatex')
 
 function log(providerId, sessionId, data) {
   const samlLog = new SamlLog()
-  samlLog.providerId = providerId
+  samlLog.providerId = (providerId || '').toString()
   samlLog.sessionId = sessionId
   samlLog.data = data
   samlLog.save(err => {
     if (err) {
-      logger.error({ err }, 'SamlLog Error')
+      logger.error({ err, sessionId, providerId }, 'SamlLog Error')
     }
   })
 }