Merge pull request 'feature/deploy-from-image-2' (#4) from feature/deploy-from-image-2 into main

Reviewed-on: #4

.drone.yml

@@ -60,6 +60,7 @@ steps:
 trigger:
   branch:
   - main
+  - develop
   event:
   - pull_request
 
@@ -155,6 +156,9 @@ name: Deploy Pipeline
 workspace:
   path: /drone/grow
 
+clone:
+  disable: true
+
 steps:
 - name: Deploy Container
   image: docker
@@ -165,10 +169,10 @@ steps:
     ROUTE_PREFIX: /auth
     PORT: 9001
   commands:
-    - docker compose -f docker-compose.staging.yml pull
-    - docker compose -f docker-compose.staging.yml build --no-cache
-    - docker compose -f docker-compose.staging.yml rm --stop
-    - docker compose -f docker-compose.staging.yml up --wait
+    - docker compose -f docker-compose.staging_image.yml pull
+    - docker compose -f docker-compose.staging_image.yml build --no-cache
+    - docker compose -f docker-compose.staging_image.yml rm --stop
+    - docker compose -f docker-compose.staging_image.yml up --wait
   volumes:
   - name: env-secrets
     path: /drone/grow/staging.env
@@ -210,3 +214,5 @@ depends_on:
 trigger:
   event:
   - promote
+  target:
+  - production

docker-compose.staging_image.yml

@@ -0,0 +1,38 @@
+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'
+            # - ./mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js:ro
+        restart: unless-stopped
+        image: mongo:latest
+    auth-service:
+        env_file:
+            - staging.env
+        container_name: ${CONTAINER_PREFIX}-auth-service
+        environment:
+            - DB_HOST=${CONTAINER_PREFIX}-auth-service_mongo
+        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: git.mifi.dev/mifi/mifi/auth:latest
+        depends_on:
+            - auth-service_mongo
+networks:
+    docknet:
+        name: docknet
+        external: true

lib/server/controllers/auth.ts

@@ -45,6 +45,9 @@ router.post(process.env.RESET_ROUTE || RESET_ROUTE, async (ctx, next) => {
 });
 
 router.patch('/:record', authenticated(), (ctx: Koa.Context) => {
+    if (ctx.user !== ctx.param.record) {
+        ctx.throw(StatusCodes.UNAUTHORIZED);
+    }
     const data = Auth.findOneAndUpdate({ record: ctx.params.record });
     if (!data) {
         ctx.throw(StatusCodes.NOT_FOUND);