updating for I2 usage

internet2 · Mar 24, 2023 · 06e0845 · 06e0845
1 parent 34e01d0
commit 06e0845
Showing 1 changed file with 5 additions and 48 deletions.
diff --git a/Controller/GrouperGroupsController.php b/Controller/GrouperGroupsController.php
@@ -773,17 +773,16 @@ function isAuthorized()
 
     //TODO - This is needed for my dev enviro since I do not log in via I2 IdP
     // BEGIN ===============================================
-    if ($this->Session->check('Auth.User.username')) {
-      $this->userId = $this->Session->read('Auth.User.username');
-    }
+//    if ($this->Session->check('Auth.User.username')) {
+//      $this->userId = $this->Session->read('Auth.User.username');
+//    }
     // END ===============================================
 
     //TODO - Need to make the following code configurable in getting the user ID. In this case the code is
     // specific to the needs of I2.
     // BEGIN ===============================================
 
-<<<<<<< Updated upstream
-    /*$uid=$this->Session->read('Auth.User.co_person_id');
+    $uid=$this->Session->read('Auth.User.co_person_id');
     $username=$this->Session->read('Auth.User.username');
     error_log("HUBING ================ " . $username);
 
@@ -823,49 +822,7 @@ function isAuthorized()
       $this->Session->write('Plugin.Grouper.UserId', $this->userId);
     }
     // END ===============================================
-    */
-=======
-//    $uid=$this->Session->read('Auth.User.co_person_id');
-//    $username=$this->Session->read('Auth.User.username');
-//    error_log("HUBING ================ " . $username);
-//
-//    switch ($username) {
-//      case "chubing@internet2.edu":
-//        error_log("username is " . $username);
-//        $uid=32;
-//        break;
-//      case "pcaskey@internet2.edu":
-//        error_log("username is " . $username);
-//        $uid=28;
-//        break;
-//      case "ij@internet2.edu":
-//        error_log("username is " . $username);
-//        $uid=6842;
-//        break;
-//      case "aaschenbrener@internet2.edu":
-//        error_log("username is " . $username);
-//        $uid=13643;
-//        // 12430 in dev
-//        break;
-//      case "sho@internet2.edu":
-//        error_log("username is " . $username);
-//        $uid=6103;
-//        break;
-//      case "wkaufman@internet2.edu":
-//        error_log("username is " . $username);
-//        $uid=6830;
-//        break;
-//    }
-//    error_log("UID IS  ================ " . $uid);
-//
-//    if ($this->Session->check('Plugin.Grouper.UserId')) {
-//      $this->userId = $this->Session->read('Plugin.Grouper.UserId');
-//    } else {
-//      $this->userId = $this->getUserId($uid);
-//      $this->Session->write('Plugin.Grouper.UserId', $this->userId);
-//    }
-    // END ===============================================
->>>>>>> Stashed changes
+
 
     // Determine what operations this user can perform
     // Construct the permission set for this user, which will also be passed to the view.