From 7fb0249b2bafc62957378a849d639e161ec3be92 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Tue, 22 Mar 2016 14:19:46 +0000 Subject: [PATCH] null check subscription for custom accounts page --- .../Features/Subscription/SubscriptionController.coffee | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/services/web/app/coffee/Features/Subscription/SubscriptionController.coffee b/services/web/app/coffee/Features/Subscription/SubscriptionController.coffee index fb378e45f6..f0026bd7f5 100644 --- a/services/web/app/coffee/Features/Subscription/SubscriptionController.coffee +++ b/services/web/app/coffee/Features/Subscription/SubscriptionController.coffee @@ -85,7 +85,7 @@ module.exports = SubscriptionController = LimitationsManager.userHasSubscriptionOrIsGroupMember user, (err, hasSubOrIsGroupMember, subscription)-> groupLicenceInviteUrl = SubscriptionDomainHandler.getDomainLicencePage(user) if subscription?.customAccount - logger.log user: user, "redirecting to plans" + logger.log user: user, "redirecting to custom account page" res.redirect "/user/subscription/custom_account" else if groupLicenceInviteUrl? and !hasSubOrIsGroupMember logger.log user:user, "redirecting to group subscription invite page" @@ -111,6 +111,10 @@ module.exports = SubscriptionController = userCustomSubscriptionPage: (req, res, next)-> AuthenticationController.getLoggedInUser req, (error, user) -> LimitationsManager.userHasSubscriptionOrIsGroupMember user, (err, hasSubOrIsGroupMember, subscription)-> + if !subscription? + err = new Error("subscription null for custom account, user:#{user?._id}") + logger.warn err:err, "subscription is null for custom accounts page" + return next(err) res.render "subscriptions/custom_account", title: "your_subscription" subscription: subscription