merge: develop to qa

.env.sample

@@ -86,4 +86,6 @@ KEYCLOAK_ADMIN_URL=http://localhost:8080
 KEYCLOAK_MASTER_REALM=xxxxxxx
 KEYCLOAK_MANAGEMENT_CLIENT_ID=xxxxxxx
 KEYCLOAK_MANAGEMENT_CLIENT_SECRET=xxxxxxx
-KEYCLOAK_REALM=xxxxxxx
+KEYCLOAK_REALM=xxxxxxx
+
+ENABLE_CORS_IP_LIST="" # Provide a list of domains that are allowed to use this server

Dockerfiles/Dockerfile.agent-provisioning

@@ -1,11 +1,6 @@
 # Stage 1: Build the application
 FROM node:18-alpine as build
-# RUN npm install -g pnpm
-# Install AWS CLI
-# RUN apk update
-# RUN apk add openssh-client
-# RUN apk update
-# RUN apk add aws-cli
+
 RUN set -eux \
     && apk --no-cache add \
         openssh-client \
@@ -16,14 +11,6 @@ RUN set -eux \
     && export PATH=$PATH:/usr/lib/node_modules/pnpm/bin \
     && rm -rf /var/cache/apk/*
 
-RUN docker --version && \
-    docker-compose --version
-
-ARG ROOT_PATH
-ENV ROOT_PATH ${ROOT_PATH}
-
-RUN echo "ROOT_PATH is set to: $ROOT_PATH"
-
 # Set the working directory
 WORKDIR /app
 
@@ -37,19 +24,16 @@ RUN pnpm i
 COPY . .
 
 # Generate Prisma client
-RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
+# RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
+RUN cd libs/prisma-service && npx prisma migrate && npx prisma generate
 RUN ls -R /app/apps/agent-provisioning/AFJ/
 
 # Build the user service
 RUN pnpm run build agent-provisioning
 
 # Stage 2: Create the final image
 FROM node:18-alpine as prod
-# Install AWS CLI
-# RUN apk update
-# RUN apk add openssh-client
-# RUN apk update
-# RUN apk add aws-cli
+
 RUN set -eux \
     && apk --no-cache add \
         openssh-client \
@@ -86,7 +70,4 @@ RUN chmod 777 /app/agent-provisioning/AFJ/token
 COPY libs/ ./libs/
 
 # Set the command to run the microservice
-CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/agent-provisioning/main.js $ROOT_PATH"]
-
-# docker build -t agent-provisioning-service -f Dockerfiles/Dockerfile.agent-provisioning .
-# docker run -d --env-file .env --name agent-provisioning-service docker.io/library/agent-provisioning-service
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/agent-provisioning/main.js"]

Dockerfiles/Dockerfile.agent-service

@@ -20,7 +20,8 @@ RUN pnpm i
 
 # Copy the rest of the application code
 COPY . .
-RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
+# RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
+RUN cd libs/prisma-service && npx prisma migrate && npx prisma generate
 
 # Build the user service
 RUN pnpm run build agent-service
@@ -48,8 +49,4 @@ COPY --from=build /app/libs/ ./libs/
 COPY --from=build /app/node_modules  ./node_modules
 
 # Set the command to run the microservice
-CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma migrate deploy && cd ../.. && node dist/apps/agent-service/main.js"]
-
-# docker build -t agent-service -f Dockerfiles/Dockerfile.agent-service .
-# docker run -d --env-file .env --name agent-service docker.io/library/agent-service
-# docker logs -f agent-service
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/agent-service/main.js"]

Dockerfiles/Dockerfile.api-gateway

@@ -13,7 +13,8 @@ RUN pnpm i
 
 # Copy the rest of the application code
 COPY . .
-RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
+# RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
+RUN cd libs/prisma-service && npx prisma migrate && npx prisma generate
 
 # Build the api-gateway service
 RUN pnpm run build api-gateway
@@ -33,4 +34,4 @@ COPY --from=build /app/node_modules  ./node_modules
 # COPY --from=build /app/uploadedFiles ./uploadedFiles
 
 # Set the command to run the microservice
-CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/api-gateway/main.js"]
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/api-gateway/main.js"]

Dockerfiles/Dockerfile.connection

@@ -13,7 +13,8 @@ RUN pnpm i
 
 # Copy the rest of the application code
 COPY . .
-RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
+# RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
+RUN cd libs/prisma-service && npx prisma migrate && npx prisma generate
 
 # Build the connection service
 RUN pnpm run build connection
@@ -36,8 +37,4 @@ COPY --from=build /app/node_modules  ./node_modules
 #RUN npm i --only=production
 
 # Set the command to run the microservice
-CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/connection/main.js"]
-
-# docker build -t connection -f Dockerfiles/Dockerfile.connection .
-# docker run -d --env-file .env --name connection docker.io/library/connection
-# docker logs -f connection
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/connection/main.js"]

Dockerfiles/Dockerfile.ecosystem

@@ -13,7 +13,8 @@ RUN pnpm i
 
 # Copy the rest of the application code
 COPY . .
-RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
+# RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
+RUN cd libs/prisma-service && npx prisma migrate && npx prisma generate
 
 # Build the issuance service
 RUN pnpm run build ecosystem
@@ -34,8 +35,4 @@ COPY --from=build /app/node_modules  ./node_modules
 
 
 # Set the command to run the microservice
-CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/ecosystem/main.js"]
-
-# docker build -t ecosystem -f Dockerfiles/Dockerfile.ecosystem .
-# docker run -d --env-file .env --name ecosystem docker.io/library/ecosystem
-# docker logs -f ecosystem
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/ecosystem/main.js"]

Dockerfiles/Dockerfile.issuance

@@ -13,7 +13,9 @@ RUN pnpm i
 
 # Copy the rest of the application code
 COPY . .
-RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
+# RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
+RUN cd libs/prisma-service && npx prisma migrate && npx prisma generate
+
 
 # Build the issuance service
 RUN pnpm run build issuance
@@ -35,8 +37,4 @@ COPY --from=build /app/node_modules  ./node_modules
 
 
 # Set the command to run the microservice
-CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/issuance/main.js"]
-
-# docker build -t issuance -f Dockerfiles/Dockerfile.issuance .
-# docker run -d --env-file .env --name issuance docker.io/library/issuance
-# docker logs -f issuance
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/issuance/main.js"]

Dockerfiles/Dockerfile.ledger

@@ -13,7 +13,9 @@ RUN pnpm i
 
 # Copy the rest of the application code
 COPY . .
-RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
+# RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
+RUN cd libs/prisma-service && npx prisma migrate && npx prisma generate
+
 
 # Build the ledger service
 RUN npm run build ledger
@@ -34,8 +36,4 @@ COPY --from=build /app/libs/ ./libs/
 COPY --from=build /app/node_modules  ./node_modules
 
 # Set the command to run the microservice
-CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/ledger/main.js"]
-
-# docker build -t ledger -f Dockerfiles/Dockerfile.ledger .
-# docker run -d --env-file .env --name ledger docker.io/library/ledger
-# docker logs -f ledger
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/ledger/main.js"]

Dockerfiles/Dockerfile.notification

@@ -13,7 +13,9 @@ RUN pnpm i --ignore-scripts
 
 # Copy the rest of the application code
 COPY . .
-RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
+# RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
+RUN cd libs/prisma-service && npx prisma migrate && npx prisma generate
+
 
 # Build the notification service
 RUN npm run build notification
@@ -34,8 +36,4 @@ COPY --from=build /app/libs/ ./libs/
 COPY --from=build /app/node_modules  ./node_modules
 
 # Set the command to run the microservice
-CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/notification/main.js"]
-
-# docker build -t notification -f Dockerfiles/Dockerfile.notification .
-# docker run -d --env-file .env --name notification docker.io/library/notification
-# docker logs -f notification
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/notification/main.js"]

Dockerfiles/Dockerfile.organization

@@ -12,7 +12,9 @@ RUN pnpm i
 
 # Copy the rest of the application code
 COPY . .
-RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
+# RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
+RUN cd libs/prisma-service && npx prisma migrate && npx prisma generate
+
 
 # Build the organization service
 RUN pnpm run build organization
@@ -33,8 +35,4 @@ COPY --from=build /app/libs/ ./libs/
 COPY --from=build /app/node_modules  ./node_modules
 
 # Set the command to run the microservice
-CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/organization/main.js"]
-
-# docker build -t organization -f Dockerfiles/Dockerfile.organization .
-# docker run -d --env-file .env --name issuance docker.io/library/organization
-# docker logs -f organization
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/organization/main.js"]

Dockerfiles/Dockerfile.user

@@ -27,7 +27,8 @@ RUN pnpm install
 
 # Copy the rest of the application code
 COPY . .
-RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
+# RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
+RUN cd libs/prisma-service && npx prisma migrate && npx prisma generate
 
 # Build the user service
 RUN pnpm run build user
@@ -62,8 +63,4 @@ COPY --from=build /app/node_modules  ./node_modules
 
 
 # Set the command to run the microservice
-CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && npx prisma  && cd ../.. && node dist/apps/user/main.js"]
-
-# docker build -t user -f Dockerfiles/Dockerfile.user .
-# docker run -d --env-file .env --name user docker.io/library/user
-# docker logs -f user
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy  && cd ../.. && node dist/apps/user/main.js"]

Dockerfiles/Dockerfile.utility

@@ -2,19 +2,8 @@
 FROM node:18-slim as build
 RUN npm install -g pnpm
 
-# We don't need the standalone Chromium
-ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
-
-# Install Google Chrome Stable and fonts
-# Note: this installs the necessary libs to make the browser work with Puppeteer.
-RUN apt-get update && apt-get install gnupg wget -y && \
-    wget --quiet --output-document=- https://dl-ssl.google.com/linux/linux_signing_key.pub | gpg --dearmor > /etc/apt/trusted.gpg.d/google-archive.gpg && \
-    sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' && \
-    apt-get update && \
-    apt-get install google-chrome-stable -y --no-install-recommends && \
-    rm -rf /var/lib/apt/lists/*
-
-# RUN apk update && apk list --all-versions chromium
+RUN apt-get update -y
+RUN apt-get --no-install-recommends install -y openssl
 # Set the working directory
 WORKDIR /app
 
@@ -26,26 +15,17 @@ RUN pnpm install
 
 # Copy the rest of the application code
 COPY . .
-RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
+# RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
+RUN cd libs/prisma-service && npx prisma migrate && npx prisma generate
 
 # Build the user service
 RUN pnpm run build utility
 
 # Stage 2: Create the final image
 FROM node:18-slim
 
-# We don't need the standalone Chromium
-ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
-
-# Install Google Chrome Stable and fonts
-# Note: this installs the necessary libs to make the browser work with Puppeteer.
-RUN apt-get update && apt-get install gnupg wget -y && \
-    wget --quiet --output-document=- https://dl-ssl.google.com/linux/linux_signing_key.pub | gpg --dearmor > /etc/apt/trusted.gpg.d/google-archive.gpg && \
-    sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' && \
-    apt-get update && \
-    apt-get install google-chrome-stable -y --no-install-recommends && \
-    rm -rf /var/lib/apt/lists/*
-
+RUN apt-get update -y
+RUN apt-get --no-install-recommends install -y openssl
 # Set the working directory
 WORKDIR /app
 RUN npm install -g pnpm
@@ -60,8 +40,4 @@ COPY --from=build /app/node_modules  ./node_modules
 
 
 # Set the command to run the microservice
-CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && npx prisma  && cd ../.. && node dist/apps/utility/main.js"]
-
-# docker build -t user -f Dockerfiles/Dockerfile.user .
-# docker run -d --env-file .env --name user docker.io/library/user
-# docker logs -f user
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/utility/main.js"]

Dockerfiles/Dockerfile.verification

@@ -12,7 +12,8 @@ RUN pnpm i
 
 # Copy the rest of the application code
 COPY . .
-RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
+# RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
+RUN cd libs/prisma-service && npx prisma migrate && npx prisma generate
 
 # Build the user service
 RUN npm run build verification
@@ -32,8 +33,4 @@ COPY --from=build /app/libs/ ./libs/
 COPY --from=build /app/node_modules  ./node_modules
 
 # Set the command to run the microservice
-CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/verification/main.js"]
-
-# docker build -t verification -f Dockerfiles/Dockerfile.verification .
-# docker run -d --env-file .env --name verification docker.io/library/verification
-# docker logs -f verification
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/verification/main.js"]

Dockerfiles/Dockerfile.webhook

@@ -13,7 +13,8 @@ RUN pnpm i
 
 # Copy the rest of the application code
 COPY . .
-RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
+# RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
+RUN cd libs/prisma-service && npx prisma migrate && npx prisma generate
 
 # Build the webhook service
 RUN pnpm run build webhook
@@ -35,8 +36,4 @@ COPY --from=build /app/node_modules  ./node_modules
 
 
 # Set the command to run the microservice
-CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/webhook/main.js"]
-
-# docker build -t webhook -f Dockerfiles/Dockerfile.webhook .
-# docker run -d --env-file .env --name webhook docker.io/library/webhook
-# docker logs -f webhook
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/webhook/main.js"]