Merge remote-tracking branch 'origin/develop' into experimental/andro…

…id-intents
idpass · Jan 31, 2024 · 2948985 · 2948985
2 parents 56a414e + 5ee3c62
commit 2948985
Show file tree

Hide file tree

Showing 461 changed files with 25,771 additions and 11,209 deletions.
diff --git a/.env b/.env
@@ -2,9 +2,9 @@
 # eg . npm build android:newlogic --reset-cache
 
 #MIMOTO_HOST=http://mock.mimoto.newlogic.dev
-MIMOTO_HOST=https://api.qa-inji.mosip.net
+MIMOTO_HOST=https://api.qa-inji1.mosip.net
 
-ESIGNET_HOST=https://api.qa-inji.mosip.net
+ESIGNET_HOST=https://api.qa-inji1.mosip.net
 
 OBSRV_HOST = https://dataset-api.obsrv.mosip.net
 
@@ -13,6 +13,8 @@ APPLICATION_THEME=orange
 
 #environment can be changed if it is toggled
 CREDENTIAL_REGISTRY_EDIT=true
+#DataBackup can enable if it is toggled
+BACKUP_AND_RESTORE=false
 DEBUG_MODE=false
 
 #supported languages( en, fil, ar, hi, kn, ta)

diff --git a/.github/workflows/clear_artifacts.yml b/.github/workflows/clear_artifacts.yml
@@ -7,4 +7,4 @@ jobs:
     uses: mosip/kattu/.github/workflows/clear-artifacts.yml@master
     secrets:
       ACCESS_TOKEN: ${{ secrets.ACTION_PAT }}
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_INJI_TEAM }}
diff --git a/.github/workflows/internal-build.yml b/.github/workflows/internal-build.yml
@@ -104,7 +104,7 @@ jobs:
       ANDROID_KEYSTORE_FILE: ${{ secrets.INJI_ANDROID_RELEASE_KEYSTORE }}
       RELEASE_KEYSTORE_PASSWORD: '${{ secrets.INJI_ANDROID_RELEASE_STOREPASS }}'
       INJI_ANDROID_PLAY_STORE_CONFIG_JSON: ${{ secrets.INJI_ANDROID_PLAY_STORE_CONFIG_JSON }}
-      SLACK_WEBHOOK_URL: '${{ secrets.SLACK_WEBHOOK }}'
+      SLACK_WEBHOOK_URL: '${{ secrets.SLACK_WEBHOOK_INJI_TEAM }}'
 
   build-android-beta:
     if: ${{ inputs.release == 'beta' && (inputs.buildFor == 'Both[Android and IOS]' || inputs.buildFor == 'Android') }}
@@ -129,7 +129,7 @@ jobs:
       ANDROID_KEYSTORE_FILE: ${{ secrets.INJI_ANDROID_RELEASE_KEYSTORE }}
       RELEASE_KEYSTORE_PASSWORD: '${{ secrets.INJI_ANDROID_RELEASE_STOREPASS }}'
       INJI_ANDROID_PLAY_STORE_CONFIG_JSON: ${{ secrets.INJI_ANDROID_PLAY_STORE_CONFIG_JSON }}
-      SLACK_WEBHOOK_URL: '${{ secrets.SLACK_WEBHOOK }}'
+      SLACK_WEBHOOK_URL: '${{ secrets.SLACK_WEBHOOK_INJI_TEAM }}'
 
   build-ios:
     if: ${{ inputs.buildFor == 'Both[Android and IOS]' || inputs.buildFor == 'IOS'}}
@@ -146,8 +146,8 @@ jobs:
       SERVICE_LOCATION: '.'
       IOS_SERVICE_LOCATION: 'ios'
       SCRIPT_NAME: "fastlane beta"
-      IOS_ARTIFACT_NAME: "Inji"
-      IOS_ARTIFACT_PATH: "ios/fastlane/Inji_app_file/Products/Applications/"
+      IOS_ARTIFACT_NAME: "ios-artifacts"
+      IOS_ARTIFACT_PATH: "ios/fastlane/Inji_artifacts/"
     secrets:
       APP_STORE_CONNECT_TEAM_ID: '${{ secrets.APP_STORE_CONNECT_TEAM_ID }}'
       DEVELOPER_APP_ID: '${{ secrets.IOS_INJI_DEVELOPER_APP_ID }}'
@@ -163,4 +163,15 @@ jobs:
       APPLE_ISSUER_ID: '${{ secrets.APPLE_ISSUER_ID }}'
       APPLE_KEY_CONTENT: '${{ secrets.APPLE_KEY_CONTENT }}'
       MATCH_PASSWORD: '${{ secrets.INJI_IOS_MATCH_PASSWORD }}'
