Merge pull request 'Restructuring the folders' (#1) from develop into main

Reviewed-on: #1

.build.yarnrc.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

.drone.yml

@@ -0,0 +1,301 @@
+kind: pipeline
+type: docker
+name: Test Pipeline
+
+workspace:
+  path: /drone/auth
+
+steps:
+- name: yarn install
+  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:
+  - 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:production
+- 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
+
+volumes:
+- name: yarnrc
+  host:
+    path: /volume1/docker/.yarnrc.yml
+
+trigger:
+  branch:
+  - main
+  - develop
+  event:
+  - pull_request
+
+---
+kind: pipeline
+type: docker
+name: Publish Pipeline
+
+workspace:
+  path: /drone/auth
+
+steps:
+- name: Build Package
+  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: Publish NPM
+  image: node:20-bullseye-slim
+  commands:
+    - 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:
+    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
+    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
+- name: yarnrc
+  host:
+    path: /volume1/docker/.yarnrc.yml
+
+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,
+};

.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

.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.yml

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

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 .npmrc /root
-COPY tsconfig.json ./
+COPY .build.yarnrc.yml /root/.yarnrc.yml
-COPY lib ./lib
+COPY . .
-RUN ls -a
+RUN yarn set version stable && yarn install
-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
+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 ./
+COPY .npmrc /root
-RUN yarn install --frozen-lockfile --production
+COPY .build.yarnrc.yml /root/.yarnrc.yml
-COPY --from=build /home/node/app/dist .
+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"]
+CMD ["node","index.js"]

babel.config.js

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

docker-compose.dev.yml

@@ -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:
@@ -26,6 +26,8 @@ services:
             args:
               - PORT
               - ENV
+              - NPM_TOKEN
+              - YARN_VERSION=3.5.0
         container_name: ${CONTAINER_PREFIX}-auth-service
         ports:
             - 9001:9001
@@ -35,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

@@ -16,7 +16,7 @@ services:
             - '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 +42,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:

package.json

@@ -1,17 +1,18 @@
 {
   "name": "@mifi/auth-service",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "author": "mifi (Mike Fitzpatrick)",
   "license": "MIT",
   "scripts": {
     "build": "tsc",
-    "build:production": "tsc -p .",
+    "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"
   },
@@ -56,8 +57,8 @@
     "typescript": "^4.9.5"
   },
   "dependencies": {
-    "@mifi/auth-db": "^1.0.0",
+    "@mifi/auth-db": "^1.x.x",
-    "@mifi/services-common": "^1.0.0",
+    "@mifi/services-common": "^1.x.x",
     "@simplewebauthn/server": "^7.2.0",
     "dotenv": "^16.0.3",
     "http-status-codes": "^2.2.0",
@@ -80,6 +81,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"
 }

src/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;

src/passport/strategies/local.ts

@@ -3,7 +3,7 @@ import { Strategy as LocalStrategy } from 'passport-local';
 
 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);
 });

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.production.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"]
+}