github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-02-23 13:51:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

make site licence regex more specific

Browse source
This commit is contained in:
Henry Oswald 2016-02-03 16:07:44 +00:00
parent 7ef96be7dc
commit 7994528c92
2 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
services/web/app/coffee/Features/Subscription/SubscriptionDomainHandler.coffee
View file

@ -45,7 +45,8 @@ module.exports = SubscriptionDomainHandler =
_findDomainLicence: (email)->
licence = _.find settings.domainLicences, (licence)->
_.find licence.domains, (domain)->
_s.endsWith email, domain
regex = "[@\.]#{domain}"
return email.match(regex)
return licence

24
services/web/test/UnitTests/coffee/Subscription/SubscriptionDomainHandlerTests.coffee
View file

@ -11,10 +11,14 @@ describe "SubscriptionDomainHandler", ->
beforeEach ->
@adminUser_id = 12345
@otherAdminUser_id = 32131231234
@ThirdOtherAdminUser_id = 33424324
@settings =
domainLicences: [
{domains:["highcools.site"], adminUser_id:"not this one"}
{domains:["uni.edu", "student.uni.edu"], adminUser_id:@adminUser_id}
{domains:["student.myuni.com", "teacher.myuni.com"], adminUser_id:@otherAdminUser_id}
{domains:["highcools.site"], adminUser_id:@ThirdOtherAdminUser_id}
]
@SubscriptionGroupHandler =
addUserToGroup: sinon.stub().callsArg(2)
@ -30,11 +34,21 @@ describe "SubscriptionDomainHandler", ->
licence.adminUser_id.should.equal @adminUser_id
done()
it "should find one of the other emails in the domain list", (done)->
licence = @SubscriptionDomainHandler._findDomainLicence "sally@student.uni.edu"
licence.adminUser_id.should.equal @adminUser_id
it "should find the if email is subdomain", (done)->
licence = @SubscriptionDomainHandler._findDomainLicence "bob@somewherelse.highcools.site"
licence.adminUser_id.should.equal @ThirdOtherAdminUser_id
done()
it "should find one of the other emails in the domain list", (done)->
licence = @SubscriptionDomainHandler._findDomainLicence "sally@teacher.myuni.com"
licence.adminUser_id.should.equal @otherAdminUser_id
done()
it "should return undefined if no licence matches even if end of email is same", (done)->
licence = @SubscriptionDomainHandler._findDomainLicence "bob@someotherhighcools.site"
expect(licence).to.not.exist
done(licence)
it "should return undefined if no licence matches", (done)->
licence = @SubscriptionDomainHandler._findDomainLicence "bob@other.edu"
expect(licence).to.not.exist
@ -46,7 +60,7 @@ describe "SubscriptionDomainHandler", ->
@SubscriptionDomainHandler._findDomainLicence = sinon.stub()
it "should call the SubscriptionGroupHandler if there is licence", (done)->
@SubscriptionDomainHandler._findDomainLicence.returns(@settings.domainLicences[1])
@SubscriptionDomainHandler._findDomainLicence.returns(@settings.domainLicences[0])
@SubscriptionDomainHandler.autoAllocate {email:@email}, (err)=>
@SubscriptionGroupHandler.addUserToGroup.calledWith(@adminUser_id, @email).should.equal true
done()