A whole new world...

.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:
@@ -175,18 +150,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
+  event:
+  - push
+  - tag
 
 ---
 kind: pipeline
@@ -196,15 +172,14 @@ 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 pull
     - docker compose build --no-cache
+    - docker compose rm --stop
     - docker compose up --wait
   volumes:
   - name: env
@@ -239,13 +214,14 @@ volumes:
     path: /var/run/docker.sock
 - name: env
   host:
-    path: /volume1/docker/labs/grow-auth/.env
+    path: /volume1/docker/beethoven/labs-auth/staging.env
 
-# depends_on:
-#   - Build Pipeline
+depends_on:
+  - Test Pipeline
 
 trigger:
   branch:
   - main
-  # event:
-  # - tag
+  event:
+  - push
+  - tag

.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

@@ -23,5 +23,4 @@ WORKDIR /home/node/app
 COPY package*.json ./
 RUN yarn install --frozen-lockfile --production
 COPY --from=0 /home/node/app/dist .
-EXPOSE 80
 CMD ["node","server/index.js"]

dev.env

@@ -0,0 +1,25 @@
+HOST=localhost
+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=sso
+SERVICE_NAME=auth-service
+DB_TYPE=mongo

docker-compose.yml

@@ -2,29 +2,31 @@ version: '3.8'
 
 services:
     auth-service_mongo:
-        container_name: ${CONTAINER_PREFIX}${SERVICE_NAME}_${DB_TYPE}
+        container_name: ${CONTAINER_PREFIX}-auth-service_mongo
+        env_file: .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
         volumes:
-            - '/volume1/docker/labs/grow-auth/mongo:/data/db'
+            - '/volume1/docker/labs/auth/mongo:/data/db'
         restart: unless-stopped
         image: mongo
     auth-service:
+        env_file: .env
         build: .
-        container_name: ${CONTAINER_PREFIX}-${SERVICE_NAME}
+        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}-${SERVICE_NAME}_${DB_TYPE}
-            - DB_USER=${DB_USER}
-            - DB_PASS=${DB_PASS}
+            - 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}
@@ -35,17 +37,18 @@ services:
             - 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.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=gitea'
-            - 'traefik.http.services.gitea.loadbalancer.server.port=${PORT}'
+            - 'traefik.http.routers.grow.service=grow-service'
+            - 'traefik.http.services.grow-service.loadbalancer.server.port=${PORT}'
         networks:
             - docknet
         restart: unless-stopped
         image: node
+        links:
+            - auth-service_mongo:${CONTAINER_PREFIX}-auth-service_mongo
         depends_on:
             - auth-service_mongo
 networks:

lib/constants/db.ts

@@ -1,5 +1,5 @@
 export const DB_HOST = process.env.DB_HOST || 'mongodb';
 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_USERNAME = process.env.DB_USERNAME || 'test';
+export const DB_PASSWORD = process.env.DB_PASSWORD || 'test';
 export const DB_NAME = process.env.DB_NAME || 'auth';

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}`);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mifi/auth",
-  "version": "0.0.8",
+  "version": "0.0.24",
   "author": "mifi (Mike Fitzpatrick)",
   "license": "MIT",
   "scripts": {