Skip to content

Commit bfb5e98

Browse files
joaopabdalajoaopabdala
committed
lintes + test corrections
1 parent 5e66387 commit bfb5e98

File tree

10 files changed

+202
-190
lines changed

10 files changed

+202
-190
lines changed

‎app/Controllers/BlockController.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
use App\Models\Block;
66
use Core\Http\Controllers\Controller;
77
use Core\Http\Request;
8-
98
use Exception;
9+
1010
use function array_map;
1111
use function is_null;
1212
use function json_encode;
@@ -111,20 +111,20 @@ public function imageUpdate(Request $request): void
111111

112112
public function destroy(Request $request): void
113113
{
114-
try {
115-
$params = $request->getParams();
116-
$block = Block::findById($params['id']);
114+
try {
115+
$params = $request->getParams();
116+
$block = Block::findById($params['id']);
117117

118-
if (!$block) {
119-
echo json_encode(['error' => 'Bloco não encontrado']);
120-
return;
121-
}
118+
if (!$block) {
119+
echo json_encode(['error' => 'Bloco não encontrado']);
120+
return;
121+
}
122122

123-
$block->destroy();
123+
$block->destroy();
124124

125-
echo json_encode(['success' => 'Deletado com sucesso']);
126-
} catch (Exception $e) {
127-
echo json_encode(['error' => $e->getMessage()]);
128-
}
125+
echo json_encode(['success' => 'Deletado com sucesso']);
126+
} catch (Exception $e) {
127+
echo json_encode(['error' => $e->getMessage()]);
128+
}
129129
}
130130
}

‎app/Controllers/ClassRoomController.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
use Core\Http\Request;
1111
use Exception;
1212
use PDO;
13-
1413
use PDOException;
14+
1515
use function is_null;
1616
use function json_encode;
1717

@@ -90,20 +90,20 @@ public function update(Request $request): void
9090

9191
public function destroy(Request $request): void
9292
{
93-
try {
94-
$params = $request->getParams();
95-
$classroom = ClassRoom::findById($params['id']);
93+
try {
94+
$params = $request->getParams();
95+
$classroom = ClassRoom::findById($params['id']);
9696

97-
if (!$classroom) {
98-
echo json_encode(['error' => 'Bloco não encontrado']);
99-
return;
100-
}
97+
if (!$classroom) {
98+
echo json_encode(['error' => 'Bloco não encontrado']);
99+
return;
100+
}
101101

102-
$classroom->destroy();
102+
$classroom->destroy();
103103

104-
echo json_encode(['success' => 'Deletado com sucesso']);
105-
} catch (Exception $e) {
106-
echo json_encode(['error' => $e->getMessage()]);
107-
}
104+
echo json_encode(['success' => 'Deletado com sucesso']);
105+
} catch (Exception $e) {
106+
echo json_encode(['error' => $e->getMessage()]);
107+
}
108108
}
109109
}

‎app/Controllers/SchedulesController.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -259,21 +259,21 @@ public function roomChange(Request $request): void
259259

260260
public function delete(Request $request): void
261261
{
262-
try {
263-
$params = $request->getParams();
264-
$schedule = Schedules::findById($params['id']);
262+
try {
263+
$params = $request->getParams();
264+
$schedule = Schedules::findById($params['id']);
265265

266-
if (!$schedule) {
267-
echo json_encode(['error' => 'Bloco não encontrado']);
268-
return;
269-
}
266+
if (!$schedule) {
267+
echo json_encode(['error' => 'Bloco não encontrado']);
268+
return;
269+
}
270270

271-
$schedule->destroy();
271+
$schedule->destroy();
272272

273-
echo json_encode(['success' => 'Deletado com sucesso']);
274-
} catch (Exception $e) {
275-
echo json_encode(['error' => $e->getMessage()]);
276-
}
273+
echo json_encode(['success' => 'Deletado com sucesso']);
274+
} catch (Exception $e) {
275+
echo json_encode(['error' => $e->getMessage()]);
276+
}
277277
}
278278

279279
public function validatesDateConflict(Schedules $schedule): bool

‎app/Controllers/SubjectController.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
use App\Models\Subject;
77
use Core\Http\Controllers\Controller;
88
use Core\Http\Request;
9-
109
use Exception;
10+
1111
use function array_map;
1212
use function is_null;
1313
use function json_encode;
@@ -86,20 +86,20 @@ public function update(Request $request): void
8686

8787
public function destroy(Request $request): void
8888
{
89-
try {
90-
$params = $request->getParams();
91-
$subject = Subject::findById($params['id']);
89+
try {
90+
$params = $request->getParams();
91+
$subject = Subject::findById($params['id']);
9292

93-
if (!$subject) {
94-
echo json_encode(['error' => 'Bloco não encontrado']);
95-
return;
96-
}
93+
if (!$subject) {
94+
echo json_encode(['error' => 'Bloco não encontrado']);
95+
return;
96+
}
9797

98-
$subject->destroy();
98+
$subject->destroy();
9999

100-
echo json_encode(['success' => 'Deletado com sucesso']);
101-
} catch (Exception $e) {
102-
echo json_encode(['error' => $e->getMessage()]);
103-
}
100+
echo json_encode(['success' => 'Deletado com sucesso']);
101+
} catch (Exception $e) {
102+
echo json_encode(['error' => $e->getMessage()]);
103+
}
104104
}
105105
}

