Framework update and updates from other projects,remove leenooks/laravel

Framework updates, and hack to get CI testing working

app/Exceptions/Handler.php

@@ -22,34 +22,20 @@ class Handler extends ExceptionHandler
      * @var array
      */
     protected $dontFlash = [
+        'current_password',
         'password',
         'password_confirmation',
     ];
 
     /**
-     * Report or log an exception.
+     * Register the exception handling callbacks for the application.
      *
-     * @param  \Throwable  $exception
      * @return void
-     *
-     * @throws \Exception
      */
-    public function report(Throwable $exception)
+    public function register()
     {
-        parent::report($exception);
-    }
-
-    /**
-     * Render an exception into an HTTP response.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Throwable  $exception
-     * @return \Symfony\Component\HttpFoundation\Response
-     *
-     * @throws \Throwable
-     */
-    public function render($request, Throwable $exception)
-    {
-        return parent::render($request, $exception);
+        $this->reportable(function (Throwable $e) {
+            //
+        });
     }
 }

app/Http/Controllers/Auth/SocialLoginController.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Auth;
-
-use Illuminate\Support\Facades\Auth;
-use App\Http\Controllers\Controller;
-
-use Socialite;
-
-class SocialLoginController extends Controller
-{
-	public function redirectToProvider($provider)
-	{
-		return Socialite::with($provider)->redirect();
-	}
-
-	public function handleProviderCallback($provider)
-	{
-		$openiduser = Socialite::with($provider)->user();
-		$user = Socialite::with($provider)->findOrCreateUser($openiduser);
-
-		Auth::login($user,FALSE);
-
-		/*
-		if (! $user->profile_update)
-		{
-			return redirect()->to(url('settings'));
-		}
-		*/
-
-		return redirect()->intended();
-	}
-}

app/Http/Controllers/HomeController.php

@@ -59,7 +59,7 @@ class HomeController extends Controller
 			$attrs = collect();
 		}
 
-		return view('widgets.dn')
+		return view('frames.dn')
 			->with('dn',__('Server Info'))
 			->with('leaf',$root)
 			->with('attributes',$this->sortAttrs($attrs));
@@ -69,7 +69,7 @@ class HomeController extends Controller
 	{
 		$dn = Crypt::decryptString($request->post('key'));
 
-		return view('widgets.dn')
+		return view('frames.dn')
 			->with('dn',$dn)
 			->with('leaf',$x=(new Server)->fetch($dn))
 			->with('attributes',$x ? $this->sortAttrs(collect($x->getAttributes())) : []);

app/Http/Kernel.php

@@ -5,6 +5,8 @@ namespace App\Http;
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 use Laravel\Passport\Http\Middleware\CreateFreshApiToken;
 
+use App\Http\Middleware\GuestUser;
+
 class Kernel extends HttpKernel
 {
     /**
@@ -39,6 +41,7 @@ class Kernel extends HttpKernel
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
             \Laravel\Passport\Http\Middleware\CreateFreshApiToken::class,
+            GuestUser::class,
         ],
 
         'api' => [

app/Http/Middleware/GuestUser.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use App\Ldap\User;
+use Closure;
+
+/**
+ * Class GuestUser
+ * @package Leenooks\Laravel\Http\Middleware
+ */
+class GuestUser
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request,Closure $next)
+    {
+        view()->share('user', auth()->user() ?: new User);
+
+        return $next($request);
+    }
+}

app/Providers/RouteServiceProvider.php

@@ -2,27 +2,32 @@
 
 namespace App\Providers;
 
+use Illuminate\Cache\RateLimiting\Limit;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\RateLimiter;
 use Illuminate\Support\Facades\Route;
 
 class RouteServiceProvider extends ServiceProvider
 {
-    /**
-     * This namespace is applied to your controller routes.
-     *
-     * In addition, it is set as the URL generator's root namespace.
-     *
-     * @var string
-     */
-    protected $namespace = 'App\Http\Controllers';
-
     /**
      * The path to the "home" route for your application.
      *
+     * This is used by Laravel authentication to redirect users after login.
+     *
      * @var string
      */
     public const HOME = '/home';
 
+    /**
+     * The controller namespace for the application.
+     *
+     * When present, controller route declarations will automatically be prefixed with this namespace.
+     *
+     * @var string|null
+     */
+    // protected $namespace = 'App\\Http\\Controllers';
+
     /**
      * Define your route model bindings, pattern filters, etc.
      *
@@ -30,51 +35,29 @@ class RouteServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        //
+        $this->configureRateLimiting();
 
-        parent::boot();
+        $this->routes(function () {
+            Route::prefix('api')
+                ->middleware('api')
+                ->namespace($this->namespace)
+                ->group(base_path('routes/api.php'));
+
+            Route::middleware('web')
+                ->namespace($this->namespace)
+                ->group(base_path('routes/web.php'));
+        });
     }
 
     /**
-     * Define the routes for the application.
+     * Configure the rate limiters for the application.
      *
      * @return void
      */
-    public function map()
+    protected function configureRateLimiting()
     {
-        $this->mapApiRoutes();
-
-        $this->mapWebRoutes();
-
-        //
-    }
-
-    /**
-     * Define the "web" routes for the application.
-     *
-     * These routes all receive session state, CSRF protection, etc.
-     *
-     * @return void
-     */
-    protected function mapWebRoutes()
-    {
-        Route::middleware('web')
-             ->namespace($this->namespace)
-             ->group(base_path('routes/web.php'));
-    }
-
-    /**
-     * Define the "api" routes for the application.
-     *
-     * These routes are typically stateless.
-     *
-     * @return void
-     */
-    protected function mapApiRoutes()
-    {
-        Route::prefix('api')
-             ->middleware('api')
-             ->namespace($this->namespace)
-             ->group(base_path('routes/api.php'));
+        RateLimiter::for('api', function (Request $request) {
+            return Limit::perMinute(60)->by(optional($request->user())->id ?: $request->ip());
+        });
     }
 }