fix(linkedin,pinterest): split CSV/space-joined OAuth scopes before saving
LinkedIn and Pinterest's OAuth providers return the granted scope list joined by comma (LinkedIn) or space-in-one-element (Pinterest), but Socialite's scope splitter doesn't match either, so 'approvedScopes' lands as a single-element array containing the whole list: LinkedIn: ['email,openid,profile,r_basicprofile,w_member_social'] Pinterest: ['boards:read boards:write pins:read pins:write user_accounts:read'] That breaks the publish-time scope check in PublishToSocialPlatform (array_diff does exact string compare), surfacing as 'Missing permissions: w_member_social. Please reconnect your account' even though the scopes were actually granted at the provider. Fix is inline at each callback — re-split before saving. Each provider has its own quirk (LinkedIn = comma, Pinterest = space), so each controller handles its own separator. Tests added: callback splits the joined approvedScopes into individual tokens for both providers.
This commit is contained in:
parent
f966b27349
commit
49ccfe851e
4 changed files with 68 additions and 2 deletions
|
|
@ -85,7 +85,8 @@ public function callback(Request $request): View
|
|||
'access_token' => $socialUser->token,
|
||||
'refresh_token' => $socialUser->refreshToken,
|
||||
'token_expires_at' => $socialUser->expiresIn ? now()->addSeconds($socialUser->expiresIn) : null,
|
||||
'scopes' => $socialUser->approvedScopes ?? null,
|
||||
// LinkedIn returns scope CSV-joined but Socialite splits on space, so re-split here.
|
||||
'scopes' => explode(',', implode(',', $socialUser->approvedScopes)),
|
||||
'status' => Status::Connected,
|
||||
'error_message' => null,
|
||||
'disconnected_at' => null,
|
||||
|
|
|
|||
|
|
@ -79,7 +79,8 @@ public function callback(Request $request): View
|
|||
'access_token' => $socialUser->token,
|
||||
'refresh_token' => $socialUser->refreshToken,
|
||||
'token_expires_at' => $socialUser->expiresIn ? now()->addSeconds($socialUser->expiresIn) : now()->addDays(30),
|
||||
'scopes' => $socialUser->approvedScopes ?? $this->scopes,
|
||||
// Pinterest returns scopes space-joined but Socialite doesn't split them, so re-split here.
|
||||
'scopes' => explode(' ', implode(' ', $socialUser->approvedScopes)),
|
||||
'status' => Status::Connected,
|
||||
]);
|
||||
|
||||
|
|
|
|||
|
|
@ -84,6 +84,42 @@
|
|||
]);
|
||||
});
|
||||
|
||||
test('linkedin oauth callback splits comma-separated approvedScopes before saving', function () {
|
||||
session(['social_connect_workspace' => $this->workspace->id]);
|
||||
|
||||
$socialiteUser = Mockery::mock(SocialiteUser::class);
|
||||
$socialiteUser->shouldReceive('getId')->andReturn('abc123xyz');
|
||||
$socialiteUser->shouldReceive('getNickname')->andReturn(null);
|
||||
$socialiteUser->shouldReceive('getName')->andReturn('John Doe');
|
||||
$socialiteUser->shouldReceive('getAvatar')->andReturn(null);
|
||||
$socialiteUser->token = 'test-access-token';
|
||||
$socialiteUser->refreshToken = 'test-refresh-token';
|
||||
$socialiteUser->expiresIn = 5184000;
|
||||
// LinkedIn returns scopes comma-separated; Socialite's LinkedInProvider
|
||||
// splits on space (the OAuth 2.0 default), so approvedScopes lands as
|
||||
// a single-element array with the whole CSV inside. The save path
|
||||
// must normalize back to individual tokens.
|
||||
$socialiteUser->approvedScopes = ['email,openid,profile,r_basicprofile,w_member_social'];
|
||||
|
||||
Socialite::shouldReceive('driver')
|
||||
->with('linkedin')
|
||||
->andReturn(Mockery::mock(['user' => $socialiteUser]));
|
||||
|
||||
Http::fake([
|
||||
'https://api.linkedin.com/v2/me*' => Http::response([
|
||||
'id' => 'abc123xyz',
|
||||
'vanityName' => 'johndoe',
|
||||
], 200),
|
||||
]);
|
||||
|
||||
$this->actingAs($this->user)->get(route('app.social.linkedin.callback'));
|
||||
|
||||
$account = SocialAccount::where('platform_user_id', 'abc123xyz')->first();
|
||||
expect($account->scopes)->toEqualCanonicalizing([
|
||||
'email', 'openid', 'profile', 'r_basicprofile', 'w_member_social',
|
||||
]);
|
||||
});
|
||||
|
||||
test('linkedin callback fails with expired session', function () {
|
||||
// No session data - simulating expired session
|
||||
|
||||
|
|
|
|||
|
|
@ -74,6 +74,34 @@
|
|||
]);
|
||||
});
|
||||
|
||||
test('pinterest oauth callback splits space-separated approvedScopes before saving', function () {
|
||||
session(['social_connect_workspace' => $this->workspace->id]);
|
||||
|
||||
$socialiteUser = Mockery::mock(SocialiteUser::class);
|
||||
$socialiteUser->shouldReceive('getId')->andReturn('pin-user-xyz');
|
||||
$socialiteUser->shouldReceive('getNickname')->andReturn('pinuser');
|
||||
$socialiteUser->shouldReceive('getName')->andReturn('Pin User');
|
||||
$socialiteUser->shouldReceive('getAvatar')->andReturn(null);
|
||||
$socialiteUser->token = 'test-access-token';
|
||||
$socialiteUser->refreshToken = 'test-refresh-token';
|
||||
$socialiteUser->expiresIn = 5184000;
|
||||
// Pinterest's SocialiteProvider has scopeSeparator = ',' but Pinterest
|
||||
// returns the granted scopes space-separated, so the provider doesn't
|
||||
// split them and approvedScopes lands as a single-element array.
|
||||
$socialiteUser->approvedScopes = ['boards:read boards:write pins:read pins:write user_accounts:read'];
|
||||
|
||||
Socialite::shouldReceive('driver')
|
||||
->with('pinterest')
|
||||
->andReturn(Mockery::mock(['user' => $socialiteUser]));
|
||||
|
||||
$this->actingAs($this->user)->get(route('app.social.pinterest.callback'));
|
||||
|
||||
$account = SocialAccount::where('platform_user_id', 'pin-user-xyz')->first();
|
||||
expect($account->scopes)->toEqualCanonicalizing([
|
||||
'boards:read', 'boards:write', 'pins:read', 'pins:write', 'user_accounts:read',
|
||||
]);
|
||||
});
|
||||
|
||||
test('pinterest callback fails with expired session', function () {
|
||||
// No session data - simulating expired session
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue