Code review updates

ubccr · Jan 17, 2019 · f9f3151 · f9f3151
1 parent 34a731f
commit f9f3151
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/classes/Authentication/SAML/XDSamlAuthentication.php b/classes/Authentication/SAML/XDSamlAuthentication.php
@@ -31,13 +31,6 @@ class XDSamlAuthentication
      */
     protected $_sources = null;
 
-    /**
-     * Whether or not SAML is configured. Defaults to false.
-     *
-     * @var boolean
-     */
-    protected $_isConfigured = null;
-
     const BASE_ADMIN_EMAIL = <<<EML
 
 Person Details -----------------------------------
@@ -93,10 +86,7 @@ public function __construct()
      */
     public function isSamlConfigured()
     {
-        if($this->_isConfigured === null){
-            $this->_isConfigured = (count($this->_sources));
-        }
-        return $this->_isConfigured;
+        return !empty($this->_sources);
     }
 
     /**

diff --git a/classes/XDSessionManager.php b/classes/XDSessionManager.php
@@ -138,7 +138,10 @@ public static function logoutUser($token = "")
             $auth = new Authentication\SAML\XDSamlAuthentication();
             $auth->logout();
         } catch (InvalidArgumentException $ex) {
-         // This will catch when a configuration directory does not exist if it is set in the environment level
+          // This will catch when apache or nginx have been set up
+          // to to have an alternate saml configuration directory
+          // that does not exist, so we ignore it as saml isnt set
+          // up and we dont have to do anything with it
         }
     }
 

diff --git a/html/gui/general/login.php b/html/gui/general/login.php
@@ -9,7 +9,10 @@
 try {
     $auth = new Authentication\SAML\XDSamlAuthentication();
 } catch (InvalidArgumentException $ex) {
- // This will catch when a configuration directory does not exist if it is set in the environment level
+    // This will catch when apache or nginx have been set up
+    // to to have an alternate saml configuration directory
+    // that does not exist, so we ignore it as saml isnt set
+    // up and we dont have to do anything with it
 }
 try {
     if ($auth && $auth->isSamlConfigured()) {