diff --git a/app/controllers/Profile.php b/app/controllers/Profile.php index 6e02e777bb645d0b94b5abf276a7da1c733b710c..850ba3aa5ff1eeec432c463861e830f7f9b98b3d 100644 --- a/app/controllers/Profile.php +++ b/app/controllers/Profile.php @@ -53,7 +53,8 @@ class Profile extends Controller session_start(); if (isset($_COOKIE['access_token'])) { - if ($this->model('Token')->validateToken($_COOKIE['access_token'])) { + $user_id = $this->model('Token')->validateToken($_COOKIE['access_token']); + if ($user_id) { $access_valid = true; } else { $access_valid = false; @@ -77,7 +78,7 @@ class Profile extends Controller } else { $user['userPicture'] = $_POST['avaHidden']; } - + $model = $this->model('User'); if ($model->updateUserById($user)) { $data = $model->readUserById($user['id']); @@ -88,7 +89,6 @@ class Profile extends Controller echo "Internal Server Error"; header('Location: /home'); exit(); - } } else { header('Location: /login'); diff --git a/app/models/Order.php b/app/models/Order.php index 3be48f2d1b62edeec6de1d0382164f33314e54ef..fad7a0144f3810fbb780e3b09e29107eb64e134a 100644 --- a/app/models/Order.php +++ b/app/models/Order.php @@ -5,8 +5,8 @@ class Order extends Model function readHistoryByUserId($id) { - $sql = "SELECT orderID, bookID FROM wbdprobook.orders WHERE userID = " . $id . " ORDER BY id DESC;"; - $result = $this->conn->query($sql); + $sql = "SELECT orderID, bookID FROM orders WHERE userID = " . $id . " ORDER BY id DESC;"; + $result = $this->conn->query($sql) or die($conn->error); $results = []; while ($row = $result->fetch_assoc()) { $results[] = $row; @@ -14,7 +14,7 @@ class Order extends Model require_once ('app/models/SoapHelper.php'); $soap = new SoapHelper(); foreach ($results as $key => $value) { - $sql = "SELECT reviewID FROM wbdprobook.review WHERE orderID = '". $results[$key]['orderID'] ."';"; + $sql = "SELECT reviewID FROM review WHERE orderID = '". $results[$key]['orderID'] ."';"; $results[$key]['reviewID'] = ($this->conn->query($sql) -> fetch_assoc()); $data['book'] = $soap->getBookByID($results[$key]['bookID']); $data['order'] = $soap->getTransactionByID($results[$key]['orderID']); diff --git a/public/images/profile/33 b/public/images/profile/33 new file mode 100644 index 0000000000000000000000000000000000000000..27cac80db760b8d73f20e7d0401ee5f3b1e5e530 Binary files /dev/null and b/public/images/profile/33 differ diff --git a/readme.md b/readme.md index 13216a47dba5b6202def47c4188e9a31c4134590..ae49fd26f4d28b5c950b1f4e5b022b920716d223 100644 --- a/readme.md +++ b/readme.md @@ -98,6 +98,7 @@ Basis data **Web Service Buku** kami terdiri dari 2 Tabel yaitu : ## Shared Session dengan REST ## Pembangkitan Token dan Expiry Time +Pembangkitan token kami lakukan setiap kali user login. Setiap user login, kami memilih sebuah karakter [a-z && A-Z] random yang kemudian disambung dengan 31 karakter hasil hashing dari banyaknya detik sejak 1 Januari 1970. Kemudian kami menyimpan token yang telah dibangkitkan tersebut bersama dengan browser, ip address, dan expiry time token pada database. Expiry time token adalah 1200 detik sejak token pertama kali dimasukkan ke database. ## Kelebihan Microservice dibanding Monolitik - Untuk setiap service nya, kompleksitas dapat berkurang dengan mendekomposisi program menjadi berbagai service sehingga setiap service nya lebih mudah didevelop, dimengerti karena sesuai fungsionalitasnya, dan dimaintain. @@ -133,6 +134,6 @@ Perubahan Web app : 8. Update DB dan Token : 13516140 Bonus : -1. HTOTP : 13516140 +1. Time-based One-Time Password : 13516140 2. Google : 13516089 diff --git a/service/rest/api/controllers/transfer.js b/service/rest/api/controllers/transfer.js index 6b06d8b05eb93467f9bb8afec335ab41a28db89b..5dbb8b5a51b417a8a3ff8d87199b27d7486e34cf 100644 --- a/service/rest/api/controllers/transfer.js +++ b/service/rest/api/controllers/transfer.js @@ -38,9 +38,11 @@ exports.transfer = function(req, res) { } else { if (rows.length == 0) { + console.log("Tidak ditemukan nomor kartu"); response.notFound('No kartu pengirim tidak ditemukan', res); } else if (Number(rows[0].saldo) < jumlah) { + console.log("Saldo tidak cukup"); response.notAcceptable('Saldo pengirim tidak cukup', res); } else { @@ -54,6 +56,7 @@ exports.transfer = function(req, res) { } else { if (rows.length == 0) { + console.log("Tidak ditemukan nomor kartu"); response.notFound('No kartu penerima tidak ditemukan', res); } else { @@ -75,6 +78,7 @@ exports.transfer = function(req, res) { }); } else { + console.log("Transfer berhasil"); response.ok('Transfer berhasil', res); } }) @@ -88,6 +92,7 @@ exports.transfer = function(req, res) { }); } else { + console.log("Token salah"); response.notAcceptable('Token salah', res); } }