Automated Drupal 10 compatibility fixes

More work required, getting the following error when attempting to save settings form:

Error: Non-static method SimpleSAML\Utils\HTTP::checkURLAllowed() cannot be called statically in Drupal\drupalauth4ssp\Form\SettingsForm->validateForm() (line 70 of /var/www/html/web/modules/contrib/drupalauth4ssp/src/Form/SettingsForm.php).

Upgrade Status report of https://git.drupalcode.org/issue/drupalauth4ssp-3287081/-/tree/3287081-a...

CONTRIBUTED PROJECTS
--------------------------------------------------------------------------------
DrupalAuth for SimpleSAMLphp
Scanned on Wed, 02/15/2023 - 22:12.

2 warnings found.

web/modules/contrib/drupalauth4ssp/src/EventSubscriber/DrupalAuthForSSPSubscribe
r.php:
┌──────────┬──────┬─────────────────────────────────────────────────────────────┐
│  STATUS  │ LINE │                           MESSAGE                           │
├──────────┼──────┼─────────────────────────────────────────────────────────────┤
│ Check    │ 54   │ Call to deprecated method stopPropagation() of class        │
│ manually │      │ Symfony\Component\EventDispatcher\Event: since Symfony 4.3, │
│          │      │ use "Symfony\Contracts\EventDispatcher\Event" instead       │
│          │      │                                                             │
│ Check    │ 64   │ Call to deprecated method stopPropagation() of class        │
│ manually │      │ Symfony\Component\EventDispatcher\Event: since Symfony 4.3, │
│          │      │ use "Symfony\Contracts\EventDispatcher\Event" instead       │
│          │      │                                                             │
└──────────┴──────┴─────────────────────────────────────────────────────────────┘

Tested on local and it seems working.

D10 requires PHP8, which in turn requires drupalauth/simplesamlphp-module-drupalauth dependency be updated to ^1.9

This means, if we want older versions of this module to continue to support D8/D9 and PHP7, we probably want this to be a new major release, aka 2.0

see ✨ composer.json need to upgrade for support php8 Fixed

@shivam_tiwari you didn't need to create a new merge request for this, your MR removes the commits of all previous contributors, I have added your change to my MR with attribution to you.

everyone.. Please review MR!6

I have tried to install this module with Drupal 10, but I have met too many conflicts even though I used drupalauth/simplesamlphp-module-drupalauth with version 1.9.

Did anyone install this module on Drupal 10 successfully?

@guaneagler Add the following sections to your composer file repositories section:

    "repositories": {
        "drupalauth/simplesamlphp-module-drupalauth": {
            "type": "git",
            "url": "https://github.com/Realityloop/simplesamlphp-module-drupalauth.git"
        },
        "simplesamlphp/simplesamlphp": {
            "type": "git",
            "url": "https://github.com/Realityloop/simplesamlphp.git"
        }
    },

Then use the following require command:
composer require drupal/drupalauth4ssp:dev-3287081-automated-drupal-10 drupalauth/simplesamlphp-module-drupalauth simplesamlphp/simplesamlphp

If you are also using drupal/simple_oauth you will get stuck on a dependency version constraint.

Hi @realityloop,

I have tried with the command you provided to install the drupalauth4ssp module
composer require drupal/drupalauth4ssp:dev-3287081-automated-drupal-10
But I got the error below, it seems like composer can't find the branch, even though I can see it from the repository.

  Problem 1
    - Root composer.json requires drupal/drupalauth4ssp dev-3287081-automated-drupal-10, found drupal/drupalauth4ssp[dev-idp_logout, dev-8.x-1.x, 2.x-dev] but it does not match the constraint.

Hi @realityloop,

I can see that you fork two repositories for the two libraries, and you change the composer info there, did you try if it works on Drupal 10?

