[LON-CAPA-cvs] cvs: loncom /auth migrateuser.pm

[raeburn]

raeburn		Tue Mar 29 19:12:04 2022 EDT

  Modified files:              
    /loncom/auth	migrateuser.pm 
  Log:
  - Modify rev. 1.52 changes so session migration can continue to be supported
    in non-deeplink cases.
  
  
Index: loncom/auth/migrateuser.pm
diff -u loncom/auth/migrateuser.pm:1.58 loncom/auth/migrateuser.pm:1.59
--- loncom/auth/migrateuser.pm:1.58	Thu Feb 24 00:13:54 2022
+++ loncom/auth/migrateuser.pm	Tue Mar 29 19:12:04 2022
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Starts a user off based of an existing token.
 #
-# $Id: migrateuser.pm,v 1.58 2022/02/24 00:13:54 raeburn Exp $
+# $Id: migrateuser.pm,v 1.59 2022/03/29 19:12:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1012,16 +1012,18 @@
     }
     if ($reuse_session) {
         $r->internal_redirect($next_url);
-    } elsif ($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'};
+    } else {
+        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'};
+            }
         }
         &Apache::lonauth::success($r,$data{'username'},$data{'domain'},$home,
                                   $next_url,$extra_env,\%form,'',$cid);