mifi/auth-service
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

develop #2

Merged
mifi merged 7 commits from develop into main 2023-05-26 16:49:34 +00:00
Conversation 0 Commits 7 Files Changed 7 +96 -94
7 changed files with 96 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
.drone.yml
View File

@@ -84,41 +84,41 @@ workspace:
path: /drone/auth path: /drone/auth
steps: steps:
# - name: Build Package - name: Build Package
# image: node:20-bullseye-slim image: node:20-bullseye-slim
# environment: environment:
# YARN_VERSION: 3.5.0 YARN_VERSION: 3.5.0
# commands: commands:
# - yarn set version stable - yarn set version stable
# - yarn install - yarn install
# - yarn build:production - yarn build:package
# volumes: volumes:
# - name: yarnrc - name: yarnrc
# path: /drone/auth/.yarnrc.yml path: /drone/auth/.yarnrc.yml
# - name: Publish NPM - name: Publish NPM
# image: node:20-bullseye-slim image: node:20-bullseye-slim
# commands: commands:
# - yarn npm publish - yarn npm publish
# volumes: volumes:
# - name: npmrc - name: npmrc
# path: /drone/auth/.npmrc path: /drone/auth/.npmrc
# - name: yarnrc - name: yarnrc
# path: /drone/auth/.yarnrc.yml path: /drone/auth/.yarnrc.yml
# - name: Report NPM Publish Status - name: Report NPM Publish Status
# image: plugins/webhook image: plugins/webhook
# settings: settings:
# urls: https://lab.mifi.dev/hooks/ccw34hdf7tgbjmzp96nptn938r urls: https://lab.mifi.dev/hooks/ccw34hdf7tgbjmzp96nptn938r
# 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 }} - New npm package release {{tag}} from # {{ build.number }}] Deploy {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}", "text": "[{{ repo.name }} - New npm package release {{tag}} from # {{ build.number }}] Deploy {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
# "username":"DroneBot" "username":"DroneBot"
# } }
# when: when:
# status: status:
# - success - success
# - failure - failure
- name: Publish Image - name: Publish Image
image: plugins/docker image: plugins/docker
settings: settings:
@@ -170,11 +170,8 @@ depends_on:
- Test Pipeline - Test Pipeline
trigger: trigger:
branch:
- main
event: event:
# - tag - tag
- push
--- ---
kind: pipeline kind: pipeline
@@ -212,7 +209,7 @@ steps:
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 }}] 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" "username":"DroneBot"
} }
when: when:
@@ -253,25 +250,9 @@ clone:
steps: steps:
- name: Deploy Container - 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 - name: Send Status Notifications
image: plugins/webhook image: plugins/webhook
privileged: true privileged: true
@@ -281,7 +262,7 @@ steps:
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 }}] 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" "username":"DroneBot"
} }
when: when:
@@ -289,19 +270,8 @@ steps:
- success - success
- failure - 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: depends_on:
- Test Pipeline - Publish Pipeline
trigger: trigger:
event: event:

3
Dockerfile
View File

@@ -7,10 +7,7 @@ ARG YARN_VERSION=3.5.0
## mongo build stage ## mongo build stage
FROM mongo:${MONGO_VERSION} AS database FROM mongo:${MONGO_VERSION} AS database
ENV NODE_ENV=${ENV}
ARG MONGO_ENTRY_FILE=${MONGO_ENTRY_FILE:-latest} ARG MONGO_ENTRY_FILE=${MONGO_ENTRY_FILE:-latest}
ENV MONGO_VERSION=${MONGO_VERSION}
RUN echo ${MONGO_ENTRY_FILE} ${MONGO_VERSION} ${NODE_ENV}
COPY docker-entrypoint-initdb.d/mongo-init-${MONGO_ENTRY_FILE}.sh ./docker-entrypoint-initdb.d/mongo-init.sh COPY docker-entrypoint-initdb.d/mongo-init-${MONGO_ENTRY_FILE}.sh ./docker-entrypoint-initdb.d/mongo-init.sh
## stage one, build the service ## stage one, build the service

5
docker-compose.staging-build.yml
View File

@@ -9,7 +9,8 @@ services:
context: . context: .
target: database target: database
args: args:
MONGO_VERSION: 4.4 - MONGO_ENTRY_FILE=4.4
- MONGO_VERSION=4.4
networks: networks:
- auth-backend - auth-backend
volumes: volumes:
@@ -55,4 +56,4 @@ networks:
volumes: volumes:
auth-db: auth-db:
external: false external: true

46
docker-compose.staging-image.yml
View File

@@ -3,41 +3,57 @@ version: '3.8'
services: services:
auth-service_mongo: auth-service_mongo:
container_name: ${CONTAINER_PREFIX}-auth-service_mongo container_name: ${CONTAINER_PREFIX}-auth-service_mongo
env_file:
- staging.env
networks: networks:
- auth-backend
- docknet - docknet
volumes: 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 restart: unless-stopped
image: mongo:4.4 image: mongo:${MONGO_VERSION}
auth-service: auth-service:
env_file:
- staging.env
container_name: ${CONTAINER_PREFIX}-auth-service container_name: ${CONTAINER_PREFIX}-auth-service
environment: environment:
- DB_HOST=${CONTAINER_PREFIX}-auth-service_mongo - 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: labels:
- 'traefik.enable=true' - '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: networks:
- auth-backend
- docknet - docknet
restart: unless-stopped restart: unless-stopped
depends_on: depends_on:
- auth-service_mongo - auth-service_mongo
image: git.mifi.dev/mifi/mifi/auth:latest image: git.mifi.dev/mifi/auth-service:latest
networks: networks:
auth-backend:
driver: bridge
external: false
docknet: docknet:
name: docknet name: docknet
external: true external: true
volumes: volumes:
auth-db: auth-db:
external: false external: true

3
package.json
View File

@@ -1,10 +1,11 @@
{ {
"name": "@mifi/auth-service", "name": "@mifi/auth-service",
"version": "1.0.11", "version": "1.0.12",
"author": "mifi (Mike Fitzpatrick)", "author": "mifi (Mike Fitzpatrick)",
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"build": "tsc", "build": "tsc",
"build:package": "tsc -p ./tsconfig.package.json",
"build:production": "tsc -p ./tsconfig.production.json", "build:production": "tsc -p ./tsconfig.production.json",
"format": "prettier:fix && lint:fix", "format": "prettier:fix && lint:fix",
"lint": "eslint --ext .ts,.tsx src/", "lint": "eslint --ext .ts,.tsx src/",

17
tsconfig.package.json Normal file
View File

@@ -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"]
}

2
tsconfig.production.json
View File

@@ -2,7 +2,7 @@
"extends": "@tsconfig/node16/tsconfig.json", "extends": "@tsconfig/node16/tsconfig.json",
"compilerOptions": { "compilerOptions": {
"allowSyntheticDefaultImports": true, "allowSyntheticDefaultImports": true,
"declaration": true, "declaration": false,
"experimentalDecorators": true, "experimentalDecorators": true,
"emitDecoratorMetadata": true, "emitDecoratorMetadata": true,
"noImplicitAny": true, "noImplicitAny": true,