minor copy changes to 2 error messages

Dave Rochwerger · Dave Rochwerger · commit 082cac83bfac · 2011-09-01T16:18:05.000-07:00
diff --git a/lib/OAuth2.php b/lib/OAuth2.php
@@ -432,7 +432,7 @@ public function verifyAccessToken($token_param, $scope = NULL) {
 
     // Check we have a well formed token
     if (!isset($token["expires"]) || !isset($token["client_id"])) 
-      throw new OAuth2AuthenticateException(self::HTTP_UNAUTHORIZED, $tokenType, $realm, self::ERROR_INVALID_GRANT, 'Malformed token (missing expires or client_id)', $scope);
+      throw new OAuth2AuthenticateException(self::HTTP_UNAUTHORIZED, $tokenType, $realm, self::ERROR_INVALID_GRANT, 'Malformed token (missing "expires" or "client_id")', $scope);
       
     // Check token expiration (expires is a mandatory paramter)
     if (isset($token["expires"]) && time() > $token["expires"])
@@ -488,10 +488,10 @@ public function getBearerToken() {
       throw new OAuth2AuthenticateException(self::HTTP_BAD_REQUEST, $tokenType, $realm, self::ERROR_INVALID_REQUEST, 'Only one method may be used to authenticate at a time (Auth header, GET or POST).');
     }
     elseif ($methodsUsed == 0) {
-      throw new OAuth2AuthenticateException(self::HTTP_BAD_REQUEST, $tokenType, $realm, self::ERROR_INVALID_REQUEST, 'The bearer token was not found.');
+      throw new OAuth2AuthenticateException(self::HTTP_BAD_REQUEST, $tokenType, $realm, self::ERROR_INVALID_REQUEST, 'The access token was not found.');
     }
     
-    // HEADER: Get the bearer token from the header
+    // HEADER: Get the access token from the header
     if (!empty($headers)) {
       if (!preg_match('/'.self::TOKEN_BEARER_HEADER_NAME.'\s(\S+)/', $headers, $matches)) {
         throw new OAuth2AuthenticateException(self::HTTP_BAD_REQUEST, $tokenType, $realm, self::ERROR_INVALID_REQUEST, 'Malformed auth header');