‎app/Controllers/UsersController.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ public function login(Request $request): void
4141
if ($user && $user->authenticate($params['password'])) {
4242
Auth::login($user);
4343

44-
$payload = [
44+
$payload = [
4545
"iss" => "http://localhost",
4646
"aud" => "http://localhost",
4747
"iat" => time(),
4848
"exp" => time() + (60 * 60),
4949
"user_id" => $user->id
50-
];
51-
$token = JWT::encode($payload,$_ENV['PASSWORD_KEY_HASH'], 'HS256');
50+
];
51+
$token = JWT::encode($payload, $_ENV['PASSWORD_KEY_HASH'], 'HS256');
5252
echo json_encode([
5353
'success' => 'Logado com sucesso',
5454
'role' => $user->roleName(),

‎app/Middleware/AdminRole.php‎

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use Firebase\JWT\JWT;
1111
use Firebase\JWT\Key;
1212
use Lib\Authentication\Auth;
13+
1314
use function dd;
1415
use function getenv;
1516
use function http_response_code;
@@ -20,36 +21,43 @@ class AdminRole implements Middleware
2021
{
2122
public function handle(Request $request): void
2223
{
23-
$headers = getallheaders();
24-
if (!isset($headers['Authorization'])) {
25-
http_response_code(401);
26-
echo json_encode(["error" => "Token não fornecido"]);
27-
exit();
28-
}
29-
30-
$token = str_replace('Bearer ', '', $headers['Authorization']);
31-
$data = $this->validatesToken($token);
32-
$user = User::findById($data['user_id']);
33-
34-
if ($user->role_id != 1) {
24+
$headers = getallheaders();
25+
if (!isset($headers['Authorization'])) {
26+
http_response_code(401);
27+
echo json_encode(["error" => "Token não fornecido"]);
28+
exit();
29+
}
30+
31+
$token = str_replace('Bearer ', '', $headers['Authorization']);
32+
$data = $this->validatesToken($token);
33+
$user = User::findById($data['user_id']);
34+
35+
if ($user->role_id != 1) {
3536
header('Content-Type: application/json', true, 401);
3637
echo json_encode(['error' => 'Acesso restrito a admnistradores']);
3738
exit;
3839
}
3940
}
4041

41-
public function validatesToken($token) {
42-
$key = $_ENV['PASSWORD_KEY_HASH'] ?? getenv('PASSWORD_KEY_HASH');
42+
/**
43+
*
44+
* @param string $token
45+
* @return array<string, mixed>|null
46+
*/
4347

44-
if (!$key) {
45-
return null;
46-
}
48+
public function validatesToken(string $token): ?array
49+
{
50+
$key = $_ENV['PASSWORD_KEY_HASH'] ?? getenv('PASSWORD_KEY_HASH');
51+
52+
if (!$key) {
53+
return null;
54+
}
4755

48-
try {
49-
$decoded = JWT::decode($token, new Key($key, 'HS256'));
50-
return (array) $decoded;
51-
} catch (Exception $e) {
52-
return null;
56+
try {
57+
$decoded = JWT::decode($token, new Key($key, 'HS256'));
58+
return (array) $decoded;
59+
} catch (Exception $e) {
60+
return null;
61+
}
5362
}
54-
}
5563
}

‎app/Middleware/Authenticate.php‎

Lines changed: 39 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -9,45 +9,50 @@
99
use Firebase\JWT\JWT;
1010
use Firebase\JWT\Key;
1111
use Lib\Authentication\Auth;
12+
1213
use function dd;
1314
use function glob;
1415

1516
class Authenticate implements Middleware
1617
{
17-
public function handle(Request $request): void
18-
{
19-
$headers = getallheaders();
20-
if (!isset($headers['Authorization'])) {
21-
http_response_code(401);
22-
echo json_encode(["error" => "Token não fornecido"]);
23-
exit();
24-
}
25-
26-
$token = str_replace('Bearer ', '', $headers['Authorization']);
27-
$data = $this->validatesToken($token);
28-
29-
if (!$data) {
30-
http_response_code(401);
31-
echo json_encode(["error" => "Token inválido"]);
32-
exit();
33-
}
34-
35-
// echo json_encode(["message" => "Autorizado", "user" => $data]);
36-
}
37-
38-
public function validatesToken($token) {
39-
$key = $_ENV['PASSWORD_KEY_HASH'] ?? getenv('PASSWORD_KEY_HASH');
40-
41-
if (!$key) {
42-
return null;
18+
public function handle(Request $request): void
19+
{
20+
$headers = getallheaders();
21+
if (!isset($headers['Authorization'])) {
22+
http_response_code(401);
23+
echo json_encode(["error" => "Token não fornecido"]);
24+
exit();
25+
}
26+
27+
$token = str_replace('Bearer ', '', $headers['Authorization']);
28+
$data = $this->validatesToken($token);
29+
30+
if (!$data) {
31+
http_response_code(401);
32+
echo json_encode(["error" => "Token inválido"]);
33+
exit();
34+
}
35+
36+
// echo json_encode(["message" => "Autorizado", "user" => $data]);
4337
}
44-
45-
try {
46-
$decoded = JWT::decode($token, new Key($key, 'HS256'));
47-
return (array) $decoded;
48-
} catch (Exception $e) {
49-
return null;
38+
/**
39+
*
40+
* @param string $token
41+
* @return array<string, mixed>|null
42+
*/
43+
public function validatesToken(string $token): ?array
44+
{
45+
$key = $_ENV['PASSWORD_KEY_HASH'] ?? getenv('PASSWORD_KEY_HASH');
46+
47+
if (!$key) {
48+
return null;
49+
}
50+
51+
try {
52+
$decoded = JWT::decode($token, new Key($key, 'HS256'));
53+
return (array) $decoded;
54+
} catch (Exception $e) {
55+
return null;
56+
}
5057
}
51-
}
52-
5358
}

0 commit comments

Comments
 (0)