Merge pull request #886 from ase-101/documentation

ES-1638 ES-1639

.github/workflows/push-trigger.yml

@@ -28,6 +28,7 @@ jobs:
     with:
       SERVICE_LOCATION: ./
       BUILD_ARTIFACT: esignet
+      MAVEN_NON_EXEC_ARTIFACTS: esignet-plugins
     secrets:
       OSSRH_USER: ${{ secrets.OSSRH_USER }}
       OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }}
@@ -212,4 +213,4 @@ jobs:
       OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }}
       OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
       GPG_SECRET: ${{ secrets.GPG_SECRET }}
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}

docker-compose/dependent-docker-compose.yml

@@ -0,0 +1,50 @@
+services:
+  database:
+    image: 'postgres:latest'
+    ports:
+      - 5455:5432
+    environment:
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=postgres
+    volumes:
+      - ./init.sql:/docker-entrypoint-initdb.d/init.sql
+
+  redis:
+    image: redis:latest
+    container_name: redis-server
+    ports:
+      - "6379:6379"
+    restart: always
+
+  mock-identity-system:
+    image: 'mosipdev/mock-identity-system:develop'
+    user: root
+    ports:
+      - 8082:8082
+    environment:
+      - container_user=mosip
+      - active_profile_env=local
+      - SPRING_DATASOURCE_URL=jdbc:postgresql://database:5432/mosip_mockidentitysystem?currentSchema=mockidentitysystem
+      - SPRING_DATASOURCE_USERNAME=postgres
+      - SPRING_DATASOURCE_PASSWORD=postgres
+    depends_on:
+      - database
+
+  zookeeper:
+    image: wurstmeister/zookeeper
+    container_name: zookeeper
+    ports:
+      - "2181:2181"
+
+  kafka:
+    image: wurstmeister/kafka
+    container_name: kafka
+    ports:
+      - "9092:9092"
+    environment:
+      KAFKA_ADVERTISED_LISTENERS: INSIDE://kafka:9092,OUTSIDE://localhost:9093
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT
+      KAFKA_LISTENERS: INSIDE://0.0.0.0:9092,OUTSIDE://0.0.0.0:9093
+      KAFKA_INTER_BROKER_LISTENER_NAME: INSIDE
+      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+      KAFKA_CREATE_TOPICS: "esignet-linked:1:1,esignet-consented:1:1"

docker-compose/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   database:
     image: 'postgres:latest'
@@ -11,79 +9,37 @@ services:
     volumes:
       - ./init.sql:/docker-entrypoint-initdb.d/init.sql
 
-  artifactory-server:
-    image: 'mosipqa/artifactory-server:1.4.1-ES'
-    ports:
-      - 8080:8080
-
   mock-identity-system:
-    image: 'mosipqa/mock-identity-system:0.9.x'
+    image: 'mosipdev/mock-identity-system:develop'
     user: root
     ports:
       - 8082:8082
     environment:
-      - artifactory_url_env=http://artifactory-server:8080/
       - container_user=mosip
-      - active_profile_env=default
-      - SPRING_CONFIG_NAME=mock-identity-system
-      - SPRING_CONFIG_LOCATION=/home/mosip/mock-identity-system-default.properties
+      - active_profile_env=local
+      - SPRING_DATASOURCE_URL=jdbc:postgresql://database:5432/mosip_mockidentitysystem?currentSchema=mockidentitysystem
+      - SPRING_DATASOURCE_USERNAME=postgres
+      - SPRING_DATASOURCE_PASSWORD=postgres
     depends_on:
       - database
-      - artifactory-server
-    volumes:
-      - ./config/mock-identity-system-default.properties:/home/mosip/mock-identity-system-default.properties
-
-
-  zookeeper:
-    image: wurstmeister/zookeeper
-    container_name: zookeeper
-    ports:
-      - "2181:2181"
-
-  kafka:
-    image: wurstmeister/kafka
-    container_name: kafka
-    ports:
-      - "9092:9092"
-    environment:
-      KAFKA_ADVERTISED_LISTENERS: INSIDE://kafka:9092,OUTSIDE://localhost:9093
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT
-      KAFKA_LISTENERS: INSIDE://0.0.0.0:9092,OUTSIDE://0.0.0.0:9093
-      KAFKA_INTER_BROKER_LISTENER_NAME: INSIDE
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-      KAFKA_CREATE_TOPICS: "esignet-linked:1:1,esignet-consented:1:1"
 
   esignet:
