Index: lams_bb_integration/RELEASE_NOTES.TXT
===================================================================
diff -u -ra73cd38aa8ee9418143efb85fe74f7f4ac0e4af7 -rcc8d3d8eb334bded5a6efbc81e059c1eb4361cfb
--- lams_bb_integration/RELEASE_NOTES.TXT (.../RELEASE_NOTES.TXT) (revision a73cd38aa8ee9418143efb85fe74f7f4ac0e4af7)
+++ lams_bb_integration/RELEASE_NOTES.TXT (.../RELEASE_NOTES.TXT) (revision cc8d3d8eb334bded5a6efbc81e059c1eb4361cfb)
@@ -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 -ra73cd38aa8ee9418143efb85fe74f7f4ac0e4af7 -rcc8d3d8eb334bded5a6efbc81e059c1eb4361cfb
--- lams_bb_integration/WEB-INF/bb-manifest.xml (.../bb-manifest.xml) (revision a73cd38aa8ee9418143efb85fe74f7f4ac0e4af7)
+++ lams_bb_integration/WEB-INF/bb-manifest.xml (.../bb-manifest.xml) (revision cc8d3d8eb334bded5a6efbc81e059c1eb4361cfb)
@@ -5,7 +5,7 @@
-
+
Index: lams_bb_integration/build.xml
===================================================================
diff -u -ra73cd38aa8ee9418143efb85fe74f7f4ac0e4af7 -rcc8d3d8eb334bded5a6efbc81e059c1eb4361cfb
--- lams_bb_integration/build.xml (.../build.xml) (revision a73cd38aa8ee9418143efb85fe74f7f4ac0e4af7)
+++ lams_bb_integration/build.xml (.../build.xml) (revision cc8d3d8eb334bded5a6efbc81e059c1eb4361cfb)
@@ -2,7 +2,7 @@
-
+
Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsSecurityUtil.java
===================================================================
diff -u -r7313b5c073ae563d642a7ef9a2acec81caa2a8ea -rcc8d3d8eb334bded5a6efbc81e059c1eb4361cfb
--- lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsSecurityUtil.java (.../LamsSecurityUtil.java) (revision 7313b5c073ae563d642a7ef9a2acec81caa2a8ea)
+++ lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsSecurityUtil.java (.../LamsSecurityUtil.java) (revision cc8d3d8eb334bded5a6efbc81e059c1eb4361cfb)
@@ -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();