From ba31f4b8be2ae113cf67dbb0d4bef91972606fb5 Mon Sep 17 00:00:00 2001
From: mifi <badmf@mifi.dev>
Date: Fri, 5 May 2023 10:01:42 -0400
Subject: [PATCH] More changes

---
 dev.env            | 25 +++++++++++++++++++++++++
 docker-compose.yml | 34 ++++++++++++++++++----------------
 package.json       |  2 +-
 3 files changed, 44 insertions(+), 17 deletions(-)
 create mode 100644 dev.env

diff --git a/dev.env b/dev.env
new file mode 100644
index 0000000..5b48508
--- /dev/null
+++ b/dev.env
@@ -0,0 +1,25 @@
+HOST=grow.mifi.dev
+PORT=9001
+
+ROUTE_PREFIX=/auth
+
+LOGIN_ROUTE=/login
+RESET_ROUTE=/reset
+
+DB_USERNAME=user
+DB_PASSWORD=password
+DB_NAME=auth
+
+SESSION_KEY=shjhakjfhfjdshjksdhfdshfhfduyeyb73te4
+
+JWT_AUDIENCE=Grow.io
+JWT_ISSUER=Grow Latch
+JWT_SECRET='Th!sIs a d3v3lopm3nt server $#cr¢T.'
+
+LOGIN_VALID_TIME=12H
+RESET_VALID_MINUTES=15
+DEFAULT_TOKEN_DAYS=1
+
+CONTAINER_PREFIX=grow
+SERVICE_NAME=auth-service
+DB_TYPE=mongo
diff --git a/docker-compose.yml b/docker-compose.yml
index 52d448d..cc68aee 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,10 +3,11 @@ version: '3.8'
 services:
     auth-service_mongo:
         container_name: ${CONTAINER_PREFIX}-${SERVICE_NAME}_${DB_TYPE}
+        env_file: staging.env
         environment:
             - ALLOW_EMPTY_PASSWORD=yes
-            - MONGO_INITDB_ROOT_USERNAME=${DB_USER}
-            - MONGO_INITDB_ROOT_PASSWORD=${DB_PASS}
+            - MONGO_INITDB_ROOT_USERNAME=${DB_USERNAME}
+            - MONGO_INITDB_ROOT_PASSWORD=${DB_PASSWORD}
             - MONGO_INITDB_DATABASE=${DB_NAME}
         networks:
             - docknet
@@ -15,24 +16,25 @@ services:
         restart: unless-stopped
         image: mongo
     auth-service:
+        env_file: staging.env
         build: .
         container_name: ${CONTAINER_PREFIX}-${SERVICE_NAME}
         environment:
-            - PORT=${PORT}
-            - ROUTE_PREFIX=${ROUTE_PREFIX}
-            - LOGIN_ROUTE=${LOGIN_ROUTE}
-            - RESET_ROUTE=${RESET_ROUTE}
+            # - PORT=${PORT}
+            # - ROUTE_PREFIX=${ROUTE_PREFIX}
+            # - LOGIN_ROUTE=${LOGIN_ROUTE}
+            # - RESET_ROUTE=${RESET_ROUTE}
             - DB_HOST=${CONTAINER_PREFIX}-${SERVICE_NAME}_${DB_TYPE}
-            - DB_USER=${DB_USER}
-            - DB_PASS=${DB_PASS}
-            - DB_NAME=${DB_NAME}
-            - SESSION_KEY=${SESSION_KEY}
-            - JWT_AUDIENCE=${JWT_AUDIENCE}
-            - JWT_ISSUER=${JWT_ISSUER}
-            - JWT_SECRET=${JWT_SECRET}
-            - LOGIN_VALID_TIME=${LOGIN_VALID_TIME}
-            - RESET_VALID_MINUTES=${RESET_VALID_MINUTES}
-            - DEFAULT_TOKEN_DAYS=${DEFAULT_TOKEN_DAYS}
+            # - DB_USER=${DB_USERNAME}
+            # - DB_PASS=${DB_PASSWORD}
+            # - DB_NAME=${DB_NAME}
+            # - SESSION_KEY=${SESSION_KEY}
+            # - JWT_AUDIENCE=${JWT_AUDIENCE}
+            # - JWT_ISSUER=${JWT_ISSUER}
+            # - JWT_SECRET=${JWT_SECRET}
+            # - LOGIN_VALID_TIME=${LOGIN_VALID_TIME}
+            # - RESET_VALID_MINUTES=${RESET_VALID_MINUTES}
+            # - DEFAULT_TOKEN_DAYS=${DEFAULT_TOKEN_DAYS}
         labels:
             - 'traefik.enable=true'
             - 'traefik.http.routers.grow.rule=Host(`${HOST}`)'
diff --git a/package.json b/package.json
index 3953d8f..87482b5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mifi/auth",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "author": "mifi (Mike Fitzpatrick)",
   "license": "MIT",
   "scripts": {