Index: lams_bb_integration/RELEASE_NOTES.TXT =================================================================== diff -u -rf51be18235d06cd7edd503662a93e0976839ba53 -rd1bd46656c685991413555e26f4efe3a9c4db39f --- lams_bb_integration/RELEASE_NOTES.TXT (.../RELEASE_NOTES.TXT) (revision f51be18235d06cd7edd503662a93e0976839ba53) +++ lams_bb_integration/RELEASE_NOTES.TXT (.../RELEASE_NOTES.TXT) (revision d1bd46656c685991413555e26f4efe3a9c4db39f) @@ -38,8 +38,13 @@ * LDEV-2897 Fixed Blackboard gradebook error (occured on Assessment tool outputs) * LDEV-2896 Added support for lessons created in LAMS building block version prior to 1.2. Also if there is no title or description don't display them - 1.2.1 Release Fixes =================== * LDEV-3034 Remove "External Page" warning introduced in BB (BB9.1 SP12) +1.2.2 Release Fixes +=================== +* LDEV-3102 Remove user call back URLs from Blackboard integration + + + Index: lams_bb_integration/WEB-INF/bb-manifest.xml =================================================================== diff -u -rf51be18235d06cd7edd503662a93e0976839ba53 -rd1bd46656c685991413555e26f4efe3a9c4db39f --- lams_bb_integration/WEB-INF/bb-manifest.xml (.../bb-manifest.xml) (revision f51be18235d06cd7edd503662a93e0976839ba53) +++ lams_bb_integration/WEB-INF/bb-manifest.xml (.../bb-manifest.xml) (revision d1bd46656c685991413555e26f4efe3a9c4db39f) @@ -5,7 +5,7 @@ - + Index: lams_bb_integration/build.xml =================================================================== diff -u -rf51be18235d06cd7edd503662a93e0976839ba53 -rd1bd46656c685991413555e26f4efe3a9c4db39f --- lams_bb_integration/build.xml (.../build.xml) (revision f51be18235d06cd7edd503662a93e0976839ba53) +++ lams_bb_integration/build.xml (.../build.xml) (revision d1bd46656c685991413555e26f4efe3a9c4db39f) @@ -2,7 +2,7 @@ - + Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsSecurityUtil.java =================================================================== diff -u -r3b9ddc508e73ba1d53a30bf7e6a45d400da05096 -rd1bd46656c685991413555e26f4efe3a9c4db39f --- lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsSecurityUtil.java (.../LamsSecurityUtil.java) (revision 3b9ddc508e73ba1d53a30bf7e6a45d400da05096) +++ lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsSecurityUtil.java (.../LamsSecurityUtil.java) (revision d1bd46656c685991413555e26f4efe3a9c4db39f) @@ -90,6 +90,9 @@ String timestamp = new Long(System.currentTimeMillis()).toString(); String username = ctx.getUser().getUserName(); + String firstName = ctx.getUser().getGivenName(); + String lastName = ctx.getUser().getFamilyName(); + String email = ctx.getUser().getEmailAddress(); String hash = generateAuthenticationHash(timestamp, username, method, serverId); String courseId = ctx.getCourse().getCourseId(); @@ -102,7 +105,10 @@ url = serverAddr + "/LoginRequest?" + "&uid=" + URLEncoder.encode(username, "UTF8") + "&method=" + method + "&ts=" + timestamp + "&sid=" + serverId + "&hash=" + hash + "&courseid=" + URLEncoder.encode(courseId, "UTF8") + "&country=" + country + "&lang=" + lang + "&requestSrc=" - + URLEncoder.encode(reqSrc, "UTF8"); + + URLEncoder.encode(reqSrc, "UTF8") + "&firstName=" + URLEncoder.encode(firstName, "UTF-8") + + "&lastName=" + URLEncoder.encode(lastName, "UTF-8") + + "&email=" + email; + } catch (UnsupportedEncodingException e) { throw new RuntimeException(); } @@ -217,6 +223,9 @@ String timestamp = new Long(System.currentTimeMillis()).toString(); String username = ctx.getUser().getUserName(); + String firstName = ctx.getUser().getGivenName(); + String lastName = ctx.getUser().getFamilyName(); + String email = ctx.getUser().getEmailAddress(); String hash = generateAuthenticationHash(timestamp, username, serverId); String courseId = ctx.getCourse().getCourseId(); @@ -230,7 +239,10 @@ String serviceURL = serverAddr + "/services/xml/LearningDesignRepository?" + "datetime=" + timestamp + "&username=" + URLEncoder.encode(username, "utf8") + "&serverId=" + URLEncoder.encode(serverId, "utf8") + "&hashValue=" + hash + "&courseId=" - + URLEncoder.encode(courseId, "UTF8") + "&country=" + country + "&lang=" + lang + "&mode=" + mode; + + URLEncoder.encode(courseId, "UTF8") + "&country=" + country + "&lang=" + lang + "&mode=" + mode + + "&firstName=" + URLEncoder.encode(firstName, "UTF-8") + + "&lastName=" + URLEncoder.encode(lastName, "UTF-8") + + "&email=" + email; URL url = new URL(serviceURL); URLConnection conn = url.openConnection();