Compare commits

...

8 Commits

Author SHA1 Message Date
Kayne Ruse 7ddef6ed1b Added DB_QUIET as an option 2021-03-10 23:57:27 +11:00
Kayne Ruse 4581f0376a Fixed crash when no password provided on account deletion 2021-03-10 23:43:57 +11:00
Kayne Ruse da8bba93eb Finally playing nice together 2021-03-07 15:34:04 +11:00
Kayne Ruse ddc07e4605 Irritating 2021-03-07 14:45:05 +11:00
Kayne Ruse 29ca934b93 Oh, come on 2021-03-07 14:21:12 +11:00
Kayne Ruse 0dd1717ff6 Minor name tweak 2021-03-07 14:14:13 +11:00
Kayne Ruse a23fb81570 Quick config fix 2021-03-07 14:07:48 +11:00
Kayne Ruse 83af2b1395 Tweaked docker-compose 2021-03-07 13:52:51 +11:00
5 changed files with 10 additions and 10 deletions
+1
View File
@@ -1,3 +1,4 @@
FROM node:15
WORKDIR "/app"
COPY package*.json ./
+1 -3
View File
@@ -4,9 +4,7 @@ An API centric auth server. Uses Sequelize and mariaDB by default.
# Setup
TODO: Dockerize this project
TODO: Write setup instructions, once dockerized
There are multiple ways to run this app - it can run on it's own via `npm start` (for production) or `npm run dev` (for development). it can also run inside docker using `docker-compose up --build` - run `node configure-script.js` to generate docker-compose.yml.
# API
+6 -5
View File
@@ -54,7 +54,7 @@ const question = (prompt, def = null) => {
version: '3'
services:
app:
${appName}:
build:
context: .
ports:
@@ -98,7 +98,9 @@ services:
- app-network
volumes:
- ./mysql:/var/lib/mysql
traefik:
- ./startup.sql:/docker-entrypoint-initdb.d/startup.sql:ro
traefik_${appName}:
container_name: ${appName}_traefik
image: "traefik:v2.4"
container_name: "traefik"
command:
@@ -116,7 +118,6 @@ services:
volumes:
- "./letsencrypt:/letsencrypt"
- "/var/run/docker.sock:/var/run/docker.sock:ro"
- "./startup.sql:/docker-entrypoint-initdb.d/startup.sql:ro"
networks:
- app-network
networks:
@@ -133,13 +134,13 @@ COPY . /app
EXPOSE ${appPort}
USER node
ENTRYPOINT ["bash", "-c"]
CMD ["sleep 10 && npm start"]
CMD ["sleep 10 && npm start"]
`;
const sqlfile = `
CREATE DATABASE IF NOT EXISTS ${appName};
CREATE USER IF NOT EXISTS '${appDBUser}'@'%' IDENTIFIED BY '${appDBPass}';
GRANT ALL PRIVILEGES ON ${appName}.* TO '${appDBUser}'@'%';
GRANT ALL PRIVILEGES ON ${appName}.* TO '${appDBUser}'@'%';
`;
fs.writeFileSync('docker-compose.yml', ymlfile);
+1 -1
View File
@@ -17,7 +17,7 @@ const route = async (req, res) => {
//compare the user's password
const compare = utils.promisify(bcrypt.compare);
const match = await compare(req.body.password, account.hash);
const match = await compare(req.body.password || '', account.hash);
if (!match) {
return res.status(401).send('incorrect password');
+1 -1
View File
@@ -4,7 +4,7 @@ const sequelize = new Sequelize(process.env.DB_DATABASE, process.env.DB_USERNAME
host: process.env.DB_HOSTNAME,
dialect: 'mariadb',
timezone: process.env.DB_TIMEZONE,
logging: false
logging: !!process.env.DB_QUIET
});
sequelize.sync();