redCOMPONENT-COM / redCORE

extensions/components/com_redcore/admin/layouts/sidebar.bs3.php

Indentation +1 added lines, -1 removed lines

@@ -115,7 +115,7 @@
 		</div>
 		<div id="rc-sidebar-accordion-payments"
 		     class="panel-collapse collapse<?php echo in_array($view, array('payments', 'payment_configurations', 'payment_dashboards', 'payment_logs')) ?
-			     ' in' : '';?>">
+				 ' in' : '';?>">
 			<ul class="list-group">
 				<li class="list-group-item">
 					<a href="<?php echo JRoute::_('index.php?option=com_redcore&view=payment_dashboard') ?>">

extensions/libraries/redcore/database/sqlparser/lexersplitter.php

Indentation +14 added lines, -14 removed lines

@@ -41,21 +41,21 @@
 
 class RDatabaseSqlparserLexersplitter {
 
-    private static $splitters = array("\r\n", "!=", ">=", "<=", "<>", ":=", "\\", "&&", ">", "<", "|", "=", "^", "(",
-                                      ")", "\t", "\n", "'", "\"", "`", ",", "@", " ", "+", "-", "*", "/", ";");
-    private $tokenSize;
-    private $hashSet;
+	private static $splitters = array("\r\n", "!=", ">=", "<=", "<>", ":=", "\\", "&&", ">", "<", "|", "=", "^", "(",
+									  ")", "\t", "\n", "'", "\"", "`", ",", "@", " ", "+", "-", "*", "/", ";");
+	private $tokenSize;
+	private $hashSet;
 
-    public function __construct() {
-        $this->tokenSize = strlen(self::$splitters[0]); # should be the largest one
-        $this->hashSet = array_flip(self::$splitters);
-    }
+	public function __construct() {
+		$this->tokenSize = strlen(self::$splitters[0]); # should be the largest one
+		$this->hashSet = array_flip(self::$splitters);
+	}
 
-    public function getMaxLengthOfSplitter() {
-        return $this->tokenSize;
-    }
+	public function getMaxLengthOfSplitter() {
+		return $this->tokenSize;
+	}
 
-    public function isSplitter($token) {
-        return isset($this->hashSet[$token]);
-    }
+	public function isSplitter($token) {
+		return isset($this->hashSet[$token]);
+	}
 }

extensions/libraries/redcore/database/sqlparser/sqlparserutils.php

Indentation +13 added lines, -13 removed lines

@@ -141,18 +141,18 @@
 		'UTC_TIME', 'UTC_TIMESTAMP', 'UUID', 'VAR_POP', 'VAR_SAMP', 'VARIANCE',
 		'VERSION', 'WEEK', 'WEEKDAY', 'WEEKOFYEAR', 'YEAR', 'YEARWEEK');
 
-    /**
-     * Ends the given string $haystack with the string $needle?
-     * @param string $haystack
-     * @param string $needle
-     */
-    protected function endsWith($haystack, $needle) {
-        $length = strlen($needle);
-        if ($length == 0) {
-            return true;
-        }
+	/**
+	 * Ends the given string $haystack with the string $needle?
+	 * @param string $haystack
+	 * @param string $needle
+	 */
+	protected function endsWith($haystack, $needle) {
+		$length = strlen($needle);
+		if ($length == 0) {
+			return true;
+		}
 
-        $start = $length * -1;
-        return (substr($haystack, $start) === $needle);
-    }
+		$start = $length * -1;
+		return (substr($haystack, $start) === $needle);
+	}
 }

extensions/libraries/redcore/database/sqlparser/positioncalculator.php

Indentation +160 added lines, -160 removed lines

@@ -49,164 +49,164 @@
  */
 class RDatabaseSqlparserPositioncalculator extends RDatabaseSqlparserSqlparserutils {
 
-    private static $allowedOnOperator = array("\t", "\n", "\r", " ", ",", "(", ")", "_", "'", "\"");
-    private static $allowedOnOther = array("\t", "\n", "\r", " ", ",", "(", ")", "<", ">", "*", "+", "-", "/", "|",
-                                           "&", "=", "!", ";");
-
-    private function printPos($text, $sql, $charPos, $key, $parsed, $backtracking) {
-        if (!isset($_ENV['DEBUG'])) {
-            return;
-        }
-
-        $spaces = "";
-        $caller = debug_backtrace();
-        $i = 1;
-        while ($caller[$i]['function'] === 'lookForBaseExpression') {
-            $spaces .= "   ";
-            $i++;
-        }
-        $holdem = substr($sql, 0, $charPos) . "^" . substr($sql, $charPos);
-        echo $spaces . $text . " key:" . $key . "  parsed:" . $parsed . " back:" . serialize($backtracking) . " "
-                . $holdem . "\n";
-    }
-
-    public function setPositionsWithinSQL($sql, $parsed) {
-        $charPos = 0;
-        $backtracking = array();
-        $this->lookForBaseExpression($sql, $charPos, $parsed, 0, $backtracking);
-        return $parsed;
-    }
-
-    private function findPositionWithinString($sql, $value, $expr_type) {
-
-        $offset = 0;
-        while (true) {
-
-            $pos = strpos($sql, $value, $offset);
-            if ($pos === false) {
-                break;
-            }
-
-            $before = "";
-            if ($pos > 0) {
-                $before = $sql[$pos - 1];
-            }
-
-            $after = "";
-            if (isset($sql[$pos + strlen($value)])) {
-                $after = $sql[$pos + strlen($value)];
-            }
-
-	        // if we have an operator, it should be surrounded by
-	        // whitespace, comma, parenthesis, digit or letter, end_of_string
-	        // an operator should not be surrounded by another operator
-
-            if ($expr_type === 'operator') {
-
-                $ok = ($before === "" || in_array($before, self::$allowedOnOperator, true))
-                        || (strtolower($before) >= 'a' && strtolower($before) <= 'z')
-                        || ($before >= '0' && $before <= '9');
-                $ok = $ok
-                        && ($after === "" || in_array($after, self::$allowedOnOperator, true)
-                                || (strtolower($after) >= 'a' && strtolower($after) <= 'z')
-                                || ($after >= '0' && $after <= '9') || ($after === '?') || ($after === '@'));
-
-                if (!$ok) {
-                    $offset = $pos + 1;
-                    continue;
-                }
-
-                break;
-            }
-
-	        // in all other cases we accept
-	        // whitespace, comma, operators, parenthesis and end_of_string
-
-            $ok = ($before === "" || in_array($before, self::$allowedOnOther, true));
-            $ok = $ok && ($after === "" || in_array($after, self::$allowedOnOther, true));
-
-            if ($ok) {
-                break;
-            }
-
-            $offset = $pos + 1;
-        }
-
-        return $pos;
-    }
-
-    private function lookForBaseExpression($sql, &$charPos, &$parsed, $key, &$backtracking) {
-        if (!is_numeric($key)) {
-            if (($key === 'UNION' || $key === 'UNION ALL') || ($key === 'expr_type' && $parsed === 'expression')
-                    || ($key === 'expr_type' && $parsed === 'subquery')
-                    || ($key === 'expr_type' && $parsed === 'bracket_expression')
-                    || ($key === 'expr_type' && $parsed === 'table_expression')
-                    || ($key === 'expr_type' && $parsed === 'record')
-                    || ($key === 'expr_type' && $parsed === 'in-list') || ($key === 'alias' && $parsed !== false)) {
-	            // we hold the current position and come back after the next base_expr
-	            // we do this, because the next base_expr contains the complete expression/subquery/record
-	            // and we have to look into it too
-                $backtracking[] = $charPos;
-
-            } elseif (($key === 'ref_clause' || $key === 'columns') && $parsed !== false) {
-              // we hold the current position and come back after n base_expr(s)
-              // there is an array of sub-elements before (!) the base_expr clause of the current element
-              // so we go through the sub-elements and must come at the end
-                $backtracking[] = $charPos;
-                $parsedCount = count($parsed);
-                for ($i = 1; $i < $parsedCount; $i++) {
-                    $backtracking[] = false; // backtracking only after n base_expr!
-                }
-            } elseif ($key === 'sub_tree' && $parsed !== false) {
-              // we prevent wrong backtracking on subtrees (too much array_pop())
-              // there is an array of sub-elements after(!) the base_expr clause of the current element
-              // so we go through the sub-elements and must not come back at the end
-                $parsedCount = count($parsed);
-                for ($i = 1; $i < $parsedCount; $i++) {
-                    $backtracking[] = false;
-                }
-            } else {
-	            // move the current pos after the keyword
-	            // SELECT, WHERE, INSERT etc.
-                if (in_array($key, parent::$reserved)) {
-                    $charPos = stripos($sql, $key, $charPos);
-                    $charPos += strlen($key);
-                }
-            }
-        }
-
-        if (!is_array($parsed)) {
-            return;
-        }
-
-        foreach ($parsed as $key => $value) {
-            if ($key === 'base_expr') {
-
-	            // $this->printPos("0", $sql, $charPos, $key, $value, $backtracking);
-
-                $subject = substr($sql, $charPos);
-                $pos = $this->findPositionWithinString($subject, $value,
-                        isset($parsed['expr_type']) ? $parsed['expr_type'] : 'alias');
-                if ($pos === false) {
-                    throw new Exception("cannot calculate position of " . $value . " within " . $subject, 5);
-
-                }
-
-                $parsed['position'] = $charPos + $pos;
-                $charPos += $pos + strlen($value);
-
-	            // $this->printPos("1", $sql, $charPos, $key, $value, $backtracking);
-
-                $oldPos = array_pop($backtracking);
-                if (isset($oldPos) && $oldPos !== false) {
-                    $charPos = $oldPos;
-                }
-
-	            // $this->printPos("2", $sql, $charPos, $key, $value, $backtracking);
-
-            } else {
-                $this->lookForBaseExpression($sql, $charPos, $parsed[$key], $key, $backtracking);
-            }
-        }
-    }
+	private static $allowedOnOperator = array("\t", "\n", "\r", " ", ",", "(", ")", "_", "'", "\"");
+	private static $allowedOnOther = array("\t", "\n", "\r", " ", ",", "(", ")", "<", ">", "*", "+", "-", "/", "|",
+										   "&", "=", "!", ";");
+
+	private function printPos($text, $sql, $charPos, $key, $parsed, $backtracking) {
+		if (!isset($_ENV['DEBUG'])) {
+			return;
+		}
+
+		$spaces = "";
+		$caller = debug_backtrace();
+		$i = 1;
+		while ($caller[$i]['function'] === 'lookForBaseExpression') {
+			$spaces .= "   ";
+			$i++;
+		}
+		$holdem = substr($sql, 0, $charPos) . "^" . substr($sql, $charPos);
+		echo $spaces . $text . " key:" . $key . "  parsed:" . $parsed . " back:" . serialize($backtracking) . " "
+				. $holdem . "\n";
+	}
+
+	public function setPositionsWithinSQL($sql, $parsed) {
+		$charPos = 0;
+		$backtracking = array();
+		$this->lookForBaseExpression($sql, $charPos, $parsed, 0, $backtracking);
+		return $parsed;
+	}
+
+	private function findPositionWithinString($sql, $value, $expr_type) {
+
+		$offset = 0;
+		while (true) {
+
+			$pos = strpos($sql, $value, $offset);
+			if ($pos === false) {
+				break;
+			}
+
+			$before = "";
+			if ($pos > 0) {
+				$before = $sql[$pos - 1];
+			}
+
+			$after = "";
+			if (isset($sql[$pos + strlen($value)])) {
+				$after = $sql[$pos + strlen($value)];
+			}
+
+			// if we have an operator, it should be surrounded by
+			// whitespace, comma, parenthesis, digit or letter, end_of_string
+			// an operator should not be surrounded by another operator
+
+			if ($expr_type === 'operator') {
+
+				$ok = ($before === "" || in_array($before, self::$allowedOnOperator, true))
+						|| (strtolower($before) >= 'a' && strtolower($before) <= 'z')
+						|| ($before >= '0' && $before <= '9');
+				$ok = $ok
+						&& ($after === "" || in_array($after, self::$allowedOnOperator, true)
+								|| (strtolower($after) >= 'a' && strtolower($after) <= 'z')
+								|| ($after >= '0' && $after <= '9') || ($after === '?') || ($after === '@'));
+
+				if (!$ok) {
+					$offset = $pos + 1;
+					continue;
+				}
+
+				break;
+			}
+
+			// in all other cases we accept
+			// whitespace, comma, operators, parenthesis and end_of_string
+
+			$ok = ($before === "" || in_array($before, self::$allowedOnOther, true));
+			$ok = $ok && ($after === "" || in_array($after, self::$allowedOnOther, true));
+
+			if ($ok) {
+				break;
+			}
+
+			$offset = $pos + 1;
+		}
+
+		return $pos;
+	}
+
+	private function lookForBaseExpression($sql, &$charPos, &$parsed, $key, &$backtracking) {
+		if (!is_numeric($key)) {
+			if (($key === 'UNION' || $key === 'UNION ALL') || ($key === 'expr_type' && $parsed === 'expression')
+					|| ($key === 'expr_type' && $parsed === 'subquery')
+					|| ($key === 'expr_type' && $parsed === 'bracket_expression')
+					|| ($key === 'expr_type' && $parsed === 'table_expression')
+					|| ($key === 'expr_type' && $parsed === 'record')
+					|| ($key === 'expr_type' && $parsed === 'in-list') || ($key === 'alias' && $parsed !== false)) {
+				// we hold the current position and come back after the next base_expr
+				// we do this, because the next base_expr contains the complete expression/subquery/record
+				// and we have to look into it too
+				$backtracking[] = $charPos;
+
+			} elseif (($key === 'ref_clause' || $key === 'columns') && $parsed !== false) {
+			  // we hold the current position and come back after n base_expr(s)
+			  // there is an array of sub-elements before (!) the base_expr clause of the current element
+			  // so we go through the sub-elements and must come at the end
+				$backtracking[] = $charPos;
+				$parsedCount = count($parsed);
+				for ($i = 1; $i < $parsedCount; $i++) {
+					$backtracking[] = false; // backtracking only after n base_expr!
+				}
+			} elseif ($key === 'sub_tree' && $parsed !== false) {
+			  // we prevent wrong backtracking on subtrees (too much array_pop())
+			  // there is an array of sub-elements after(!) the base_expr clause of the current element
+			  // so we go through the sub-elements and must not come back at the end
+				$parsedCount = count($parsed);
+				for ($i = 1; $i < $parsedCount; $i++) {
+					$backtracking[] = false;
+				}
+			} else {
+				// move the current pos after the keyword
+				// SELECT, WHERE, INSERT etc.
+				if (in_array($key, parent::$reserved)) {
+					$charPos = stripos($sql, $key, $charPos);
+					$charPos += strlen($key);
+				}
+			}
+		}
+
+		if (!is_array($parsed)) {
+			return;
+		}
+
+		foreach ($parsed as $key => $value) {
+			if ($key === 'base_expr') {
+
+				// $this->printPos("0", $sql, $charPos, $key, $value, $backtracking);
+
+				$subject = substr($sql, $charPos);
+				$pos = $this->findPositionWithinString($subject, $value,
+						isset($parsed['expr_type']) ? $parsed['expr_type'] : 'alias');
+				if ($pos === false) {
+					throw new Exception("cannot calculate position of " . $value . " within " . $subject, 5);
+
+				}
+
+				$parsed['position'] = $charPos + $pos;
+				$charPos += $pos + strlen($value);
+
+				// $this->printPos("1", $sql, $charPos, $key, $value, $backtracking);
+
+				$oldPos = array_pop($backtracking);
+				if (isset($oldPos) && $oldPos !== false) {
+					$charPos = $oldPos;
+				}
+
+				// $this->printPos("2", $sql, $charPos, $key, $value, $backtracking);
+
+			} else {
+				$this->lookForBaseExpression($sql, $charPos, $parsed[$key], $key, $backtracking);
+			}
+		}
+	}
 }

