Fixes

.drone.yml

@@ -0,0 +1,282 @@
+kind: pipeline
+type: docker
+name: Test Pipeline
+
+workspace:
+  path: /drone/auth
+
+steps:
+- name: yarn install
+  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 Test Status Notification
+  image: plugins/webhook
+  settings:
+    urls: https://lab.mifi.dev/hooks/9p65zpagctgkmndo8nwwm4199r
+    content_type: application/json
+    template: |
+      {
+        "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}}",
+        "username":"DroneBot"
+      }
+  when:
+    status:
+      - success
+      - failure
+- name: Build
+  image: node:latest
+  commands:
+  - yarn build
+- name: Send Build Status Notifications
+  image: plugins/webhook
+  settings:
+    urls: https://lab.mifi.dev/hooks/9p65zpagctgkmndo8nwwm4199r
+    content_type: application/json
+    template: |
+      {
+        "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}}",
+        "username":"DroneBot"
+      }
+  when:
+    status:
+      - success
+      - failure
+
+trigger:
+  branch:
+  - main
+  - develop
+  event:
+  - pull_request
+
+---
+kind: pipeline
+type: docker
+name: Publish Pipeline
+
+workspace:
+  path: /drone/auth
+
+steps:
+- name: Build Package
+  image: node:latest
+  commands:
+    - yarn install
+    - yarn build
+- name: Publish NPM
+  image: node:20-alpine
+  failure: ignore
+  commands:
+    - yarn publish -t ${DRONE_TAG}
+  volumes:
+  - name: npmrc
+    path: /drone/auth/.npmrc
+- name: Report NPM Publish Status
+  image: plugins/webhook
+  settings:
+    urls: https://lab.mifi.dev/hooks/ccw34hdf7tgbjmzp96nptn938r
+    content_type: application/json
+    template: |
+      {
+        "icon_url":"https://emojipedia-us.s3.dualstack.us-west-1.amazonaws.com/thumbs/120/apple/198/freezing-face_1f976.png",
+        "text": "[{{ repo.name }} - New npm package release {{tag}} from # {{ build.number }}] Deploy {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
+        "username":"DroneBot"
+      }
+  when:
+    status:
+      - success
+      - failure
+- name: Publish Image
+  image: plugins/docker
+  settings:
+    auto_tag: true
+    repo: git.mifi.dev/mifi/auth-service
+    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:
+    urls: https://lab.mifi.dev/hooks/ccw34hdf7tgbjmzp96nptn938r
+    content_type: application/json
+    template: |
+      {
+        "icon_url":"https://emojipedia-us.s3.dualstack.us-west-1.amazonaws.com/thumbs/120/apple/198/freezing-face_1f976.png",
+        "text": "[{{ repo.name }} - New docker image release {{tag}} from # {{ build.number }}] Deploy {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
+        "username":"DroneBot"
+      }
+  when:
+    status:
+      - success
+      - failure
+
+volumes:
+- name: dockerconfig
+  host:
+    path: /volume1/docker/dockerconfig.json
+- name: dockersock
+  host:
+    path: /var/run/docker.sock
+- name: npmrc
+  host:
+    path: /volume1/docker/beethoven/labs-auth/.npmrc
+
+depends_on:
+  - Test Pipeline
+
+trigger:
+  event:
+  - tag
+
+---
+kind: pipeline
+type: docker
+name: Staging Deploy Pipeline
+
+workspace:
+  path: /drone/auth
+
+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-build.yml build --pull --no-cache
+    - docker compose -f docker-compose.staging-build.yml up --remove-orphans --force-recreate --wait
+  volumes:
+  - name: env-secrets
+    path: /drone/auth/staging.env
+  - name: dockersock
+    path: /var/run/docker.sock
+  - name: dockerconfig
+    path: /drone/auth/.docker/config.json
+- name: Send Status Notifications
+  image: plugins/webhook
+  privileged: true
+  settings:
+    urls: https://lab.mifi.dev/hooks/ccw34hdf7tgbjmzp96nptn938r
+    content_type: application/json
+    template: |
+      {
+        "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 }}] Deploy {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
+        "username":"DroneBot"
+      }
+  when:
+    status:
+      - success
+      - failure
+
+volumes:
+- name: dockerconfig
+  host:
+    path: /volume1/docker/dockerconfig.json
+- name: dockersock
+  host:
+    path: /var/run/docker.sock
+- name: env-secrets
+  host:
+    path: /volume1/docker/beethoven/labs-auth/staging.env
+
+depends_on:
+  - Test Pipeline
+
+trigger:
+  branch:
+  - develop
+  event:
+  - push
+
+---
+kind: pipeline
+type: docker
+name: Production Deploy Pipeline
+
+workspace:
+  path: /drone/auth
+
+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.production-build.yml pull
+    - docker compose -f docker-compose.production-build.yml build --no-cache
+    - docker compose -f docker-compose.production-build.yml rm --stop
+    - docker compose -f docker-compose.production-build.yml up --wait
+  volumes:
+  - name: env-secrets
+    path: /drone/auth/production.env
+  - name: dockersock
+    path: /var/run/docker.sock
+  - name: dockerconfig
+    path: /drone/auth/.docker/config.json
+- name: Send Status Notifications
+  image: plugins/webhook
+  privileged: true
+  settings:
+    urls: https://lab.mifi.dev/hooks/ccw34hdf7tgbjmzp96nptn938r
+    content_type: application/json
+    template: |
+      {
+        "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 }}] Deploy {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
+        "username":"DroneBot"
+      }
+  when:
+    status:
+      - success
+      - failure
+
+volumes:
+- name: dockerconfig
+  host:
+    path: /volume1/docker/dockerconfig.json
+- name: dockersock
+  host:
+    path: /var/run/docker.sock
+- name: env-secrets
+  host:
+    path: /volume1/docker/beethoven/labs-auth/staging.env
+
+depends_on:
+  - Test Pipeline
+
+trigger:
+  event:
+  - promote
+  target:
+  - production

