From 7fcdf6829626b557bee6be1dd35815728fb8efe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Fern=C3=A1ndez=20Capel?= Date: Fri, 1 Jun 2018 16:05:44 +0100 Subject: [PATCH] Remove dead code --- .../coffee/Features/Email/EmailBuilder.coffee | 25 ------------------- .../SubscriptionGroupHandler.coffee | 10 -------- .../SubscriptionGroupControllerTests.coffee | 1 - .../SubscriptionGroupHandlerTests.coffee | 18 ------------- 4 files changed, 54 deletions(-) diff --git a/services/web/app/coffee/Features/Email/EmailBuilder.coffee b/services/web/app/coffee/Features/Email/EmailBuilder.coffee index 9b975140f9..28a748431d 100644 --- a/services/web/app/coffee/Features/Email/EmailBuilder.coffee +++ b/services/web/app/coffee/Features/Email/EmailBuilder.coffee @@ -144,31 +144,6 @@ Thank You gmailGoToAction: null }) -templates.completeJoinGroupAccount = - subject: _.template "Verify Email to join <%= group_name %> group" - layout: BaseWithHeaderEmailLayout - type:"notification" - plainTextTemplate: _.template """ -Hi, please verify your email to join the <%= group_name %> and get your free premium account - -Click this link to verify now: <%= completeJoinUrl %> - -Thank You - -#{settings.appName} - <%= siteUrl %> -""" - compiledTemplate: (opts) -> - SingleCTAEmailBody({ - title: "Verify Email to join #{ opts.group_name } group" - greeting: "Hi," - message: "please verify your email to join the #{ opts.group_name } group and get your free premium account." - secondaryMessage: null - ctaText: "Verify now" - ctaURL: opts.completeJoinUrl - gmailGoToAction: null - }) - - templates.testEmail = subject: _.template "A Test Email from ShareLaTeX" layout: BaseWithHeaderEmailLayout diff --git a/services/web/app/coffee/Features/Subscription/SubscriptionGroupHandler.coffee b/services/web/app/coffee/Features/Subscription/SubscriptionGroupHandler.coffee index b34dacc3e6..b8d1b32aa0 100644 --- a/services/web/app/coffee/Features/Subscription/SubscriptionGroupHandler.coffee +++ b/services/web/app/coffee/Features/Subscription/SubscriptionGroupHandler.coffee @@ -71,16 +71,6 @@ module.exports = SubscriptionGroupHandler = logger.log user_id:user_id, subscription_id:subscription_id, partOfGroup:partOfGroup, "checking if user is part of a group" callback(err, partOfGroup) - - sendVerificationEmail: (subscription_id, licenceName, email, callback)-> - ONE_DAY_IN_S = 1000 * 60 * 60 * 24 - OneTimeTokenHandler.getNewToken subscription_id, {expiresIn:ONE_DAY_IN_S}, (err, token)-> - opts = - to : email - group_name: licenceName - completeJoinUrl: "#{settings.siteUrl}/user/subscription/#{subscription_id}/group/complete-join?token=#{token}" - EmailHandler.sendEmail "completeJoinGroupAccount", opts, callback - buildUserViewModel = (user)-> u = email: user.email diff --git a/services/web/test/unit/coffee/Subscription/SubscriptionGroupControllerTests.coffee b/services/web/test/unit/coffee/Subscription/SubscriptionGroupControllerTests.coffee index 086babd3e7..d9ad55080f 100644 --- a/services/web/test/unit/coffee/Subscription/SubscriptionGroupControllerTests.coffee +++ b/services/web/test/unit/coffee/Subscription/SubscriptionGroupControllerTests.coffee @@ -25,7 +25,6 @@ describe "SubscriptionGroupController", -> addUserToGroup: sinon.stub().callsArgWith(2, null, @user) removeUserFromGroup: sinon.stub().callsArgWith(2) isUserPartOfGroup: sinon.stub() - sendVerificationEmail:sinon.stub() getPopulatedListOfMembers: sinon.stub().callsArgWith(1, null, [@user]) @SubscriptionLocator = getUsersSubscription: sinon.stub().callsArgWith(1, null, @subscription) @AuthenticationController = diff --git a/services/web/test/unit/coffee/Subscription/SubscriptionGroupHandlerTests.coffee b/services/web/test/unit/coffee/Subscription/SubscriptionGroupHandlerTests.coffee index 59471c68f8..878751df2e 100644 --- a/services/web/test/unit/coffee/Subscription/SubscriptionGroupHandlerTests.coffee +++ b/services/web/test/unit/coffee/Subscription/SubscriptionGroupHandlerTests.coffee @@ -179,21 +179,3 @@ describe "SubscriptionGroupHandler", -> @Handler.isUserPartOfGroup @user_id, @subscription_id, (err, partOfGroup)-> partOfGroup.should.equal false done() - - - describe "sendVerificationEmail", -> - beforeEach -> - @token = "secret token" - @subscription_id = "123ed13123" - @licenceName = "great licnece" - @email = "bob@smith.com" - @OneTimeTokenHandler.getNewToken.callsArgWith(2, null, @token) - @EmailHandler.sendEmail.callsArgWith(2) - - it "should put a one time token into the email", (done)-> - @Handler.sendVerificationEmail @subscription_id, @licenceName, @email, (err)=> - emailOpts = @EmailHandler.sendEmail.args[0][1] - emailOpts.completeJoinUrl.should.equal "#{@settings.siteUrl}/user/subscription/#{@subscription_id}/group/complete-join?token=#{@token}" - emailOpts.to.should.equal @email - emailOpts.group_name.should.equal @licenceName - done()