github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-04-12 07:36:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix ordering of boolean check to be more readable

Browse source
This commit is contained in:
Alasdair Smith 2018-10-08 11:25:24 +01:00
parent f26f30e677
commit e129172553
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
services/web/app/coffee/Features/Authentication/AuthenticationManager.coffee
View file

@ -39,11 +39,11 @@ module.exports = AuthenticationManager =
if !password?
return { message: 'password not set' }
if (Settings.passwordStrengthOptions?.length?.max? and
Settings.passwordStrengthOptions?.length?.max < password.length)
return { message: 'password is too short' }
if (Settings.passwordStrengthOptions?.length?.min? and
Settings.passwordStrengthOptions?.length?.min > password.length)
password.length > Settings.passwordStrengthOptions?.length?.max)
return { message: "password is too long" }
if (Settings.passwordStrengthOptions?.length?.min? and
password.length < Settings.passwordStrengthOptions?.length?.min)
return { message: 'password is too short' }
return null
setUserPassword: (user_id, password, callback = (error) ->) ->

2
services/web/test/unit/coffee/Authentication/AuthenticationManagerTests.coffee
View file

@ -135,6 +135,8 @@ describe "AuthenticationManager", ->
it "should return validation error object if too long", ->
result = @AuthenticationManager.validatePassword 'dsdsadsadsadsadsadkjsadjsadjsadljs'
expect(result).to.not.equal null
expect(result.message).to.equal 'password is too long'
describe "setUserPassword", ->
beforeEach ->