extensions/libraries/redcore/database/sqlparser/sqllexer.php

Indentation +295 added lines, -295 removed lines

@@ -47,322 +47,322 @@
  */
 class RDatabaseSqlparserSqllexer extends RDatabaseSqlparserSqlparserutils {
 
-    private $splitters;
+	private $splitters;
 
-    public function __construct() {
-        $this->splitters = new RDatabaseSqlparserLexersplitter();
-    }
+	public function __construct() {
+		$this->splitters = new RDatabaseSqlparserLexersplitter();
+	}
 
-    public function split($sql) {
-        if (!is_string($sql))
-            throw new InvalidArgumentException("no SQL string to parse: \n" . $sql, 10);
+	public function split($sql) {
+		if (!is_string($sql))
+			throw new InvalidArgumentException("no SQL string to parse: \n" . $sql, 10);
 
-        $tokens = array();
-        $token = '';
-
-        $splitLen = $this->splitters->getMaxLengthOfSplitter();
-        $len = strlen($sql);
-        $pos = 0;
-
-        while ($pos < $len) {
-
-            for ($i = $splitLen; $i > 0; $i--) {
-                $substr = substr($sql, $pos, $i);
-                if ($this->splitters->isSplitter($substr)) {
-
-                    if ($token !== "") {
-                        $tokens[] = $token;
-                    }
+		$tokens = array();
+		$token = '';
+
+		$splitLen = $this->splitters->getMaxLengthOfSplitter();
+		$len = strlen($sql);
+		$pos = 0;
+
+		while ($pos < $len) {
+
+			for ($i = $splitLen; $i > 0; $i--) {
+				$substr = substr($sql, $pos, $i);
+				if ($this->splitters->isSplitter($substr)) {
+
+					if ($token !== "") {
+						$tokens[] = $token;
+					}
 
-                    $tokens[] = $substr;
-                    $pos += $i;
-                    $token = '';
+					$tokens[] = $substr;
+					$pos += $i;
+					$token = '';
 
-                    continue 2;
-                }
-            }
+					continue 2;
+				}
+			}
 
-            $token .= $sql[$pos];
-            $pos++;
-        }
+			$token .= $sql[$pos];
+			$pos++;
+		}
 
-        if ($token !== "") {
-            $tokens[] = $token;
-        }
+		if ($token !== "") {
+			$tokens[] = $token;
+		}
 
-        $tokens = $this->concatEscapeSequences($tokens);
-        $tokens = $this->balanceBackticks($tokens);
-        $tokens = $this->concatColReferences($tokens);
-        $tokens = $this->balanceParenthesis($tokens);
-        $tokens = $this->balanceMultilineComments($tokens);
-        $tokens = $this->concatInlineComments($tokens);
-        $tokens = $this->concatUserDefinedVariables($tokens);
-        return $tokens;
-    }
-
-    private function concatUserDefinedVariables($tokens) {
-        $i = 0;
-        $cnt = count($tokens);
-        $userdef = false;
-
-        while ($i < $cnt) {
-
-            if (!isset($tokens[$i])) {
-                $i++;
-                continue;
-            }
-
-            $token = $tokens[$i];
-
-            if ($userdef !== false) {
-                $tokens[$userdef] .= $token;
-                unset($tokens[$i]);
-                if ($token !== "@") {
-                    $userdef = false;
-                }
-            }
-
-            if ($userdef === false && $token === "@") {
-                $userdef = $i;
-            }
-
-            $i++;
-        }
-
-        return array_values($tokens);
-    }
-
-    private function concatInlineComments($tokens) {
-
-        $i = 0;
-        $cnt = count($tokens);
-        $comment = false;
-
-        while ($i < $cnt) {
-
-            if (!isset($tokens[$i])) {
-                $i++;
-                continue;
-            }
-
-            $token = $tokens[$i];
-
-            if ($comment !== false) {
-                if ($token === "\n" || $token === "\r\n") {
-                    $comment = false;
-                } else {
-                    unset($tokens[$i]);
-                    $tokens[$comment] .= $token;
-                }
-            }
-
-            if (($comment === false) && ($token === "-")) {
-                if (isset($tokens[$i + 1]) && $tokens[$i + 1] === "-") {
-                    $comment = $i;
-                    $tokens[$i] = "--";
-                    $i++;
-                    unset($tokens[$i]);
-                    continue;
-                }
-            }
-
-            $i++;
-        }
-
-        return array_values($tokens);
-    }
-
-    private function balanceMultilineComments($tokens) {
-
-        $i = 0;
-        $cnt = count($tokens);
-        $comment = false;
-
-        while ($i < $cnt) {
-
-            if (!isset($tokens[$i])) {
-                $i++;
-                continue;
-            }
-
-            $token = $tokens[$i];
-
-            if ($comment !== false) {
-                unset($tokens[$i]);
-                $tokens[$comment] .= $token;
-                if ($token === "*" && isset($tokens[$i + 1]) && $tokens[$i + 1] === "/") {
-                    unset($tokens[$i + 1]);
-                    $tokens[$comment] .= "/";
-                    $comment = false;
-                }
-            }
-
-            if (($comment === false) && ($token === "/")) {
-                if (isset($tokens[$i + 1]) && $tokens[$i + 1] === "*") {
-                    $comment = $i;
-                    $tokens[$i] = "/*";
-                    $i++;
-                    unset($tokens[$i]);
-                    continue;
-                }
-            }
-
-            $i++;
-        }
-        return array_values($tokens);
-    }
-
-    private function isBacktick($token) {
-        return ($token === "'" || $token === "\"" || $token === "`");
-    }
-
-    private function balanceBackticks($tokens) {
-        $i = 0;
-        $cnt = count($tokens);
-        while ($i < $cnt) {
-
-            if (!isset($tokens[$i])) {
-                $i++;
-                continue;
-            }
-
-            $token = $tokens[$i];
-
-            if ($this->isBacktick($token)) {
-                $tokens = $this->balanceCharacter($tokens, $i, $token);
-            }
-
-            $i++;
-        }
-
-        return $tokens;
-    }
+		$tokens = $this->concatEscapeSequences($tokens);
+		$tokens = $this->balanceBackticks($tokens);
+		$tokens = $this->concatColReferences($tokens);
+		$tokens = $this->balanceParenthesis($tokens);
+		$tokens = $this->balanceMultilineComments($tokens);
+		$tokens = $this->concatInlineComments($tokens);
+		$tokens = $this->concatUserDefinedVariables($tokens);
+		return $tokens;
+	}
+
+	private function concatUserDefinedVariables($tokens) {
+		$i = 0;
+		$cnt = count($tokens);
+		$userdef = false;
+
+		while ($i < $cnt) {
+
+			if (!isset($tokens[$i])) {
+				$i++;
+				continue;
+			}
+
+			$token = $tokens[$i];
+
+			if ($userdef !== false) {
+				$tokens[$userdef] .= $token;
+				unset($tokens[$i]);
+				if ($token !== "@") {
+					$userdef = false;
+				}
+			}
+
+			if ($userdef === false && $token === "@") {
+				$userdef = $i;
+			}
+
+			$i++;
+		}
+
+		return array_values($tokens);
+	}
+
+	private function concatInlineComments($tokens) {
+
+		$i = 0;
+		$cnt = count($tokens);
+		$comment = false;
+
+		while ($i < $cnt) {
+
+			if (!isset($tokens[$i])) {
+				$i++;
+				continue;
+			}
+
+			$token = $tokens[$i];
+
+			if ($comment !== false) {
+				if ($token === "\n" || $token === "\r\n") {
+					$comment = false;
+				} else {
+					unset($tokens[$i]);
+					$tokens[$comment] .= $token;
+				}
+			}
+
+			if (($comment === false) && ($token === "-")) {
+				if (isset($tokens[$i + 1]) && $tokens[$i + 1] === "-") {
+					$comment = $i;
+					$tokens[$i] = "--";
+					$i++;
+					unset($tokens[$i]);
+					continue;
+				}
+			}
+
+			$i++;
+		}
+
+		return array_values($tokens);
+	}
+
+	private function balanceMultilineComments($tokens) {
+
+		$i = 0;
+		$cnt = count($tokens);
+		$comment = false;
+
+		while ($i < $cnt) {
+
+			if (!isset($tokens[$i])) {
+				$i++;
+				continue;
+			}
+
+			$token = $tokens[$i];
+
+			if ($comment !== false) {
+				unset($tokens[$i]);
+				$tokens[$comment] .= $token;
+				if ($token === "*" && isset($tokens[$i + 1]) && $tokens[$i + 1] === "/") {
+					unset($tokens[$i + 1]);
+					$tokens[$comment] .= "/";
+					$comment = false;
+				}
+			}
+
+			if (($comment === false) && ($token === "/")) {
+				if (isset($tokens[$i + 1]) && $tokens[$i + 1] === "*") {
+					$comment = $i;
+					$tokens[$i] = "/*";
+					$i++;
+					unset($tokens[$i]);
+					continue;
+				}
+			}
+
+			$i++;
+		}
+		return array_values($tokens);
+	}
+
+	private function isBacktick($token) {
+		return ($token === "'" || $token === "\"" || $token === "`");
+	}
+
+	private function balanceBackticks($tokens) {
+		$i = 0;
+		$cnt = count($tokens);
+		while ($i < $cnt) {
+
+			if (!isset($tokens[$i])) {
+				$i++;
+				continue;
+			}
+
+			$token = $tokens[$i];
+
+			if ($this->isBacktick($token)) {
+				$tokens = $this->balanceCharacter($tokens, $i, $token);
+			}
+
+			$i++;
+		}
+
+		return $tokens;
+	}
 
 	// backticks are not balanced within one token, so we have
 	// to re-combine some tokens
-    private function balanceCharacter($tokens, $idx, $char) {
+	private function balanceCharacter($tokens, $idx, $char) {
 
-        $token_count = count($tokens);
-        $i = $idx + 1;
-        while ($i < $token_count) {
+		$token_count = count($tokens);
+		$i = $idx + 1;
+		while ($i < $token_count) {
 
-            if (!isset($tokens[$i])) {
-                $i++;
-                continue;
-            }
+			if (!isset($tokens[$i])) {
+				$i++;
+				continue;
+			}
 
-            $token = $tokens[$i];
-            $tokens[$idx] .= $token;
-            unset($tokens[$i]);
+			$token = $tokens[$i];
+			$tokens[$idx] .= $token;
+			unset($tokens[$i]);
 
-            if ($token === $char) {
-                break;
-            }
+			if ($token === $char) {
+				break;
+			}
 
-            $i++;
-        }
-        return array_values($tokens);
-    }
+			$i++;
+		}
+		return array_values($tokens);
+	}
 
-    /*
+	/*
      * does the token ends with dot?
      * concat it with the next token
      * 
      * does the token starts with a dot?
      * concat it with the previous token
      */
-    private function concatColReferences($tokens) {
-
-        $cnt = count($tokens);
-        $i = 0;
-        while ($i < $cnt) {
-
-            if (!isset($tokens[$i])) {
-                $i++;
-                continue;
-            }
-
-            if ($tokens[$i][0] === ".") {
-
-                // concat the previous tokens, till the token has been changed
-                $k = $i - 1;
-                $len = strlen($tokens[$i]);
-                while (($k >= 0) && ($len == strlen($tokens[$i]))) {
-                    if (!isset($tokens[$k])) { // FIXME: this can be wrong if we have schema . table . column
-                        $k--;
-                        continue;
-                    }
-                    $tokens[$i] = $tokens[$k] . $tokens[$i];
-                    unset($tokens[$k]);
-                    $k--;
-                }
-            }
-
-            if ($this->endsWith($tokens[$i], '.')) {
-
-                // concat the next tokens, till the token has been changed
-                $k = $i + 1;
-                $len = strlen($tokens[$i]);
-                while (($k < $cnt) && ($len == strlen($tokens[$i]))) {
-                    if (!isset($tokens[$k])) {
-                        $k++;
-                        continue;
-                    }
-                    $tokens[$i] .= $tokens[$k];
-                    unset($tokens[$k]);
-                    $k++;
-                }
-            }
-
-            $i++;
-        }
-
-        return array_values($tokens);
-    }
-
-    private function concatEscapeSequences($tokens) {
-        $tokenCount = count($tokens);
-        $i = 0;
-        while ($i < $tokenCount) {
-
-            if ($this->endsWith($tokens[$i], "\\")) {
-                $i++;
-                if (isset($tokens[$i])) {
-                    $tokens[$i - 1] .= $tokens[$i];
-                    unset($tokens[$i]);
-                }
-            }
-            $i++;
-        }
-        return array_values($tokens);
-    }
-
-    private function balanceParenthesis($tokens) {
-        $token_count = count($tokens);
-        $i = 0;
-        while ($i < $token_count) {
-            if ($tokens[$i] !== '(') {
-                $i++;
-                continue;
-            }
-            $count = 1;
-            for ($n = $i + 1; $n < $token_count; $n++) {
-                $token = $tokens[$n];
-                if ($token === '(') {
-                    $count++;
-                }
-                if ($token === ')') {
-                    $count--;
-                }
-                $tokens[$i] .= $token;
-                unset($tokens[$n]);
-                if ($count === 0) {
-                    $n++;
-                    break;
-                }
-            }
-            $i = $n;
-        }
-        return array_values($tokens);
-    }
+	private function concatColReferences($tokens) {
+
+		$cnt = count($tokens);
+		$i = 0;
+		while ($i < $cnt) {
+
+			if (!isset($tokens[$i])) {
+				$i++;
+				continue;
+			}
+
+			if ($tokens[$i][0] === ".") {
+
+				// concat the previous tokens, till the token has been changed
+				$k = $i - 1;
+				$len = strlen($tokens[$i]);
+				while (($k >= 0) && ($len == strlen($tokens[$i]))) {
+					if (!isset($tokens[$k])) { // FIXME: this can be wrong if we have schema . table . column
+						$k--;
+						continue;
+					}
+					$tokens[$i] = $tokens[$k] . $tokens[$i];
+					unset($tokens[$k]);
+					$k--;
+				}
+			}
+
+			if ($this->endsWith($tokens[$i], '.')) {
+
+				// concat the next tokens, till the token has been changed
+				$k = $i + 1;
+				$len = strlen($tokens[$i]);
+				while (($k < $cnt) && ($len == strlen($tokens[$i]))) {
+					if (!isset($tokens[$k])) {
+						$k++;
+						continue;
+					}
+					$tokens[$i] .= $tokens[$k];
+					unset($tokens[$k]);
+					$k++;
+				}
+			}
+
+			$i++;
+		}
+
+		return array_values($tokens);
+	}
+
+	private function concatEscapeSequences($tokens) {
+		$tokenCount = count($tokens);
+		$i = 0;
+		while ($i < $tokenCount) {
+
+			if ($this->endsWith($tokens[$i], "\\")) {
+				$i++;
+				if (isset($tokens[$i])) {
+					$tokens[$i - 1] .= $tokens[$i];
+					unset($tokens[$i]);
+				}
+			}
+			$i++;
+		}
+		return array_values($tokens);
+	}
+
+	private function balanceParenthesis($tokens) {
+		$token_count = count($tokens);
+		$i = 0;
+		while ($i < $token_count) {
+			if ($tokens[$i] !== '(') {
+				$i++;
+				continue;
+			}
+			$count = 1;
+			for ($n = $i + 1; $n < $token_count; $n++) {
+				$token = $tokens[$n];
+				if ($token === '(') {
+					$count++;
+				}
+				if ($token === ')') {
+					$count--;
+				}
+				$tokens[$i] .= $token;
+				unset($tokens[$n]);
+				if ($count === 0) {
+					$n++;
+					break;
+				}
+			}
+			$i = $n;
+		}
+		return array_values($tokens);
+	}
 }

