Lots of updates! Working in local dev... not sure about staging yet...

Reviewed-on: #3

.drone.yml

@@ -60,15 +60,14 @@ steps:
 trigger:
   branch:
   - main
+  - develop
   event:
   - pull_request
-  - push
 
 ---
 kind: pipeline
 type: docker
 name: Publish Pipeline
-group: publish
 
 workspace:
   path: /drone/grow
@@ -80,16 +79,10 @@ steps:
     - yarn install
     - yarn build
 - name: Publish NPM
-  image: plugins/npm
+  image: node:20-alpine
   failure: ignore
-  settings:
-    username:
-      from_secret: registry_username
-    password:
-      from_secret: registry_password
-    registry: https://git.mifi.dev/api/packages/mifi/npm
-    token:
-    - from_secret: gitea_token
+  commands:
+    - yarn publish -t ${DRONE_TAG}
   volumes:
   - name: npmrc
     path: /drone/grow/.npmrc
@@ -109,34 +102,18 @@ steps:
       - success
       - failure
 - name: Publish Image
-  image: docker
-  commands:
-    - docker build -f docker-compose.staging.yml -t git.mifi.dev/mifi/mifi/auth:latest .
-    - 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
-  - name: dockerconfig
-    path: /drone/grow/.docker/config.json
+  image: plugins/docker
+  settings:
+    auto_tag: true
+    repo: git.mifi.dev/mifi/mifi/auth
+    registry: git.mifi.dev
+    debug: true
+    ssh-agent-key:
+      from_secret: reg_token    
+    username: <token>
+    password:
+      from_secret: reg_token
+  secrets: [reg_token]
 - name: Report Image Publish Status
   image: plugins/webhook
   settings:
@@ -168,10 +145,7 @@ depends_on:
   - Test Pipeline
 
 trigger:
-  branch:
-  - main
   event:
-  - push
   - tag
 
 ---
@@ -182,17 +156,25 @@ name: Deploy Pipeline
 workspace:
   path: /drone/grow
 
+clone:
+  disable: true
+
 steps:
 - name: Deploy Container
   image: docker
   privileged: true
+  environment:
+    CONTAINER_PREFIX: staging
+    HOST: area51.mifi.dev
+    ROUTE_PREFIX: /auth
+    PORT: 9001
   commands:
-    - 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
+    - docker compose -f docker-compose.staging-image.yml pull
+    - docker compose -f docker-compose.staging-image.yml build --no-cache
+    - docker compose -f docker-compose.staging-image.yml rm --stop
+    - docker compose -f docker-compose.staging-image.yml up --wait
   volumes:
-  - name: env
+  - name: env-secrets
     path: /drone/grow/staging.env
   - name: dockersock
     path: /var/run/docker.sock
@@ -222,7 +204,7 @@ volumes:
 - name: dockersock
   host:
     path: /var/run/docker.sock
-- name: env
+- name: env-secrets
   host:
     path: /volume1/docker/beethoven/labs-auth/staging.env
 
@@ -230,8 +212,7 @@ depends_on:
   - Test Pipeline
 
 trigger:
-  branch:
-  - main
   event:
-  - push
-  - tag
+  - promote
+  target:
+  - production

.env.dev

@@ -28,4 +28,4 @@ DEFAULT_TOKEN_DAYS=1
 
 CONTAINER_PREFIX=dev
 SERVICE_NAME=auth-service
-DB_TYPE=mongo
+ENV=development

Dockerfile

@@ -1,28 +1,19 @@
-# 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
+ENV NODE_ENV development
 WORKDIR /home/node/app
 COPY package*.json ./
 COPY tsconfig.json ./
 COPY lib ./lib
 RUN ls -a
 RUN yarn install
-RUN yarn build:production
+RUN yarn build
 
 ## this is stage two , where the app actually runs
 FROM node:20-alpine AS containerize
+ENV NODE_ENV ${ENV:-production}
 WORKDIR /home/node/app
 COPY package*.json ./
 RUN yarn install --frozen-lockfile --production
 COPY --from=0 /home/node/app/dist .
-EXPOSE 9001
-EXPOSE 27017
+EXPOSE ${PORT:-9001}
 CMD ["node","server/index.js"]

docker-compose.dev.yml

@@ -2,20 +2,24 @@ version: '3.8'
 
 services:
     auth-service_mongo:
-        env_file: dev.env
+        env_file: .env.dev
         container_name: ${CONTAINER_PREFIX:-dev}-auth-service_mongo
         ports:
             - 27017:27017
         networks:
-            - labs-net
+            - backend
         volumes:
-            - /var/tmp/labs:/data/db
+            - auth-db:/data
             - ./mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js:ro
         restart: unless-stopped
         image: mongo:latest
     auth-service:
-        env_file: dev.env
-        build: .
+        env_file: .env.dev
+        build:
+            context: .
+            args:
+              - PORT
+              - ENV
         container_name: ${CONTAINER_PREFIX:-dev}-auth-service
         ports:
             - 9001:9001
