diff --git a/.dev/users.sql b/.dev/users.sql new file mode 100644 index 0000000..b645362 --- /dev/null +++ b/.dev/users.sql @@ -0,0 +1,69 @@ +-- phpMyAdmin SQL Dump +-- version 4.7.7 +-- https://www.phpmyadmin.net/ +-- +-- Host: localhost +-- Creato il: Apr 23, 2020 alle 17:25 +-- Versione del server: 10.4.8-MariaDB +-- Versione PHP: 7.3.11 + +SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; +SET AUTOCOMMIT = 0; +START TRANSACTION; +SET time_zone = "+00:00"; + + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8mb4 */; + +-- +-- Database: `jwt` +-- + +-- -------------------------------------------------------- + +-- +-- Struttura della tabella `users` +-- + +CREATE TABLE `users` ( + `id` int(11) NOT NULL, + `first_name` varchar(150) NOT NULL, + `last_name` varchar(150) NOT NULL, + `email` varchar(255) DEFAULT NULL, + `password` varchar(255) DEFAULT NULL +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +-- +-- Dump dei dati per la tabella `users` +-- + +INSERT INTO `users` (`id`, `first_name`, `last_name`, `email`, `password`) VALUES +(1, 'Carmine', 'De Rosa', 'dslaky@gmail.com', '$2y$10$2xHmJMpjQX3aLtNMk/9dQudzVEk5Y4SfmDZfA2imQPyIiTMBfcC8e'); + +-- +-- Indici per le tabelle scaricate +-- + +-- +-- Indici per le tabelle `users` +-- +ALTER TABLE `users` + ADD PRIMARY KEY (`id`); + +-- +-- AUTO_INCREMENT per le tabelle scaricate +-- + +-- +-- AUTO_INCREMENT per la tabella `users` +-- +ALTER TABLE `users` + MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=8; +COMMIT; + +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; diff --git a/api/config/config.php b/api/config/config.php index 703faf5..320a8f8 100644 --- a/api/config/config.php +++ b/api/config/config.php @@ -1,11 +1,17 @@ diff --git a/api/config/database.php b/api/config/database.php index 4c01d5e..6bc9823 100755 --- a/api/config/database.php +++ b/api/config/database.php @@ -1,24 +1,35 @@ glob =& $GLOBALS; + } - $this->connection = null; + public function getConnection() { - try{ - $this->connection = new PDO("mysql:host=" . $this->db_host . ";dbname=" . $this->db_name, $this->db_user, $this->db_password); - }catch(PDOException $exception){ - echo "Connection failed: " . $exception->getMessage(); - } + $this->connection = null; + $this->db_host = $this->glob['CONF']['DB']['HOST']; + $this->db_name = $this->glob['CONF']['DB']['DB_NAME']; + $this->db_user = $this->glob['CONF']['DB']['USER']; + $this->db_password = $this->glob['CONF']['DB']['PASSWORD']; - return $this->connection; + try { + $this->connection = new PDO("mysql:host=" . $this->db_host . ";dbname=" . $this->db_name, $this->db_user, $this->db_password); + } catch(PDOException $exception) { + echo "Connection failed: " . $exception->getMessage(); } + + return $this->connection; + } } ?> diff --git a/api/login.php b/api/login.php index 8967513..24f08f3 100755 --- a/api/login.php +++ b/api/login.php @@ -42,11 +42,11 @@ if($num > 0) { if(password_verify($password, $password2)) { $token = array( - "iss" => $CONF['CLAIM']['ISSUER'], - "aud" => $CONF['CLAIM']['AUDIENCE'], - "iat" => $CONF['CLAIM']['ISSUE_DATE'], - "nbf" => $CONF['CLAIM']['NOT_BEFORE'], - "exp" => $CONF['CLAIM']['EXPIRE'], + "iss" => $GLOBALS['CONF']['CLAIM']['ISSUER'], + "aud" => $GLOBALS['CONF']['CLAIM']['AUDIENCE'], + "iat" => $GLOBALS['CONF']['CLAIM']['ISSUE_DATE'], + "nbf" => $GLOBALS['CONF']['CLAIM']['NOT_BEFORE'], + "exp" => $GLOBALS['CONF']['CLAIM']['EXPIRE'], "data" => array( "id" => $id, "firstname" => $firstname, @@ -56,13 +56,13 @@ if($num > 0) { http_response_code(200); - $jwt = JWT::encode($token, $CONF['CLAIM']['SECRET']); + $jwt = JWT::encode($token, $GLOBALS['CONF']['CLAIM']['SECRET']); echo json_encode( array( "message" => "Successful login.", "jwt" => $jwt, "email" => $email, - "expireAt" => $CONF['CLAIM']['EXPIRE'] + "expireAt" => $GLOBALS['CONF']['CLAIM']['EXPIRE'] )); } else { http_response_code(401); diff --git a/api/users.php b/api/users.php index bbbefd7..a72eba0 100755 --- a/api/users.php +++ b/api/users.php @@ -11,7 +11,7 @@ header("Access-Control-Allow-Headers: Content-Type, Access-Control-Allow-Headers $authToken = new AuthenticationToken(); -$tokenCheck = $authToken->tokenCheck($CONF['CLAIM']['SECRET']); +$tokenCheck = $authToken->tokenCheck($GLOBALS['CONF']['CLAIM']['SECRET']); if($tokenCheck['access'] == "GRANTED") {