--- loncom/auth/migrateuser.pm 2014/10/06 00:48:44 1.23 +++ loncom/auth/migrateuser.pm 2017/11/30 15:14:51 1.26 @@ -1,7 +1,7 @@ # The LearningOnline Network # Starts a user off based of an existing token. # -# $Id: migrateuser.pm,v 1.23 2014/10/06 00:48:44 raeburn Exp $ +# $Id: migrateuser.pm,v 1.26 2017/11/30 15:14:51 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,12 +37,15 @@ use Apache::lonlocal; use Apache::lonlogin(); sub goto_login { - my ($r) = @_; + my ($r,$domain) = @_; &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; + my $url = '/adm/login'; + if ($domain) { + $url .= '?domain='.$domain; + } $r->print(&Apache::loncommon::start_page('Going to login',undef, - {'redirect' => - [0,'/adm/login'],}). + {'redirect' => [0,$url],}). '
'.&mt('Transferring to login page.').'
'. &Apache::loncommon::end_page()); @@ -50,7 +53,7 @@ sub goto_login { } -sub sso_check { +sub sso_lti_check { my ($data) = @_; my %extra_env; if (ref($data) eq 'HASH') { @@ -61,6 +64,21 @@ sub sso_check { $extra_env{'request.sso.reloginserver'} = $data->{'sso.reloginserver'}; } + if ($data->{'lti.login'}) { + $extra_env{'request.lti.login'} = $data->{'lti.login'}; + } + if ($data->{'lti.passbackid'}) { + $extra_env{'request.lti.passbackid'} = $data->{'lti.passbackid'}; + } + if ($data->{'lti.passbackurl'}) { + $extra_env{'request.lti.passbackurl'} = $data->{'lti.passbackurl'}; + } + if ($data->{'lti.rosterid'}) { + $extra_env{'request.lti.rosterid'} = $data->{'lti.rosterid'}; + } + if ($data->{'lti.rosterurl'}) { + $extra_env{'request.lti.rosterurl'} = $data->{'lti.rosterurl'}; + } } return \%extra_env; } @@ -173,10 +191,13 @@ sub ip_changed { $url .= '/adm/roles'; } else { $url .= '/adm/login'; + if ($udom) { + $url .= '?domain='.$udom; + } $message .= '