Feature/meditor 937 upgrade and simplify meditor

.env.example

@@ -1,5 +1,9 @@
 NODE_ENV=development
 
+NEXTAUTH_URL=http://localhost/meditor/api/auth
+NEXTAUTH_URL_INTERNAL=http://meditor_app:3000/meditor/api/auth
+AUTH_SECRET=ThisSecretEncryptsTheAuthJWTToken
+
 # include in your .env to disable email notifications, if disabled you will see the email in the logs instead of an actual
 # email being sent
 DISABLE_EMAIL_NOTIFICATIONS=true
@@ -8,6 +12,11 @@ AUTH_HOST=urs.earthdata.nasa.gov
 AUTH_CLIENT_ID=ask-someone-for-this
 AUTH_CLIENT_SECRET=ask-someone-for-this
 
+DB_CONNECTION=mongo # will be used to switch between database providers
+DB_HOST=localhost
+DB_PORT=27017
+DB_DATABASE=meditor
+
 MAIL_HOST=ndc-relay.ndc.nasa.gov
 # Uncomment if you are planning to use Cognito for login
 # follow the steps for creating a client at: https://www.npmjs.com/package/passport-cognito-oauth2

buildspec.yml

@@ -25,13 +25,6 @@ batch:
           REPOSITORY_NAME: meditor/meditor_docs
           PACKAGE_PATH: packages/docs
       ignore-failure: false
-    - identifier: legacy_api
-      debug-session: false
-      env:
-        variables:
-          REPOSITORY_NAME: meditor/meditor_server
-          PACKAGE_PATH: packages/legacy-api
-      ignore-failure: false
     - identifier: notebook_viewer
       debug-session: false
       env:

docker-compose.yml

@@ -1,13 +1,21 @@
 services:
   notebookviewer:
-    depends_on:
-      - legacy-api
+    container_name: meditor_notebookviewer
+    build: packages/notebook-viewer
+    environment:
+      - FLASK_ENV=development
+    env_file:
+      - .env
+    volumes:
+      - ./packages/notebook-viewer:/usr/src/app
 
   proxy:
+    container_name: meditor_proxy
+    build: packages/proxy
+    restart: on-failure
     ports:
       - "127.0.0.1:80:8080"
     depends_on:
-      - legacy-api
       - nats
       - app
       - database
@@ -16,36 +24,72 @@ services:
   notifier:
     depends_on:
       - nats
+    container_name: meditor_notifier
+    build: packages/notifier
+    restart: on-failure
+    env_file:
+      - .env
+    volumes:
+      - ./packages/notifier:/usr/src/app
+      - /usr/src/app/node_modules
 
   app:
-    depends_on:
-      - legacy-api
+    container_name: meditor_app
+    build: packages/app
+    restart: on-failure
+    env_file:
+      - .env
+    ports:
+      - "127.0.0.1:4000:4000"
+    develop:
+      watch:
+        - action: sync
+          path: ./packages/app
+          target: /usr/src/app
+          ignore:
+            - node_modules/
+            - .next/
+        - action: rebuild
+          path: package.json
 
   docs:
+    container_name: meditor_docs
+    build: packages/docs
+    env_file:
+      - .env
+    ports:
+      - "127.0.0.1:3030:3030"
     depends_on:
-      - legacy-api
       - app
 
-  legacy-api:
-    depends_on:
-      - database
-      - nats
-
   database:
     image: ${REGISTRY}mongo:4.1.4
+    container_name: meditor_database
+    volumes:
+      - ./mongo-data:/data/db
+    ports:
+      - "127.0.0.1:27018:27017"
 
   nats:
     image: ${REGISTRY}nats-streaming:0.15.1
+    container_name: meditor_nats
+    volumes:
+      - ./nats-data:/nats/data
+    ports:
+      - "127.0.0.1:4222:4222"
+      - "127.0.0.1:8222:8222"
 
   monitor:
     image: ${REGISTRY}portainer/portainer:1.20.0
+    container_name: meditor_monitor
     command: -H unix:///var/run/docker.sock
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - monitor-data:/data
 
   agent:
     image: ${REGISTRY}portainer/agent:1.1.2
+    container_name: meditor_agent
     environment:
       AGENT_CLUSTER_ADDR: tasks.agent
     volumes:

packages/app/.env.development

@@ -1,4 +1,7 @@
 DB_NAME=meditor
+HOST='http://localhost:3000/meditor'
 NEXT_PUBLIC_API_BASE_PATH='/meditor/api'
 NEXT_PUBLIC_IMAGE_UPLOAD_URL='https://lb.gesdisc.eosdis.nasa.gov/images/upload'
 NEXT_PUBLIC_NOTEBOOKVIEWER_URL='/meditor/notebookviewer/'
+NEXTAUTH_URL=http://localhost:3000/meditor/api/auth
+NEXTAUTH_URL_INTERNAL=http://localhost:3000/meditor/api/auth

packages/app/.env.production

@@ -1,4 +1,7 @@
 DB_NAME=meditor
+HOST='https://lb.gesdisc.eosdis.nasa.gov/meditor'
 NEXT_PUBLIC_API_BASE_PATH='/meditor/api'
 NEXT_PUBLIC_IMAGE_UPLOAD_URL='https://lb.gesdisc.eosdis.nasa.gov/images/upload'
 NEXT_PUBLIC_NOTEBOOKVIEWER_URL='/meditor/notebookviewer/'
+NEXTAUTH_URL=https://lb.gesdisc.eosdis.nasa.gov/meditor/api/auth
+NEXTAUTH_URL_INTERNAL=https://meditor_app:3000/meditor/api/auth

packages/app/.eslintrc.json

@@ -1,3 +1,6 @@
 {
-    "extends": "next/core-web-vitals"
+    "extends": "next/core-web-vitals",
+    "rules": {
+        "react-hooks/exhaustive-deps": "off"
+    }
 }

packages/app/Dockerfile

@@ -1,5 +1,5 @@
 ARG REGISTRY
-FROM ${REGISTRY}node:16.11.1
+FROM ${REGISTRY}node:22.11.0
 
 ENV NPM_CONFIG_LOGLEVEL warn
 ARG node_env

packages/app/auth/db.ts

@@ -73,6 +73,21 @@ class UsersDb {
             })
             .toArray()
     }
+
+    async getMeditorUserByUid(uid: string): Promise<Document> {
+        const user = await this.#db
+            // the mEditor user record is a generic, dynamic document, like any other model's document (see the "Users" model)
+            .collection<Document>(this.#USERS_COLLECTION)
+            .findOne(
+                {
+                    id: uid,
+                    'x-meditor.deletedOn': { $exists: false }, // filter out deleted users
+                },
+                { sort: { 'x-meditor.modifiedOn': -1 } }
+            )
+
+        return makeSafeObjectIDs(user)
+    }
 }
 
 const db = new UsersDb()