extensions/libraries/redcore/api/oauth2/Server.php

Indentation +786 added lines, -786 removed lines

@@ -42,791 +42,791 @@
 * @see OAuth2\Controller\TokenController
 */
 class Server implements ResourceControllerInterface,
-    AuthorizeControllerInterface,
-    TokenControllerInterface,
-    UserInfoControllerInterface
+	AuthorizeControllerInterface,
+	TokenControllerInterface,
+	UserInfoControllerInterface
 {
-    // misc properties
-    protected $response;
-    protected $config;
-    protected $storages;
-
-    // servers
-    protected $authorizeController;
-    protected $tokenController;
-    protected $resourceController;
-    protected $userInfoController;
-
-    // config classes
-    protected $grantTypes;
-    protected $responseTypes;
-    protected $tokenType;
-    protected $scopeUtil;
-    protected $clientAssertionType;
-
-    protected $storageMap = array(
-        'access_token' => 'OAuth2\Storage\AccessTokenInterface',
-        'authorization_code' => 'OAuth2\Storage\AuthorizationCodeInterface',
-        'client_credentials' => 'OAuth2\Storage\ClientCredentialsInterface',
-        'client' => 'OAuth2\Storage\ClientInterface',
-        'refresh_token' => 'OAuth2\Storage\RefreshTokenInterface',
-        'user_credentials' => 'OAuth2\Storage\UserCredentialsInterface',
-        'user_claims' => 'OAuth2\OpenID\Storage\UserClaimsInterface',
-        'public_key' => 'OAuth2\Storage\PublicKeyInterface',
-        'jwt_bearer' => 'OAuth2\Storage\JWTBearerInterface',
-        'scope' => 'OAuth2\Storage\ScopeInterface',
-    );
-
-    protected $responseTypeMap = array(
-        'token' => 'OAuth2\ResponseType\AccessTokenInterface',
-        'code' => 'OAuth2\ResponseType\AuthorizationCodeInterface',
-        'id_token' => 'OAuth2\OpenID\ResponseType\IdTokenInterface',
-        'id_token token' => 'OAuth2\OpenID\ResponseType\IdTokenTokenInterface',
-        'code id_token' => 'OAuth2\OpenID\ResponseType\CodeIdTokenInterface',
-    );
-
-    /**
-     * @param mixed                                                   $storage             (array or OAuth2\Storage) - single object or array of objects implementing the
-     *                                                                                     required storage types (ClientCredentialsInterface and AccessTokenInterface as a minimum)
-     * @param array                                                   $config              specify a different token lifetime, token header name, etc
-     * @param array                                                   $grantTypes          An array of OAuth2\GrantType\GrantTypeInterface to use for granting access tokens
-     * @param array                                                   $responseTypes       Response types to use.  array keys should be "code" and and "token" for
-     *                                                                                     Access Token and Authorization Code response types
-     * @param OAuth2\TokenType\TokenTypeInterface                     $tokenType           The token type object to use. Valid token types are "bearer" and "mac"
-     * @param OAuth2\ScopeInterface                                   $scopeUtil           The scope utility class to use to validate scope
-     * @param OAuth2\ClientAssertionType\ClientAssertionTypeInterface $clientAssertionType The method in which to verify the client identity.  Default is HttpBasic
-     *
-     * @ingroup oauth2_section_7
-     */
-    public function __construct($storage = array(), array $config = array(), array $grantTypes = array(), array $responseTypes = array(), TokenTypeInterface $tokenType = null, ScopeInterface $scopeUtil = null, ClientAssertionTypeInterface $clientAssertionType = null)
-    {
-        $storage = is_array($storage) ? $storage : array($storage);
-        $this->storages = array();
-        foreach ($storage as $key => $service) {
-            $this->addStorage($service, $key);
-        }
-
-        // merge all config values.  These get passed to our controller objects
-        $this->config = array_merge(array(
-            'use_jwt_access_tokens'        => false,
-            'store_encrypted_token_string' => true,
-            'use_openid_connect'       => false,
-            'id_lifetime'              => 3600,
-            'access_lifetime'          => 3600,
-            'www_realm'                => 'Service',
-            'token_param_name'         => 'access_token',
-            'token_bearer_header_name' => 'Bearer',
-            'enforce_state'            => true,
-            'require_exact_redirect_uri' => true,
-            'allow_implicit'           => false,
-            'allow_credentials_in_request_body' => true,
-            'allow_public_clients'     => true,
-            'always_issue_new_refresh_token' => false,
-            'unset_refresh_token_after_use' => true,
-        ), $config);
-
-        foreach ($grantTypes as $key => $grantType) {
-            $this->addGrantType($grantType, $key);
-        }
-
-        foreach ($responseTypes as $key => $responseType) {
-            $this->addResponseType($responseType, $key);
-        }
-
-        $this->tokenType = $tokenType;
-        $this->scopeUtil = $scopeUtil;
-        $this->clientAssertionType = $clientAssertionType;
-
-        if ($this->config['use_openid_connect']) {
-            $this->validateOpenIdConnect();
-        }
-    }
-
-    public function getAuthorizeController()
-    {
-        if (is_null($this->authorizeController)) {
-            $this->authorizeController = $this->createDefaultAuthorizeController();
-        }
-
-        return $this->authorizeController;
-    }
-
-    public function getTokenController()
-    {
-        if (is_null($this->tokenController)) {
-            $this->tokenController = $this->createDefaultTokenController();
-        }
-
-        return $this->tokenController;
-    }
-
-    public function getResourceController()
-    {
-        if (is_null($this->resourceController)) {
-            $this->resourceController = $this->createDefaultResourceController();
-        }
-
-        return $this->resourceController;
-    }
-
-    public function getUserInfoController()
-    {
-        if (is_null($this->userInfoController)) {
-            $this->userInfoController = $this->createDefaultUserInfoController();
-        }
-
-        return $this->userInfoController;
-    }
-
-    /**
-     * every getter deserves a setter
-     */
-    public function setAuthorizeController(AuthorizeControllerInterface $authorizeController)
-    {
-        $this->authorizeController = $authorizeController;
-    }
-
-    /**
-     * every getter deserves a setter
-     */
-    public function setTokenController(TokenControllerInterface $tokenController)
-    {
-        $this->tokenController = $tokenController;
-    }
-
-    /**
-     * every getter deserves a setter
-     */
-    public function setResourceController(ResourceControllerInterface $resourceController)
-    {
-        $this->resourceController = $resourceController;
-    }
-
-    /**
-     * every getter deserves a setter
-     */
-    public function setUserInfoController(UserInfoControllerInterface $userInfoController)
-    {
-        $this->userInfoController = $userInfoController;
-    }
-
-    /**
-     * Return claims about the authenticated end-user.
-     * This would be called from the "/UserInfo" endpoint as defined in the spec.
-     *
-     * @param $request - OAuth2\RequestInterface
-     * Request object to grant access token
-     *
-     * @param $response - OAuth2\ResponseInterface
-     * Response object containing error messages (failure) or user claims (success)
-     *
-     * @throws InvalidArgumentException
-     * @throws LogicException
-     *
-     * @see http://openid.net/specs/openid-connect-core-1_0.html#UserInfo
-     */
-    public function handleUserInfoRequest(RequestInterface $request, ResponseInterface $response = null)
-    {
-        $this->response = is_null($response) ? new Response() : $response;
-        $this->getUserInfoController()->handleUserInfoRequest($request, $this->response);
-
-        return $this->response;
-    }
-
-    /**
-     * Grant or deny a requested access token.
-     * This would be called from the "/token" endpoint as defined in the spec.
-     * Obviously, you can call your endpoint whatever you want.
-     *
-     * @param $request - OAuth2\RequestInterface
-     * Request object to grant access token
-     *
-     * @param $response - OAuth2\ResponseInterface
-     * Response object containing error messages (failure) or access token (success)
-     *
-     * @throws InvalidArgumentException
-     * @throws LogicException
-     *
-     * @see http://tools.ietf.org/html/rfc6749#section-4
-     * @see http://tools.ietf.org/html/rfc6749#section-10.6
-     * @see http://tools.ietf.org/html/rfc6749#section-4.1.3
-     *
-     * @ingroup oauth2_section_4
-     */
-    public function handleTokenRequest(RequestInterface $request, ResponseInterface $response = null)
-    {
-        $this->response = is_null($response) ? new Response() : $response;
-        $this->getTokenController()->handleTokenRequest($request, $this->response);
-
-        return $this->response;
-    }
-
-    public function grantAccessToken(RequestInterface $request, ResponseInterface $response = null)
-    {
-        $this->response = is_null($response) ? new Response() : $response;
-        $value = $this->getTokenController()->grantAccessToken($request, $this->response);
-
-        return $value;
-    }
-
-    /**
-     * Handle a revoke token request
-     * This would be called from the "/revoke" endpoint as defined in the draft Token Revocation spec
-     *
-     * @see https://tools.ietf.org/html/rfc7009#section-2
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return Response|ResponseInterface
-     */
-    public function handleRevokeRequest(RequestInterface $request, ResponseInterface $response = null)
-    {
-        $this->response = is_null($response) ? new Response() : $response;
-        $this->getTokenController()->handleRevokeRequest($request, $this->response);
-
-        return $this->response;
-    }
-
-    /**
-     * Redirect the user appropriately after approval.
-     *
-     * After the user has approved or denied the resource request the
-     * authorization server should call this function to redirect the user
-     * appropriately.
-     *
-     * @param $request
-     * The request should have the follow parameters set in the querystring:
-     * - response_type: The requested response: an access token, an
-     * authorization code, or both.
-     * - client_id: The client identifier as described in Section 2.
-     * - redirect_uri: An absolute URI to which the authorization server
-     * will redirect the user-agent to when the end-user authorization
-     * step is completed.
-     * - scope: (optional) The scope of the resource request expressed as a
-     * list of space-delimited strings.
-     * - state: (optional) An opaque value used by the client to maintain
-     * state between the request and callback.
-     * @param $is_authorized
-     * TRUE or FALSE depending on whether the user authorized the access.
-     * @param $user_id
-     * Identifier of user who authorized the client
-     *
-     * @see http://tools.ietf.org/html/rfc6749#section-4
-     *
-     * @ingroup oauth2_section_4
-     */
-    public function handleAuthorizeRequest(RequestInterface $request, ResponseInterface $response, $is_authorized, $user_id = null)
-    {
-        $this->response = $response;
-        $this->getAuthorizeController()->handleAuthorizeRequest($request, $this->response, $is_authorized, $user_id);
-
-        return $this->response;
-    }
-
-    /**
-     * Pull the authorization request data out of the HTTP request.
-     * - The redirect_uri is OPTIONAL as per draft 20. But your implementation can enforce it
-     * by setting $config['enforce_redirect'] to true.
-     * - The state is OPTIONAL but recommended to enforce CSRF. Draft 21 states, however, that
-     * CSRF protection is MANDATORY. You can enforce this by setting the $config['enforce_state'] to true.
-     *
-     * The draft specifies that the parameters should be retrieved from GET, override the Response
-     * object to change this
-     *
-     * @return
-     * The authorization parameters so the authorization server can prompt
-     * the user for approval if valid.
-     *
-     * @see http://tools.ietf.org/html/rfc6749#section-4.1.1
-     * @see http://tools.ietf.org/html/rfc6749#section-10.12
-     *
-     * @ingroup oauth2_section_3
-     */
-    public function validateAuthorizeRequest(RequestInterface $request, ResponseInterface $response = null)
-    {
-        $this->response = is_null($response) ? new Response() : $response;
-        $value = $this->getAuthorizeController()->validateAuthorizeRequest($request, $this->response);
-
-        return $value;
-    }
-
-    public function verifyResourceRequest(RequestInterface $request, ResponseInterface $response = null, $scope = null)
-    {
-        $this->response = is_null($response) ? new Response() : $response;
-        $value = $this->getResourceController()->verifyResourceRequest($request, $this->response, $scope);
-
-        return $value;
-    }
-
-    public function getAccessTokenData(RequestInterface $request, ResponseInterface $response = null)
-    {
-        $this->response = is_null($response) ? new Response() : $response;
-        $value = $this->getResourceController()->getAccessTokenData($request, $this->response);
-
-        return $value;
-    }
-
-    public function addGrantType(GrantTypeInterface $grantType, $identifier = null)
-    {
-        if (!is_string($identifier)) {
-            $identifier = $grantType->getQuerystringIdentifier();
-        }
-
-        $this->grantTypes[$identifier] = $grantType;
-
-        // persist added grant type down to TokenController
-        if (!is_null($this->tokenController)) {
-            $this->getTokenController()->addGrantType($grantType, $identifier);
-        }
-    }
-
-    /**
-     * Set a storage object for the server
-     *
-     * @param $storage
-     * An object implementing one of the Storage interfaces
-     * @param $key
-     * If null, the storage is set to the key of each storage interface it implements
-     *
-     * @see storageMap
-     */
-    public function addStorage($storage, $key = null)
-    {
-        // if explicitly set to a valid key, do not "magically" set below
-        if (isset($this->storageMap[$key])) {
-            if (!is_null($storage) && !$storage instanceof $this->storageMap[$key]) {
-                throw new \InvalidArgumentException(sprintf('storage of type "%s" must implement interface "%s"', $key, $this->storageMap[$key]));
-            }
-            $this->storages[$key] = $storage;
-
-            // special logic to handle "client" and "client_credentials" strangeness
-            if ($key === 'client' && !isset($this->storages['client_credentials'])) {
-                if ($storage instanceof \OAuth2\Storage\ClientCredentialsInterface) {
-                    $this->storages['client_credentials'] = $storage;
-                }
-            } elseif ($key === 'client_credentials' && !isset($this->storages['client'])) {
-                if ($storage instanceof \OAuth2\Storage\ClientInterface) {
-                    $this->storages['client'] = $storage;
-                }
-            }
-        } elseif (!is_null($key) && !is_numeric($key)) {
-            throw new \InvalidArgumentException(sprintf('unknown storage key "%s", must be one of [%s]', $key, implode(', ', array_keys($this->storageMap))));
-        } else {
-            $set = false;
-            foreach ($this->storageMap as $type => $interface) {
-                if ($storage instanceof $interface) {
-                    $this->storages[$type] = $storage;
-                    $set = true;
-                }
-            }
-
-            if (!$set) {
-                throw new \InvalidArgumentException(sprintf('storage of class "%s" must implement one of [%s]', get_class($storage), implode(', ', $this->storageMap)));
-            }
-        }
-    }
-
-    public function addResponseType(ResponseTypeInterface $responseType, $key = null)
-    {
-        $key = $this->normalizeResponseType($key);
-
-        if (isset($this->responseTypeMap[$key])) {
-            if (!$responseType instanceof $this->responseTypeMap[$key]) {
-                throw new \InvalidArgumentException(sprintf('responseType of type "%s" must implement interface "%s"', $key, $this->responseTypeMap[$key]));
-            }
-            $this->responseTypes[$key] = $responseType;
-        } elseif (!is_null($key) && !is_numeric($key)) {
-            throw new \InvalidArgumentException(sprintf('unknown responseType key "%s", must be one of [%s]', $key, implode(', ', array_keys($this->responseTypeMap))));
-        } else {
-            $set = false;
-            foreach ($this->responseTypeMap as $type => $interface) {
-                if ($responseType instanceof $interface) {
-                    $this->responseTypes[$type] = $responseType;
-                    $set = true;
-                }
-            }
-
-            if (!$set) {
-                throw new \InvalidArgumentException(sprintf('Unknown response type %s.  Please implement one of [%s]', get_class($responseType), implode(', ', $this->responseTypeMap)));
-            }
-        }
-    }
-
-    public function getScopeUtil()
-    {
-        if (!$this->scopeUtil) {
-            $storage = isset($this->storages['scope']) ? $this->storages['scope'] : null;
-            $this->scopeUtil = new Scope($storage);
-        }
-
-        return $this->scopeUtil;
-    }
-
-    /**
-     * every getter deserves a setter
-     */
-    public function setScopeUtil($scopeUtil)
-    {
-        $this->scopeUtil = $scopeUtil;
-    }
-
-    protected function createDefaultAuthorizeController()
-    {
-        if (!isset($this->storages['client'])) {
-            throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\ClientInterface to use the authorize server");
-        }
-        if (0 == count($this->responseTypes)) {
-            $this->responseTypes = $this->getDefaultResponseTypes();
-        }
-        if ($this->config['use_openid_connect'] && !isset($this->responseTypes['id_token'])) {
-            $this->responseTypes['id_token'] = $this->createDefaultIdTokenResponseType();
-            if ($this->config['allow_implicit']) {
-                $this->responseTypes['id_token token'] = $this->createDefaultIdTokenTokenResponseType();
-            }
-        }
-
-        $config = array_intersect_key($this->config, array_flip(explode(' ', 'allow_implicit enforce_state require_exact_redirect_uri')));
-
-        if ($this->config['use_openid_connect']) {
-            return new OpenIDAuthorizeController($this->storages['client'], $this->responseTypes, $config, $this->getScopeUtil());
-        }
-
-        return new AuthorizeController($this->storages['client'], $this->responseTypes, $config, $this->getScopeUtil());
-    }
-
-    protected function createDefaultTokenController()
-    {
-        if (0 == count($this->grantTypes)) {
-            $this->grantTypes = $this->getDefaultGrantTypes();
-        }
-
-        if (is_null($this->clientAssertionType)) {
-            // see if HttpBasic assertion type is requred.  If so, then create it from storage classes.
-            foreach ($this->grantTypes as $grantType) {
-                if (!$grantType instanceof ClientAssertionTypeInterface) {
-                    if (!isset($this->storages['client_credentials'])) {
-                        throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\ClientCredentialsInterface to use the token server");
-                    }
-                    $config = array_intersect_key($this->config, array_flip(explode(' ', 'allow_credentials_in_request_body allow_public_clients')));
-                    $this->clientAssertionType = new HttpBasic($this->storages['client_credentials'], $config);
-                    break;
-                }
-            }
-        }
-
-        if (!isset($this->storages['client'])) {
-            throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\ClientInterface to use the token server");
-        }
-
-        $accessTokenResponseType = $this->getAccessTokenResponseType();
-
-        return new TokenController($accessTokenResponseType, $this->storages['client'], $this->grantTypes, $this->clientAssertionType, $this->getScopeUtil());
-    }
-
-    protected function createDefaultResourceController()
-    {
-        if ($this->config['use_jwt_access_tokens']) {
-            // overwrites access token storage with crypto token storage if "use_jwt_access_tokens" is set
-            if (!isset($this->storages['access_token']) || !$this->storages['access_token'] instanceof JwtAccessTokenInterface) {
-                $this->storages['access_token'] = $this->createDefaultJwtAccessTokenStorage();
-            }
-        } elseif (!isset($this->storages['access_token'])) {
-            throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\AccessTokenInterface or use JwtAccessTokens to use the resource server");
-        }
-
-        if (!$this->tokenType) {
-            $this->tokenType = $this->getDefaultTokenType();
-        }
-
-        $config = array_intersect_key($this->config, array('www_realm' => ''));
-
-        return new ResourceController($this->tokenType, $this->storages['access_token'], $config, $this->getScopeUtil());
-    }
-
-    protected function createDefaultUserInfoController()
-    {
-        if ($this->config['use_jwt_access_tokens']) {
-            // overwrites access token storage with crypto token storage if "use_jwt_access_tokens" is set
-            if (!isset($this->storages['access_token']) || !$this->storages['access_token'] instanceof JwtAccessTokenInterface) {
-                $this->storages['access_token'] = $this->createDefaultJwtAccessTokenStorage();
-            }
-        } elseif (!isset($this->storages['access_token'])) {
-            throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\AccessTokenInterface or use JwtAccessTokens to use the UserInfo server");
-        }
-
-        if (!isset($this->storages['user_claims'])) {
-            throw new \LogicException("You must supply a storage object implementing OAuth2\OpenID\Storage\UserClaimsInterface to use the UserInfo server");
-        }
-
-        if (!$this->tokenType) {
-            $this->tokenType = $this->getDefaultTokenType();
-        }
-
-        $config = array_intersect_key($this->config, array('www_realm' => ''));
-
-        return new UserInfoController($this->tokenType, $this->storages['access_token'], $this->storages['user_claims'], $config, $this->getScopeUtil());
-    }
-
-    protected function getDefaultTokenType()
-    {
-        $config = array_intersect_key($this->config, array_flip(explode(' ', 'token_param_name token_bearer_header_name')));
-
-        return new Bearer($config);
-    }
-
-    protected function getDefaultResponseTypes()
-    {
-        $responseTypes = array();
-
-        if ($this->config['allow_implicit']) {
-            $responseTypes['token'] = $this->getAccessTokenResponseType();
-        }
-
-        if ($this->config['use_openid_connect']) {
-            $responseTypes['id_token'] = $this->getIdTokenResponseType();
-            if ($this->config['allow_implicit']) {
-                $responseTypes['id_token token'] = $this->getIdTokenTokenResponseType();
-            }
-        }
-
-        if (isset($this->storages['authorization_code'])) {
-            $config = array_intersect_key($this->config, array_flip(explode(' ', 'enforce_redirect auth_code_lifetime')));
-            if ($this->config['use_openid_connect']) {
-                if (!$this->storages['authorization_code'] instanceof OpenIDAuthorizationCodeInterface) {
-                    throw new \LogicException("Your authorization_code storage must implement OAuth2\OpenID\Storage\AuthorizationCodeInterface to work when 'use_openid_connect' is true");
-                }
-                $responseTypes['code'] = new OpenIDAuthorizationCodeResponseType($this->storages['authorization_code'], $config);
-                $responseTypes['code id_token'] = new CodeIdToken($responseTypes['code'], $responseTypes['id_token']);
-            } else {
-                $responseTypes['code'] = new AuthorizationCodeResponseType($this->storages['authorization_code'], $config);
-            }
-        }
-
-        if (count($responseTypes) == 0) {
-            throw new \LogicException("You must supply an array of response_types in the constructor or implement a OAuth2\Storage\AuthorizationCodeInterface storage object or set 'allow_implicit' to true and implement a OAuth2\Storage\AccessTokenInterface storage object");
-        }
-
-        return $responseTypes;
-    }
-
-    protected function getDefaultGrantTypes()
-    {
-        $grantTypes = array();
-
-        if (isset($this->storages['user_credentials'])) {
-            $grantTypes['password'] = new UserCredentials($this->storages['user_credentials']);
-        }
-
-        if (isset($this->storages['client_credentials'])) {
-            $config = array_intersect_key($this->config, array('allow_credentials_in_request_body' => ''));
-            $grantTypes['client_credentials'] = new ClientCredentials($this->storages['client_credentials'], $config);
-        }
-
-        if (isset($this->storages['refresh_token'])) {
-            $config = array_intersect_key($this->config, array_flip(explode(' ', 'always_issue_new_refresh_token unset_refresh_token_after_use')));
-            $grantTypes['refresh_token'] = new RefreshToken($this->storages['refresh_token'], $config);
-        }
-
-        if (isset($this->storages['authorization_code'])) {
-            if ($this->config['use_openid_connect']) {
-                if (!$this->storages['authorization_code'] instanceof OpenIDAuthorizationCodeInterface) {
-                    throw new \LogicException("Your authorization_code storage must implement OAuth2\OpenID\Storage\AuthorizationCodeInterface to work when 'use_openid_connect' is true");
-                }
-                $grantTypes['authorization_code'] = new OpenIDAuthorizationCodeGrantType($this->storages['authorization_code']);
-            } else {
-                $grantTypes['authorization_code'] = new AuthorizationCode($this->storages['authorization_code']);
-            }
-        }
-
-        if (count($grantTypes) == 0) {
-            throw new \LogicException("Unable to build default grant types - You must supply an array of grant_types in the constructor");
-        }
-
-        return $grantTypes;
-    }
-
-    protected function getAccessTokenResponseType()
-    {
-        if (isset($this->responseTypes['token'])) {
-            return $this->responseTypes['token'];
-        }
-
-        if ($this->config['use_jwt_access_tokens']) {
-            return $this->createDefaultJwtAccessTokenResponseType();
-        }
-
-        return $this->createDefaultAccessTokenResponseType();
-    }
-
-    protected function getIdTokenResponseType()
-    {
-        if (isset($this->responseTypes['id_token'])) {
-            return $this->responseTypes['id_token'];
-        }
-
-        return $this->createDefaultIdTokenResponseType();
-    }
-
-    protected function getIdTokenTokenResponseType()
-    {
-        if (isset($this->responseTypes['id_token token'])) {
-            return $this->responseTypes['id_token token'];
-        }
-
-        return $this->createDefaultIdTokenTokenResponseType();
-    }
-
-    /**
-     * For Resource Controller
-     */
-    protected function createDefaultJwtAccessTokenStorage()
-    {
-        if (!isset($this->storages['public_key'])) {
-            throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\PublicKeyInterface to use crypto tokens");
-        }
-        $tokenStorage = null;
-        if (!empty($this->config['store_encrypted_token_string']) && isset($this->storages['access_token'])) {
-            $tokenStorage = $this->storages['access_token'];
-        }
-        // wrap the access token storage as required.
-        return new JwtAccessTokenStorage($this->storages['public_key'], $tokenStorage);
-    }
-
-    /**
-     * For Authorize and Token Controllers
-     */
-    protected function createDefaultJwtAccessTokenResponseType()
-    {
-        if (!isset($this->storages['public_key'])) {
-            throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\PublicKeyInterface to use crypto tokens");
-        }
-
-        $tokenStorage = null;
-        if (isset($this->storages['access_token'])) {
-            $tokenStorage = $this->storages['access_token'];
-        }
-
-        $refreshStorage = null;
-        if (isset($this->storages['refresh_token'])) {
-            $refreshStorage = $this->storages['refresh_token'];
-        }
-
-        $config = array_intersect_key($this->config, array_flip(explode(' ', 'store_encrypted_token_string issuer access_lifetime refresh_token_lifetime')));
-
-        return new JwtAccessToken($this->storages['public_key'], $tokenStorage, $refreshStorage, $config);
-    }
-
-    protected function createDefaultAccessTokenResponseType()
-    {
-        if (!isset($this->storages['access_token'])) {
-            throw new \LogicException("You must supply a response type implementing OAuth2\ResponseType\AccessTokenInterface, or a storage object implementing OAuth2\Storage\AccessTokenInterface to use the token server");
-        }
-
-        $refreshStorage = null;
-        if (isset($this->storages['refresh_token'])) {
-            $refreshStorage = $this->storages['refresh_token'];
-        }
-
-        $config = array_intersect_key($this->config, array_flip(explode(' ', 'access_lifetime refresh_token_lifetime')));
-        $config['token_type'] = $this->tokenType ? $this->tokenType->getTokenType() :  $this->getDefaultTokenType()->getTokenType();
-
-        return new AccessToken($this->storages['access_token'], $refreshStorage, $config);
-    }
-
-    protected function createDefaultIdTokenResponseType()
-    {
-        if (!isset($this->storages['user_claims'])) {
-            throw new \LogicException("You must supply a storage object implementing OAuth2\OpenID\Storage\UserClaimsInterface to use openid connect");
-        }
-        if (!isset($this->storages['public_key'])) {
-            throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\PublicKeyInterface to use openid connect");
-        }
-
-        $config = array_intersect_key($this->config, array_flip(explode(' ', 'issuer id_lifetime')));
-
-        return new IdToken($this->storages['user_claims'], $this->storages['public_key'], $config);
-    }
-
-    protected function createDefaultIdTokenTokenResponseType()
-    {
-        return new IdTokenToken($this->getAccessTokenResponseType(), $this->getIdTokenResponseType());
-    }
-
-    protected function validateOpenIdConnect()
-    {
-        $authCodeGrant = $this->getGrantType('authorization_code');
-        if (!empty($authCodeGrant) && !$authCodeGrant instanceof OpenIDAuthorizationCodeGrantType) {
-            throw new \InvalidArgumentException('You have enabled OpenID Connect, but supplied a grant type that does not support it.');
-        }
-    }
-
-    protected function normalizeResponseType($name)
-    {
-        // for multiple-valued response types - make them alphabetical
-        if (!empty($name) && false !== strpos($name, ' ')) {
-            $types = explode(' ', $name);
-            sort($types);
-            $name = implode(' ', $types);
-        }
-
-        return $name;
-    }
-
-    public function getResponse()
-    {
-        return $this->response;
-    }
-
-    public function getStorages()
-    {
-        return $this->storages;
-    }
-
-    public function getStorage($name)
-    {
-        return isset($this->storages[$name]) ? $this->storages[$name] : null;
-    }
-
-    public function getGrantTypes()
-    {
-        return $this->grantTypes;
-    }
-
-    public function getGrantType($name)
-    {
-        return isset($this->grantTypes[$name]) ? $this->grantTypes[$name] : null;
-    }
-
-    public function getResponseTypes()
-    {
-        return $this->responseTypes;
-    }
-
-    public function getResponseType($name)
-    {
-        // for multiple-valued response types - make them alphabetical
-        $name = $this->normalizeResponseType($name);
-
-        return isset($this->responseTypes[$name]) ? $this->responseTypes[$name] : null;
-    }
-
-    public function getTokenType()
-    {
-        return $this->tokenType;
-    }
-
-    public function getClientAssertionType()
-    {
-        return $this->clientAssertionType;
-    }
-
-    public function setConfig($name, $value)
-    {
-        $this->config[$name] = $value;
-    }
-
-    public function getConfig($name, $default = null)
-    {
-        return isset($this->config[$name]) ? $this->config[$name] : $default;
-    }
+	// misc properties
+	protected $response;
+	protected $config;
+	protected $storages;
+
+	// servers
+	protected $authorizeController;
+	protected $tokenController;
+	protected $resourceController;
+	protected $userInfoController;
+
+	// config classes
+	protected $grantTypes;
+	protected $responseTypes;
+	protected $tokenType;
+	protected $scopeUtil;
+	protected $clientAssertionType;
+
+	protected $storageMap = array(
+		'access_token' => 'OAuth2\Storage\AccessTokenInterface',
+		'authorization_code' => 'OAuth2\Storage\AuthorizationCodeInterface',
+		'client_credentials' => 'OAuth2\Storage\ClientCredentialsInterface',
+		'client' => 'OAuth2\Storage\ClientInterface',
+		'refresh_token' => 'OAuth2\Storage\RefreshTokenInterface',
+		'user_credentials' => 'OAuth2\Storage\UserCredentialsInterface',
+		'user_claims' => 'OAuth2\OpenID\Storage\UserClaimsInterface',
+		'public_key' => 'OAuth2\Storage\PublicKeyInterface',
+		'jwt_bearer' => 'OAuth2\Storage\JWTBearerInterface',
+		'scope' => 'OAuth2\Storage\ScopeInterface',
+	);
+
+	protected $responseTypeMap = array(
+		'token' => 'OAuth2\ResponseType\AccessTokenInterface',
+		'code' => 'OAuth2\ResponseType\AuthorizationCodeInterface',
+		'id_token' => 'OAuth2\OpenID\ResponseType\IdTokenInterface',
+		'id_token token' => 'OAuth2\OpenID\ResponseType\IdTokenTokenInterface',
+		'code id_token' => 'OAuth2\OpenID\ResponseType\CodeIdTokenInterface',
+	);
+
+	/**
+	 * @param mixed                                                   $storage             (array or OAuth2\Storage) - single object or array of objects implementing the
+	 *                                                                                     required storage types (ClientCredentialsInterface and AccessTokenInterface as a minimum)
+	 * @param array                                                   $config              specify a different token lifetime, token header name, etc
+	 * @param array                                                   $grantTypes          An array of OAuth2\GrantType\GrantTypeInterface to use for granting access tokens
+	 * @param array                                                   $responseTypes       Response types to use.  array keys should be "code" and and "token" for
+	 *                                                                                     Access Token and Authorization Code response types
+	 * @param OAuth2\TokenType\TokenTypeInterface                     $tokenType           The token type object to use. Valid token types are "bearer" and "mac"
+	 * @param OAuth2\ScopeInterface                                   $scopeUtil           The scope utility class to use to validate scope
+	 * @param OAuth2\ClientAssertionType\ClientAssertionTypeInterface $clientAssertionType The method in which to verify the client identity.  Default is HttpBasic
+	 *
+	 * @ingroup oauth2_section_7
+	 */
+	public function __construct($storage = array(), array $config = array(), array $grantTypes = array(), array $responseTypes = array(), TokenTypeInterface $tokenType = null, ScopeInterface $scopeUtil = null, ClientAssertionTypeInterface $clientAssertionType = null)
+	{
+		$storage = is_array($storage) ? $storage : array($storage);
+		$this->storages = array();
+		foreach ($storage as $key => $service) {
+			$this->addStorage($service, $key);
+		}
+
+		// merge all config values.  These get passed to our controller objects
+		$this->config = array_merge(array(
+			'use_jwt_access_tokens'        => false,
+			'store_encrypted_token_string' => true,
+			'use_openid_connect'       => false,
+			'id_lifetime'              => 3600,
+			'access_lifetime'          => 3600,
+			'www_realm'                => 'Service',
+			'token_param_name'         => 'access_token',
+			'token_bearer_header_name' => 'Bearer',
+			'enforce_state'            => true,
+			'require_exact_redirect_uri' => true,
+			'allow_implicit'           => false,
+			'allow_credentials_in_request_body' => true,
+			'allow_public_clients'     => true,
+			'always_issue_new_refresh_token' => false,
+			'unset_refresh_token_after_use' => true,
+		), $config);
+
+		foreach ($grantTypes as $key => $grantType) {
+			$this->addGrantType($grantType, $key);
+		}
+
+		foreach ($responseTypes as $key => $responseType) {
+			$this->addResponseType($responseType, $key);
+		}
+
+		$this->tokenType = $tokenType;
+		$this->scopeUtil = $scopeUtil;
+		$this->clientAssertionType = $clientAssertionType;
+
+		if ($this->config['use_openid_connect']) {
+			$this->validateOpenIdConnect();
+		}
+	}
+
+	public function getAuthorizeController()
+	{
+		if (is_null($this->authorizeController)) {
+			$this->authorizeController = $this->createDefaultAuthorizeController();
+		}
+
+		return $this->authorizeController;
+	}
+
+	public function getTokenController()
+	{
+		if (is_null($this->tokenController)) {
+			$this->tokenController = $this->createDefaultTokenController();
+		}
+
+		return $this->tokenController;
+	}
+
+	public function getResourceController()
+	{
+		if (is_null($this->resourceController)) {
+			$this->resourceController = $this->createDefaultResourceController();
+		}
+
+		return $this->resourceController;
+	}
+
+	public function getUserInfoController()
+	{
+		if (is_null($this->userInfoController)) {
+			$this->userInfoController = $this->createDefaultUserInfoController();
+		}
+
+		return $this->userInfoController;
+	}
+
+	/**
+	 * every getter deserves a setter
+	 */
+	public function setAuthorizeController(AuthorizeControllerInterface $authorizeController)
+	{
+		$this->authorizeController = $authorizeController;
+	}
+
+	/**
+	 * every getter deserves a setter
+	 */
+	public function setTokenController(TokenControllerInterface $tokenController)
+	{
+		$this->tokenController = $tokenController;
+	}
+
+	/**
+	 * every getter deserves a setter
+	 */
+	public function setResourceController(ResourceControllerInterface $resourceController)
+	{
+		$this->resourceController = $resourceController;
+	}
+
+	/**
+	 * every getter deserves a setter
+	 */
+	public function setUserInfoController(UserInfoControllerInterface $userInfoController)
+	{
+		$this->userInfoController = $userInfoController;
+	}
+
+	/**
+	 * Return claims about the authenticated end-user.
+	 * This would be called from the "/UserInfo" endpoint as defined in the spec.
+	 *
+	 * @param $request - OAuth2\RequestInterface
+	 * Request object to grant access token
+	 *
+	 * @param $response - OAuth2\ResponseInterface
+	 * Response object containing error messages (failure) or user claims (success)
+	 *
+	 * @throws InvalidArgumentException
+	 * @throws LogicException
+	 *
+	 * @see http://openid.net/specs/openid-connect-core-1_0.html#UserInfo
+	 */
+	public function handleUserInfoRequest(RequestInterface $request, ResponseInterface $response = null)
+	{
+		$this->response = is_null($response) ? new Response() : $response;
+		$this->getUserInfoController()->handleUserInfoRequest($request, $this->response);
+
+		return $this->response;
+	}
+
+	/**
+	 * Grant or deny a requested access token.
+	 * This would be called from the "/token" endpoint as defined in the spec.
+	 * Obviously, you can call your endpoint whatever you want.
+	 *
+	 * @param $request - OAuth2\RequestInterface
+	 * Request object to grant access token
+	 *
+	 * @param $response - OAuth2\ResponseInterface
+	 * Response object containing error messages (failure) or access token (success)
+	 *
+	 * @throws InvalidArgumentException
+	 * @throws LogicException
+	 *
+	 * @see http://tools.ietf.org/html/rfc6749#section-4
+	 * @see http://tools.ietf.org/html/rfc6749#section-10.6
+	 * @see http://tools.ietf.org/html/rfc6749#section-4.1.3
+	 *
+	 * @ingroup oauth2_section_4
+	 */
+	public function handleTokenRequest(RequestInterface $request, ResponseInterface $response = null)
+	{
+		$this->response = is_null($response) ? new Response() : $response;
+		$this->getTokenController()->handleTokenRequest($request, $this->response);
+
+		return $this->response;
+	}
+
+	public function grantAccessToken(RequestInterface $request, ResponseInterface $response = null)
+	{
+		$this->response = is_null($response) ? new Response() : $response;
+		$value = $this->getTokenController()->grantAccessToken($request, $this->response);
+
+		return $value;
+	}
+
+	/**
+	 * Handle a revoke token request
+	 * This would be called from the "/revoke" endpoint as defined in the draft Token Revocation spec
+	 *
+	 * @see https://tools.ietf.org/html/rfc7009#section-2
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return Response|ResponseInterface
+	 */
+	public function handleRevokeRequest(RequestInterface $request, ResponseInterface $response = null)
+	{
+		$this->response = is_null($response) ? new Response() : $response;
+		$this->getTokenController()->handleRevokeRequest($request, $this->response);
+
+		return $this->response;
+	}
+
+	/**
+	 * Redirect the user appropriately after approval.
+	 *
+	 * After the user has approved or denied the resource request the
+	 * authorization server should call this function to redirect the user
+	 * appropriately.
+	 *
+	 * @param $request
+	 * The request should have the follow parameters set in the querystring:
+	 * - response_type: The requested response: an access token, an
+	 * authorization code, or both.
+	 * - client_id: The client identifier as described in Section 2.
+	 * - redirect_uri: An absolute URI to which the authorization server
+	 * will redirect the user-agent to when the end-user authorization
+	 * step is completed.
+	 * - scope: (optional) The scope of the resource request expressed as a
+	 * list of space-delimited strings.
+	 * - state: (optional) An opaque value used by the client to maintain
+	 * state between the request and callback.
+	 * @param $is_authorized
+	 * TRUE or FALSE depending on whether the user authorized the access.
+	 * @param $user_id
+	 * Identifier of user who authorized the client
+	 *
+	 * @see http://tools.ietf.org/html/rfc6749#section-4
+	 *
+	 * @ingroup oauth2_section_4
+	 */
+	public function handleAuthorizeRequest(RequestInterface $request, ResponseInterface $response, $is_authorized, $user_id = null)
+	{
+		$this->response = $response;
+		$this->getAuthorizeController()->handleAuthorizeRequest($request, $this->response, $is_authorized, $user_id);
+
+		return $this->response;
+	}
+
+	/**
+	 * Pull the authorization request data out of the HTTP request.
+	 * - The redirect_uri is OPTIONAL as per draft 20. But your implementation can enforce it
+	 * by setting $config['enforce_redirect'] to true.
+	 * - The state is OPTIONAL but recommended to enforce CSRF. Draft 21 states, however, that
+	 * CSRF protection is MANDATORY. You can enforce this by setting the $config['enforce_state'] to true.
+	 *
+	 * The draft specifies that the parameters should be retrieved from GET, override the Response
+	 * object to change this
+	 *
+	 * @return
+	 * The authorization parameters so the authorization server can prompt
+	 * the user for approval if valid.
+	 *
+	 * @see http://tools.ietf.org/html/rfc6749#section-4.1.1
+	 * @see http://tools.ietf.org/html/rfc6749#section-10.12
+	 *
+	 * @ingroup oauth2_section_3
+	 */
+	public function validateAuthorizeRequest(RequestInterface $request, ResponseInterface $response = null)
+	{
+		$this->response = is_null($response) ? new Response() : $response;
+		$value = $this->getAuthorizeController()->validateAuthorizeRequest($request, $this->response);
+
+		return $value;
+	}
+
+	public function verifyResourceRequest(RequestInterface $request, ResponseInterface $response = null, $scope = null)
+	{
+		$this->response = is_null($response) ? new Response() : $response;
+		$value = $this->getResourceController()->verifyResourceRequest($request, $this->response, $scope);
+
+		return $value;
+	}
+
+	public function getAccessTokenData(RequestInterface $request, ResponseInterface $response = null)
+	{
+		$this->response = is_null($response) ? new Response() : $response;
+		$value = $this->getResourceController()->getAccessTokenData($request, $this->response);
+
+		return $value;
+	}
+
+	public function addGrantType(GrantTypeInterface $grantType, $identifier = null)
+	{
+		if (!is_string($identifier)) {
+			$identifier = $grantType->getQuerystringIdentifier();
+		}
+
+		$this->grantTypes[$identifier] = $grantType;
+
+		// persist added grant type down to TokenController
+		if (!is_null($this->tokenController)) {
+			$this->getTokenController()->addGrantType($grantType, $identifier);
+		}
+	}
+
+	/**
+	 * Set a storage object for the server
+	 *
+	 * @param $storage
+	 * An object implementing one of the Storage interfaces
+	 * @param $key
+	 * If null, the storage is set to the key of each storage interface it implements
+	 *
+	 * @see storageMap
+	 */
+	public function addStorage($storage, $key = null)
+	{
+		// if explicitly set to a valid key, do not "magically" set below
+		if (isset($this->storageMap[$key])) {
+			if (!is_null($storage) && !$storage instanceof $this->storageMap[$key]) {
+				throw new \InvalidArgumentException(sprintf('storage of type "%s" must implement interface "%s"', $key, $this->storageMap[$key]));
+			}
+			$this->storages[$key] = $storage;
+
+			// special logic to handle "client" and "client_credentials" strangeness
+			if ($key === 'client' && !isset($this->storages['client_credentials'])) {
+				if ($storage instanceof \OAuth2\Storage\ClientCredentialsInterface) {
+					$this->storages['client_credentials'] = $storage;
+				}
+			} elseif ($key === 'client_credentials' && !isset($this->storages['client'])) {
+				if ($storage instanceof \OAuth2\Storage\ClientInterface) {
+					$this->storages['client'] = $storage;
+				}
+			}
+		} elseif (!is_null($key) && !is_numeric($key)) {
+			throw new \InvalidArgumentException(sprintf('unknown storage key "%s", must be one of [%s]', $key, implode(', ', array_keys($this->storageMap))));
+		} else {
+			$set = false;
+			foreach ($this->storageMap as $type => $interface) {
+				if ($storage instanceof $interface) {
+					$this->storages[$type] = $storage;
+					$set = true;
+				}
+			}
+
+			if (!$set) {
+				throw new \InvalidArgumentException(sprintf('storage of class "%s" must implement one of [%s]', get_class($storage), implode(', ', $this->storageMap)));
+			}
+		}
+	}
+
+	public function addResponseType(ResponseTypeInterface $responseType, $key = null)
+	{
+		$key = $this->normalizeResponseType($key);
+
+		if (isset($this->responseTypeMap[$key])) {
+			if (!$responseType instanceof $this->responseTypeMap[$key]) {
+				throw new \InvalidArgumentException(sprintf('responseType of type "%s" must implement interface "%s"', $key, $this->responseTypeMap[$key]));
+			}
+			$this->responseTypes[$key] = $responseType;
+		} elseif (!is_null($key) && !is_numeric($key)) {
+			throw new \InvalidArgumentException(sprintf('unknown responseType key "%s", must be one of [%s]', $key, implode(', ', array_keys($this->responseTypeMap))));
+		} else {
+			$set = false;
+			foreach ($this->responseTypeMap as $type => $interface) {
+				if ($responseType instanceof $interface) {
+					$this->responseTypes[$type] = $responseType;
+					$set = true;
+				}
+			}
+
+			if (!$set) {
+				throw new \InvalidArgumentException(sprintf('Unknown response type %s.  Please implement one of [%s]', get_class($responseType), implode(', ', $this->responseTypeMap)));
+			}
+		}
+	}
+
+	public function getScopeUtil()
+	{
+		if (!$this->scopeUtil) {
+			$storage = isset($this->storages['scope']) ? $this->storages['scope'] : null;
+			$this->scopeUtil = new Scope($storage);
+		}
+
+		return $this->scopeUtil;
+	}
+
+	/**
+	 * every getter deserves a setter
+	 */
+	public function setScopeUtil($scopeUtil)
+	{
+		$this->scopeUtil = $scopeUtil;
+	}
+
+	protected function createDefaultAuthorizeController()
+	{
+		if (!isset($this->storages['client'])) {
+			throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\ClientInterface to use the authorize server");
+		}
+		if (0 == count($this->responseTypes)) {
+			$this->responseTypes = $this->getDefaultResponseTypes();
+		}
+		if ($this->config['use_openid_connect'] && !isset($this->responseTypes['id_token'])) {
+			$this->responseTypes['id_token'] = $this->createDefaultIdTokenResponseType();
+			if ($this->config['allow_implicit']) {
+				$this->responseTypes['id_token token'] = $this->createDefaultIdTokenTokenResponseType();
+			}
+		}
+
+		$config = array_intersect_key($this->config, array_flip(explode(' ', 'allow_implicit enforce_state require_exact_redirect_uri')));
+
+		if ($this->config['use_openid_connect']) {
+			return new OpenIDAuthorizeController($this->storages['client'], $this->responseTypes, $config, $this->getScopeUtil());
+		}
+
+		return new AuthorizeController($this->storages['client'], $this->responseTypes, $config, $this->getScopeUtil());
+	}
+
+	protected function createDefaultTokenController()
+	{
+		if (0 == count($this->grantTypes)) {
+			$this->grantTypes = $this->getDefaultGrantTypes();
+		}
+
+		if (is_null($this->clientAssertionType)) {
+			// see if HttpBasic assertion type is requred.  If so, then create it from storage classes.
+			foreach ($this->grantTypes as $grantType) {
+				if (!$grantType instanceof ClientAssertionTypeInterface) {
+					if (!isset($this->storages['client_credentials'])) {
+						throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\ClientCredentialsInterface to use the token server");
+					}
+					$config = array_intersect_key($this->config, array_flip(explode(' ', 'allow_credentials_in_request_body allow_public_clients')));
+					$this->clientAssertionType = new HttpBasic($this->storages['client_credentials'], $config);
+					break;
+				}
+			}
+		}
+
+		if (!isset($this->storages['client'])) {
+			throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\ClientInterface to use the token server");
+		}
+
+		$accessTokenResponseType = $this->getAccessTokenResponseType();
+
+		return new TokenController($accessTokenResponseType, $this->storages['client'], $this->grantTypes, $this->clientAssertionType, $this->getScopeUtil());
+	}
+
+	protected function createDefaultResourceController()
+	{
+		if ($this->config['use_jwt_access_tokens']) {
+			// overwrites access token storage with crypto token storage if "use_jwt_access_tokens" is set
+			if (!isset($this->storages['access_token']) || !$this->storages['access_token'] instanceof JwtAccessTokenInterface) {
+				$this->storages['access_token'] = $this->createDefaultJwtAccessTokenStorage();
+			}
+		} elseif (!isset($this->storages['access_token'])) {
+			throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\AccessTokenInterface or use JwtAccessTokens to use the resource server");
+		}
+
+		if (!$this->tokenType) {
+			$this->tokenType = $this->getDefaultTokenType();
+		}
+
+		$config = array_intersect_key($this->config, array('www_realm' => ''));
+
+		return new ResourceController($this->tokenType, $this->storages['access_token'], $config, $this->getScopeUtil());
+	}
+
+	protected function createDefaultUserInfoController()
+	{
+		if ($this->config['use_jwt_access_tokens']) {
+			// overwrites access token storage with crypto token storage if "use_jwt_access_tokens" is set
+			if (!isset($this->storages['access_token']) || !$this->storages['access_token'] instanceof JwtAccessTokenInterface) {
+				$this->storages['access_token'] = $this->createDefaultJwtAccessTokenStorage();
+			}
+		} elseif (!isset($this->storages['access_token'])) {
+			throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\AccessTokenInterface or use JwtAccessTokens to use the UserInfo server");
+		}
+
+		if (!isset($this->storages['user_claims'])) {
+			throw new \LogicException("You must supply a storage object implementing OAuth2\OpenID\Storage\UserClaimsInterface to use the UserInfo server");
+		}
+
+		if (!$this->tokenType) {
+			$this->tokenType = $this->getDefaultTokenType();
+		}
+
+		$config = array_intersect_key($this->config, array('www_realm' => ''));
+
+		return new UserInfoController($this->tokenType, $this->storages['access_token'], $this->storages['user_claims'], $config, $this->getScopeUtil());
+	}
+
+	protected function getDefaultTokenType()
+	{
+		$config = array_intersect_key($this->config, array_flip(explode(' ', 'token_param_name token_bearer_header_name')));
+
+		return new Bearer($config);
+	}
+
+	protected function getDefaultResponseTypes()
+	{
+		$responseTypes = array();
+
+		if ($this->config['allow_implicit']) {
+			$responseTypes['token'] = $this->getAccessTokenResponseType();
+		}
+
+		if ($this->config['use_openid_connect']) {
+			$responseTypes['id_token'] = $this->getIdTokenResponseType();
+			if ($this->config['allow_implicit']) {
+				$responseTypes['id_token token'] = $this->getIdTokenTokenResponseType();
+			}
+		}
+
+		if (isset($this->storages['authorization_code'])) {
+			$config = array_intersect_key($this->config, array_flip(explode(' ', 'enforce_redirect auth_code_lifetime')));
+			if ($this->config['use_openid_connect']) {
+				if (!$this->storages['authorization_code'] instanceof OpenIDAuthorizationCodeInterface) {
+					throw new \LogicException("Your authorization_code storage must implement OAuth2\OpenID\Storage\AuthorizationCodeInterface to work when 'use_openid_connect' is true");
+				}
+				$responseTypes['code'] = new OpenIDAuthorizationCodeResponseType($this->storages['authorization_code'], $config);
+				$responseTypes['code id_token'] = new CodeIdToken($responseTypes['code'], $responseTypes['id_token']);
+			} else {
+				$responseTypes['code'] = new AuthorizationCodeResponseType($this->storages['authorization_code'], $config);
+			}
+		}
+
+		if (count($responseTypes) == 0) {
+			throw new \LogicException("You must supply an array of response_types in the constructor or implement a OAuth2\Storage\AuthorizationCodeInterface storage object or set 'allow_implicit' to true and implement a OAuth2\Storage\AccessTokenInterface storage object");
+		}
+
+		return $responseTypes;
+	}
+
+	protected function getDefaultGrantTypes()
+	{
+		$grantTypes = array();
+
+		if (isset($this->storages['user_credentials'])) {
+			$grantTypes['password'] = new UserCredentials($this->storages['user_credentials']);
+		}
+
+		if (isset($this->storages['client_credentials'])) {
+			$config = array_intersect_key($this->config, array('allow_credentials_in_request_body' => ''));
+			$grantTypes['client_credentials'] = new ClientCredentials($this->storages['client_credentials'], $config);
+		}
+
+		if (isset($this->storages['refresh_token'])) {
+			$config = array_intersect_key($this->config, array_flip(explode(' ', 'always_issue_new_refresh_token unset_refresh_token_after_use')));
+			$grantTypes['refresh_token'] = new RefreshToken($this->storages['refresh_token'], $config);
+		}
+
+		if (isset($this->storages['authorization_code'])) {
+			if ($this->config['use_openid_connect']) {
+				if (!$this->storages['authorization_code'] instanceof OpenIDAuthorizationCodeInterface) {
+					throw new \LogicException("Your authorization_code storage must implement OAuth2\OpenID\Storage\AuthorizationCodeInterface to work when 'use_openid_connect' is true");
+				}
+				$grantTypes['authorization_code'] = new OpenIDAuthorizationCodeGrantType($this->storages['authorization_code']);
+			} else {
+				$grantTypes['authorization_code'] = new AuthorizationCode($this->storages['authorization_code']);
+			}
+		}
+
+		if (count($grantTypes) == 0) {
+			throw new \LogicException("Unable to build default grant types - You must supply an array of grant_types in the constructor");
+		}
+
+		return $grantTypes;
+	}
+
+	protected function getAccessTokenResponseType()
+	{
+		if (isset($this->responseTypes['token'])) {
+			return $this->responseTypes['token'];
+		}
+
+		if ($this->config['use_jwt_access_tokens']) {
+			return $this->createDefaultJwtAccessTokenResponseType();
+		}
+
+		return $this->createDefaultAccessTokenResponseType();
+	}
+
+	protected function getIdTokenResponseType()
+	{
+		if (isset($this->responseTypes['id_token'])) {
+			return $this->responseTypes['id_token'];
+		}
+
+		return $this->createDefaultIdTokenResponseType();
+	}
+
+	protected function getIdTokenTokenResponseType()
+	{
+		if (isset($this->responseTypes['id_token token'])) {
+			return $this->responseTypes['id_token token'];
+		}
+
+		return $this->createDefaultIdTokenTokenResponseType();
+	}
+
+	/**
+	 * For Resource Controller
+	 */
+	protected function createDefaultJwtAccessTokenStorage()
+	{
+		if (!isset($this->storages['public_key'])) {
+			throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\PublicKeyInterface to use crypto tokens");
+		}
+		$tokenStorage = null;
+		if (!empty($this->config['store_encrypted_token_string']) && isset($this->storages['access_token'])) {
+			$tokenStorage = $this->storages['access_token'];
+		}
+		// wrap the access token storage as required.
+		return new JwtAccessTokenStorage($this->storages['public_key'], $tokenStorage);
+	}
+
+	/**
+	 * For Authorize and Token Controllers
+	 */
+	protected function createDefaultJwtAccessTokenResponseType()
+	{
+		if (!isset($this->storages['public_key'])) {
+			throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\PublicKeyInterface to use crypto tokens");
+		}
+
+		$tokenStorage = null;
+		if (isset($this->storages['access_token'])) {
+			$tokenStorage = $this->storages['access_token'];
+		}
+
+		$refreshStorage = null;
+		if (isset($this->storages['refresh_token'])) {
+			$refreshStorage = $this->storages['refresh_token'];
+		}
+
+		$config = array_intersect_key($this->config, array_flip(explode(' ', 'store_encrypted_token_string issuer access_lifetime refresh_token_lifetime')));
+
+		return new JwtAccessToken($this->storages['public_key'], $tokenStorage, $refreshStorage, $config);
+	}
+
+	protected function createDefaultAccessTokenResponseType()
+	{
+		if (!isset($this->storages['access_token'])) {
+			throw new \LogicException("You must supply a response type implementing OAuth2\ResponseType\AccessTokenInterface, or a storage object implementing OAuth2\Storage\AccessTokenInterface to use the token server");
+		}
+
+		$refreshStorage = null;
+		if (isset($this->storages['refresh_token'])) {
+			$refreshStorage = $this->storages['refresh_token'];
+		}
+
+		$config = array_intersect_key($this->config, array_flip(explode(' ', 'access_lifetime refresh_token_lifetime')));
+		$config['token_type'] = $this->tokenType ? $this->tokenType->getTokenType() :  $this->getDefaultTokenType()->getTokenType();
+
+		return new AccessToken($this->storages['access_token'], $refreshStorage, $config);
+	}
+
+	protected function createDefaultIdTokenResponseType()
+	{
+		if (!isset($this->storages['user_claims'])) {
+			throw new \LogicException("You must supply a storage object implementing OAuth2\OpenID\Storage\UserClaimsInterface to use openid connect");
+		}
+		if (!isset($this->storages['public_key'])) {
+			throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\PublicKeyInterface to use openid connect");
+		}
+
+		$config = array_intersect_key($this->config, array_flip(explode(' ', 'issuer id_lifetime')));
+
+		return new IdToken($this->storages['user_claims'], $this->storages['public_key'], $config);
+	}
+
+	protected function createDefaultIdTokenTokenResponseType()
+	{
+		return new IdTokenToken($this->getAccessTokenResponseType(), $this->getIdTokenResponseType());
+	}
+
+	protected function validateOpenIdConnect()
+	{
+		$authCodeGrant = $this->getGrantType('authorization_code');
+		if (!empty($authCodeGrant) && !$authCodeGrant instanceof OpenIDAuthorizationCodeGrantType) {
+			throw new \InvalidArgumentException('You have enabled OpenID Connect, but supplied a grant type that does not support it.');
+		}
+	}
+
+	protected function normalizeResponseType($name)
+	{
+		// for multiple-valued response types - make them alphabetical
+		if (!empty($name) && false !== strpos($name, ' ')) {
+			$types = explode(' ', $name);
+			sort($types);
+			$name = implode(' ', $types);
+		}
+
+		return $name;
+	}
+
+	public function getResponse()
+	{
+		return $this->response;
+	}
+
+	public function getStorages()
+	{
+		return $this->storages;
+	}
+
+	public function getStorage($name)
+	{
+		return isset($this->storages[$name]) ? $this->storages[$name] : null;
+	}
+
+	public function getGrantTypes()
+	{
+		return $this->grantTypes;
+	}
+
+	public function getGrantType($name)
+	{
+		return isset($this->grantTypes[$name]) ? $this->grantTypes[$name] : null;
+	}
+
+	public function getResponseTypes()
+	{
+		return $this->responseTypes;
+	}
+
+	public function getResponseType($name)
+	{
+		// for multiple-valued response types - make them alphabetical
+		$name = $this->normalizeResponseType($name);
+
+		return isset($this->responseTypes[$name]) ? $this->responseTypes[$name] : null;
+	}
+
+	public function getTokenType()
+	{
+		return $this->tokenType;
+	}
+
+	public function getClientAssertionType()
+	{
+		return $this->clientAssertionType;
+	}
+
+	public function setConfig($name, $value)
+	{
+		$this->config[$name] = $value;
+	}
+
+	public function getConfig($name, $default = null)
+	{
+		return isset($this->config[$name]) ? $this->config[$name] : $default;
+	}
 }

