Merge pull request 'develop' (#2) from develop into main

Reviewed-on: #2

.drone.yml

@@ -7,9 +7,15 @@ workspace:
 
 steps:
 - name: yarn install
-  image: node:latest
+  image: node:20-bullseye-slim
+  environment:
+    YARN_VERSION: 3.5.0
   commands:
+  - yarn set version stable
   - yarn install
+  volumes:
+  - name: yarnrc
+    path: /drone/auth/.yarnrc.yml
 - name: Code Style Checks
   image: node:latest
   commands:
@@ -40,7 +46,7 @@ steps:
 - name: Build
   image: node:latest
   commands:
-  - yarn build
+  - yarn build:production
 - name: Send Build Status Notifications
   image: plugins/webhook
   settings:
@@ -57,6 +63,11 @@ steps:
       - success
       - failure
 
+volumes:
+- name: yarnrc
+  host:
+    path: /volume1/docker/.yarnrc.yml
+
 trigger:
   branch:
   - main
@@ -74,18 +85,25 @@ workspace:
 
 steps:
 - name: Build Package
-  image: node:latest
+  image: node:20-bullseye-slim
+  environment:
+    YARN_VERSION: 3.5.0
   commands:
+  - yarn set version stable
   - yarn install
-    - yarn build
+  - yarn build:package
+  volumes:
+  - name: yarnrc
+    path: /drone/auth/.yarnrc.yml
 - name: Publish NPM
-  image: node:20-alpine
+  image: node:20-bullseye-slim
-  failure: ignore
   commands:
-    - yarn publish -t ${DRONE_TAG}
+    - yarn npm publish
   volumes:
   - name: npmrc
     path: /drone/auth/.npmrc
+  - name: yarnrc
+    path: /drone/auth/.yarnrc.yml
 - name: Report NPM Publish Status
   image: plugins/webhook
   settings:
@@ -107,7 +125,11 @@ steps:
     auto_tag: true
     repo: git.mifi.dev/mifi/auth-service
     registry: git.mifi.dev
-    debug: true
+    build_args:
+      - MONGO_ENTRY_FILE=latest
+      - MONGO_VERSION=latest
+      - NPM_TOKEN:
+        from_secret: reg_token
     ssh-agent-key:
       from_secret: reg_token    
     username: <token>
@@ -140,6 +162,9 @@ volumes:
 - name: npmrc
   host:
     path: /volume1/docker/beethoven/labs-auth/.npmrc
+- name: yarnrc
+  host:
+    path: /volume1/docker/.yarnrc.yml
 
 depends_on:
   - Test Pipeline
@@ -184,7 +209,7 @@ steps:
     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}}",
+        "text": "[{{ repo.name }} - Build # {{ build.number }}] Staging Deploy {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
         "username":"DroneBot"
       }
   when:
@@ -225,25 +250,9 @@ clone:
 
 steps:
 - name: Deploy Container
-  image: docker
+  image: plugins/webhook
-  privileged: true
+  settings:
-  environment:
+    urls: https://portainer.mifi.dev/api/stacks/webhooks/968d2244-2548-4f0b-8c18-bbc9bc35305d
-    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
@@ -253,7 +262,7 @@ steps:
     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}}",
+        "text": "[{{ repo.name }} - Build # {{ build.number }}] Production Deploy {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
         "username":"DroneBot"
       }
   when:
@@ -261,19 +270,8 @@ steps:
       - 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
+  - Publish Pipeline
 
 trigger:
   event:

.eslintrc.js

