diff --git a/services/web/app/coffee/Features/Subscription/SubscriptionDomainHandler.coffee b/services/web/app/coffee/Features/Subscription/SubscriptionDomainHandler.coffee index 3877b93cfd..a71d4496e7 100644 --- a/services/web/app/coffee/Features/Subscription/SubscriptionDomainHandler.coffee +++ b/services/web/app/coffee/Features/Subscription/SubscriptionDomainHandler.coffee @@ -1,8 +1,6 @@ -NotificationsBuilder = require("../Notifications/NotificationsBuilder") async = require("async") _ = require("underscore") settings = require("settings-sharelatex") -SubscriptionGroupHandler = require("./SubscriptionGroupHandler") module.exports = SubscriptionDomainHandler = @@ -11,21 +9,9 @@ module.exports = SubscriptionDomainHandler = licence = SubscriptionDomainHandler._findDomainLicence(user.email) return licence - attemptToJoinGroup: (user, callback)-> - licence = SubscriptionDomainHandler._findDomainLicence(user.email) - if licence? and user.emailVerified - SubscriptionGroupHandler.addUserToGroup licence.adminUser_id, user.email, (err)-> - if err? - logger.err err:err, "error adding user to group" - return callback(err) - NotificationsBuilder.groupPlan(user, licence).read() - else - callback "user not verified" - rejectInvitationToGroup: (user, subscription, callback)-> removeUserFromGroup(subscription.admin_id, user._id, callback) - getDomainLicencePage: (user)-> licence = SubscriptionDomainHandler._findDomainLicence(user.email) if licence?.verifyEmail @@ -33,13 +19,6 @@ module.exports = SubscriptionDomainHandler = else return undefined - autoAllocate: (user, callback = ->)-> - licence = SubscriptionDomainHandler._findDomainLicence(user.email) - if licence? - SubscriptionGroupHandler.addUserToGroup licence.adminUser_id, user.email, callback - else - callback() - _findDomainLicence: (email)-> licence = _.find settings.domainLicences, (licence)-> _.find licence.domains, (domain)-> @@ -52,4 +31,3 @@ module.exports = SubscriptionDomainHandler = licence = _.find settings.domainLicences, (licence)-> licence?.subscription_id == subscription_id return licence - diff --git a/services/web/test/UnitTests/coffee/Subscription/SubscriptionDomainHandlerTests.coffee b/services/web/test/UnitTests/coffee/Subscription/SubscriptionDomainHandlerTests.coffee index acf99e2d3d..56509a031a 100644 --- a/services/web/test/UnitTests/coffee/Subscription/SubscriptionDomainHandlerTests.coffee +++ b/services/web/test/UnitTests/coffee/Subscription/SubscriptionDomainHandlerTests.coffee @@ -54,19 +54,3 @@ describe "SubscriptionDomainHandler", -> expect(licence).to.not.exist done(licence) - describe "autoAllocate", -> - beforeEach -> - @email = "bob@somewhere.com" - @SubscriptionDomainHandler._findDomainLicence = sinon.stub() - - it "should call the SubscriptionGroupHandler if there is licence", (done)-> - @SubscriptionDomainHandler._findDomainLicence.returns(@settings.domainLicences[0]) - @SubscriptionDomainHandler.autoAllocate {email:@email}, (err)=> - @SubscriptionGroupHandler.addUserToGroup.calledWith(@adminUser_id, @email).should.equal true - done() - - it "should not call the SubscriptionGroupHandler if there is no licence", (done)-> - @SubscriptionDomainHandler._findDomainLicence.returns() - @SubscriptionDomainHandler.autoAllocate {email:@email}, (err)=> - @SubscriptionGroupHandler.addUserToGroup.called.should.equal false - done() \ No newline at end of file