Merge pull request 'Probably not...' (#2) from feature/updated_compose into main

Reviewed-on: #2

.drone.yml

@@ -62,13 +62,11 @@ trigger:
   - main
   event:
   - pull_request
-  - push
 
 ---
 kind: pipeline
 type: docker
 name: Publish Pipeline
-group: publish
 
 workspace:
   path: /drone/grow
@@ -80,16 +78,10 @@ steps:
     - yarn install
     - yarn build
 - name: Publish NPM
-  image: plugins/npm
+  image: node:20-alpine
   failure: ignore
-  settings:
+  commands:
-    username:
+    - yarn publish -t ${DRONE_TAG}
-      from_secret: registry_username
-    password:
-      from_secret: registry_password
-    registry: https://git.mifi.dev
-    token:
-    - from_secret: gitea_token
   volumes:
   - name: npmrc
     path: /drone/grow/.npmrc
@@ -112,21 +104,15 @@ steps:
   image: plugins/docker
   settings:
     auto_tag: true
-    squash: true
+    repo: git.mifi.dev/mifi/mifi/auth
-    repo: git.mifi.dev/mifi/auth
-    context: mifi
     registry: git.mifi.dev
-    username:
+    debug: true
-      from_secret: registry_username
-    password:
-      from_secret: registry_password
     ssh-agent-key:
-      from_secret: gitea_token
+      from_secret: reg_token    
-  volumes:
+    username: <token>
-  - name: dockersock
+    password:
-    path: /var/run/docker.sock
+      from_secret: reg_token
-  - name: dockerconfig
+  secrets: [reg_token]
-    path: /drone/grow/.docker/config.json
 - name: Report Image Publish Status
   image: plugins/webhook
   settings:
@@ -152,16 +138,13 @@ volumes:
     path: /var/run/docker.sock
 - name: npmrc
   host:
-    path: /volume1/docker/grow/labs-auth/.npmrc
+    path: /volume1/docker/beethoven/labs-auth/.npmrc
 
 depends_on:
   - Test Pipeline
 
 trigger:
-  branch:
-  - main
   event:
-  - push
   - tag
 
 ---
@@ -176,14 +159,19 @@ steps:
 - name: Deploy Container
   image: docker
   privileged: true
+  environment:
+    CONTAINER_PREFIX: staging
+    HOST: area51.mifi.dev
+    ROUTE_PREFIX: /auth
+    PORT: 9001
   commands:
-    - docker compose pull
+    - docker compose -f docker-compose.staging.yml pull
-    - docker compose build --no-cache
+    - docker compose -f docker-compose.staging.yml build --no-cache
-    - docker compose rm --stop
+    - docker compose -f docker-compose.staging.yml rm --stop
-    - docker compose up --wait
+    - docker compose -f docker-compose.staging.yml up --wait
   volumes:
-  - name: env
+  - name: env-secrets
-    path: /drone/grow/.env
+    path: /drone/grow/staging.env
   - name: dockersock
     path: /var/run/docker.sock
   - name: dockerconfig
@@ -212,16 +200,15 @@ 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.env
 
 depends_on:
   - Test Pipeline
 
 trigger:
-  branch:
-  - main
   event:
-  - push
+  - promote
-  - tag
+  target:
+  - production

.env.dev

@@ -1,4 +1,4 @@
-HOST=grow.mifi.dev
+HOST=localhost
 PORT=9001
 
 ROUTE_PREFIX=/auth
@@ -6,20 +6,24 @@ 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 $#cr¢T.'
+JWT_SECRET=Th!sIs a d3v3lopm3nt server SEcr¢T.
 
 LOGIN_VALID_TIME=12H
 RESET_VALID_MINUTES=15
 DEFAULT_TOKEN_DAYS=1
 
-CONTAINER_PREFIX=grow
+CONTAINER_PREFIX=dev
-SERVICE_NAME=auth-service
-DB_TYPE=mongo

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 ./
@@ -15,12 +5,14 @@ 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 ${PORT}
 CMD ["node","server/index.js"]

docker-compose.dev.yml

@@ -0,0 +1,41 @@
+version: '3.8'
+
+services:
+    auth-service_mongo:
+        env_file: .env.dev
+        build:
+            args:
+              - CONTAINER_PREFIX=${CONTAINER_PREFIX}
+        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:
+            context: .
+            args:
+              - HOST=${HOST}
+              - PORT=${PORT}
+              - ROUTE_PREFIX=${ROUTE_PREFIX}
+              - CONTAINER_PREFIX=${CONTAINER_PREFIX}
+        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,39 @@
+version: '3.8'
+
+services:
+    auth-service_mongo:
+        container_name: ${CONTAINER_PREFIX}-auth-service_mongo
+        env_file:
+            - staging.env
+        networks:
+            - docknet
+        volumes:
+            - '/volume1/docker/labs/auth/mongo:/data/db'
+            # - ./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}-auth-service
+        environment:
+            - DB_HOST=${CONTAINER_PREFIX}-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.staging_image.yml

@@ -0,0 +1,39 @@
+version: '3.8'
+
+services:
+    auth-service_mongo:
+        container_name: ${CONTAINER_PREFIX}-auth-service_mongo
+        env_file:
+            - staging.env
+        networks:
+            - docknet
+        volumes:
+            - '/volume1/docker/labs/auth/mongo:/data/db'
+            # - ./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}-auth-service
+        environment:
+            - DB_HOST=${CONTAINER_PREFIX}-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,57 +0,0 @@
-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_USERNAME}
-            - MONGO_INITDB_ROOT_PASSWORD=${DB_PASSWORD}
-            - MONGO_INITDB_DATABASE=${DB_NAME}
-        networks:
-            - docknet
-        volumes:
-            - '/volume1/docker/labs/grow-auth/mongo:/data/db'
-        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}
-            - DB_HOST=${CONTAINER_PREFIX}-${SERVICE_NAME}_${DB_TYPE}
-            # - 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}`)'
-            - '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
-        links:
-            - auth-service_mongo:${CONTAINER_PREFIX}-${SERVICE_NAME}_${DB_TYPE}
-        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_USERNAME = process.env.DB_USERNAME || 'not_set';
-export const DB_PASS = process.env.DB_PASSWORD || 'test';
+export const DB_PASSWORD = process.env.DB_PASSWORD || 'not_set';
-export const DB_NAME = process.env.DB_NAME || 'auth';
+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

@@ -7,10 +7,17 @@ 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);
 
+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 } };
@@ -37,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

@@ -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.17",
+  "version": "0.0.37",
   "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"
 }