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

Framework updates, and hack to get CI testing working
This commit is contained in:
Deon George
2021-12-03 13:36:25 +11:00
parent 88eb35a567
commit 2ccc1d3b83
33 changed files with 3424 additions and 2184 deletions

View File

@@ -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();
}
}

View File

@@ -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())) : []);

View File

@@ -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' => [

View File

@@ -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);
}
}