Browse Source

Adicionando comentarios na API

1.9
Claudio Zimmermann Junior 3 months ago committed by Gitea
parent
commit
ea576aef6b
  1. 4
      .vscode/launch.json
  2. 6
      app/controllers/AuthController.php
  3. 4
      app/controllers/MeetController.php
  4. 1
      app/middleware/AuthMiddleware.php
  5. 9
      public/api.php

4
.vscode/launch.json vendored

@ -1,7 +1,5 @@
{ {
// Use o IntelliSense para saber mais sobre os atributos possíveis.
// Focalizar para exibir as descrições dos atributos existentes.
// Para obter mais informações, acesse: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0", "version": "0.2.0",
"configurations": [ "configurations": [
{ {

6
app/controllers/AuthController.php

@ -28,6 +28,7 @@ class AuthController
{ {
$body = json_decode($request->getBody()->getContents(), true); $body = json_decode($request->getBody()->getContents(), true);
// wrong/no credentials - START
if (empty($body['senha']) || empty($body['email'])) { if (empty($body['senha']) || empty($body['email'])) {
$response->getBody()->write(json_encode( $response->getBody()->write(json_encode(
[ [
@ -44,11 +45,14 @@ class AuthController
$response->getBody()->write(json_encode(['status' => false, 'data' => ["message" => "Usuario e senha nao confere, por favor verifique as informacoes passadas!"]])); $response->getBody()->write(json_encode(['status' => false, 'data' => ["message" => "Usuario e senha nao confere, por favor verifique as informacoes passadas!"]]));
return $response; return $response;
} }
// wrong/no credentials - END
$expiredat = (new \DateTime())->modify('+1 days')->format('Y-m-d H:i:s'); $expiredat = (new \DateTime())->modify('+1 days')->format('Y-m-d H:i:s');
$tokenPayload = ['sub' => $usuario->id, 'name' => $usuario->nome, 'email' => $usuario->email, 'expired_at' => $expiredat]; $tokenPayload = ['sub' => $usuario->id, 'name' => $usuario->nome, 'email' => $usuario->email, 'expired_at' => $expiredat];
$tokens = Token::find(["id_usuario" => $usuario->id]);
// If token's expired: delete it and create another one
// else: just return it
$tokens = Token::find(["id_usuario" => $usuario->id]);
if ($tokens) { if ($tokens) {
$expiredDate = new DateTime($tokens->expired_at); $expiredDate = new DateTime($tokens->expired_at);
$now = new DateTime(); $now = new DateTime();

4
app/controllers/MeetController.php

@ -30,7 +30,7 @@ class MeetController
$this->serverRequest(); $this->serverRequest();
$body = json_decode($request->getBody()->getContents(), true); $body = json_decode($request->getBody()->getContents(), true);
$data = []; $data = []; // this array is never populated??
$dados['org_id'] = $body['org_id']; $dados['org_id'] = $body['org_id'];
$dados['meet_id'] = $body['data']['roomName']; $dados['meet_id'] = $body['data']['roomName'];
$dados['nome'] = $body['data']['roomName']; $dados['nome'] = $body['data']['roomName'];
@ -49,7 +49,7 @@ class MeetController
} }
$p = MeetPeople::create($people); $p = MeetPeople::create($people);
if ($data) { if ($data) { // will it allways be falsy?
$response->getBody()->write(json_encode(['status' => true, 'data' => ['meet' => ['created' => $meet ?? 'OK'], 'user' => ['join' => $p ?? 'yes']]])); $response->getBody()->write(json_encode(['status' => true, 'data' => ['meet' => ['created' => $meet ?? 'OK'], 'user' => ['join' => $p ?? 'yes']]]));
} else { } else {
$response->getBody()->write(json_encode(['status' => false, 'data' => $data])); $response->getBody()->write(json_encode(['status' => false, 'data' => $data]));

1
app/middleware/AuthMiddleware.php

@ -15,6 +15,7 @@ class AuthMiddleware
public function __invoke(Request $request, RequestHandler $handler): ResponseInterface public function __invoke(Request $request, RequestHandler $handler): ResponseInterface
{ {
try { try {
//returns [user_id, token_id, id_organizacao, token, expired_at] if not found --> throws exception
$this->findToken($request); $this->findToken($request);
$response = $handler->handle($request); $response = $handler->handle($request);
} catch (Exception $e) { } catch (Exception $e) {

9
public/api.php

@ -3,7 +3,7 @@
require __DIR__ . '/../vendor/autoload.php'; require __DIR__ . '/../vendor/autoload.php';
//error_reporting(E_ALL); //error_reporting(E_ALL);
// ini_set('display_errors', 1); ini_set('display_errors', 0);
use app\controllers\QueueController; use app\controllers\QueueController;
use app\controllers\CallController; use app\controllers\CallController;
@ -21,10 +21,11 @@ header("Access-Control-Allow-Methods: HEAD, GET, POST, PUT, PATCH, DELETE, OPTIO
header("Access-Control-Allow-Headers: X-API-KEY, Origin, ngrok-skip-browser-warning, X-Requested-With, Content-Type, Accept, Access-Control-Request-Method, Access-Control-Request-Headers, Authorization"); header("Access-Control-Allow-Headers: X-API-KEY, Origin, ngrok-skip-browser-warning, X-Requested-With, Content-Type, Accept, Access-Control-Request-Method, Access-Control-Request-Headers, Authorization");
header('Content-Type: application/json'); header('Content-Type: application/json');
$method = $_SERVER['REQUEST_METHOD']; $method = $_SERVER['REQUEST_METHOD'];
if ($method == "OPTIONS") { /*if ($method == "OPTIONS") {
header("HTTP/1.1 200 OK"); echo "teste OK";
// header("HTTP/1.1 200 OK");
die(); die();
} }*/
$app = AppFactory::create(); $app = AppFactory::create();
$app->addRoutingMiddleware(); $app->addRoutingMiddleware();

Loading…
Cancel
Save