Refactored skeleton to include some changes so that we don't have to pass user object around everywhere and also removed some unecessary controller and view.

Author: Eugene Lee

app/controllers/AdminController.php

@@ -2,8 +2,21 @@
 
 class AdminController extends BaseController {
 
+	protected $logged_in_user;
+
+	public function __construct() {
+		// Fetch the User object, or set it to false if not logged in
+		if (Confide::User()) {
+			$this->logged_in_user = Confide::User();
+		}
+		else {
+			$this->logged_in_user = false;
+		}
+
+		View::share('logged_in_user', $this->logged_in_user);
+	}
 
 	public function index() {
-		return View::make('admin.index')->with('user', Confide::user());
+		return View::make('admin.index');
 	}
 }

app/controllers/ApiController.php

@@ -8,6 +8,7 @@ class ApiController extends Controller {
 	public function __construct()
 	{
 		$this->token = Input::get('token');
+		$this->user = User::getFromToken($this->token);
 	}
 
 }

app/controllers/HomeController.php

@@ -2,18 +2,6 @@
 
 class AdminUserController extends AdminController {
 
-	/**
-	 * Setup the layout used by the controller.
-	 *
-	 * @return void
-	 */
-	protected function setupLayout()
-	{
-		if (!is_null($this->layout))
-		{
-			$this->layout = View::make($this->layout);
-		}
-	}
 
 	public function index()
 	{
@@ -30,7 +18,9 @@ public function store()
 		// Get form data, create new user
 		// Hacky, I know, but had to do this because of Sentry
 		$user_data = Input::all();
-		$user = new User($user_data);
+		$user = new User();
+		$user->fill($user_data);
+
 		// TODO:  If we need to do confirmation, then stop doing this below
 		$user->confirmed = 1;
 
@@ -84,11 +74,11 @@ public function login()
 		{
 			// If user is logged, redirect to internal
 			// page, change it to '/admin', '/dashboard' or something
-			return Redirect::to('/')->with('user', Confide::user());
+			return Redirect::to('/');
 		}
 		else
 		{
-			return View::make('/login')->with('user', new User());
+			return View::make('/login');
 		}
 	}
 

app/controllers/admin/UserController.php

@@ -5,10 +5,8 @@ class ApiV1UserController extends ApiController {
 
 	public function index()
 	{
-		// Get user from token
-		$user = User::getFromToken($this->token);
 		// Find permissions and find users that this person has permissions to view
-		if($user->can('manage_user')) {
+		if($this->user->can('manage_user')) {
 
 			$users = User::all();
 			return Api::response($users->toArray());

app/controllers/api/v1/UserController.php

@@ -58,7 +58,7 @@
 	// Invalid API key
 	if ($validate !== true)
 	{
-		return Api::error($validate->errors()->getMessages());
+		return Api::error($validate->errors()->getMessages(), 401);
 	}
 });
 
@@ -76,14 +76,14 @@
 	// Invalid API key
 	if ($validate !== true)
 	{
-		return Api::error($validate->errors()->getMessages());
+		return Api::error($validate->errors()->getMessages(), 401);
 	}
 
 	$validToken = User::isValidToken(Input::get('token'));
 
 	if($validToken !== true)
 	{
-		return Api::error(Lang::get('errors.invalid_token'));
+		return Api::error(Lang::get('errors.invalid_token'), 401);
 	}
 });
 

app/filters.php

@@ -5,7 +5,7 @@
 			<label for="username" class="col-md-4">Username</label>
 			<div class="col-md-8">
 				{{ Form::text('username', $user->username, array('class' => 'form-control', 'id' => 'username')) }}
-				{{ $errors->first('username') }}
+				<span class="text-danger">{{ $errors->first('username') }}</span>
 			</div> <!-- /controls -->
 		</div> <!-- /control-group -->
 
@@ -14,7 +14,7 @@
 			<label for="first_name" class="col-md-4">First Name</label>
 			<div class="col-md-8">
 				{{ Form::text('first_name', $user->first_name, array('class' => 'form-control', 'id' => 'first_name')) }}
-				{{ $errors->first('first_name') }}
+				<span class="text-danger">{{ $errors->first('first_name') }}</span>
 			</div> <!-- /controls -->
 		</div> <!-- /control-group -->
 
@@ -23,7 +23,7 @@
 			<label class="col-md-4" for="last_name">Last Name</label>
 			<div class="col-md-8">
 				{{ Form::text('last_name', $user->last_name, array('class' => 'form-control', 'id' => 'last_name')) }}
-				{{ $errors->first('last_name') }}
+				<span class="text-danger">{{ $errors->first('last_name') }}</span>
 			</div>
 		</div> <!-- /control-group -->
 
@@ -32,7 +32,7 @@
 			<label class="col-md-4" for="email">Email Address</label>
 			<div class="col-md-8">
 				{{ Form::text('email', $user->email, array('class' => 'form-control', 'id' => 'email')) }}
-				{{ $errors->first('email') }}
+				<span class="text-danger">{{ $errors->first('email') }}</span>
 			</div> <!-- /controls -->
 		</div> <!-- /control-group -->
 
@@ -43,7 +43,7 @@
 			<label class="col-md-4" for="password">Password</label>
 			<div class="col-md-8">
 				{{ Form::password('password', array('class' => 'form-control', 'id' => 'password')) }}
-				{{ $errors->first('password') }}
+				<span class="text-danger">{{ $errors->first('password') }}</span>
 			</div> <!-- /controls -->
 		</div> <!-- /control-group -->
 
@@ -52,7 +52,7 @@
 			<label class="col-md-4" for="password_confirmation">Confirm</label>
 			<div class="col-md-8">
 				{{ Form::password('password_confirmation', array('class' => 'form-control', 'id' => 'password_confirmation')) }}
-				{{ $errors->first('password_confirmation') }}
+				<span class="text-danger">{{ $errors->first('password_confirmation') }}</span>
 			</div> <!-- /controls -->
 		</div> <!-- /control-group -->
 

app/views/admin/users/form.blade.php

@@ -51,16 +51,16 @@
 			<ul class="nav navbar-nav navbar-right">
 				<li class="dropdown">
 
-					@if( !empty($user))
+					@if( !empty($logged_in_user))
 						<a href="javscript:;" class="dropdown-toggle" data-toggle="dropdown">
 							<i class="icon-user"></i>
-							{{$user->username}}
+							{{$logged_in_user->username}}
 							<b class="caret"></b>
 						</a>
 
 
 						<ul class="dropdown-menu">
-							<li><a href="/admin/users/{{$user->id}}/edit">Account Settings</a></li>
+							<li><a href="/admin/users/{{$logged_in_user->id}}/edit">Account Settings</a></li>
 							<li class="divider"></li>
 							<li><a href="/logout">Logout</a></li>
 						</ul>
@@ -79,7 +79,7 @@
 
 
 
-@if( !empty($user))
+@if( !empty($logged_in_user))
 
 <div class="subnavbar">
 
@@ -112,7 +112,7 @@
 
 						<ul class="dropdown-menu">
 							<li><a href="/admin/users">All Users</a></li>
-							<li><a href="/admin/users/{{$user->id}}/edit">My Account</a></li> <!-- TODO : Should this point to same as above link? -->
+							<li><a href="/admin/users/{{$logged_in_user->id}}/edit">My Account</a></li> <!-- TODO : Should this point to same as above link? -->
 							<li><a href="/admin/users/create">Create New Account</a></li>
 						</ul>
 					</li>

app/views/hello.php

@@ -5,9 +5,9 @@
 	"license": "MIT",
 	"require": {
 		"laravel/framework": "4.0.*",
-		"zizaco/confide": "1.0.x",
-		"zizaco/entrust": "dev-master",
-    		"way/generators": "dev-master",
+		"zizaco/confide": "2.0.0b4",
+		"zizaco/entrust": "0.4.0beta",
+		"way/generators": "1.0"
 	},
 	"autoload": {
 		"classmap": [
@@ -17,7 +17,7 @@
 			"app/database/migrations",
 			"app/database/seeds",
 			"app/tests/TestCase.php",
-            "app/libraries"
+      "app/libraries"
 		]
 	},
 	"scripts": {
@@ -36,5 +36,5 @@
 		"preferred-install": "dist"
 	},
 	"minimum-stability": "dev",
-    "prefer-stable": true
+  "prefer-stable": true
 }