@@ -11,7 +11,7 @@ module.exports = {
     plugins: ['@typescript-eslint'],
     settings: {
         'import/parsers': {
-            '@typescript-eslint/parser': [".ts", ".tsx"],
+            '@typescript-eslint/parser': ['.ts', '.tsx'],
         },
         'import/resolver': 'typescript',
     },

.gitignore

@@ -130,3 +130,6 @@ dist
 .yarn/install-state.gz
 .pnp.*
 
+# Project
+lib/
+dist/

.npmignore

@@ -0,0 +1,12 @@
+.build.yarnrc.yml
+.drone.yml
+.env*
+.eslintrc*
+.npmrc
+.prettierrc*
+.yarnrc.yml
+babel.config.*
+jest.config.*
+src
+tsconfig*.json
+tslint.json

.yarnrc.yml

@@ -1 +1,3 @@
 nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-3.5.1.cjs

Dockerfile

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

docker-compose.dev.yml

@@ -8,7 +8,7 @@ services:
             context: .
             target: database
             args:
-              MONGO_VERSION: 6.0.5
+              MONGO_VERSION: latest
         ports:
             - 27017:27017
         networks:
@@ -17,7 +17,7 @@ services:
             - auth-db:/data/db
             - auth-db:/data/configdb
         restart: unless-stopped
-        image: mongo:latest
+        image: ${CONTAINER_PREFIX}-auth-service_mongo:${TAG:-latest}
     auth-service:
         env_file: .env.dev
         build:
@@ -37,7 +37,7 @@ services:
             - labs-net
             - backend
         restart: unless-stopped
-        image: node:20-alpine
+        image: ${CONTAINER_PREFIX}-auth-service:${TAG:-latest}
         depends_on:
             - auth-service_mongo
 networks:

docker-compose.staging-build.yml

@@ -9,14 +9,15 @@ services:
             context: .
             target: database
             args:
-              MONGO_VERSION: 4.4
+              - MONGO_ENTRY_FILE=4.4
+              - MONGO_VERSION=4.4
         networks:
             - auth-backend
         volumes:
             - 'auth-db:/data/db'
             - 'auth-db:/data/configdb'
         restart: unless-stopped
-        image: mongo:4.4
+        image: ${CONTAINER_PREFIX}auth-service_mongo:${DRONE_TAG:-latest}
     auth-service:
         container_name: ${CONTAINER_PREFIX}-auth-service
         env_file:
@@ -42,7 +43,7 @@ services:
             - auth-backend
             - docknet
         restart: unless-stopped
-        image: node:20-alpine
+        image: ${CONTAINER_PREFIX}auth-service:${DRONE_TAG:-latest}
         depends_on:
             - auth-service_mongo
 networks:
@@ -55,4 +56,4 @@ networks:
 
 volumes:
     auth-db:
-        external: false
+        external: true

docker-compose.staging-image.yml

@@ -3,41 +3,57 @@ version: '3.8'
 services:
     auth-service_mongo:
         container_name: ${CONTAINER_PREFIX}-auth-service_mongo
-        env_file:
-            - staging.env
         networks:
+            - auth-backend
             - docknet
         volumes:
-            - auth-db:/data
+            - auth-db:/data/db
-            - ./mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js:ro
+            - auth-db:/data/configdb
         restart: unless-stopped
-        image: mongo:4.4
+        image: mongo:${MONGO_VERSION}
     auth-service:
-        env_file:
-            - staging.env
         container_name: ${CONTAINER_PREFIX}-auth-service
         environment:
             - DB_HOST=${CONTAINER_PREFIX}-auth-service_mongo
+            - DB_NAME=${DB_NAME}
+            - DB_PASSWORD=${DB_PASSWORD}
+            - DB_USERNAME=${DB_USERNAME}
+            - DEFAULT_TOKEN_DAYS=${DEFAULT_TOKEN_DAYS}
+            - JWT_AUDIENCE=${JWT_AUDIENCE}
+            - JWT_ISSUER=${JWT_ISSUER}
+            - JWT_SECRET=${JWT_SECRET}
+            - LOGIN_ROUTE=${LOGIN_ROUTE}
+            - LOGIN_VALID_TIME=${LOGIN_VALID_TIME}
+            - PORT=${PORT}
+            - RESET_ROUTE=${RESET_ROUTE}
+            - RESET_VALID_MINUTES=${RESET_VALID_MINUTES}
+            - ROUTE_PREFIX=${ROUTE_PREFIX}
+            - SESSION_KEY=${SESSION_KEY}
         labels:
             - 'traefik.enable=true'
-            - 'traefik.http.routers.grow.rule=Host(`${HOST}`) && Path(`${ROUTE_PREFIX}`)'
+            - 'traefik.docker.network=docknet'
-            - 'traefik.http.routers.grow.entrypoints=websecure'
+            - 'traefik.http.routers.auth.rule=Host(`${HOST}`) && PathPrefix(`${ROUTE_PREFIX}`)'
-            - 'traefik.http.routers.grow.tls=true'
+            - 'traefik.http.routers.auth.entrypoints=websecure'
-            - 'traefik.http.routers.grow.tls.certresolver=letsencrypt'
+            - 'traefik.http.routers.auth.tls=true'
-            - 'traefik.http.routers.grow.service=grow-service'
+            - 'traefik.http.routers.auth.tls.certresolver=letsencrypt'
-            - 'traefik.http.services.grow-service.loadbalancer.server.port=${PORT}'
+            - 'traefik.http.routers.auth.service=auth-service'
+            - 'traefik.http.services.auth-service.loadbalancer.server.port=${PORT}'
         networks:
+            - auth-backend
             - docknet
         restart: unless-stopped
         depends_on:
             - auth-service_mongo
-        image: git.mifi.dev/mifi/mifi/auth:latest
+        image: git.mifi.dev/mifi/auth-service:latest
 
 networks:
+    auth-backend:
+        driver: bridge
+        external: false
     docknet:
         name: docknet
         external: true
 
 volumes:
     auth-db:
-        external: false
+        external: true

package.json

@@ -1,17 +1,19 @@
 {
   "name": "@mifi/auth-service",
-  "version": "1.0.2",
+  "version": "1.0.12",
   "author": "mifi (Mike Fitzpatrick)",
   "license": "MIT",
   "scripts": {
     "build": "tsc",
-    "build:production": "tsc -p .",
+    "build:package": "tsc -p ./tsconfig.package.json",
+    "build:production": "tsc -p ./tsconfig.production.json",
     "format": "prettier:fix && lint:fix",
-    "lint": "eslint --ext .ts,.tsx lib/",
+    "lint": "eslint --ext .ts,.tsx src/",
-    "lint:fix": "eslint --fix --ext .ts,.tsx lib/",
+    "lint:fix": "eslint --fix --ext .ts,.tsx src/",
-    "prettier": "prettier --check 'lib/**/*.ts'",
+    "prettier": "prettier --check 'src/**/*.ts'",
-    "prettier:fix": "prettier --write 'lib/**/*.ts'",
+    "prettier:fix": "prettier --write 'src/**/*.ts'",
-    "serve": "node dist/lib/index.js",
+    "serve-dev": "ts-node src/index.ts",
+    "serve": "node lib/index.js",
     "start": "nodemon",
     "test": "jest --passWithNoTests"
   },
@@ -80,6 +82,7 @@
   "description": "",
   "repository": {
     "type": "git",
-    "url": "https://git.mifi.dev/mifi/auth-api.git"
+    "url": "https://git.mifi.dev/mifi/auth-service.git"
-  }
+  },
+  "packageManager": "yarn@3.5.1"
 }

