More ENV updates

.drone.yml

@@ -10,23 +10,19 @@ steps:
   image: node:latest
   commands:
   - yarn install
-
 - name: Code Style Checks
   image: node:latest
   commands:
   - yarn prettier
-
 - name: Lint
   image: node:latest
   commands:
   - yarn lint
-
 - name: Unit Tests
   image: node:latest
   commands:
   - yarn test
-
-- name: Send Status Notification
+- name: Send Test Status Notification
   image: plugins/webhook
   settings:
     urls: https://lab.mifi.dev/hooks/9p65zpagctgkmndo8nwwm4199r
@@ -41,34 +37,14 @@ steps:
     status:
       - success
       - failure
-
-trigger:
-  event:
-  - push
-
----
-kind: pipeline
-type: docker
-name: Build Pipeline
-
-workspace:
-  path: /drone/grow
-
-steps:
-- name: yarn install
-  image: node:latest
-  commands:
-  - yarn install
-
 - name: Build
   image: node:latest
   commands:
   - yarn build
-
-- name: Send Status Notifications
+- name: Send Build Status Notifications
   image: plugins/webhook
   settings:
-    urls: https://lab.mifi.dev/hooks/ccw34hdf7tgbjmzp96nptn938r
+    urls: https://lab.mifi.dev/hooks/9p65zpagctgkmndo8nwwm4199r
     content_type: application/json
     template: |
       {
@@ -81,13 +57,11 @@ steps:
       - success
       - failure
 
-depends_on:
-  - Test Pipeline
-
 trigger:
   branch:
   - main
   event:
+  # - pull_request
   - push
 
 ---
@@ -100,7 +74,7 @@ workspace:
   path: /drone/grow
 
 steps:
-- name: Build Service
+- name: Build Package
   image: node:latest
   commands:
     - yarn install
@@ -113,11 +87,12 @@ steps:
       from_secret: registry_username
     password:
       from_secret: registry_password
-    registry: https://git.mifi.dev
+    registry: https://git.mifi.dev/api/packages/mifi/npm
     token:
     - from_secret: gitea_token
   volumes:
-  - name: yarnrc
+  - name: npmrc
+    path: /drone/grow/.npmrc
 - name: Report NPM Publish Status
   image: plugins/webhook
   settings:
@@ -134,19 +109,29 @@ steps:
       - success
       - failure
 - name: Publish Image
-  image: plugins/docker
-  settings:
-    auto_tag: true
-    squash: true
-    repo: git.mifi.dev/mifi/auth
-    context: mifi
-    registry: git.mifi.dev
-    username:
-      from_secret: registry_username
-    password:
-      from_secret: registry_password
-    ssh-agent-key:
-      from_secret: gitea_token
+  image: docker
+  commands:
+    - docker build -t git.mifi.dev/mifi/mifi/auth:latest -t git.mifi.dev/mifi/mifi/auth:${DRONE_TAG} .
+    - docker push git.mifi.dev/mifi/mifi/auth:latest
+  volumes:
+  - name: dockersock
+    path: /var/run/docker.sock
+  - name: dockerconfig
+    path: /drone/grow/.docker/config.json
+# - name: Publish Image
+#   image: plugins/docker
+#   settings:
+#     auto_tag: true
+#     squash: true
+#     repo: git.mifi.dev/mifi/auth
+#     context: mifi
+#     registry: git.mifi.dev
+#     username:
+#       from_secret: registry_username
+#     password:
+#       from_secret: registry_password
+#     ssh-agent-key:
+#       from_secret: gitea_token
   volumes:
   - name: dockersock
     path: /var/run/docker.sock
@@ -175,18 +160,19 @@ volumes:
 - name: dockersock
   host:
     path: /var/run/docker.sock
-- name: yarnrc
+- name: npmrc
   host:
-    path: /volume1/docker/.yarnrc.yml
+    path: /volume1/docker/beethoven/labs-auth/.npmrc
 
-# depends_on:
-#   - Build Pipeline
+depends_on:
+  - Test Pipeline
 
 trigger:
-  branch:
-  - main
-  # event:
-  # - tag
+  # branch:
+  # - main
+  event:
+  # - push
+  - tag
 
 ---
 kind: pipeline
@@ -196,19 +182,18 @@ name: Deploy Pipeline
 workspace:
   path: /drone/grow
 
-# image_pull_secrets:
-# - from_secret: gitea_token
-
 steps:
 - name: Deploy Container
   image: docker
   privileged: true
   commands:
-    - docker compose build --no-cache
-    - docker compose up --wait
+    - docker compose -f docker-compose.staging.yml pull
+    - docker compose -f docker-compose.staging.yml build --no-cache
+    - docker compose -f docker-compose.staging.yml rm --stop
+    - docker compose -f docker-compose.staging.yml up --wait
   volumes:
-  - name: env
-    path: /drone/grow/.env
+  - name: env-secrets
+    path: /drone/grow/staging.env
   - name: dockersock
     path: /var/run/docker.sock
   - name: dockerconfig
@@ -237,15 +222,16 @@ volumes:
 - name: dockersock
   host:
     path: /var/run/docker.sock
-- name: env
+- name: env-secrets
   host:
-    path: /volume1/docker/labs/grow-auth/.env
+    path: /volume1/docker/beethoven/labs-auth/staging.secrets.env
 
-# depends_on:
-#   - Build Pipeline
+depends_on:
+  - Test Pipeline
 
 trigger:
-  branch:
-  - main
-  # event:
-  # - tag
+  # branch:
+  # - main
+  event:
+  # - push
+  - tag

.env.dev

@@ -0,0 +1,29 @@
+HOST=localhost
+PORT=9001
+
+ROUTE_PREFIX=/auth
+
+LOGIN_ROUTE=/login
+RESET_ROUTE=/reset
+
+DB_ADMIN_USERNAME=root
+DB_ADMIN_PASSWORD=password
+DB_USERNAME=user
+DB_PASSWORD=password
+DB_NAME=auth
+
+MONGO_INITDB_ROOT_USERNAME=$DB_ADMIN_USERNAME
+MONGO_INITDB_ROOT_PASSWORD=$DB_ADMIN_PASSWORD
+MONGO_INITDB_DATABASE=$DB_NAME
+
+SESSION_KEY=shjhakjfhfjdshjksdhfdshfhfduyeyb73te4
+
+JWT_AUDIENCE=Grow.io
+JWT_ISSUER=Grow Latch
+JWT_SECRET=Th!sIs a d3v3lopm3nt server SEcr¢T.
+
+LOGIN_VALID_TIME=12H
+RESET_VALID_MINUTES=15
+DEFAULT_TOKEN_DAYS=1
+
+CONTAINER_PREFIX=dev

.env.staging

@@ -0,0 +1,6 @@
+HOST=area51.mifi.dev
+PORT=9001
+
+ROUTE_PREFIX=/auth
+
+CONTAINER_PREFIX=mifi

.npmrc

@@ -1,3 +0,0 @@
-@mifi:registry=https://git.mifi.dev/api/packages/mifi/npm
-//git.mifi.dev/api/packages/mifi/npm/:_authToken=${REGISTRY_TOKEN}
-@mifi/grow:registry=https://git.mifi.dev

Dockerfile

@@ -1,13 +1,3 @@
-# FROM node:20-alpine AS build
-# RUN mkdir -p /home/node/app/node_modules && chown -R node:node /home/node/app
-# WORKDIR /home/node/app
-# COPY package*.json .
-# COPY dist/lib .
-# USER node
-# RUN yarn install --frozen-lockfile --production
-# COPY --chown=node:node node_modules ./node_modules
-# CMD ["node", "dist/lib/server/index.js"]
-
 FROM node:20-alpine AS build
 WORKDIR /home/node/app
 COPY package*.json ./
@@ -23,5 +13,6 @@ WORKDIR /home/node/app
 COPY package*.json ./
 RUN yarn install --frozen-lockfile --production
 COPY --from=0 /home/node/app/dist .
-EXPOSE 80
+EXPOSE 9001
+EXPOSE 27017
 CMD ["node","server/index.js"]

docker-compose.dev.yml

@@ -0,0 +1,32 @@
+version: '3.8'
+
+services:
+    auth-service_mongo:
+        env_file: .env.dev
+        container_name: ${CONTAINER_PREFIX:-dev}-auth-service_mongo
+        ports:
+            - 27017:27017
+        networks:
+            - labs-net
+        volumes:
+            - /var/tmp/labs:/data/db
+            - ./mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js:ro
+        restart: unless-stopped
+        image: mongo:latest
+    auth-service:
+        env_file: .env.dev
+        build: .
+        container_name: ${CONTAINER_PREFIX:-dev}-auth-service
+        ports:
+            - 9001:9001
+        environment:
+            - DB_HOST=${CONTAINER_PREFIX:-dev}-auth-service_mongo
+        networks:
+            - labs-net
+        restart: unless-stopped
+        image: node:20-alpine
+        depends_on:
+            - auth-service_mongo
+networks:
+    labs-net:
+        name: labs-net

docker-compose.staging.yml

@@ -0,0 +1,40 @@
+version: '3.8'
+
+services:
+    auth-service_mongo:
+        container_name: ${CONTAINER_PREFIX:-mifi}-auth-service_mongo
+        env_file:
+            - .env.staging
+            - staging.env
+        networks:
+            - docknet
+        volumes:
+            - '/volume1/docker/labs/auth/mongo:/data/db'
+        restart: unless-stopped
+        image: mongo:latest
+    auth-service:
+        env_file:
+            - .env.staging
+            - staging.env
+        build: .
+        container_name: ${CONTAINER_PREFIX:-mifi}-auth-service
+        environment:
+            - DB_HOST=${CONTAINER_PREFIX:-mifi}-auth-service_mongo
+        labels:
+            - 'traefik.enable=true'
+            - 'traefik.http.routers.grow.rule=Host(`${HOST}`) && Path(`${ROUTE_PREFIX}`)'
+            - 'traefik.http.routers.grow.entrypoints=websecure'
+            - 'traefik.http.routers.grow.tls=true'
+            - 'traefik.http.routers.grow.tls.certresolver=letsencrypt'
+            - 'traefik.http.routers.grow.service=grow-service'
+            - 'traefik.http.services.grow-service.loadbalancer.server.port=${PORT}'
+        networks:
+            - docknet
+        restart: unless-stopped
+        image: node:20-alpine
+        depends_on:
+            - auth-service_mongo
+networks:
+    docknet:
+        name: docknet
+        external: true

docker-compose.yml

@@ -1,53 +0,0 @@
-version: '3.8'
-
-services:
-    auth-service_mongo:
-        container_name: ${CONTAINER_PREFIX}${SERVICE_NAME}_${DB_TYPE}
-        environment:
-            - ALLOW_EMPTY_PASSWORD=yes
-            - MONGO_INITDB_ROOT_USERNAME=${DB_USER}
-            - MONGO_INITDB_ROOT_PASSWORD=${DB_PASS}
-            - MONGO_INITDB_DATABASE=${DB_NAME}
-        networks:
-            - docknet
-        volumes:
-            - '/volume1/docker/labs/grow-auth/mongo:/data/db'
-        restart: unless-stopped
-        image: mongo
-    auth-service:
-        build: .
-        container_name: ${CONTAINER_PREFIX}-${SERVICE_NAME}
-        environment:
-            - 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}
-        labels:
-            - 'traefik.enable=true'
-            - 'traefik.http.routers.grow.rule=Host(`${HOST}`)'
-            - 'traefik.http.routers.grow.rule=Path(`${ROUTE_PREFIX}`)'
-            - 'traefik.http.routers.grow.entrypoints=websecure'
-            - 'traefik.http.routers.grow.tls=true'
-            - 'traefik.http.routers.grow.tls.certresolver=letsencrypt'
-            - 'traefik.http.routers.grow.service=gitea'
-            - 'traefik.http.services.gitea.loadbalancer.server.port=${PORT}'
-        networks:
-            - docknet
-        restart: unless-stopped
-        image: node
-        depends_on:
-            - auth-service_mongo
-networks:
-    docknet:
-        name: docknet

