--- loncom/auth/migrateuser.pm	2022/02/07 12:05:05	1.25.2.5.2.2
+++ loncom/auth/migrateuser.pm	2018/11/24 16:19:04	1.35
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Starts a user off based of an existing token.
 #
-# $Id: migrateuser.pm,v 1.25.2.5.2.2 2022/02/07 12:05:05 raeburn Exp $
+# $Id: migrateuser.pm,v 1.35 2018/11/24 16:19:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,26 +30,31 @@ package Apache::migrateuser;
 
 use strict;
 use LONCAPA qw(:DEFAULT :match);
-use Apache::Constants qw(:common :http :methods :remotehost);
+use Apache::Constants qw(:common :http :methods);
 use Apache::lonauth;
 use Apache::lonnet;
 use Apache::lonlocal;
 use Apache::lonlogin();
+use Apache::ltiauth;
 use CGI::Cookie;
 
 sub goto_login {
-    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,$url],}).
-	      '<h1>'.&mt('One moment please...').'</h1>'.
-	      '<p>'.&mt('Transferring to login page.').'</p>'.
-	      &Apache::loncommon::end_page());
+    my ($r,$domain,$data) = @_;
+    if ((ref($data) eq 'HASH') && ($data->{'lti.login'})) {
+        &Apache::ltiauth::invalid_request($r,'22');
+    } else {
+        &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,$url],}).
+	          '<h1>'.&mt('One moment please...').'</h1>'.
+	          '<p>'.&mt('Transferring to login page.').'</p>'.
+	          &Apache::loncommon::end_page());
+    }
     return OK;
 }
 
@@ -64,10 +69,54 @@ 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;
 }
 