.env.dev

@@ -0,0 +1,31 @@
+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_TIMEOUT=12h
+RESET_VALID_TIMEOUT=15m
+DEFAULT_TOKEN_DAYS=1
+
+CONTAINER_PREFIX=dev
+SERVICE_NAME=auth-service
+ENV=development

.eslintrc.js

@@ -0,0 +1,19 @@
+/* eslint-env node */
+module.exports = {
+    extends: [
+        'eslint:recommended',
+        'plugin:@typescript-eslint/recommended',
+        'plugin:import/errors',
+        'plugin:prettier/recommended',
+        'prettier',
+    ],
+    parser: '@typescript-eslint/parser',
+    plugins: ['@typescript-eslint'],
+    settings: {
+        'import/parsers': {
+            '@typescript-eslint/parser': [".ts", ".tsx"],
+        },
+        'import/resolver': 'typescript',
+    },
+    root: true,
+};

.npmrc

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

.prettierrc.js

@@ -0,0 +1,7 @@
+module.exports = {
+    parser: 'typescript',
+    printWidth: 120,
+    trailingComma: 'all',
+    tabWidth: 4,
+    singleQuote: true,
+};

.yarnrc.build.yml

@@ -0,0 +1,6 @@
+nodeLinker: node-modules
+npmScopes:
+    mifi:
+        npmRegistryServer: https://git.mifi.dev/api/packages/mifi/npm/
+        npmAuthToken: e35a182b01581790f91996594bc16e5c6a89c71c # ${NPM_TOKEN}
+        npmAlwaysAuth: true

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

Dockerfile

@@ -1,28 +1,35 @@
 ARG ENV=production
 ARG MONGO_VERSION=latest
 ARG PORT=9001
+ARG NPM_TOKEN=not_set
+ARG YARN_VERSION=3.5.0
 
 ## mongo build stage
 FROM mongo:$MONGO_VERSION AS database
 COPY docker-entrypoint-initdb.d/mongo-init-$MONGO_VERSION.sh ./docker-entrypoint-initdb.d/mongo-init.sh
 
 ## stage one, build the service
-FROM node:20-alpine AS build
+FROM node:20-bullseye-slim AS build
+ENV YARN_VERSION $YARN_VERSION
 ENV NODE_ENV development
+ENV NPM_TOKEN $NPM_TOKEN
 WORKDIR /home/node/app
-COPY package*.json ./
-COPY tsconfig.json ./
-COPY lib ./lib
-RUN ls -a
-RUN yarn install
+COPY .npmrc /root
+COPY .yarnrc.build.yml /root/.yarnrc.yml
+COPY lib package*.json tsconfig.json yarn.lock ./
+RUN yarn set version stable && yarn install
 RUN yarn build
 
 ## this is stage two , where the app actually runs
-FROM node:20-alpine AS containerize
+FROM node:20-bullseye-slim AS containerize
+ENV YARN_VERSION $YARN_VERSION
 ENV NODE_ENV $ENV
+ENV NPM_TOKEN $NPM_TOKEN
 WORKDIR /home/node/app
-COPY package*.json ./
-RUN yarn install --frozen-lockfile --production
+COPY .npmrc /root
+COPY .yarnrc.build.yml /root/.yarnrc.yml
+COPY package*.json yarn.lock ./
+RUN yarn set version stable && yarn install && yarn cache clean
 COPY --from=build /home/node/app/dist .
 EXPOSE $PORT
 CMD ["node","server/index.js"]

babel.config.js

@@ -1,6 +1 @@
-module.exports = {
-    presets: [
-        ['@babel/preset-env', { targets: { node: 'current' } }],
-        '@babel/preset-typescript',
-    ],
-};
+export const presets = [['@babel/preset-env', { targets: { node: 'current' } }], '@babel/preset-typescript'];

docker-compose.dev.yml

@@ -26,6 +26,8 @@ services:
             args:
               - PORT
               - ENV
+              - NPM_TOKEN
+              - YARN_VERSION=3.5.0
         container_name: ${CONTAINER_PREFIX}-auth-service
         ports:
             - 9001:9001

lib/app.ts

