From 02a23822647433906731501b41bd9fa310c9adba Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Thu, 20 Aug 2020 12:14:02 +0100 Subject: [PATCH] [WebApiManager] use a new CorruptedJoinProjectResponseError --- services/real-time/app/js/Errors.js | 7 +++++++ services/real-time/app/js/WebApiManager.js | 14 ++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/services/real-time/app/js/Errors.js b/services/real-time/app/js/Errors.js index 5b41334fb3..ebcf1d1d81 100644 --- a/services/real-time/app/js/Errors.js +++ b/services/real-time/app/js/Errors.js @@ -6,6 +6,12 @@ class CodedError extends OError { } } +class CorruptedJoinProjectResponseError extends OError { + constructor() { + super('no data returned from joinProject request') + } +} + class DataTooLargeToParseError extends OError { constructor(data) { super('data too large to parse', { @@ -47,6 +53,7 @@ class WebApiRequestFailedError extends OError { module.exports = { CodedError, + CorruptedJoinProjectResponseError, DataTooLargeToParseError, MissingSessionError, NotAuthorizedError, diff --git a/services/real-time/app/js/WebApiManager.js b/services/real-time/app/js/WebApiManager.js index dffcca51c8..a39d9dd832 100644 --- a/services/real-time/app/js/WebApiManager.js +++ b/services/real-time/app/js/WebApiManager.js @@ -4,7 +4,11 @@ const request = require('request') const settings = require('settings-sharelatex') const logger = require('logger-sharelatex') -const { CodedError, WebApiRequestFailedError } = require('./Errors') +const { + CodedError, + CorruptedJoinProjectResponseError, + WebApiRequestFailedError +} = require('./Errors') module.exports = { joinProject(project_id, user, callback) { @@ -32,15 +36,9 @@ module.exports = { if (error) { return callback(error) } - let err if (response.statusCode >= 200 && response.statusCode < 300) { if (!(data && data.project)) { - err = new Error('no data returned from joinProject request') - logger.error( - { err, project_id, user_id }, - 'error accessing web api' - ) - return callback(err) + return callback(new CorruptedJoinProjectResponseError()) } callback( null,