Add the option to use dash instead of underscore on the key name

Author: Or

modules/restful_token_auth/plugins/authentication/RestfulAuthenticationToken.class.php

@@ -6,24 +6,55 @@
 
 class RestfulAuthenticationToken extends \RestfulAuthenticationBase {
 
+  /**
+   * Extracting the token from a request by a key name, either dashed or not.
+   *
+   * @param $param_name
+   *  The param name to check.
+   * @param array $request
+   *  The current request.
+   *
+   * @return string
+   *  The token from the request or FALSE if token isn't exists.
+   */
+  private  function extractTokenFromRequest(array $request = array(), $param_name) {
+    $key_name = !empty($param_name) ? $param_name : 'access_token';
+    $dashed_key_name = str_replace('_', '-', $key_name);
+
+    // Access token may be on the request, or in the headers
+    // (may be a with dash instead of underscore).
+    if (!empty($request['__application'][$key_name])) {
+      return $request['__application'][$key_name];
+    }
+    elseif (!empty($request[$key_name])) {
+      return $request[$key_name];
+    }
+    elseif (!empty($request['__application'][$dashed_key_name])) {
+      return $request['__application'][$dashed_key_name];
+    }
+    elseif (!empty($request[$dashed_key_name])) {
+      return $request[$dashed_key_name];
+    }
+
+    // Access token with that key name isn't exists.
+    return FALSE;
+  }
+
   /**
    * {@inheritdoc}
    */
   public function applies(array $request = array(), $method = \RestfulInterface::GET) {
     $options = $this->getPluginKey('options');
-    $key_name = !empty($options['param_name']) ? $options['param_name'] : 'access_token';
 
-    // Access token may be on the request, or in the headers.
-    return !empty($request['__application'][$key_name]) || !empty($request[$key_name]);
+    return $this->extractTokenFromRequest($request, $options['param_name']);
   }
 
   /**
    * {@inheritdoc}
    */
   public function authenticate(array $request = array(), $method = \RestfulInterface::GET) {
     $options = $this->getPluginKey('options');
-    $key_name = !empty($options['param_name']) ? $options['param_name'] : 'access_token';
-    $token = !empty($request['__application'][$key_name]) ? $request['__application'][$key_name] : $request[$key_name];
+    $token = $this->extractTokenFromRequest($request, $options['param_name']);
 
     // Check if there is a token that did not expire yet.
 

modules/restful_token_auth/tests/RestfulTokenAuthenticationTestCase.test

@@ -91,6 +91,11 @@ class RestfulTokenAuthenticationTestCase extends DrupalWebTestCase {
     $result = $response[0];
     $this->assertEqual($result['label'], $title1, 'Article resource can be accessed with valid access token.');
 
+    // Get a "protected" resource with the dashed access token .
+    $response = $handler->get($id, array('access-token' => $access_token));
+    $result = $response[0];
+    $this->assertEqual($result['label'], $title1, 'Article resource can be accessed with valid (dashed) access token.');
+
     // Set the expiration token to the past.
     $query = new \EntityFieldQuery();
     $result = $query