extensions/libraries/redcore/api/oauth2/Autoloader.php

Indentation +38 added lines, -38 removed lines

@@ -10,47 +10,47 @@
  */
 class Autoloader
 {
-    private $dir;
+	private $dir;
 
-    public function __construct($dir = null)
-    {
-        if (is_null($dir)) {
-            $dir = dirname(__FILE__).'/..';
-        }
-        $this->dir = $dir;
-    }
-    /**
-     * Registers OAuth2\Autoloader as an SPL autoloader.
-     */
-    public static function register($dir = null)
-    {
-        ini_set('unserialize_callback_func', 'spl_autoload_call');
-        spl_autoload_register(array(new self($dir), 'autoload'));
-    }
+	public function __construct($dir = null)
+	{
+		if (is_null($dir)) {
+			$dir = dirname(__FILE__).'/..';
+		}
+		$this->dir = $dir;
+	}
+	/**
+	 * Registers OAuth2\Autoloader as an SPL autoloader.
+	 */
+	public static function register($dir = null)
+	{
+		ini_set('unserialize_callback_func', 'spl_autoload_call');
+		spl_autoload_register(array(new self($dir), 'autoload'));
+	}
 
-    /**
-     * Handles autoloading of classes.
-     *
-     * @param string $class A class name.
-     *
-     * @return boolean Returns true if the class has been loaded
-     */
-    public function autoload($class)
-    {
-        if (0 !== strpos($class, 'OAuth2')) {
-            return;
-        }
+	/**
+	 * Handles autoloading of classes.
+	 *
+	 * @param string $class A class name.
+	 *
+	 * @return boolean Returns true if the class has been loaded
+	 */
+	public function autoload($class)
+	{
+		if (0 !== strpos($class, 'OAuth2')) {
+			return;
+		}
 
-	    $class = str_replace('\\', '/', $class);
+		$class = str_replace('\\', '/', $class);
 
-	    if (strpos($class, 'OAuth2') === 0)
-	    {
-		    $count = 1;
-		    $class = str_replace('OAuth2', 'oauth2', $class, $count);
-	    }
+		if (strpos($class, 'OAuth2') === 0)
+		{
+			$count = 1;
+			$class = str_replace('OAuth2', 'oauth2', $class, $count);
+		}
 
-        if (file_exists($file = $this->dir . '/' . $class . '.php')) {
-            require $file;
-        }
-    }
+		if (file_exists($file = $this->dir . '/' . $class . '.php')) {
+			require $file;
+		}
+	}
 }

