SAK-29150 Return site role if trusted consumer.

If a launch is from a trusted consumer, just return the user's site role rather than mapping the lti role.
susowrc · Mar 12, 2015 · b5d8646 · b5d8646
1 parent a42cd86
commit b5d8646
Showing 1 changed file with 20 additions and 15 deletions.
diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/LTIRoleMapperImpl.java b/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/LTIRoleMapperImpl.java
@@ -36,21 +36,6 @@ public void setSiteService(SiteService siteService) {
 
     public Map.Entry<String, String> mapLTIRole(Map payload, User user, Site site, boolean trustedConsumer) throws LTIException {
 
-        String ltiRole = null;
-
-        if (!trustedConsumer) {
-            ltiRole = (String) payload.get(BasicLTIConstants.ROLES);
-            if (ltiRole == null) {
-                ltiRole = "";
-            } else {
-                ltiRole = ltiRole.toLowerCase();
-            }
-        }
-
-        if (M_log.isDebugEnabled()) {
-            M_log.debug("ltiRole=" + ltiRole);
-        }
-
         // Check if the user is a member of the site already
         boolean userExistsInSite = false;
         try {
@@ -73,6 +58,26 @@ public Map.Entry<String, String> mapLTIRole(Map payload, User user, Site site, b
             throw new LTIException( "launch.site.user.missing", "user_id="+user.getId()+ ", siteId="+site.getId(), null);
         }
 
+        String ltiRole = null;
+
+        if (trustedConsumer) {
+            // If the launch is from a trusted consumer, just return the user's
+            // role in the site. No need to map.
+            Member member = site.getMember(user.getId());
+            return new AbstractMap.SimpleImmutableEntry(ltiRole, member.getRole().getId());
+        } else {
+            ltiRole = (String) payload.get(BasicLTIConstants.ROLES);
+            if (ltiRole == null) {
+                ltiRole = "";
+            } else {
+                ltiRole = ltiRole.toLowerCase();
+            }
+        }
+
+        if (M_log.isDebugEnabled()) {
+            M_log.debug("ltiRole=" + ltiRole);
+        }
+
         try {
             site = siteService.getSite(site.getId());
             Set<Role> roles = site.getRoles();