Merge e70f3a6 into 418043e

UI/admin.html

@@ -31,7 +31,7 @@
                                 <li>
                                     <a id="profile_dropdown" href="#" class="">
                                         <span class="micro_avatar_wrapper">
-                                            <img class="micro_avatar" src="https://s3.eu-west-2.amazonaws.com/quick-credit/profile_photos/4" alt="">
+                                            <img class="micro_avatar" src="https://s3.eu-west-2.amazonaws.com/quick-credit/profile_photos/1" alt="">
                                         </span>
                                         <svg
                                             xmlns="http://www.w3.org/2000/svg"
@@ -84,7 +84,7 @@ <h2 id="page_heading">
                         <div class="admin_top_div">
                             <div class="user_card card">
                                 <div class="user_photo">
-                                    <img src="https://s3.eu-west-2.amazonaws.com/quick-credit/profile_photos/4" alt="">
+                                    <img src="https://s3.eu-west-2.amazonaws.com/quick-credit/profile_photos/1" alt="">
                                 </div>
                                 <hr class="card_divider">
 

UI/dashboard.html

@@ -30,7 +30,7 @@
                                 <li>
                                     <a id="profile_dropdown" href="#" class="">
                                         <span class="micro_avatar_wrapper">
-                                            <img class="micro_avatar" src="https://s3.eu-west-2.amazonaws.com/quick-credit/profile_photos/4" alt="">
+                                            <img class="micro_avatar" src="https://s3.eu-west-2.amazonaws.com/quick-credit/profile_photos/1" alt="">
                                         </span>
                                         <svg
                                             xmlns="http://www.w3.org/2000/svg"
@@ -84,7 +84,7 @@ <h2 class="page_heading">Orji Chidi <i class="fas fa-check-circle"></i></h2>
                             <div class="user_card card">
                                 <div
                                 class="user_photo"
-                                style="background-image: url('https://s3.eu-west-2.amazonaws.com/quick-credit/profile_photos/4')"
+                                style="background-image: url('https://s3.eu-west-2.amazonaws.com/quick-credit/profile_photos/1')"
                                 >
                                 <svg
                                     id="profile_pix"
@@ -104,7 +104,7 @@ <h2 class="page_heading">Orji Chidi <i class="fas fa-check-circle"></i></h2>
                                 <!-- <img
                                     title="Click to change"
                                     id="profile_pix"
-                                    src="https://s3.eu-west-2.amazonaws.com/quick-credit/profile_photos/4"
+                                    src="https://s3.eu-west-2.amazonaws.com/quick-credit/profile_photos/1"
                                     alt="Profile picture"
                                 > -->
                                     <input type="file" id="img_uploader" name="img_uploader" accept="image/*" />

UI/js/dashboard.js

@@ -17,7 +17,7 @@ const update_profile_pix = file => {
         reader.readAsDataURL(file);
     }
     else {
-        profile_pix.src = 'https://s3.eu-west-2.amazonaws.com/quick-credit/profile_photos/4';
+        profile_pix.src = 'https://s3.eu-west-2.amazonaws.com/quick-credit/profile_photos/1';
     }
 };
 

UI/loan.html

@@ -30,7 +30,7 @@
                                 <li>
                                     <a id="profile_dropdown" href="#" class="">
                                         <span class="micro_avatar_wrapper">
-                                            <img class="micro_avatar" src="https://s3.eu-west-2.amazonaws.com/quick-credit/profile_photos/4" alt="">
+                                            <img class="micro_avatar" src="https://s3.eu-west-2.amazonaws.com/quick-credit/profile_photos/1" alt="">
                                         </span>
                                         <svg
                                             xmlns="http://www.w3.org/2000/svg"
@@ -118,7 +118,7 @@ <h2 class="page_heading">Loan | 1</h2>
 
                         <div class="user_card card">
                             <div class="user_photo">