-      SLACK_WEBHOOK_URL: '${{ secrets.SLACK_WEBHOOK }}'
+      SLACK_WEBHOOK_URL: '${{ secrets.SLACK_WEBHOOK_INJI_TEAM }}'
+
+  # sonar-check:
+  #   uses: mosip/kattu/.github/workflows/gradlew-sonar-analysis.yml@master
+  #   with:
+  #     SERVICE_LOCATION: '.'
+  #     ANDROID_LOCATION: 'android'
+  #     SONAR_ARGS: -Dsonarqube
+  #   secrets:
+  #     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+  #     SONAR_ORGANIZATION: ${{ secrets.ORG_KEY }}
+  #     SLACK_WEBHOOK_URL: '${{ secrets.SLACK_WEBHOOK_INJI_TEAM }}'
diff --git a/.github/workflows/push-triggers.yml b/.github/workflows/push-triggers.yml
@@ -36,4 +36,15 @@ jobs:
       NODE_VERSION: "18.x"
       SERVICE_LOCATION: '.'
       IOS_SERVICE_LOCATION: 'ios'
-      SCRIPT_NAME: "fastlane ios_app_build"
+      SCRIPT_NAME: "fastlane ios_app_build"
+
+  # sonar-check:
+  #   if: ${{ github.event_name != 'pull_request' }}
+  #   uses: mosip/kattu/.github/workflows/gradlew-sonar-analysis.yml@master
+  #   with:
+  #     SERVICE_LOCATION: '.'
+  #     ANDROID_LOCATION: 'android'
+  #   secrets:
+  #     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+  #     SONAR_ORGANIZATION: ${{ secrets.ORG_KEY }}
+  #     SLACK_WEBHOOK_URL: '${{ secrets.SLACK_WEBHOOK_INJI_TEAM }}'
diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
@@ -32,4 +32,4 @@ jobs:
       PRE_RELEASE: ${{ inputs.PRE_RELEASE }}
       DRAFT: ${{ inputs.DRAFT }}
     secrets:
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_INJI_TEAM }}
diff --git a/.github/workflows/ui-automation.yml b/.github/workflows/ui-automation.yml
@@ -5,12 +5,12 @@ on:
   workflow_dispatch:
     inputs:
       runName:
-        description: 'Run name'
+        description: 'Name the run for Actions & DeviceFarm'
         required: true
-        default: 'Device-pool/Test-name/Env'
+        default: 'Ex: Sanity/Regression[ENV]'
         type: string
       buildFor:
-        description: 'Build'
+        description: 'Trigger test case run for'
         required: true
         default: 'Both[Android and IOS]'
         type: choice
@@ -19,7 +19,7 @@ on:
           - Android
           - IOS
       testType:
-        description: 'Sanity/Regression'
+        description: 'Test type Sanity/Regression'
         required: true
         default: 'sanity'
         type: choice
@@ -51,7 +51,7 @@ jobs:
           key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-npm-
-    
+
       - name: Install npm dependencies
         run: |
           npm ci
@@ -66,8 +66,8 @@ jobs:
       - name: Create Android Build
         run: |
           npx jetify
-          cd android
-          ./gradlew :app:assembleResidentappRelease
+          cd android/scripts
+          ./android-build.sh
         env:
           MIMOTO_HOST: ${{ github.event.inputs.backendServiceUrl }}
           ESIGNET_HOST: ${{ github.event.inputs.backendServiceUrl }}
@@ -76,35 +76,33 @@ jobs:
           RELEASE_KEYSTORE_ALIAS: 'androidreleasekey'
           RELEASE_KEYSTORE_PASSWORD: "${{ secrets.INJI_ANDROID_RELEASE_STOREPASS }}"
 
-      - name: Configure AWS CLI 
+      - name: Configure AWS CLI
         run: |
           aws configure set aws_access_key_id ${{ secrets.AWS_DEVICE_FARM_ACCESS_KEY }}
           aws configure set aws_secret_access_key ${{ secrets.AWS_DEVICE_FARM_SECRET_KEY }}
           aws configure set region us-west-2
-        
+
       - name: Android - Automation
         id: android-run
         run: |
           cd injitest/scripts/ui_automation
-          RUN_ARN=$(./automation_trigger.sh "Android" "$RUN_NAME" "$TEST_TYPE")
-          echo "The Run ARN is $RUN_ARN"
+          ./automation_trigger.sh "Android" "$RUN_NAME-Android" "$TEST_TYPE"
         env:
           RUN_NAME: ${{ github.event.inputs.runName }}
           TEST_TYPE: ${{ github.event.inputs.testType }}
 
-      # - name: Artifacts download
-      #   id: artifact-download
-      #   run: |
-      #     cd injitest/scripts/ui_automation
-      #     ./download_artifacts.sh "${{ steps.android-run.outputs.run_arn }}" "Android"
+      - name: Download Android Artifacts
+        run: |
+          cd injitest/scripts/ui_automation
+          ./download_artifacts.sh "$RUN_ARN" "Android"
+
+      - name: Upload Artifact to Actions
+        uses: actions/[email protected]
+        with:
+          name: Android-Artifacts
+          path: injitest/scripts/ui_automation/artifacts/android_artifacts/
+          retention-days: 10
 
