Publishing FTW

.drone.yml

@@ -1,74 +1,73 @@
-kind: pipeline
+# kind: pipeline
-type: docker
+# type: docker
-name: Test Pipeline
+# name: Test Pipeline
 
-workspace:
+# workspace:
-  path: /drone/grow
+#   path: /drone/grow
 
-steps:
+# steps:
-- name: yarn install
+# - name: yarn install
-  image: node:latest
+#   image: node:latest
-  commands:
+#   commands:
-  - yarn install
+#   - yarn install
-- name: Code Style Checks
+# - name: Code Style Checks
-  image: node:latest
+#   image: node:latest
-  commands:
+#   commands:
-  - yarn prettier
+#   - yarn prettier
-- name: Lint
+# - name: Lint
-  image: node:latest
+#   image: node:latest
-  commands:
+#   commands:
-  - yarn lint
+#   - yarn lint
-- name: Unit Tests
+# - name: Unit Tests
-  image: node:latest
+#   image: node:latest
-  commands:
+#   commands:
-  - yarn test
+#   - yarn test
-- name: Send Test Status Notification
+# - name: Send Test Status Notification
-  image: plugins/webhook
+#   image: plugins/webhook
-  settings:
+#   settings:
-    urls: https://lab.mifi.dev/hooks/9p65zpagctgkmndo8nwwm4199r
+#     urls: https://lab.mifi.dev/hooks/9p65zpagctgkmndo8nwwm4199r
-    content_type: application/json
+#     content_type: application/json
-    template: |
+#     template: |
-      {
+#       {
-        "icon_url":"https://emojipedia-us.s3.dualstack.us-west-1.amazonaws.com/thumbs/120/apple/198/freezing-face_1f976.png",
+#         "icon_url":"https://emojipedia-us.s3.dualstack.us-west-1.amazonaws.com/thumbs/120/apple/198/freezing-face_1f976.png",
-        "text": "[{{ repo.name }} - Build # {{ build.number }}] Code Quality Checks {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
+#         "text": "[{{ repo.name }} - Build # {{ build.number }}] Code Quality Checks {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
-        "username":"DroneBot"
+#         "username":"DroneBot"
-      }
+#       }
-  when:
+#   when:
-    status:
+#     status:
-      - success
+#       - success
-      - failure
+#       - failure
-- name: Build
+# - name: Build
-  image: node:latest
+#   image: node:latest
-  commands:
+#   commands:
-  - yarn build
+#   - yarn build
-- name: Send Build Status Notifications
+# - name: Send Build Status Notifications
-  image: plugins/webhook
+#   image: plugins/webhook
-  settings:
+#   settings:
-    urls: https://lab.mifi.dev/hooks/9p65zpagctgkmndo8nwwm4199r
+#     urls: https://lab.mifi.dev/hooks/9p65zpagctgkmndo8nwwm4199r
-    content_type: application/json
+#     content_type: application/json
-    template: |
+#     template: |
-      {
+#       {
-        "icon_url":"https://emojipedia-us.s3.dualstack.us-west-1.amazonaws.com/thumbs/120/apple/198/freezing-face_1f976.png",
+#         "icon_url":"https://emojipedia-us.s3.dualstack.us-west-1.amazonaws.com/thumbs/120/apple/198/freezing-face_1f976.png",
-        "text": "[{{ repo.name }} - Build # {{ build.number }}] Build package {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
+#         "text": "[{{ repo.name }} - Build # {{ build.number }}] Build package {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
-        "username":"DroneBot"
+#         "username":"DroneBot"
-      }
+#       }
-  when:
+#   when:
-    status:
+#     status:
-      - success
+#       - success
-      - failure
+#       - failure
 
-trigger:
+# trigger:
-  branch:
+#   branch:
-  - main
+#   - main
-  event:
+#   event:
-  - pull_request
+#   # - pull_request
-  - push
+#   - push
 
----
+# ---
 kind: pipeline
 type: docker
 name: Publish Pipeline
-group: publish
 
 workspace:
   path: /drone/grow
@@ -87,7 +86,7 @@ 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:
@@ -109,19 +108,16 @@ steps:
       - success
       - failure
 - name: Publish Image
-  image: plugins/docker
+  image: docker
-  settings:
+  environemnt:
-    auto_tag: true
+    USERNAME: 'mifi'
-    squash: true
+      # from_secret: registry_username
-    repo: git.mifi.dev/mifi/auth
+    PASSWORD: '%0z&+V5?A6PytCp8#4Z17-T}chQ9s{Lj'
-    context: mifi
+      # from_secret: registry_password
-    registry: git.mifi.dev
+  commands:
-    username:
+    - 'docker login  -u ${USERNAME} -p ${PASSWORD} git.mifi.dev'
-      from_secret: registry_username
+    - 'docker build -t git.mifi.dev/mifi/mifi/auth:latest -t git.mifi.dev/mifi/mifi/auth:${DRONE_TAG} .'
-    password:
+    - docker push git.mifi.dev/mifi/mifi/auth:latest
-      from_secret: registry_password
-    ssh-agent-key:
-      from_secret: gitea_token
   volumes:
   - name: dockersock
     path: /var/run/docker.sock
@@ -154,74 +150,79 @@ volumes:
   host:
     path: /volume1/docker/beethoven/labs-auth/.npmrc
 
-depends_on:
+# depends_on:
-  - Test Pipeline
+#   - Test Pipeline
 
 trigger:
   branch:
   - main
   event:
   - push
