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

[raeburn]

raeburn		Thu Feb 24 00:13:54 2022 EDT

  Modified files:              
    /loncom/auth	migrateuser.pm 
  Log:
  - Bug 6907
    - When access is launched for a user from a deeplink, and user already has
      a session active, update required session information if the existing 
      session was from a different launch, or was from normal login access. 
  
  
Index: loncom/auth/migrateuser.pm
diff -u loncom/auth/migrateuser.pm:1.57 loncom/auth/migrateuser.pm:1.58
--- loncom/auth/migrateuser.pm:1.57	Sun Feb  6 21:37:04 2022
+++ loncom/auth/migrateuser.pm	Thu Feb 24 00:13:54 2022
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Starts a user off based of an existing token.
 #
-# $Id: migrateuser.pm,v 1.57 2022/02/06 21:37:04 raeburn Exp $
+# $Id: migrateuser.pm,v 1.58 2022/02/24 00:13:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -722,20 +722,14 @@
 						     $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;
-                    }
+                unless ($env{'request.linkprot'} eq $data{'linkprot'}) {
+                    $checklaunch = 1;
                 }
-                if ($env{'request.deeplink.login'}) {
-                    unless ($env{'request.deeplink.login'} eq $data{'deeplink.login'}) {
-                        $checklaunch = 1;
-                    }
+                unless ($env{'request.linkkey'} eq $data{'linkkey'}) {
+                    $checklaunch = 1;
+                }
+                unless ($env{'request.deeplink.login'} eq $data{'deeplink.login'}) {
+                    $checklaunch = 1;
                 }
             }
             if ($data{'linkprot'} ne '') {