--- loncom/auth/lonauth.pm	2017/08/08 18:26:34	1.148
+++ loncom/auth/lonauth.pm	2018/03/23 01:01:29	1.149
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.148 2017/08/08 18:26:34 raeburn Exp $
+# $Id: lonauth.pm,v 1.149 2018/03/23 01:01:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,6 +36,7 @@ use Apache::loncommon();
 use Apache::lonnet;
 use Apache::lonmenu();
 use Apache::createaccount;
+use Apache::ltiauth;
 use Fcntl qw(:flock);
 use Apache::lonlocal;
 use Apache::File();
@@ -45,7 +46,7 @@ use Digest::MD5;
 # ------------------------------------------------------------ Successful login
 sub success {
     my ($r, $username, $domain, $authhost, $lowerurl, $extra_env,
-	$form) = @_;
+	$form,$skipcritical) = @_;
 
 # ------------------------------------------------------------ Get cookie ready
     my $cookie =
@@ -64,10 +65,12 @@ sub success {
 
 # ------------------------------------------------- Check for critical messages
 
-    my @what=&Apache::lonnet::dump('critical',$domain,$username);
-    if ($what[0]) {
-	if (($what[0] ne 'con_lost') && ($what[0]!~/^error\:/)) {
-	    $lowerurl='/adm/email?critical=display';
+    unless ($skipcritical) {
+        my @what=&Apache::lonnet::dump('critical',$domain,$username);
+        if ($what[0]) {
+	    if (($what[0] ne 'con_lost') && ($what[0]!~/^error\:/)) {
+	        $lowerurl='/adm/email?critical=display';
+            }
         }
     }
 
@@ -93,7 +96,29 @@ sub success {
     }
 # -------------------------------------------------------- Menu script and info
     my $destination = $lowerurl;
-
+    if ($env{'request.lti.login'}) {
+        if (($env{'request.lti.reqcrs'}) && ($env{'request.lti.reqrole'} eq 'cc')) {
+            &Apache::loncommon::content_type($r,'text/html');
+            if ($securecookie) {
+                $r->headers_out->add('Set-cookie' => $securecookie);
+            }
+            if ($defaultcookie) {
+                $r->headers_out->add('Set-cookie' => $defaultcookie);
+            }
+            $r->send_http_header;
+            &Apache::ltiauth::lti_reqcrs($r,$domain,$form,$username,$domain);
+            return;
+        }
+        if ($env{'request.lti.selfenrollrole'}) {
+            if (&Apache::ltiauth::lti_enroll($username,$domain,
+                                             $env{'request.lti.selfenrollrole'}) eq 'ok') {
+                $form->{'role'} = $env{'request.lti.selfenrollrole'};
+                &Apache::lonnet::delenv('request.lti.selfenrollrole');
+            } else {
+                &Apache::ltiauth::invalid_request($r,24);
+            }
+        }
+    }
     if (defined($form->{role})) {
         my $envkey = 'user.role.'.$form->{role};
         my $now=time;
@@ -161,11 +186,7 @@ sub success {
             }
         }
     }
-    my $start_page=&Apache::loncommon::start_page('Successful Login',
-                                                  $header,$args);
-    my $end_page  =&Apache::loncommon::end_page();
 
-	my $continuelink='<a href="'.$destination.'">'.&mt('Continue').'</a>';
 # ------------------------------------------------- Output for successful login
 
     &Apache::loncommon::content_type($r,'text/html');
@@ -177,6 +198,12 @@ sub success {
     }
     $r->send_http_header;
 
+    my $start_page=&Apache::loncommon::start_page('Successful Login',
+                                                  $header,$args);
+    my $end_page  =&Apache::loncommon::end_page();
+
+    my $continuelink='<a href="'.$destination.'">'.&mt('Continue').'</a>';
+
     my %lt=&Apache::lonlocal::texthash(
 				       'wel' => 'Welcome',
 				       'pro' => 'Login problems?',
@@ -407,7 +434,7 @@ sub handler {
     my $authhost=Apache::lonnet::authenticate($form{'uname'},$upass,
                                               $form{'udom'},$defaultauth,
                                               $clientcancheckhost);
-    
+
 # --------------------------------------------------------------------- Failed?
 
     if ($authhost eq 'no_host') {