--- loncom/auth/migrateuser.pm	2019/01/27 16:02:43	1.43
+++ loncom/auth/migrateuser.pm	2019/06/15 02:50:04	1.44
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Starts a user off based of an existing token.
 #
-# $Id: migrateuser.pm,v 1.43 2019/01/27 16:02:43 raeburn Exp $
+# $Id: migrateuser.pm,v 1.44 2019/06/15 02:50:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -115,6 +115,9 @@ sub lti_check {
         if ($data->{'lti.rosterurl'}) {
             $lti_env{'request.lti.rosterurl'} = $data->{'lti.rosterurl'};
         }
+        if (($data->{'balancer'}) && ($data->{'server'}) && ($data->{'balcookie'})) {
+            $lti_env{'request.balancercookie'} = $data->{'server'}.':'.$data->{'balcookie'};
+        }
     }
     return \%lti_env;
 }
@@ -340,7 +343,11 @@ sub logout {
     }
     my (%info,%user_info,%lti_info);
     if (ref($lti_env) eq 'HASH') {
-        %lti_info = %{$lti_env};
+        foreach my $key (sort(keys(%{$lti_env}))) {
+            if ($key =~ /^request\.(.+)$/) {
+                $lti_info{$1} = $lti_env->{$key};
+            }
+        }
     }
     my $lonhost = $r->dir_config('lonHostID');
     if (ref($data) eq 'HASH') {
@@ -362,6 +369,13 @@ sub logout {
                                        {'redirect'       => [0.1,$url],
                                         'only_body'      => 1,}).
         &Apache::loncommon::end_page());
+    if ($env{'request.balancercookie'}) {
+        my ($balancer,$cookie) = split(/:/,$env{'request.balancercookie'});
+        if ((&Apache::lonnet::hostname($balancer)) && ($cookie =~ /^[a-f0-9]{32}$/)) {
+            $cookie = $env{'user.domain'}.'_'.$env{'user.name'}.'_'.$cookie;
+            &Apache::lonnet::delbalcookie($cookie,$balancer);
+        }
+    }
     $r->register_cleanup(\&flush_course_logs);
     return;
 }
@@ -844,9 +858,12 @@ sub handler {
                 }
             }
             my $skipcritical;
-            if (($data{'lti.login'}) && ($data{'lti.reqcrs'}) &&
-                ($data{'lti.reqrole'} eq 'cc')) {
-                $skipcritical = 1;
+            if ($data{'lti.login'}) {
+                if ((($data{'lti.reqcrs'}) &&
+                     ($data{'lti.reqrole'} eq 'cc')) ||
+                    ($data{'lti.selfenrollrole'})) {
+                    $skipcritical = 1;
+                }
             }
 	    &Apache::lonauth::success($r,$data{'username'},$data{'domain'},
 				      $home,$desturl,$extra_env,\%form,$skipcritical);
@@ -854,18 +871,51 @@ sub handler {
 	return OK;
     }
 
-    my $next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1';
-    if ($data{'origurl'} ne '') {
-        $next_url .= '&orgurl='.&escape($data{'origurl'});
-        if ($data{'lti.login'}) {
-            if (($data{'origurl'} =~ m{/default_\d+\.sequence$}) ||
-                ($data{'origurl'} =~ m{^/res/.+\.sequence$})) {
-                $next_url .= '&navmap=1';
+    if ($data{'lti.login'}) {
+        my $handle = &Apache::lonnet::check_for_valid_session($r);
+        if ($handle) {
+            &Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'),
+                                                     $handle);
+            my $needslogout;
+            if ($env{'request.lti.login'}) {
+                if (($env{'user.name'} ne $data{'username'}) ||
+                    ($env{'user.domain'} ne $data{'domain'})) {
+                    $needslogout = 1;
+                }
+            } else {
+                $needslogout = 1;
+            }
+            if ($needslogout) {
+                &logout($r,$handle,\%data,$lti_env);
+                return OK;
             }
         }
     }
-    &Apache::lonauth::success($r,$data{'username'},$data{'domain'},$home,
-			      $next_url,$extra_env,\%form);
+
+# check if current user, and role match those expected.
+    my ($next_url,$reuse_session);
+    if (($env{'user.name'} eq $data{'username'}) && ($env{'user.domain'} eq $data{'domain'}) &&
+        ($env{'request.role'} eq $data{'role'}) && ($data{'origurl'} ne '')) {
+        $next_url = $data{'origurl'};
+        $reuse_session = 1;
+    } else {
+        $next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1';
+        if ($data{'origurl'} ne '') {
+            $next_url .= '&orgurl='.&escape($data{'origurl'});
+        }
+    }
+    if ($data{'lti.login'}) {
+        if (($data{'origurl'} =~ m{/default_\d+\.sequence$}) ||
+            ($data{'origurl'} =~ m{^/res/.+\.sequence$})) {
+            $next_url .= '&navmap=1';
+        }
+    }
+    if ($reuse_session) {
+        $r->internal_redirect($next_url);
+    } else {
+        &Apache::lonauth::success($r,$data{'username'},$data{'domain'},$home,
+                                  $next_url,$extra_env,\%form);
+    }
     return OK;
 }