From 941241af54685199e03acb1cc840a33b5166867f Mon Sep 17 00:00:00 2001 From: Alasdair Smith Date: Fri, 9 Oct 2020 11:48:37 +0100 Subject: [PATCH] Merge pull request #3273 from overleaf/as-fix-institution-script-error-handling Handle error in check institution script correctly GitOrigin-RevId: 5e6bee330020a9c675779e451853dc3cbf4d6324 --- .../app/src/Features/Institutions/InstitutionsManager.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/services/web/app/src/Features/Institutions/InstitutionsManager.js b/services/web/app/src/Features/Institutions/InstitutionsManager.js index 755efa282d..ed0376912d 100644 --- a/services/web/app/src/Features/Institutions/InstitutionsManager.js +++ b/services/web/app/src/Features/Institutions/InstitutionsManager.js @@ -9,6 +9,7 @@ const NotificationsBuilder = require('../Notifications/NotificationsBuilder') const SubscriptionLocator = require('../Subscription/SubscriptionLocator') const { Institution } = require('../../models/Institution') const { Subscription } = require('../../models/Subscription') +const OError = require('@overleaf/o-error') const ASYNC_LIMIT = parseInt(process.env.ASYNC_LIMIT, 10) || 5 module.exports = { @@ -39,7 +40,10 @@ module.exports = { UserGetter.getUsersByAnyConfirmedEmail( affiliations.map(affiliation => affiliation.email), { features: 1, samlIdentifiers: 1 }, - (error, users) => callback(error, checkFeatures(institutionId, users)) + (error, users) => { + if (error) return callback(OError.tag(error)) + callback(error, checkFeatures(institutionId, users)) + } ) }) },