Zapier integration (#491)
* create zapier app * install sanctum * move OAuthProviderController * make `api-external` middleware * add zapier endpoints * add tests * token management * zapier event handler * add policy * use `slug` instead of `id` * wip * check policies * change api prefix to `external` * ui tweaks * validate token abilities * open zapier URL * zapier ui tweaks * update zap * Fix linting * Added sample endpoints + minor UI changes * Run PHP code linter --------- Co-authored-by: Julien Nahum <julien@nahum.net>
This commit is contained in:
@@ -13,7 +13,6 @@ class FormZapierWebhookController extends Controller
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
// $this->middleware('subscribed');
|
||||
$this->middleware('auth');
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,62 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Integrations\Zapier;
|
||||
|
||||
use App\Http\Requests\Integration\Zapier\PollSubmissionRequest;
|
||||
use App\Http\Requests\Zapier\CreateIntegrationRequest;
|
||||
use App\Http\Requests\Zapier\DeleteIntegrationRequest;
|
||||
use App\Integrations\Handlers\ZapierIntegration;
|
||||
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
|
||||
use Tests\Helpers\FormSubmissionDataFactory;
|
||||
|
||||
class IntegrationController
|
||||
{
|
||||
use AuthorizesRequests;
|
||||
|
||||
public function store(CreateIntegrationRequest $request)
|
||||
{
|
||||
$form = $request->form();
|
||||
|
||||
$this->authorize('view', $form);
|
||||
|
||||
$form->integrations()
|
||||
->create([
|
||||
'integration_id' => 'zapier',
|
||||
'status' => 'active',
|
||||
'data' => [
|
||||
'hook_url' => $request->input('hookUrl'),
|
||||
],
|
||||
]);
|
||||
|
||||
return response()->json();
|
||||
}
|
||||
|
||||
public function destroy(DeleteIntegrationRequest $request)
|
||||
{
|
||||
$form = $request->form();
|
||||
|
||||
$this->authorize('view', $form);
|
||||
|
||||
$form
|
||||
->integrations()
|
||||
->where('data->hook_url', $request->input('hookUrl'))
|
||||
->delete();
|
||||
|
||||
return response()->json();
|
||||
}
|
||||
|
||||
public function poll(PollSubmissionRequest $request)
|
||||
{
|
||||
$form = $request->form();
|
||||
|
||||
$this->authorize('view', $form);
|
||||
|
||||
$lastSubmission = $form->submissions()->latest()->first();
|
||||
if (!$lastSubmission) {
|
||||
// Generate fake data when no previous submissions
|
||||
$submissionData = (new FormSubmissionDataFactory($form))->asFormSubmissionData()->createSubmissionData();
|
||||
}
|
||||
|
||||
return [ZapierIntegration::formatWebhookData($form, $submissionData ?? $lastSubmission->data)];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Integrations\Zapier;
|
||||
|
||||
use App\Http\Requests\Zapier\ListFormsRequest;
|
||||
use App\Http\Resources\Zapier\FormResource;
|
||||
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
|
||||
|
||||
class ListFormsController
|
||||
{
|
||||
use AuthorizesRequests;
|
||||
|
||||
public function __invoke(ListFormsRequest $request)
|
||||
{
|
||||
$workspace = $request->workspace();
|
||||
|
||||
$this->authorize('view', $workspace);
|
||||
|
||||
return FormResource::collection(
|
||||
$workspace->forms()->get()
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Integrations\Zapier;
|
||||
|
||||
use App\Http\Resources\Zapier\WorkspaceResource;
|
||||
use App\Models\Workspace;
|
||||
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
class ListWorkspacesController
|
||||
{
|
||||
use AuthorizesRequests;
|
||||
|
||||
public function __invoke()
|
||||
{
|
||||
$this->authorize('viewAny', Workspace::class);
|
||||
|
||||
return WorkspaceResource::collection(
|
||||
Auth::user()->workspaces()->get()
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Integrations\Zapier;
|
||||
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
class ValidateAuthController
|
||||
{
|
||||
public function __invoke()
|
||||
{
|
||||
$user = Auth::user();
|
||||
|
||||
return [
|
||||
'name' => $user->name,
|
||||
'email' => $user->email,
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\OAuth;
|
||||
namespace App\Http\Controllers\Settings;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Resources\OAuthProviderResource;
|
||||
43
app/Http/Controllers/Settings/TokenController.php
Normal file
43
app/Http/Controllers/Settings/TokenController.php
Normal file
@@ -0,0 +1,43 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Settings;
|
||||
|
||||
use App\Enums\AccessTokenAbility;
|
||||
use App\Http\Requests\CreateTokenRequest;
|
||||
use App\Http\Resources\TokenResource;
|
||||
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Laravel\Sanctum\PersonalAccessToken;
|
||||
|
||||
class TokenController
|
||||
{
|
||||
use AuthorizesRequests;
|
||||
|
||||
public function index()
|
||||
{
|
||||
return TokenResource::collection(
|
||||
Auth::user()->tokens()->get()
|
||||
);
|
||||
}
|
||||
|
||||
public function store(CreateTokenRequest $request)
|
||||
{
|
||||
$token = Auth::user()->createToken(
|
||||
$request->input('name'),
|
||||
AccessTokenAbility::allowed($request->input('abilities'))
|
||||
);
|
||||
|
||||
return response()->json([
|
||||
'token' => $token->plainTextToken,
|
||||
]);
|
||||
}
|
||||
|
||||
public function destroy(PersonalAccessToken $token)
|
||||
{
|
||||
$this->authorize('delete', $token);
|
||||
|
||||
$token->delete();
|
||||
|
||||
return response()->json();
|
||||
}
|
||||
}
|
||||
@@ -64,6 +64,11 @@ class Kernel extends HttpKernel
|
||||
SelfHostedCredentialsMiddleware::class,
|
||||
ImpersonationMiddleware::class,
|
||||
],
|
||||
|
||||
'api-external' => [
|
||||
\Illuminate\Routing\Middleware\ThrottleRequests::class.':api',
|
||||
\Illuminate\Routing\Middleware\SubstituteBindings::class,
|
||||
],
|
||||
];
|
||||
|
||||
/**
|
||||
@@ -90,5 +95,8 @@ class Kernel extends HttpKernel
|
||||
|
||||
'pro-form' => \App\Http\Middleware\Form\ProForm::class,
|
||||
'protected-form' => \App\Http\Middleware\Form\ProtectedForm::class,
|
||||
|
||||
'abilities' => \Laravel\Sanctum\Http\Middleware\CheckAbilities::class,
|
||||
'ability' => \Laravel\Sanctum\Http\Middleware\CheckForAnyAbility::class,
|
||||
];
|
||||
}
|
||||
|
||||
22
app/Http/Requests/CreateTokenRequest.php
Normal file
22
app/Http/Requests/CreateTokenRequest.php
Normal file
@@ -0,0 +1,22 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Requests;
|
||||
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class CreateTokenRequest extends FormRequest
|
||||
{
|
||||
public function rules()
|
||||
{
|
||||
return [
|
||||
'name' => [
|
||||
'required',
|
||||
'string',
|
||||
],
|
||||
'abilities' => [
|
||||
'nullable',
|
||||
'array'
|
||||
]
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Requests\Integration\Zapier;
|
||||
|
||||
use App\Models\Forms\Form;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use Illuminate\Validation\Rule;
|
||||
|
||||
class PollSubmissionRequest extends FormRequest
|
||||
{
|
||||
/**
|
||||
* Get the validation rules that apply to the request.
|
||||
*
|
||||
* @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
|
||||
*/
|
||||
public function rules(): array
|
||||
{
|
||||
return [
|
||||
'form_id' => [
|
||||
'required',
|
||||
Rule::exists(Form::getModel()->getTable(), 'slug'),
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
public function form(): Form
|
||||
{
|
||||
return Form::query()
|
||||
->where('slug', $this->input('form_id'))
|
||||
->firstOrFail();
|
||||
}
|
||||
}
|
||||
31
app/Http/Requests/Zapier/CreateIntegrationRequest.php
Normal file
31
app/Http/Requests/Zapier/CreateIntegrationRequest.php
Normal file
@@ -0,0 +1,31 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Requests\Zapier;
|
||||
|
||||
use App\Models\Forms\Form;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use Illuminate\Validation\Rule;
|
||||
|
||||
class CreateIntegrationRequest extends FormRequest
|
||||
{
|
||||
public function rules()
|
||||
{
|
||||
return [
|
||||
'form_id' => [
|
||||
'required',
|
||||
Rule::exists(Form::getModel()->getTable(), 'slug'),
|
||||
],
|
||||
'hookUrl' => [
|
||||
'required',
|
||||
'url',
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
public function form(): Form
|
||||
{
|
||||
return Form::query()
|
||||
->where('slug', $this->input('form_id'))
|
||||
->firstOrFail();
|
||||
}
|
||||
}
|
||||
31
app/Http/Requests/Zapier/DeleteIntegrationRequest.php
Normal file
31
app/Http/Requests/Zapier/DeleteIntegrationRequest.php
Normal file
@@ -0,0 +1,31 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Requests\Zapier;
|
||||
|
||||
use App\Models\Forms\Form;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use Illuminate\Validation\Rule;
|
||||
|
||||
class DeleteIntegrationRequest extends FormRequest
|
||||
{
|
||||
public function rules()
|
||||
{
|
||||
return [
|
||||
'form_id' => [
|
||||
'required',
|
||||
Rule::exists(Form::getModel()->getTable(), 'slug'),
|
||||
],
|
||||
'hookUrl' => [
|
||||
'required',
|
||||
'url',
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
public function form(): Form
|
||||
{
|
||||
return Form::query()
|
||||
->where('slug', $this->input('form_id'))
|
||||
->firstOrFail();
|
||||
}
|
||||
}
|
||||
25
app/Http/Requests/Zapier/ListFormsRequest.php
Normal file
25
app/Http/Requests/Zapier/ListFormsRequest.php
Normal file
@@ -0,0 +1,25 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Requests\Zapier;
|
||||
|
||||
use App\Models\Workspace;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use Illuminate\Validation\Rule;
|
||||
|
||||
class ListFormsRequest extends FormRequest
|
||||
{
|
||||
public function rules()
|
||||
{
|
||||
return [
|
||||
'workspace_id' => [
|
||||
'required',
|
||||
Rule::exists(Workspace::getModel()->getTable(), 'id'),
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
public function workspace(): Workspace
|
||||
{
|
||||
return Workspace::findOrFail($this->input('workspace_id'));
|
||||
}
|
||||
}
|
||||
20
app/Http/Resources/TokenResource.php
Normal file
20
app/Http/Resources/TokenResource.php
Normal file
@@ -0,0 +1,20 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Resources;
|
||||
|
||||
use Illuminate\Http\Resources\Json\JsonResource;
|
||||
|
||||
/**
|
||||
* @property \Laravel\Sanctum\PersonalAccessToken $resource
|
||||
*/
|
||||
class TokenResource extends JsonResource
|
||||
{
|
||||
public function toArray($request)
|
||||
{
|
||||
return [
|
||||
'id' => $this->resource->id,
|
||||
'name' => $this->resource->name,
|
||||
'abilities' => $this->resource->abilities,
|
||||
];
|
||||
}
|
||||
}
|
||||
19
app/Http/Resources/Zapier/FormResource.php
Normal file
19
app/Http/Resources/Zapier/FormResource.php
Normal file
@@ -0,0 +1,19 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Resources\Zapier;
|
||||
|
||||
use Illuminate\Http\Resources\Json\JsonResource;
|
||||
|
||||
/**
|
||||
* @property \App\Models\Forms\Form $resource
|
||||
*/
|
||||
class FormResource extends JsonResource
|
||||
{
|
||||
public function toArray($request)
|
||||
{
|
||||
return [
|
||||
'id' => $this->resource->slug,
|
||||
'name' => $this->resource->title,
|
||||
];
|
||||
}
|
||||
}
|
||||
19
app/Http/Resources/Zapier/WorkspaceResource.php
Normal file
19
app/Http/Resources/Zapier/WorkspaceResource.php
Normal file
@@ -0,0 +1,19 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Resources\Zapier;
|
||||
|
||||
use Illuminate\Http\Resources\Json\JsonResource;
|
||||
|
||||
/**
|
||||
* @property \App\Models\Workspace $resource
|
||||
*/
|
||||
class WorkspaceResource extends JsonResource
|
||||
{
|
||||
public function toArray($request)
|
||||
{
|
||||
return [
|
||||
'id' => $this->resource->id,
|
||||
'name' => $this->resource->name,
|
||||
];
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user