--- loncom/auth/migrateuser.pm	2022/09/17 23:38:50	1.66
+++ loncom/auth/migrateuser.pm	2024/02/09 20:08:17	1.68
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Starts a user off based of an existing token.
 #
-# $Id: migrateuser.pm,v 1.66 2022/09/17 23:38:50 raeburn Exp $
+# $Id: migrateuser.pm,v 1.68 2024/02/09 20:08:17 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -289,7 +289,7 @@ sub ip_changed {
                     'username'        => $dataref->{'username'},
                     'sessionserver'   => $lonhost,
                   );
-        my @names = ('origurl','symb','role','linkprotuser','linkprotexit','linkprot','linkkey');
+        my @names = ('origurl','symb','role','linkprotuser','linkprotexit','linkprot','linkkey','linkprotpbid','linkprotpburl');
         foreach my $name (@names) {
             if ($dataref->{$name} ne '') {
                 $info{$name} = $dataref->{$name};
@@ -752,7 +752,7 @@ sub handler {
 	if ($handle) {
 	    &Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'),
 						     $handle);
-            my $checklaunch;
+            my ($checklaunch,$prevlaunch);
             if ($data{'origurl'} =~ m{^/tiny/$match_domain/\w+$}) {
                 unless ($env{'request.linkprot'} eq $data{'linkprot'}) {
                     $checklaunch = 1;
@@ -760,6 +760,12 @@ sub handler {
                 unless ($env{'request.linkprotexit'} eq $data{'linkprotexit'}) {
                     $checklaunch = 1;
                 }
+                unless ($env{'request.linkprotpbid'} eq $data{'linkprotpbid'}) {
+                    $checklaunch = 1;
+                }
+                unless ($env{'request.linkprotpburl'} eq $data{'linkprotpburl'}) {
+                    $checklaunch = 1;
+                }
                 unless ($env{'request.linkkey'} eq $data{'linkkey'}) {
                     $checklaunch = 1;
                 }
@@ -771,7 +777,7 @@ sub handler {
                 if (($env{'user.name'} ne $data{'username'}) ||
                     ($env{'user.domain'} ne $data{'domain'})) {
                     my %linkprot_env;
-                    foreach my $item ('linkprot','linkprotexit','deeplink.login') {
+                    foreach my $item ('linkprot','linkprotexit','linkprotpbid','linkprotpburl','deeplink.login') {
                         if ($data{$item}) {
                             $linkprot_env{$item} = $data{$item};
                         }
@@ -836,6 +842,9 @@ sub handler {
                 }
             }
             if ($data{'deeplink.login'}) {
+                if (($env{'request.deeplink.login'}) && ($env{'request.deeplink.login'} ne $data{'deeplink.login'})) {
+                    $prevlaunch = $env{'request.deeplink.login'};
+                }
                 &Apache::lonnet::appenv({'request.deeplink.login' => $data{'deeplink.login'}});
             }
             if ($data{'lti.login'}) {
@@ -921,7 +930,7 @@ sub handler {
                     my %info;
                     if ($env{'request.linkprot'}) {
                         $info{'linkprot'} = $env{'request.linkprot'};
-                        foreach my $item ('linkprotuser','linkprotexit') {
+                        foreach my $item ('linkprotuser','linkprotexit','linkprotpbid','linkprotpburl') {
                             if ($data{$item}) {
                                 $info{$item} = $data{$item};
                             }
@@ -932,6 +941,7 @@ sub handler {
                     $info{'origurl'} = $data{'origurl'};
                     if ($checklaunch) {
                         $info{'checklaunch'} = 1;
+                        $info{'prevlaunch'} = $prevlaunch;
                     }
                     my $token = &Apache::lonnet::tmpput(\%info,$r->dir_config('lonHostID'),'link');
                     unless (($token eq 'con_lost') || ($token eq 'refused') || ($token =~ /^error:/) ||
@@ -980,8 +990,14 @@ sub handler {
                         if ($data{'linkprotexit'}) {
                             $extra_env->{'request.linkprotexit'} = $data{'linkprotexit'};
                         }
+                        if ($data{'linkprotpbid'}) {
+                            $extra_env->{'request.linkprotpbid'} = $data{'linkprotpbid'};
+                        }
+                        if ($data{'linkprotpburl'}) {
+                            $extra_env->{'request.linkprotpburl'} = $data{'linkprotpburl'};
+                        }
                     }
-                    foreach my $item ('linkprotuser','linkprotexit') {
+                    foreach my $item ('linkprotuser','linkprotexit','linkprotpbid','linkprotpburl') {
                         if ($data{$item} ne '') {
                             $form{$item} = $data{$item};
                         }
@@ -1093,7 +1109,13 @@ sub handler {
                 if ($data{'linkprotexit'}) {
                     $extra_env->{'request.linkprotexit'} = $data{'linkprotexit'};
                 }
-                foreach my $item ('linkprotuser','linkprotexit') {
+                if ($data{'linkprotpbid'}) {
+                    $extra_env->{'request.linkprotpassbid'} = $data{'linkprotpbid'};
+                }
+                if ($data{'linkprotpburl'}) {
+                    $extra_env->{'request.linkprotpassburl'} = $data{'linkprotpburl'};
+                }
+                foreach my $item ('linkprotuser','linkprotexit','linkprotpbid','linkprotpburl') {
                     if ($data{$item}) {
                         $form{'request.'.$item} = $data{$item};
                     }