nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-25 10:20:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/recaptcha'

Browse Source 
# Conflicts:
#	public/mix-manifest.json
#	src/Domain/Settings/Controllers/StoreSocialServiceCredentialsController.php
This commit is contained in:
Čarodej
2022-01-25 16:29:37 +01:00
parent 630cefee41 995319cfe5
commit 3d32e8f7e0
17 changed files with 223 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Domain/Homepage/Requests/SendContactMessageRequest.php
+3
View File
@@ -1,7 +1,9 @@
<?php
namespace Domain\Homepage\Requests;
use App\Users\Rules\ReCaptchaRules;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rules\RequiredIf;
class SendContactMessageRequest extends FormRequest
{
@@ -25,6 +27,7 @@ class SendContactMessageRequest extends FormRequest
return [
'email' => 'required|email',
'message' => 'required|string',
'reCaptcha' => [new RequiredIf(get_settings('allowed_recaptcha') == 1), 'string', app(ReCaptchaRules::class)]
];
}
}
src/Domain/Settings/Controllers/StoreSocialServiceCredentialsController.php
+7 -2
View File
@@ -18,7 +18,7 @@ class StoreSocialServiceCredentialsController
// Set on social login
Setting::updateOrCreate([
'name' => "allowed_{$request->input('service')}_login",
'name' => "allowed_{$request->input('service')}",
], [
'value' => 1,
]);
@@ -27,7 +27,7 @@ class StoreSocialServiceCredentialsController
if (! app()->runningUnitTests()) {
$credentials = [
'facebook' => [
'FACEBOOK_CLIENT_ID' => $request->input('client_id'),
'FACEBOOK_CLIENT_ID' => $request->input('client_id'),
'FACEBOOK_CLIENT_SECRET' => $request->input('client_secret'),
],
'google' => [
@@ -38,6 +38,11 @@ class StoreSocialServiceCredentialsController
'GITHUB_CLIENT_ID' => $request->input('client_id'),
'GITHUB_CLIENT_SECRET' => $request->input('client_secret'),
],
'recaptcha' => [
'RECAPTCHA_CLIENT_ID' => $request->input('client_id'),
'RECAPTCHA_CLIENT_SECRET' => $request->input('client_secret'),
],
];
// Store credentials into the .env file