Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 4581f0376a | |||
| da8bba93eb | |||
| ddc07e4605 | |||
| 29ca934b93 | |||
| 0dd1717ff6 | |||
| a23fb81570 | |||
| 83af2b1395 |
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
FROM node:15
|
FROM node:15
|
||||||
WORKDIR "/app"
|
WORKDIR "/app"
|
||||||
COPY package*.json ./
|
COPY package*.json ./
|
||||||
|
|||||||
@@ -4,9 +4,7 @@ An API centric auth server. Uses Sequelize and mariaDB by default.
|
|||||||
|
|
||||||
# Setup
|
# Setup
|
||||||
|
|
||||||
TODO: Dockerize this project
|
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.
|
||||||
|
|
||||||
TODO: Write setup instructions, once dockerized
|
|
||||||
|
|
||||||
# API
|
# API
|
||||||
|
|
||||||
|
|||||||
+6
-5
@@ -54,7 +54,7 @@ const question = (prompt, def = null) => {
|
|||||||
version: '3'
|
version: '3'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
${appName}:
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
ports:
|
ports:
|
||||||
@@ -98,7 +98,9 @@ services:
|
|||||||
- app-network
|
- app-network
|
||||||
volumes:
|
volumes:
|
||||||
- ./mysql:/var/lib/mysql
|
- ./mysql:/var/lib/mysql
|
||||||
traefik:
|
- ./startup.sql:/docker-entrypoint-initdb.d/startup.sql:ro
|
||||||
|
traefik_${appName}:
|
||||||
|
container_name: ${appName}_traefik
|
||||||
image: "traefik:v2.4"
|
image: "traefik:v2.4"
|
||||||
container_name: "traefik"
|
container_name: "traefik"
|
||||||
command:
|
command:
|
||||||
@@ -116,7 +118,6 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- "./letsencrypt:/letsencrypt"
|
- "./letsencrypt:/letsencrypt"
|
||||||
- "/var/run/docker.sock:/var/run/docker.sock:ro"
|
- "/var/run/docker.sock:/var/run/docker.sock:ro"
|
||||||
- "./startup.sql:/docker-entrypoint-initdb.d/startup.sql:ro"
|
|
||||||
networks:
|
networks:
|
||||||
- app-network
|
- app-network
|
||||||
networks:
|
networks:
|
||||||
@@ -133,13 +134,13 @@ COPY . /app
|
|||||||
EXPOSE ${appPort}
|
EXPOSE ${appPort}
|
||||||
USER node
|
USER node
|
||||||
ENTRYPOINT ["bash", "-c"]
|
ENTRYPOINT ["bash", "-c"]
|
||||||
CMD ["sleep 10 && npm start"]
|
CMD ["sleep 10 && npm start"]
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const sqlfile = `
|
const sqlfile = `
|
||||||
CREATE DATABASE IF NOT EXISTS ${appName};
|
CREATE DATABASE IF NOT EXISTS ${appName};
|
||||||
CREATE USER IF NOT EXISTS '${appDBUser}'@'%' IDENTIFIED BY '${appDBPass}';
|
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);
|
fs.writeFileSync('docker-compose.yml', ymlfile);
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ const route = async (req, res) => {
|
|||||||
|
|
||||||
//compare the user's password
|
//compare the user's password
|
||||||
const compare = utils.promisify(bcrypt.compare);
|
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) {
|
if (!match) {
|
||||||
return res.status(401).send('incorrect password');
|
return res.status(401).send('incorrect password');
|
||||||
|
|||||||
Reference in New Issue
Block a user