From 50c74fdb71adc7bfd4dd0f78fbd90344842f8ade Mon Sep 17 00:00:00 2001
From: mifi <badmf@mifi.dev>
Date: Sat, 6 May 2023 00:48:27 -0400
Subject: [PATCH] I think it is working now...

---
 docker-compose.dev.yml     | 14 ++++++--------
 docker-compose.staging.yml | 22 +---------------------
 mongo-init.js              |  2 +-
 package.json               |  5 ++---
 4 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 97de15d..600107f 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -7,9 +7,9 @@ services:
         ports:
             - 27017:27017
         networks:
-            - docknet
+            - labs-net
         volumes:
-            # - /var/tmp/labs:/data/db
+            - /var/tmp/labs:/data/db
             - ./mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js:ro
         restart: unless-stopped
         image: mongo:latest
@@ -18,17 +18,15 @@ services:
         build: .
         container_name: ${CONTAINER_PREFIX:-dev}-auth-service
         ports:
-            - 9000:9000
+            - 9001:9001
         environment:
             - DB_HOST=${CONTAINER_PREFIX:-dev}-auth-service_mongo
         networks:
-            - docknet
+            - labs-net
         restart: unless-stopped
         image: node:20-alpine
-        links:
-            - auth-service_mongo:${CONTAINER_PREFIX:-dev}-auth-service_mongo
         depends_on:
             - auth-service_mongo
 networks:
-    docknet:
-        name: docknet
+    labs-net:
+        name: labs-net
diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml
index c1a1fad..0a468d8 100644
--- a/docker-compose.staging.yml
+++ b/docker-compose.staging.yml
@@ -4,11 +4,6 @@ services:
     auth-service_mongo:
         container_name: ${CONTAINER_PREFIX}-auth-service_mongo
         env_file: .env
-        environment:
-            - ALLOW_EMPTY_PASSWORD=yes
-            - MONGO_INITDB_ROOT_USERNAME=${DB_USERNAME}
-            - MONGO_INITDB_ROOT_PASSWORD=${DB_PASSWORD}
-            - MONGO_INITDB_DATABASE=${DB_NAME}
         networks:
             - docknet
         volumes:
@@ -20,21 +15,7 @@ services:
         build: .
         container_name: ${CONTAINER_PREFIX}-auth-service
         environment:
-            - PORT=${PORT}
-            - ROUTE_PREFIX=${ROUTE_PREFIX}
-            - LOGIN_ROUTE=${LOGIN_ROUTE}
-            - RESET_ROUTE=${RESET_ROUTE}
             - DB_HOST=${CONTAINER_PREFIX}-auth-service_mongo
-            - DB_USERNAME=${DB_USERNAME}
-            - DB_PASSWORD=${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}`) && Path(`${ROUTE_PREFIX}`)'
@@ -47,10 +28,9 @@ services:
             - docknet
         restart: unless-stopped
         image: node
-        links:
-            - auth-service_mongo:${CONTAINER_PREFIX}-auth-service_mongo
         depends_on:
             - auth-service_mongo
 networks:
     docknet:
         name: docknet
+        external: true
\ No newline at end of file
diff --git a/mongo-init.js b/mongo-init.js
index 99ec02b..56542b7 100644
--- a/mongo-init.js
+++ b/mongo-init.js
@@ -1,5 +1,5 @@
 /* eslint-disable no-undef */
-db = db.getSiblingDB(process.env.DB_NAME || 'not_set');
+db = db.getSiblingDB(process.env.DB_NAME);
 db.createUser({
     user: process.env.DB_USERNAME,
     pwd: process.env.DB_PASSWORD,
diff --git a/package.json b/package.json
index cb6a2dd..a644306 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mifi/auth",
-  "version": "0.0.25",
+  "version": "0.0.26",
   "author": "mifi (Mike Fitzpatrick)",
   "license": "MIT",
   "scripts": {
@@ -80,6 +80,5 @@
   "repository": {
     "type": "git",
     "url": "https://git.mifi.dev/mifi/auth.git"
-  },
-  "registry": "https://git.mifi.dev"
+  }
 }