--- loncom/interface/lonexttool.pm	2017/12/30 19:51:30	1.15
+++ loncom/interface/lonexttool.pm	2022/03/29 20:12:46	1.23
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Launch External Tool Provider (LTI)
 #
-# $Id: lonexttool.pm,v 1.15 2017/12/30 19:51:30 raeburn Exp $
+# $Id: lonexttool.pm,v 1.23 2022/03/29 20:12:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -110,10 +110,9 @@ sub handler {
                                            width  => $toolsettings{'width'},
                                            height => $toolsettings{'height'},
                                        };
-                $toolhash{'crslabel'} = $toolsettings{'crslabel'};
-                $toolhash{'crstitle'} = $toolsettings{'crstitle'};
-                $toolhash{'crsappend'} = $toolsettings{'crsappend'};
-                $toolhash{'gradable'} = $toolsettings{'gradable'};
+                foreach my $item (qw(crslabel crstitle crsappend gradable)) {
+                    $toolhash{$item} = $toolsettings{$item};
+                }
                 $is_tool = 1;
             }
         }
@@ -225,7 +224,7 @@ sub lti_params {
     my ($r,$cnum,$cdom,$idx,$submittext,$toolsref) = @_;
     my ($version,$context_type,$msgtype,$toolname,$passback,$roster,$locale,
         $crslabel,$crstitle,$gradesecret,$rostersecret,%fields,%rolesmap,
-        %display,%custom,@userlangs);
+        %display,%custom,@userlangs,$incdom);
     if (ref($toolsref) eq 'HASH') {
         $version = $toolsref->{'version'};
         $toolname = $toolsref->{'title'};
@@ -234,6 +233,7 @@ sub lti_params {
         $roster = $toolsref->{'roster'};
         $rostersecret = $toolsref->{'rostersecret'};
         $msgtype = $toolsref->{'messagetype'};
+        $incdom = $toolsref->{'incdom'};
         if (ref($toolsref->{'fields'}) eq 'HASH') {
             %fields = %{$toolsref->{'fields'}};
         }
@@ -259,10 +259,10 @@ sub lti_params {
         $msgtype = 'basic-lti-launch-request';
     }
     if ($crslabel eq '') {
-        $crslabel = $env{'course.'.$env{'request.course.id'}.'.internal.coursecode'},
+        $crslabel = $env{'course.'.$env{'request.course.id'}.'.internal.coursecode'};
     }
     if ($crstitle eq '') {
-        $crstitle = $env{'course.'.$env{'request.course.id'}.'.description'},;
+        $crstitle = $env{'course.'.$env{'request.course.id'}.'.description'};
     }
     my $lonhost = $r->dir_config('lonHostID');
     my $loncaparev = $r->dir_config('lonVersion');
@@ -274,8 +274,10 @@ sub lti_params {
     unless (grep(/^\Q$ltirole\E$/,@possroles)) {
         $ltirole = 'Learner';
     }
-    my $digest_user = &Encode::decode_utf8($uname.':'.$udom);
+    my @possdigest;
+    my $digest_user = &Encode::decode('UTF-8',$uname.':'.$udom);
     $digest_user = &Digest::SHA::sha1_hex($digest_user);
+    push(@possdigest,$digest_user);
     if ($env{'course.'.$env{'request.course.id'}.'.languages'} ne '') {
         @userlangs=(@userlangs,split(/\s*(\,|\;|\:)\s*/,
                     $env{'course.'.$env{'request.course.id'}.'.languages'}));
@@ -296,8 +298,9 @@ sub lti_params {
     my ($title,$digest_symb);
     my ($symb) = &Apache::lonnet::whichuser();
     if ($symb) {
-        $digest_symb = &Encode::decode_utf8($symb);
+        $digest_symb = &Encode::decode('UTF-8',$symb);
         $digest_symb = &Digest::SHA::sha1_hex($digest_symb);
+        push(@possdigest,$digest_symb);
         my $navmap = Apache::lonnavmaps::navmap->new();
         if (ref($navmap)) {
             my $res = $navmap->getBySymb($symb);
@@ -309,7 +312,7 @@ sub lti_params {
     my $domdesc = &Apache::lonnet::domain($cdom);
     my $primary_id = &Apache::lonnet::domain($cdom,'primary');
     my $int_dom = &Apache::lonnet::internet_dom($primary_id);
-    my $portal_url = &Apache::lonnet::course_portal_url($cnum,$cdom);
+    my $portal_url = &Apache::lonnet::course_portal_url($cnum,$cdom,$r);
 
     my %ltiparams = (
         lti_version                            => $version,
@@ -319,7 +322,7 @@ sub lti_params {
         tool_consumer_instance_guid            => $lonhost,
         tool_consumer_instance_description     => $domdesc,
         tool_consumer_info_product_family_code => 'loncapa',
-        tool_consumer_instance_name            => $int_dom,  
+        tool_consumer_instance_name            => $int_dom,
         tool_consumer_instance_url             => $portal_url,
         tool_consumer_info_version             => $loncaparev,
         user_id                                => $digest_user,
@@ -338,12 +341,17 @@ sub lti_params {
             $crsprotocol = 'http';
         }
         if (($passback) || ($roster)) {
+            my (%currdigest,%digesthash);
+            if (@possdigest) {
+                %currdigest = &Apache::lonnet::get('exttools',\@possdigest,
+                                                   $cdom,$cnum);
+            }
             if ($passback) {
                 $ltiparams{'lis_outcome_service_url'} = $crsprotocol.'://'.$crshostname.'/adm/service/passback';
                 $ltiparams{'ext_ims_lis_basic_outcome_url'} = $ltiparams{'lis_outcome_service_url'};
                 if ($gradesecret) {
                     my $uniqid = $digest_symb.':::'.$digest_user.':::'.$env{'request.course.id'};
-                    $ltiparams{'lis_result_sourcedid'} = &LONCAPA::ltiutils::get_service_id($gradesecret,$uniqid); 
+                    $ltiparams{'lis_result_sourcedid'} = &LONCAPA::ltiutils::get_service_id($gradesecret,$uniqid);
                 }
             }
             if ($roster) {
@@ -355,18 +363,15 @@ sub lti_params {
                     }
                 }
             }
-            my %digesthash;
-            if ($ltiparams{'lis_result_sourcedid'}) {
-                $digesthash{$ltiparams{'lis_result_sourcedid'}} = "$idx\0".time; 
-            }
-            if ($ltiparams{'ext_ims_lis_memberships_id'}) {
-                $digesthash{$ltiparams{'ext_ims_lis_memberships_id'}} = "$idx\0".time; 
-            }
             if (($digest_symb) && ($gradesecret || $rostersecret)) {
-                $digesthash{$digest_symb} = $symb;
+                unless ((exists($currdigest{$digest_symb})) && ($currdigest{$digest_symb} eq $symb)) {
+                    $digesthash{$digest_symb} = $symb;
+                }
             }
             if (($passback) && ($gradesecret)) {
-                $digesthash{$digest_user} = $uname.':'.$udom;
+                unless ((exists($currdigest{$digest_user})) && ($currdigest{$digest_user} eq $uname.':'.$udom)) {
+                    $digesthash{$digest_user} = $uname.':'.$udom;
+                }
             }
             if (keys(%digesthash)) {
                 &Apache::lonnet::put('exttools',\%digesthash,$cdom,$cnum);
@@ -403,7 +408,11 @@ sub lti_params {
         $ltiparams{'lis_person_contact_email_primary'} = $contact_email;
     }
     if ($fields{'user'}) {
-        $ltiparams{'lis_person_sourcedid'} = $uname.':'.$udom;
+        if ($incdom) {
+            $ltiparams{'lis_person_sourcedid'} = $uname.':'.$udom;
+        } else {
+            $ltiparams{'lis_person_sourcedid'} = $uname;
+        }
     }
     if (keys(%custom)) {
         foreach my $key (keys(%custom)) {
@@ -418,7 +427,7 @@ sub lti_params {
         }
     }
     foreach my $key (keys(%ltiparams)) {
-        $ltiparams{$key} = &Encode::decode_utf8($ltiparams{$key});
+        $ltiparams{$key} = &Encode::decode('UTF-8',$ltiparams{$key});
     }
     $ltiparams{'basiclti_submit'} = $submittext;
     return %ltiparams;
@@ -426,7 +435,7 @@ sub lti_params {
 
 sub launch_html {
     my ($url,$key,$secret,$sigmethod,$submittext,$paramsref) = @_;
-    my $hashref = &LONCAPA::ltiutils::sign_params($url,$key,$secret,$sigmethod,$paramsref);
+    my $hashref = &LONCAPA::ltiutils::sign_params($url,$key,$secret,$paramsref,$sigmethod);
     my $action = &HTML::Entities::encode($url,'<>&"');
     my $form = <<"END";
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -474,10 +483,7 @@ sub gradabletool_access_check {
         @targets = ('web');
     }
     foreach my $target (@targets) {
-        undef(%Apache::lonhomework::results);
-        undef(%Apache::lonhomework::history);
-        %Apache::lonhomework::history =
-            &Apache::lonnet::restore($symb,$courseid,$udom,$uname);
+        &Apache::structuretags::initialize_storage($symb);
         &Apache::lonhomework::set_show_problem_status(&Apache::lonnet::EXT('resource.0.problemstatus'));
         my ($accessmsg,$slot_name,$slot,$ipused);
         ($status,$accessmsg,$slot_name,$slot,$ipused) =
@@ -508,6 +514,9 @@ sub gradabletool_access_check {
                 }
             }
         }
+        if (keys(%Apache::lonhomework::results)) {
+            &Apache::structuretags::finalize_storage();
+        }
     }
     return ($status,$result,$resource_due);
 }