Merge pull request #1208 from credebl/qa

Merge: Sync up changes from Qa to Main

Author: bhavanakarwade

.dockerignore

@@ -0,0 +1 @@
+node_modules

.env.demo

@@ -47,7 +47,7 @@ PUBLIC_PRODUCTION_API_URL=https://api.credebl.id
 PUBLIC_SANDBOX_API_URL=https://sandboxapi.credebl.id
 [email protected]
 
-AFJ_VERSION=credo-0.5.3:latest
+AFJ_VERSION=ghcr.io/credebl/credo-controller:latest
 
 PLATFORM_WALLET_NAME=platform-admin
 PLATFORM_WALLET_PASSWORD='U2FsdGVkX19l6w/PpuicnGBYThBHolzF27oN0JwfWkc='
@@ -86,22 +86,22 @@ DEEPLINK_DOMAIN='https://link.credebl.id?url='
 
 ENABLE_CORS_IP_LIST=http://localhost:3000, http://localhost:3001, http://localhost:5000,http://localhost:8085,https://verify.credebl.id,https://verifyed.credebl.id,https://verify-api.credebl.id,https://qa.credebl.id,https://dev.credebl.id,https://credebl.id
 
-USER_NKEY_SEED=SUAILBO6CYQF4RPIZYCVCFRIOMJ7BW33PFZDFEZKOHV65MN3W37FFJA3JY
-API_GATEWAY_NKEY_SEED=SUAI7SDZAHS24I7JWOB77BK6EFE3ZS3NCF5FW22PMWCXGE56OBPYHK5734
-ORGANIZATION_NKEY_SEED=SUABORS4UFEV2OAWNEXB7JA76XNOF7A6YJAFOGRZTWOEGCXER36P2NP7JQ
-AGENT_PROVISIONING_NKEY_SEED=SUAIUEPEC5D4KMTLK45UOPZ45JQ5QUMMIIJY2UT37RMQE6GENBTJTT2MSQ
-AGENT_SERVICE_NKEY_SEED=SUABOFFEQNQY7YR4BIZDJENJ5T24CCDYOYTVHBKQLEWTZUTPTL3EQ3IZ3U
-VERIFICATION_NKEY_SEED=SUAOTKYQMN6RGVWLZII22A4EFURAT65H4PGU3G5QXKM427HZ3JKIQZ7KU4
-LEDGER_NKEY_SEED=SUABKZWIZCMUROUKCSHL774UOLKFQZR2UPQXII5FCGXHF25GFQX2XLIPLI
-ISSUANCE_NKEY_SEED=SUAG7GEESSHO2ZF4J2IUKB6QPF4ENTLO7MLXZSSF67MEETTFZWFGJNDYVU
-CONNECTION_NKEY_SEED=SUALLWKCDN2KBB4YTZUNUUFP7ZNSI4PBXVK7X5FPNX6LQ3DCHFGYX4JPLQ
-ECOSYSTEM_NKEY_SEED=SUAGUAGZZLT2LYEA3SRWFXCJL32MXR5GCBAZNYJLLIUH4O76GDEGQAYM74
-CREDENTAILDEFINITION_NKEY_SEED=SUAAYNLVKEP2E4JPCJ7OYSQ6OFCDBQ3GCTOPARBXBNP64JFESDWH7N3FQA
-SCHEMA_NKEY_SEED=SUAESXIRPE4PBJR26T44XPPIAONQ3YJTN45VSTRNZUW77GAF5RBP3SEBFA
-UTILITIES_NKEY_SEED=SUAHLF3PYEGNN3J2LZHHT6LOQ4GQ2CPGATEO66XRXLCEE6QYSM26TKCNUM
-CLOUD_WALLET_NKEY_SEED=SUAJ3VT7IFZXVE7SSTX3JFE6F2U6DYDROW6VTCCGFVVB6D7O6C7OWJWTPM
-GEOLOCATION_NKEY_SEED=SUAA3YQLMQPKEK224OVFGENQ3VRYD57LNPJFMGDULOO57CUYOQLAA7KBJU
-NOTIFICATION_NKEY_SEED=SUAF5V6RN6HHOLBJX6UV7443PBNT7NSAJ6YCUOW7LTZQ77PXXAMH25AHPI
+USER_NKEY_SEED=
+API_GATEWAY_NKEY_SEED=
+ORGANIZATION_NKEY_SEED=
+AGENT_PROVISIONING_NKEY_SEED=
+AGENT_SERVICE_NKEY_SEED=
+VERIFICATION_NKEY_SEED=
+LEDGER_NKEY_SEED=
+ISSUANCE_NKEY_SEED=
+CONNECTION_NKEY_SEED=
+ECOSYSTEM_NKEY_SEED=
+CREDENTAILDEFINITION_NKEY_SEED=
+SCHEMA_NKEY_SEED=
+UTILITIES_NKEY_SEED=
+CLOUD_WALLET_NKEY_SEED=
+GEOLOCATION_NKEY_SEED=
+NOTIFICATION_NKEY_SEED=
 
 KEYCLOAK_DOMAIN=http://localhost:8080/
 KEYCLOAK_ADMIN_URL=http://localhost:8080
