Commit 494a0b8c authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Passage à phpCas 1.6

parent 5f33ffae

composer.json

+5 −5
Original line number Diff line number Diff line
@@ -8,10 +8,10 @@ 
        }

    ],

    "require": {

      "unicaen/app": ">=6.2",

        "unicaen/app": "^6.0|^7.0",

        "unicaen/utilisateur": "^6.3|^7.0",

        "unicaen/bjy-authorize": "^6.0",

      "apereo/phpcas": "1.5.*",

        "apereo/phpcas": "1.6.*",

        "ramsey/uuid": "^3.7"

    },

    "require-dev": {

src/UnicaenAuthentification/Authentication/Adapter/Cas.php

+13 −1
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ class Cas extends AbstractAdapter 
     */

    private $router;



    private string $serviceBaseUrl;





    /**

     * @param RouteInterface $router

     */
@@ -176,7 +179,8 @@ class Cas extends AbstractAdapter 
        }



        // initialize phpCAS

        $this->casClient->client($options['version'], $options['hostname'], $options['port'], $options['uri'], true);

        $this->casClient->client($options['version'], $options['hostname'], $options['port'], $options['uri'], $this->serviceBaseUrl,true);



        // no SSL validation for the CAS server

        $this->casClient->setNoCasServerValidation();
@@ -265,4 +269,12 @@ class Cas extends AbstractAdapter 
            ],

        ]);

    }







    public function setServiceBaseUrl(string $serviceBaseUrl): void

    {

        $this->serviceBaseUrl = $serviceBaseUrl;

    }



}
 
 No newline at end of file

src/UnicaenAuthentification/Authentication/Adapter/CasAdapterFactory.php

+6 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ namespace UnicaenAuthentification\Authentication\Adapter; 


use Interop\Container\ContainerInterface;

use Laminas\Authentication\Storage\Session;

use Laminas\View\Helper\ServerUrl;

use UnicaenApp\Mapper\Ldap\People as LdapPeopleMapper;

use UnicaenAuthentification\Options\ModuleOptions;

use UnicaenAuthentification\Service\User;
@@ -61,5 +62,10 @@ class CasAdapterFactory 
        /** @var LdapPeopleMapper $ldapPeopleMapper */

        $ldapPeopleMapper = $container->get('ldap_people_mapper');

        $adapter->setLdapPeopleMapper($ldapPeopleMapper);



        /** @var ServerUrl $serverUrl */

        $serverUrl = $container->get('ViewHelperManager')->get('ServerUrl');



        $adapter->setServiceBaseUrl($serverUrl());

    }

}
 
 No newline at end of file