@@ -7,7 +7,7 @@ import passport from './passport';
 import { performanceLogger, performanceTimer } from './middleware/performance';
 import { errorHandler } from './middleware/errorHandler';
 import { authRouter } from './controllers/auth';
-import { SESSION_KEY } from '../constants/env';
+import { SESSION_KEY } from './constants/env';
 
 const app: Koa = new Koa();
 

lib/controllers/auth.ts

@@ -3,13 +3,13 @@ import Koa from 'koa';
 import Router from 'koa-router';
 import { StringSchemaDefinition } from 'mongoose';
 
-import { Auth } from '@mifi/services-common/lib/db';
-import { create } from '@mifi/services-common/lib/db/dao/create';
-import { resetPasswordPost } from '@mifi/services-common/lib/db/api/resetPasswordPost';
-import { resetPasswordGet } from '@mifi/services-common/lib/db/api/resetPasswordGet';
-import { deleteById } from '@mifi/services-common/lib/db/dao/deleteById';
-import { deleteStrategy } from '@mifi/services-common/lib/db/api/deleteStrategy';
-import { AuthDocument } from '@mifi/services-common/lib/db/schema/auth';
+import { Auth } from '@mifi/auth-db/lib';
+import { deleteStrategy } from '@mifi/auth-db/lib/api/deleteStrategy';
+import { resetPasswordGet } from '@mifi/auth-db/lib/api/resetPasswordGet';
+import { resetPasswordPost } from '@mifi/auth-db/lib/api/resetPasswordPost';
+import { create } from '@mifi/auth-db/lib/dao/create';
+import { deleteById } from '@mifi/auth-db/lib/dao/deleteById';
+import { AuthDocument } from '@mifi/auth-db/lib/schema/auth';
 
 import { ROUTE_PREFIX as prefix, RESET_ROUTE } from '../constants/env';
 import passport from '../passport';

lib/index.ts

@@ -1,6 +1,6 @@
 import app from './app';
-import { connection } from '../db';
-import { PORT } from '../constants/env';
+import { connection } from '@mifi/auth-db/lib';
+import { PORT } from './constants/env';
 
 connection.then(
     () => {

lib/middleware/errorHandler.ts

@@ -4,6 +4,7 @@ import { Context, Next } from 'koa';
 export const errorHandler = async (ctx: Context, next: Next) => {
     try {
         await next();
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (error: any) {
         ctx.status = error.statusCode || error.status || StatusCodes.INTERNAL_SERVER_ERROR;
         error.status = ctx.status;

lib/passport/index.ts

@@ -1,9 +1,9 @@
 import passport from 'koa-passport';
 import { Types } from 'mongoose';
 
-import { AuthDocument } from '@mifi/services-common/lib/db/schema/auth';
-import { readOneByRecord } from '@mifi/services-common/lib/db/dao/readOneByRecord';
-import { readOneById } from '@mifi/services-common/lib/db/dao/readOneById';
+import { AuthDocument } from '@mifi/auth-db/lib/schema/auth';
+import { readOneByRecord } from '@mifi/auth-db/lib/dao/readOneByRecord';
+import { readOneById } from '@mifi/auth-db/lib/dao/readOneById';
 
 import LocalStrategy from './strategies/local';
 import JwtStrategy from './strategies/jwt';

lib/passport/strategies/jwt.ts

@@ -1,6 +1,6 @@
 import { ExtractJwt, Strategy as JwtStrategy } from 'passport-jwt';
 
-import { readOneByRecord } from '@mifi/services-common/lib/db/dao/readOneByRecord';
+import { readOneByRecord } from '@mifi/auth-db/lib/dao/readOneByRecord';
 
 import { JWT_SECRET } from '../../constants/env';
 

lib/passport/strategies/local.ts

@@ -1,9 +1,9 @@
 // eslint-disable-next-line import/named
 import { Strategy as LocalStrategy } from 'passport-local';
 
-import { authenticate } from '@mifi/services-common/lib/db/api/authenticate';
+import { authenticate } from '@mifi/auth-db/lib/api/authenticate';
 
-export default new LocalStrategy(async (username: string, password: string, done: any) => {
+export default new LocalStrategy(async (username, password, done) => {
     const user = await authenticate(username, password);
     done(null, user);
 });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mifi/auth-service",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "author": "mifi (Mike Fitzpatrick)",
   "license": "MIT",
   "scripts": {
@@ -19,7 +19,7 @@
     "@babel/core": "^7.21.8",
     "@babel/preset-env": "^7.21.5",
     "@babel/preset-typescript": "^7.21.5",
-    "@tsconfig/node16": "^1.0.3",
+    "@tsconfig/node16": "^1.0.4",
     "@types/jest": "^29.5.1",
     "@types/jsonwebtoken": "^9.0.1",
     "@types/koa": "^2.13.5",
@@ -56,7 +56,8 @@
     "typescript": "^4.9.5"
   },
   "dependencies": {
-    "@mifi/auth-db": "^1.0.0",
+    "@mifi/auth-db": "^1.x.x",
+    "@mifi/services-common": "^1.x.x",
     "@simplewebauthn/server": "^7.2.0",
     "dotenv": "^16.0.3",
     "http-status-codes": "^2.2.0",