Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions ProcessMaker/Http/Controllers/Api/DevLinkController.php
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,20 @@ public function destroy(DevLink $devLink)
public function ping(DevLink $devLink)
{
try {
return $devLink->client()->get(route('api.devlink.pong', [], false));
} catch (\Exception $e) {
return response()->json(['error' => 'DevLink connection error'], $e->getCode());
$response = $devLink->client()->get(route('api.devlink.pong', [], false));
} catch (RequestException $e) {
$status = $e->response->status();

return response()->json([
'status' => in_array($status, [401, 403], true) ? 'authorization_required' : 'error',
]);
} catch (\Throwable $e) {
return response()->json(['status' => 'error']);
}

return response()->json([
'status' => $response->json('status') === 'ok' ? 'ok' : 'error',
]);
}

public function pong()
Expand Down
9 changes: 4 additions & 5 deletions resources/js/admin/devlink/components/Index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,15 @@ const create = (name, url) => {
ProcessMaker.apiClient
.get(`devlink/${newId}/ping`)
.then((response) => {
status.value = 'success';
window.location.href = fullUrl;
})
.catch((e) => {
if (e.response.status === 401) {
if (['ok', 'authorization_required'].includes(response.data.status)) {
status.value = 'success';
window.location.href = fullUrl;
} else {
status.value = 'error';
}
})
.catch(() => {
status.value = 'error';
});
})
.catch((error) => {
Expand Down
87 changes: 87 additions & 0 deletions tests/Feature/Api/DevLinkTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,93 @@ public function testAddAssets()
$this->assertEquals('Asset already exists in bundle', $response->json()['error']['message']);
}

public function testPingReturnsOkWhenRemotePongSucceeds()
{
$devLink = DevLink::factory()->create([
'url' => 'https://remote-instance.test',
'access_token' => 'token',
]);

Http::fake([
'remote-instance.test/*' => Http::response(['status' => 'ok'], 200),
]);

$response = $this->apiCall('GET', route('api.devlink.ping', ['devLink' => $devLink->id]));

$response->assertStatus(200);
$response->assertJson(['status' => 'ok']);
}

public function testPingReturnsAuthorizationRequiredWhenRemotePongReturnsUnauthorized()
{
$devLink = DevLink::factory()->create([
'url' => 'https://remote-instance.test',
'access_token' => 'token',
]);

Http::fake([
'remote-instance.test/*' => Http::response(['message' => 'Unauthorized'], 401),
]);

$response = $this->apiCall('GET', route('api.devlink.ping', ['devLink' => $devLink->id]));

$response->assertStatus(200);
$response->assertJson(['status' => 'authorization_required']);
}

public function testPingReturnsAuthorizationRequiredWhenRemotePongReturnsForbidden()
{
$devLink = DevLink::factory()->create([
'url' => 'https://remote-instance.test',
'access_token' => 'token',
]);

Http::fake([
'remote-instance.test/*' => Http::response(['message' => 'Forbidden'], 403),
]);

$response = $this->apiCall('GET', route('api.devlink.ping', ['devLink' => $devLink->id]));

$response->assertStatus(200);
$response->assertJson(['status' => 'authorization_required']);
}

public function testPingReturnsErrorWhenRemotePongFails()
{
$devLink = DevLink::factory()->create([
'url' => 'https://remote-instance.test',
'access_token' => 'token',
]);

Http::fake([
'remote-instance.test/*' => Http::response(['message' => 'Server error'], 500),
]);

$response = $this->apiCall('GET', route('api.devlink.ping', ['devLink' => $devLink->id]));

$response->assertStatus(200);
$response->assertJson(['status' => 'error']);
}

public function testPingReturnsErrorWhenRemotePongCannotConnect()
{
$devLink = DevLink::factory()->create([
'url' => 'https://remote-instance.test',
'access_token' => 'token',
]);

Http::fake([
'remote-instance.test/*' => function () {
throw new ConnectionException('Connection failed');
},
]);

$response = $this->apiCall('GET', route('api.devlink.ping', ['devLink' => $devLink->id]));

$response->assertStatus(200);
$response->assertJson(['status' => 'error']);
}

public function testInstallRemoteAsset()
{
$screen = Screen::factory()->create();
Expand Down
Loading