extensions/libraries/redcore/api/oauth2/GrantType/UserCredentials.php

Indentation +50 added lines, -50 removed lines

@@ -13,71 +13,71 @@
  */
 class UserCredentials implements GrantTypeInterface
 {
-    private $userInfo;
+	private $userInfo;
 
-    protected $storage;
+	protected $storage;
 
-    /**
-     * @param OAuth2\Storage\UserCredentialsInterface $storage REQUIRED Storage class for retrieving user credentials information
-     */
-    public function __construct(UserCredentialsInterface $storage)
-    {
-        $this->storage = $storage;
-    }
+	/**
+	 * @param OAuth2\Storage\UserCredentialsInterface $storage REQUIRED Storage class for retrieving user credentials information
+	 */
+	public function __construct(UserCredentialsInterface $storage)
+	{
+		$this->storage = $storage;
+	}
 
-    public function getQuerystringIdentifier()
-    {
-        return 'password';
-    }
+	public function getQuerystringIdentifier()
+	{
+		return 'password';
+	}
 
-    public function validateRequest(RequestInterface $request, ResponseInterface $response)
-    {
-        if (!$request->request("password") || !$request->request("username")) {
-            $response->setError(400, 'invalid_request', 'Missing parameters: "username" and "password" required');
+	public function validateRequest(RequestInterface $request, ResponseInterface $response)
+	{
+		if (!$request->request("password") || !$request->request("username")) {
+			$response->setError(400, 'invalid_request', 'Missing parameters: "username" and "password" required');
 
-            return null;
-        }
+			return null;
+		}
 
-        if (!$this->storage->checkUserCredentials($request->request("username"), $request->request("password"))) {
-            $response->setError(401, 'invalid_grant', 'Invalid username and password combination');
+		if (!$this->storage->checkUserCredentials($request->request("username"), $request->request("password"))) {
+			$response->setError(401, 'invalid_grant', 'Invalid username and password combination');
 
-            return null;
-        }
+			return null;
+		}
 
-        $userInfo = $this->storage->getUserDetails($request->request("username"));
+		$userInfo = $this->storage->getUserDetails($request->request("username"));
 
-        if (empty($userInfo)) {
-            $response->setError(400, 'invalid_grant', 'Unable to retrieve user information');
+		if (empty($userInfo)) {
+			$response->setError(400, 'invalid_grant', 'Unable to retrieve user information');
 
-            return null;
-        }
+			return null;
+		}
 
-        if (!isset($userInfo['user_id'])) {
-            throw new \LogicException("you must set the user_id on the array returned by getUserDetails");
-        }
+		if (!isset($userInfo['user_id'])) {
+			throw new \LogicException("you must set the user_id on the array returned by getUserDetails");
+		}
 
-        $this->userInfo = $userInfo;
+		$this->userInfo = $userInfo;
 
-        return true;
-    }
+		return true;
+	}
 
-    public function getClientId()
-    {
-        return null;
-    }
+	public function getClientId()
+	{
+		return null;
+	}
 
-    public function getUserId()
-    {
-        return $this->userInfo['user_id'];
-    }
+	public function getUserId()
+	{
+		return $this->userInfo['user_id'];
+	}
 
-    public function getScope()
-    {
-        return isset($this->userInfo['scope']) ? $this->userInfo['scope'] : null;
-    }
+	public function getScope()
+	{
+		return isset($this->userInfo['scope']) ? $this->userInfo['scope'] : null;
+	}
 
-    public function createAccessToken(AccessTokenInterface $accessToken, $client_id, $user_id, $scope)
-    {
-        return $accessToken->createAccessToken($client_id, $user_id, $scope);
-    }
+	public function createAccessToken(AccessTokenInterface $accessToken, $client_id, $user_id, $scope)
+	{
+		return $accessToken->createAccessToken($client_id, $user_id, $scope);
+	}
 }

