extern/2FAuth
1
0
Fork 0
mirror of https://github.com/Bubka/2FAuth.git synced 2025-08-17 09:01:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Set SettingService behind a Facade

Browse Source
This commit is contained in:
Bubka
2022-07-30 17:51:02 +02:00
parent be632bb489
commit f7ac1e96c3
21 changed files with 101 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/Http/Controllers/SinglePageController.php
View File

@ -2,27 +2,12 @@
namespace App\Http\Controllers;
use App\Services\SettingService;
use App\Facades\Settings;
use Illuminate\Support\Facades\App;
class SinglePageController extends Controller
{
/**
* The Settings Service instance.
*/
protected SettingService $settingService;
/**
* Create a new controller instance.
*
*/
public function __construct(SettingService $settingService)
{
$this->settingService = $settingService;
}
/**
* return the main view
@ -31,7 +16,7 @@ class SinglePageController extends Controller
public function index()
{
return view('landing')->with([
'appSettings' => $this->settingService->all()->toJson(),
'appSettings' => Settings::all()->toJson(),
'appConfig' => collect([
'proxyAuth' => config("auth.defaults.guard") === 'reverse-proxy-guard' ? true : false,
'proxyLogoutUrl' => config("2fauth.config.proxyLogoutUrl") ? config("2fauth.config.proxyLogoutUrl") : false,

19
app/Http/Controllers/SystemController.php
View File

@ -3,27 +3,12 @@
namespace App\Http\Controllers;
use App\Http\Controllers\Controller;
use App\Services\SettingService;
use App\Facades\Settings;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
class SystemController extends Controller
{
/**
* The Settings Service instance.
*/
protected SettingService $settingService;
/**
* Create a new controller instance.
*/
public function __construct(SettingService $settingService)
{
$this->settingService = $settingService;
}
/**
* Get detailed information about the current installation
*
@ -55,7 +40,7 @@ class SystemController extends Controller
$infos['Trusted proxies'] = config('2fauth.trustedProxies') ?: 'none';
// User info
if ($request->user()) {
$infos['options'] = $this->settingService->all()->toArray();
$infos['options'] = Settings::all()->toArray();
}
return response()->json($infos);