--- loncom/lti/ltiauth.pm	2023/05/24 14:55:57	1.41
+++ loncom/lti/ltiauth.pm	2023/06/02 01:20:28	1.42
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Basic LTI Authentication Module
 #
-# $Id: ltiauth.pm,v 1.41 2023/05/24 14:55:57 raeburn Exp $
+# $Id: ltiauth.pm,v 1.42 2023/06/02 01:20:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -183,6 +183,13 @@ sub handler {
                                 $exiturl = $params->{'custom_'.$lti_in_use{'returnurl'}};
                             }
                         }
+                        my ($pbid,$pburl);
+                        if ($params->{'lis_result_sourcedid'}) {
+                            $pbid = $params->{'lis_result_sourcedid'};
+                        }
+                        if ($params->{'lis_outcome_service_url'}) {
+                            $pburl = $params->{'lis_outcome_service_url'};
+                        }
                         if (($itemid) && ($lti_in_use{'requser'})) {
                             my %courseinfo = &Apache::lonnet::coursedescription($cdom.'_'.$cnum);
                             my $ltiauth;
@@ -233,7 +240,8 @@ sub handler {
                                                 foreach my $key (%{$params}) {
                                                     delete($env{'form.'.$key});
                                                 }
-                                                &linkprot_session($r,$uname,$cnum,$cdom,$uhome,$itemid,$ltitype,$tail,$lonhost,$exiturl);
+                                                &linkprot_session($r,$uname,$cnum,$cdom,$uhome,$itemid,$ltitype,
+                                                                  $tail,$lonhost,$exiturl,$pbid,$pburl);
                                                 return OK;
                                             }
                                         }
@@ -259,6 +267,12 @@ sub handler {
                             if ($exiturl ne '') {
                                 $info{'linkprotexit'} = $exiturl; 
                             }
+                            if ($pbid ne '') {
+                                $info{'linkprotpbid'} = $pbid;
+                            }
+                            if ($pburl ne '') {
+                                $info{'linkprotpburl'} = $pburl;
+                            }
                             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') ||
@@ -442,7 +456,7 @@ sub handler {
 #
 
     my %lti;
-    my $itemid = &get_lti_itemid($requri,$hostname,$params,$cdom);
+    my $itemid = &get_lti_itemid($requri,$hostname,$params,$cdom,'','provider');
     if ($itemid) {
         %lti = &Apache::lonnet::get_domain_lti($cdom,'provider');
     }
@@ -923,9 +937,8 @@ sub lti_session {
         # login but immediately go to switch server.
         &Apache::lonauth::success($r,$uname,$udom,$uhome,'noredirect');
         if (($ltihash->{'callback'}) && ($params->{$ltihash->{'callback'}})) {
-            &LONCAPA::ltiutils::setup_logout_callback($uname,$udom,$otherserver,
-                                                      $ltihash->{'key'},
-                                                      $ltihash->{'secret'},
+            &LONCAPA::ltiutils::setup_logout_callback($cdom,$cnum,'',$itemid,$ltihash->{'cipher'},
+                                                      $uname,$udom,$otherserver,
                                                       $params->{$ltihash->{'callback'}},
                                                       $r->dir_config('ltiIDsDir'),
                                                       $protocol,$r->hostname);
@@ -998,9 +1011,8 @@ sub lti_session {
             delete($env{'form.'.$key});
         }
         if (($ltihash->{'callback'}) && ($params->{$ltihash->{'callback'}})) {
-            &LONCAPA::ltiutils::setup_logout_callback($uname,$udom,$lonhost,
-                                                      $ltihash->{'key'},
-                                                      $ltihash->{'secret'},
+            &LONCAPA::ltiutils::setup_logout_callback($cdom,$cnum,'',$itemid,$ltihash->{'cipher'},
+                                                      $uname,$udom,$lonhost,
                                                       $params->{$ltihash->{'callback'}},
                                                       $r->dir_config('ltiIDsDir'),
                                                       $protocol,$r->hostname);
@@ -1072,7 +1084,7 @@ sub lti_session {
 }
 
 sub linkprot_session {
-    my ($r,$uname,$cnum,$cdom,$uhome,$itemid,$ltitype,$dest,$lonhost,$exiturl) = @_;
+    my ($r,$uname,$cnum,$cdom,$uhome,$itemid,$ltitype,$dest,$lonhost,$exiturl,$pbid,$pburl) = @_;
     $r->user($uname);
     if ($ltitype eq 'c') {
         &Apache::lonnet::logthis("Course Link Protector ($itemid) authorized student: $uname:$cdom, course: $cdom\_$cnum");
@@ -1090,6 +1102,12 @@ sub linkprot_session {
         if ($exiturl ne '') {
             $env{'request.linkprotexit'} = $exiturl;
         }
+        if ($pbid ne '') {
+            $env{'request.linkprotpbid'} = $pbid;
+        }
+        if ($pburl ne '') {
+            $env{'request.linkprotpburl'} = $pburl;
+        }
         my $redirecturl = '/adm/switchserver';
         if ($otherserver ne '') {
             $redirecturl .= '?otherserver='.$otherserver;
@@ -1109,6 +1127,12 @@ sub linkprot_session {
                   'origurl'        => $dest,
                   'deeplink.login' => $dest,
                  );
+        if ($pbid ne '') {
+            $info{'linkprotpbid'} = $pbid;
+        }
+        if ($pburl ne '') {
+            $info{'linkprotpburl'} = $pburl;
+        }
         if ($exiturl ne '') {
             $info{'linkprotexit'} = $exiturl; 
         }