Skip to content

Commit 4e3390e

Browse files
authored
Merge pull request #942 from driesvints/status-code-destroy-methods
[7.0] Add responses for destroy methods
2 parents d5362c2 + 45066e5 commit 4e3390e

6 files changed

+21
-8
lines changed

src/Http/Controllers/AuthorizedAccessTokenController.php

+2
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,7 @@ public function destroy(Request $request, $tokenId)
5959
}
6060

6161
$token->revoke();
62+
63+
return new Response('', Response::HTTP_NO_CONTENT);
6264
}
6365
}

src/Http/Controllers/ClientController.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public function update(Request $request, $clientId)
108108
/**
109109
* Delete the given client.
110110
*
111-
* @param Request $request
111+
* @param \Illuminate\Http\Request $request
112112
* @param string $clientId
113113
* @return \Illuminate\Http\Response
114114
*/
@@ -120,8 +120,8 @@ public function destroy(Request $request, $clientId)
120120
return new Response('', 404);
121121
}
122122

123-
$this->clients->delete(
124-
$client
125-
);
123+
$this->clients->delete($client);
124+
125+
return new Response('', Response::HTTP_NO_CONTENT);
126126
}
127127
}

src/Http/Controllers/PersonalAccessTokenController.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function store(Request $request)
7373
/**
7474
* Delete the given token.
7575
*
76-
* @param Request $request
76+
* @param \Illuminate\Http\Request $request
7777
* @param string $tokenId
7878
* @return \Illuminate\Http\Response
7979
*/
@@ -88,5 +88,7 @@ public function destroy(Request $request, $tokenId)
8888
}
8989

9090
$token->revoke();
91+
92+
return new Response('', Response::HTTP_NO_CONTENT);
9193
}
9294
}

tests/AuthorizedAccessTokenControllerTest.php

+4-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Laravel\Passport\Client;
99
use PHPUnit\Framework\TestCase;
1010
use Laravel\Passport\TokenRepository;
11+
use Symfony\Component\HttpFoundation\Response;
1112
use Laravel\Passport\Http\Controllers\AuthorizedAccessTokenController;
1213

1314
class AuthorizedAccessTokenControllerTest extends TestCase
@@ -85,7 +86,9 @@ public function test_tokens_can_be_deleted()
8586
return $user;
8687
});
8788

88-
$this->controller->destroy($request, 1);
89+
$response = $this->controller->destroy($request, 1);
90+
91+
$this->assertEquals(Response::HTTP_NO_CONTENT, $response->status());
8992
}
9093

9194
public function test_not_found_response_is_returned_if_user_doesnt_have_token()

tests/ClientControllerTest.php

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Laravel\Passport\Client;
88
use PHPUnit\Framework\TestCase;
99
use Laravel\Passport\Http\Rules\RedirectRule;
10+
use Symfony\Component\HttpFoundation\Response;
1011
use Laravel\Passport\Http\Controllers\ClientController;
1112

1213
class ClientControllerTest extends TestCase
@@ -155,7 +156,9 @@ public function test_clients_can_be_deleted()
155156
$clients, $validator, m::mock(RedirectRule::class)
156157
);
157158

158-
$controller->destroy($request, 1);
159+
$response = $controller->destroy($request, 1);
160+
161+
$this->assertEquals(Response::HTTP_NO_CONTENT, $response->status());
159162
}
160163

161164
public function test_404_response_if_client_doesnt_belong_to_user_on_delete()

tests/PersonalAccessTokenControllerTest.php

+4-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Laravel\Passport\Passport;
99
use PHPUnit\Framework\TestCase;
1010
use Laravel\Passport\TokenRepository;
11+
use Symfony\Component\HttpFoundation\Response;
1112
use Laravel\Passport\Http\Controllers\PersonalAccessTokenController;
1213

1314
class PersonalAccessTokenControllerTest extends TestCase
@@ -104,7 +105,9 @@ public function test_tokens_can_be_deleted()
104105
$validator = m::mock('Illuminate\Contracts\Validation\Factory');
105106
$controller = new PersonalAccessTokenController($tokenRepository, $validator);
106107

107-
$controller->destroy($request, 1);
108+
$response = $controller->destroy($request, 1);
109+
110+
$this->assertEquals(Response::HTTP_NO_CONTENT, $response->status());
108111
}
109112

110113
public function test_not_found_response_is_returned_if_user_doesnt_have_token()

0 commit comments

Comments
 (0)