--- loncom/auth/migrateuser.pm	2021/05/04 18:47:37	1.50
+++ loncom/auth/migrateuser.pm	2021/11/18 20:25:27	1.56
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Starts a user off based of an existing token.
 #
-# $Id: migrateuser.pm,v 1.50 2021/05/04 18:47:37 raeburn Exp $
+# $Id: migrateuser.pm,v 1.56 2021/11/18 20:25:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -283,19 +283,17 @@ sub ip_changed {
         my %info= (
                     'domain'          => $udom,
                     'username'        => $dataref->{'username'},
-                    'role'            => $dataref->{'role'},
                     'sessionserver'   => $lonhost,
                   );
-        if ($dataref->{'origurl'}) {
-            $info{'origurl'} = $dataref->{'origurl'};
-        }
-        if ($dataref->{'symb'}) {
-            $info{'symb'} = $dataref->{'symb'};
+        my @names = ('origurl','symb','role','linkprot','linkkey');
+        foreach my $name (@names) {
+            if ($dataref->{$name} ne '') {
+                $info{$name} = $dataref->{$name};
+            }
         }
-        my $iptoken = &Apache::lonnet::tmpput(\%info,$switchto);
+        my $iptoken = &Apache::lonnet::tmpput(\%info,$switchto,'link');
         unless ($iptoken eq 'conlost') {
-            $url .= ($url =~ /\?/) ? '&' : '?';
-            $url .= 'iptoken='.$iptoken;
+            $url .= (($url =~ /\?/) ? '&' : '?') . 'iptoken='.$iptoken;
         }
         $r->print(&Apache::loncommon::start_page($title,undef,
                                                  {'redirect' =>
@@ -705,15 +703,47 @@ sub handler {
             }
         }
     } else {
-	my $handle = &Apache::lonnet::check_for_valid_session($r);
+        my ($handle,$expirepub);
+        $handle = &Apache::lonnet::check_for_valid_session($r);
+
+# For "public user" - remove any existing "public" cookie so actual user is logged in.
+        if ($handle) {
+            if ($handle=~/^publicuser\_/) {
+                my $lonidsdir=$r->dir_config('lonIDsDir');
+                if ($lonidsdir ne '') {
+                    unlink("$lonidsdir/$handle.id");
+                }
+                undef($handle);
+                $expirepub = 1;
+            }
+        }
 	if ($handle) {
 	    &Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'),
 						     $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;
+                    }
+                }
+                if ($env{'request.deeplink.login'}) {
+                    unless ($env{'request.deeplink.login'} eq $data{'deeplink.login'}) {
+                        $checklaunch = 1;
+                    }
+                }
+            }
             if ($data{'linkprot'} ne '') {
-                my ($linkprotector,$deeplink) = split(/:/,$data{'linkprot'},2);
-                if ($deeplink ne '') {
-                    &Apache::lonnet::appenv({'request.deeplink.login' => $deeplink});
+                &Apache::lonnet::appenv({'request.linkprot' => $data{'linkprot'}});
+                if ($env{'request.linkkey'}) {
+                    &Apache::lonnet::delenv('request.linkkey');
                 }
+                my ($linkprotector,$deeplink) = split(/:/,$data{'linkprot'},2);
                 if ($env{'user.linkprotector'}) {
                     my @protectors = split(/,/,$env{'user.linkprotector'});
                     unless (grep(/^\Q$linkprotector\E$/,@protectors)) {
@@ -734,19 +764,23 @@ sub handler {
                 } else {
                     &Apache::lonnet::appenv({'user.linkproturi' => $deeplink});
                 }
-            } elsif ($data{'deeplink.login'}) {
+            } elsif ($data{'linkkey'} ne '') {
+                &Apache::lonnet::appenv({'request.linkkey' => $data{'linkkey'}});
+                if ($env{'request.linkprot'}) {
+                    &Apache::lonnet::delenv('request.linkprot');
+                }
                 my $deeplink = $data{'deeplink.login'};
-                if ($data{'linkkey'}) {
-                    my $linkkey = $data{'linkkey'};
-                    if ($env{'user.deeplinkkey'}) {
-                        my @linkkeys = split(/,/,$env{'user.deeplinkkey'});
-                        unless (grep(/^\Q$linkkey\E$/,@linkkeys)) {
-                            push(@linkkeys,$linkkey);
-                            &Apache::lonnet::appenv({'user.deeplinkkey' => join(',',sort(@linkkeys))});
-                        }
-                    } else {
-                        &Apache::lonnet::appenv({'user.deeplinkkey' => $linkkey});
+                my $linkkey = $data{'linkkey'};
+                if ($env{'user.deeplinkkey'} ne '') {
+                    my @linkkeys = split(/,/,$env{'user.deeplinkkey'});
+                    unless (grep(/^\Q$linkkey\E$/,@linkkeys)) {
+                        push(@linkkeys,$linkkey);
+                        &Apache::lonnet::appenv({'user.deeplinkkey' => join(',',sort(@linkkeys))});
                     }
+                } else {
+                    &Apache::lonnet::appenv({'user.deeplinkkey' => $linkkey});
+                }
+                if ($deeplink) {
                     if ($env{'user.keyedlinkuri'}) {
                         my @keyeduris = split(/,/,$env{'user.keyedlinkuri'});
                         unless (grep(/^\Q$deeplink\E$/,@keyeduris)) {
@@ -757,6 +791,8 @@ sub handler {
                         &Apache::lonnet::appenv({'user.keyedlinkuri' => $deeplink});
                     }
                 }
+            }
+            if ($data{'deeplink.login'}) {
                 &Apache::lonnet::appenv({'request.deeplink.login' => $data{'deeplink.login'}});
             }
             if ($data{'lti.login'}) {
@@ -836,7 +872,26 @@ sub handler {
                     }
                 }
             } elsif ($data{'origurl'} ne '') {
-                $r->internal_redirect($data{'origurl'});
+                my $dest = $data{'origurl'};
+                if (($env{'request.deeplink.login'} eq $data{'origurl'}) &&
+                    (($env{'request.linkprot'}) || ($env{'request.linkkey'} ne ''))) {
+                    my %info;
+                    if ($env{'request.linkprot'}) {
+                        $info{'linkprot'} = $env{'request.linkprot'};
+                    } elsif ($env{'request.linkkey'} ne '') {
+                        $info{'linkkey'} = $env{'request.linkkey'};
+                    }
+                    $info{'origurl'} = $data{'origurl'};
+                    if ($checklaunch) {
+                        $info{'checklaunch'} = 1;
+                    }
+                    my $token = &Apache::lonnet::tmpput(\%info,$r->dir_config('lonHostID'),'link');
+                    unless (($token eq 'con_lost') || ($token eq 'refused') ||
+                            ($token eq 'unknown_cmd') || ($token eq 'no_such_host')) {
+                        $dest .= (($dest =~ /\?/) ? '&' : '?') . 'ttoken='.$token;
+                    }
+                }
+                $r->internal_redirect($dest);
             } elsif ($env{'request.course.id'}) {
                 $r->internal_redirect('/adm/navmaps');
 	    } else {
@@ -844,7 +899,7 @@ sub handler {
 	    }
 	} else {
             my $desturl = '/adm/roles';
-            if ($data{'lti.login'}) { 
+            if ($data{'lti.login'}) {
                 if ($data{'lti.selfenrollrole'}) {
                     $desturl .= '?selectrole=1&'.
                                 &escape($data{'lti.selfenrollrole'}).'=1';
@@ -868,23 +923,27 @@ sub handler {
                         if (ref($extra_env) eq 'HASH') {
                             $extra_env->{'user.linkprotector'} = $linkprotector;
                             $extra_env->{'user.linkproturi'} = $linkuri;
+                            $extra_env->{'request.linkprot'} = $data{'linkprot'};
                         } else {
                             $extra_env = {'user.linkprotector' => $linkprotector,
-                                          'user.linkproturi' => $linkuri,};
-                        }
-                    }
-                } elsif ($data{'deeplink.login'}) {
-                    if ($data{'linkkey'}) {
-                        if (ref($extra_env) eq 'HASH') {
-                            $extra_env->{'user.deeplinkkey'} = $data{'linkkey'};
-                            $extra_env->{'user.keyedlinkuri'} = $data{'deeplink.login'},
-                        } else {
-                            $extra_env = {'user.deeplinkkey' => $data{'linkkey'},
-                                          'user.keyedlinkuri' => $data{'deeplink.login'}};
+                                          'user.linkproturi' => $linkuri,
+                                          'request.linkprot' => $data{'linkprot'}};
                         }
                     }
+                } elsif ($data{'linkkey'} ne '') {
                     if (ref($extra_env) eq 'HASH') {
-                        $extra_env->{'request.deeplink.login' => $data{'deeplink.login'}};
+                        $extra_env->{'user.deeplinkkey'} = $data{'linkkey'};
+                        $extra_env->{'user.keyedlinkuri'} = $data{'deeplink.login'};
+                        $extra_env->{'request.linkkey'} = $data{'linkkey'};
+                     } else {
+                        $extra_env = {'user.deeplinkkey' => $data{'linkkey'},
+                                      'user.keyedlinkuri' => $data{'deeplink.login'},
+                                      'request.linkkey' => $data{'linkkey'}};
+                    }
+                }
+                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'}};
                     }
@@ -899,7 +958,8 @@ sub handler {
                 }
             }
 	    &Apache::lonauth::success($r,$data{'username'},$data{'domain'},
-				      $home,$desturl,$extra_env,\%form,$skipcritical);
+				      $home,$desturl,$extra_env,\%form,$skipcritical,'',
+                                      $expirepub);
 	}
 	return OK;
     }
@@ -931,21 +991,33 @@ sub handler {
         ($env{'request.role'} eq $data{'role'}) && ($data{'origurl'} ne '')) {
         $next_url = $data{'origurl'};
         $reuse_session = 1;
+    } elsif ($data{'origurl'} =~ m{^/tiny/$match_domain/\w+$}) {
+        $next_url=$data{'origurl'};
     } else {
-        $next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1';
+        $next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1';
         if ($data{'origurl'} ne '') {
-            $next_url .= '&orgurl='.&escape($data{'origurl'});
+            $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';
+            $next_url .= '&navmap=1';
         }
     }
     if ($reuse_session) {
         $r->internal_redirect($next_url);
-    } else {
+    } 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'};
+        }
         &Apache::lonauth::success($r,$data{'username'},$data{'domain'},$home,
                                   $next_url,$extra_env,\%form,'',$cid);
     }