dev #59718 test fix

application/modules/api/controllers/UserController.php

@@ -20,23 +20,23 @@
  */
 
 
-class Api_UserController extends Zend_Controller_Action {
+class Api_UserController extends ZendAfi_Controller_Action {
   public function loansAction() {
     if (!$this->_request->isSecure())
-      return $this->_error('Use HTTPS, not ' . $this->_request->getScheme());
+      return $this->_error($this->_('Protocole HTTP obligatoire'));
 
     if (!$authorization = $this->_request->getHeader('authorization'))
-      return $this->_error('Authorization not provided');
+      return $this->_error($this->_('Autorisation non spécifiée'));
 
     $parts = explode(' ', $authorization);
     if ($parts[0] !== 'Bearer')
-      return $this->_error('Bearer not provided');
+      return $this->_error($this->_('Jeton d\'autorisation non fourni'));
 
     if (!$token = Class_User_ApiToken::findFirstBy(['token' => $parts[1]]))
-      return $this->_error('Invalid authorization token');
+      return $this->_error($this->_('Jeton d\'autorisation invalide'));
 
     if (!$user = $token->getUser())
-      return $this->_error('User not found');
+      return $this->_error($this->_('Utilisateur non trouvé'));
 
     $this->view->loans = (new Class_User_Cards($user))->getLoans();
   }

library/Class/User/ApiToken.php

@@ -20,7 +20,6 @@
  */
 class User_ApiTokenLoader extends Storm_Model_Loader {
   public function findOrCreateForUserAndApplication($user, $client_id) {
-    xdebug_break();
     if ($token = Class_User_ApiToken::findFirstBy(['role' => 'user',
                                                    'model' => $user,
                                                    'client_id' => $client_id]))

tests/scenarios/MobileApplication/UserAccountTest.php

@@ -120,7 +120,7 @@ class Scenario_MobileApplication_UserAccountWithoutTokenTest extends Scenario_Mo
                     ["Content-Type" => "application/json"]);
 
     $this->assertEquals(['error' => 'invalid_request',
-                         'message' => 'Authorization not provided'],
+                         'message' => 'Autorisation non spécifiée'],
                         json_decode($this->_response->getBody(), true));
   }
 
@@ -133,7 +133,7 @@ class Scenario_MobileApplication_UserAccountWithoutTokenTest extends Scenario_Mo
                      "Content-Type" => "application/json"]);
 
     $this->assertEquals(['error' => 'invalid_request',
-                         'message' => 'Bearer not provided'],
+                         'message' => 'Jeton d\'autorisation non fourni'],
                         json_decode($this->_response->getBody(), true));
   }
 
@@ -146,7 +146,7 @@ class Scenario_MobileApplication_UserAccountWithoutTokenTest extends Scenario_Mo
                      "Content-Type" => "application/json"]);
 
     $this->assertEquals(['error' => 'invalid_request',
-                         'message' => 'Invalid authorization token'],
+                         'message' => 'Jeton d\'autorisation invalide'],
                         json_decode($this->_response->getBody(), true));
   }
 
@@ -164,7 +164,7 @@ class Scenario_MobileApplication_UserAccountWithoutTokenTest extends Scenario_Mo
                      "Content-Type" => "application/json"]);
 
     $this->assertEquals(['error' => 'invalid_request',
-                         'message' => 'User not found'],
+                         'message' => 'Utilisateur non trouvé'],
                         json_decode($this->_response->getBody(), true));
   }
 
@@ -179,7 +179,7 @@ class Scenario_MobileApplication_UserAccountWithoutTokenTest extends Scenario_Mo
                      "Content-Type" => "application/json"]);
 
     $this->assertEquals(['error' => 'invalid_request',
-                         'message' => 'Use HTTPS, not http'],
+                         'message' => 'Protocole HTTP obligatoire'],
                         json_decode($this->_response->getBody(), true));
   }
 }