-      # - name: Upload Artifact to Actions
-      #   uses: actions/[email protected]
-      #   with:
-      #     name: Automation Artifacts
-      #     path: injitest/scripts/ui_automation/artifacts/
-      #     retention-days: 5
-
       # - name: Update slack channel
       #   if: always()
       #   uses: 8398a7/action-slack@v3
@@ -132,7 +130,7 @@ jobs:
           key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-npm-
-    
+
       - name: Install npm dependencies
         run: |
           npm ci
@@ -141,7 +139,7 @@ jobs:
         run: |
           cd ios
           pod install && pod install
-          fastlane ios_ui_automation_build 
+          fastlane ios_ui_automation_build
         env:
           MIMOTO_HOST: ${{ github.event.inputs.backendServiceUrl }}
           ESIGNET_HOST: ${{ github.event.inputs.backendServiceUrl }}
@@ -151,8 +149,12 @@ jobs:
           INJI_IOS_TEMP_KEYCHAIN_PASSWORD: '${{ secrets.INJI_IOS_TEMP_KEYCHAIN_PASSWORD }}'
           INJI_IOS_TEMP_KEYCHAIN_USER: '${{ secrets.INJI_IOS_TEMP_KEYCHAIN_USER }}'
           GIT_AUTHORIZATION: '${{ secrets.GIT_AUTHORIZATION }}'
+          APPLE_KEY_ID: '${{ secrets.APPLE_KEY_ID }}'
+          APPLE_ISSUER_ID: '${{ secrets.APPLE_ISSUER_ID }}'
+          APPLE_KEY_CONTENT: '${{ secrets.APPLE_KEY_CONTENT }}'
+          MATCH_PASSWORD: '${{ secrets.INJI_IOS_MATCH_PASSWORD }}'
 
-      - name: Configure AWS CLI 
+      - name: Configure AWS CLI
         run: |
           aws configure set aws_access_key_id ${{ secrets.AWS_DEVICE_FARM_ACCESS_KEY }}
           aws configure set aws_secret_access_key ${{ secrets.AWS_DEVICE_FARM_SECRET_KEY }}
@@ -161,30 +163,28 @@ jobs:
       - name: IOS - Automation
         run: |
           cd injitest/scripts/ui_automation
-          RUN_ARN=$(./automation_trigger.sh "IOS" "$RUN_NAME" "$TEST_TYPE")
-          echo "The Run ARN is $RUN_ARN"
+          ./automation_trigger.sh "IOS" "$RUN_NAME-IOS" "$TEST_TYPE"
         env:
           RUN_NAME: ${{ github.event.inputs.runName }}
           TEST_TYPE: ${{ github.event.inputs.testType }}
-
-      # - name: Artifacts download
-      #   id: artifact-download
-      #   run: |
-      #     cd injitest/scripts/ui_automation
-      #     ./download_artifacts.sh "${{ steps.android-run.outputs.run_arn }}" "Android"
-
-      # - name: Upload Artifact to Actions
-      #   uses: actions/[email protected]
-      #   with:
-      #     name: Automation Artifacts
-      #     path: injitest/scripts/ui_automation/artifacts/
-      #     retention-days: 5
-
+
+      - name: Download IOS Artifacts
+        run: |
+          cd injitest/scripts/ui_automation
+          ./download_artifacts.sh "$RUN_ARN" "IOS"
+
+      - name: Upload Artifact to Actions
+        uses: actions/[email protected]
+        with:
+          name: IOS-Artifacts
+          path: injitest/scripts/ui_automation/artifacts/ios_artifacts/
+          retention-days: 10
+
       # - name: Update slack channel
       #   if: always()
       #   uses: 8398a7/action-slack@v3
       #   with:
       #     status: ${{ job.status }}
       #     fields: repo,message,author,commit,workflow,job
       #   env:
-      #     SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_INJI_TEAM }}
+      #     SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_INJI_TEAM }}
diff --git a/.gitignore b/.gitignore
@@ -13,7 +13,6 @@ web-build/
 # The following patterns were generated by expo-cli
 
 # Built application files
-*.apk
 *.aab
 android/app/debug/output-metadata.json
 android/app/release/output-metadata.json
@@ -121,4 +120,13 @@ android/app/debug.keystore
 # Expo
 .expo
 dist/
-web-build/
+web-build/
+
+# automation test results
+# test reports generated after running test
+injitest/report/ 
+injitest/testng-report/
+# logs from tests ran
+injitest/src/logs/
+# test case class files
+injitest/target/
diff --git a/.svgrrc b/.svgrrc
@@ -0,0 +1,7 @@
+{
+  "replaceAttrValues": {
+    "@fill": "{props.color1}",
+    "@fill2": "{props.color2}",
+    "@stroke": "{props.color3}"
+  }
+}