Merge remote-tracking branch 'origin/recaptcha'

# Conflicts:
#	public/mix-manifest.json
#	src/Domain/Settings/Controllers/StoreSocialServiceCredentialsController.php

src/App/Users/Requests/RegisterUserRequest.php

@@ -2,8 +2,10 @@
 namespace App\Users\Requests;
 
 use App\Users\Rules\EmailProvider;
+use App\Users\Rules\ReCaptchaRules;
 use Illuminate\Foundation\Http\FormRequest;
 use App\Users\Rules\PasswordValidationRules;
+use Illuminate\Validation\Rules\RequiredIf;
 
 class RegisterUserRequest extends FormRequest
 {
@@ -30,6 +32,7 @@ class RegisterUserRequest extends FormRequest
             'email'    => ['required', 'string', 'email', 'max:255', 'unique:users,email', new EmailProvider],
             'name'     => 'required|string|max:255',
             'password' => $this->passwordRules(),
+            'reCaptcha' => [new RequiredIf(get_settings('allowed_recaptcha') == 1), 'string', app(ReCaptchaRules::class)]
         ];
     }
 }

src/App/Users/Rules/ReCaptchaRules.php

@@ -0,0 +1,38 @@
+<?php
+ 
+namespace App\Users\Rules;
+ 
+use GuzzleHttp\Client;
+use Illuminate\Contracts\Validation\Rule;
+ 
+class ReCaptchaRules implements Rule
+{
+    /**
+     * Determine if the validation rule passes.
+     *
+     * @param  string  $attribute
+     * @param  mixed  $value
+     * @return bool
+     */
+    public function passes($attribute, $value)
+    {
+        $client = new Client();
+        $response = $client->post('https://www.google.com/recaptcha/api/siteverify',
+            [
+                'form_params' => [
+                    'secret' => env('RECAPTCHA_CLIENT_SECRET', false),
+                    'remoteip' => request()->getClientIp(),
+                    'response' => $value
+                ]
+            ]
+        );
+        $body = json_decode((string)$response->getBody());
+
+        return $body->success;
+    }
+
+    public function message(): string
+    {
+        return 'Are you a robot?';
+    }
+}

src/Domain/Homepage/Requests/SendContactMessageRequest.php

@@ -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

@@ -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