--- loncom/auth/migrateuser.pm	2022/02/07 12:05:05	1.25.2.5.2.2
+++ loncom/auth/migrateuser.pm	2023/01/23 00:59:22	1.25.2.5.2.8
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Starts a user off based of an existing token.
 #
-# $Id: migrateuser.pm,v 1.25.2.5.2.2 2022/02/07 12:05:05 raeburn Exp $
+# $Id: migrateuser.pm,v 1.25.2.5.2.8 2023/01/23 00:59:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,7 +38,11 @@ use Apache::lonlogin();
 use CGI::Cookie;
 
 sub goto_login {
-    my ($r,$domain) = @_;
+    my ($r,$domain,$data) = @_;
+    my $write_to_opener;
+    if (ref($data) eq 'HASH') {
+        $write_to_opener = $data->{'lcssowin'};
+    }
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     my $url = '/adm/login';
@@ -46,7 +50,7 @@ sub goto_login {
         $url .= '?domain='.$domain;
     }
     $r->print(&Apache::loncommon::start_page('Going to login',undef,
-					     {'redirect' => [0,$url],}).
+					     {'redirect' => [0,$url,'',$write_to_opener],}).
 	      '<h1>'.&mt('One moment please...').'</h1>'.
 	      '<p>'.&mt('Transferring to login page.').'</p>'.
 	      &Apache::loncommon::end_page());
@@ -193,19 +197,27 @@ 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};
             }
         }
+        if ($info{'origurl'} eq '/adm/email') {
+            if (($dataref->{'display'}) && ($dataref->{'mailrecip'})) {
+                if (&unescape($dataref->{'mailrecip'}) eq $dataref->{'username'}.':'.$dataref->{'domain'}) {
+                    $info{'display'} = $dataref->{'display'};
+                    $info{'mailrecip'} = $dataref->{'mailrecip'};
+                }
+            }
+        }
         my $iptoken = &Apache::lonnet::tmpput(\%info,$switchto,'link');
         unless ($iptoken eq 'conlost') {
             $url .= (($url =~ /\?/) ? '&' : '?') . 'iptoken='.$iptoken;
         }
         $r->print(&Apache::loncommon::start_page($title,undef,
                                                  {'redirect' =>
-                                                  [2,$url],}).
+                                                  [2,$url,'',$dataref->{'lcssowin'}]}).
                   '<h1>'.&mt('One moment please...').'</h1>'.
                   '<p class="LC_warning">'.$message.'</p>'.
                   &Apache::loncommon::end_page());
@@ -216,7 +228,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$/) &&
@@ -243,15 +255,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,$write_to_opener,%info,%user_info);
     if (ref($data) eq 'HASH') {
         %user_info=('ip'       => $ip,
                     'domain'   => $data->{'domain'},
@@ -261,14 +266,41 @@ sub logout {
                     'origurl'  => $data->{'origurl'},
                     'symb'     => $data->{'symb'},
                     'server'   => $lonhost);
+        $write_to_opener = $data->{'lcssowin'};
+    }
+    $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;
     }
