From a299bab794814f7113252c1105a1ba7b9264d059 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Thu, 18 Nov 2021 14:52:44 +0000 Subject: [PATCH] Preparing for Egg Trainer merge --- .github/workflows/docker.yml | 2 +- configure-script.js | 4 ++-- package-lock.json | 4 ++-- package.json | 2 +- server/utilities/token-generate.js | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 1164b45..242cdda 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -26,7 +26,7 @@ jobs: docker_image: krgamestudios/auth-server - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v1 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} diff --git a/configure-script.js b/configure-script.js index f4d4226..0265783 100644 --- a/configure-script.js +++ b/configure-script.js @@ -85,7 +85,7 @@ services: - ADMIN_DEFAULT_PASSWORD=${appDefaultPass} - SECRET_ACCESS=${appSecretAccess} - SECRET_REFRESH=${appSecretRefresh} - networks: + networks: - app-network depends_on: - database @@ -96,7 +96,7 @@ services: MYSQL_USER: ${appDBUser} MYSQL_PASSWORD: ${appDBPass} MYSQL_ROOT_PASSWORD: ${dbRootPass} - networks: + networks: - app-network volumes: - ./mysql:/var/lib/mysql diff --git a/package-lock.json b/package-lock.json index 8adfbaf..0ee8f53 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "auth-server", - "version": "1.4.4", + "version": "1.4.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "auth-server", - "version": "1.4.4", + "version": "1.4.5", "license": "ISC", "dependencies": { "bcryptjs": "^2.4.3", diff --git a/package.json b/package.json index 6ddb1f5..bcf0b2d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "auth-server", - "version": "1.4.4", + "version": "1.4.5", "description": "An API centric auth server. Uses Sequelize and mariaDB by default.", "main": "server/server.js", "scripts": { diff --git a/server/utilities/token-generate.js b/server/utilities/token-generate.js index 890239e..84459b7 100644 --- a/server/utilities/token-generate.js +++ b/server/utilities/token-generate.js @@ -12,8 +12,8 @@ module.exports = (index, email, username, type, admin, mod) => { mod, }; - const accessToken = jwt.sign(content, process.env.SECRET_ACCESS, { expiresIn: '10m' }); - const refreshToken = jwt.sign(content, process.env.SECRET_REFRESH, { expiresIn: '30d' }); + const accessToken = jwt.sign(content, process.env.SECRET_ACCESS, { expiresIn: '10m', issuer: 'auth' }); + const refreshToken = jwt.sign(content, process.env.SECRET_REFRESH, { expiresIn: '30d', issuer: 'auth' }); tokens.create({ token: refreshToken, email: email });