For the simplesamlphp/simplesamlphp, I can see from another project that the official library has the version of dev-simplesamlphp-2.1 which support the drupal 10 ( https://www.drupal.org/project/simplesamlphp_auth/issues/3380262 📌 Support SimpleSAMLphp 2.1 release Fixed ). Do you think that we can use that version?

For #18, just found that the branch is on the issue repository https://git.drupalcode.org/issue/drupalauth4ssp-3287081.git, not the module repository. I know why it doesn't work now.

I have tested MR !6, There are still few issues.
Attaching screen shot.

@guaneagler yes I am using it on a D10 project that's in development

@keshav the error you describe may be due to you using an older version of Drupal or symfony.
On Drupal 10.1.4 and symfony 6.3, the Symfony\Component\HttpKernel\Event\ResponseEvent implements Symfony\Contracts\EventDispatcher\StoppableEventInterface

@realityloop 2 things:

1. are you planning to take on maintenance of simplesamlphp-module-drupalauth ?
I see your PR, and looks like the upstream project has gone stagnant...

2. your suggested composer config works for me to get the packages set up (haven't actually been able to test the SSO yet though), here's a slightly more minimal version:

    "repositories": {
        "drupal": {
            "type": "composer",
            "url": "https://packages.drupal.org/8",
            "exclude": [
                "drupal/drupalauth4ssp"
            ]
        },
        "drupal/drupalauth4ssp": {
            "type": "git",
            "url": "https://git.drupalcode.org/issue/drupalauth4ssp-3287081.git"
        },
        "drupalauth/simplesamlphp-module-drupalauth": {
            "type": "git",
            "url": "https://github.com/Realityloop/simplesamlphp-module-drupalauth.git"
        }
    },

"require": {
        "drupal/drupalauth4ssp": "dev-3287081-automated-drupal-10",
        "drupalauth/simplesamlphp-module-drupalauth": "^1.9@dev",
        "simplesamlphp/simplesamlphp": "dev-simplesamlphp-2.1",

OK, finally got my config updated and usable, and able to review the functionality.

Cross-posting from drupalauth github:
I'm getting an error when testing in version simplesamlphp/simplesamlphp:dev-simplesamlphp-2.1

Caused by: Exception: Could not resolve 'drupalauth:External': The class 'SimpleSAML\Module\drupalauth\Auth\Source\External' isn't a subclass of '\SimpleSAML\Auth\Source'.

Which is weird, because SimpleSAML\Module\drupalauth\Auth\Source\External is definitely a subclass of SimpleSAML\Auth\Source

stack trace:

SimpleSAML\Error\Error: UNHANDLEDEXCEPTION
Backtrace:
2 public/_include.php:28 (SimpleSAML_exception_handler)
1 vendor/symfony/error-handler/ErrorHandler.php:537 (Symfony\Component\ErrorHandler\ErrorHandler::handleException)
0 [builtin] (N/A)
Caused by: Exception: Could not resolve 'drupalauth:External': The class 'SimpleSAML\Module\drupalauth\Auth\Source\External' isn't a subclass of '\SimpleSAML\Auth\Source'.
Backtrace:
8 src/SimpleSAML/Module.php:459 (SimpleSAML\Module::resolveClass)
7 src/SimpleSAML/Auth/Source.php:313 (SimpleSAML\Auth\Source::parseAuthSource)
6 src/SimpleSAML/Auth/Source.php:356 (SimpleSAML\Auth\Source::getById)
5 src/SimpleSAML/Auth/Simple.php:62 (SimpleSAML\Auth\Simple::getAuthSource)
4 src/SimpleSAML/Auth/Simple.php:151 (SimpleSAML\Auth\Simple::login)
3 [builtin] (call_user_func_array)
2 src/SimpleSAML/HTTP/RunnableResponse.php:68 (SimpleSAML\HTTP\RunnableResponse::sendContent)
1 vendor/symfony/http-foundation/Response.php:423 (Symfony\Component\HttpFoundation\Response::send)
0 public/module.php:24 (N/A)
            

Update - in the drupalauth/simplesamlphp-module-drupalauth package: renaming lib directory to src resolves this issue.

@AaronBauman I've just merged that PR, cheers.

We have code in our composer.json to handle the autoloading that I'd mistakenly not included in my pastes above.

I can also confirm we have working saml implementation on our build now..

Awesome, thanks!
I've got my D10 IDP up and running, but still don't have an SP to actually test SSO.
Will report back when I get that going

Drupal 10 compatible version 2.0.0-rc1 was just released.

Please test and report back any issues.

Automatically closed - issue fixed for 2 weeks with no activity.

RoSk0 → closed merge request !6

RoSk0 → closed merge request !7