Merge pull request #185 from sef-global/development

Release ScholarX v1.2.4
sef-global · Jul 27, 2021 · 19a38ca · 19a38ca
2 parents ac631e7 + eb918e4
commit 19a38ca
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/main/java/org/sefglobal/scholarx/service/AuthUserService.java b/src/main/java/org/sefglobal/scholarx/service/AuthUserService.java
@@ -67,11 +67,16 @@ public void populateEmailAddressFromLinkedIn(OAuth2UserRequest oAuth2UserRequest
 
     @SuppressWarnings("rawtypes")
     public void populateImageUrl(Map<String, Object> attributes) {
-        Map profilePictureObject = (Map<?, ?>) attributes.get("profilePicture");
-        Map imageMetaData = (Map<?, ?>) profilePictureObject.get("displayImage~");
-        List<?> elements = (List<?>) imageMetaData.get("elements");
-        List<?> identifiers = (List<?>) ((Map<?, ?>) elements.get(0)).get("identifiers");
-        Map image = (Map<?, ?>) identifiers.get(0);
-        attributes.put("imageUrl", image.get("identifier"));
+        if (attributes.get("profilePicture") != null) {
+            Map profilePictureObject = (Map<?, ?>) attributes.get("profilePicture");
+            Map imageMetaData = (Map<?, ?>) profilePictureObject.get("displayImage~");
+            List<?> elements = (List<?>) imageMetaData.get("elements");
+            List<?> identifiers = (List<?>) ((Map<?, ?>) elements.get(0)).get("identifiers");
+            Map image = (Map<?, ?>) identifiers.get(0);
+            attributes.put("imageUrl", image.get("identifier"));
+        } else {
+            // Default profile image (If user has no LinkedIn profile image)
+            attributes.put("imageUrl", "https://res.cloudinary.com/dsxobn1ln/image/upload/v1626966152/profile-pic_hvfryw.jpg");
+        }
     }
 }