Merge branch 'dev#15293_cas_cyberlibris' into 'hotline_6.48'

Dev#15293 cas cyberlibris

See merge request !306

application/modules/opac/controllers/CasServerV10Controller.php

@@ -21,7 +21,9 @@
 class CasServerV10Controller extends CasServerController {
 	// see http://www.jasig.org/cas/protocol#validate-cas-1.0
 	public function returnValidTicketResponse($user, $ticket) {
-		$this->getResponse()->setBody('yes'.chr(10));
+		$this->getResponse()->setBody(
+			'yes'.chr(10).$user->getNomAff().'|'.$user->getLogin().chr(10)
+		);
 	}
 
 

tests/application/modules/opac/controllers/CasServerControllerTest.php

@@ -28,7 +28,9 @@ class CasServerControllerValidateActionTest extends AbstractControllerTestCase {
 		parent::setUp();
 		$user = new StdClass();
 		$user->ID_USER=300;
-		Class_Users::newInstanceWithId(300);
+		Class_Users::newInstanceWithId(300, 
+		                               ['login' => '87364',
+																	  'pseudo' => 'georges']);
 		Zend_Registry::get('cache')->save('300',
 																			md5(Zend_Session::getId().'300'));
 	}
@@ -82,11 +84,11 @@ class CasServerControllerValidateActionTest extends AbstractControllerTestCase {
 	 * see http://www.jasig.org/cas/protocol#validate-cas-1.0
 	 * @test 
 	 */
-	public function validateOnCasOneZeroWithValidTicketShouldAnswerYesLF() {
+	public function validateOnCasOneZeroWithValidTicketShouldAnswerYesLFUsernameLogin() {
 		$this->dispatch(
 			'/opac/cas-server-v10/validate?ticket=ST-'.md5(Zend_Session::getId().'300').'&service=http://test.com', 
 			true);
-		$this->assertEquals('yes'.chr(10), $this->_response->getBody());
+		$this->assertEquals('yes'.chr(10).'georges|87364'.chr(10), $this->_response->getBody());
 	}