updates with password

This commit is contained in:
Karl 2021-09-15 15:33:40 +00:00
parent 10a9f9da52
commit 649b4e9e19
3 changed files with 21 additions and 14 deletions

View File

@ -16,16 +16,16 @@ services:
- DBPASS=Grd555269 - DBPASS=Grd555269
- DATABASE=BBLB_DNS - DATABASE=BBLB_DNS
- DBPORT=3306 - DBPORT=3306
frontend: # frontend:
build: # build:
context: ./client # context: ./client
dockerfile: Dockerfile.prod # dockerfile: Dockerfile.prod
# dockerfile: .dockerfile # # dockerfile: .dockerfile
image: "karl0ss/bblbtv_dns-frontend" # image: "karl0ss/bblbtv_dns-frontend"
ports: # ports:
- "6969:6969" # - "6969:6969"
environment: # environment:
- URL=vps.k-world.me.uk # - URL=vps.k-world.me.uk
- PORT=6969 # - PORT=6969
links: # links:
- "backend" # - "backend"

View File

@ -5,7 +5,8 @@ function getUserAccounts(user) {
userAccounts.username, userAccounts.username,
userAccounts.stream, userAccounts.stream,
userAccounts.streamURL, userAccounts.streamURL,
userAccounts.expiaryDate userAccounts.expiaryDate,
userAccounts.password
FROM users FROM users
INNER JOIN userAccounts INNER JOIN userAccounts
ON users.id = userAccounts.userID ON users.id = userAccounts.userID

View File

@ -2,11 +2,17 @@ var express = require('express');
var router = express.Router(); var router = express.Router();
const { getUserAccounts, getUserId } = require('../lib/getUser') const { getUserAccounts, getUserId } = require('../lib/getUser')
const { decryptPassword } = require('../lib/password')
/* POST postUser page. */ /* POST postUser page. */
router.get('/', async function (req, res, next) { router.get('/', async function (req, res, next) {
let userId = await getUserId(req.auth.user) let userId = await getUserId(req.auth.user)
let data = await getUserAccounts(userId) 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) res.send(data)
}); });