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.
85 lines
3 KiB
PHP
85 lines
3 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace App\Http\Controllers\Auth;
|
|
|
|
use App\Enums\SocialAccount\Platform as SocialPlatform;
|
|
use App\Enums\SocialAccount\Status;
|
|
use App\Models\Workspace;
|
|
use Illuminate\Http\Request;
|
|
use Illuminate\Support\Facades\Log;
|
|
use Inertia\Response as InertiaResponse;
|
|
use Laravel\Socialite\Facades\Socialite;
|
|
use Symfony\Component\HttpFoundation\Response;
|
|
|
|
class PinterestController extends SocialController
|
|
{
|
|
protected string $driver = 'pinterest';
|
|
|
|
protected SocialPlatform $platform = SocialPlatform::Pinterest;
|
|
|
|
protected array $scopes = [
|
|
'boards:read',
|
|
'boards:write',
|
|
'pins:read',
|
|
'pins:write',
|
|
'user_accounts:read',
|
|
];
|
|
|
|
public function connect(Request $request): Response
|
|
{
|
|
$this->ensurePlatformEnabled();
|
|
|
|
$workspace = $request->user()->currentWorkspace;
|
|
|
|
$this->authorize('manageAccounts', $workspace);
|
|
|
|
return $this->redirectToProvider($request, $this->driver, $this->scopes);
|
|
}
|
|
|
|
public function callback(Request $request): InertiaResponse
|
|
{
|
|
$workspaceId = session('social_connect_workspace');
|
|
|
|
if (! $workspaceId) {
|
|
return $this->popupCallback(false, __('accounts.popup_callback.session_expired'), $this->platform->value);
|
|
}
|
|
|
|
$workspace = Workspace::find($workspaceId);
|
|
|
|
if (! $workspace || ! $request->user()->can('manageAccounts', $workspace)) {
|
|
return $this->popupCallback(false, __('accounts.popup_callback.workspace_not_found'), $this->platform->value);
|
|
}
|
|
|
|
try {
|
|
$socialUser = Socialite::driver($this->driver)->user();
|
|
|
|
$avatarPath = uploadFromUrl($socialUser->getAvatar());
|
|
|
|
// Create new account
|
|
$workspace->socialAccounts()->create([
|
|
'platform' => $this->platform->value,
|
|
'platform_user_id' => $socialUser->getId(),
|
|
'username' => $socialUser->getNickname(),
|
|
'display_name' => $socialUser->getName() ?? $socialUser->getNickname(),
|
|
'avatar_url' => $avatarPath,
|
|
'access_token' => $socialUser->token,
|
|
'refresh_token' => $socialUser->refreshToken,
|
|
'token_expires_at' => $socialUser->expiresIn ? now()->addSeconds($socialUser->expiresIn) : now()->addDays(30),
|
|
// Pinterest returns scopes space-joined but Socialite doesn't split them, so re-split here.
|
|
'scopes' => explode(' ', implode(' ', $socialUser->approvedScopes)),
|
|
'status' => Status::Connected,
|
|
]);
|
|
|
|
return $this->popupCallback(true, __('accounts.popup_callback.connected'), $this->platform->value);
|
|
} catch (\Exception $e) {
|
|
Log::error('Pinterest OAuth Error', [
|
|
'error' => $e->getMessage(),
|
|
'trace' => $e->getTraceAsString(),
|
|
]);
|
|
|
|
return $this->popupCallback(false, __('accounts.popup_callback.error_connecting'), $this->platform->value);
|
|
}
|
|
}
|
|
}
|