rel #27657: Add SSO link for external url.

library/Class/Notice/Urls.php

@@ -105,14 +105,7 @@ class Class_Notice_Urls {
 
 
   protected function _get1DTouchLink() {
-    $closure = function ($datas) use (&$result) {
-      $result[] = $this->_get1DTouchLinkFor($datas);
-    };
-
-    $this->_withBlocsDo($this->_notice->get_subfield(856), $closure);
-    $result = array_filter($result);
-
-    return empty($result) ? [] : [reset($result)];
+    return [Class_OneDTouchLink::urlFor($this->_notice->getAlbum())];
   }
 
 
@@ -196,21 +189,5 @@ class Class_Notice_Urls {
 
     return $link;
   }
-
-
-  protected function _get1DTouchLinkFor($datas) {
-    $link = $type = null;
-
-    foreach ($datas as $data) {
-      if ($data['code']=='x')
-        $type = $data['valeur'];
-
-      if ($data['code']=='a')
-        $link = $data['valeur'];
-    }
-
-    return ($type == 'external_uri' && $link) ?
-      $link : null;
-  }
 }
 ?>
\ No newline at end of file

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

@@ -27,6 +27,11 @@ class RechercheControllerAlbum1DTouchTest extends AbstractControllerTestCase {
   public function setUp() {
     parent::setUp();
 
+    $this->fixture('Class_AdminVar',
+                   ['id' => 'ONEDTOUCH_ID',
+                    'clef' => 'ONEDTOUCH_ID',
+                    'valeur' => 'my_bib']);
+
     $bridges = $this->fixture('Class_Album',
                    ['id' => 74721,
                     'titre' => 'Bridges',
@@ -51,8 +56,8 @@ class RechercheControllerAlbum1DTouchTest extends AbstractControllerTestCase {
 
 
   /** @test */
-  public function externalUrlShouldTarget1Dtouch() {
-    $this->assertXPath('//a[@href="http://music.1dtouch.com/albums/1"]',
+  public function externalUrlShouldBeSSO() {
+    $this->assertXPath('//a[@href="http://music.1dtouch.com/users/auth/my_bib?dest=albums/1"]',
                        $this->_response->getBody());
   }
 }
\ No newline at end of file