update demo

Signed-off-by: Suhayb El Wardany <[email protected]>

app/commands/DemoInstallCommand.php

@@ -0,0 +1,69 @@
+<?php
+
+use Illuminate\Console\Command;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputArgument;
+
+class DemoInstallCommand extends Command {
+
+	/**
+	 * The console command name.
+	 *
+	 * @var string
+	 */
+	protected $name = 'demo:install';
+
+	/**
+	 * The console command description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'Install demo.';
+
+	/**
+	 * Create a new command instance.
+	 *
+	 * @return void
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+	/**
+	 * Execute the console command.
+	 *
+	 * @return mixed
+	 */
+	public function fire()
+	{
+		$this->call('migrate');
+		$this->call('migrate:reset');
+		$this->call('migrate', ['--package' => 'cartalyst/sentry']);
+	}
+
+	/**
+	 * Get the console command arguments.
+	 *
+	 * @return array
+	 */
+	protected function getArguments()
+	{
+		return array(
+
+		);
+	}
+
+	/**
+	 * Get the console command options.
+	 *
+	 * @return array
+	 */
+	protected function getOptions()
+	{
+		return array(
+
+		);
+	}
+
+}

app/config/mail.php

@@ -119,6 +119,6 @@
 	|
 	*/
 
-	'pretend' => false,
+	'pretend' => true,
 
-);
+);

app/controllers/AuthController.php

@@ -97,7 +97,9 @@ public function processRegistration()
 		{
 			$activation = Activation::create($user);
 
-			$sent = Mail::send('sentry.emails.activate', compact('user', 'activation'), function($m) use ($user)
+			$code = $activation->code;
+
+			$sent = Mail::send('sentry.emails.activate', compact('user', 'code'), function($m) use ($user)
 			{
 				$m->to($user->email)->subject('Activate Your Account');
 			});

app/routes.php

@@ -11,6 +11,9 @@
 |
 */
 
+// Disable checkpoints (throttling, activation) for demo purposes
+Sentry::disableCheckpoints();
+
 Route::get('logout', function()
 {
 	Sentry::logout();
@@ -40,6 +43,11 @@
 
 Route::get('/', function()
 {
+	if (Sentry::check())
+	{
+		return Redirect::to('account');
+	}
+
 	return View::make('sentry/index');
 });
 
@@ -49,8 +57,6 @@
 Route::get('register', 'AuthController@register');
 Route::post('register', 'AuthController@processRegistration');
 
-
-
 Route::get('wait', function()
 {
 	return View::make('sentry.wait');
@@ -78,6 +84,11 @@
 
 	$activation = Activation::exists($user) ?: Activation::create($user);
 
+	// This is used for the demo, usually you would want
+	// to activate the account through the link you
+	// receive in the activation email
+	Activation::complete($user, $activation->code);
+
 	$code = $activation->code;
 
 	$sent = Mail::send('sentry.emails.activate', compact('user', 'code'), function($m) use ($user)
@@ -90,7 +101,7 @@
 		return Redirect::to('register')->withErrors('Failed to send activation email.');
 	}
 
-	return Redirect::to('wait');
+	return Redirect::to('account');
 })->where('id', '\d+');
 
 Route::get('deactivate', function()
@@ -199,15 +210,10 @@
 	Route::get('/', function()
 	{
 		$user = Sentry::getUser();
-		$persistence = Sentry::getPersistence();
-		$activationCode = '';
 
-		if ( ! $user->isActivated())
-		{
-			$activationCode = Activation::exists($user);
-		}
+		$persistence = Sentry::getPersistence();
 
-		return View::make('sentry.account.home', compact('user', 'persistence', 'activationCode'));
+		return View::make('sentry.account.home', compact('user', 'persistence'));
 	});
 
 	Route::get('kill/{code}', function($code)
@@ -252,7 +258,7 @@
 
 		Session::reflash();
 
-		$user = Sentry::authenticate(compact('email', 'password'));
+		$user = Sentry::forceAuthenticateAndRemember(compact('email', 'password'));
 
 		if ( ! $user)
 		{
@@ -325,7 +331,7 @@
 			}
 
 			// We should expect another exception
-			Sentry::authenticate(compact('email', 'password'));
+			Sentry::forceAuthenticateAndRemember(compact('email', 'password'));
 
 			// We should never get here
 			return Redirect::to('login')
@@ -384,7 +390,7 @@
 
 			$user = SwipeIdentity::checkAnswer($user, Input::get('code'), function($user)
 			{
-				return Sentry::authenticate($user, (bool) Input::old('remember', false));
+				return Sentry::forceAuthenticateAndRemember($user, (bool) Input::old('remember', false));
 			});
 
 			if ( ! $user)

app/start/artisan.php

@@ -11,3 +11,4 @@
 |
 */
 
+Artisan::add(new DemoInstallCommand);

app/views/sentry/account/home.blade.php

@@ -38,7 +38,7 @@
 		<div class="col-md-6">
 			<h3>Activation</h3>
 
-			@if ($user->isActivated())
+			@if (Activation::completed($user))
 
 				<a class="btn btn-danger" href="{{ URL::to('deactivate') }}">Deactivate</a>
 

app/views/sentry/emails/activate.blade.php

@@ -1 +1 @@
-Activate your account by clicking <a href="{{ URL::to("activate/{$user->getUserId()}/{$activation->code}") }}">here</a>
+Activate your account by clicking <a href="{{ URL::to("activate/{$user->getUserId()}/{$code}") }}">here</a>

app/views/template.blade.php

@@ -52,7 +52,7 @@
 						@if ($user = Sentry::check())
 						<ul class="nav navbar-nav pull-right">
 							<li{{ Request::is('account') ? ' class="active"' : null }}><a href="{{ URL::to('account') }}">Account
-							@if ( ! $user->isActivated())
+							@if ( ! Activation::completed($user))
 								<span class="label label-danger">Inactive</span>
 							@endif
 							</a></li>

composer.json

@@ -5,7 +5,6 @@
 	"license": "MIT",
 	"require": {
 		"cartalyst/sentry": "dev-develop",
-		"doctrine/dbal": "2.5.*",
 		"laravel/framework": "4.1.*"
 	},
 	"autoload": {