From 0cef35a36e6e670f61e77e6652761711bf2a9d84 Mon Sep 17 00:00:00 2001 From: Kautilya Tripathi Date: Tue, 30 Apr 2019 02:37:28 +0530 Subject: [PATCH] Fixes #14300 (#14301) --- .../server/functions/getAvatarSuggestionForUser.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/lib/server/functions/getAvatarSuggestionForUser.js b/app/lib/server/functions/getAvatarSuggestionForUser.js index 84eec85cf47..687e5c5f79a 100644 --- a/app/lib/server/functions/getAvatarSuggestionForUser.js +++ b/app/lib/server/functions/getAvatarSuggestionForUser.js @@ -9,49 +9,49 @@ export function getAvatarSuggestionForUser(user) { const avatars = []; - if (user.services.facebook && user.services.facebook.id && settings.get('Accounts_OAuth_Facebook')) { + if (user.services && user.services.facebook && user.services.facebook.id && settings.get('Accounts_OAuth_Facebook')) { avatars.push({ service: 'facebook', url: `https://graph.facebook.com/${ user.services.facebook.id }/picture?type=large`, }); } - if (user.services.google && user.services.google.picture && user.services.google.picture !== 'https://lh3.googleusercontent.com/-XdUIqdMkCWA/AAAAAAAAAAI/AAAAAAAAAAA/4252rscbv5M/photo.jpg' && settings.get('Accounts_OAuth_Google')) { + if (user.services && user.services.google && user.services.google.picture && user.services.google.picture !== 'https://lh3.googleusercontent.com/-XdUIqdMkCWA/AAAAAAAAAAI/AAAAAAAAAAA/4252rscbv5M/photo.jpg' && settings.get('Accounts_OAuth_Google')) { avatars.push({ service: 'google', url: user.services.google.picture, }); } - if (user.services.github && user.services.github.username && settings.get('Accounts_OAuth_Github')) { + if (user.services && user.services.github && user.services.github.username && settings.get('Accounts_OAuth_Github')) { avatars.push({ service: 'github', url: `https://avatars.githubusercontent.com/${ user.services.github.username }?s=200`, }); } - if (user.services.linkedin && user.services.linkedin.pictureUrl && settings.get('Accounts_OAuth_Linkedin')) { + if (user.services && user.services.linkedin && user.services.linkedin.pictureUrl && settings.get('Accounts_OAuth_Linkedin')) { avatars.push({ service: 'linkedin', url: user.services.linkedin.pictureUrl, }); } - if (user.services.twitter && user.services.twitter.profile_image_url_https && settings.get('Accounts_OAuth_Twitter')) { + if (user.services && user.services.twitter && user.services.twitter.profile_image_url_https && settings.get('Accounts_OAuth_Twitter')) { avatars.push({ service: 'twitter', url: user.services.twitter.profile_image_url_https.replace(/_normal|_bigger/, ''), }); } - if (user.services.gitlab && user.services.gitlab.avatar_url && settings.get('Accounts_OAuth_Gitlab')) { + if (user.services && user.services.gitlab && user.services.gitlab.avatar_url && settings.get('Accounts_OAuth_Gitlab')) { avatars.push({ service: 'gitlab', url: user.services.gitlab.avatar_url, }); } - if (user.services.blockstack && user.services.blockstack.image && settings.get('Blockstack_Enable')) { + if (user.services && user.services.blockstack && user.services.blockstack.image && settings.get('Blockstack_Enable')) { avatars.push({ service: 'blockstack', url: user.services.blockstack.image,