@@ -121,7 +121,7 @@ AFJ_AGENT_SPIN_UP=/agent-provisioning/AFJ/scripts/docker_start_agent.sh
 AFJ_AGENT_ENDPOINT_PATH=/agent-provisioning/AFJ/endpoints/
 # Uncomment bellow three lines and comment the above to start services locally without using docker, using pnpm
 # AFJ_AGENT_TOKEN_PATH=/apps/agent-provisioning/AFJ/token/
-# AFJ_AGENT_SPIN_UP=/apps/agent-provisioning/AFJ/scripts/docker_start_agent.sh
+# AFJ_AGENT_SPIN_UP=/apps/agent-provisioning/AFJ/scripts/start_agent.sh
 # AFJ_AGENT_ENDPOINT_PATH=/apps/agent-provisioning/AFJ/endpoints/
 
 AGENT_PROTOCOL=http
@@ -131,13 +131,18 @@ MAX_ORG_LIMIT=10
 FIDO_API_ENDPOINT=http://localhost:8000
 
 IS_ECOSYSTEM_ENABLE=false
-CONSOLE_LOG_FLAG=true // Enable or disable console ELK logs
-ELK_LOG=true // ELK flag
-LOG_LEVEL=debug // ELK log level
-ELK_LOG_PATH = "http://localhost:9200/" // ELK log path
-ELK_USERNAME=elastic // ELK user username
-ELK_PASSWORD=xxxxxx // ELK user password
+CONSOLE_LOG_FLAG=true # Enable or disable console ELK logs
+ELK_LOG=false # ELK flag
+LOG_LEVEL=debug # ELK log level
+ELK_LOG_PATH= "http://localhost:9200/" # ELK log path
+ELK_USERNAME=elastic # ELK user username
+ELK_PASSWORD=xxxxxx # ELK user password
 
 ORGANIZATION=credebl
 CONTEXT=platform
-APP=api
+APP=api
+
+#Schema-file-server
+APP_PORT=4000
+JWT_TOKEN_SECRET=
+ISSUER=Credebl

.github/workflows/continuous-delivery.yml

@@ -29,6 +29,8 @@ jobs:
           - utility
           - verification
           - webhook
+          - organization
+          - seed
 
     permissions:
       contents: read
@@ -57,4 +59,4 @@ jobs:
           push: true
           tags: |
             ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ matrix.service }}:${{ env.TAG }}
-            ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ matrix.service }}:latest
+            ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ matrix.service }}:latest

.nvmrc

@@ -53,4 +53,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/agent-service/main.js"]
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/agent-service/main.js"]

Dockerfiles/Dockerfile.agent-service

@@ -40,4 +40,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 && npx prisma generate && cd ../.. && node dist/apps/api-gateway/main.js"]