extensions/libraries/redcore/api/oauth2/GrantType/AuthorizationCode.php

Indentation +69 added lines, -69 removed lines

@@ -13,88 +13,88 @@
  */
 class AuthorizationCode implements GrantTypeInterface
 {
-    protected $storage;
-    protected $authCode;
-
-    /**
-     * @param OAuth2\Storage\AuthorizationCodeInterface $storage REQUIRED Storage class for retrieving authorization code information
-     */
-    public function __construct(AuthorizationCodeInterface $storage)
-    {
-        $this->storage = $storage;
-    }
-
-    public function getQuerystringIdentifier()
-    {
-        return 'authorization_code';
-    }
-
-    public function validateRequest(RequestInterface $request, ResponseInterface $response)
-    {
-        if (!$request->request('code')) {
-            $response->setError(400, 'invalid_request', 'Missing parameter: "code" is required');
-
-            return false;
-        }
-
-        $code = $request->request('code');
-        if (!$authCode = $this->storage->getAuthorizationCode($code)) {
-            $response->setError(400, 'invalid_grant', 'Authorization code doesn\'t exist or is invalid for the client');
-
-            return false;
-        }
-
-        /*
+	protected $storage;
+	protected $authCode;
+
+	/**
+	 * @param OAuth2\Storage\AuthorizationCodeInterface $storage REQUIRED Storage class for retrieving authorization code information
+	 */
+	public function __construct(AuthorizationCodeInterface $storage)
+	{
+		$this->storage = $storage;
+	}
+
+	public function getQuerystringIdentifier()
+	{
+		return 'authorization_code';
+	}
+
+	public function validateRequest(RequestInterface $request, ResponseInterface $response)
+	{
+		if (!$request->request('code')) {
+			$response->setError(400, 'invalid_request', 'Missing parameter: "code" is required');
+
+			return false;
+		}
+
+		$code = $request->request('code');
+		if (!$authCode = $this->storage->getAuthorizationCode($code)) {
+			$response->setError(400, 'invalid_grant', 'Authorization code doesn\'t exist or is invalid for the client');
+
+			return false;
+		}
+
+		/*
          * 4.1.3 - ensure that the "redirect_uri" parameter is present if the "redirect_uri" parameter was included in the initial authorization request
          * @uri - http://tools.ietf.org/html/rfc6749#section-4.1.3
          */
-        if (isset($authCode['redirect_uri']) && $authCode['redirect_uri']) {
-            if (!$request->request('redirect_uri') || urldecode($request->request('redirect_uri')) != $authCode['redirect_uri']) {
-                $response->setError(400, 'redirect_uri_mismatch', "The redirect URI is missing or do not match", "#section-4.1.3");
+		if (isset($authCode['redirect_uri']) && $authCode['redirect_uri']) {
+			if (!$request->request('redirect_uri') || urldecode($request->request('redirect_uri')) != $authCode['redirect_uri']) {
+				$response->setError(400, 'redirect_uri_mismatch', "The redirect URI is missing or do not match", "#section-4.1.3");
 
-                return false;
-            }
-        }
+				return false;
+			}
+		}
 
-        if (!isset($authCode['expires'])) {
-            throw new \Exception('Storage must return authcode with a value for "expires"');
-        }
+		if (!isset($authCode['expires'])) {
+			throw new \Exception('Storage must return authcode with a value for "expires"');
+		}
 
-        if ($authCode["expires"] < time()) {
-            $response->setError(400, 'invalid_grant', "The authorization code has expired");
+		if ($authCode["expires"] < time()) {
+			$response->setError(400, 'invalid_grant', "The authorization code has expired");
 
-            return false;
-        }
+			return false;
+		}
 
-        if (!isset($authCode['code'])) {
-            $authCode['code'] = $code; // used to expire the code after the access token is granted
-        }
+		if (!isset($authCode['code'])) {
+			$authCode['code'] = $code; // used to expire the code after the access token is granted
+		}
 
-        $this->authCode = $authCode;
+		$this->authCode = $authCode;
 
-        return true;
-    }
+		return true;
+	}
 
-    public function getClientId()
-    {
-        return $this->authCode['client_id'];
-    }
+	public function getClientId()
+	{
+		return $this->authCode['client_id'];
+	}
 
-    public function getScope()
-    {
-        return isset($this->authCode['scope']) ? $this->authCode['scope'] : null;
-    }
+	public function getScope()
+	{
+		return isset($this->authCode['scope']) ? $this->authCode['scope'] : null;
+	}
 
-    public function getUserId()
-    {
-        return isset($this->authCode['user_id']) ? $this->authCode['user_id'] : null;
-    }
+	public function getUserId()
+	{
+		return isset($this->authCode['user_id']) ? $this->authCode['user_id'] : null;
+	}
 
-    public function createAccessToken(AccessTokenInterface $accessToken, $client_id, $user_id, $scope)
-    {
-        $token = $accessToken->createAccessToken($client_id, $user_id, $scope);
-        $this->storage->expireAuthorizationCode($this->authCode['code']);
+	public function createAccessToken(AccessTokenInterface $accessToken, $client_id, $user_id, $scope)
+	{
+		$token = $accessToken->createAccessToken($client_id, $user_id, $scope);
+		$this->storage->expireAuthorizationCode($this->authCode['code']);
 
-        return $token;
-    }
+		return $token;
+	}
 }