lib/constants/db.ts

@@ -1,5 +1,5 @@
-export const DB_HOST = process.env.DB_HOST || 'mongodb';
+export const DB_HOST = process.env.DB_HOST || 'not_set';
 export const DB_PORT = process.env.DB_PORT || 27017;
-export const DB_USER = process.env.DB_USER || 'test';
-export const DB_PASS = process.env.DB_PASSWORD || 'test';
-export const DB_NAME = process.env.DB_NAME || 'auth';
+export const DB_USERNAME = process.env.DB_USERNAME || 'not_set';
+export const DB_PASSWORD = process.env.DB_PASSWORD || 'not_set';
+export const DB_NAME = process.env.DB_NAME || 'not_set';

lib/constants/env.ts

@@ -1,4 +1,4 @@
-export const PACKAGE_NAME = '@mifi/latch';
+export const PACKAGE_NAME = '@mifi/auth';
 export const PORT = process.env.PORT || 9000;
 
 export const SESSION_KEY = process.env.SESSION_KEY || 'secret-key';

lib/db/index.ts

@@ -1,5 +1,5 @@
 import mongoose from 'mongoose';
 
-import { DB_HOST, DB_NAME, DB_PASS, DB_PORT, DB_USER } from '../constants/db';
+import { DB_HOST, DB_NAME, DB_PASSWORD, DB_PORT, DB_USERNAME } from '../constants/db';
 
