--- loncom/lti/ltiauth.pm	2022/06/26 04:03:48	1.38
+++ loncom/lti/ltiauth.pm	2022/06/30 21:04:14	1.39
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Basic LTI Authentication Module
 #
-# $Id: ltiauth.pm,v 1.38 2022/06/26 04:03:48 raeburn Exp $
+# $Id: ltiauth.pm,v 1.39 2022/06/30 21:04:14 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -175,6 +175,14 @@ sub handler {
                                 }
                             }
                         }
+                        my $exiturl;
+                        if (($itemid) && ($lti_in_use{'returnurl'} ne '')) {
+                            if (exists($params->{$lti_in_use{'returnurl'}})) {
+                                $exiturl = $params->{$lti_in_use{'returnurl'}};
+                            } elsif (exists($params->{'custom_'.$lti_in_use{'returnurl'}})) {
+                                $exiturl = $params->{'custom_'.$lti_in_use{'returnurl'}};
+                            }
+                        }
                         if (($itemid) && ($lti_in_use{'requser'})) {
                             my %courseinfo = &Apache::lonnet::coursedescription($cdom.'_'.$cnum);
                             my $ltiauth;
@@ -225,7 +233,7 @@ sub handler {
                                                 foreach my $key (%{$params}) {
                                                     delete($env{'form.'.$key});
                                                 }
-                                                &linkprot_session($r,$uname,$cnum,$cdom,$uhome,$itemid,$ltitype,$tail,$lonhost);
+                                                &linkprot_session($r,$uname,$cnum,$cdom,$uhome,$itemid,$ltitype,$tail,$lonhost,$exiturl);
                                                 return OK;
                                             }
                                         }
@@ -248,6 +256,9 @@ sub handler {
                             if ($ltiuser ne '') {
                                 $info{'linkprotuser'} = $ltiuser;
                             }
+                            if ($exiturl ne '') {
+                                $info{'linkprotexit'} = $exiturl; 
+                            }
                             my $ltoken = &Apache::lonnet::tmpput(\%info,$lonhost,'link');
                             if (($ltoken eq 'con_lost') || ($ltoken eq 'refused') || ($ltoken =~ /^error:/) ||
                                 ($ltoken eq 'unknown_cmd') || ($ltoken eq 'no_such_host') ||
@@ -1061,7 +1072,7 @@ sub lti_session {
 }
 
 sub linkprot_session {
-    my ($r,$uname,$cnum,$cdom,$uhome,$itemid,$ltitype,$dest,$lonhost) = @_;
+    my ($r,$uname,$cnum,$cdom,$uhome,$itemid,$ltitype,$dest,$lonhost,$exiturl) = @_;
     $r->user($uname);
     if ($ltitype eq 'c') {
         &Apache::lonnet::logthis("Course Link Protector ($itemid) authorized student: $uname:$cdom, course: $cdom\_$cnum");
@@ -1076,6 +1087,9 @@ sub linkprot_session {
         $env{'request.linkprot'} = $itemid.$ltitype.':'.$dest;
         $env{'request.linkprotuser'} = $uname.':'.$cdom;
         $env{'request.deeplink.login'} = $dest;
+        if ($exiturl ne '') {
+            $env{'request.linkprotexit'} = $exiturl;
+        }
         my $redirecturl = '/adm/switchserver';
         if ($otherserver ne '') {
             $redirecturl .= '?otherserver='.$otherserver;
@@ -1095,6 +1109,9 @@ sub linkprot_session {
                   'origurl'        => $dest,
                   'deeplink.login' => $dest,
                  );
+        if ($exiturl ne '') {
+            $info{'linkprotexit'} = $exiturl; 
+        }
         my $token = &Apache::lonnet::tmpput(\%info,$lonhost);
         $env{'form.token'} = $token;
         $r->internal_redirect('/adm/migrateuser');