github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'sk-sync-details-from-sso'

Browse source
This commit is contained in:
Shane Kilkelly 2016-11-28 10:11:59 +00:00
commit 52462d7020
3 changed files with 65 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/app/coffee/Features/User/UserPagesController.coffee
View file

@ -60,11 +60,13 @@ module.exports =
settingsPage : (req, res, next)->
user_id = AuthenticationController.getLoggedInUserId(req)
logger.log user: user_id, "loading settings page"
shouldAllowEditingDetails = !(Settings?.ldap?.updateUserDetailsOnLogin) and !(Settings?.saml?.updateUserDetailsOnLogin)
UserLocator.findById user_id, (err, user)->
return next(err) if err?
res.render 'user/settings',
title:'account_settings'
user: user,
shouldAllowEditingDetails: shouldAllowEditingDetails
languages: Settings.languages,
accountSettingsTabActive: true

47
services/web/app/views/user/settings.jade
View file

@ -39,25 +39,34 @@ block content
label.control-label #{translate("email")}
div.form-control(readonly="true") #{user.email}
.form-group
label(for='firstName').control-label #{translate("first_name")}
input.form-control(
type='text',
name='first_name',
value=user.first_name
)
.form-group
label(for='lastName').control-label #{translate("last_name")}
input.form-control(
type='text',
name='last_name',
value=user.last_name
)
.actions
button.btn.btn-primary(
type='submit',
ng-disabled="settingsForm.$invalid"
) #{translate("update")}
if shouldAllowEditingDetails
.form-group
label(for='firstName').control-label #{translate("first_name")}
input.form-control(
type='text',
name='first_name',
value=user.first_name
)
.form-group
label(for='lastName').control-label #{translate("last_name")}
input.form-control(
type='text',
name='last_name',
value=user.last_name
)
.actions
button.btn.btn-primary(
type='submit',
ng-disabled="settingsForm.$invalid"
) #{translate("update")}
else
.form-group
label.control-label #{translate("first_name")}
div.form-control(readonly="true") #{user.first_name}
.form-group
label.control-label #{translate("last_name")}
div.form-control(readonly="true") #{user.last_name}
if !externalAuthenticationSystemUsed()
.col-md-5.col-md-offset-1
h3 #{translate("change_password")}

36
services/web/test/UnitTests/coffee/User/UserPagesControllerTests.coffee
View file

@ -33,7 +33,7 @@ describe "UserPagesController", ->
_getRedirectFromSession: sinon.stub()
_setRedirectInSession: sinon.stub()
@UserPagesController = SandboxedModule.require modulePath, requires:
"settings-sharelatex":@settings
"settings-sharelatex": @settings
"logger-sharelatex":
log:->
err:->
@ -149,6 +149,40 @@ describe "UserPagesController", ->
done()
@UserPagesController.settingsPage @req, @res
it "should set 'shouldAllowEditingDetails' to true", (done)->
@res.render = (page, opts)=>
opts.shouldAllowEditingDetails.should.equal true
done()
@UserPagesController.settingsPage @req, @res
describe 'when ldap.updateUserDetailsOnLogin is true', ->
beforeEach ->
@settings.ldap = {updateUserDetailsOnLogin: true}
afterEach ->
delete @settings.ldap
it 'should set "shouldAllowEditingDetails" to false', (done) ->
@res.render = (page, opts)=>
opts.shouldAllowEditingDetails.should.equal false
done()
@UserPagesController.settingsPage @req, @res
describe 'when saml.updateUserDetailsOnLogin is true', ->
beforeEach ->
@settings.saml = {updateUserDetailsOnLogin: true}
afterEach ->
delete @settings.saml
it 'should set "shouldAllowEditingDetails" to false', (done) ->
@res.render = (page, opts)=>
opts.shouldAllowEditingDetails.should.equal false
done()
@UserPagesController.settingsPage @req, @res
describe "activateAccountPage", ->
beforeEach ->
@req.query.user_id = @user_id