--- loncom/auth/migrateuser.pm 2019/06/15 02:50:04 1.44 +++ loncom/auth/migrateuser.pm 2019/06/16 22:27:06 1.45 @@ -1,7 +1,7 @@ # The LearningOnline Network # Starts a user off based of an existing token. # -# $Id: migrateuser.pm,v 1.44 2019/06/15 02:50:04 raeburn Exp $ +# $Id: migrateuser.pm,v 1.45 2019/06/16 22:27:06 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -71,9 +71,6 @@ sub sso_check { $extra_env{'request.sso.reloginserver'} = $data->{'sso.reloginserver'}; } - if (($data->{'balancer'}) && ($data->{'server'}) && ($data->{'balcookie'})) { - $extra_env{'request.balancercookie'} = $data->{'server'}.':'.$data->{'balcookie'}; - } } return \%extra_env; } @@ -115,9 +112,6 @@ sub lti_check { if ($data->{'lti.rosterurl'}) { $lti_env{'request.lti.rosterurl'} = $data->{'lti.rosterurl'}; } - if (($data->{'balancer'}) && ($data->{'server'}) && ($data->{'balcookie'})) { - $lti_env{'request.balancercookie'} = $data->{'server'}.':'.$data->{'balcookie'}; - } } return \%lti_env; } @@ -659,6 +653,13 @@ sub handler { } elsif ((ref($lti_env) eq 'HASH') && (keys(%{$lti_env}))) { $extra_env = $lti_env; } + if (($data{'balancer'}) && ($data{'server'}) && ($data{'balcookie'})) { + if (ref($extra_env) eq 'HASH') { + $extra_env->{'request.balancercookie'} = $data{'server'}.':'.$data{'balcookie'}; + } else { + $extra_env = { 'request.balancercookie' => $data{'server'}.':'.$data{'balcookie'} }; + } + } if (($data{'conlost'}) && ($data{'server'})) { my @conlosts = split(/,/,$data{'conlost'});