Slight cleanup and keeping to MVC pattern

resting · Feb 17, 2012 · f22fa68 · f22fa68
1 parent d77efc0
commit f22fa68
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/Controller/OAuthController.php b/Controller/OAuthController.php
@@ -32,7 +32,6 @@ class OAuthController extends OAuthAppController {
  */
 	public function beforeFilter() {
 		parent::beforeFilter();
-		$this->OAuth->allow('test');
 		$this->OAuth->authenticate = array('fields' => array('username' => 'email'));
 		$this->Security->blackHoleCallback = 'blackHole';
 	}
@@ -142,7 +141,6 @@ public function login () {
  */
 	public function token(){
 		$this->autoRender = false;
-		$this->Security->csrfCheck = false;
 		try {
 			$this->OAuth->grantAccessToken();
 		} catch (OAuth2ServerException $e) {
@@ -159,9 +157,9 @@ public function token(){
  * 
  */
 	public function userinfo() {
-		$this->autoRender = false;
+		$this->layout = null;
 		$user = $this->OAuth->user();
-		echo json_encode($user);
+		$this->set(compact('user'));
 	}
 
 /**

diff --git a/View/OAuth/userinfo.ctp b/View/OAuth/userinfo.ctp
@@ -0,0 +1,5 @@
+<?php
+
+echo json_encode($user);
+
+?>