replace filter with middleware. fix #49

src/Pingpong/Admin/Middleware/Authenticate.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace Pingpong\Admin\Middleware;
+
+use Closure;
+use Illuminate\Contracts\Auth\Guard;
+
+class Authenticate
+{
+ /**
+ * The Guard implementation.
+ *
+ * @var Guard
+ */
+ protected $auth;
+
+ /**
+ * Create a new filter instance.
+ *
+ * @param Guard $auth
+ * @return void
+ */
+ public function __construct(Guard $auth)
+ {
+ $this->auth = $auth;
+ }
+
+ /**
+ * Handle an incoming request.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param \Closure $next
+ * @return mixed
+ */
+ public function handle($request, Closure $next)
+ {
+ if ($this->auth->guest()) {
+ if ($request->ajax()) {
+ return response('Unauthorized.', 401);
+ } else {
+ return redirect()->route('admin.login.index');
+ }
+ }
+
+ return $next($request);
+ }
+}

src/Pingpong/Admin/Middleware/OnlyAdmin.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Pingpong\Admin\Middleware;
+
+use Closure;
+
+class OnlyAdmin
+{
+ /**
+ * Handle an incoming request.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param \Closure $next
+ * @return mixed
+ */
+ public function handle($request, Closure $next)
+ {
+ if ( ! $request->user()->is('admin')) {
+ return redirect()->route('admin.login.index');
+ }
+
+ return $next($request);
+ }
+}

src/Pingpong/Admin/Middleware/RedirectIfAuthenticated.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Pingpong\Admin\Middleware;
+
+use Closure;
+
+class RedirectIfAuthenticated
+{
+ /**
+ * Handle an incoming request.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param \Closure $next
+ * @return mixed
+ */
+ public function handle($request, Closure $next)
+ {
+ if (auth()->check()) {
+ return redirect()->route('admin.home');
+ }
+
+ return $next($request);
+ }
+}

src/config/config.php

@@ -3,8 +3,11 @@
 return [
  'prefix' => 'admin',
  'filter' => [
- 'auth' => 'admin.auth',
- 'guest' => 'admin.guest',
+ 'auth' => [
+ Pingpong\Admin\Middleware\Authenticate::class,
+ Pingpong\Admin\Middleware\OnlyAdmin::class
+ ],
+ 'guest' => Pingpong\Admin\Middleware\RedirectIfAuthenticated::class,
  ],
  'views' => [
  'layout' => 'admin::layouts.master',