-  - tag
+  # - tag
 
----
+# ---
-kind: pipeline
+# kind: pipeline
-type: docker
+# type: docker
-name: Deploy Pipeline
+# name: Deploy Pipeline
 
-workspace:
+# workspace:
-  path: /drone/grow
+#   path: /drone/grow
 
-steps:
+# steps:
-- name: Deploy Container
+# - name: Deploy Container
-  image: docker
+#   image: docker
-  privileged: true
+#   privileged: true
-  commands:
+#   environment:
-    - docker compose pull
+#     CONTAINER_PREFIX: dev
-    - docker compose build --no-cache
+#     HOST: area51.mifi.dev
-    - docker compose rm --stop
+#     ROUTE_PREFIX: /auth
-    - docker compose up --wait
+#     PORT: 9001
-  volumes:
+#   commands:
-  - name: env
+#     - docker compose -f docker-compose.staging.yml pull
-    path: /drone/grow/.env
+#     - docker compose -f docker-compose.staging.yml build --no-cache
-  - name: dockersock
+#     - docker compose -f docker-compose.staging.yml rm --stop
-    path: /var/run/docker.sock
+#     - docker compose -f docker-compose.staging.yml up --wait
-  - name: dockerconfig
+#   volumes:
-    path: /drone/grow/.docker/config.json
+#   - name: env-secrets
-- name: Send Status Notifications
+#     path: /drone/grow/staging.env
-  image: plugins/webhook
+#   - name: dockersock
-  privileged: true
+#     path: /var/run/docker.sock
-  settings:
+#   - name: dockerconfig
-    urls: https://lab.mifi.dev/hooks/ccw34hdf7tgbjmzp96nptn938r
+#     path: /drone/grow/.docker/config.json
-    content_type: application/json
+# - name: Send Status Notifications
-    template: |
+#   image: plugins/webhook
-      {
+#   privileged: true
-        "icon_url":"https://emojipedia-us.s3.dualstack.us-west-1.amazonaws.com/thumbs/120/apple/198/freezing-face_1f976.png",
+#   settings:
-        "text": "[{{ repo.name }} - Build # {{ build.number }}] Deploy {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
+#     urls: https://lab.mifi.dev/hooks/ccw34hdf7tgbjmzp96nptn938r
-        "username":"DroneBot"
+#     content_type: application/json
-      }
+#     template: |
-  when:
+#       {
-    status:
+#         "icon_url":"https://emojipedia-us.s3.dualstack.us-west-1.amazonaws.com/thumbs/120/apple/198/freezing-face_1f976.png",
-      - success
+#         "text": "[{{ repo.name }} - Build # {{ build.number }}] Deploy {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
-      - failure
+#         "username":"DroneBot"
+#       }
+#   when:
+#     status:
+#       - success
+#       - failure
 
-volumes:
+# volumes:
-- name: dockerconfig
+# - name: dockerconfig
-  host:
+#   host:
-    path: /volume1/docker/dockerconfig.json
+#     path: /volume1/docker/dockerconfig.json
-- name: dockersock
+# - name: dockersock
-  host:
+#   host:
-    path: /var/run/docker.sock
+#     path: /var/run/docker.sock
-- name: env
+# - name: env-secrets
-  host:
+#   host:
-    path: /volume1/docker/beethoven/labs-auth/staging.env
+#     path: /volume1/docker/beethoven/labs-auth/staging.env
 
-depends_on:
+# # depends_on:
-  - Test Pipeline
+# #   - Test Pipeline
 
-trigger:
+# trigger:
-  branch:
+#   branch:
-  - main
+#   - main
-  event:
+#   event:
-  - push
+#   - push
-  - tag
+#   # - tag

.env.dev

@@ -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=sso
+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 ./
@@ -23,4 +13,6 @@ WORKDIR /home/node/app
 COPY package*.json ./
 RUN yarn install --frozen-lockfile --production
 COPY --from=0 /home/node/app/dist .
+EXPOSE 9001
+EXPOSE 27017
 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,36 @@
+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'
+        restart: unless-stopped
+        image: mongo:latest
+    auth-service:
+        env_file:
+            - staging.env
+        build: .
+        container_name: ${CONTAINER_PREFIX}-auth-service
+        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,56 +0,0 @@
-version: '3.8'
-
-services:
-    auth-service_mongo:
-        container_name: $${CONTAINER_PREFIX:package}-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:
-            - '/volume1/docker/labs/auth/mongo:/data/db'
-        restart: unless-stopped
-        image: mongo
-    auth-service:
-        env_file: .env
-        build: .
-        container_name: $${CONTAINER_PREFIX:package}-auth-service
-        environment:
-            - PORT=${PORT}
-            - ROUTE_PREFIX=${ROUTE_PREFIX}
-            - LOGIN_ROUTE=${LOGIN_ROUTE}
-            - RESET_ROUTE=${RESET_ROUTE}
-            - DB_HOST=$${CONTAINER_PREFIX:package}-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}`)'
-            - '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
-        links:
-            - auth-service_mongo:$${CONTAINER_PREFIX:package}-auth-service_mongo
-        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_USERNAME = process.env.DB_USERNAME || 'test';
+export const DB_USERNAME = process.env.DB_USERNAME || 'not_set';
-export const DB_PASSWORD = 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/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.23",
+  "version": "0.0.34",
   "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"
 }