-export const connection = mongoose.connect(`mongodb://${DB_USER}:${DB_PASS}@${DB_HOST}:${DB_PORT}/${DB_NAME}`);
+export const connection = mongoose.connect(`mongodb://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}`);

lib/server/controllers/auth.ts

@@ -11,6 +11,12 @@ import { ErrorCodes, getErrorBody } from '../../constants/errors';
 const routerOpts: Router.IRouterOptions = { prefix };
 const router: Router = new Router(routerOpts);
 
+router.get('/info', (ctx) => {
+    ctx.body = {
+        service: process.env.SERVICE_NAME,
+    };
+});
+
 router.post('/', async (ctx) => {
     const data = (await Auth.create(ctx.body)).save();
     ctx.body = { success: true, data: { ...data, strategies: undefined } };

lib/server/index.ts

@@ -1,12 +1,11 @@
-import dotenv from 'dotenv';
-
 import app from './app';
 import { connection } from '../db';
 import { PORT } from '../constants/env';
 
-dotenv.config();
-
 connection.then(
-    () => app.listen(PORT),
-    (err) => console.error('ERROR!', err),
+    () => {
+        app.listen(PORT);
+        console.log('LISTENING', process.env);
+    },
+    (err) => console.error('SERVER ERROR!', { err, env: process.env }),
 );

mongo-init.js

@@ -0,0 +1,12 @@
+/* eslint-disable no-undef */
+db = db.getSiblingDB(process.env.DB_NAME);
+db.createUser({
+    user: process.env.DB_USERNAME,
+    pwd: process.env.DB_PASSWORD,
+    roles: [
+        {
+            role: 'readWrite',
+            db: process.env.DB_NAME,
+        },
+    ],
+});

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mifi/auth",
-  "version": "0.0.8",
+  "version": "0.0.31",
   "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"
+  }
 }