github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-29 09:13:39 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8707 from overleaf/ta-user-context-fix

Browse source 
Fix User Context Attributes

GitOrigin-RevId: 1fed088785d21e9ec51f3f541487c2fa0e1d0111
This commit is contained in:
Timothée Alby 2022-07-07 10:00:50 +02:00 committed by Copybot
parent 8f41431719
commit b3dc3808c7
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/web/app/src/Features/User/UserPagesController.js
View file

@ -72,12 +72,14 @@ async function settingsPage(req, res) {
res.render('user/settings-react', { res.render('user/settings-react', {
title: 'account_settings', title: 'account_settings',
user: { user: {
id: user.id, id: user._id,
isAdmin: user.isAdmin, isAdmin: user.isAdmin,
email: user.email, email: user.email,
allowedFreeTrial: user.allowedFreeTrial, allowedFreeTrial: user.allowedFreeTrial,
first_name: user.first_name, first_name: user.first_name,
last_name: user.last_name, last_name: user.last_name,
alphaProgram: user.alphaProgram,
betaProgram: user.betaProgram,
features: { features: {
dropbox: user.features.dropbox, dropbox: user.features.dropbox,
github: user.features.github, github: user.features.github,

2
services/web/frontend/js/shared/context/user-context.js
View file

@ -13,6 +13,8 @@ UserContext.Provider.propTypes = {
allowedFreeTrial: PropTypes.boolean, allowedFreeTrial: PropTypes.boolean,
first_name: PropTypes.string, first_name: PropTypes.string,
last_name: PropTypes.string, last_name: PropTypes.string,
alphaProgram: PropTypes.boolean,
betaProgram: PropTypes.boolean,
features: PropTypes.shape({ features: PropTypes.shape({
dropbox: PropTypes.boolean, dropbox: PropTypes.boolean,
github: PropTypes.boolean, github: PropTypes.boolean,