From c2eb3c1caabef7c2bab8e5baa77f568faaa91dec Mon Sep 17 00:00:00 2001
From: Ersun Warncke <ersun.warncke@overleaf.com>
Date: Wed, 18 Dec 2019 14:41:38 -0400
Subject: [PATCH] fix unit tests

GitOrigin-RevId: 34b2aad1b2f4a59909265b60e415d31fd178e9ee
---
 .../app/src/Features/SamlLog/SamlLogHandler.js   | 16 ++++++++++++----
 .../test/unit/src/SamlLog/SamlLogHandlerTests.js |  8 ++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/services/web/app/src/Features/SamlLog/SamlLogHandler.js b/services/web/app/src/Features/SamlLog/SamlLogHandler.js
index 91e70c6674..4af4a99336 100644
--- a/services/web/app/src/Features/SamlLog/SamlLogHandler.js
+++ b/services/web/app/src/Features/SamlLog/SamlLogHandler.js
@@ -4,16 +4,24 @@ const logger = require('logger-sharelatex')
 function log(providerId, sessionId, data) {
   try {
     const samlLog = new SamlLog()
-    samlLog.providerId = (providerId || '').toString()
-    samlLog.sessionId = (sessionId || '').toString().substr(0, 8)
-    samlLog.jsonData = JSON.stringify(data)
+    samlLog.providerId = providerId = (providerId || '').toString()
+    samlLog.sessionId = sessionId = (sessionId || '').toString().substr(0, 8)
+    try {
+      samlLog.jsonData = JSON.stringify(data)
+    } catch (err) {
+      // log but continue on data errors
+      logger.error(
+        { err, sessionId, providerId },
+        'SamlLog JSON.stringify Error'
+      )
+    }
     samlLog.save(err => {
       if (err) {
         logger.error({ err, sessionId, providerId }, 'SamlLog Error')
       }
     })
   } catch (err) {
-    logger.error({ err, sessionId, providerId }, 'SamlLog JSON.stringify Error')
+    logger.error({ err, sessionId, providerId }, 'SamlLog Error')
   }
 }
 
diff --git a/services/web/test/unit/src/SamlLog/SamlLogHandlerTests.js b/services/web/test/unit/src/SamlLog/SamlLogHandlerTests.js
index 0d0bcd0f7d..f89b3cf42b 100644
--- a/services/web/test/unit/src/SamlLog/SamlLogHandlerTests.js
+++ b/services/web/test/unit/src/SamlLog/SamlLogHandlerTests.js
@@ -45,7 +45,7 @@ describe('SamlLogHandler', function() {
 
     it('should log data', function() {
       samlLog.providerId.should.equal(providerId)
-      samlLog.sessionId.should.equal(sessionId)
+      samlLog.sessionId.should.equal(sessionId.substr(0, 8))
       samlLog.jsonData.should.equal('{"foo":true}')
       expect(samlLog.data).to.be.undefined
       samlLog.save.should.have.been.calledOnce
@@ -62,12 +62,12 @@ describe('SamlLogHandler', function() {
 
     it('should log without data and log error', function() {
       samlLog.providerId.should.equal(providerId)
-      samlLog.sessionId.should.equal(sessionId)
+      samlLog.sessionId.should.equal(sessionId.substr(0, 8))
       expect(samlLog.data).to.be.undefined
       expect(samlLog.jsonData).to.be.undefined
       samlLog.save.should.have.been.calledOnce
       LoggerSharelatex.error.should.have.been.calledOnce.and.calledWithMatch(
-        { providerId, sessionId },
+        { providerId, sessionId: sessionId.substr(0, 8) },
         'SamlLog JSON.stringify Error'
       )
     })
@@ -82,7 +82,7 @@ describe('SamlLogHandler', function() {
 
     it('should log error', function() {
       LoggerSharelatex.error.should.have.been.calledOnce.and.calledWithMatch(
-        { err: 'error', providerId, sessionId },
+        { err: 'error', providerId, sessionId: sessionId.substr(0, 8) },
         'SamlLog Error'
       )
     })