From 5eb91a9043f87c8c3b996e94e21b90648b960e87 Mon Sep 17 00:00:00 2001 From: Shaun Hamilton Date: Wed, 10 May 2023 10:59:40 +0100 Subject: [PATCH] chore(api-server): remove unused `is*` fields (#50346) --- api-server/src/common/models/user.js | 4 ---- api-server/src/server/boot/settings.js | 11 +---------- api-server/src/server/boot/user.js | 4 ---- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/api-server/src/common/models/user.js b/api-server/src/common/models/user.js index 028ffcc7dc9..a5d4776ac57 100644 --- a/api-server/src/common/models/user.js +++ b/api-server/src/common/models/user.js @@ -815,10 +815,6 @@ export default function initializeUser(User) { user; const allUser = { ..._.pick(user, publicUserProps), - isGithub: !!user.githubProfile, - isLinkedIn: !!user.linkedin, - isTwitter: !!user.twitter, - isWebsite: !!user.website, points: progressTimestamps.length, completedChallenges, ...getProgress(progressTimestamps, timezone), diff --git a/api-server/src/server/boot/settings.js b/api-server/src/server/boot/settings.js index 9a2d67c80db..0fc22857780 100644 --- a/api-server/src/server/boot/settings.js +++ b/api-server/src/server/boot/settings.js @@ -307,16 +307,7 @@ function handleInvalidUpdate(res) { function updateUserFlag(req, res, next) { const { user, body: update } = req; - const allowedKeys = [ - 'isGithub', - 'isLinkedIn', - 'isTwitter', - 'isWebsite', - 'githubProfile', - 'linkedin', - 'twitter', - 'website' - ]; + const allowedKeys = ['githubProfile', 'linkedin', 'twitter', 'website']; if (Object.keys(update).every(key => allowedKeys.includes(key))) { return user.updateAttributes( update, diff --git a/api-server/src/server/boot/user.js b/api-server/src/server/boot/user.js index eedcf1cc4e8..e7c380829e9 100644 --- a/api-server/src/server/boot/user.js +++ b/api-server/src/server/boot/user.js @@ -149,10 +149,6 @@ function createReadSessionUser(app) { ...pick(user, userPropsForSession), username: user.usernameDisplay || user.username, isEmailVerified: !!user.emailVerified, - isGithub: !!user.githubProfile, - isLinkedIn: !!user.linkedin, - isTwitter: !!user.twitter, - isWebsite: !!user.website, ...normaliseUserFields(user), joinDate: user.id.getTimestamp(), userToken: encodedUserToken