@@ -23,6 +27,7 @@ services:
             - DB_HOST=${CONTAINER_PREFIX:-dev}-auth-service_mongo
         networks:
             - labs-net
+            - backend
         restart: unless-stopped
         image: node:20-alpine
         depends_on:
@@ -30,3 +35,7 @@ services:
 networks:
     labs-net:
         name: labs-net
+
+volumes:
+    auth-db:
+        external: true

docker-compose.staging-build.yml

@@ -0,0 +1,47 @@
+version: '3.8'
+
+services:
+    auth-service_mongo:
+        container_name: ${CONTAINER_PREFIX:-staging}-auth-service_mongo
+        env_file:
+            - staging.env
+        networks:
+            - docknet
+        volumes:
+            - 'auth-db:/data'
+            - './mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js:ro'
+        restart: unless-stopped
+        image: mongo:latest
+    auth-service:
+        env_file:
+            - staging.env
+        build:
+            context: .
+            args:
+              - PORT
+              - ENV
+        container_name: ${CONTAINER_PREFIX:-staging}-auth-service
+        environment:
+            - DB_HOST=${CONTAINER_PREFIX:-staging}-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
+
+volumes:
+    auth-db:
+        external: false

docker-compose.staging-image.yml

@@ -2,20 +2,22 @@ version: '3.8'
 
 services:
     auth-service_mongo:
-        container_name: ${CONTAINER_PREFIX:-mifi}-auth-service_mongo
-        env_file: staging.env
+        container_name: ${CONTAINER_PREFIX:-staging}-auth-service_mongo
+        env_file:
+            - staging.env
         networks:
             - docknet
         volumes:
-            - '/volume1/docker/labs/auth/mongo:/data/db'
+            - auth-db:/data
+            - ./mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js:ro
         restart: unless-stopped
         image: mongo:latest
     auth-service:
-        env_file: staging.env
-        build: .
-        container_name: ${CONTAINER_PREFIX:-mifi}-auth-service
+        env_file:
+            - staging.env
+        container_name: ${CONTAINER_PREFIX:-staging}-auth-service
         environment:
-            - DB_HOST=${CONTAINER_PREFIX:-mifi}-auth-service_mongo
+            - DB_HOST=${CONTAINER_PREFIX:-staging}-auth-service_mongo
         labels:
             - 'traefik.enable=true'
             - 'traefik.http.routers.grow.rule=Host(`${HOST}`) && Path(`${ROUTE_PREFIX}`)'
@@ -27,10 +29,15 @@ services:
         networks:
             - docknet
         restart: unless-stopped
-        image: node:20-alpine
+        image: git.mifi.dev/mifi/mifi/auth:latest
         depends_on:
             - auth-service_mongo
+
 networks:
     docknet:
         name: docknet
-        external: true
+        external: true
+
+volumes:
+    auth-db:
+        external: false

lib/constants/db.ts

@@ -1,5 +1,5 @@
-export const DB_HOST = process.env.DB_HOST || 'not_set';
+export const DB_HOST = process.env.DB_HOST;
 export const DB_PORT = process.env.DB_PORT || 27017;
-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';
+export const DB_USERNAME = process.env.DB_USERNAME;
+export const DB_PASSWORD = process.env.DB_PASSWORD;
+export const DB_NAME = process.env.DB_NAME;

lib/server/controllers/auth.ts

@@ -7,6 +7,7 @@ import Auth from '../../db/model/auth';
 import { sign } from '../../utils/jwt';
 import passport from '../passport';
 import { ErrorCodes, getErrorBody } from '../../constants/errors';
+import { authenticated } from '../middleware/authenication';
 
 const routerOpts: Router.IRouterOptions = { prefix };
 const router: Router = new Router(routerOpts);
@@ -43,7 +44,10 @@ router.post(process.env.RESET_ROUTE || RESET_ROUTE, async (ctx, next) => {
     ctx.body = { success: false, ...getErrorBody(ErrorCodes.RESET_REQUEST_DATA) };
 });
 
-router.patch('/:record', (ctx: Koa.Context) => {
+router.patch('/:record', authenticated(), (ctx: Koa.Context) => {
+    if (ctx.user !== ctx.param.record) {
+        ctx.throw(StatusCodes.UNAUTHORIZED);
+    }
     const data = Auth.findOneAndUpdate({ record: ctx.params.record });
     if (!data) {
         ctx.throw(StatusCodes.NOT_FOUND);

lib/server/index.ts

@@ -5,7 +5,7 @@ import { PORT } from '../constants/env';
 connection.then(
     () => {
         app.listen(PORT);
-        console.log('LISTENING', process.env);
+        console.debug('Server up and listening', { env: process.env });
     },
-    (err) => console.error('SERVER ERROR!', { err, env: process.env }),
+    (err) => console.error('Could not reach database', { err, env: process.env }),
 );

package.json

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