From 0a64c1c8ac0eac58ae6e8e1148a562ecc2720452 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Tue, 27 Jan 2015 18:22:51 +0000 Subject: [PATCH] on register try and auto allocate a group licence if one exists --- .../web/app/coffee/Features/User/UserController.coffee | 2 ++ .../UnitTests/coffee/User/UserControllerTests.coffee | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/services/web/app/coffee/Features/User/UserController.coffee b/services/web/app/coffee/Features/User/UserController.coffee index 1515fc86f0..18f0e6de18 100644 --- a/services/web/app/coffee/Features/User/UserController.coffee +++ b/services/web/app/coffee/Features/User/UserController.coffee @@ -10,6 +10,7 @@ AuthenticationController = require("../Authentication/AuthenticationController") AuthenticationManager = require("../Authentication/AuthenticationManager") ReferalAllocator = require("../Referal/ReferalAllocator") UserUpdater = require("./UserUpdater") +SubscriptionDomainAllocator = require("../Subscription/SubscriptionDomainAllocator") module.exports = @@ -91,6 +92,7 @@ module.exports = req.session.user = user req.session.justRegistered = true ReferalAllocator.allocate req.session.referal_id, user._id, req.session.referal_source, req.session.referal_medium + SubscriptionDomainAllocator.autoAllocate(user) res.send redir:redir id:user._id.toString() diff --git a/services/web/test/UnitTests/coffee/User/UserControllerTests.coffee b/services/web/test/UnitTests/coffee/User/UserControllerTests.coffee index ec3fde5b3e..c16ce4a7ae 100644 --- a/services/web/test/UnitTests/coffee/User/UserControllerTests.coffee +++ b/services/web/test/UnitTests/coffee/User/UserControllerTests.coffee @@ -35,6 +35,8 @@ describe "UserController", -> setUserPassword: sinon.stub() @ReferalAllocator = allocate:sinon.stub() + @SubscriptionDomainAllocator = + autoAllocate:sinon.stub() @UserUpdater = changeEmailAddress:sinon.stub() @UserController = SandboxedModule.require modulePath, requires: @@ -47,6 +49,7 @@ describe "UserController", -> "../Authentication/AuthenticationController": @AuthenticationController "../Authentication/AuthenticationManager": @AuthenticationManager "../Referal/ReferalAllocator":@ReferalAllocator + "../Subscription/SubscriptionDomainAllocator":@SubscriptionDomainAllocator "logger-sharelatex": {log:->} @@ -212,6 +215,12 @@ describe "UserController", -> done() @UserController.register @req, @res + it "should auto allocate the subscription for that domain", (done)-> + @UserRegistrationHandler.registerNewUser.callsArgWith(1, null, @user) + @res.send = (opts)=> + @SubscriptionDomainAllocator.autoAllocate.calledWith(@user).should.equal true + done() + @UserController.register @req, @res describe "changePassword", ->