Dockerfiles/Dockerfile.api-gateway

@@ -43,4 +43,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/cloud-wallet/main.js"]
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/cloud-wallet/main.js"]

Dockerfiles/Dockerfile.cloud-wallet

@@ -43,4 +43,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"]
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/connection/main.js"]

Dockerfiles/Dockerfile.connection

@@ -42,4 +42,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"]
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/issuance/main.js"]

Dockerfiles/Dockerfile.issuance

@@ -41,4 +41,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"]
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/ledger/main.js"]

Dockerfiles/Dockerfile.ledger

@@ -39,4 +39,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"]
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/notification/main.js"]

Dockerfiles/Dockerfile.notification

@@ -40,4 +40,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"]
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/organization/main.js"]

Dockerfiles/Dockerfile.organization

@@ -0,0 +1,20 @@
+FROM node:18 as build
+
+# Install pnpm
+RUN npm install -g pnpm
+
+# Install PostgreSQL client (use apt for Debian-based images)
+RUN apt-get update && apt-get install -y postgresql-client
+
+# Set working directory
+WORKDIR /app
+
+COPY . .
+
+RUN pnpm i --ignore-scripts
+
+# Run Prisma commands
+RUN cd libs/prisma-service && npx prisma generate
+
+# Set the command to run the microservice
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && npx prisma db seed"]

Dockerfiles/Dockerfile.seed

@@ -66,4 +66,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/user/main.js"]
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/user/main.js"]

Dockerfiles/Dockerfile.user

@@ -43,4 +43,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/utility/main.js"]
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/utility/main.js"]

Dockerfiles/Dockerfile.utility

@@ -39,4 +39,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"]
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/verification/main.js"]

Dockerfiles/Dockerfile.verification

@@ -42,4 +42,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"]
+CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/webhook/main.js"]

Dockerfiles/Dockerfile.webhook

@@ -209,7 +209,7 @@ if [ $? -eq 0 ]; then
 
   docker rm -f "${PROJECT_NAME}" || true
 
-  docker-compose -f $FILE_NAME --project-name "${PROJECT_NAME}" up -d
+  docker compose -f $FILE_NAME --project-name "${PROJECT_NAME}" up -d
   if [ $? -eq 0 ]; then
 
     n=0
@@ -271,4 +271,4 @@ else
   echo "ERROR : Failed to execute!" && exit 125
 fi
 
-echo "Total time elapsed: $(date -ud "@$(($(date +%s) - $START_TIME))" +%T) (HH:MM:SS)"
+echo "Total time elapsed: $(date -ud "@$(($(date +%s) - $START_TIME))" +%T) (HH:MM:SS)"

apps/agent-provisioning/AFJ/scripts/start_agent.sh

@@ -1,18 +1,20 @@
 import { IsBoolean, IsDefined, IsNotEmpty, IsOptional, IsString } from 'class-validator';
-
 import { ApiProperty } from '@nestjs/swagger';
+import { Transform } from 'class-transformer';
+import { trim } from '@credebl/common/cast.helper';
 
 export class CreateCredentialDefinitionDto {
 
     @ApiProperty({ 'example': 'default' })
-    @IsDefined({ message: 'Tag is required.' })
+    @IsDefined({ message: 'Tag is required' })
     @IsNotEmpty({ message: 'Please provide a tag' })
-    @IsString({ message: 'Tag id should be string' })
+    @IsString({ message: 'Tag should be string' })
     tag: string;
 
     @ApiProperty({ 'example': 'WgWxqztrNooG92RXvxSTWv:2:schema_name:1.0' })
-    @IsDefined({ message: 'schemaLedgerId is required.' })
-    @IsNotEmpty({ message: 'Please provide a schema id' })
+    @IsDefined({ message: 'schemaLedgerId is required' })
+    @IsNotEmpty({ message: 'Please provide valid schema ledger Id' })
+    @Transform(({ value }) => trim(value))
     @IsString({ message: 'Schema id should be string' })
     schemaLedgerId: string;