From 649b4e9e19a5e324d61186655355bf450bda3cba Mon Sep 17 00:00:00 2001
From: Karl <karl@k-world.me.uk>
Date: Wed, 15 Sep 2021 15:33:40 +0000
Subject: [PATCH] updates with password

---
 docker-compose.yml        | 26 +++++++++++++-------------
 lib/getUser.js            |  3 ++-
 routes/getUserAccounts.js |  6 ++++++
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index c4e6781..f3dbfe2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,16 +16,16 @@ services:
       - DBPASS=Grd555269
       - DATABASE=BBLB_DNS
       - DBPORT=3306
-  frontend:
-    build:
-      context: ./client
-      dockerfile: Dockerfile.prod
-      # dockerfile: .dockerfile
-    image: "karl0ss/bblbtv_dns-frontend"
-    ports:
-      - "6969:6969"
-    environment:
-      - URL=vps.k-world.me.uk
-      - PORT=6969
-    links:
-      - "backend"
\ No newline at end of file
+  # frontend:
+  #   build:
+  #     context: ./client
+  #     dockerfile: Dockerfile.prod
+  #     # dockerfile: .dockerfile
+  #   image: "karl0ss/bblbtv_dns-frontend"
+  #   ports:
+  #     - "6969:6969"
+  #   environment:
+  #     - URL=vps.k-world.me.uk
+  #     - PORT=6969
+  #   links:
+  #     - "backend"
\ No newline at end of file
diff --git a/lib/getUser.js b/lib/getUser.js
index d01fd34..a7f187c 100644
--- a/lib/getUser.js
+++ b/lib/getUser.js
@@ -5,7 +5,8 @@ function getUserAccounts(user) {
     userAccounts.username,
     userAccounts.stream,
     userAccounts.streamURL,
-    userAccounts.expiaryDate
+    userAccounts.expiaryDate,
+    userAccounts.password
   FROM users
     INNER JOIN userAccounts
       ON users.id = userAccounts.userID
diff --git a/routes/getUserAccounts.js b/routes/getUserAccounts.js
index b72bcb7..9f81623 100644
--- a/routes/getUserAccounts.js
+++ b/routes/getUserAccounts.js
@@ -2,11 +2,17 @@ var express = require('express');
 var router = express.Router();
 
 const { getUserAccounts, getUserId } = require('../lib/getUser')
+const { decryptPassword } = require('../lib/password')
 
 /* POST postUser page. */
 router.get('/', async function (req, res, next) {
     let userId = await getUserId(req.auth.user)
     let data = await getUserAccounts(userId)
+    for (let index = 0; index < data.length; index++) {
+        let element = data[index];
+        element.password = await decryptPassword(element.password)
+    }
+
     res.send(data)
 });