Merge pull request #1 from csingletwd/drupalauth#90Support-simplesamlphp-2.x

drupalauth#90: Support simplesamlphp 2.x

Author: csingletwd

README.md

@@ -131,3 +131,24 @@ Configure the authentication source by putting following code into `simplesamlph
     ),
 ),
 ```
+in composer.json add these repos:
+{
+"name": "drupal/drupalauth4ssp",
+"type": "git",
+"url": "https://git.drupalcode.org/issue/drupalauth4ssp-3287081.git"
+},
+{
+"name": "drupalauth/simplesamlphp-module-drupalauth",
+"type": "git",
+"url": "https://github.com/csingletwd/simplesamlphp-module-drupalauth.git"
+},
+
+
+and require section looks like this:
+
+        "drupal/drupalauth4ssp": "dev-3287081-automated-drupal-10",
+        "drupal/memcache": "^2.5",
+        "drupal/simplesamlphp_auth": "4.x-dev@dev",
+        "drupalauth/simplesamlphp-module-drupalauth": "1.9.x-dev",
+        "drush/drush": "^12.x-dev",
+        "simplesamlphp/simplesamlphp": "dev-simplesamlphp-2.1"

composer.json

@@ -21,8 +21,8 @@
     }
   ],
   "require": {
-    "php": "^5.6.0|^7.0|^8.0",
-    "simplesamlphp/simplesamlphp": "~1.0",
+    "php": "^5.6.0|^7.0|^8.0|^8.1",
+    "simplesamlphp/simplesamlphp": "dev-simplesamlphp-2.1",
     "simplesamlphp/composer-module-installer": "~1.0"
   },
   "require-dev": {
@@ -34,7 +34,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "1.8.x-dev"
+      "dev-master": "1.9.x-dev"
     }
   }
 }

lib/Auth/Source/External.php renamed to src/Auth/Source/External.php

@@ -13,6 +13,8 @@
 use SimpleSAML\Module\drupalauth\ConfigHelper;
 use SimpleSAML\Module\drupalauth\DrupalHelper;
 use SimpleSAML\Utils\HTTP;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 
 /**
  * Drupal authentication source for SimpleSAMLphp using Drupal's login page.
@@ -169,7 +171,7 @@ private function getUser()
      *
      * @param array &$state  Information about the current authentication.
      */
-    public function authenticate(&$state)
+    public function authenticate(array &$state): void
     {
         assert(is_array($state));
 
@@ -235,14 +237,10 @@ public function authenticate(&$state)
          * Note the 'ReturnTo' parameter. This must most likely be replaced with
          * the real name of the parameter for the login page.
          */
-        HTTP::redirectTrustedURL($authPage, [
+        $http_utils = new HTTP();
+        $http_utils->redirectTrustedURL($authPage, [
             'ReturnTo' => $returnTo,
         ]);
-
-        /*
-         * The redirect function never returns, so we never get this far.
-         */
-        assert(false);
     }
 
     /**
@@ -327,7 +325,7 @@ public static function resume()
      *
      * @param array &$state  The logout state array.
      */
-    public function logout(&$state)
+    public function logout(array &$state): void
     {
         assert(is_array($state));
 
@@ -347,6 +345,7 @@ public function logout(&$state)
             $parameters['ReturnTo'] = $state['ReturnTo'];
         }
 
-        HTTP::redirectTrustedURL($logout_url, $parameters);
+        $http_utils = new HTTP();
+        $http_utils->redirectTrustedURL($logout_url, $parameters);
     }
 }

lib/Auth/Source/UserPass.php renamed to src/Auth/Source/UserPass.php

@@ -93,7 +93,8 @@ public function __construct($config, $location)
         $this->drupal_login_url = $config->getString('drupal_login_url', null);
 
         $this->cookie_path = Configuration::getInstance()->getBasePath();
-        $this->cookie_salt = Config::getSecretSalt();
+        $config_utils = new Config();
+        $this->cookie_salt = $config_utils->getSecretSalt();
     }