-                                <img src="https://s3.eu-west-2.amazonaws.com/quick-credit/profile_photos/4" alt="">
+                                <img src="https://s3.eu-west-2.amazonaws.com/quick-credit/profile_photos/1" alt="">
                             </div>
                             <hr class="card_divider">
 

UI/loan.new.html

@@ -27,7 +27,7 @@
                                 <li>
                                     <a id="profile_dropdown" href="#" class="">
                                         <span class="micro_avatar_wrapper">
-                                            <img class="micro_avatar" src="https://s3.eu-west-2.amazonaws.com/quick-credit/profile_photos/4" alt="">
+                                            <img class="micro_avatar" src="https://s3.eu-west-2.amazonaws.com/quick-credit/profile_photos/1" alt="">
                                         </span>
                                         <svg
                                             xmlns="http://www.w3.org/2000/svg"

UI/loans.html

@@ -29,7 +29,7 @@
                                 <li>
                                     <a id="profile_dropdown" href="#" class="">
                                         <span class="micro_avatar_wrapper">
-                                            <img class="micro_avatar" src="https://s3.eu-west-2.amazonaws.com/quick-credit/profile_photos/4" alt="">
+                                            <img class="micro_avatar" src="https://s3.eu-west-2.amazonaws.com/quick-credit/profile_photos/1" alt="">
                                         </span>
                                         <svg
                                             xmlns="http://www.w3.org/2000/svg"

UI/profile.edit.html

@@ -29,7 +29,7 @@
                                 <li>
                                     <a id="profile_dropdown" href="#" class="">
                                         <span class="micro_avatar_wrapper">
-                                            <img class="micro_avatar" src="https://s3.eu-west-2.amazonaws.com/quick-credit/profile_photos/4" alt="">
+                                            <img class="micro_avatar" src="https://s3.eu-west-2.amazonaws.com/quick-credit/profile_photos/1" alt="">
                                         </span>
                                         <svg
                                             xmlns="http://www.w3.org/2000/svg"

UI/user.html

@@ -30,7 +30,7 @@
                                 <li>
                                     <a id="profile_dropdown" href="#" class="">
                                         <span class="micro_avatar_wrapper">
-                                            <img class="micro_avatar" src="https://s3.eu-west-2.amazonaws.com/quick-credit/profile_photos/4" alt="">
+                                            <img class="micro_avatar" src="https://s3.eu-west-2.amazonaws.com/quick-credit/profile_photos/1" alt="">
                                         </span>
                                         <svg
                                             xmlns="http://www.w3.org/2000/svg"
@@ -100,7 +100,7 @@ <h2 id="page_heading">
                                     <img
                                         title="Click to change"
                                         id="profile_pix"
-                                        src="https://s3.eu-west-2.amazonaws.com/quick-credit/profile_photos/4"
+                                        src="https://s3.eu-west-2.amazonaws.com/quick-credit/profile_photos/1"
                                         alt="Profile picture"
                                     >
                                     <input type="file" id="img_uploader" name="img_uploader" accept="image/*" />

UI/users.html

@@ -29,7 +29,7 @@
                                 <li>
                                     <a id="profile_dropdown" href="#" class="">
                                         <span class="micro_avatar_wrapper">
-                                            <img class="micro_avatar" src="https://s3.eu-west-2.amazonaws.com/quick-credit/profile_photos/4" alt="">
+                                            <img class="micro_avatar" src="https://s3.eu-west-2.amazonaws.com/quick-credit/profile_photos/1" alt="">
                                         </span>
                                         <svg
                                             xmlns="http://www.w3.org/2000/svg"

controllers/AuthController.js

@@ -1,9 +1,10 @@
 import Model from '../models/Model';
 import 
 { 
-    check_user_existence,
-    get_user_clause,
-    add_user_to_db
+    check_user_exists,
+    get_existing_user,
+    add_user_to_db,
+    check_password
 } from './helpers/AuthController';
 // import { dev_logger } from '../utils/loggers';
 
