Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.92.2.9 -r1.92.2.10
--- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	22 Nov 2016 08:25:25 -0000	1.92.2.9
+++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	25 Nov 2016 15:57:44 -0000	1.92.2.10
@@ -548,6 +548,6 @@
 label.theme  =Theme
 
 label.2FA.property.enable =Enable two-factor authentication
+sysadmin.lti.consumer.monitor.roles  =Comma-separated list of monitor roles
 
-
 #======= End labels: Exported 540 labels for en AU =====
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java,v
diff -u -r1.22.12.5 -r1.22.12.6
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java	5 May 2016 07:40:37 -0000	1.22.12.5
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java	25 Nov 2016 15:57:44 -0000	1.22.12.6
@@ -60,10 +60,6 @@
  * </p>
  *
  * @author <a href="mailto:fyang@melcoe.mq.edu.au">Fei Yang</a>
- *
- *
- *
- *
  */
 public class OrgManageAction extends LamsDispatchAction {
 
Index: lams_admin/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/Attic/struts-config.xml,v
diff -u -r1.1.2.6 -r1.1.2.7
--- lams_admin/web/WEB-INF/struts-config.xml	22 Nov 2016 08:25:25 -0000	1.1.2.6
+++ lams_admin/web/WEB-INF/struts-config.xml	25 Nov 2016 15:57:44 -0000	1.1.2.7
@@ -130,6 +130,7 @@
 	<form-property name="disabled" type="java.lang.Boolean" initial="false"/>
 	<form-property name="lessonFinishUrl" type="java.lang.String"/>
 	<form-property name="timeToLiveLoginRequestEnabled" type="java.lang.Boolean" initial="false"/>
+	<form-property name="ltiToolConsumerMonitorRoles" type="java.lang.String"/>
 </form-bean>
 
 <form-bean name="ConfigForm" type="org.apache.struts.action.DynaActionForm">
Index: lams_admin/web/lti/ltiConsumer.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/lti/ltiConsumer.jsp,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_admin/web/lti/ltiConsumer.jsp	27 Sep 2016 06:18:51 -0000	1.1.2.2
+++ lams_admin/web/lti/ltiConsumer.jsp	25 Nov 2016 15:57:45 -0000	1.1.2.3
@@ -78,6 +78,10 @@
 			<td><fmt:message key="sysadmin.lessonFinishUrl" />:</td>
 			<td>${lessonFinishUrl}</td>
 		</tr>
+		<tr>
+			<td><fmt:message key="sysadmin.lti.consumer.monitor.roles" />:</td>
+			<td><html:text property="ltiToolConsumerMonitorRoles" size="30"/></td>
+		</tr>
 	</table>
 	
 	<div class="pull-right">
Index: lams_admin/web/organisation/list.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/organisation/list.jsp,v
diff -u -r1.8.2.5 -r1.8.2.6
--- lams_admin/web/organisation/list.jsp	23 Nov 2016 20:54:10 -0000	1.8.2.5
+++ lams_admin/web/organisation/list.jsp	25 Nov 2016 15:57:44 -0000	1.8.2.6
@@ -2,7 +2,7 @@
 <%@ page import="org.lamsfoundation.lams.usermanagement.Role" %>
 <c:set var="lams"><lams:LAMSURL /></c:set>
 
- <link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap.css">
+<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap.css">
 <link type="text/css" href="${lams}css/jquery.tablesorter.pager.css" rel="stylesheet">
 <style>
 	table.infoDisplay {
Index: lams_build/lib/lams/lams.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v
diff -u -r1.420.2.100 -r1.420.2.101
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java,v
diff -u -r1.2.2.3 -r1.2.2.4
--- lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java	28 Sep 2016 15:13:39 -0000	1.2.2.3
+++ lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java	25 Nov 2016 15:57:46 -0000	1.2.2.4
@@ -97,23 +97,23 @@
 	//verify whether request was correctly signed by OAuth
 	ExtServer extServer = integrationService.getExtServer(consumerKey);
 	String secret = extServer.getServerkey();// retrieve corresponding secret for key from db
-//	LtiVerificationResult ltiResult = null;
-//	try {
-//	    LtiVerifier ltiVerifier = new LtiOauthVerifier();
-//	    ltiResult = ltiVerifier.verify(request, secret);
-//	} catch (LtiVerificationException e) {
-//	    log.error("Authentication error: ", e);
-//	    response.sendError(HttpServletResponse.SC_UNAUTHORIZED,
-//		    "Login Failed - authentication error. " + e.getMessage());
-//	    return;
-//	}
-//	LtiLaunch ltiLaunch = ltiResult.getLtiLaunchResult();
-//	if (!ltiResult.getSuccess()) {
-//	    log.warn("Authentication error: " + ltiResult.getMessage());
-//	    response.sendError(HttpStatus.SC_UNAUTHORIZED,
-//		    "Login Failed - authentication error. " + ltiResult.getMessage());
-//	    return;
-//	}
+	LtiVerificationResult ltiResult = null;
+	try {
+	    LtiVerifier ltiVerifier = new LtiOauthVerifier();
+	    ltiResult = ltiVerifier.verify(request, secret);
+	} catch (LtiVerificationException e) {
+	    log.error("Authentication error: ", e);
+	    response.sendError(HttpServletResponse.SC_UNAUTHORIZED,
+		    "Login Failed - authentication error. " + e.getMessage());
+	    return;
+	}
+	LtiLaunch ltiLaunch = ltiResult.getLtiLaunchResult();
+	if (!ltiResult.getSuccess()) {
+	    log.warn("Authentication error: " + ltiResult.getMessage());
+	    response.sendError(HttpStatus.SC_UNAUTHORIZED,
+		    "Login Failed - authentication error. " + ltiResult.getMessage());
+	    return;
+	}
 
 	//provide default values for user names, as we can't fetch them from LTI Tool consumer
 	if (StringUtils.isBlank(firstName)) {
@@ -124,14 +124,15 @@
 	}
 	ExtServerLessonMap lesson = integrationService.getLtiConsumerLesson(consumerKey, resourceLinkId);
 
-	//determine method based on role parameter
+	//Determine method based on role parameter. Monitor roles can be either LTI standard ones or tool consumer's custom ones set
 	String method;
-	if (LtiUtils.isLearner(roles) && !LtiUtils.isStaff(roles) && !LtiUtils.isAdmin(roles)) {
-	    method = LoginRequestDispatcher.METHOD_LEARNER_STRICT_AUTHENTICATION;
-	} else if (lesson == null) {
-	    method = LoginRequestDispatcher.METHOD_AUTHOR;
+	boolean isCustomMonitorRole = LtiUtils.isToolConsumerCustomRole(roles,
+		extServer.getLtiToolConsumerMonitorRoles());
+	if (LtiUtils.isStaff(roles) || LtiUtils.isAdmin(roles) || isCustomMonitorRole) {
+	    method = (lesson == null) ? LoginRequestDispatcher.METHOD_AUTHOR : LoginRequestDispatcher.METHOD_MONITOR;
+
 	} else {
-	    method = LoginRequestDispatcher.METHOD_MONITOR;
+	    method = LoginRequestDispatcher.METHOD_LEARNER_STRICT_AUTHENTICATION;
 	}
 	
 	//provide empty lessonId in case of learner accesses LTI link before teacher authored it
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/Attic/ExtServerOrgMap.hbm.xml,v
diff -u -r1.6.2.7 -r1.6.2.8
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml	28 Sep 2016 15:12:46 -0000	1.6.2.7
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml	25 Nov 2016 15:57:16 -0000	1.6.2.8
@@ -161,6 +161,16 @@
             insert="true"
             column="time_to_live_login_request"
         />
+        
+        <property
+			name="ltiToolConsumerMonitorRoles"
+			type="java.lang.String"
+			update="true"
+			insert="true"
+			column="lti_consumer_monitor_roles"
+			length="65535"
+			not-null="false"
+        />
 
         <set
             name="extCourseClassMaps"
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040076.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/integration/ExtServer.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/ExtServer.java,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_common/src/java/org/lamsfoundation/lams/integration/ExtServer.java	28 Sep 2016 15:12:46 -0000	1.1.2.2
+++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtServer.java	25 Nov 2016 15:57:16 -0000	1.1.2.3
@@ -65,6 +65,11 @@
 
     /** persistent field */
     private Set extUserUseridMaps;
+    
+    /**
+     * Comma-separated list of roles that LTI tool consumer uses to indicate user monitor role
+     */
+    private String ltiToolConsumerMonitorRoles;
 
     /** default constructor */
     public ExtServer() {
@@ -211,6 +216,14 @@
     public void setExtUserUseridMaps(Set extUserUseridMaps) {
 	this.extUserUseridMaps = extUserUseridMaps;
     }
+    
+    public String getLtiToolConsumerMonitorRoles() {
+	return this.ltiToolConsumerMonitorRoles;
+    }
+    
+    public void setLtiToolConsumerMonitorRoles(String ltiToolConsumerMonitorRoles) {
+	this.ltiToolConsumerMonitorRoles = ltiToolConsumerMonitorRoles;
+    }
 
     @Override
     public String toString() {
Index: lams_common/src/java/org/lamsfoundation/lams/integration/util/LtiUtils.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/util/LtiUtils.java,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_common/src/java/org/lamsfoundation/lams/integration/util/LtiUtils.java	27 Sep 2016 06:22:54 -0000	1.1.2.2
+++ lams_common/src/java/org/lamsfoundation/lams/integration/util/LtiUtils.java	25 Nov 2016 15:57:16 -0000	1.1.2.3
@@ -1,5 +1,6 @@
 package org.lamsfoundation.lams.integration.util;
 
+import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -37,6 +38,15 @@
 	
 	return hasRole(roles, rolesToSearchFor);
     }
+    
+    public static boolean isToolConsumerCustomRole(String roles, String toolConsumerCustomRoles) {
+	if (roles == null || toolConsumerCustomRoles == null) {
+	    return false;
+	}
+	
+	List<String> rolesToSearchFor = Arrays.asList(toolConsumerCustomRoles.split(","));
+	return hasRole(roles, rolesToSearchFor);
+    }
 
     /**
      * Return <code>true</code> if the user is a learner.