Merge pull request #7 from oemebamo/master

Andrew Sutherland · Andrew Sutherland · commit cf9b859c78aa · 2012-01-19T22:44:16.000-08:00
english typo and missing user_id column for auth_codes in sql
diff --git a/lib/OAuth2.php b/lib/OAuth2.php
@@ -668,7 +668,7 @@ public function grantAccessToken(array $inputData = NULL, array $authHeaders = N
         }
         
         if (empty($client[1])) {
-          throw new OAuth2ServerException(self::HTTP_BAD_REQUEST, self::ERROR_INVALID_CLIENT, 'The client_secret is mandatory for the "client_crendentials" grant type');
+          throw new OAuth2ServerException(self::HTTP_BAD_REQUEST, self::ERROR_INVALID_CLIENT, 'The client_secret is mandatory for the "client_credentials" grant type');
         }
         // NB: We don't need to check for $stored==false, because it was checked above already
         $stored = $this->storage->checkClientCredentialsGrant($client[0], $client[1]);
diff --git a/server/examples/pdo/mysql_create_tables.sql b/server/examples/pdo/mysql_create_tables.sql
@@ -3,6 +3,7 @@ SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
 CREATE TABLE `auth_codes` (
   `code` varchar(40) NOT NULL,
   `client_id` varchar(20) NOT NULL,
+  `user_id` int(11) UNSIGNED NOT NULL,
   `redirect_uri` varchar(200) NOT NULL,
   `expires` int(11) NOT NULL,
   `scope` varchar(250) DEFAULT NULL,

Original file line number	Diff line number	Diff line change
`@@ -668,7 +668,7 @@ public function grantAccessToken(array $inputData = NULL, array $authHeaders = N`
`668`	`668`	`}`
`669`	`669`
`670`	`670`	`if (empty($client[1])) {`
`671`		`- throw new OAuth2ServerException(self::HTTP_BAD_REQUEST, self::ERROR_INVALID_CLIENT, 'The client_secret is mandatory for the "client_crendentials" grant type');`
	`671`	`+ throw new OAuth2ServerException(self::HTTP_BAD_REQUEST, self::ERROR_INVALID_CLIENT, 'The client_secret is mandatory for the "client_credentials" grant type');`
`672`	`672`	`}`
`673`	`673`	`// NB: We don't need to check for $stored==false, because it was checked above already`
`674`	`674`	`$stored = $this->storage->checkClientCredentialsGrant($client[0], $client[1]);`