+sub lti_check {
+    my ($data) = @_;
+    my %lti_env;
+    if (ref($data) eq 'HASH') {
+        if ($data->{'lti.login'}) {
+            $lti_env{'request.lti.login'} = $data->{'lti.login'};
+            if ($data->{'lti.reqcrs'}) {
+                $lti_env{'request.lti.reqcrs'} = $data->{'lti.reqcrs'};
+            }
+            if ($data->{'lti.reqrole'}) {
+                $lti_env{'request.lti.reqrole'} = $data->{'lti.reqrole'};
+            }
+            if ($data->{'lti.selfenrollrole'}) {
+                $lti_env{'request.lti.selfenrollrole'} = $data->{'lti.selfenrollrole'};
+            }
+            if ($data->{'lti.uri'}) {
+                $lti_env{'request.lti.uri'} = $data->{'lti.uri'};
+            }
+            if ($data->{'lti.target'}) {
+                $lti_env{'request.lti.target'} = $data->{'lti.target'};
+            }
+            if ($data->{'lti.sourcecrs'}) {
+                $lti_env{'request.lti.sourcecrs'} = $data->{'lti.sourcecrs'};
+            }
+        }
+        if ($data->{'lti.passbackid'}) {
+            $lti_env{'request.lti.passbackid'} = $data->{'lti.passbackid'};
+        }
+        if ($data->{'lti.passbackurl'}) {
+            $lti_env{'request.lti.passbackurl'} = $data->{'lti.passbackurl'};
+        }
+        if ($data->{'lti.rosterid'}) {
+            $lti_env{'request.lti.rosterid'} = $data->{'lti.rosterid'};
+        }
+        if ($data->{'lti.rosterurl'}) {
+            $lti_env{'request.lti.rosterurl'} = $data->{'lti.rosterurl'};
+        }
+    }
+    return \%lti_env;
+}
+
 sub ip_changed {
     my ($r,$udom,$camefrom,$dataref) = @_;
     &Apache::loncommon::content_type($r,'text/html');
@@ -161,8 +210,6 @@ sub ip_changed {
                 if ($hostname) {
                     my $protocol = $Apache::lonnet::protocol{$switchto};
                     $protocol = 'http' if ($protocol ne 'https');
-                    my $alias = &Apache::lonnet::use_proxy_alias($r,$switchto);
-                    $hostname = $alias if ($alias ne '');
                     $url = $protocol.'://'.$hostname;
                     if ($rule_in_effect eq 'balancer') {
                         $message .= '<br />'.
@@ -191,17 +238,19 @@ sub ip_changed {
         my %info= (
                     'domain'          => $udom,
                     'username'        => $dataref->{'username'},
+                    'role'            => $dataref->{'role'},
                     'sessionserver'   => $lonhost,
                   );
-        my @names = ('origurl','symb','role','linkprot','linkkey');
-        foreach my $name (@names) {
-            if ($dataref->{$name} ne '') {
-                $info{$name} = $dataref->{$name};
-            }
+        if ($dataref->{'origurl'}) {
+            $info{'origurl'} = $dataref->{'origurl'};
+        }
+        if ($dataref->{'symb'}) {
+            $info{'symb'} = $dataref->{'symb'};
         }
-        my $iptoken = &Apache::lonnet::tmpput(\%info,$switchto,'link');
+        my $iptoken = &Apache::lonnet::tmpput(\%info,$switchto);
         unless ($iptoken eq 'conlost') {
-            $url .= (($url =~ /\?/) ? '&' : '?') . 'iptoken='.$iptoken;
+            $url .= ($url =~ /\?/) ? '&' : '?';
+            $url .= 'iptoken='.$iptoken;
         }
         $r->print(&Apache::loncommon::start_page($title,undef,
                                                  {'redirect' =>
@@ -216,7 +265,7 @@ sub ip_changed {
 }
 
 sub logout {
-    my ($r,$ip,$handle,$data,$lti_env) = @_;
+    my ($r,$handle,$data,$lti_env) = @_;
     my $lonidsdir=$r->dir_config('lonIDsDir');
     if (unlink("$lonidsdir/$handle.id")) {
         if (($env{'user.linkedenv'} =~ /^[a-f0-9]+_linked$/) &&
@@ -230,7 +279,7 @@ sub logout {
     &Apache::lonnet::log($env{'user.domain'},
                          $env{'user.name'},
                          $env{'user.home'},
-                         "Logout $ip");
+                         "Logout $ENV{'REMOTE_ADDR'}");
 
     &Apache::loncommon::content_type($r,'text/html');
 
@@ -245,18 +294,13 @@ sub logout {
     }
     my (%info,%user_info,%lti_info);
     if (ref($lti_env) eq 'HASH') {
-        foreach my $key (sort(keys(%{$lti_env}))) {
-            if ($key =~ /^request\.(.+)$/) {
-                $lti_info{$1} = $lti_env->{$key};
-            }
-        }
+        %lti_info = %{$lti_env};
     }
     my $lonhost = $r->dir_config('lonHostID');
     if (ref($data) eq 'HASH') {
-        %user_info=('ip'       => $ip,
+        %user_info=('ip'       => $ENV{'REMOTE_ADDR'},
                     'domain'   => $data->{'domain'},
                     'username' => $data->{'username'},
-                    'home'     => $data->{'home'},
                     'role'     => $data->{'role'},
                     'origurl'  => $data->{'origurl'},
                     'symb'     => $data->{'symb'},
@@ -271,20 +315,18 @@ sub logout {
                                        {'redirect'       => [0.1,$url],
                                         'only_body'      => 1,}).
         &Apache::loncommon::end_page());
-    if ($env{'request.balancercookie'}) {
-        my ($balancer,$cookie) = split(/:/,$env{'request.balancercookie'});
-        if ((&Apache::lonnet::hostname($balancer)) && ($cookie =~ /^[a-f0-9]{32}$/)) {
-            $cookie = $env{'user.domain'}.'_'.$env{'user.name'}.'_'.$cookie;
-            &Apache::lonnet::delbalcookie($cookie,$balancer);
-        }
-    }
     $r->register_cleanup(\&flush_course_logs);
     return;
 }
 
+sub flush_course_logs {
+    &Apache::lonnet::flushcourselogs();
+    return OK;
+}
+
 sub handler {
     my ($r) = @_;
-
+    
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token']);
     my %data =   &Apache::lonnet::tmpget($env{'form.token'});
     if (keys(%data) == 0) {
@@ -295,16 +337,15 @@ sub handler {
     &Apache::lonlocal::get_language_handle($r);
 
     if ($delete ne 'ok') {
-	return &goto_login($r);
+	return &goto_login($r,undef,\%data);
     }
 
     if (!defined($data{'username'}) || !defined($data{'domain'})) {
-        return &goto_login($r);
+        return &goto_login($r,undef,\%data);
     }
-    my $ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP); 
-    if ($data{'ip'} ne $ip) {
+    if ($data{'ip'} ne $ENV{'REMOTE_ADDR'}) {
         &Apache::lonnet::logthis('IP change when session migration requested -- was: '.
-                 $data{'ip'}.'; now: '.$ip.' for '.$data{'username'}.':'.$data{'domain'});
+                 $data{'ip'}.'; now: '.$ENV{'REMOTE_ADDR'}.' for '.$data{'username'}.':'.$data{'domain'});
 	return &ip_changed($r,$data{'domain'},$data{'server'},\%data);
     }
 
@@ -314,32 +355,19 @@ sub handler {
     if (&Apache::lonnet::domain($data{'domain'})) {
         $udom=$data{'domain'};
     }
-    if ($home =~ /(con_lost|no_such_host)/) { return &goto_login($r,$udom); }
+    if ($home =~ /(con_lost|no_such_host)/) { return &goto_login($r,$udom,\%data); }
 
-    my $extra_env = &sso_check(\%data);
-    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'} };
-        }
-    } elsif (($data{'server'}) && ($data{'otherbalcookie'})) {
-        my ($balancer,$balcookie) = split(/:/,$data{'otherbalcookie'});
-        if (defined(&Apache::lonnet::hostname($balancer)) && $balcookie =~ /^[a-f0-9]{32}$/) {
-            my $baldom = &Apache::lonnet::host_domain($balancer);
-            if (&Apache::lonnet::shared_institution($baldom)) {
-                my $cookieid = join('_',$udom,$data{'username'},$balcookie);
-                &Apache::lonnet::updatebalcookie($cookieid,$balancer,$data{'server'});
-                if (ref($extra_env) eq 'HASH') {
-                    $extra_env->{'request.balancercookie'} = $data{'otherbalcookie'};
-                } else {
-                    $extra_env = { 'request.balancercookie' => $data{'otherbalcookie'} };
-                }
-            }
-        }
+    my $sso_env = &sso_check(\%data);
+    my $lti_env = &lti_check(\%data);
+
+    my $extra_env;
+    if ((ref($sso_env) eq 'HASH') && (keys(%{$sso_env}))) {
+        $extra_env = $sso_env;
+    } elsif ((ref($lti_env) eq 'HASH') && (keys(%{$lti_env}))) {
+        $extra_env = $lti_env;
     }
 
-    my (%form,$cid);
+    my %form;
     if ($data{'symb'} ne '') {
         $form{'symb'} = $data{'symb'};
     }
@@ -349,137 +377,90 @@ sub handler {
     if ($data{'noloadbalance'} ne '') {
         $form{'noloadbalance'} = $data{'noloadbalance'};
     }
-    if ($data{'role'}) {
-        if ($data{'role'} =~ m{\./($match_domain)/($match_courseid)(?:/\w+|$)}) {
-            unless (&Apache::lonnet::homeserver($2,$1) eq 'no_host') {
-                $cid = $1.'_'.$2;
-            }
-        }
-    } else {
-        my ($handle,$expirepub);
-        $handle = &Apache::lonnet::check_for_valid_session($r);
 
-# For "public user" - remove any existing "public" cookie so actual user is logged in.
-        if ($handle) {
-            if ($handle=~/^publicuser\_/) {
-                my $lonidsdir=$r->dir_config('lonIDsDir');
-                if ($lonidsdir ne '') {
-                    unlink("$lonidsdir/$handle.id");
-                }
-                undef($handle);
-                $expirepub = 1;
-            }
-        }
+    if (!$data{'role'}) {
+	my $handle = &Apache::lonnet::check_for_valid_session($r);
 	if ($handle) {
 	    &Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'),
 						     $handle);
-            my $checklaunch;
-            if ($data{'origurl'} =~ m{^/tiny/$match_domain/\w+$}) {
-                if ($env{'request.linkprot'} ne '') {
-                     unless ($env{'request.linkprot'} eq $data{'linkprot'}) {
-                         $checklaunch = 1;
-                     }
-                }
-                if ($env{'request.linkkey'} ne '') {
-                    unless ($env{'request.linkkey'} eq $data{'linkkey'}) {
-                        $checklaunch = 1;
-                    }
-                }
-                if ($env{'request.deeplink.login'}) {
-                    unless ($env{'request.deeplink.login'} eq $data{'deeplink.login'}) {
-                        $checklaunch = 1;
-                    }
-                }
-            }
-            if ($data{'linkprot'} ne '') {
-                if (($env{'user.name'} ne $data{'username'}) ||
-                    ($env{'user.domain'} ne $data{'domain'})) {
-                    my %linkprot_env;
-                    foreach my $item ('linkprot','deeplink.login') {
-                        if ($data{$item}) {
-                            $linkprot_env{'request.'.$item} = $data{$item};
-                        }
-                    }
-                    &logout($r,$ip,$handle,\%data,\%linkprot_env);
-                    return OK;
-                }
-                &Apache::lonnet::appenv({'request.linkprot' => $data{'linkprot'}});
-                if ($env{'request.linkkey'}) {
-                    &Apache::lonnet::delenv('request.linkkey');
-                }
-                my ($linkprotector,$deeplink) = split(/:/,$data{'linkprot'},2);
-                if ($env{'user.linkprotector'}) {
-                    my @protectors = split(/,/,$env{'user.linkprotector'});
-                    unless (grep(/^\Q$linkprotector\E$/,@protectors)) {
-                        push(@protectors,$linkprotector);
-                        @protectors = sort { $a <=> $b } @protectors;
-                        &Apache::lonnet::appenv({'user.linkprotector' => join(',',@protectors)});
-                    }
-                } else {
-                    &Apache::lonnet::appenv({'user.linkprotector' => $linkprotector });
-                }
-                if ($env{'user.linkproturi'}) {
-                    my @proturis = split(/,/,$env{'user.linkproturi'});
-                    unless(grep(/^\Q$deeplink\E$/,@proturis)) {
-                        push(@proturis,$deeplink);
-                        @proturis = sort @proturis;
-                        &Apache::lonnet::appenv({'user.linkproturi' => join(',',@proturis)});
+            if ($data{'lti.login'}) {
+                my $needslogout;
+                if ($env{'request.lti.login'}) {
+                    if (($env{'user.name'} ne $data{'username'}) ||
+                        ($env{'user.domain'} ne $data{'domain'})) {
+                        $needslogout = 1;
                     }
                 } else {
-                    &Apache::lonnet::appenv({'user.linkproturi' => $deeplink});
+                    $needslogout = 1;
                 }
-            } elsif ($data{'linkkey'} ne '') {
-                &Apache::lonnet::appenv({'request.linkkey' => $data{'linkkey'}});
-                if ($env{'request.linkprot'}) {
-                    &Apache::lonnet::delenv('request.linkprot');
-                }
-                my $deeplink = $data{'deeplink.login'};
-                my $linkkey = $data{'linkkey'};
-                if ($env{'user.deeplinkkey'} ne '') {
-                    my @linkkeys = split(/,/,$env{'user.deeplinkkey'});
-                    unless (grep(/^\Q$linkkey\E$/,@linkkeys)) {
-                        push(@linkkeys,$linkkey);
-                        &Apache::lonnet::appenv({'user.deeplinkkey' => join(',',sort(@linkkeys))});
-                    }
+# If access is via LTI, and user already has a non-LTI session cookie 
+# (and session) or has an LTI session cookie for a different username,
+# logout the existing session, and start a new one
+                if ($needslogout) {
+                    &logout($r,$handle,\%data,$lti_env);
+                } elsif (($data{'lti.reqcrs'}) && ($data{'lti.reqrole'} eq 'cc')) {
+                    $form{'lti.reqcrs'} = $data{'lti.reqcrs'};
+                    $form{'lti.reqrole'} = $data{'lti.reqrole'};
+                    $form{'lti.sourcecrs'} = $data{'lti.sourcecrs'};
+                    $form{'lti.uri'} = $data{'lti.uri'};
+                    if ($data{'lti.passbackid'}) {
+                        $form{'lti.passbackid'} = $data{'lti.passbackid'};
+                    }
+                    if ($data{'lti.passbackurl'}) {
+                        $form{'lti.passbackurl'} = $data{'lti.passbackurl'};
+                    }
+                    if ($data{'lti.rosterid'}) {
+                        $form{'lti.rosterid'} = $data{'lti.rosterid'};
+                    }
+                    if ($data{'lti.rosterurl'}) {
+                        $form{'lti.rosterurl'} = $data{'lti.rosterurl'};
+                    }
+                    if ($data{'lti.target'}) {
+                        $form{'lti.target'} = $data{'lti.target'};
+                    }
+                    &Apache::loncommon::content_type($r,'text/html');
+                    $r->send_http_header;
+                    &Apache::ltiauth::lti_reqcrs($r,$data{'domain'},\%form,$data{'username'},$data{'domain'});
                 } else {
-                    &Apache::lonnet::appenv({'user.deeplinkkey' => $linkkey});
-                }
-                if ($deeplink) {
-                    if ($env{'user.keyedlinkuri'}) {
-                        my @keyeduris = split(/,/,$env{'user.keyedlinkuri'});
-                        unless (grep(/^\Q$deeplink\E$/,@keyeduris)) {
-                            push(@keyeduris,$deeplink);
-                            &Apache::lonnet::appenv({'user.keyedlinkuri' => join(',',sort(@keyeduris))});
+                    if (ref($lti_env) eq 'HASH') {
+                        delete($lti_env->{'reqcrs'});
+                        delete($lti_env->{'reqrole'});
+                        delete($lti_env->{'selfenrollrole'});
+                    }
+                    if ($data{'lti.selfenrollrole'}) {
+                        if (&Apache::ltiauth::lti_enroll($data{'username'},$data{'domain'},
+                                                         $data{'lti.selfenrollrole'}) eq 'ok') {
+                            my $url = '/adm/roles?selectrole=1&'.
+                                      &escape($data{'lti.selfenrollrole'}).'=1';
+                            if ($data{'origurl'} =~ m{/default_\d+\.sequence$}) {
+                                $url .= '&orgurl='.$data{'origurl'}.'&navmap=1';
+                            } elsif ($data{'origurl'} ne '') {
+                                $url .= '&orgurl='.$data{'origurl'};
+                            }
+                            if (ref($lti_env) eq 'HASH') {
+                                &Apache::lonnet::appenv($lti_env);
+                            }
+                            $r->internal_redirect($url);
+                        } else {
+                            &Apache::ltiauth::invalid_request($r,23);
+                        }
+                    } elsif ($data{'origurl'} ne '') {
+                        my $url = $data{'origurl'};
+                        if ($url =~ m{/default_\d+\.sequence$}) {
+                            $url .= (($url =~/\?/)?'&':'?').'navmap=1';
+                        }
+                        if (ref($lti_env) eq 'HASH') {
+                            &Apache::lonnet::appenv($lti_env);
                         }
+                        $r->internal_redirect($url);
                     } else {
-                        &Apache::lonnet::appenv({'user.keyedlinkuri' => $deeplink});
-                    }
-                }
-            }
-            if ($data{'deeplink.login'}) {
-                &Apache::lonnet::appenv({'request.deeplink.login' => $data{'deeplink.login'}});
-            }
-            if ($data{'origurl'} ne '') {
-                my $dest = $data{'origurl'};
-                if (($env{'request.deeplink.login'} eq $data{'origurl'}) &&
-                    (($env{'request.linkprot'}) || ($env{'request.linkkey'} ne ''))) {
-                    my %info;
-                    if ($env{'request.linkprot'}) {
-                        $info{'linkprot'} = $env{'request.linkprot'};
-                    } elsif ($env{'request.linkkey'} ne '') {
-                        $info{'linkkey'} = $env{'request.linkkey'};
-                    }
-                    $info{'origurl'} = $data{'origurl'};
-                    if ($checklaunch) {
-                        $info{'checklaunch'} = 1;
-                    }
-                    my $token = &Apache::lonnet::tmpput(\%info,$r->dir_config('lonHostID'),'link');
-                    unless (($token eq 'con_lost') || ($token eq 'refused') ||
-                            ($token eq 'unknown_cmd') || ($token eq 'no_such_host')) {
-                        $dest .= (($dest =~ /\?/) ? '&' : '?') . 'ttoken='.$token;
+                        if (ref($lti_env) eq 'HASH') {
+                            &Apache::lonnet::appenv($lti_env);
+                        }
                     }
                 }
-                $r->internal_redirect($dest);
+            } elsif ($data{'origurl'} ne '') {
+                $r->internal_redirect($data{'origurl'});
             } elsif ($env{'request.course.id'}) {
                 $r->internal_redirect('/adm/navmaps');
 	    } else {
@@ -489,63 +470,36 @@ sub handler {
             my $desturl = '/adm/roles';
             if ($data{'origurl'} ne '') {
                 $desturl = $data{'origurl'};
-                if ($data{'linkprot'}) {
-                    my ($linkprotector,$linkuri) = split(/:/,$data{'linkprot'},2);
-                    if ($linkprotector) {
-                        if (ref($extra_env) eq 'HASH') {
-                            $extra_env->{'user.linkprotector'} = $linkprotector;
-                            $extra_env->{'user.linkproturi'} = $linkuri;
-                            $extra_env->{'request.linkprot'} = $data{'linkprot'};
-                        } else {
-                            $extra_env = {'user.linkprotector' => $linkprotector,
-                                          'user.linkproturi' => $linkuri,
-                                          'request.linkprot' => $data{'linkprot'}};
-                        }
-                    }
-                } elsif ($data{'linkkey'}) {
-                    if (ref($extra_env) eq 'HASH') {
-                        $extra_env->{'user.deeplinkkey'} = $data{'linkkey'};
-                        $extra_env->{'user.keyedlinkuri'} = $data{'deeplink.login'};
-                        $extra_env->{'request.linkkey'} = $data{'linkkey'};
-                     } else {
-                        $extra_env = {'user.deeplinkkey' => $data{'linkkey'},
-                                      'user.keyedlinkuri' => $data{'deeplink.login'},
-                                      'request.linkkey' => $data{'linkkey'}};
-                    }
-                }
-                if ($data{'deeplink.login'}) {
-                    if (ref($extra_env) eq 'HASH') {
-                        $extra_env->{'request.deeplink.login'} = $data{'deeplink.login'};
-                    } else {
-                        $extra_env = {'request.deeplink.login' => $data{'deeplink.login'}};
+                if ($data{'lti.login'}) {
+                    $desturl = $data{'origurl'};
+                    if ($desturl =~ m{/default_\d+\.sequence$}) {
+                        $desturl .= (($desturl =~/\?/)?'&':'?').'navmap=1';
                     }
                 }
             }
+            my $skipcritical;
+            if (($data{'lti.login'}) && ($data{'lti.reqcrs'}) &&
+                ($data{'lti.reqrole'} eq 'cc')) {
+                $skipcritical = 1;
+            }
 	    &Apache::lonauth::success($r,$data{'username'},$data{'domain'},
-				      $home,$desturl,$extra_env,\%form,'',
-                                      $expirepub);
+				      $home,$desturl,$extra_env,\%form,$skipcritical);
 	}
 	return OK;
     }
 
-    my $next_url='/adm/roles?selectrole=1&amp;'.&escape($data{'role'}).'=1';
+    my $next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1';
     if ($data{'origurl'} ne '') {
-        $next_url .= '&amp;orgurl='.&escape($data{'origurl'});
-    }
-    if ($data{'deeplink.login'}) {
-        if (ref($extra_env) eq 'HASH') {
-            $extra_env->{'request.deeplink.login'} = $data{'deeplink.login'};
-        } else {
-            $extra_env = {'request.deeplink.login' => $data{'deeplink.login'}};
-        }
-        if ($data{'linkprot'}) {
-            $extra_env->{'request.linkprot'} = $data{'linkprot'};
-        } elsif ($data{'linkkey'} ne '') {
-            $extra_env->{'request.linkkey'} = $data{'linkkey'};
+        $next_url .= '&orgurl='.&escape($data{'origurl'});
+        if ($data{'lti.login'}) {
+            if (($data{'origurl'} =~ m{/default_\d+\.sequence$}) ||
+                ($data{'origurl'} =~ m{^/res/.+\.sequence$})) {
+                $next_url .= '&navmap=1';
+            }
         }
     }
     &Apache::lonauth::success($r,$data{'username'},$data{'domain'},$home,
-			      $next_url,$extra_env,\%form,$cid);
+			      $next_url,$extra_env,\%form);
     return OK;
 }