Feature/abha incentive genatation

.github/workflows/build-on-pull-request.yml

@@ -2,7 +2,7 @@ name: Build On Pull Request
 on:
   pull_request:
     branches: [ "master","develop" ]
-
+    
 jobs:
   Build:
     runs-on: ubuntu-latest
@@ -14,10 +14,10 @@ jobs:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
 
       - name: Setup JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v2
         with:
           java-version: 17
-          distribution: 'temurin'
-
-      - name: Build with Maven
+          distribution: 'zulu'
+          
+      - name: Build with Maven  
         run: mvn clean install

.github/workflows/package.yml

@@ -5,35 +5,35 @@ on:
     branches: [ "develop"]
     paths-ignore:
      - target/**
-
+     
   pull_request:
      branches: [ "develop" ]
      paths-ignore:
      - target/**
-
+     
 env:
   ENV_VAR: test
 
 jobs:
   Package-test:
     runs-on: ubuntu-latest
     steps:
-
-    - name: Checkout code
-      uses: actions/checkout@v3
-
+    
+    - name: Checkout code 
+      uses: actions/checkout@v2
+      
     - name: Setup JDK 17
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v2
       with:
         java-version: 17
-        distribution: 'temurin'
-
+        distribution: 'zulu'
+        
     - name: Build with Maven
       run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}
-
+      
     - name: Build WAR file
       run: mvn -B package --file pom.xml
-
+      
     - name: Upload WAR file as artifact
       uses: actions/upload-artifact@v4
       with:

.github/workflows/sast.yml

@@ -5,7 +5,7 @@ on:
     branches: [ "develop" ]
     paths-ignore:
      - target/**
-
+     
   pull_request:
     branches: [ "develop" ]
     paths-ignore:
@@ -25,7 +25,7 @@ jobs:
       fail-fast: false
       matrix:
         language: [ 'java' ]
-
+       
     steps:
     - name: Checkout code
       uses: actions/checkout@v3
@@ -35,19 +35,18 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v2
 
     - name: Setup JDK 17
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v2
       with:
           java-version: 17
-          distribution: 'temurin'
-
+          distribution: 'zulu'
+       
     - name: Build with Maven
       run: mvn clean install
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v2
       with:
         category: "/language:${{matrix.language}}"
-

src/main/environment/common_ci.properties

@@ -1,5 +1,5 @@
-benSearchByBenIDURL=@env.COMMON_API_BASE_URL@beneficiary/searchUserByID
-userAuthURL=@env.COMMON_API_BASE_URL@user/userAuthenticate
+benSearchByBenIDURL=@env.COMMON_API_BASE_URL@/beneficiary/searchUserByID
+userAuthURL=@env.COMMON_API_BASE_URL@/user/userAuthenticate
 
 # E-aushadhi
 eaushadhiStoreStockDetailsUrl=@env.EAUSHADHI_URL@/rest/storeStockDetailsService/
@@ -79,27 +79,24 @@ generateABDM_NotifySMS=@env.ABDM_BASE_URL@/gateway/v1/patients/sms/notify2
 abdmVerifyBio=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/registration/aadhaar/verifyBio
 abdmGenerateMobileOTP=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/registration/aadhaar/generateMobileOTP
 abdmConfirmAadhaarBio=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/auth/confirmWithAadhaarBio
-abdmAccountProfile=@env.ABDM_ACCOUNT_ID_BASE_URL@/api/v1/account/profile
+abdmAccountProfile=@env.ABDM_Account_ID_BASE_URL@/api/v1/account/profile
 
 ##ABDM Facility services
-getAbdmFacilityServicies= @env.ABDM_HIECM_BASE_URL@/api/hiecm/gateway/v3/bridge-services
+getAbdmFacilityServicies= @env.ABDM_BASE_URL@/devservice/v1/bridges/getServices
 
 ##ABDM V3 APIs
-abdmV3UserAuthenticate = @env.ABDM_HIECM_BASE_URL@/api/hiecm/gateway/v3/sessions
-getAuthCertPublicKey =  @env.ABDM_ABHA_V3_URL@/v3/profile/public/certificate
-requestOtpForEnrollment = @env.ABDM_ABHA_V3_URL@/v3/enrollment/request/otp
-abhaEnrollByAadhaar = @env.ABDM_ABHA_V3_URL@/v3/enrollment/enrol/byAadhaar
-printAbhaCard = @env.ABDM_ABHA_V3_URL@/v3/profile/account/abha-card
-abhaLoginRequestOtp = @env.ABDM_ABHA_V3_URL@/v3/profile/login/request/otp
-verifyAbhaLogin = @env.ABDM_ABHA_V3_URL@/v3/profile/login/verify
-abhaProfileLoginVerifyUser =  @env.ABDM_ABHA_V3_URL@/v3/profile/login/verify/user
-requestAuthByAbdm = @env.ABDM_ABHA_V3_URL@/v3/enrollment/auth/byAbdm
-webLoginAbhaRequestOtp = @env.ABDM_PHR_URL@/login/abha/request/otp
-webLoginAbhaVerify = @env.ABDM_PHR_URL@/login/abha/verify
-webLoginPhrCard = @env.ABDM_PHR_URL@/login/profile/abha/phr-card
-
-x-CM-ID=@env.X_CM_ID@
-abhaMode=@env.ABHA_MODE@
+getAuthCertPublicKey = @env.ABDM_HEALTH_ID_BASE_URL@/api/v1/auth/cert
+requestOtpForEnrollment = @env.ABDM_BASE_URL@/abha/api/v3/enrollment/request/otp
+abhaEnrollByAadhaar = @env.ABDM_BASE_URL@/abha/api/v3/enrollment/enrol/byAadhaar
+printAbhaCard = @env.ABDM_BASE_URL@/abha/api/v3/profile/account/abha-card
+abhaLoginRequestOtp = @env.ABDM_BASE_URL@/abha/api/v3/profile/login/request/otp
+verifyAbhaLogin = @env.ABDM_BASE_URL@/abha/api/v3/profile/login/verify
+requestAuthByAbdm = @env.ABDM_BASE_URL@/abha/api/v3/enrollment/auth/byAbdm
+webLoginAbhaRequestOtp = @env.ABDM_BASE_URL@/abha/api/v3/phr/web/login/abha/request/otp
+webLoginAbhaVerify = @env.ABDM_BASE_URL@/abha/api/v3/phr/web/login/abha/verify
+
+
+abhaMode=sbx
 
 #logging.pattern.level=DEBUG
 logging.level.root=INFO
@@ -109,14 +106,5 @@ logging.level.com.iemr=DEBUG
 logging.level.org.springframework=INFO
 
 #ELK logging file name
-logging.path=logs/
 logging.file.name=@env.FHIR_API_LOGGING_FILE_NAME@
 jwt.secret=@env.JWT_SECRET_KEY@
-
-springdoc.api-docs.enabled=@env.SWAGGER_DOC_ENABLED@
-springdoc.swagger-ui.enabled=@env.SWAGGER_DOC_ENABLED@
-
-# Redis IP
-spring.redis.host=@env.REDIS_HOST@
-
-cors.allowed-origins=@env.CORS_ALLOWED_ORIGINS@

src/main/environment/common_dev.properties

@@ -0,0 +1,106 @@
+benSearchByBenIDURL=<Enter your socket address here>/commonapi-v1.0/beneficiary/searchUserByID
+userAuthURL=<Enter your socket address here>/commonapi-v1.0/user/userAuthenticate
+
+# E-aushadhi
+eaushadhiStoreStockDetailsUrl=https://uatbiharsso.dcservices.in/eAushadhi_BIHAR/rest/storeStockDetailsService/
+eaushadhiStoreStockAckUrl=https://uatbiharsso.dcservices.in/eAushadhi_BIHAR/rest/AcknowledgeStoreStockService/
+
+fhirUserName=<Enter FHIR username here>
+fhirPassword=<Enter FHIR password here>
+
+# DB Connections (MySQL)
+spring.datasource.url=<Enter AMRIT DB_IEMR URL here>
+spring.datasource.username=<Enter your AMRIT DB_IEMR username>
+spring.datasource.password=<Enter your AMRIT DB_IEMR password>
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+
+# DB Connection (Mongo DB)
+spring.data.mongodb.host=<Enter Mongo DB host ip address>
+spring.data.mongodb.port=27017
+spring.data.mongodb.authentication-database=<Enter MongoDB authentication database name>
+spring.data.mongodb.database=<Enter MongoDB database name>
+spring.data.mongodb.username=<Enter MongoDB username>
+spring.data.mongodb.password=<Enter MongoDB password>
+
+atomsFeedStartPage=1
+parentUrl=https://demo.mybahmni.org
+
+atomFeedURLPatientDemographic=/openmrs/ws/atomfeed/patient/
+atomFeedURLPatientEncounter=/openmrs/ws/atomfeed/encounter/
+
+feedAuthUserName=<Enter feed authentication username>
+feedAuthPassword=<Enter feed authentication password>
+
+eAushadhiDummy=yes
+
+##NDHM ABHA API
+clientID=<Enter client ID>
+clientSecret=<Enter client secret key>
+
+##Default ABDM Facility ID
+abdmFacilityId= <Enter ABDM Facility ID>
+
+ndhmuserAuthenticate=https://dev.abdm.gov.in/gateway/v0.5/sessions
+ndhmGenerateOTP=https://healthidsbx.abdm.gov.in/api/v1/registration/mobile/generateOtp
+ndhmVerifyOTP=https://healthidsbx.abdm.gov.in/api/v1/registration/mobile/verifyOtp
+ndhmCreateHealthID=https://healthidsbx.abdm.gov.in/api/v1/registration/mobile/createHealthId
+
+## ABHA with aadhaar
+ndhmGenerateOTPWithAadhaar=https://healthidsbx.abdm.gov.in/api/v1/registration/aadhaar/generateOtp
+ndhmCreateHealthIDWithAadhaar=https://healthidsbx.abdm.gov.in/api/v1/registration/aadhaar/createHealthIdWithAadhaarOtp
+
+## ABHA Creation New APIs
+abdmVerifyOTP= https://healthidsbx.abdm.gov.in/api/v1/registration/aadhaar/verifyOTP
+abdmCheckAndGenerateMobileOTP= https://healthidsbx.abdm.gov.in/api/v2/registration/aadhaar/checkAndGenerateMobileOTP
+abdmVerifyMobileOTP= https://healthidsbx.abdm.gov.in/api/v1/registration/aadhaar/verifyMobileOTP
+abdmcreateHealthIdWithPreVerified= https://healthidsbx.abdm.gov.in/api/v1/registration/aadhaar/createHealthIdWithPreVerified
+
+
+##CareContext Creation API
+generateOTPForCareContext=https://dev.abdm.gov.in/gateway/v0.5/users/auth/init
+addCareContext = https://dev.abdm.gov.in/gateway/v0.5/links/link/add-contexts
+validateOTPForCareContext=https://dev.abdm.gov.in/gateway/v0.5/users/auth/confirm
+
+##ABHA Card API
+## Auth init - aadhar / mobile  
+generateOTP_ForCard=https://healthidsbx.abdm.gov.in/api/v1/auth/init
+## confirm with mobile OTP
+verifyOTP_ForCard=https://healthidsbx.abdm.gov.in/api/v1/auth/confirmWithMobileOTP
+## confirm with Aadhaar
+verifyOTP_ForCard_Aadhaar=https://healthidsbx.abdm.gov.in/api/v1/auth/confirmWithAadhaarOtp
+## print ABHA card - PNG
+generateHealthCard=https://healthidsbx.abdm.gov.in/api/v1/health/facility/getPngCard
+generateHealthIDCard=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/account/getPngCard
+
+## Generate Notify SMS once episode completed
+generateABDM_NotifySMS=https://dev.abdm.gov.in/gateway/v1/patients/sms/notify2
+
+##verifyBio
+abdmVerifyBio=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/registration/aadhaar/verifyBio
+abdmGenerateMobileOTP=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/registration/aadhaar/generateMobileOTP
+abdmConfirmAadhaarBio=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/auth/confirmWithAadhaarBio
+abdmAccountProfile=@env.ABDM_Account_ID_BASE_URL@/api/v1/account/profile
+
+##ABDM Facility services
+getAbdmFacilityServicies= https://dev.abdm.gov.in/devservice/v1/bridges/getServices
+
+##ABDM V3 APIs
+getAuthCertPublicKey = https://healthidsbx.abdm.gov.in/api/v1/auth/cert
+requestOtpForEnrollment = https://abhasbx.abdm.gov.in/abha/api/v3/enrollment/request/otp
+abhaEnrollByAadhaar = https://abhasbx.abdm.gov.in/abha/api/v3/enrollment/enrol/byAadhaar
+printAbhaCard = https://abhasbx.abdm.gov.in/abha/api/v3/profile/account/abha-card
+abhaLoginRequestOtp = https://abhasbx.abdm.gov.in/abha/api/v3/profile/login/request/otp
+verifyAbhaLogin = https://abhasbx.abdm.gov.in/abha/api/v3/profile/login/verify
+requestAuthByAbdm = https://abhasbx.abdm.gov.in/abha/api/v3/enrollment/auth/byAbdm
+webLoginAbhaRequestOtp = https://abhasbx.abdm.gov.in/abha/api/v3/phr/web/login/abha/request/otp
+webLoginAbhaVerify = https://abhasbx.abdm.gov.in/abha/api/v3/phr/web/login/abha/verify
+
+abhaMode=sbx
+
+#logging.pattern.level=DEBUG
+logging.level.root=INFO
+logging.level.org.springframework.web=INFO
+logging.level.org.hibernate=INFO
+logging.level.com.iemr=DEBUG
+logging.level.org.springframework=INFO
+jwt.secret=

src/main/environment/common_example.properties

@@ -85,22 +85,17 @@ abdmConfirmAadhaarBio=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/auth/confirmWithAadha
 abdmAccountProfile=@env.ABDM_Account_ID_BASE_URL@/api/v1/account/profile
 
 ##ABDM Facility services
-getAbdmFacilityServicies= https://dev.abdm.gov.in/api/hiecm/gateway/v3/bridge-services
+getAbdmFacilityServicies= https://dev.abdm.gov.in/devservice/v1/bridges/getServices
 
 ##ABDM V3 APIs
-abdmV3UserAuthenticate = https://dev.abdm.gov.in/api/hiecm/gateway/v3/sessions
 getAuthCertPublicKey = https://healthidsbx.abdm.gov.in/api/v1/auth/cert
 requestOtpForEnrollment = https://abhasbx.abdm.gov.in/abha/api/v3/enrollment/request/otp
 abhaEnrollByAadhaar = https://abhasbx.abdm.gov.in/abha/api/v3/enrollment/enrol/byAadhaar
 printAbhaCard = https://abhasbx.abdm.gov.in/abha/api/v3/profile/account/abha-card
 abhaLoginRequestOtp = https://abhasbx.abdm.gov.in/abha/api/v3/profile/login/request/otp
 verifyAbhaLogin = https://abhasbx.abdm.gov.in/abha/api/v3/profile/login/verify
-abhaProfileLoginVerifyUser = https://abhasbx.abdm.gov.in/abha/api/v3/profile/login/verify/user
-requestAuthByAbdm = https://abhasbx.abdm.gov.in/abha/api/v3/enrollment/auth/byAbdm
-webLoginAbhaVerify = https://abhasbx.abdm.gov.in/abha/api/v3/phr/web/login/abha/verify
-webLoginPhrCard = https://abhasbx.abdm.gov.in/abha/api/v3/phr/web/login/profile/abha/phr-card
 
-x-CM-ID= sbx
+
 abhaMode=sbx
 
 #logging.pattern.level=DEBUG
@@ -109,8 +104,4 @@ logging.level.org.springframework.web=INFO
 logging.level.org.hibernate=INFO
 logging.level.com.iemr=DEBUG
 logging.level.org.springframework=INFO
-jwt.secret=my-32-character-ultra-secure-and-ultra-long-secret
-logging.path=logs/
-logging.file.name=logs/fhir-api.log
-
-cors.allowed-origins=http://localhost:*
+jwt.secret=