-    image: 'mosipqa/esignet:1.4.x'
+    build:
+      context: ../esignet-service
+      dockerfile: Dockerfile
     user: root
     ports: 
       - 8088:8088
     environment:
-      - artifactory_url_env=http://artifactory-server:8080/
       - container_user=mosip
-      - active_profile_env=default
-      - SPRING_CONFIG_NAME=esignet
-      - SPRING_CONFIG_LOCATION=/home/mosip/esignet-default.properties
+      - active_profile_env=local
+      - plugin_name_env=esignet-mock-plugin.jar
+      - KAFKA_ENABLED=false
+      - SPRING_AUTOCONFIGURE_EXCLUDE=org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration
+      - SPRING_DATASOURCE_URL=jdbc:postgresql://database:5432/mosip_esignet?currentSchema=esignet
+      - SPRING_DATASOURCE_USERNAME=postgres
+      - SPRING_DATASOURCE_PASSWORD=postgres
+      - SPRING_CACHE_TYPE=simple
+      - MOCK_IDENTITY_SYSTEM_DOMAIN_URL=http://mock-identity-system:8082
     depends_on:
-      - database
-      - artifactory-server
-      - kafka
-    volumes:
-      - ./config/esignet-default.properties:/home/mosip/esignet-default.properties
-      - ./loader_path/:/home/mosip/additional_jars/
-
-  esignet-ui:
-    image: 'mosipqa/oidc-ui:1.4.x'
-    user: root
-    ports: 
-      - 3000:3000
-    depends_on:
-      - esignet
-      - artifactory-server
-    environment:
-      - artifactory_url_env=http://artifactory-server:8080/
-      - container_user=mosip
-      - DEFAULT_WELLKNOWN=%5B%7B%22name%22%3A%22OpenID%20Configuration%22%2C%22value%22%3A%22%2F.well-known%2Fopenid-configuration%22%7D%2C%7B%22name%22%3A%22Jwks%20Json%22%2C%22value%22%3A%22%2F.well-known%2Fjwks.json%22%7D%2C%7B%22name%22%3A%22Authorization%20Server%22%2C%22value%22%3A%22%2F.well-known%2Foauth-authorization-server%22%7D%2C%7B%22name%22%3A%22OpenID%20Credential%20Issuer%22%2C%22value%22%3A%22%2F.well-known%2Fopenid-credential-issuer%22%7D%5D
-      - SIGN_IN_WITH_ESIGNET_PLUGIN_URL=http://artifactory-server:8080/artifactory/libs-release-local/mosip-plugins/sign-in-with-esignet.zip
-    volumes:
-      - ./nginx.conf:/etc/nginx/nginx.conf
+      - database

docker-compose/init.sql

@@ -219,5 +219,19 @@ CREATE TABLE mockidentitysystem.mock_identity(
     CONSTRAINT pk_mock_id_code PRIMARY KEY (individual_id)
 );
 
+CREATE TABLE mockidentitysystem.verified_claim(
+    id VARCHAR(100) NOT NULL,
+	individual_id VARCHAR(36) NOT NULL,
+	claim VARCHAR NOT NULL,
+	trust_framework VARCHAR NOT NULL,
+	detail VARCHAR,
+	cr_by character varying(256) NOT NULL,
+    cr_dtimes timestamp NOT NULL,
+    upd_by character varying(256),
+    upd_dtimes timestamp,
+    is_active boolean DEFAULT TRUE,
+    CONSTRAINT pk_verified_claim_id PRIMARY KEY (id)
+);
+
 INSERT INTO mockidentitysystem.KEY_POLICY_DEF(APP_ID,KEY_VALIDITY_DURATION,PRE_EXPIRE_DAYS,ACCESS_ALLOWED,IS_ACTIVE,CR_BY,CR_DTIMES) VALUES('ROOT', 2920, 1125, 'NA', true, 'mosipadmin', now());
 INSERT INTO mockidentitysystem.KEY_POLICY_DEF(APP_ID,KEY_VALIDITY_DURATION,PRE_EXPIRE_DAYS,ACCESS_ALLOWED,IS_ACTIVE,CR_BY,CR_DTIMES) VALUES('MOCK_AUTHENTICATION_SERVICE', 1095, 50, 'NA', true, 'mosipadmin', now());