dba6346226
EnsureAccountReady bundled a subscription gate (redirects to onboarding, SaaS only) with a workspace gate (redirects to workspace creation). The connect routes can't sit behind it because connecting/disconnecting happens during onboarding, before a subscription exists. Split the workspace gate into a standalone EnsureHasWorkspace middleware: - EnsureAccountReady is now subscription-only. - EnsureHasWorkspace redirects to workspace creation when there is no current workspace, in both SaaS and self-hosted modes. - The social connect group gains EnsureHasWorkspace; the main app group gains it alongside EnsureAccountReady (listed after it, so the subscription gate still runs first — no custom middleware priority). - The repeated `if (! $workspace) redirect()` guard is removed from the connect/store/authorize/disconnect/index/toggle handlers, and their return types are tightened (no more dangling RedirectResponse). LinkedIn connect's no-workspace path changes from a popup callback to the same redirect as the other platforms.
33 lines
900 B
PHP
33 lines
900 B
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace App\Http\Controllers\Auth;
|
|
|
|
use App\Enums\SocialAccount\Platform as SocialPlatform;
|
|
use Illuminate\Http\Request;
|
|
use Inertia\Response as InertiaResponse;
|
|
use Symfony\Component\HttpFoundation\Response;
|
|
|
|
class DiscordController extends SocialController
|
|
{
|
|
protected string $driver = 'discord';
|
|
|
|
protected SocialPlatform $platform = SocialPlatform::Discord;
|
|
|
|
public function connect(Request $request): Response
|
|
{
|
|
$this->ensurePlatformEnabled();
|
|
|
|
$workspace = $request->user()->currentWorkspace;
|
|
|
|
$this->authorize('manageAccounts', $workspace);
|
|
|
|
return $this->redirectToProvider($request, $this->driver, config('trypost.platforms.discord.scopes'));
|
|
}
|
|
|
|
public function callback(Request $request): InertiaResponse
|
|
{
|
|
return $this->handleCallback($request, $this->platform, $this->driver);
|
|
}
|
|
}
|