tsconfig.json

@@ -2,11 +2,16 @@
     "extends": "@tsconfig/node16/tsconfig.json",
     "compilerOptions": {
         "allowSyntheticDefaultImports": true,
+        "declaration": true,
         "experimentalDecorators": true,
         "emitDecoratorMetadata": true,
         "noImplicitAny": true,
-        "outDir": "./dist/",
+        "outDir": "dist/",
-        "rootDirs": ["lib"],
+        "rootDirs": ["./", "src/"],
-        "sourceMap": true
+        "strict": true,
-    }
+        "esModuleInterop": true,
+        "sourceMap": true,
+        "removeComments": false
+    },
+    "include": ["src"]
 }

tsconfig.package.json

@@ -0,0 +1,17 @@
+{
+    "extends": "@tsconfig/node16/tsconfig.json",
+    "compilerOptions": {
+        "allowSyntheticDefaultImports": true,
+        "declaration": true,
+        "experimentalDecorators": true,
+        "emitDecoratorMetadata": true,
+        "noImplicitAny": true,
+        "outDir": "dist/",
+        "rootDirs": ["./", "src/"],
+        "strict": true,
+        "esModuleInterop": true,
+        "sourceMap": false,
+        "removeComments": true
+    },
+    "include": ["./src"]
+}

tsconfig.production.json

@@ -0,0 +1,17 @@
+{
+    "extends": "@tsconfig/node16/tsconfig.json",
+    "compilerOptions": {
+        "allowSyntheticDefaultImports": true,
+        "declaration": false,
+        "experimentalDecorators": true,
+        "emitDecoratorMetadata": true,
+        "noImplicitAny": true,
+        "outDir": "dist/",
+        "rootDirs": ["./", "src/"],
+        "strict": true,
+        "esModuleInterop": true,
+        "sourceMap": false,
+        "removeComments": true
+    },
+    "include": ["./src"]
+}