diff --git a/docker-compose.yml b/docker-compose.yml index cfe29ac984bf37d409a50efb2cd601be001a2cfb..8fc82bdc7b741e2fb26f8873c3a179c8f25c44cd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,6 +23,7 @@ services: restart: unless-stopped volumes: - ./migrations/migrate.sql:/docker-entry-point-initdb.d/migrate.sql + - ./migrations/migrate.sql:/docker-entrypoint-initdb.d/migrate.sql environment: MYSQL_ROOT_PASSWORD : Babybaby123 MYSQL_USER : test diff --git a/src/services/UserSrv.php b/src/services/UserSrv.php index 5055c73704bd4a2889571352af1f10a8631f8979..01270b2ea2b87de1f671489e0b67b5c2b24d334b 100644 --- a/src/services/UserSrv.php +++ b/src/services/UserSrv.php @@ -44,12 +44,12 @@ class UserSrv extends BaseSrv if ($password !== $confirm_password) { throw new Exception("Password and confirm password do not match"); } -// echo ("<script>console.log(".$username.")</script>"); - $u=$this->getByUsername($username); -// echo is_null($u); - if (!is_null($u->get('username'))){ -// echo $username; - throw new Exception("Username already taken!"); + // echo ("<script>console.log(".$username.")</script>"); + $u = $this->getByUsername($username); + // echo is_null($u); + if (!is_null($u->get('username'))) { + // echo $username; + throw new Exception("Username already taken!"); } $user = (new UserModel())->set('nama', $nama)->set('username', $username)->set('email', $email)->set('password', password_hash($password, PASSWORD_DEFAULT)); @@ -90,7 +90,7 @@ class UserSrv extends BaseSrv throw new Exception("User not found"); } - if (!password_verify($password, $user->get('password'))) { + if (!password_verify($password, $user->get('password') ?? "")) { throw new Exception("Password do not match"); } @@ -130,13 +130,14 @@ class UserSrv extends BaseSrv return $user; } - public function getByUsername($username){ - $user = new UserModel(); - $sqlRes = $this->repository->getByUsername($username); - if ($sqlRes) { - $user->constructFromArray($sqlRes); - } - return $user; + public function getByUsername($username) + { + $user = new UserModel(); + $sqlRes = $this->repository->getByUsername($username); + if ($sqlRes) { + $user->constructFromArray($sqlRes); + } + return $user; } public function updateUser($userId, $userData) diff --git a/src/utils/FileUploader.php b/src/utils/FileUploader.php index f62e3187840b8df2db2e7fbc812eed294242d89f..912c4e59ce817c0d732a062dde0407a11166753f 100644 --- a/src/utils/FileUploader.php +++ b/src/utils/FileUploader.php @@ -1,8 +1,6 @@ <?php function handleFileUpload($inputName, $uploadDirectory) { - echo isset($_FILES[$inputName]); - echo $_FILES[$inputName]['error'] === UPLOAD_ERR_OK; if (isset($_FILES[$inputName]) && $_FILES[$inputName]['error'] === UPLOAD_ERR_OK) { $uploadedFile = $_FILES[$inputName]; $randomID = uniqid();