From 7fe097702a097406ef9b78d7e0dc0ed0ef24f5f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Alby?= <timothee.alby@gmail.com>
Date: Thu, 7 Jul 2022 10:00:50 +0200
Subject: [PATCH] Merge pull request #8707 from overleaf/ta-user-context-fix

Fix User Context Attributes

GitOrigin-RevId: 1fed088785d21e9ec51f3f541487c2fa0e1d0111
---
 services/web/app/src/Features/User/UserPagesController.js | 4 +++-
 services/web/frontend/js/shared/context/user-context.js   | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/services/web/app/src/Features/User/UserPagesController.js b/services/web/app/src/Features/User/UserPagesController.js
index a44f68b07c..be17d1c65f 100644
--- a/services/web/app/src/Features/User/UserPagesController.js
+++ b/services/web/app/src/Features/User/UserPagesController.js
@@ -72,12 +72,14 @@ async function settingsPage(req, res) {
     res.render('user/settings-react', {
       title: 'account_settings',
       user: {
-        id: user.id,
+        id: user._id,
         isAdmin: user.isAdmin,
         email: user.email,
         allowedFreeTrial: user.allowedFreeTrial,
         first_name: user.first_name,
         last_name: user.last_name,
+        alphaProgram: user.alphaProgram,
+        betaProgram: user.betaProgram,
         features: {
           dropbox: user.features.dropbox,
           github: user.features.github,
diff --git a/services/web/frontend/js/shared/context/user-context.js b/services/web/frontend/js/shared/context/user-context.js
index 4b1c659071..fe322cfa3a 100644
--- a/services/web/frontend/js/shared/context/user-context.js
+++ b/services/web/frontend/js/shared/context/user-context.js
@@ -13,6 +13,8 @@ UserContext.Provider.propTypes = {
       allowedFreeTrial: PropTypes.boolean,
       first_name: PropTypes.string,
       last_name: PropTypes.string,
+      alphaProgram: PropTypes.boolean,
+      betaProgram: PropTypes.boolean,
       features: PropTypes.shape({
         dropbox: PropTypes.boolean,
         github: PropTypes.boolean,