-    %info = (%user_info,%lti_info);
-    my $token = &Apache::lonnet::tmpput(\%info,$lonhost);
-    my $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,'',$write_to_opener],
                                         'only_body'      => 1,}).
         &Apache::loncommon::end_page());
     if ($env{'request.balancercookie'}) {
@@ -282,6 +314,11 @@ sub logout {
     return;
 }
 
+sub flush_course_logs {
+    &Apache::lonnet::flushcourselogs();
+    return OK;
+}
+
 sub handler {
     my ($r) = @_;
 
@@ -295,11 +332,11 @@ sub handler {
     &Apache::lonlocal::get_language_handle($r);
 
     if ($delete ne 'ok') {
-	return &goto_login($r);
+	return &goto_login($r,'',\%data);
     }
 
     if (!defined($data{'username'}) || !defined($data{'domain'})) {
-        return &goto_login($r);
+        return &goto_login($r,'',\%data);
     }
     my $ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP); 
     if ($data{'ip'} ne $ip) {
@@ -314,7 +351,7 @@ sub handler {
     if (&Apache::lonnet::domain($data{'domain'})) {
         $udom=$data{'domain'};
     }
-    if ($home =~ /(con_lost|no_such_host)/) { return &goto_login($r,$udom); }
+    if ($home =~ /(con_lost|no_such_host)/) { return &goto_login($r,$udom,\%data); }
 
     my $extra_env = &sso_check(\%data);
     if (($data{'balancer'}) && ($data{'server'}) && ($data{'balcookie'})) {
@@ -375,35 +412,35 @@ 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.linkprotexit'} eq $data{'linkprotexit'}) {
+                    $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') {
+                    foreach my $item ('linkprot','linkprotexit','deeplink.login') {
                         if ($data{$item}) {
-                            $linkprot_env{'request.'.$item} = $data{$item};
+                            $linkprot_env{$item} = $data{$item};
                         }
                     }
-                    &logout($r,$ip,$handle,\%data,\%linkprot_env);
+                    &logout($r,$ip,$handle,\%data,undef,\%linkprot_env);
                     return OK;
                 }
                 &Apache::lonnet::appenv({'request.linkprot' => $data{'linkprot'}});
+                if ($data{'linkprotexit'}) {
+                    &Apache::lonnet::appenv({'request.linkprotexit' => $data{'linkprotexit'}});
+                }
                 if ($env{'request.linkkey'}) {
                     &Apache::lonnet::delenv('request.linkkey');
                 }
@@ -458,6 +495,9 @@ sub handler {
             }
             if ($data{'deeplink.login'}) {
                 &Apache::lonnet::appenv({'request.deeplink.login' => $data{'deeplink.login'}});
+                if ($env{'environment.remote'} eq 'on') {
+                    &Apache::lonnet::appenv({'environment.remote' => 'off'});
+                }
             }
             if ($data{'origurl'} ne '') {
                 my $dest = $data{'origurl'};
@@ -466,6 +506,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'};
                     }
@@ -474,7 +519,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;
                     }
@@ -501,6 +546,14 @@ sub handler {
                                           'user.linkproturi' => $linkuri,
                                           'request.linkprot' => $data{'linkprot'}};
                         }
+                        if ($data{'linkprotexit'}) {
+                            $extra_env->{'request.linkprotexit'} = $data{'linkprotexit'};
+                        }
+                    }
+                    foreach my $item ('linkprotuser','linkprotexit') {
+                        if ($data{$item} ne '') {
+                            $form{$item} = $data{$item};
+                        }
                     }
                 } elsif ($data{'linkkey'}) {
                     if (ref($extra_env) eq 'HASH') {
@@ -520,10 +573,17 @@ sub handler {
                         $extra_env = {'request.deeplink.login' => $data{'deeplink.login'}};
                     }
                 }
+                if ($desturl eq '/adm/email') {
+                    if (($data{'display'}) && ($data{'mailrecip'})) {
+                        if (&unescape($data{'mailrecip'}) eq "$data{'username'}:$data{'domain'}") {
+                            $form{'display'} = &unescape($data{'display'});
+                        }
+                    }
+                }
             }
 	    &Apache::lonauth::success($r,$data{'username'},$data{'domain'},
 				      $home,$desturl,$extra_env,\%form,'',
-                                      $expirepub);
+                                      $expirepub,$data{'lcssowin'});
 	}
 	return OK;
     }
@@ -540,12 +600,20 @@ sub handler {
         }
         if ($data{'linkprot'}) {
             $extra_env->{'request.linkprot'} = $data{'linkprot'};
+            if ($data{'linkprotexit'}) {
+                $extra_env->{'request.linkprotexit'} = $data{'linkprotexit'};
+            }
+            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);
+			      $next_url,$extra_env,\%form,$cid,'',$data{'lcssowin'});
     return OK;
 }