@@ -12,8 +13,8 @@ const users_model = new Model('users');
 const AuthController = {
     signup: async (req, res) => {
         const { email } = req.body;
-        const user_exists = await check_user_existence(
-            users_model, email, res);
+        const user_exists = await check_user_exists(
+            users_model, `WHERE email='${email}'`, res);
 
         if (user_exists) {
             return res
@@ -24,16 +25,23 @@ const AuthController = {
         const [ { id }, ] = rows;
         const clause = `WHERE id=${id}`;
         const err_msg = `User with id ${id} does not exist.`;
-        const user = await get_user_clause(users_model, res, clause, err_msg);
+        const user = await get_existing_user(users_model, res, clause, err_msg);
         return res.status(201).json({ data: { ...user, token: req.token } });
     },
-    
+
     signin: async (req, res) => {
-        const { email } = req.body;
+        const { email, password } = req.body;
         const clause = `WHERE email='${email}'`;
         const err_msg = `User with email ${email} does not exist.`;
-        const user = await get_user_clause(users_model, res, clause, err_msg);
-        return res.status(200).json({ data: { ...user, token: req.token } });
+        // check user exists
+        const match = await check_password(users_model, email, password, res);
+        if (match) {
+            const user = await get_existing_user(
+                users_model, res, clause, err_msg);
+            return res
+                .status(200).json({ data: { ...user, token: req.token } });
+        }
+        return res.status(404).json({ error: 'Incorrect password' });
     },
 };
 

controllers/UsersController.js

@@ -1,33 +1,36 @@
 import Model from '../models/Model';
 import { InternalServerError } from '../utils/errorHandlers';
-import { get_user_clause } from './helpers/AuthController';
 import {
-    aws_signed_url,
-    update_user_photo_url
-} from './helpers/UsersController';
+    get_existing_user, check_user_exists
+} from './helpers/AuthController';
+import { aws_signed_url, } from './helpers/UsersController';
 
 const users_model = new Model('users');
 
 const UsersController = {
     get_user: async (req, res) => {
         const { id } = req.params;
         const clause = `WHERE id=${id}`;
-        const err_msg = `User with id ${id} not found`;
-        const user = await get_user_clause(users_model, res, clause, err_msg);
-        if (user.id) {
+        const exists = await check_user_exists(users_model, clause, res);
+        if (exists) {
+            const user = await get_existing_user(users_model, res, clause);
             return res.status(200).json({ data: user });
         }
+        return res.status(404)
+            .json({ error: `User with id ${id} not found` });
     },
 
     verify_user: async (req, res) => {
         const { id } = req.params;
         const clause = `WHERE id=${id}`;
-        const err_msg = `User with id ${id} not found`;
-        await users_model.update('status=\'verified\'', clause);
-        const user = await get_user_clause(users_model, res, clause, err_msg);
-        if (user.id) {
+        const exists = await check_user_exists(users_model, clause, res);
+        if (exists) {
+            await users_model.update('status=\'verified\'', clause);
+            const user = await get_existing_user(users_model, res, clause);
             return res.status(200).json({ data: user });
         }
+        return res.status(404)
+            .json({ error: `User with id ${id} not found` });
     },
 
     get_users: async (req, res) => {
@@ -36,15 +39,13 @@ const UsersController = {
             let data;
             if (status) {
                 data = await users_model.select(
-                    `id, email, password, firstname,
-                    lastname, phone, status, address`,
+                    'id, email, firstname, lastname, phone, status, address',
                     `WHERE status='${status}'`
                 );
             }
             else {
                 data = await users_model.select(
-                    `id, email, password, firstname,
-                    lastname, phone, status, address`,
+                    'id, email, firstname, lastname, phone, status, address',
                 );
             }
             return res.status(200).json({ data: data.rows });
@@ -56,21 +57,19 @@ const UsersController = {
         const { id } = req.params;
         const { firstname, lastname, phone, home, office } = req.body;
         const clause = `WHERE id=${id}`;
-        const err_msg = `User with id ${id} not found`;
-        try {
+        const exists = await check_user_exists(users_model, clause, res);
+        if (exists) {
             await users_model.update(
                 `firstname='${firstname}', lastname='${lastname}', 
                 phone='${phone}', 
                 address='{"home": "${home}", "office": "${office}"}'`,
                 clause
             );
-            const user = await get_user_clause(
-                users_model, res, clause, err_msg);
+            const user = await get_existing_user(users_model, res, clause);
             return res.status(200).json({ data: user });
         }
-        catch (e) {
-            return InternalServerError(res, e);
-        }
+        return res.status(404)
+            .json({ error: `User with id ${id} not found` });
     },
 
     get_aws_signed_url: (req, res) => {
@@ -83,15 +82,16 @@ const UsersController = {
     update_photo_url: async (req, res) => {
         const { id } = req.params;
         const { photo_url } = req.body;
-        try {
-            await update_user_photo_url(users_model, id, photo_url, res);
-            const clause = `WHERE id=${id}`;
-            const err_msg = `User with id ${id} does not exist.`;
-            const user = await get_user_clause(
-                users_model, res, clause, err_msg);
+        const clause = `WHERE id=${id}`;
+        const exists = await check_user_exists(users_model, clause, res);
+        if (exists) {
+            await users_model.update(`photo='${photo_url}'`, clause);
+            const user = await get_existing_user(users_model, res, clause);
             return res.status(200).json({ data: user });
         }
-        catch (e) { return InternalServerError(res, e); }
+        return res.status(404)
+            .json({ error: `User with id ${id} not found` });
+
     }
 };
 

controllers/helpers/AuthController.js

@@ -2,13 +2,24 @@ import bcrypt from 'bcrypt';
 
 import { InternalServerError } from '../../utils/errorHandlers';
 
-export const check_user_existence = async (model_instance, email, res) => {
+export const check_user_exists = async (model_instance, clause, res) => {
     try {
         const { rows } = await model_instance.select(
-            'id, email', `WHERE email='${email}'`);
+            'id, email', clause);
         const [ user, ] = rows;
-
-        if (user) return user;
+        if (user) return true;
+        return false;
+    }
+    catch (e) { return InternalServerError(res, e);}
+};
+
+export const check_password = async (model_instance, email, password, res) => {
+    try {
+        const { rows } = await model_instance.select(
+            'id, email, password', `WHERE email='${email}'`);
+        const [ user, ] = rows;
+        if (bcrypt.compareSync(password, user.password)) return true;
+        return false;
     }
     catch (e) { return InternalServerError(res, e);}
 };
@@ -27,15 +38,12 @@ export const add_user_to_db = async (model_instance, req, res) => {
     catch (e) { return InternalServerError(res, e);}
 };
 
-export const get_user_clause = async (model_instance, res, clause, err_msg) => {
+export const get_existing_user = async (model_instance, res, clause) => {
     try {
         const { rows } = await model_instance.select(
             'id, email, firstname, photo, lastname, phone, status, address',
             clause
         );
-        if (rows.length === 0) return res.status(404).json({ 
-            error: err_msg
-        });
         return rows[0];
     }
     catch (e) { return InternalServerError(res, e); }

controllers/helpers/UsersController.js

@@ -1,7 +1,6 @@
 import AWS from 'aws-sdk';
 import settings from '../../settings';
 import { dev_logger } from '../../utils/loggers';
-import { InternalServerError } from '../../utils/errorHandlers';
 
 const s3  = new AWS.S3({
     accessKeyId: settings.AWS_settings.accessKeyId,
@@ -22,11 +21,3 @@ export const aws_signed_url = (id, filetype) => {
     const url = s3.getSignedUrl('putObject', params);
     return url;
 };
-
-export const update_user_photo_url = async (model_instance, id, url, res) => {
-    try {
-        await model_instance.update(
-            `photo='${url}'`, `WHERE id=${id}`);
-    }
-    catch (e) { return InternalServerError(res, e); }
-};