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

Move SSO & Registration settings to the new admin panel's Auth page

Browse Source
This commit is contained in:
Bubka
2024-09-20 09:58:53 +02:00
parent 012af3177b
commit d629ed83c5
8 changed files with 168 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Api/v1/Controllers/SettingController.php
View File

@ -6,6 +6,7 @@ use App\Api\v1\Requests\SettingStoreRequest;
use App\Api\v1\Requests\SettingUpdateRequest;
use App\Facades\Settings;
use App\Http\Controllers\Controller;
use Illuminate\Validation\ValidationException;
class SettingController extends Controller
{
@ -95,8 +96,18 @@ class SettingController extends Controller
abort(404);
}
$appSettings = config('2fauth.settings');
if (array_key_exists($settingName, $appSettings)) {
$defaultAppSettings = config('2fauth.settings');
// When deleting a setting, it may be an original or an additional one:
// - Additional settings are created by administrators to extend 2FAuth, they are not registered in the laravel config object.
// They are not nullable so empty string is not allowed.They only exist in the Options table, so it is possible to delete them.
// - Original settings are part of 2FAuth, they are registered in the laravel config object with their default value.
// When set by an admin, their custom value is stored in the Options table too. Deleting a custom value in the Options table from here
// won't delete the setting at all, so we reject all requests that ask for.
// But there is an exception with the restrictRule and restrictList settings:
// Unlike other settings, these two have to support empty strings. Because the Options table does not allow empty strings,
// the only way to set them like so is to restore their original value, an empty string.
if (array_key_exists($settingName, $defaultAppSettings) && $defaultAppSettings[$settingName] !== '') {
return response()->json(
['message' => 'bad request',
'reason' => [__('errors.delete_user_setting_only')],