--- loncom/auth/migrateuser.pm	2021/11/18 20:25:27	1.56
+++ loncom/auth/migrateuser.pm	2022/06/30 21:04:13	1.63
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Starts a user off based of an existing token.
 #
-# $Id: migrateuser.pm,v 1.56 2021/11/18 20:25:27 raeburn Exp $
+# $Id: migrateuser.pm,v 1.63 2022/06/30 21:04:13 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -285,7 +285,7 @@ sub ip_changed {
                     'username'        => $dataref->{'username'},
                     'sessionserver'   => $lonhost,
                   );
-        my @names = ('origurl','symb','role','linkprot','linkkey');
+        my @names = ('origurl','symb','role','linkprotuser','linkprotexit','linkprot','linkkey');
         foreach my $name (@names) {
             if ($dataref->{$name} ne '') {
                 $info{$name} = $dataref->{$name};
@@ -308,7 +308,7 @@ sub ip_changed {
 }
 
 sub logout {
-    my ($r,$ip,$handle,$data,$lti_env) = @_;
+    my ($r,$ip,$handle,$data,$lti_env,$linkprot_info) = @_;
     my $lonidsdir=$r->dir_config('lonIDsDir');
     if (unlink("$lonidsdir/$handle.id")) {
         if (($env{'user.linkedenv'} =~ /^[a-f0-9]+_linked$/) &&
@@ -335,15 +335,8 @@ sub logout {
                                 -expires => '-10y',);
         $r->headers_out->add('Set-cookie' => $c);
     }
-    my (%info,%user_info,%lti_info);
-    if (ref($lti_env) eq 'HASH') {
-        foreach my $key (sort(keys(%{$lti_env}))) {
-            if ($key =~ /^request\.(.+)$/) {
-                $lti_info{$1} = $lti_env->{$key};
-            }
-        }
-    }
     my $lonhost = $r->dir_config('lonHostID');
+    my ($url,$token,$delay,%info,%user_info);
     if (ref($data) eq 'HASH') {
         %user_info=('ip'       => $ip,
                     'domain'   => $data->{'domain'},
@@ -354,13 +347,39 @@ sub logout {
                     'symb'     => $data->{'symb'},
                     'server'   => $lonhost);
     }
-    %info = (%user_info,%lti_info);
-    my $token = &Apache::lonnet::tmpput(\%info,$lonhost);
-    my $url = '/adm/migrateuser?token='.$token;
+    $delay = 0.1;
+    if (ref($linkprot_info) eq 'HASH') {
+        if ($linkprot_info->{'linkprotuser'} ne '') {
+            $token = &Apache::lonnet::tmpput($linkprot_info,$lonhost);
+            $url = '/adm/login?ltoken='.$token;
+        } else {
+            foreach my $key (keys(%user_info)) {
+                if ($user_info{$key} eq '') {
+                    delete($user_info{$key});
+                }
+            }
+            %info = (%user_info,%{$linkprot_info});
+            $token = &Apache::lonnet::tmpput(\%info,$lonhost);
+            $url = '/adm/migrateuser?token='.$token;
+        }
+        $delay = 0;
+    } else {
+        my %lti_info;
+        if (ref($lti_env) eq 'HASH') {
+            foreach my $key (sort(keys(%{$lti_env}))) {
+                if ($key =~ /^request\.(.+)$/) {
+                    $lti_info{$1} = $lti_env->{$key};
+                }
+            }
+        }
+        %info = (%user_info,%lti_info);
+        $token = &Apache::lonnet::tmpput(\%info,$lonhost);
+        $url = '/adm/migrateuser?token='.$token;
+    }
     $r->send_http_header;
     $r->print(
         &Apache::loncommon::start_page('Updating Session ...',undef,
-                                       {'redirect'       => [0.1,$url],
+                                       {'redirect'       => [$delay,$url],
                                         'only_body'      => 1,}).
         &Apache::loncommon::end_page());
     if ($env{'request.balancercookie'}) {
@@ -722,23 +741,28 @@ sub handler {
 						     $handle);
             my $checklaunch;
             if ($data{'origurl'} =~ m{^/tiny/$match_domain/\w+$}) {
-                if ($env{'request.linkprot'} ne '') {
-                     unless ($env{'request.linkprot'} eq $data{'linkprot'}) {
-                         $checklaunch = 1;
-                     }
-                }
-                if ($env{'request.linkkey'} ne '') {
-                    unless ($env{'request.linkkey'} eq $data{'linkkey'}) {
-                        $checklaunch = 1;
-                    }
+                unless ($env{'request.linkprot'} eq $data{'linkprot'}) {
+                    $checklaunch = 1;
                 }
-                if ($env{'request.deeplink.login'}) {
-                    unless ($env{'request.deeplink.login'} eq $data{'deeplink.login'}) {
-                        $checklaunch = 1;
-                    }
+                unless ($env{'request.linkkey'} eq $data{'linkkey'}) {
+                    $checklaunch = 1;
+                }
+                unless ($env{'request.deeplink.login'} eq $data{'deeplink.login'}) {
+                    $checklaunch = 1;
                 }
             }
             if ($data{'linkprot'} ne '') {
+                if (($env{'user.name'} ne $data{'username'}) ||
+                    ($env{'user.domain'} ne $data{'domain'})) {
+                    my %linkprot_env;
+                    foreach my $item ('linkprot','deeplink.login') {
+                        if ($data{$item}) {
+                            $linkprot_env{$item} = $data{$item};
+                        }
+                    }
+                    &logout($r,$ip,$handle,\%data,undef,\%linkprot_env);
+                    return OK;
+                }
                 &Apache::lonnet::appenv({'request.linkprot' => $data{'linkprot'}});
                 if ($env{'request.linkkey'}) {
                     &Apache::lonnet::delenv('request.linkkey');
@@ -878,6 +902,11 @@ sub handler {
                     my %info;
                     if ($env{'request.linkprot'}) {
                         $info{'linkprot'} = $env{'request.linkprot'};
+                        foreach my $item ('linkprotuser','linkprotexit') {
+                            if ($data{$item}) {
+                                $info{$item} = $data{$item};
+                            }
+                        }
                     } elsif ($env{'request.linkkey'} ne '') {
                         $info{'linkkey'} = $env{'request.linkkey'};
                     }
@@ -886,7 +915,7 @@ sub handler {
                         $info{'checklaunch'} = 1;
                     }
                     my $token = &Apache::lonnet::tmpput(\%info,$r->dir_config('lonHostID'),'link');
-                    unless (($token eq 'con_lost') || ($token eq 'refused') ||
+                    unless (($token eq 'con_lost') || ($token eq 'refused') || ($token =~ /^error:/) ||
                             ($token eq 'unknown_cmd') || ($token eq 'no_such_host')) {
                         $dest .= (($dest =~ /\?/) ? '&' : '?') . 'ttoken='.$token;
                     }
@@ -930,6 +959,11 @@ sub handler {
                                           'request.linkprot' => $data{'linkprot'}};
                         }
                     }
+                    foreach my $item ('linkprotuser','linkprotexit') {
+                        if ($data{$item} ne '') {
+                            $form{$item} = $data{$item};
+                        }
+                    }
                 } elsif ($data{'linkkey'} ne '') {
                     if (ref($extra_env) eq 'HASH') {
                         $extra_env->{'user.deeplinkkey'} = $data{'linkkey'};
@@ -994,29 +1028,47 @@ sub handler {
     } elsif ($data{'origurl'} =~ m{^/tiny/$match_domain/\w+$}) {
         $next_url=$data{'origurl'};
     } 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'}) {
+            $next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1';
+            if ($data{'origurl'} ne '') {
+                $next_url .= '&orgurl='.&escape($data{'origurl'});
+            }
+        } 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) {
+                $next_url .= '&navmap=1';
+            } else {
+                $next_url .= '&navmap=1';
+            }
         }
     }
     if ($reuse_session) {
         $r->internal_redirect($next_url);
-    } elsif ($data{'deeplink.login'}) {
-        if (ref($extra_env) eq 'HASH') {
-            $extra_env->{'request.deeplink.login'} = $data{'deeplink.login'};
-        } else {
-            $extra_env = {'request.deeplink.login' => $data{'deeplink.login'}};
-        }
-        if ($data{'linkprot'}) {
-            $extra_env->{'request.linkprot'} = $data{'linkprot'};
-        } elsif ($data{'linkkey'} ne '') {
-            $extra_env->{'request.linkkey'} = $data{'linkkey'};
+    } else {
+        if ($data{'deeplink.login'}) {
+            if (ref($extra_env) eq 'HASH') {
+                $extra_env->{'request.deeplink.login'} = $data{'deeplink.login'};
+            } else {
+                $extra_env = {'request.deeplink.login' => $data{'deeplink.login'}};
+            }
+            if ($data{'linkprot'}) {
+                $extra_env->{'request.linkprot'} = $data{'linkprot'};
+                foreach my $item ('linkprotuser','linkprotexit') {
+                    if ($data{$item}) {
+                        $form{'request.'.$item} = $data{$item};
+                    }
+                }
+            } elsif ($data{'linkkey'} ne '') {
+                $extra_env->{'request.linkkey'} = $data{'linkkey'};
+            }
         }
         &Apache::lonauth::success($r,$data{'username'},$data{'domain'},$home,
                                   $next_url,$extra_env,\%form,'',$cid);