More improvements to User Switch

composer.json

@@ -18,7 +18,10 @@
     "autoload": {
         "psr-4": {
             "Leenooks\\": "src"
-        }
+        },
+        "files": [
+            "src/helpers.php"
+        ]
     },
     "extra": {
         "laravel": {

resources/themes/adminlte/lang/en/message.php

@@ -136,4 +136,5 @@ return [
     'loggedin'                => 'Logged in!',
     'entering'                => 'Entering...',
     'registered'              => 'User Registered!',
+    'switchoff'               => 'Switch Back',
 ];

resources/themes/adminlte/views/auth/register.blade.php

@@ -10,7 +10,7 @@
     <div id="app" v-cloak>
         <div class="register-box">
             <div class="register-logo">
-                <a href="{{ url('/home') }}"><b>Pipeline</b>Management</a>
+                <a href="{{ url('/home') }}">{!! config('app.name_html_long') !!}</a>
             </div>
 
             @if (count($errors) > 0)

resources/themes/adminlte/views/layouts/partials/mainheader.blade.php

@@ -45,7 +45,7 @@
 					<!-- Top Menu Items -->
 					@include('adminlte::layouts.partials.topmenu')
 
-					<li class="dropdown user user-menu" id="user_menu">
+					<li class="dropdown user user-menu @if($user->switched) bg-red @endif" id="user_menu">
 					<!-- Menu Toggle Button -->
 						<a href="#" class="dropdown-toggle" data-toggle="dropdown">
 							<!-- The user image in the navbar-->
@@ -69,16 +69,22 @@
 								</div>
 
 								<div class="pull-right">
-									<a href="{{ url('/logout') }}" class="btn btn-default btn-flat" id="logout"
+									@if ($user->switched)
-										onclick="event.preventDefault();
+										<a href="{{ url('/admin/switch/stop') }}" class="btn btn-default btn-flat" id="switch">
-										document.getElementById('logout-form').submit();">
+											{{ trans('adminlte_lang::message.switchoff') }}
-										{{ trans('adminlte_lang::message.signout') }}
+										</a>
-									</a>
+									@else
+										<a href="{{ url('/logout') }}" class="btn btn-default btn-flat" id="logout"
+										   onclick="event.preventDefault();
+													document.getElementById('logout-form').submit();">
+											{{ trans('adminlte_lang::message.signout') }}
+										</a>
 
-									<form id="logout-form" action="{{ url('/logout') }}" method="POST" style="display: none;">
+										<form id="logout-form" action="{{ url('/logout') }}" method="POST" style="display: none;">
-										{{ csrf_field() }}
+											{{ csrf_field() }}
-										<input type="submit" value="logout" style="display: none;">
+											<input type="submit" value="logout" style="display: none;">
-									</form>
+										</form>
+									@endif
 								</div>
 							</li>
 						</ul>
@@ -95,4 +101,4 @@
 			</ul>
 		</div>
 	</nav>
-</header>
+</header>

resources/themes/adminlte/views/layouts/partials/scripts.blade.php

@@ -4,6 +4,16 @@
 <!-- Laravel App -->
 <script src="{{ url(mix('/js/app.js')) }}" type="text/javascript"></script>
 
+<!-- Our our CSRF token to each interaction -->
+{{-- @todo Test that we are validating this, also axios should be doing this for us? --}}
+<script type="text/javascript">
+    $.ajaxSetup({
+        headers: {
+            'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
+        }
+    });
+</script>
+
 <!-- Optionally, you can add Slimscroll and FastClick plugins.
       Both of these plugins are recommended to enhance the
       user experience. Slimscroll is required when using the

src/Commands/ScheduleList.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace Leenooks\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Console\Scheduling\Schedule;
+
+class ScheduleList extends Command
+{
+	protected $signature = 'schedule:list';
+
+	protected $description = 'List when scheduled commands are executed.';
+
+	/**
+	 * @var Schedule
+	 */
+	protected $schedule;
+
+	/**
+	 * ScheduleList constructor.
+	 *
+	 * @param Schedule $schedule
+	 */
+	public function __construct(Schedule $schedule)
+	{
+		parent::__construct();
+
+		$this->schedule = $schedule;
+	}
+
+	/**
+	 * Execute the console command.
+	 *
+	 * @return mixed
+	 */
+	public function handle()
+	{
+		$events = array_map(function ($event) {
+			return [
+				'cron' => $event->expression,
+				'command' => static::fixupCommand($event->command),
+			];
+		}, $this->schedule->events());
+
+		$this->table(
+			['Cron', 'Command'],
+			$events
+		);
+	}
+
+	/**
+	 * If it's an artisan command, strip off the PHP
+	 *
+	 * @param $command
+	 * @return string
+	 */
+	protected static function fixupCommand($command)
+	{
+		$parts = explode(' ', $command);
+		if (count($parts) > 2 && $parts[1] === "'artisan'") {
+			array_shift($parts);
+		}
+
+		return implode(' ', $parts);
+	}
+}

src/Controllers/AdminController.php

@@ -2,12 +2,13 @@
 
 namespace Leenooks\Controllers;
 
+use Illuminate\Support\Facades\Auth;
 use App\Http\Controllers\Controller;
-use App\User;
-use Auth;
 use Redirect;
 use Session;
 
+use App\User;
+
 class AdminController extends Controller
 {
 	public function __construct()
@@ -15,12 +16,22 @@ class AdminController extends Controller
 		$this->middleware('auth');
 	}
 
+	public function switch_authorised()
+	{
+		return Auth::user()->isAdmin ? TRUE : FALSE;
+	}
+
+	public function switch_session()
+	{
+		return ! Session::get('orig_user');
+	}
+
 	/**
 	 * @todo Change the background color (or something) so we know we are switched
 	 */
 	public function user_switch_start($id)
 	{
-		if ($this->switch_authorised())
+		if ($this->switch_session() AND $this->switch_authorised())
 		{
 			$uo = User::find($id);
 
@@ -43,11 +54,4 @@ class AdminController extends Controller
 
 		return Redirect::to('/home');
 	}
-
+}
-
-	public function switch_authorised()
-	{
-		// @todo
-		return TRUE;
-	}
-}

src/Traits/UserSwitch.php

@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * Check if users have been switched
+ */
+namespace Leenooks\Traits;
+
+use Session;
+
+trait UserSwitch
+{
+	public function GetIsAdminAttribute()
+	{
+		return isset($this->admin) ? $this->admin : FALSE;
+	}
+
+	public function getSwitchedAttribute()
+	{
+		return Session::get('orig_user');
+	}
+}

src/helpers.php

@@ -0,0 +1,15 @@
+<?php
+
+// is_json helper
+if (! function_exists('is_json')) {
+	function is_json($string) {
+		try {
+			json_decode($string);
+
+		} catch (\Exception $e) {
+			return FALSE;
+		}
+
+		return (json_last_error() == JSON_ERROR_NONE);
+	}
+}