diff --git a/.github/workflows/mavenpublish.yml b/.github/workflows/mavenpublish.yml deleted file mode 100644 index 130dc767e92..00000000000 --- a/.github/workflows/mavenpublish.yml +++ /dev/null @@ -1,213 +0,0 @@ -# This workflow will build a package using Maven and then publish it nexus when a pull request is merged -# For more information see: https://github.com/actions/setup-java#apache-maven-with-a-settings-path - -name: Maven Package upon a pull request - -on: - pull_request: - types: [closed] - -jobs: - build-kernel-ref-idobjectvalidator: - - runs-on: ubuntu-latest - - if: github.event.pull_request.merged == true - - steps: - - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 - with: - ref: ${{ github.ref }} - java-version: 1.8 - server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml - settings-path: ${{ github.workspace }} # location for the settings.xml file - - - name: Setup branch and GPG public key - run: | - # Strip git ref prefix from version - echo "::set-env name=BRANCH_NAME::$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" - echo ${{ env.BRANCH_NAME }} - echo "::set-env name=GPG_TTY::$(tty)" - echo ${{ env.GPG_TTY }} - sudo apt-get --yes install gnupg2 - gpg2 --import ./.github/keys/mosipgpgkey_pub.gpg - gpg2 --quiet --batch --passphrase=${{secrets.gpg_secret}} --allow-secret-key-import --import ./.github/keys/mosipgpgkey_sec.gpg - - - uses: actions/cache@v1 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven-${{ env.BRANCH_NAME }} - - - name: Setup the settings file for ossrh server - run: echo " ossrh ${{secrets.ossrh_user}} ${{secrets.ossrh_secret}} ossrh true gpg2 ${{secrets.gpg_secret}} allow-snapshots true snapshots-repo https://oss.sonatype.org/content/repositories/snapshots false true releases-repo https://oss.sonatype.org/service/local/staging/deploy/maven2 true false sonar . https://sonarcloud.io false " > $GITHUB_WORKSPACE/settings.xml - - - - name: Build with Maven - run: | - cd kernel - mvn -B package -s $GITHUB_WORKSPACE/settings.xml --file pom.xml - - - name: Ready the springboot artifacts - run: find -name '*.jar' -executable -type f -exec zip release.zip {} + - - - name: Upload the springboot jars - uses: actions/upload-artifact@v1 - with: - name: release - path: ./release.zip - - publish_to_nexus: - runs-on: ubuntu-latest - if: github.event.pull_request.merged == true - - steps: - - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 - with: - ref: ${{ github.ref }} - java-version: 1.8 - server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml - settings-path: ${{ github.workspace }} # location for the settings.xml file - - - name: Setup branch and GPG public key - run: | - # Strip git ref prefix from version - echo "::set-env name=BRANCH_NAME::$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" - echo ${{ env.BRANCH_NAME }} - echo "::set-env name=GPG_TTY::$(tty)" - echo ${{ env.GPG_TTY }} - sudo apt-get --yes install gnupg2 - gpg2 --import ./.github/keys/mosipgpgkey_pub.gpg - gpg2 --quiet --batch --passphrase=${{secrets.gpg_secret}} --allow-secret-key-import --import ./.github/keys/mosipgpgkey_sec.gpg - - - uses: actions/cache@v1 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven-${{ env.BRANCH_NAME }} - - name: Install xmllint - run: | - sudo apt-get update - sudo apt-get install libxml2-utils - - name: Setup the settings file for ossrh server - run: echo " ossrh ${{secrets.ossrh_user}} ${{secrets.ossrh_secret}} ossrh true gpg2 ${{secrets.gpg_secret}} allow-snapshots true snapshots-repo https://oss.sonatype.org/content/repositories/snapshots false true releases-repo https://oss.sonatype.org/service/local/staging/deploy/maven2 true false sonar . https://sonarcloud.io false " > $GITHUB_WORKSPACE/settings.xml - - - name: Build with Maven - run: | - cd kernel - mvn -B package -s $GITHUB_WORKSPACE/settings.xml --file pom.xml - - - name: Publish the maven package - run: | - chmod +x ./deploy.sh - ./deploy.sh kernel $GITHUB_WORKSPACE/settings.xml SNAPSHOT - env: - GPG_TTY: $(tty) - - name: Analyze with SonarCloud - run: | - cd kernel - mvn -B verify sonar:sonar -Dsonar.projectKey=${{ secrets.PROJECT_KEY }} -Dsonar.organization=${{ secrets.ORG_KEY }} -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${{ secrets.SONAR_TOKEN }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - # This workflow contains a single job called "build" - - build-admin-ui: - runs-on: ubuntu-latest - env: - NAMESPACE: ${{ secrets. dev_namespace_docker_hub }} - SERVICE_NAME: admin-ui - SERVICE_LOCATION: admin-ui - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - - uses: actions/setup-node@v1 - - - name: npm install - run: cd ${{ env.SERVICE_LOCATION }} && npm install --ignore-scripts - - - name: npm build - run: cd ${{ env.SERVICE_LOCATION }} && npm run-script build -- --prod --base-href . --output-path=dist - - - name: setup environment - run: | - # Strip git ref prefix from version - echo "::set-env name=BRANCH_NAME::$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" - echo ${{ env.BRANCH_NAME }} - - - name: Build image - run: | - cd "./${{env.SERVICE_LOCATION}}" - docker build . --file Dockerfile --tag ${{ env.SERVICE_NAME }} - - - name: Log into registry - run: echo "${{ secrets.release_docker_hub }}" | docker login -u ${{ secrets.actor_docker_hub }} --password-stdin - - - name: Push image - run: | - IMAGE_ID=$NAMESPACE/$SERVICE_NAME - - # Change all uppercase to lowercase - IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]') - VERSION=$BRANCH_NAME - echo "push version $VERSION" - echo IMAGE_ID=$IMAGE_ID - echo VERSION=$VERSION - docker tag $SERVICE_NAME $IMAGE_ID:$VERSION - docker push $IMAGE_ID:$VERSION - -# This workflow contains a single job called "build" - build-pre-registration-ui: - - runs-on: ubuntu-latest - env: - NAMESPACE: ${{ secrets. dev_namespace_docker_hub }} - SERVICE_NAME: pre-registration-ui - SERVICE_LOCATION: pre-registration-ui - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - - uses: actions/setup-node@v1 - - - name: npm install - run: cd ${{ env.SERVICE_LOCATION }} && npm install --ignore-scripts - - - name: npm build - run: cd ${{ env.SERVICE_LOCATION }} && npm run-script build -- --prod --base-href . --output-path=dist - - - name: setup environment - run: | - # Strip git ref prefix from version - echo "::set-env name=BRANCH_NAME::$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" - echo ${{ env.BRANCH_NAME }} - - - name: Build image - run: | - cd "./${{env.SERVICE_LOCATION}}" - docker build . --file Dockerfile --tag ${{ env.SERVICE_NAME }} - - - name: Log into registry - run: echo "${{ secrets.release_docker_hub }}" | docker login -u ${{ secrets.actor_docker_hub }} --password-stdin - - - name: Push image - run: | - IMAGE_ID=$NAMESPACE/$SERVICE_NAME - - # Change all uppercase to lowercase - IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]') - VERSION=$BRANCH_NAME - echo "push version $VERSION" - echo IMAGE_ID=$IMAGE_ID - echo VERSION=$VERSION - docker tag $SERVICE_NAME $IMAGE_ID:$VERSION - docker push $IMAGE_ID:$VERSION diff --git a/.github/workflows/push_trigger.yml b/.github/workflows/push_trigger.yml index 2c65e5a7177..5ee4b2e26a3 100644 --- a/.github/workflows/push_trigger.yml +++ b/.github/workflows/push_trigger.yml @@ -7,7 +7,7 @@ on: - master - 1.0.* - develop - - 1.1.2 + - 1.1.* jobs: build-kernel-ref-idobjectvalidator: @@ -23,12 +23,16 @@ jobs: server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml settings-path: ${{ github.workspace }} # location for the settings.xml file + - name: Setup branch and env + run: | + # Strip git ref prefix from version + echo "BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" >> $GITHUB_ENV + echo "GPG_TTY=$(tty)" >> $GITHUB_ENV + - name: Setup branch and GPG public key run: | # Strip git ref prefix from version - echo "::set-env name=BRANCH_NAME::$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" echo ${{ env.BRANCH_NAME }} - echo "::set-env name=GPG_TTY::$(tty)" echo ${{ env.GPG_TTY }} sudo apt-get --yes install gnupg2 gpg2 --import ./.github/keys/mosipgpgkey_pub.gpg @@ -65,13 +69,16 @@ jobs: java-version: 11 server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml settings-path: ${{ github.workspace }} # location for the settings.xml file + - name: Setup branch and env + run: | + # Strip git ref prefix from version + echo "BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" >> $GITHUB_ENV + echo "GPG_TTY=$(tty)" >> $GITHUB_ENV - name: Setup branch and GPG public key run: | # Strip git ref prefix from version - echo "::set-env name=BRANCH_NAME::$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" - echo ${{ env.BRANCH_NAME }} - echo "::set-env name=GPG_TTY::$(tty)" + echo "BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" >> $GITHUB_ENV echo ${{ env.GPG_TTY }} sudo apt-get --yes install gnupg2 gpg2 --import ./.github/keys/mosipgpgkey_pub.gpg @@ -94,13 +101,16 @@ jobs: run: | cd kernel mvn -B package -s $GITHUB_WORKSPACE/settings.xml --file pom.xml - + - name: Publish the maven package run: | - cd kernel && mvn deploy -DskipTests -DaltDeploymentRepository=ossrh::default::${{ secrets.RELEASE_URL }} -s $GITHUB_WORKSPACE/settings.xml -f pom.xml + #cd kernel && mvn deploy -DskipTests -DaltDeploymentRepository=ossrh::default::${{ secrets.RELEASE_URL }} -s $GITHUB_WORKSPACE/settings.xml -f pom.xml + #cd .. + cd pre-registration-booking-service && mvn deploy -DskipTests -DaltDeploymentRepository=ossrh::default::${{ secrets.RELEASE_URL }} -s $GITHUB_WORKSPACE/settings.xml -f pom.xml env: GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }} GPG_TTY: $(tty) + - name: Analyze with SonarCloud run: | cd kernel @@ -108,8 +118,111 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - # This workflow contains a single job called "build" + + build-pre-registration-booking-service: + + runs-on: ubuntu-latest + env: + NAMESPACE: ${{ secrets. dev_namespace_docker_hub }} + SERVICE_NAME: pre-registration-booking-service + SERVICE_LOCATION: pre-registration-booking-service + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v1 + with: + ref: ${{ github.ref }} + java-version: 11 + server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml + settings-path: ${{ github.workspace }} # location for the settings.xml file + - name: Setup branch and env + run: | + # Strip git ref prefix from version + echo "BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" >> $GITHUB_ENV + echo "GPG_TTY=$(tty)" >> $GITHUB_ENV + + - name: Setup branch and GPG public key + run: | + # Strip git ref prefix from version + echo "BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" >> $GITHUB_ENV + echo ${{ env.GPG_TTY }} + sudo apt-get --yes install gnupg2 + gpg2 --import ./.github/keys/mosipgpgkey_pub.gpg + gpg2 --quiet --batch --passphrase=${{secrets.gpg_secret}} --allow-secret-key-import --import ./.github/keys/mosipgpgkey_sec.gpg + + + - name: Setup the settings file for ossrh server + run: echo " ossrh ${{secrets.RELEASE_USER}} ${{secrets.RELEASE_TOKEN}} ossrh true gpg2 ${{secrets.gpg_secret}} allow-snapshots true snapshots-repo https://oss.sonatype.org/content/repositories/snapshots false true releases-repo https://oss.sonatype.org/service/local/staging/deploy/maven2 true false sonar . https://sonarcloud.io false " > $GITHUB_WORKSPACE/settings.xml + + + - name: Build with Maven + run: | + cd pre-registration-booking-service + mvn -B package -s $GITHUB_WORKSPACE/settings.xml --file pom.xml + + - name: Ready the springboot artifacts + run: find -name '*.jar' -executable -type f -exec zip release.zip {} + + + + - name: Setup branch and GPG public key + run: | + # Strip git ref prefix from version + + echo "BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" >> $GITHUB_ENV + echo ${{ env.GPG_TTY }} + sudo apt-get --yes install gnupg2 + gpg2 --import ./.github/keys/mosipgpgkey_pub.gpg + gpg2 --quiet --batch --passphrase=${{secrets.gpg_secret}} --allow-secret-key-import --import ./.github/keys/mosipgpgkey_sec.gpg + + - uses: actions/cache@v1 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven-${{ env.BRANCH_NAME }} + - name: Install xmllint + run: | + sudo apt-get update + sudo apt-get install libxml2-utils + - name: Setup the settings file for ossrh server + run: echo " ossrh ${{secrets.RELEASE_USER}} ${{secrets.RELEASE_TOKEN}} ossrh true gpg2 ${{secrets.gpg_secret}} allow-snapshots true snapshots-repo https://oss.sonatype.org/content/repositories/snapshots false true releases-repo https://oss.sonatype.org/service/local/staging/deploy/maven2 true false sonar . https://sonarcloud.io false " > $GITHUB_WORKSPACE/settings.xml + + + - name: Publish the maven package + run: | + cd pre-registration-booking-service && mvn deploy -DskipTests -DaltDeploymentRepository=ossrh::default::${{ secrets.RELEASE_URL }} -s $GITHUB_WORKSPACE/settings.xml -f pom.xml + + +# - name: Analyze with SonarCloud +# run: | +# cd pre-registration-booking-service +# mvn -B verify sonar:sonar -Dsonar.projectKey=${{ secrets.PROJECT_KEY }} -Dsonar.organization=${{ secrets.ORG_KEY }} -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${{ secrets.SONAR_TOKEN }} +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + + - name: Build image + run: | + cd "./${{env.SERVICE_LOCATION}}" + docker build . --file Dockerfile --tag ${{ env.SERVICE_NAME }} + + - name: Log into registry + run: echo "${{ secrets.release_docker_hub }}" | docker login -u ${{ secrets.actor_docker_hub }} --password-stdin + + - name: Push image + run: | + IMAGE_ID=$NAMESPACE/$SERVICE_NAME + + # Change all uppercase to lowercase + IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]') + VERSION=$BRANCH_NAME + echo "push version $VERSION" + echo IMAGE_ID=$IMAGE_ID + echo VERSION=$VERSION + docker tag $SERVICE_NAME $IMAGE_ID:$VERSION + docker push $IMAGE_ID:$VERSION + build-admin-ui: runs-on: ubuntu-latest env: @@ -129,11 +242,16 @@ jobs: - name: npm build run: cd ${{ env.SERVICE_LOCATION }} && npm run-script build -- --prod --base-href . --output-path=dist + - name: Setup branch and env + run: | + # Strip git ref prefix from version + echo "BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" >> $GITHUB_ENV + echo "GPG_TTY=$(tty)" >> $GITHUB_ENV - name: setup environment run: | # Strip git ref prefix from version - echo "::set-env name=BRANCH_NAME::$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" - echo ${{ env.BRANCH_NAME }} + echo "GPG_TTY=$(tty)" >> $GITHUB_ENV + echo "BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" >> $GITHUB_ENV - name: Build image run: | @@ -176,12 +294,15 @@ jobs: - name: npm build run: cd ${{ env.SERVICE_LOCATION }} && npm run-script build -- --prod --base-href . --output-path=dist - + - name: Setup branch and env + run: | + # Strip git ref prefix from version + echo "BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" >> $GITHUB_ENV + echo "GPG_TTY=$(tty)" >> $GITHUB_ENV - name: setup environment run: | # Strip git ref prefix from version - echo "::set-env name=BRANCH_NAME::$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" - echo ${{ env.BRANCH_NAME }} + echo "BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" >> $GITHUB_ENV - name: Build image run: | @@ -203,3 +324,50 @@ jobs: echo VERSION=$VERSION docker tag $SERVICE_NAME $IMAGE_ID:$VERSION docker push $IMAGE_ID:$VERSION + + +# This workflow contains a single job called "build" + build-keycloak: + + runs-on: ubuntu-latest + env: + NAMESPACE: ${{ secrets. dev_namespace_docker_hub }} + SERVICE_NAME: mosip-keycloak + SERVICE_LOCATION: keycloak + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + - uses: actions/setup-node@v1 + + - name: Setup branch and env + run: | + # Strip git ref prefix from version + echo "BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" >> $GITHUB_ENV + echo "GPG_TTY=$(tty)" >> $GITHUB_ENV + - name: setup environment + run: | + # Strip git ref prefix from version + echo "BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" >> $GITHUB_ENV + + - name: Build image + run: | + cd "./${{env.SERVICE_LOCATION}}" + docker build . --file Dockerfile --tag ${{ env.SERVICE_NAME }} + + - name: Log into registry + run: echo "${{ secrets.release_docker_hub }}" | docker login -u ${{ secrets.actor_docker_hub }} --password-stdin + + - name: Push image + run: | + IMAGE_ID=$NAMESPACE/$SERVICE_NAME + + # Change all uppercase to lowercase + IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]') + VERSION=$BRANCH_NAME + echo "push version $VERSION" + echo IMAGE_ID=$IMAGE_ID + echo VERSION=$VERSION + docker tag $SERVICE_NAME $IMAGE_ID:$VERSION + docker push $IMAGE_ID:$VERSION diff --git a/admin-ui/package-lock.json b/admin-ui/package-lock.json index 9a3415a7f79..e195e441de8 100644 --- a/admin-ui/package-lock.json +++ b/admin-ui/package-lock.json @@ -1,6 +1,6 @@ { "name": "admin", - "version": "1.0.7", + "version": "1.1.4", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -12061,9 +12061,9 @@ } }, "url-parse": { - "version": "1.4.7", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz", - "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz", + "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==", "dev": true, "requires": { "querystringify": "^2.1.1", diff --git a/admin-ui/package.json b/admin-ui/package.json index acd6732e0a0..357ebd4e5ed 100644 --- a/admin-ui/package.json +++ b/admin-ui/package.json @@ -1,6 +1,6 @@ { "name": "admin", - "version": "1.1.2", + "version": "1.1.4", "scripts": { "ng": "ng", "start": "ng serve", diff --git a/admin-ui/src/app/app-config.service.ts b/admin-ui/src/app/app-config.service.ts index 15062ce9be3..95725b846a8 100644 --- a/admin-ui/src/app/app-config.service.ts +++ b/admin-ui/src/app/app-config.service.ts @@ -12,6 +12,17 @@ export class AppConfigService { async loadAppConfig() { this.appConfig = await this.http.get('./assets/config.json').toPromise(); + if(this.appConfig.primaryLangCode){ + this.http.get(this.appConfig.baseUrl + 'masterdata/applicationconfigs').subscribe( + response => { + this.appConfig["primaryLangCode"]= response["response"]["primaryLangCode"]; + this.appConfig["secondaryLangCode"] = response["response"]["secondaryLangCode"]; + }, + error => { + console.log(error); + } + ); + } } getConfig() { diff --git a/admin-ui/src/app/app-routing.module.ts b/admin-ui/src/app/app-routing.module.ts index 641c3b31274..c27e906b19e 100644 --- a/admin-ui/src/app/app-routing.module.ts +++ b/admin-ui/src/app/app-routing.module.ts @@ -42,6 +42,13 @@ const routes: Routes = [ import('./features/bulkupload/bulkupload.module').then( m => m.BulkuploadModule ) + }, + { + path: 'keymanager', + loadChildren: () => + import('./features/keymanager/keymanager.module').then( + m => m.KeymanagerModule + ) } ], canActivateChild : [AuthguardService] , canActivate: [LanguageGuard] }, diff --git a/admin-ui/src/app/app.constants.ts b/admin-ui/src/app/app.constants.ts index 85923c57a84..048377e2761 100644 --- a/admin-ui/src/app/app.constants.ts +++ b/admin-ui/src/app/app.constants.ts @@ -63,7 +63,7 @@ export const navItems = [ route: '/admin/packet-status', children: null, auditEventId: 'ADM-008', - roles: ['ZONAL_ADMIN'] + roles: ['ZONAL_ADMIN', 'GLOBAL_ADMIN'] }, { displayName: 'menuItems.item3.title', @@ -83,13 +83,57 @@ export const navItems = [ icon: null, route: '/admin/bulkupload/masterdataupload', auditEventId: 'ADM-004', - roles: ['ZONAL_ADMIN', 'GLOBAL_ADMIN'] + roles: ['GLOBAL_ADMIN'] }, { displayName: 'menuItems.item5.subItem2', icon: null, route: '/admin/bulkupload/packetupload', auditEventId: 'ADM-005', + roles: ['GLOBAL_ADMIN'] + } + ], + auditEventId: 'ADM-003', + roles: ['GLOBAL_ADMIN'] + }, + { + displayName: 'menuItems.item6.title', + icon: 'assets/images/support.svg', + route: 'admin/keymanager', + children: [ + { + displayName: 'menuItems.item6.subItem1', + icon: null, + route: '/admin/keymanager/generatecsr', + auditEventId: 'ADM-004', + roles: ['ZONAL_ADMIN', 'GLOBAL_ADMIN'] + }, + { + displayName: 'menuItems.item6.subItem2', + icon: null, + route: '/admin/keymanager/generatemasterkey', + auditEventId: 'ADM-004', + roles: ['ZONAL_ADMIN', 'GLOBAL_ADMIN'] + }, + { + displayName: 'menuItems.item6.subItem3', + icon: null, + route: '/admin/keymanager/getcertificate', + auditEventId: 'ADM-004', + roles: ['ZONAL_ADMIN', 'GLOBAL_ADMIN'] + }, + { + displayName: 'menuItems.item6.subItem4', + icon: null, + route: '/admin/keymanager/uploadcertificate', + auditEventId: 'ADM-004', + roles: ['ZONAL_ADMIN', 'GLOBAL_ADMIN'] + }, + { + displayName: 'menuItems.item6.subItem5', + icon: null, + route: '/admin/keymanager/uploadotherdomaincertificate', + auditEventId: 'ADM-004', roles: ['ZONAL_ADMIN', 'GLOBAL_ADMIN'] } ], @@ -307,7 +351,7 @@ export const ListViewIdKeyMapping = { 'machine-type': { idKey: 'code', auditEventId: 'ADM-067' }, templates: { idKey: 'id', auditEventId: 'ADM-068' }, title: { idKey: 'code', auditEventId: 'ADM-069' }, - 'blacklisted-words': { idKey: 'word', auditEventId: 'ADM-070' }, + 'blacklisted-words': { idKey: 'word', auditEventId: 'ADM-070'}, 'document-type': { idKey: 'code', auditEventId: 'ADM-071' }, location: { idKey: 'postalCode', auditEventId: 'ADM-072' }, 'device-specs': { idKey: 'id', auditEventId: 'ADM-073' }, @@ -319,7 +363,8 @@ export const ListViewIdKeyMapping = { 'center-type': { idKey: 'code', auditEventId: 'ADM-079' }, holiday: { idKey: 'holidayId', auditEventId: 'ADM-080' }, masterdataupload : { idKey: 'transcationId', auditEventId: 'ADM-081' }, - packetupload : { idKey: 'transcationId', auditEventId: 'ADM-082' } + packetupload : { idKey: 'transcationId', auditEventId: 'ADM-082' }, + getcertificate : { idKey: 'applicationId', auditEventId: 'ADM-083' } }; diff --git a/admin-ui/src/app/core/models/filter-request.model.ts b/admin-ui/src/app/core/models/filter-request.model.ts index b5a258bcf69..1a9c88c9425 100644 --- a/admin-ui/src/app/core/models/filter-request.model.ts +++ b/admin-ui/src/app/core/models/filter-request.model.ts @@ -3,6 +3,7 @@ import { FilterModel } from './filter.model'; export class FilterRequest { constructor( public filters: FilterModel[], - public languageCode: string + public languageCode: string, + public optionalFilters: FilterModel[] ) {} } diff --git a/admin-ui/src/app/core/models/holiday-specs.model.ts b/admin-ui/src/app/core/models/holiday-specs.model.ts index 9dcec14d72f..faca595f3f4 100644 --- a/admin-ui/src/app/core/models/holiday-specs.model.ts +++ b/admin-ui/src/app/core/models/holiday-specs.model.ts @@ -7,6 +7,6 @@ export class HolidaySpecsModel { public locationCode: string, public langCode: string, public isActive?: boolean, - public id?: string + public holidayId?: string ) {} } \ No newline at end of file diff --git a/admin-ui/src/app/core/models/optional-filter-values.model.ts b/admin-ui/src/app/core/models/optional-filter-values.model.ts new file mode 100644 index 00000000000..2fe64bb3af0 --- /dev/null +++ b/admin-ui/src/app/core/models/optional-filter-values.model.ts @@ -0,0 +1,7 @@ +export class OptionalFilterValuesModel { + constructor( + public columnName: string, + public type: string, + public value?: string, + ) {} +} diff --git a/admin-ui/src/app/core/services/data-storage.service.ts b/admin-ui/src/app/core/services/data-storage.service.ts index c71a9c4a6f7..2122de1a1b1 100644 --- a/admin-ui/src/app/core/services/data-storage.service.ts +++ b/admin-ui/src/app/core/services/data-storage.service.ts @@ -24,7 +24,6 @@ export class DataStorageService { locationCode: string, langCode: string ): Observable { - console.log('getImmediateChildren>>>'); return this.http.get( this.BASE_URL + appConstants.MASTERDATA_BASE_URL + @@ -115,7 +114,6 @@ export class DataStorageService { type: string, data: RequestModel ): Observable { - console.log('getFiltersForAllMaterDataTypes>>>' + type + '<<>>' + data); return this.http.post( this.BASE_URL + appConstants.MASTERDATA_BASE_URL + type + '/filtervalues', data @@ -131,7 +129,6 @@ export class DataStorageService { } getZoneData(langCode: string): Observable { - console.log('getZoneData>>>'); return this.http.get( this.BASE_URL + appConstants.MASTERDATA_BASE_URL + diff --git a/admin-ui/src/app/core/services/keymanager.service.ts b/admin-ui/src/app/core/services/keymanager.service.ts new file mode 100644 index 00000000000..4e07e7def51 --- /dev/null +++ b/admin-ui/src/app/core/services/keymanager.service.ts @@ -0,0 +1,48 @@ +import { Injectable } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; +import { RequestModel } from '../models/request.model'; +import { Observable } from 'rxjs'; +import { AppConfigService } from 'src/app/app-config.service'; + +@Injectable({ + providedIn: 'root' +}) +export class KeymanagerService { + + constructor(private http: HttpClient, private appService: AppConfigService) { } + + private BASE_URL = this.appService.getConfig().baseUrl; + + getCertificate(request: RequestModel, applicationId : any, pageStart : any, pageFetch : any, referenceId : any): Observable { + return this.http.get(this.BASE_URL + 'keymanager' + '/getCertificate?applicationId='+applicationId+'&referenceId='+referenceId); + } + + + uploadOtherDomainCertificate(data: any): Observable { + return this.http.post( + this.BASE_URL + 'keymanager' + '/uploadOtherDomainCertificate', + data + ); + } + + uploadCertificate(data: any): Observable { + return this.http.post( + this.BASE_URL + 'keymanager' + '/uploadCertificate', + data + ); + } + + generateMasterkey(data: any, ObjectType : any): Observable { + return this.http.post( + this.BASE_URL + 'keymanager' + '/generateMasterKey' + '/' + ObjectType, + data + ); + } + + generateCSR(data: any): Observable { + return this.http.post( + this.BASE_URL + 'keymanager' + '/generateCSR', + data + ); + } +} diff --git a/admin-ui/src/app/core/side-menu/side-menu.component.html b/admin-ui/src/app/core/side-menu/side-menu.component.html index 0c449357a71..f0bbf00feeb 100644 --- a/admin-ui/src/app/core/side-menu/side-menu.component.html +++ b/admin-ui/src/app/core/side-menu/side-menu.component.html @@ -1,11 +1,10 @@
    -
  • - +
  • + Icon  {{ item?.displayName | translate }} - + + + + + + diff --git a/admin-ui/src/app/features/keymanager/getCertificate/view/view.component.scss b/admin-ui/src/app/features/keymanager/getCertificate/view/view.component.scss new file mode 100644 index 00000000000..a125b589e5e --- /dev/null +++ b/admin-ui/src/app/features/keymanager/getCertificate/view/view.component.scss @@ -0,0 +1,14 @@ +.mat-card{ + border-radius: 0; + padding: 0; + margin:0; + width: 100%; + margin-top:1rem; +} +.header { + display: block; + font-size: 13.5px !important; + font-weight: bold; + margin-top: 12px !important; + padding-bottom: 0px; + } \ No newline at end of file diff --git a/admin-ui/src/app/features/keymanager/getCertificate/view/view.component.spec.ts b/admin-ui/src/app/features/keymanager/getCertificate/view/view.component.spec.ts new file mode 100644 index 00000000000..6cc48d40f2f --- /dev/null +++ b/admin-ui/src/app/features/keymanager/getCertificate/view/view.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ViewComponent } from './view.component'; + +describe('ViewComponent', () => { + let component: ViewComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ViewComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ViewComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/admin-ui/src/app/features/keymanager/getCertificate/view/view.component.ts b/admin-ui/src/app/features/keymanager/getCertificate/view/view.component.ts new file mode 100644 index 00000000000..c3c7b16db2e --- /dev/null +++ b/admin-ui/src/app/features/keymanager/getCertificate/view/view.component.ts @@ -0,0 +1,145 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { KeymanagerService } from 'src/app/core/services/keymanager.service'; +import { RequestModel } from 'src/app/core/models/request.model'; +import { AppConfigService } from 'src/app/app-config.service'; +import { SortModel } from 'src/app/core/models/sort.model'; +import { PaginationModel } from 'src/app/core/models/pagination.model'; +import * as getCertificateConfig from 'src/assets/entity-spec/getcertificate.json'; +import { ActivatedRoute, Router, NavigationEnd } from '@angular/router'; +import Utils from '../../../../app.utils'; +import { DialogComponent } from 'src/app/shared/dialog/dialog.component'; +import { MatDialog } from '@angular/material'; +import { TranslateService } from '@ngx-translate/core'; +import { AuditService } from 'src/app/core/services/audit.service'; + +@Component({ + selector: 'app-view', + templateUrl: './view.component.html', + styleUrls: ['./view.component.scss'] +}) +export class ViewComponent implements OnInit, OnDestroy { + displayedColumns = []; + actionButtons = []; + actionEllipsis = []; + paginatorOptions: any; + sortFilter = []; + pagination = new PaginationModel(); + requestModel: RequestModel; + datas = []; + subscribed: any; + errorMessages: any; + noData = false; + filtersApplied = false; + + constructor( + private keymanagerService: KeymanagerService, + private appService: AppConfigService, + private activatedRoute: ActivatedRoute, + private router: Router, + public dialog: MatDialog, + private translateService: TranslateService, + private auditService: AuditService + ) { + this.getCertificateCofig(); + this.translateService.use(appService.getConfig().primaryLangCode); + this.translateService.getTranslation(appService.getConfig().primaryLangCode).subscribe(response => { + console.log(response); + this.errorMessages = response.errorPopup; + }); + this.subscribed = router.events.subscribe(event => { + if (event instanceof NavigationEnd) { + this.getCertificate(); + } + }); + } + + ngOnInit() { + this.auditService.audit(3, getCertificateConfig.auditEventIds[0], 'getCertificate'); + } + + getCertificateCofig() { + this.displayedColumns = getCertificateConfig.columnsToDisplay; + console.log(this.displayedColumns); + this.actionButtons = getCertificateConfig.actionButtons.filter( + value => value.showIn.toLowerCase() === 'ellipsis' + ); + this.actionEllipsis = getCertificateConfig.actionButtons.filter( + value => value.showIn.toLowerCase() === 'button' + ); + this.paginatorOptions = getCertificateConfig.paginator; + } + + /*pageEvent(event: any) { + const filters = Utils.convertFilter( + this.activatedRoute.snapshot.queryParams, + this.appService.getConfig().primaryLangCode + ); + filters.pagination.pageFetch = event.pageSize; + filters.pagination.pageStart = event.pageIndex; + const url = Utils.convertFilterToUrl(filters); + this.router.navigateByUrl(`admin/bulkupload/masterdataupload/view?${url}`); + } + + getSortColumn(event: SortModel) { + console.log(event); + this.sortFilter.forEach(element => { + if (element.sortField === event.sortField) { + const index = this.sortFilter.indexOf(element); + this.sortFilter.splice(index, 1); + } + }); + if (event.sortType != null) { + this.sortFilter.push(event); + } + console.log(this.sortFilter); + const filters = Utils.convertFilter( + this.activatedRoute.snapshot.queryParams, + this.appService.getConfig().primaryLangCode + ); + filters.sort = this.sortFilter; + const url = Utils.convertFilterToUrl(filters); + this.router.navigateByUrl('admin/bulkupload/masterdataupload/view?' + url); + }*/ + + getCertificate() { + this.datas = []; + this.noData = false; + this.filtersApplied = false; + const filters = Utils.convertFilter( + this.activatedRoute.snapshot.queryParams, + this.appService.getConfig().primaryLangCode + ); + if (filters.filters.length > 0) { + this.filtersApplied = true; + } + this.sortFilter = filters.sort; + if(this.sortFilter.length == 0){ + this.sortFilter.push({"sortType":"desc","sortField":"timeStamp"}); + } + this.requestModel = new RequestModel(null, null, filters); + console.log("filters>>>"+JSON.stringify(filters)); + console.log(JSON.stringify(this.requestModel)); + this.keymanagerService + .getCertificate(this.requestModel, "", filters.pagination.pageStart, filters.pagination.pageFetch, "") + .subscribe(({ response, errors }) => { + console.log("response>>>"+response); + if (response != null) { + this.paginatorOptions.totalEntries = response.totalItems; + this.paginatorOptions.pageIndex = filters.pagination.pageStart; + this.paginatorOptions.pageSize = filters.pagination.pageFetch; + console.log(this.paginatorOptions); + if (response.data !== null) { + this.datas = response.data ? [...response.data] : []; + } else { + this.noData = true; + } + } else { + this.noData = true; + } + }); + } + + ngOnDestroy() { + this.subscribed.unsubscribe(); + } +} diff --git a/admin-ui/src/app/features/keymanager/keymanager-routing.module.ts b/admin-ui/src/app/features/keymanager/keymanager-routing.module.ts new file mode 100644 index 00000000000..05d70881d79 --- /dev/null +++ b/admin-ui/src/app/features/keymanager/keymanager-routing.module.ts @@ -0,0 +1,18 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + + +const routes: Routes = [ + { path: '', redirectTo: 'generatecsr', pathMatch: 'full' }, + { path: 'generatecsr', loadChildren: () => import('../keymanager/generateCSR/generatecsr.module').then(m => m.GeneratecsrModule) }, + { path: 'generatemasterkey', loadChildren: () => import('../keymanager/generateMasterKey/generatemasterkey.module').then(m => m.GeneratemasterkeyModule) }, + { path: 'getcertificate', loadChildren: () => import('../keymanager/getCertificate/getcertificate.module').then(m => m.GetcertificateModule) }, + { path: 'uploadcertificate', loadChildren: () => import('../keymanager/uploadCertificate/uploadcertificate.module').then(m => m.UploadcertificateModule) }, + { path: 'uploadotherdomaincertificate', loadChildren: () => import('../keymanager/uploadOtherDomainCertificate/uploadotherdomaincertificate.module').then(m => m.UploadotherdomaincertificateModule) }, +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class KeymanagerRoutingModule { } diff --git a/admin-ui/src/app/features/keymanager/keymanager.module.ts b/admin-ui/src/app/features/keymanager/keymanager.module.ts new file mode 100644 index 00000000000..f51732663cd --- /dev/null +++ b/admin-ui/src/app/features/keymanager/keymanager.module.ts @@ -0,0 +1,16 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { KeymanagerRoutingModule } from './keymanager-routing.module'; +import { MaterialModule } from 'src/app/shared/material.module'; +import { I18nModule } from 'src/app/i18n.module'; + +@NgModule({ + imports: [ + CommonModule, + KeymanagerRoutingModule, + MaterialModule, + I18nModule, + ], + declarations: [] +}) +export class KeymanagerModule { } diff --git a/admin-ui/src/app/features/keymanager/uploadCertificate/create/create.component.css b/admin-ui/src/app/features/keymanager/uploadCertificate/create/create.component.css new file mode 100644 index 00000000000..07c769f8559 --- /dev/null +++ b/admin-ui/src/app/features/keymanager/uploadCertificate/create/create.component.css @@ -0,0 +1,45 @@ +/* No CSS *//*# sourceMappingURL=create.component.css.map */ + +.browseInput { + background: rgba(253, 81, 140, 1); + border: 1px solid rgba(253, 81, 140, 1); + color: white; + padding: 8px; + border-radius: 2px; +} + +.browseInput[disabled] { + border: 1px solid rgba(253, 81, 140, 0.35); + color: rgba(253, 81, 140, 0.35); +} + +.custom-file-input{ + display: inline-block; + overflow: hidden; + position: relative; + padding:10px; +} +.custom-file-input input[type="file"]{ + width: 100%; + height: 100%; + opacity: 0; + filter: alpha(opacity=0); + zoom: 1; /* Fix for IE7 */ + position: absolute; + top: 0; + left: 0; + z-index: 999; +} +.custom-file-input input[type="text"]{ + border-bottom: 1px solid rgba(0, 0, 0, 0.42) ! important; + border: 0px; + height: 32px; + margin-left: 1px; + width: 26.5rem; +} +.forms-container{ + width: 30%; +} +.mat-form-field{ + padding:10px; +} \ No newline at end of file diff --git a/admin-ui/src/app/features/keymanager/uploadCertificate/create/create.component.html b/admin-ui/src/app/features/keymanager/uploadCertificate/create/create.component.html new file mode 100644 index 00000000000..d3f123b851d --- /dev/null +++ b/admin-ui/src/app/features/keymanager/uploadCertificate/create/create.component.html @@ -0,0 +1,58 @@ +
    +
    +
    + +
    +
    + img +
    +
    +

    Upload Certificate

    +
    +
    +     +
    +
    + + +
    + + Application Id + + + {{ data.value}} + + + + + + +
    + + + +
    +
    +     + + + +     +
    +
    +
    diff --git a/admin-ui/src/app/features/keymanager/uploadCertificate/create/create.component.spec.ts b/admin-ui/src/app/features/keymanager/uploadCertificate/create/create.component.spec.ts new file mode 100644 index 00000000000..6413b6ac0c6 --- /dev/null +++ b/admin-ui/src/app/features/keymanager/uploadCertificate/create/create.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CreateComponent } from './create.component'; + +describe('CreateComponent', () => { + let component: CreateComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ CreateComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CreateComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/admin-ui/src/app/features/keymanager/uploadCertificate/create/create.component.ts b/admin-ui/src/app/features/keymanager/uploadCertificate/create/create.component.ts new file mode 100644 index 00000000000..d6fdc3a8fe0 --- /dev/null +++ b/admin-ui/src/app/features/keymanager/uploadCertificate/create/create.component.ts @@ -0,0 +1,149 @@ +import {Component, ViewEncapsulation} from '@angular/core'; +import { FormGroup, FormBuilder, Validators } from '@angular/forms'; +import { MatDialog } from '@angular/material/dialog'; +import { Location } from '@angular/common'; +import { Router, NavigationEnd } from '@angular/router'; +import { KeymanagerService } from 'src/app/core/services/keymanager.service'; +import { DialogComponent } from 'src/app/shared/dialog/dialog.component'; +import { RequestModel } from 'src/app/core/models/request.model'; + +@Component({ + selector: 'app-create', + templateUrl: './create.component.html', + styleUrls: ["./create.component.css"], + encapsulation: ViewEncapsulation.None +}) +export class CreateComponent { + + createForm: FormGroup; + dropDownValues = ["Insert","Update", "Delete"]; + applicationId = [{id:"PRE_REGISTRATION", value:"PRE_REGISTRATION 3years"}, {id:"REGISTRATION_PROCESSOR", value:"REGISTRATION_PROCESSOR 3years"}, {id:"REGISTRATION", value:"REGISTRATION 3years"}, {id:"IDA", value:"IDA 3years"}, {id:"ID_REPO", value:"ID_REPO 3years"}, {id:"KERNEL", value:"KERNEL 3years"}, {id:"ROOT", value:"ROOT 5years"}, {id:"PMS", value:"PMS 3years"}]; + subscribed: any; + fileName = ""; + fileData:any; + + constructor( + private keymanagerService: KeymanagerService, + private location: Location, + private formBuilder: FormBuilder, + private router: Router, + private dialog: MatDialog, + ) { + this.subscribed = router.events.subscribe(event => { + if (event instanceof NavigationEnd) { + this.initializeComponent(); + } + }); + } + + initializeComponent() { + this.initializeForm(); + } + + initializeForm() { + this.createForm = this.formBuilder.group({ + applicationId : [''], + referenceId: [''], + files: [''], + }); + } + + onFileSelect(event) { + let self = this; + if (event.target.files.length > 0) { + const file = event.target.files[0]; + self.createForm.get('files').setValue(file); + self.fileName = file.name; + + const fileReader: FileReader = new FileReader(); + + fileReader.onload = (event: Event) => { + self.fileData = fileReader.result; // This is valid + }; + + fileReader.readAsText(file); + + /*var reader = new FileReader(); + reader.onload = function(evt) { + if(evt.target.readyState != 2) return; + if(evt.target.error) { + alert('Error while reading file'); + return; + } + self.fileData = evt.target.result; + }; + reader.readAsText(file);*/ + } + } + + submit(){ + /*let data = {}; + data = { + case: 'CONFIRMATION', + title: "Confirm Bulk Master Data Upload", + message: "Bulk "+this.createForm.get('operation').value+" on "+this.createForm.get('tableName').value+" will be processed.\n Please ensure that all information is correct.\n\n\n Transaction will start once you click on confirm.", + yesBtnTxt: "CONFIRM", + noBtnTxt: "CANCEL" + }; + const dialogRef = this.dialog.open(DialogComponent, { + width: '450px', + data + }); + dialogRef.afterClosed().subscribe(response => { + if(response){*/ + this.saveData(); + /*} + }); */ + } + + saveData(){ + let self = this; + console.log("self.fileData>>>"+self.fileData); + const formData = {}; + formData['applicationId'] = self.createForm.get('applicationId').value; + formData['referenceId'] = self.createForm.get('referenceId').value; + formData['certificateData'] = self.fileData.replaceAll("\\n", "\n"); + const primaryRequest = new RequestModel( + "", + null, + formData + ); + self.keymanagerService.uploadCertificate(primaryRequest).subscribe(response => { + self.showMessage(response); + }); + } + + showMessage(response){ + let data = {}; + let self = this; + if(response.errors){ + data = { + case: 'MESSAGE', + title: "Failure !", + message: response.errors[0].message, + btnTxt: "DONE" + }; + }else{ + data = { + case: 'MESSAGE', + title: "Success", + message: response.response.status, + btnTxt: "DONE" + }; + } + console.log(); + const dialogRef = self.dialog.open(DialogComponent, { + width: '650px', + data + }); + dialogRef.afterClosed().subscribe(response => { + if(response.errors){ + }else{ + location.reload(); + } + }); + } + cancel() { + location.reload(); + } +} diff --git a/admin-ui/src/app/features/keymanager/uploadCertificate/uploadcertificate-routing.module.ts b/admin-ui/src/app/features/keymanager/uploadCertificate/uploadcertificate-routing.module.ts new file mode 100644 index 00000000000..65e4978719f --- /dev/null +++ b/admin-ui/src/app/features/keymanager/uploadCertificate/uploadcertificate-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; +import { CreateComponent } from './create/create.component'; +import { CanDeactivateGuardService } from 'src/app/core/services/can-deactivate-guard.service'; +import { RolesGuard } from 'src/app/core/services/roles.guard'; + + +const routes: Routes = [ + { path: '', redirectTo: 'create', pathMatch: 'full' }, + { path: 'create', component: CreateComponent, canDeactivate: [CanDeactivateGuardService] }, +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class UploadcertificateRoutingModule { } diff --git a/admin-ui/src/app/features/keymanager/uploadCertificate/uploadcertificate.module.ts b/admin-ui/src/app/features/keymanager/uploadCertificate/uploadcertificate.module.ts new file mode 100644 index 00000000000..5e5f08ffe51 --- /dev/null +++ b/admin-ui/src/app/features/keymanager/uploadCertificate/uploadcertificate.module.ts @@ -0,0 +1,26 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +import { CreateComponent } from './create/create.component'; +import { UploadcertificateRoutingModule } from './uploadcertificate-routing.module'; +import { SharedModule } from '../../../shared/shared.module'; +import { MaterialModule } from 'src/app/shared/material.module'; +import { I18nModule } from '../../../../app/i18n.module'; +import { ReactiveFormsModule, FormsModule } from '@angular/forms'; +import { MatKeyboardModule } from 'ngx7-material-keyboard'; + + +@NgModule({ + imports: [ + CommonModule, + UploadcertificateRoutingModule, + SharedModule, + MaterialModule, + I18nModule, + ReactiveFormsModule, + FormsModule, + MatKeyboardModule + ], + declarations: [CreateComponent] +}) +export class UploadcertificateModule { } diff --git a/admin-ui/src/app/features/keymanager/uploadOtherDomainCertificate/create/create.component.css b/admin-ui/src/app/features/keymanager/uploadOtherDomainCertificate/create/create.component.css new file mode 100644 index 00000000000..07c769f8559 --- /dev/null +++ b/admin-ui/src/app/features/keymanager/uploadOtherDomainCertificate/create/create.component.css @@ -0,0 +1,45 @@ +/* No CSS *//*# sourceMappingURL=create.component.css.map */ + +.browseInput { + background: rgba(253, 81, 140, 1); + border: 1px solid rgba(253, 81, 140, 1); + color: white; + padding: 8px; + border-radius: 2px; +} + +.browseInput[disabled] { + border: 1px solid rgba(253, 81, 140, 0.35); + color: rgba(253, 81, 140, 0.35); +} + +.custom-file-input{ + display: inline-block; + overflow: hidden; + position: relative; + padding:10px; +} +.custom-file-input input[type="file"]{ + width: 100%; + height: 100%; + opacity: 0; + filter: alpha(opacity=0); + zoom: 1; /* Fix for IE7 */ + position: absolute; + top: 0; + left: 0; + z-index: 999; +} +.custom-file-input input[type="text"]{ + border-bottom: 1px solid rgba(0, 0, 0, 0.42) ! important; + border: 0px; + height: 32px; + margin-left: 1px; + width: 26.5rem; +} +.forms-container{ + width: 30%; +} +.mat-form-field{ + padding:10px; +} \ No newline at end of file diff --git a/admin-ui/src/app/features/keymanager/uploadOtherDomainCertificate/create/create.component.html b/admin-ui/src/app/features/keymanager/uploadOtherDomainCertificate/create/create.component.html new file mode 100644 index 00000000000..d3f123b851d --- /dev/null +++ b/admin-ui/src/app/features/keymanager/uploadOtherDomainCertificate/create/create.component.html @@ -0,0 +1,58 @@ +
    +
    +
    + +
    +
    + img +
    +
    +

    Upload Certificate

    +
    +
    +     +
    +
    + + +
    + + Application Id + + + {{ data.value}} + + + + + + +
    + + + +
    +
    +     + + + +     +
    +
    +
    diff --git a/admin-ui/src/app/features/keymanager/uploadOtherDomainCertificate/create/create.component.spec.ts b/admin-ui/src/app/features/keymanager/uploadOtherDomainCertificate/create/create.component.spec.ts new file mode 100644 index 00000000000..6413b6ac0c6 --- /dev/null +++ b/admin-ui/src/app/features/keymanager/uploadOtherDomainCertificate/create/create.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CreateComponent } from './create.component'; + +describe('CreateComponent', () => { + let component: CreateComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ CreateComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CreateComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/admin-ui/src/app/features/keymanager/uploadOtherDomainCertificate/create/create.component.ts b/admin-ui/src/app/features/keymanager/uploadOtherDomainCertificate/create/create.component.ts new file mode 100644 index 00000000000..1ff425659fa --- /dev/null +++ b/admin-ui/src/app/features/keymanager/uploadOtherDomainCertificate/create/create.component.ts @@ -0,0 +1,148 @@ +import {Component, ViewEncapsulation} from '@angular/core'; +import { FormGroup, FormBuilder, Validators } from '@angular/forms'; +import { MatDialog } from '@angular/material/dialog'; +import { Location } from '@angular/common'; +import { Router, NavigationEnd } from '@angular/router'; +import { KeymanagerService } from 'src/app/core/services/keymanager.service'; +import { DialogComponent } from 'src/app/shared/dialog/dialog.component'; +import { RequestModel } from 'src/app/core/models/request.model'; + +@Component({ + selector: 'app-create', + templateUrl: './create.component.html', + styleUrls: ["./create.component.css"], + encapsulation: ViewEncapsulation.None +}) +export class CreateComponent { + + createForm: FormGroup; + dropDownValues = ["Insert","Update", "Delete"]; + applicationId = [{id:"PRE_REGISTRATION", value:"PRE_REGISTRATION 3years"}, {id:"REGISTRATION_PROCESSOR", value:"REGISTRATION_PROCESSOR 3years"}, {id:"REGISTRATION", value:"REGISTRATION 3years"}, {id:"IDA", value:"IDA 3years"}, {id:"ID_REPO", value:"ID_REPO 3years"}, {id:"KERNEL", value:"KERNEL 3years"}, {id:"ROOT", value:"ROOT 5years"}, {id:"PMS", value:"PMS 3years"}]; + subscribed: any; + fileName = ""; + fileData : any; + + constructor( + private keymanagerService: KeymanagerService, + private location: Location, + private formBuilder: FormBuilder, + private router: Router, + private dialog: MatDialog, + ) { + this.subscribed = router.events.subscribe(event => { + if (event instanceof NavigationEnd) { + this.initializeComponent(); + } + }); + } + + initializeComponent() { + this.initializeForm(); + } + + initializeForm() { + this.createForm = this.formBuilder.group({ + applicationId : [''], + referenceId: [''], + files: [''], + }); + } + + onFileSelect(event) { + let self = this; + if (event.target.files.length > 0) { + const file = event.target.files[0]; + self.createForm.get('files').setValue(file); + self.fileName = file.name; + + const fileReader: FileReader = new FileReader(); + + fileReader.onload = (event: Event) => { + self.fileData = fileReader.result; // This is valid + }; + + fileReader.readAsText(file); + + /*let reader = new FileReader(); + reader.onload = function(evt) { + if(evt.target.readyState != 2) return; + if(evt.target.error) { + alert('Error while reading file'); + return; + } + self.fileData = evt.target.result; + }; + reader.readAsText(file);*/ + } + } + + submit(){ + /*let data = {}; + data = { + case: 'CONFIRMATION', + title: "Confirm Bulk Master Data Upload", + message: "Bulk "+this.createForm.get('operation').value+" on "+this.createForm.get('tableName').value+" will be processed.\n Please ensure that all information is correct.\n\n\n Transaction will start once you click on confirm.", + yesBtnTxt: "CONFIRM", + noBtnTxt: "CANCEL" + }; + const dialogRef = this.dialog.open(DialogComponent, { + width: '450px', + data + }); + dialogRef.afterClosed().subscribe(response => { + if(response){*/ + this.saveData(); + /*} + }); */ + } + + saveData(){ + let self = this; + const formData = {}; + formData['applicationId'] = self.createForm.get('applicationId').value; + formData['referenceId'] = self.createForm.get('referenceId').value; + formData['certificateData'] = self.fileData.replaceAll("\\n", "\n"); + const primaryRequest = new RequestModel( + "", + null, + formData + ); + self.keymanagerService.uploadOtherDomainCertificate(primaryRequest).subscribe(response => { + self.showMessage(response); + }); + } + + showMessage(response){ + let data = {}; + let self = this; + if(response.errors){ + data = { + case: 'MESSAGE', + title: "Failure !", + message: response.errors[0].message, + btnTxt: "DONE" + }; + }else{ + data = { + case: 'MESSAGE', + title: "Success", + message: response.response.status, + btnTxt: "DONE" + }; + } + console.log(); + const dialogRef = self.dialog.open(DialogComponent, { + width: '650px', + data + }); + dialogRef.afterClosed().subscribe(response => { + if(response.errors){ + }else{ + location.reload(); + } + }); + } + cancel() { + location.reload(); + } +} diff --git a/admin-ui/src/app/features/keymanager/uploadOtherDomainCertificate/uploadotherdomaincertificate-routing.module.ts b/admin-ui/src/app/features/keymanager/uploadOtherDomainCertificate/uploadotherdomaincertificate-routing.module.ts new file mode 100644 index 00000000000..54a07e6d823 --- /dev/null +++ b/admin-ui/src/app/features/keymanager/uploadOtherDomainCertificate/uploadotherdomaincertificate-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; +import { CreateComponent } from './create/create.component'; +import { CanDeactivateGuardService } from 'src/app/core/services/can-deactivate-guard.service'; +import { RolesGuard } from 'src/app/core/services/roles.guard'; + + +const routes: Routes = [ + { path: '', redirectTo: 'create', pathMatch: 'full' }, + { path: 'create', component: CreateComponent, canDeactivate: [CanDeactivateGuardService] }, +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class UploadotherdomaincertificateRoutingModule { } diff --git a/admin-ui/src/app/features/keymanager/uploadOtherDomainCertificate/uploadotherdomaincertificate.module.ts b/admin-ui/src/app/features/keymanager/uploadOtherDomainCertificate/uploadotherdomaincertificate.module.ts new file mode 100644 index 00000000000..6e72ea120b8 --- /dev/null +++ b/admin-ui/src/app/features/keymanager/uploadOtherDomainCertificate/uploadotherdomaincertificate.module.ts @@ -0,0 +1,26 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +import { CreateComponent } from './create/create.component'; +import { UploadotherdomaincertificateRoutingModule } from './uploadotherdomaincertificate-routing.module'; +import { SharedModule } from '../../../shared/shared.module'; +import { MaterialModule } from 'src/app/shared/material.module'; +import { I18nModule } from '../../../../app/i18n.module'; +import { ReactiveFormsModule, FormsModule } from '@angular/forms'; +import { MatKeyboardModule } from 'ngx7-material-keyboard'; + + +@NgModule({ + imports: [ + CommonModule, + UploadotherdomaincertificateRoutingModule, + SharedModule, + MaterialModule, + I18nModule, + ReactiveFormsModule, + FormsModule, + MatKeyboardModule + ], + declarations: [CreateComponent] +}) +export class UploadotherdomaincertificateModule { } diff --git a/admin-ui/src/app/features/masterdata/list-view/list-view.component.ts b/admin-ui/src/app/features/masterdata/list-view/list-view.component.ts index 553ccdd1ffa..c89a2256e4e 100644 --- a/admin-ui/src/app/features/masterdata/list-view/list-view.component.ts +++ b/admin-ui/src/app/features/masterdata/list-view/list-view.component.ts @@ -174,6 +174,9 @@ export class ListViewComponent implements OnDestroy { this.filtersApplied = true; } this.sortFilter = filters.sort; + if(this.sortFilter.length == 0){ + this.sortFilter.push({"sortType":"desc","sortField":"createdDateTime"}); + } this.requestModel = new RequestModel(null, null, filters); console.log(JSON.stringify(this.requestModel)); this.dataStorageService diff --git a/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.html b/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.html index d4057a82879..be12679d08f 100644 --- a/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.html +++ b/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.html @@ -1,10 +1,10 @@
    - +
    {{'center.language' | translate }}
    -
    -
    +
    {{ languageNames[secondaryLang] }}
    + +
    + {{'center.language' | translate }} + keyboard +
    +

    + + + + {{ data.locationHierarchyName}} + + + +
    + +
    + {{ languageNames[secondaryLang] }} + keyboard +
    +

    + + + + {{ data.locationHierarchyName}} + + + +
    +
    -
    #end
    #if( $demographics.get(""fullName"") ) #end #if( $demographics.get(""fullName"") ) #end #if( $demographics.get(""dateOfBirth"") ) #end #if( $demographics.get(""dateOfBirth"") ) #end #if( $demographics.get(""gender"") ) #end #if( $demographics.get(""gender"") ) #end #if( $demographics.get(""phone"") ) #end #if( $demographics.get(""email"") ) #end #if( $demographics.get(""phone"") ) #end #if( $demographics.get(""email"") ) #end
    $demographics.get(""fullName"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""fullName"").get(""secondaryLabel"") #end
    $demographics.get(""fullName"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""fullName"").get(""secondaryValue"") #end
    $demographics.get(""dateOfBirth"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""dateOfBirth"").get(""secondaryLabel"") #end
    $demographics.get(""dateOfBirth"").get(""primaryValue"")
    $demographics.get(""gender"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""gender"").get(""secondaryLabel"") #end
    $demographics.get(""gender"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""gender"").get(""secondaryValue"") #end
    $demographics.get(""phone"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""phone"").get(""secondaryLabel"") #end$demographics.get(""email"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""email"").get(""secondaryLabel"") #end
    $demographics.get(""phone"").get(""primaryValue"")$demographics.get(""email"").get(""primaryValue"")
    #if( $demographics.get(""addressLine1"") )

    Address

    #end #if( $demographics.get(""addressLine1"") ) #end #if( $demographics.get(""addressLine2"") ) #end #if( $demographics.get(""addressLine3"") ) #end #if( $demographics.get(""addressLine1"") ) #end #if( $demographics.get(""addressLine2"") ) #end #if( $demographics.get(""addressLine3"") ) #end
    $demographics.get(""addressLine1"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""addressLine1"").get(""secondaryLabel"") #end$demographics.get(""addressLine2"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""addressLine2"").get(""secondaryLabel"") #end$demographics.get(""addressLine3"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""addressLine3"").get(""secondaryLabel"") #end
    $demographics.get(""addressLine1"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""addressLine1"").get(""secondaryValue"") #end$demographics.get(""addressLine2"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""addressLine2"").get(""secondaryValue"") #end$demographics.get(""addressLine3"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""addressLine3"").get(""secondaryValue"") #end
    #if( $demographics.get(""region"") ) #end #if( $demographics.get(""province"") ) #end #if( $demographics.get(""city"") ) #end #if( $demographics.get(""region"") ) #end #if( $demographics.get(""province"") ) #end #if( $demographics.get(""city"") ) #end
    $demographics.get(""region"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""region"").get(""secondaryLabel"") #end$demographics.get(""province"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""province"").get(""secondaryLabel"") #end$demographics.get(""city"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""city"").get(""secondaryLabel"") #end
    $demographics.get(""region"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""region"").get(""secondaryValue"") #end$demographics.get(""province"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""province"").get(""secondaryValue"") #end$demographics.get(""city"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""city"").get(""secondaryValue"") #end
    #if( $demographics.get(""zone"") ) #end #if( $demographics.get(""postalCode"") ) #end #if( $demographics.get(""zone"") ) #end #if( $demographics.get(""postalCode"") ) #end #if( $demographics.get(""modeOfClaim"") ) #end #if( $demographics.get(""modeOfClaim"") ) #end
    $demographics.get(""zone"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""zone"").get(""secondaryLabel"") #end$demographics.get(""postalCode"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""postalCode"").get(""secondaryLabel"") #end
    $demographics.get(""zone"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""zone"").get(""secondaryValue"") #end$demographics.get(""postalCode"").get(""primaryValue"")
    $demographics.get(""modeOfClaim"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""modeOfClaim"").get(""secondaryLabel"") #end
    $demographics.get(""modeOfClaim"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""modeOfClaim"").get(""secondaryValue"") #end
    #if( $demographics.get(""parentOrGuardianName"") )

    Gaurdian Details

    #if( $demographics.get(""parentOrGuardianRID"") ) #end #if( $demographics.get(""parentOrGuardianUIN"") ) #end #if( $demographics.get(""parentOrGuardianRID"") ) #end #if( $demographics.get(""parentOrGuardianUIN"") ) #end
    $demographics.get(""parentOrGuardianName"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""parentOrGuardianName"").get(""secondaryLabel"") #end $demographics.get(""parentOrGuardianRID"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""parentOrGuardianRID"").get(""secondaryLabel"") #end$demographics.get(""parentOrGuardianUIN"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""parentOrGuardianUIN"").get(""secondaryLabel"") #end
    $demographics.get(""parentOrGuardianName"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""parentOrGuardianName"").get(""secondaryValue"") #end$demographics.get(""parentOrGuardianRID"").get(""primaryValue"")$demographics.get(""parentOrGuardianUIN"").get(""primaryValue"")
    #end
    #if ( $ApplicantImageSource )

    ${PhotoPrim} #if( $secLangPresent ) /${PhotoSec} #end
    #end


    ${DocumentsPrimLabel} #if( $secLangPresent ) /${DocumentsSecLabel} #end

    #if($isPreview)
    #end
    #foreach( $key in $documents.keySet() ) #end

    $documents.get($key).get(""primaryLabel"") #if( $secLangPresent ) /$documents.get($key).get(""secondaryLabel"") #end


    $documents.get($key).get(""value"")

    ${BiometricsPrimLabel} #if( $secLangPresent ) /${BiometricsSecLabel} #end

    #if($isPreview)
    #end
    #foreach( $key in $biometrics.keySet() )
    $biometrics.get($key).get(""primaryLabel"") #if( $secLangPresent ) /$biometrics.get($key).get(""secondaryLabel"") #end

    Fingers ( $biometrics.get($key).get(""FingerCount"") ),Iris ( $biometrics.get($key).get(""IrisCount"") ),Face ( $biometrics.get($key).get(""FaceCount"") )
    #if( $biometrics.get($key).get(""CapturedLeftEye"") ) #end #if( $biometrics.get($key).get(""CapturedRightEye"") ) #end #if( $biometrics.get($key).get(""CapturedLeftEye"") ) #end #if( $biometrics.get($key).get(""CapturedRightEye"") ) #end

    ${LeftEyePrimLabel} #if( $secLangPresent ) /${LeftEyeSecLabel} #end

    ${RightEyePrimLabel} #if( $secLangPresent ) /${RightEyeSecLabel} #end

    #if( !$isPreview )
    $biometrics.get($key).get(""LeftEye"")
    #end #if( $isPreview && $biometrics.get($key).get(""CapturedLeftEye"") ) #end     		#if( !$isPreview )
    $biometrics.get($key).get(""RightEye"")
    #end
    #if( $biometrics.get($key).get(""CapturedLeftSlap"") ) #end #if( $biometrics.get($key).get(""CapturedRightSlap"") ) #end #if( $biometrics.get($key).get(""CapturedThumbs"") ) #end #if( $biometrics.get($key).get(""CapturedLeftSlap"") ) #end #if( $biometrics.get($key).get(""CapturedRightSlap"") ) #end #if( $biometrics.get($key).get(""CapturedThumbs"") ) #end

    ${LeftPalmPrimLabel} #if( $secLangPresent ) /${LeftPalmSecLabel} #end

    ${RightPalmPrimLabel} #if( $secLangPresent ) /${RightPalmSecLabel} #end

    ${ThumbsPrimLabel} #if( $secLangPresent ) /${ThumbsSecLabel} #end

    #if( !$isPreview )
    $biometrics.get($key).get(""leftLittle"")
    $biometrics.get($key).get(""leftRing"")
    $biometrics.get($key).get(""leftMiddle"")
    $biometrics.get($key).get(""leftIndex"")
    #end     		#if( !$isPreview )
    $biometrics.get($key).get(""rightIndex"")
    $biometrics.get($key).get(""rightMiddle"")
    $biometrics.get($key).get(""rightRing"")
    $biometrics.get($key).get(""rightLittle"")
    #end     		#if( !$isPreview )
    $biometrics.get($key).get(""leftThumb"")
    $biometrics.get($key).get(""rightThumb"")
    #end

    #if( $biometrics.get($key).get(""FaceImageSource"") ) #end #if( $biometrics.get($key).get(""subType"") == ""applicant"" && $ExceptionImageSource ) #end #if( $biometrics.get($key).get(""FaceImageSource"") ) #end #if( $biometrics.get($key).get(""subType"") == ""applicant"" && $ExceptionImageSource ) #end

    ${FacePrimLabel} #if( $secLangPresent ) /${FaceSecLabel} #end

    ${ExceptionPhotoPrimLabel} #if( $secLangPresent ) /${ExceptionPhotoSecLabel} #end

    #end

    ${RONamePrimLabel} #if( $secLangPresent ) /${RONameSecLabel} #end


    ${ROName}
    ${RONameSec}

    ${RegCenterPrimLabel} #if( $secLangPresent ) /${RegCenterSecLabel} #end


    ${RegCenter}
    ${RegCenterSec}

    ${ImportantGuidelines}

      #foreach( $line in $Guidelines )
    • ${line}
      • #end
    ",10005,Registration,reg-ack-template-part,eng,TRUE,superadmin,now() +1251,نموذج إقرار التسجيل,Acknowledgement generated after registration,txt,velocity,"
    #if ( !$isPreview && $QRCodeSource ) #end #if ( $UIN ) #end #if ( $isPreview && $PreRegID ) #end

    ${RIDPrimLabel} #if( $secLangPresent ) /${RIDSecLabel} #end


    ${RID}

    ${UINPrimLabel} #if( $secLangPresent ) /${UINSecLabel} #end


    ${UIN}

    ${PreRegIDPrimLabel} #if( $secLangPresent ) /${PreRegIDSecLabel} #end


    ${PreRegID}

    ${DatePrimLabel} #if( $secLangPresent ) /${DateSecLabel} #end


    ${Date}

    #if ( $name )

    ${NamePrimLabel} #if( $secLangPresent ) /${NameSecLabel} #end


    ${NamePrimValue} #if( $secLangPresent ) /${NameSecValue} #end
    #end

    ${DemographicInfo} #if( $secLangPresent ) /${DemographicInfoSecondary} #end

    #if ( $isPreview )
    #end
    #if( $demographics.get(""fullName"") ) #end #if( $demographics.get(""fullName"") ) #end #if( $demographics.get(""dateOfBirth"") ) #end #if( $demographics.get(""dateOfBirth"") ) #end #if( $demographics.get(""gender"") ) #end #if( $demographics.get(""gender"") ) #end #if( $demographics.get(""phone"") ) #end #if( $demographics.get(""email"") ) #end #if( $demographics.get(""phone"") ) #end #if( $demographics.get(""email"") ) #end
    $demographics.get(""fullName"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""fullName"").get(""secondaryLabel"") #end
    $demographics.get(""fullName"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""fullName"").get(""secondaryValue"") #end
    $demographics.get(""dateOfBirth"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""dateOfBirth"").get(""secondaryLabel"") #end
    $demographics.get(""dateOfBirth"").get(""primaryValue"")
    $demographics.get(""gender"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""gender"").get(""secondaryLabel"") #end
    $demographics.get(""gender"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""gender"").get(""secondaryValue"") #end
    $demographics.get(""phone"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""phone"").get(""secondaryLabel"") #end$demographics.get(""email"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""email"").get(""secondaryLabel"") #end
    $demographics.get(""phone"").get(""primaryValue"")$demographics.get(""email"").get(""primaryValue"")
    #if( $demographics.get(""addressLine1"") )

    Address

    #end #if( $demographics.get(""addressLine1"") ) #end #if( $demographics.get(""addressLine2"") ) #end #if( $demographics.get(""addressLine3"") ) #end #if( $demographics.get(""addressLine1"") ) #end #if( $demographics.get(""addressLine2"") ) #end #if( $demographics.get(""addressLine3"") ) #end
    $demographics.get(""addressLine1"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""addressLine1"").get(""secondaryLabel"") #end$demographics.get(""addressLine2"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""addressLine2"").get(""secondaryLabel"") #end$demographics.get(""addressLine3"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""addressLine3"").get(""secondaryLabel"") #end
    $demographics.get(""addressLine1"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""addressLine1"").get(""secondaryValue"") #end$demographics.get(""addressLine2"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""addressLine2"").get(""secondaryValue"") #end$demographics.get(""addressLine3"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""addressLine3"").get(""secondaryValue"") #end
    #if( $demographics.get(""region"") ) #end #if( $demographics.get(""province"") ) #end #if( $demographics.get(""city"") ) #end #if( $demographics.get(""region"") ) #end #if( $demographics.get(""province"") ) #end #if( $demographics.get(""city"") ) #end
    $demographics.get(""region"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""region"").get(""secondaryLabel"") #end$demographics.get(""province"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""province"").get(""secondaryLabel"") #end$demographics.get(""city"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""city"").get(""secondaryLabel"") #end
    $demographics.get(""region"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""region"").get(""secondaryValue"") #end$demographics.get(""province"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""province"").get(""secondaryValue"") #end$demographics.get(""city"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""city"").get(""secondaryValue"") #end
    #if( $demographics.get(""zone"") ) #end #if( $demographics.get(""postalCode"") ) #end #if( $demographics.get(""zone"") ) #end #if( $demographics.get(""postalCode"") ) #end #if( $demographics.get(""modeOfClaim"") ) #end #if( $demographics.get(""modeOfClaim"") ) #end
    $demographics.get(""zone"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""zone"").get(""secondaryLabel"") #end$demographics.get(""postalCode"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""postalCode"").get(""secondaryLabel"") #end
    $demographics.get(""zone"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""zone"").get(""secondaryValue"") #end$demographics.get(""postalCode"").get(""primaryValue"")
    $demographics.get(""modeOfClaim"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""modeOfClaim"").get(""secondaryLabel"") #end
    $demographics.get(""modeOfClaim"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""modeOfClaim"").get(""secondaryValue"") #end
    #if( $demographics.get(""parentOrGuardianName"") )

    Gaurdian Details

    #if( $demographics.get(""parentOrGuardianRID"") ) #end #if( $demographics.get(""parentOrGuardianUIN"") ) #end #if( $demographics.get(""parentOrGuardianRID"") ) #end #if( $demographics.get(""parentOrGuardianUIN"") ) #end
    $demographics.get(""parentOrGuardianName"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""parentOrGuardianName"").get(""secondaryLabel"") #end $demographics.get(""parentOrGuardianRID"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""parentOrGuardianRID"").get(""secondaryLabel"") #end$demographics.get(""parentOrGuardianUIN"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""parentOrGuardianUIN"").get(""secondaryLabel"") #end
    $demographics.get(""parentOrGuardianName"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""parentOrGuardianName"").get(""secondaryValue"") #end$demographics.get(""parentOrGuardianRID"").get(""primaryValue"")$demographics.get(""parentOrGuardianUIN"").get(""primaryValue"")
    #end
    #if ( $ApplicantImageSource )

    ${PhotoPrim} #if( $secLangPresent ) /${PhotoSec} #end
    #end


    ${DocumentsPrimLabel} #if( $secLangPresent ) /${DocumentsSecLabel} #end

    #if($isPreview)
    #end
    #foreach( $key in $documents.keySet() ) #end

    $documents.get($key).get(""primaryLabel"") #if( $secLangPresent ) /$documents.get($key).get(""secondaryLabel"") #end


    $documents.get($key).get(""value"")

    ${BiometricsPrimLabel} #if( $secLangPresent ) /${BiometricsSecLabel} #end

    #if($isPreview)
    #end
    #foreach( $key in $biometrics.keySet() )
    $biometrics.get($key).get(""primaryLabel"") #if( $secLangPresent ) /$biometrics.get($key).get(""secondaryLabel"") #end

    Fingers ( $biometrics.get($key).get(""FingerCount"") ),Iris ( $biometrics.get($key).get(""IrisCount"") ),Face ( $biometrics.get($key).get(""FaceCount"") )
    #if( $biometrics.get($key).get(""CapturedLeftEye"") ) #end #if( $biometrics.get($key).get(""CapturedRightEye"") ) #end #if( $biometrics.get($key).get(""CapturedLeftEye"") ) #end #if( $biometrics.get($key).get(""CapturedRightEye"") ) #end

    ${LeftEyePrimLabel} #if( $secLangPresent ) /${LeftEyeSecLabel} #end

    ${RightEyePrimLabel} #if( $secLangPresent ) /${RightEyeSecLabel} #end

    #if( !$isPreview )
    $biometrics.get($key).get(""LeftEye"")
    #end #if( $isPreview && $biometrics.get($key).get(""CapturedLeftEye"") ) #end     		#if( !$isPreview )
    $biometrics.get($key).get(""RightEye"")
    #end
    #if( $biometrics.get($key).get(""CapturedLeftSlap"") ) #end #if( $biometrics.get($key).get(""CapturedRightSlap"") ) #end #if( $biometrics.get($key).get(""CapturedThumbs"") ) #end #if( $biometrics.get($key).get(""CapturedLeftSlap"") ) #end #if( $biometrics.get($key).get(""CapturedRightSlap"") ) #end #if( $biometrics.get($key).get(""CapturedThumbs"") ) #end

    ${LeftPalmPrimLabel} #if( $secLangPresent ) /${LeftPalmSecLabel} #end

    ${RightPalmPrimLabel} #if( $secLangPresent ) /${RightPalmSecLabel} #end

    ${ThumbsPrimLabel} #if( $secLangPresent ) /${ThumbsSecLabel} #end

    #if( !$isPreview )
    $biometrics.get($key).get(""leftLittle"")
    $biometrics.get($key).get(""leftRing"")
    $biometrics.get($key).get(""leftMiddle"")
    $biometrics.get($key).get(""leftIndex"")
    #end     		#if( !$isPreview )
    $biometrics.get($key).get(""rightIndex"")
    $biometrics.get($key).get(""rightMiddle"")
    $biometrics.get($key).get(""rightRing"")
    $biometrics.get($key).get(""rightLittle"")
    #end     		#if( !$isPreview )
    $biometrics.get($key).get(""leftThumb"")
    $biometrics.get($key).get(""rightThumb"")
    #end

    #if( $biometrics.get($key).get(""FaceImageSource"") ) #end #if( $biometrics.get($key).get(""subType"") == ""applicant"" && $ExceptionImageSource ) #end #if( $biometrics.get($key).get(""FaceImageSource"") ) #end #if( $biometrics.get($key).get(""subType"") == ""applicant"" && $ExceptionImageSource ) #end

    ${FacePrimLabel} #if( $secLangPresent ) /${FaceSecLabel} #end

    ${ExceptionPhotoPrimLabel} #if( $secLangPresent ) /${ExceptionPhotoSecLabel} #end

    #end

    ${RONamePrimLabel} #if( $secLangPresent ) /${RONameSecLabel} #end


    ${ROName}
    ${RONameSec}

    ${RegCenterPrimLabel} #if( $secLangPresent ) /${RegCenterSecLabel} #end


    ${RegCenter}
    ${RegCenterSec}

    ${ImportantGuidelines}

      #foreach( $line in $Guidelines )
    • ${line}
      • #end
    ",10005,Registration,reg-ack-template-part,ara,TRUE,superadmin,now() +1252,Modèle d'accusé de réception d'inscription,Acknowledgement generated after registration,txt,velocity,"
    #if ( !$isPreview && $QRCodeSource ) #end #if ( $UIN ) #end #if ( $isPreview && $PreRegID ) #end

    ${RIDPrimLabel} #if( $secLangPresent ) /${RIDSecLabel} #end


    ${RID}

    ${UINPrimLabel} #if( $secLangPresent ) /${UINSecLabel} #end


    ${UIN}

    ${PreRegIDPrimLabel} #if( $secLangPresent ) /${PreRegIDSecLabel} #end


    ${PreRegID}

    ${DatePrimLabel} #if( $secLangPresent ) /${DateSecLabel} #end


    ${Date}

    #if ( $name )

    ${NamePrimLabel} #if( $secLangPresent ) /${NameSecLabel} #end


    ${NamePrimValue} #if( $secLangPresent ) /${NameSecValue} #end
    #end

    ${DemographicInfo} #if( $secLangPresent ) /${DemographicInfoSecondary} #end

    #if ( $isPreview )
    #end
    #if( $demographics.get(""fullName"") ) #end #if( $demographics.get(""fullName"") ) #end #if( $demographics.get(""dateOfBirth"") ) #end #if( $demographics.get(""dateOfBirth"") ) #end #if( $demographics.get(""gender"") ) #end #if( $demographics.get(""gender"") ) #end #if( $demographics.get(""phone"") ) #end #if( $demographics.get(""email"") ) #end #if( $demographics.get(""phone"") ) #end #if( $demographics.get(""email"") ) #end
    $demographics.get(""fullName"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""fullName"").get(""secondaryLabel"") #end
    $demographics.get(""fullName"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""fullName"").get(""secondaryValue"") #end
    $demographics.get(""dateOfBirth"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""dateOfBirth"").get(""secondaryLabel"") #end
    $demographics.get(""dateOfBirth"").get(""primaryValue"")
    $demographics.get(""gender"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""gender"").get(""secondaryLabel"") #end
    $demographics.get(""gender"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""gender"").get(""secondaryValue"") #end
    $demographics.get(""phone"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""phone"").get(""secondaryLabel"") #end$demographics.get(""email"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""email"").get(""secondaryLabel"") #end
    $demographics.get(""phone"").get(""primaryValue"")$demographics.get(""email"").get(""primaryValue"")
    #if( $demographics.get(""addressLine1"") )

    Address

    #end #if( $demographics.get(""addressLine1"") ) #end #if( $demographics.get(""addressLine2"") ) #end #if( $demographics.get(""addressLine3"") ) #end #if( $demographics.get(""addressLine1"") ) #end #if( $demographics.get(""addressLine2"") ) #end #if( $demographics.get(""addressLine3"") ) #end
    $demographics.get(""addressLine1"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""addressLine1"").get(""secondaryLabel"") #end$demographics.get(""addressLine2"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""addressLine2"").get(""secondaryLabel"") #end$demographics.get(""addressLine3"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""addressLine3"").get(""secondaryLabel"") #end
    $demographics.get(""addressLine1"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""addressLine1"").get(""secondaryValue"") #end$demographics.get(""addressLine2"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""addressLine2"").get(""secondaryValue"") #end$demographics.get(""addressLine3"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""addressLine3"").get(""secondaryValue"") #end
    #if( $demographics.get(""region"") ) #end #if( $demographics.get(""province"") ) #end #if( $demographics.get(""city"") ) #end #if( $demographics.get(""region"") ) #end #if( $demographics.get(""province"") ) #end #if( $demographics.get(""city"") ) #end
    $demographics.get(""region"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""region"").get(""secondaryLabel"") #end$demographics.get(""province"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""province"").get(""secondaryLabel"") #end$demographics.get(""city"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""city"").get(""secondaryLabel"") #end
    $demographics.get(""region"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""region"").get(""secondaryValue"") #end$demographics.get(""province"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""province"").get(""secondaryValue"") #end$demographics.get(""city"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""city"").get(""secondaryValue"") #end
    #if( $demographics.get(""zone"") ) #end #if( $demographics.get(""postalCode"") ) #end #if( $demographics.get(""zone"") ) #end #if( $demographics.get(""postalCode"") ) #end #if( $demographics.get(""modeOfClaim"") ) #end #if( $demographics.get(""modeOfClaim"") ) #end
    $demographics.get(""zone"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""zone"").get(""secondaryLabel"") #end$demographics.get(""postalCode"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""postalCode"").get(""secondaryLabel"") #end
    $demographics.get(""zone"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""zone"").get(""secondaryValue"") #end$demographics.get(""postalCode"").get(""primaryValue"")
    $demographics.get(""modeOfClaim"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""modeOfClaim"").get(""secondaryLabel"") #end
    $demographics.get(""modeOfClaim"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""modeOfClaim"").get(""secondaryValue"") #end
    #if( $demographics.get(""parentOrGuardianName"") )

    Gaurdian Details

    #if( $demographics.get(""parentOrGuardianRID"") ) #end #if( $demographics.get(""parentOrGuardianUIN"") ) #end #if( $demographics.get(""parentOrGuardianRID"") ) #end #if( $demographics.get(""parentOrGuardianUIN"") ) #end
    $demographics.get(""parentOrGuardianName"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""parentOrGuardianName"").get(""secondaryLabel"") #end $demographics.get(""parentOrGuardianRID"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""parentOrGuardianRID"").get(""secondaryLabel"") #end$demographics.get(""parentOrGuardianUIN"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""parentOrGuardianUIN"").get(""secondaryLabel"") #end
    $demographics.get(""parentOrGuardianName"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""parentOrGuardianName"").get(""secondaryValue"") #end$demographics.get(""parentOrGuardianRID"").get(""primaryValue"")$demographics.get(""parentOrGuardianUIN"").get(""primaryValue"")
    #end
    #if ( $ApplicantImageSource )

    ${PhotoPrim} #if( $secLangPresent ) /${PhotoSec} #end
    #end


    ${DocumentsPrimLabel} #if( $secLangPresent ) /${DocumentsSecLabel} #end

    #if($isPreview)
    #end
    #foreach( $key in $documents.keySet() ) #end

    $documents.get($key).get(""primaryLabel"") #if( $secLangPresent ) /$documents.get($key).get(""secondaryLabel"") #end


    $documents.get($key).get(""value"")

    ${BiometricsPrimLabel} #if( $secLangPresent ) /${BiometricsSecLabel} #end

    #if($isPreview)
    #end
    #foreach( $key in $biometrics.keySet() )
    $biometrics.get($key).get(""primaryLabel"") #if( $secLangPresent ) /$biometrics.get($key).get(""secondaryLabel"") #end

    Fingers ( $biometrics.get($key).get(""FingerCount"") ),Iris ( $biometrics.get($key).get(""IrisCount"") ),Face ( $biometrics.get($key).get(""FaceCount"") )
    #if( $biometrics.get($key).get(""CapturedLeftEye"") ) #end #if( $biometrics.get($key).get(""CapturedRightEye"") ) #end #if( $biometrics.get($key).get(""CapturedLeftEye"") ) #end #if( $biometrics.get($key).get(""CapturedRightEye"") ) #end

    ${LeftEyePrimLabel} #if( $secLangPresent ) /${LeftEyeSecLabel} #end

    ${RightEyePrimLabel} #if( $secLangPresent ) /${RightEyeSecLabel} #end

    #if( !$isPreview )
    $biometrics.get($key).get(""LeftEye"")
    #end #if( $isPreview && $biometrics.get($key).get(""CapturedLeftEye"") ) #end     		#if( !$isPreview )
    $biometrics.get($key).get(""RightEye"")
    #end
    #if( $biometrics.get($key).get(""CapturedLeftSlap"") ) #end #if( $biometrics.get($key).get(""CapturedRightSlap"") ) #end #if( $biometrics.get($key).get(""CapturedThumbs"") ) #end #if( $biometrics.get($key).get(""CapturedLeftSlap"") ) #end #if( $biometrics.get($key).get(""CapturedRightSlap"") ) #end #if( $biometrics.get($key).get(""CapturedThumbs"") ) #end

    ${LeftPalmPrimLabel} #if( $secLangPresent ) /${LeftPalmSecLabel} #end

    ${RightPalmPrimLabel} #if( $secLangPresent ) /${RightPalmSecLabel} #end

    ${ThumbsPrimLabel} #if( $secLangPresent ) /${ThumbsSecLabel} #end

    #if( !$isPreview )
    $biometrics.get($key).get(""leftLittle"")
    $biometrics.get($key).get(""leftRing"")
    $biometrics.get($key).get(""leftMiddle"")
    $biometrics.get($key).get(""leftIndex"")
    #end     		#if( !$isPreview )
    $biometrics.get($key).get(""rightIndex"")
    $biometrics.get($key).get(""rightMiddle"")
    $biometrics.get($key).get(""rightRing"")
    $biometrics.get($key).get(""rightLittle"")
    #end     		#if( !$isPreview )
    $biometrics.get($key).get(""leftThumb"")
    $biometrics.get($key).get(""rightThumb"")
    #end

    #if( $biometrics.get($key).get(""FaceImageSource"") ) #end #if( $biometrics.get($key).get(""subType"") == ""applicant"" && $ExceptionImageSource ) #end #if( $biometrics.get($key).get(""FaceImageSource"") ) #end #if( $biometrics.get($key).get(""subType"") == ""applicant"" && $ExceptionImageSource ) #end

    ${FacePrimLabel} #if( $secLangPresent ) /${FaceSecLabel} #end

    ${ExceptionPhotoPrimLabel} #if( $secLangPresent ) /${ExceptionPhotoSecLabel} #end

    #end

    ${RONamePrimLabel} #if( $secLangPresent ) /${RONameSecLabel} #end


    ${ROName}
    ${RONameSec}

    ${RegCenterPrimLabel} #if( $secLangPresent ) /${RegCenterSecLabel} #end


    ${RegCenter}
    ${RegCenterSec}

    ${ImportantGuidelines}

      #foreach( $line in $Guidelines )
    • ${line}
      • #end
    ",10005,Registration,reg-ack-template-part,fra,TRUE,superadmin,now() +1253,Registration Preview Template,Preview generated after registration,txt,velocity,"
    #if ( $UIN ) #end #if ( $PreRegID ) #end

    ${RIDPrimLabel} #if( $secLangPresent ) /${RIDSecLabel} #end


    ${RID}

    ${UINPrimLabel} #if( $secLangPresent ) /${UINSecLabel} #end


    ${UIN}

    ${PreRegIDPrimLabel} #if( $secLangPresent ) /${PreRegIDSecLabel} #end


    ${PreRegID}

    ${DatePrimLabel} #if( $secLangPresent ) /${DateSecLabel} #end


    ${Date}

    #if ( $name )

    ${NamePrimLabel} #if( $secLangPresent ) /${NameSecLabel} #end


    ${NamePrimValue} #if( $secLangPresent ) /${NameSecValue} #end
    #end

    ${DemographicInfo} #if( $secLangPresent ) /${DemographicInfoSecondary} #end

    #if( $demographics.get(""fullName"") ) #end #if( $demographics.get(""fullName"") ) #end #if( $demographics.get(""dateOfBirth"") ) #end #if( $demographics.get(""dateOfBirth"") ) #end #if( $demographics.get(""gender"") ) #end #if( $demographics.get(""gender"") ) #end #if( $demographics.get(""phone"") ) #end #if( $demographics.get(""email"") ) #end #if( $demographics.get(""phone"") ) #end #if( $demographics.get(""email"") ) #end
    $demographics.get(""fullName"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""fullName"").get(""secondaryLabel"") #end
    $demographics.get(""fullName"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""fullName"").get(""secondaryValue"") #end
    $demographics.get(""dateOfBirth"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""dateOfBirth"").get(""secondaryLabel"") #end
    $demographics.get(""dateOfBirth"").get(""primaryValue"")
    $demographics.get(""gender"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""gender"").get(""secondaryLabel"") #end
    $demographics.get(""gender"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""gender"").get(""secondaryValue"") #end
    $demographics.get(""phone"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""phone"").get(""secondaryLabel"") #end$demographics.get(""email"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""email"").get(""secondaryLabel"") #end
    $demographics.get(""phone"").get(""primaryValue"")$demographics.get(""email"").get(""primaryValue"")
    #if( $demographics.get(""addressLine1"") )

    Address

    #end #if( $demographics.get(""addressLine1"") ) #end #if( $demographics.get(""addressLine2"") ) #end #if( $demographics.get(""addressLine3"") ) #end #if( $demographics.get(""addressLine1"") ) #end #if( $demographics.get(""addressLine2"") ) #end #if( $demographics.get(""addressLine3"") ) #end
    $demographics.get(""addressLine1"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""addressLine1"").get(""secondaryLabel"") #end$demographics.get(""addressLine2"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""addressLine2"").get(""secondaryLabel"") #end$demographics.get(""addressLine3"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""addressLine3"").get(""secondaryLabel"") #end
    $demographics.get(""addressLine1"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""addressLine1"").get(""secondaryValue"") #end$demographics.get(""addressLine2"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""addressLine2"").get(""secondaryValue"") #end$demographics.get(""addressLine3"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""addressLine3"").get(""secondaryValue"") #end
    #if( $demographics.get(""region"") ) #end #if( $demographics.get(""province"") ) #end #if( $demographics.get(""city"") ) #end #if( $demographics.get(""region"") ) #end #if( $demographics.get(""province"") ) #end #if( $demographics.get(""city"") ) #end
    $demographics.get(""region"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""region"").get(""secondaryLabel"") #end$demographics.get(""province"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""province"").get(""secondaryLabel"") #end$demographics.get(""city"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""city"").get(""secondaryLabel"") #end
    $demographics.get(""region"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""region"").get(""secondaryValue"") #end$demographics.get(""province"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""province"").get(""secondaryValue"") #end$demographics.get(""city"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""city"").get(""secondaryValue"") #end
    #if( $demographics.get(""zone"") ) #end #if( $demographics.get(""postalCode"") ) #end #if( $demographics.get(""zone"") ) #end #if( $demographics.get(""postalCode"") ) #end #if( $demographics.get(""modeOfClaim"") ) #end #if( $demographics.get(""modeOfClaim"") ) #end
    $demographics.get(""zone"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""zone"").get(""secondaryLabel"") #end$demographics.get(""postalCode"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""postalCode"").get(""secondaryLabel"") #end
    $demographics.get(""zone"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""zone"").get(""secondaryValue"") #end$demographics.get(""postalCode"").get(""primaryValue"")
    $demographics.get(""modeOfClaim"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""modeOfClaim"").get(""secondaryLabel"") #end
    $demographics.get(""modeOfClaim"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""modeOfClaim"").get(""secondaryValue"") #end
    #if( $demographics.get(""parentOrGuardianName"") )

    Gaurdian Details

    #if( $demographics.get(""parentOrGuardianRID"") ) #end #if( $demographics.get(""parentOrGuardianUIN"") ) #end #if( $demographics.get(""parentOrGuardianRID"") ) #end #if( $demographics.get(""parentOrGuardianUIN"") ) #end
    $demographics.get(""parentOrGuardianName"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""parentOrGuardianName"").get(""secondaryLabel"") #end $demographics.get(""parentOrGuardianRID"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""parentOrGuardianRID"").get(""secondaryLabel"") #end$demographics.get(""parentOrGuardianUIN"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""parentOrGuardianUIN"").get(""secondaryLabel"") #end
    $demographics.get(""parentOrGuardianName"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""parentOrGuardianName"").get(""secondaryValue"") #end$demographics.get(""parentOrGuardianRID"").get(""primaryValue"")$demographics.get(""parentOrGuardianUIN"").get(""primaryValue"")
    #end
    #if ( $ApplicantImageSource )

    ${PhotoPrim} #if( $secLangPresent ) /${PhotoSec} #end
    #end


    ${DocumentsPrimLabel} #if( $secLangPresent ) /${DocumentsSecLabel} #end

    #foreach( $key in $documents.keySet() ) #end

    $documents.get($key).get(""primaryLabel"") #if( $secLangPresent ) /$documents.get($key).get(""secondaryLabel"") #end


    $documents.get($key).get(""value"")

    ${BiometricsPrimLabel} #if( $secLangPresent ) /${BiometricsSecLabel} #end

    #foreach( $key in $biometrics.keySet() )
    $biometrics.get($key).get(""primaryLabel"") #if( $secLangPresent ) /$biometrics.get($key).get(""secondaryLabel"") #end

    Fingers ( $biometrics.get($key).get(""FingerCount"") ),Iris ( $biometrics.get($key).get(""IrisCount"") ),Face ( $biometrics.get($key).get(""FaceCount"") )
    #if( $biometrics.get($key).get(""CapturedLeftEye"") ) #end #if( $biometrics.get($key).get(""CapturedRightEye"") ) #end #if( $biometrics.get($key).get(""CapturedLeftEye"") ) #end #if( $biometrics.get($key).get(""CapturedRightEye"") ) #end

    ${LeftEyePrimLabel} #if( $secLangPresent ) /${LeftEyeSecLabel} #end

    ${RightEyePrimLabel} #if( $secLangPresent ) /${RightEyeSecLabel} #end

    #if( $biometrics.get($key).get(""CapturedLeftEye"") ) #end #if( $biometrics.get($key).get(""CapturedRightEye"") ) #end
    #if( $biometrics.get($key).get(""CapturedLeftSlap"") ) #end #if( $biometrics.get($key).get(""CapturedRightSlap"") ) #end #if( $biometrics.get($key).get(""CapturedThumbs"") ) #end #if( $biometrics.get($key).get(""CapturedLeftSlap"") ) #end #if( $biometrics.get($key).get(""CapturedRightSlap"") ) #end #if( $biometrics.get($key).get(""CapturedThumbs"") ) #end

    ${LeftPalmPrimLabel} #if( $secLangPresent ) /${LeftPalmSecLabel} #end

    ${RightPalmPrimLabel} #if( $secLangPresent ) /${RightPalmSecLabel} #end

    ${ThumbsPrimLabel} #if( $secLangPresent ) /${ThumbsSecLabel} #end


    #if( $biometrics.get($key).get(""FaceImageSource"") ) #end #if( $biometrics.get($key).get(""subType"") == ""applicant"" && $ExceptionImageSource ) #end #if( $biometrics.get($key).get(""FaceImageSource"") ) #end #if( $biometrics.get($key).get(""subType"") == ""applicant"" && $ExceptionImageSource ) #end

    ${FacePrimLabel} #if( $secLangPresent ) /${FaceSecLabel} #end

    ${ExceptionPhotoPrimLabel} #if( $secLangPresent ) /${ExceptionPhotoSecLabel} #end

    #end

    ${Consent}

    ",10005,Registration,reg-preview-template-part,eng,TRUE,superadmin,now() +1254,نموذج معاينة التسجيل,Preview generated after registration,txt,velocity,"
    #if ( $UIN ) #end #if ( $PreRegID ) #end

    ${RIDPrimLabel} #if( $secLangPresent ) /${RIDSecLabel} #end


    ${RID}

    ${UINPrimLabel} #if( $secLangPresent ) /${UINSecLabel} #end


    ${UIN}

    ${PreRegIDPrimLabel} #if( $secLangPresent ) /${PreRegIDSecLabel} #end


    ${PreRegID}

    ${DatePrimLabel} #if( $secLangPresent ) /${DateSecLabel} #end


    ${Date}

    #if ( $name )

    ${NamePrimLabel} #if( $secLangPresent ) /${NameSecLabel} #end


    ${NamePrimValue} #if( $secLangPresent ) /${NameSecValue} #end
    #end

    ${DemographicInfo} #if( $secLangPresent ) /${DemographicInfoSecondary} #end

    #if( $demographics.get(""fullName"") ) #end #if( $demographics.get(""fullName"") ) #end #if( $demographics.get(""dateOfBirth"") ) #end #if( $demographics.get(""dateOfBirth"") ) #end #if( $demographics.get(""gender"") ) #end #if( $demographics.get(""gender"") ) #end #if( $demographics.get(""phone"") ) #end #if( $demographics.get(""email"") ) #end #if( $demographics.get(""phone"") ) #end #if( $demographics.get(""email"") ) #end
    $demographics.get(""fullName"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""fullName"").get(""secondaryLabel"") #end
    $demographics.get(""fullName"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""fullName"").get(""secondaryValue"") #end
    $demographics.get(""dateOfBirth"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""dateOfBirth"").get(""secondaryLabel"") #end
    $demographics.get(""dateOfBirth"").get(""primaryValue"")
    $demographics.get(""gender"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""gender"").get(""secondaryLabel"") #end
    $demographics.get(""gender"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""gender"").get(""secondaryValue"") #end
    $demographics.get(""phone"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""phone"").get(""secondaryLabel"") #end$demographics.get(""email"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""email"").get(""secondaryLabel"") #end
    $demographics.get(""phone"").get(""primaryValue"")$demographics.get(""email"").get(""primaryValue"")
    #if( $demographics.get(""addressLine1"") )

    Address

    #end #if( $demographics.get(""addressLine1"") ) #end #if( $demographics.get(""addressLine2"") ) #end #if( $demographics.get(""addressLine3"") ) #end #if( $demographics.get(""addressLine1"") ) #end #if( $demographics.get(""addressLine2"") ) #end #if( $demographics.get(""addressLine3"") ) #end
    $demographics.get(""addressLine1"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""addressLine1"").get(""secondaryLabel"") #end$demographics.get(""addressLine2"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""addressLine2"").get(""secondaryLabel"") #end$demographics.get(""addressLine3"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""addressLine3"").get(""secondaryLabel"") #end
    $demographics.get(""addressLine1"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""addressLine1"").get(""secondaryValue"") #end$demographics.get(""addressLine2"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""addressLine2"").get(""secondaryValue"") #end$demographics.get(""addressLine3"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""addressLine3"").get(""secondaryValue"") #end
    #if( $demographics.get(""region"") ) #end #if( $demographics.get(""province"") ) #end #if( $demographics.get(""city"") ) #end #if( $demographics.get(""region"") ) #end #if( $demographics.get(""province"") ) #end #if( $demographics.get(""city"") ) #end
    $demographics.get(""region"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""region"").get(""secondaryLabel"") #end$demographics.get(""province"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""province"").get(""secondaryLabel"") #end$demographics.get(""city"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""city"").get(""secondaryLabel"") #end
    $demographics.get(""region"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""region"").get(""secondaryValue"") #end$demographics.get(""province"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""province"").get(""secondaryValue"") #end$demographics.get(""city"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""city"").get(""secondaryValue"") #end
    #if( $demographics.get(""zone"") ) #end #if( $demographics.get(""postalCode"") ) #end #if( $demographics.get(""zone"") ) #end #if( $demographics.get(""postalCode"") ) #end #if( $demographics.get(""modeOfClaim"") ) #end #if( $demographics.get(""modeOfClaim"") ) #end
    $demographics.get(""zone"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""zone"").get(""secondaryLabel"") #end$demographics.get(""postalCode"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""postalCode"").get(""secondaryLabel"") #end
    $demographics.get(""zone"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""zone"").get(""secondaryValue"") #end$demographics.get(""postalCode"").get(""primaryValue"")
    $demographics.get(""modeOfClaim"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""modeOfClaim"").get(""secondaryLabel"") #end
    $demographics.get(""modeOfClaim"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""modeOfClaim"").get(""secondaryValue"") #end
    #if( $demographics.get(""parentOrGuardianName"") )

    Gaurdian Details

    #if( $demographics.get(""parentOrGuardianRID"") ) #end #if( $demographics.get(""parentOrGuardianUIN"") ) #end #if( $demographics.get(""parentOrGuardianRID"") ) #end #if( $demographics.get(""parentOrGuardianUIN"") ) #end
    $demographics.get(""parentOrGuardianName"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""parentOrGuardianName"").get(""secondaryLabel"") #end $demographics.get(""parentOrGuardianRID"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""parentOrGuardianRID"").get(""secondaryLabel"") #end$demographics.get(""parentOrGuardianUIN"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""parentOrGuardianUIN"").get(""secondaryLabel"") #end
    $demographics.get(""parentOrGuardianName"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""parentOrGuardianName"").get(""secondaryValue"") #end$demographics.get(""parentOrGuardianRID"").get(""primaryValue"")$demographics.get(""parentOrGuardianUIN"").get(""primaryValue"")
    #end
    #if ( $ApplicantImageSource )

    ${PhotoPrim} #if( $secLangPresent ) /${PhotoSec} #end
    #end


    ${DocumentsPrimLabel} #if( $secLangPresent ) /${DocumentsSecLabel} #end

    #foreach( $key in $documents.keySet() ) #end

    $documents.get($key).get(""primaryLabel"") #if( $secLangPresent ) /$documents.get($key).get(""secondaryLabel"") #end


    $documents.get($key).get(""value"")

    ${BiometricsPrimLabel} #if( $secLangPresent ) /${BiometricsSecLabel} #end

    #foreach( $key in $biometrics.keySet() )
    $biometrics.get($key).get(""primaryLabel"") #if( $secLangPresent ) /$biometrics.get($key).get(""secondaryLabel"") #end

    Fingers ( $biometrics.get($key).get(""FingerCount"") ),Iris ( $biometrics.get($key).get(""IrisCount"") ),Face ( $biometrics.get($key).get(""FaceCount"") )
    #if( $biometrics.get($key).get(""CapturedLeftEye"") ) #end #if( $biometrics.get($key).get(""CapturedRightEye"") ) #end #if( $biometrics.get($key).get(""CapturedLeftEye"") ) #end #if( $biometrics.get($key).get(""CapturedRightEye"") ) #end

    ${LeftEyePrimLabel} #if( $secLangPresent ) /${LeftEyeSecLabel} #end

    ${RightEyePrimLabel} #if( $secLangPresent ) /${RightEyeSecLabel} #end

    #if( $biometrics.get($key).get(""CapturedLeftEye"") ) #end #if( $biometrics.get($key).get(""CapturedRightEye"") ) #end
    #if( $biometrics.get($key).get(""CapturedLeftSlap"") ) #end #if( $biometrics.get($key).get(""CapturedRightSlap"") ) #end #if( $biometrics.get($key).get(""CapturedThumbs"") ) #end #if( $biometrics.get($key).get(""CapturedLeftSlap"") ) #end #if( $biometrics.get($key).get(""CapturedRightSlap"") ) #end #if( $biometrics.get($key).get(""CapturedThumbs"") ) #end

    ${LeftPalmPrimLabel} #if( $secLangPresent ) /${LeftPalmSecLabel} #end

    ${RightPalmPrimLabel} #if( $secLangPresent ) /${RightPalmSecLabel} #end

    ${ThumbsPrimLabel} #if( $secLangPresent ) /${ThumbsSecLabel} #end


    #if( $biometrics.get($key).get(""FaceImageSource"") ) #end #if( $biometrics.get($key).get(""subType"") == ""applicant"" && $ExceptionImageSource ) #end #if( $biometrics.get($key).get(""FaceImageSource"") ) #end #if( $biometrics.get($key).get(""subType"") == ""applicant"" && $ExceptionImageSource ) #end

    ${FacePrimLabel} #if( $secLangPresent ) /${FaceSecLabel} #end

    ${ExceptionPhotoPrimLabel} #if( $secLangPresent ) /${ExceptionPhotoSecLabel} #end

    #end

    ${Consent}

    ",10005,Registration,reg-preview-template-part,ara,TRUE,superadmin,now() +1255,Modèle d'aperçu d'inscription,Preview generated after registration,txt,velocity,"
    #if ( $UIN ) #end #if ( $PreRegID ) #end

    ${RIDPrimLabel} #if( $secLangPresent ) /${RIDSecLabel} #end


    ${RID}

    ${UINPrimLabel} #if( $secLangPresent ) /${UINSecLabel} #end


    ${UIN}

    ${PreRegIDPrimLabel} #if( $secLangPresent ) /${PreRegIDSecLabel} #end


    ${PreRegID}

    ${DatePrimLabel} #if( $secLangPresent ) /${DateSecLabel} #end


    ${Date}

    #if ( $name )

    ${NamePrimLabel} #if( $secLangPresent ) /${NameSecLabel} #end


    ${NamePrimValue} #if( $secLangPresent ) /${NameSecValue} #end
    #end

    ${DemographicInfo} #if( $secLangPresent ) /${DemographicInfoSecondary} #end

    #if( $demographics.get(""fullName"") ) #end #if( $demographics.get(""fullName"") ) #end #if( $demographics.get(""dateOfBirth"") ) #end #if( $demographics.get(""dateOfBirth"") ) #end #if( $demographics.get(""gender"") ) #end #if( $demographics.get(""gender"") ) #end #if( $demographics.get(""phone"") ) #end #if( $demographics.get(""email"") ) #end #if( $demographics.get(""phone"") ) #end #if( $demographics.get(""email"") ) #end
    $demographics.get(""fullName"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""fullName"").get(""secondaryLabel"") #end
    $demographics.get(""fullName"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""fullName"").get(""secondaryValue"") #end
    $demographics.get(""dateOfBirth"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""dateOfBirth"").get(""secondaryLabel"") #end
    $demographics.get(""dateOfBirth"").get(""primaryValue"")
    $demographics.get(""gender"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""gender"").get(""secondaryLabel"") #end
    $demographics.get(""gender"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""gender"").get(""secondaryValue"") #end
    $demographics.get(""phone"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""phone"").get(""secondaryLabel"") #end$demographics.get(""email"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""email"").get(""secondaryLabel"") #end
    $demographics.get(""phone"").get(""primaryValue"")$demographics.get(""email"").get(""primaryValue"")
    #if( $demographics.get(""addressLine1"") )

    Address

    #end #if( $demographics.get(""addressLine1"") ) #end #if( $demographics.get(""addressLine2"") ) #end #if( $demographics.get(""addressLine3"") ) #end #if( $demographics.get(""addressLine1"") ) #end #if( $demographics.get(""addressLine2"") ) #end #if( $demographics.get(""addressLine3"") ) #end
    $demographics.get(""addressLine1"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""addressLine1"").get(""secondaryLabel"") #end$demographics.get(""addressLine2"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""addressLine2"").get(""secondaryLabel"") #end$demographics.get(""addressLine3"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""addressLine3"").get(""secondaryLabel"") #end
    $demographics.get(""addressLine1"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""addressLine1"").get(""secondaryValue"") #end$demographics.get(""addressLine2"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""addressLine2"").get(""secondaryValue"") #end$demographics.get(""addressLine3"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""addressLine3"").get(""secondaryValue"") #end
    #if( $demographics.get(""region"") ) #end #if( $demographics.get(""province"") ) #end #if( $demographics.get(""city"") ) #end #if( $demographics.get(""region"") ) #end #if( $demographics.get(""province"") ) #end #if( $demographics.get(""city"") ) #end
    $demographics.get(""region"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""region"").get(""secondaryLabel"") #end$demographics.get(""province"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""province"").get(""secondaryLabel"") #end$demographics.get(""city"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""city"").get(""secondaryLabel"") #end
    $demographics.get(""region"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""region"").get(""secondaryValue"") #end$demographics.get(""province"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""province"").get(""secondaryValue"") #end$demographics.get(""city"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""city"").get(""secondaryValue"") #end
    #if( $demographics.get(""zone"") ) #end #if( $demographics.get(""postalCode"") ) #end #if( $demographics.get(""zone"") ) #end #if( $demographics.get(""postalCode"") ) #end #if( $demographics.get(""modeOfClaim"") ) #end #if( $demographics.get(""modeOfClaim"") ) #end
    $demographics.get(""zone"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""zone"").get(""secondaryLabel"") #end$demographics.get(""postalCode"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""postalCode"").get(""secondaryLabel"") #end
    $demographics.get(""zone"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""zone"").get(""secondaryValue"") #end$demographics.get(""postalCode"").get(""primaryValue"")
    $demographics.get(""modeOfClaim"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""modeOfClaim"").get(""secondaryLabel"") #end
    $demographics.get(""modeOfClaim"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""modeOfClaim"").get(""secondaryValue"") #end
    #if( $demographics.get(""parentOrGuardianName"") )

    Gaurdian Details

    #if( $demographics.get(""parentOrGuardianRID"") ) #end #if( $demographics.get(""parentOrGuardianUIN"") ) #end #if( $demographics.get(""parentOrGuardianRID"") ) #end #if( $demographics.get(""parentOrGuardianUIN"") ) #end
    $demographics.get(""parentOrGuardianName"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""parentOrGuardianName"").get(""secondaryLabel"") #end $demographics.get(""parentOrGuardianRID"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""parentOrGuardianRID"").get(""secondaryLabel"") #end$demographics.get(""parentOrGuardianUIN"").get(""primaryLabel"") #if( $secLangPresent ) /$demographics.get(""parentOrGuardianUIN"").get(""secondaryLabel"") #end
    $demographics.get(""parentOrGuardianName"").get(""primaryValue"") #if( $secLangPresent ) /$demographics.get(""parentOrGuardianName"").get(""secondaryValue"") #end$demographics.get(""parentOrGuardianRID"").get(""primaryValue"")$demographics.get(""parentOrGuardianUIN"").get(""primaryValue"")
    #end
    #if ( $ApplicantImageSource )

    ${PhotoPrim} #if( $secLangPresent ) /${PhotoSec} #end
    #end


    ${DocumentsPrimLabel} #if( $secLangPresent ) /${DocumentsSecLabel} #end

    #foreach( $key in $documents.keySet() ) #end

    $documents.get($key).get(""primaryLabel"") #if( $secLangPresent ) /$documents.get($key).get(""secondaryLabel"") #end


    $documents.get($key).get(""value"")

    ${BiometricsPrimLabel} #if( $secLangPresent ) /${BiometricsSecLabel} #end

    #foreach( $key in $biometrics.keySet() )
    $biometrics.get($key).get(""primaryLabel"") #if( $secLangPresent ) /$biometrics.get($key).get(""secondaryLabel"") #end

    Fingers ( $biometrics.get($key).get(""FingerCount"") ),Iris ( $biometrics.get($key).get(""IrisCount"") ),Face ( $biometrics.get($key).get(""FaceCount"") )
    #if( $biometrics.get($key).get(""CapturedLeftEye"") ) #end #if( $biometrics.get($key).get(""CapturedRightEye"") ) #end #if( $biometrics.get($key).get(""CapturedLeftEye"") ) #end #if( $biometrics.get($key).get(""CapturedRightEye"") ) #end

    ${LeftEyePrimLabel} #if( $secLangPresent ) /${LeftEyeSecLabel} #end

    ${RightEyePrimLabel} #if( $secLangPresent ) /${RightEyeSecLabel} #end

    #if( $biometrics.get($key).get(""CapturedLeftEye"") ) #end #if( $biometrics.get($key).get(""CapturedRightEye"") ) #end
    #if( $biometrics.get($key).get(""CapturedLeftSlap"") ) #end #if( $biometrics.get($key).get(""CapturedRightSlap"") ) #end #if( $biometrics.get($key).get(""CapturedThumbs"") ) #end #if( $biometrics.get($key).get(""CapturedLeftSlap"") ) #end #if( $biometrics.get($key).get(""CapturedRightSlap"") ) #end #if( $biometrics.get($key).get(""CapturedThumbs"") ) #end

    ${LeftPalmPrimLabel} #if( $secLangPresent ) /${LeftPalmSecLabel} #end

    ${RightPalmPrimLabel} #if( $secLangPresent ) /${RightPalmSecLabel} #end

    ${ThumbsPrimLabel} #if( $secLangPresent ) /${ThumbsSecLabel} #end


    #if( $biometrics.get($key).get(""FaceImageSource"") ) #end #if( $biometrics.get($key).get(""subType"") == ""applicant"" && $ExceptionImageSource ) #end #if( $biometrics.get($key).get(""FaceImageSource"") ) #end #if( $biometrics.get($key).get(""subType"") == ""applicant"" && $ExceptionImageSource ) #end

    ${FacePrimLabel} #if( $secLangPresent ) /${FaceSecLabel} #end

    ${ExceptionPhotoPrimLabel} #if( $secLangPresent ) /${ExceptionPhotoSecLabel} #end

    #end

    ${Consent}

    ",10005,Registration,reg-preview-template-part,fra,TRUE,superadmin,now() diff --git a/data-dml/mosip_master/dml/master-template_file_format.csv b/data-dml/mosip_master/dml/master-template_file_format.csv new file mode 100644 index 00000000000..4670894f2dd --- /dev/null +++ b/data-dml/mosip_master/dml/master-template_file_format.csv @@ -0,0 +1,13 @@ +code,descr,lang_code,is_active,cr_by,cr_dtimes +txt,Text File,eng,TRUE,superadmin,now() +xml,XML File,eng,TRUE,superadmin,now() +json,Json File,eng,TRUE,superadmin,now() +txt,ملف نصي,ara,TRUE,superadmin,now() +xml,ملف XML,ara,TRUE,superadmin,now() +json,ملف Json,ara,TRUE,superadmin,now() +txt,Fichier texte,fra,TRUE,superadmin,now() +xml,Fichier XML,fra,TRUE,superadmin,now() +json,Fichier Json,fra,TRUE,superadmin,now() +html,html file,eng,TRUE,superadmin,now() +html,ملف html,ara,TRUE,superadmin,now() +html,Fichier html,fra,TRUE,superadmin,now() diff --git a/data-dml/mosip_master/dml/master-template_type.csv b/data-dml/mosip_master/dml/master-template_type.csv new file mode 100644 index 00000000000..3f36e948972 --- /dev/null +++ b/data-dml/mosip_master/dml/master-template_type.csv @@ -0,0 +1,397 @@ +code,descr,lang_code,is_active,cr_by,cr_dtimes +auth-email-content,Template for authorization content,eng,TRUE,superadmin,now() +auth-email-subject,Template for authorization subject,eng,TRUE,superadmin,now() +auth-sms,Template for authorization SMS,eng,TRUE,superadmin,now() +ida-auth-otp-email-content-template,Template for Email Content,eng,TRUE,superadmin,now() +ida-auth-otp-email-subject-template,Template for Email Subject,eng,TRUE,superadmin,now() +ida-auth-otp-sms-template,Template for OTP in SMS ,eng,TRUE,superadmin,now() +auth-email-content,قالب لمحتوى التخويل,ara,TRUE,superadmin,now() +auth-email-subject,قالب لموضوع التخويل,ara,TRUE,superadmin,now() +auth-sms,قالب لرسالة التفويض,ara,TRUE,superadmin,now() +ida-auth-otp-email-content-template,قالب لمحتوى البريد الإلكتروني,ara,TRUE,superadmin,now() +ida-auth-otp-email-subject-template,قالب لموضوع البريد الإلكتروني,ara,TRUE,superadmin,now() +ida-auth-otp-sms-template,قالب كلمة المرور لمرة واحدة في الرسالة,ara,TRUE,superadmin,now() +auth-email-content,Modèle de contenu dautorisation,fra,TRUE,superadmin,now() +auth-email-subject,Modèle pour sujet dautorisation,fra,TRUE,superadmin,now() +auth-sms,Modèle de SMS dautorisation,fra,TRUE,superadmin,now() +ida-auth-otp-email-content-template,Modèle de contenu de courrier électronique,fra,TRUE,superadmin,now() +ida-auth-otp-email-subject-template,Modèle pour sujet demail,fra,TRUE,superadmin,now() +ida-auth-otp-sms-template,Modèle pour OTP dans SMS,fra,TRUE,superadmin,now() +RPR_DUP_UIN_EMAIL,Template for duplicate UIN Email,eng,TRUE,superadmin,now() +RPR_DUP_UIN_SMS,Template for duplicate UIN SMS,eng,TRUE,superadmin,now() +RPR_TEC_ISSUE_EMAIL,Template for Technical Issue Email,eng,TRUE,superadmin,now() +RPR_TEC_ISSUE_SMS,Template for Technical Issue SMS,eng,TRUE,superadmin,now() +RPR_UIN_GEN_EMAIL,Template for UIN generation Email,eng,TRUE,superadmin,now() +RPR_UIN_GEN_SMS,Template for UIN generation SMS,eng,TRUE,superadmin,now() +RPR_UIN_UPD_EMAIL,Template for update details Email,eng,TRUE,superadmin,now() +RPR_UIN_UPD_SMS,Template for update Details SMS,eng,TRUE,superadmin,now() +RPR_DUP_UIN_EMAIL,قالب لبريد إلكتروني مكرر الهوية,ara,TRUE,superadmin,now() +RPR_DUP_UIN_SMS,قالب لرسالة الهوية المكررة,ara,TRUE,superadmin,now() +RPR_TEC_ISSUE_EMAIL,نموذج للبريد الإلكتروني لمشكلة فنية,ara,TRUE,superadmin,now() +RPR_TEC_ISSUE_SMS,قالب لرسالة المشكلة الفنية,ara,TRUE,superadmin,now() +RPR_UIN_GEN_EMAIL,قالب لتوليد الهوية البريد الإلكتروني,ara,TRUE,superadmin,now() +RPR_UIN_GEN_SMS,قالب لرسالة توليد الهوية,ara,TRUE,superadmin,now() +RPR_UIN_UPD_EMAIL,قالب للحصول على تفاصيل التحديث,ara,TRUE,superadmin,now() +RPR_UIN_UPD_SMS,قالب لتحديث تفاصيل الرسالة,ara,TRUE,superadmin,now() +RPR_DUP_UIN_EMAIL,Modèle de courrier didentité en double,fra,TRUE,superadmin,now() +RPR_DUP_UIN_SMS,Modèle de message didentité en double,fra,TRUE,superadmin,now() +RPR_TEC_ISSUE_EMAIL,Modèle pour courrier électronique de problème technique,fra,TRUE,superadmin,now() +RPR_TEC_ISSUE_SMS,Modèle de message de problème technique,fra,TRUE,superadmin,now() +RPR_UIN_GEN_EMAIL,Modèle de courrier électronique de génération didentité,fra,TRUE,superadmin,now() +RPR_UIN_GEN_SMS,Modèle de message de génération didentité,fra,TRUE,superadmin,now() +RPR_UIN_UPD_EMAIL,Modèle pour les détails de la mise à jour Email,fra,TRUE,superadmin,now() +RPR_UIN_UPD_SMS,Modèle pour la mise à jour Détails Message,fra,TRUE,superadmin,now() +NewReg-email-content-template,Template for new registration Email Content,eng,TRUE,superadmin,now() +NewReg-email-subject-template,Template for new registration Email Subject,eng,TRUE,superadmin,now() +NewReg-sms-template,Template for new registration SMS,eng,TRUE,superadmin,now() +OTP-email-content-template,Template for OTP generation Email Content,eng,TRUE,superadmin,now() +OTP-email-subject-template,Template for OTP generation Email Subject,eng,TRUE,superadmin,now() +OTP-sms-template,Template for OTP SMS,eng,TRUE,superadmin,now() +Update-email-content-template,Template for update registration Email Content,eng,TRUE,superadmin,now() +Update-email-subject-template,Template for update registration Email Subject,eng,TRUE,superadmin,now() +Update-sms-template,Template for update registration SMS,eng,TRUE,superadmin,now() +NewReg-email-content-template,قالب للتسجيل الجديد محتوى البريد الإلكتروني,ara,TRUE,superadmin,now() +NewReg-email-subject-template,قالب للتسجيل الجديد البريد الإلكتروني الموضوع,ara,TRUE,superadmin,now() +NewReg-sms-template,قالب لرسالة التسجيل الجديدة,ara,TRUE,superadmin,now() +OTP-email-content-template,قالب لتوليد OTP محتوى البريد الإلكتروني,ara,TRUE,superadmin,now() +OTP-email-subject-template,قالب لتوليد OTP البريد الإلكتروني الموضوع,ara,TRUE,superadmin,now() +OTP-sms-template,قالب لرسالة OTP,ara,TRUE,superadmin,now() +Update-email-content-template,قالب لتحديث تسجيل محتوى البريد الإلكتروني,ara,TRUE,superadmin,now() +Update-email-subject-template,قالب لتسجيل التحديث البريد الإلكتروني الموضوع,ara,TRUE,superadmin,now() +Update-sms-template,قالب لرسالة تسجيل التحديث,ara,TRUE,superadmin,now() +NewReg-email-content-template,Modèle pour nouvelle inscription Email Content,fra,TRUE,superadmin,now() +NewReg-email-subject-template,Modèle pour nouvelle inscription Objet de le-mail,fra,TRUE,superadmin,now() +NewReg-sms-template,Modèle de nouvelle inscription SMS,fra,TRUE,superadmin,now() +OTP-email-content-template,Modèle de contenu de courrier électronique de génération dOTP,fra,TRUE,superadmin,now() +OTP-email-subject-template,Modèle pour le sujet de-mail de génération dOTP,fra,TRUE,superadmin,now() +OTP-sms-template,Modèle pour SMS OTP,fra,TRUE,superadmin,now() +Update-email-content-template,Modèle pour lenregistrement de la mise à jour,fra,TRUE,superadmin,now() +Update-email-subject-template,Modèle denregistrement de mise à jour Objet de le-mail,fra,TRUE,superadmin,now() +Update-sms-template,Modèle pour SMS denregistrement de mise à jour,fra,TRUE,superadmin,now() +Email-Acknowledgement,Template for Email Acknowledgement,eng,TRUE,superadmin,now() +Onscreen-Acknowledgement,Template for Onscreen Acknowledgment,eng,TRUE,superadmin,now() +otp-email-content-template,Template for OTP Email Content,eng,TRUE,superadmin,now() +otp-email-subject-template,Template for OTP Email Subject,eng,TRUE,superadmin,now() +otp-sms-template,Template for OTP SMS,eng,TRUE,superadmin,now() +SMS-Acknowledgement,Template for SMS Acknowledgement,eng,TRUE,superadmin,now() +Email-Acknowledgement,قالب لتأكيد البريد الإلكتروني,ara,TRUE,superadmin,now() +Onscreen-Acknowledgement,قالب للشاشة شكر وتقدير,ara,TRUE,superadmin,now() +otp-email-content-template,قالب لمحتوى البريد الإلكتروني OTP,ara,TRUE,superadmin,now() +otp-email-subject-template,قالب لموضوع البريد الإلكتروني OTP,ara,TRUE,superadmin,now() +otp-sms-template,قالب ل OTP SMS,ara,TRUE,superadmin,now() +SMS-Acknowledgement,قالب للإشعار SMS,ara,TRUE,superadmin,now() +Email-Acknowledgement,Template for email confirmation,fra,TRUE,superadmin,now() +Onscreen-Acknowledgement,On-screen recognition template,fra,TRUE,superadmin,now() +otp-email-content-template,OTP Email Content Template,fra,TRUE,superadmin,now() +otp-email-subject-template,Template for OTP email subject,fra,TRUE,superadmin,now() +otp-sms-template,Template for OTP SMS,fra,TRUE,superadmin,now() +SMS-Acknowledgement,Template for SMS Acknowledgment,fra,TRUE,superadmin,now() +Acknowledgement-email-subject,Template for email subject of Acknowledgement,eng,TRUE,superadmin,now() +Acknowledgement-email-subject,قالب للتسليم البريد الكتروني الموضوع,ara,TRUE,superadmin,now() +Acknowledgement-email-subject,Modèle pour le sujet d'email d'accusé de réception,fra,TRUE,superadmin,now() +RPR_UIN_CARD_TEMPLATE,UIN card template,eng,TRUE,superadmin,now() +RPR_UIN_CARD_TEMPLATE,قالب بطاقة UIN,ara,TRUE,superadmin,now() +RPR_UIN_CARD_TEMPLATE,Modèle de carte UIN,fra,TRUE,superadmin,now() +RPR_UIN_DEAC_SMS,Template for UIN Deactivation SMS,eng,TRUE,superadmin,now() +RPR_UIN_DEAC_SMS,قالب لتعطيل UIN SMS,ara,TRUE,superadmin,now() +RPR_UIN_DEAC_SMS,Modèle pour SMS de désactivation UIN,fra,TRUE,superadmin,now() +RPR_UIN_DEAC_EMAIL,Template for UIN Deactivation Email,eng,TRUE,superadmin,now() +RPR_UIN_DEAC_EMAIL,قالب لإلغاء تنشيط البريد,ara,TRUE,superadmin,now() +RPR_UIN_DEAC_EMAIL,Modèle pour Email de désactivation UIN,fra,TRUE,superadmin,now() +RPR_UIN_REAC_SMS,Template for UIN Reactivate SMS,eng,TRUE,superadmin,now() +RPR_UIN_REAC_SMS,قالب لـ UIN تنشيط SMS,ara,TRUE,superadmin,now() +RPR_UIN_REAC_SMS,Modèle pour UIN Réactiver SMS,fra,TRUE,superadmin,now() +RPR_UIN_REAC_EMAIL,Template for UIN Reactivate Email,eng,TRUE,superadmin,now() +RPR_UIN_REAC_EMAIL,قالب لـ UIN تنشيط البريد,ara,TRUE,superadmin,now() +RPR_UIN_REAC_EMAIL,Modèle pour UIN Réactiver Email,fra,TRUE,superadmin,now() +reg-sms-notification,Registration Acknowledgement Template,eng,TRUE,superadmin,now() +reg-sms-notification,نموذج شكر التسجيل,ara,TRUE,superadmin,now() +reg-sms-notification,accusé de réception,fra,TRUE,superadmin,now() +reg-email-notification,Registration Acknowledgement Template,eng,TRUE,superadmin,now() +reg-email-notification,نموذج شكر التسجيل,ara,TRUE,superadmin,now() +reg-email-notification,accusé de réception,fra,TRUE,superadmin,now() +consent,Consent,eng,TRUE,superadmin,now() +consent,موافقة,ara,TRUE,superadmin,now() +consent,Consentement,fra,TRUE,superadmin,now() +auth-otp-email-subject-template,Auth OTP Email Subject Template,eng,TRUE,superadmin,now() +auth-otp-email-subject-template,مصادقة OTP قالب موضوع,ara,TRUE,superadmin,now() +auth-otp-email-subject-template,Modèle dobjet de-mail Auth OTP,fra,TRUE,superadmin,now() +auth-otp-email-content-template,Auth OTP Email Content Template,eng,TRUE,superadmin,now() +auth-otp-email-content-template,مصادقة OTP قالب محتوى,ara,TRUE,superadmin,now() +auth-otp-email-content-template,Auth OTP Email ContentTemplate,fra,TRUE,superadmin,now() +auth-otp-sms-template,Auth OTP SMS Template,eng,TRUE,superadmin,now() +auth-otp-sms-template,مصادقة قالب رسالة OTP,ara,TRUE,superadmin,now() +auth-otp-sms-template,Modèle SMS OTP Auth,fra,TRUE,superadmin,now() +lostUIN-email-notification,فقدت قالب الاعتراف UIN,ara,TRUE,superadmin,now() +lostUIN-email-notification,Lost UIN Acknowledgement Template,eng,TRUE,superadmin,now() +lostUIN-email-notification,Modèle de reconnaissance UIN perdu,fra,TRUE,superadmin,now() +lostUIN-sms-notification,فقدت قالب الاعتراف UIN,ara,TRUE,superadmin,now() +lostUIN-sms-notification,Lost UIN Acknowledgement Template,eng,TRUE,superadmin,now() +lostUIN-sms-notification,Modèle de reconnaissance UIN perdu,fra,TRUE,superadmin,now() +updateUIN-email-notification,تحديث قالب شكر UIN,ara,TRUE,superadmin,now() +updateUIN-email-notification,Updtae UIN Acknowledgement Template,eng,TRUE,superadmin,now() +updateUIN-email-notification,Mise à jour du modèle d'accusé de réception UIN,fra,TRUE,superadmin,now() +updateUIN-sms-notification,تحديث قالب شكر UIN,ara,TRUE,superadmin,now() +updateUIN-sms-notification,Updtae UIN Acknowledgement Template,eng,TRUE,superadmin,now() +updateUIN-sms-notification,Mise à jour du modèle d'accusé de réception UIN,fra,TRUE,superadmin,now() +cancel-appointment,Template for Cancel Appointment,eng,TRUE,superadmin,now() +cancel-appointment,قالب لإلغاء الموعد,ara,TRUE,superadmin,now() +cancel-appointment,Modèle pour annuler un rendez-vous,fra,TRUE,superadmin,now() +RPR_LOST_UIN_SMS,Lost UIN Notification SMS,eng,TRUE,superadmin,now() +RPR_LOST_UIN_SMS,فقدت رسالة إعلام UIN,ara,TRUE,superadmin,now() +RPR_LOST_UIN_SMS,SMS de notification UIN perdu,fra,TRUE,superadmin,now() +RPR_LOST_UIN_EMAIL,Lost UIN Notification Email,eng,TRUE,superadmin,now() +RPR_LOST_UIN_EMAIL,فقدت البريد الإلكتروني الإخطار UIN,ara,TRUE,superadmin,now() +RPR_LOST_UIN_EMAIL,Email de notification UIN perdu,fra,TRUE,superadmin,now() +RPR_MASKED_UIN_CARD_TEMPLATE,Masked UIN card template,eng,TRUE,superadmin,now() +RPR_MASKED_UIN_CARD_TEMPLATE,قالب بطاقة UIN Masked,ara,TRUE,superadmin,now() +RPR_MASKED_UIN_CARD_TEMPLATE,Modèle de carte Masked UIN,fra,TRUE,superadmin,now() +RS_AUTH_HIST_SUCCESS_EMAIL,Authentication History Request Success Email,eng,TRUE,superadmin,now() +RS_AUTH_HIST_SUCCESS_EMAIL,تاريخ طلب المصادقة,ara,TRUE,superadmin,now() +RS_AUTH_HIST_SUCCESS_EMAIL,E-mail de réussite de la demande d'historique d'authentification,fra,TRUE,superadmin,now() +RS_AUTH_HIST_SUCCESS_SMS,Authentication History Request Success SMS,eng,TRUE,superadmin,now() +RS_AUTH_HIST_SUCCESS_SMS,تاريخ المصادقة طلب النجاح SMS,ara,TRUE,superadmin,now() +RS_AUTH_HIST_SUCCESS_SMS,Historique de l'authentification des services résidents SMS de transcation,fra,TRUE,superadmin,now() +RS_AUTH_HIST_SUCCESS_EMAIL_SUB,Authentication History Request Success EMAIL Subject,eng,TRUE,superadmin,now() +RS_AUTH_HIST_SUCCESS_EMAIL_SUB,طلب سجل المصادقة النجاح عنوان البريد الإلكتروني,ara,TRUE,superadmin,now() +RS_AUTH_HIST_SUCCESS_EMAIL_SUB,Succès EMAIL de la demande d'historique d'authentification,fra,TRUE,superadmin,now() +RS_DOW_UIN_SUCCESS_EMAIL,Successful Download of e-UIN Email,eng,TRUE,superadmin,now() +RS_DOW_UIN_SUCCESS_EMAIL,تنزيل ناجح للبريد الإلكتروني,ara,TRUE,superadmin,now() +RS_DOW_UIN_SUCCESS_EMAIL,Téléchargement réussi du courriel e-UIN,fra,TRUE,superadmin,now() +RS_DOW_UIN_SUCCESS_EMAIL_SUB,Successful Download of e-UIN Email Subject,eng,TRUE,superadmin,now() +RS_DOW_UIN_SUCCESS_EMAIL_SUB,تنزيل ناجح لموضوع البريد الإلكتروني UIN,ara,TRUE,superadmin,now() +RS_DOW_UIN_SUCCESS_EMAIL_SUB,Téléchargement réussi de l'objet de l'e-UIN,fra,TRUE,superadmin,now() +RS_DOW_UIN_SUCCESS_SMS,Successful Download of e-UIN SMS,eng,TRUE,superadmin,now() +RS_DOW_UIN_SUCCESS_SMS,تنزيل ناجح لرسائل e-UIN SMS,ara,TRUE,superadmin,now() +RS_DOW_UIN_SUCCESS_SMS,Téléchargement réussi de l'e-UIN SMS,fra,TRUE,superadmin,now() +RS_LOCK_AUTH_SUCCESS_EMAIL,Successful Locking of Auth Types Email,eng,TRUE,superadmin,now() +RS_LOCK_AUTH_SUCCESS_EMAIL,قفل ناجح لأنواع مصادقة البريد الإلكتروني,ara,TRUE,superadmin,now() +RS_LOCK_AUTH_SUCCESS_EMAIL,Verrouillage réussi des e-mails des types d'authentification,fra,TRUE,superadmin,now() +RS_LOCK_AUTH_SUCCESS_EMAIL_SUB,Successful Locking of Auth Types Email Subject,eng,TRUE,superadmin,now() +RS_LOCK_AUTH_SUCCESS_EMAIL_SUB,قفل ناجح لأنواع مصادقة البريد الإلكتروني الموضوع,ara,TRUE,superadmin,now() +RS_LOCK_AUTH_SUCCESS_EMAIL_SUB,Succès du verrouillage des types d'authentification,fra,TRUE,superadmin,now() +RS_LOCK_AUTH_SUCCESS_SMS,Successful Locking of Auth Types SMS,eng,TRUE,superadmin,now() +RS_LOCK_AUTH_SUCCESS_SMS,قفل ناجح لأنواع مصادقة الرسائل القصيرة,ara,TRUE,superadmin,now() +RS_LOCK_AUTH_SUCCESS_SMS,Verrouillage réussi des types d'authentification SMS,fra,TRUE,superadmin,now() +RS_UNLOCK_AUTH_SUCCESS_EMAIL,Successful Unlocking of Auth Types Email,eng,TRUE,superadmin,now() +RS_UNLOCK_AUTH_SUCCESS_EMAIL,فتح ناجح لأنواع مصادقة البريد الإلكتروني,ara,TRUE,superadmin,now() +RS_UNLOCK_AUTH_SUCCESS_EMAIL,Déverrouillage réussi des types d'authentification,fra,TRUE,superadmin,now() +RS_UNLOCK_AUTH_SUCCESS_EMAIL_SUB,Successful Unlocking of Auth Types Email Subject,eng,TRUE,superadmin,now() +RS_UNLOCK_AUTH_SUCCESS_EMAIL_SUB,فتح ناجح لأنواع مصادقة البريد الإلكتروني الموضوع,ara,TRUE,superadmin,now() +RS_UNLOCK_AUTH_SUCCESS_EMAIL_SUB,Déverrouillage réussi des types d'authentification Objet de l'e-mail,fra,TRUE,superadmin,now() +RS_UNLOCK_AUTH_SUCCESS_SMS,Successful Unlocking of Auth Types SMS,eng,TRUE,superadmin,now() +RS_UNLOCK_AUTH_SUCCESS_SMS,فتح ناجح لأنواع مصادقة الرسائل القصيرة,ara,TRUE,superadmin,now() +RS_UNLOCK_AUTH_SUCCESS_SMS,Déverrouillage réussi des types d'authentification SMS,fra,TRUE,superadmin,now() +RS_VIN_GEN_SUCCESS_EMAIL,VID Generation Success Email,eng,TRUE,superadmin,now() +RS_VIN_GEN_SUCCESS_EMAIL,VID جيل النجاح البريد الإلكتروني,ara,TRUE,superadmin,now() +RS_VIN_GEN_SUCCESS_EMAIL,E-mail de réussite de la génération VID,fra,TRUE,superadmin,now() +RS_VIN_GEN_SUCCESS_EMAIL_SUB,VID Generation Success Email Subject,eng,TRUE,superadmin,now() +RS_VIN_GEN_SUCCESS_EMAIL_SUB,VID جيل النجاح البريد الإلكتروني الموضوع,ara,TRUE,superadmin,now() +RS_VIN_GEN_SUCCESS_EMAIL_SUB,Sujet de l'e-mail de réussite de la génération VID,fra,TRUE,superadmin,now() +RS_VIN_GEN_SUCCESS_SMS,VID Generation Success SMS,eng,TRUE,superadmin,now() +RS_VIN_GEN_SUCCESS_SMS,VID جيل النجاح SMS,ara,TRUE,superadmin,now() +RS_VIN_GEN_SUCCESS_SMS,SMS de réussite de génération VID,fra,TRUE,superadmin,now() +RS_VIN_REV_SUCCESS_EMAIL,VID Revocation Success Email,eng,TRUE,superadmin,now() +RS_VIN_REV_SUCCESS_EMAIL,VID إبطال نجاح البريد الإلكتروني,ara,TRUE,superadmin,now() +RS_VIN_REV_SUCCESS_EMAIL,E-mail de réussite de la révocation de VID,fra,TRUE,superadmin,now() +RS_VIN_REV_SUCCESS_EMAIL_SUB,VID Revocation Success Email Subject,eng,TRUE,superadmin,now() +RS_VIN_REV_SUCCESS_EMAIL_SUB,VID إبطال نجاح البريد الإلكتروني الموضوع,ara,TRUE,superadmin,now() +RS_VIN_REV_SUCCESS_EMAIL_SUB,Sujet de l'e-mail de réussite de la révocation de VID,fra,TRUE,superadmin,now() +RS_VIN_REV_SUCCESS_SMS,VID Revocation Success SMS,eng,TRUE,superadmin,now() +RS_VIN_REV_SUCCESS_SMS,VID إبطال نجاح الرسائل القصيرة,ara,TRUE,superadmin,now() +RS_VIN_REV_SUCCESS_SMS,SMS de succès de révocation VID,fra,TRUE,superadmin,now() +RS_UIN_RPR_SUCCESS_EMAIL,Reprint Request Success Email,eng,TRUE,superadmin,now() +RS_UIN_RPR_SUCCESS_EMAIL,طبع طلب النجاح البريد الإلكتروني,ara,TRUE,superadmin,now() +RS_UIN_RPR_SUCCESS_EMAIL,Réimpression de l'e-mail de réussite de la demande,fra,TRUE,superadmin,now() +RS_UIN_RPR_SUCCESS_EMAIL_SUB,Reprint Request Success Email Subject,eng,TRUE,superadmin,now() +RS_UIN_RPR_SUCCESS_EMAIL_SUB,طبع طلب النجاح البريد الإلكتروني الموضوع,ara,TRUE,superadmin,now() +RS_UIN_RPR_SUCCESS_EMAIL_SUB,Sujet de l'e-mail de demande de réimpression réussie,fra,TRUE,superadmin,now() +RS_UIN_RPR_SUCCESS_SMS,Reprint Request Success SMS,eng,TRUE,superadmin,now() +RS_UIN_RPR_SUCCESS_SMS,إعادة طبع طلب النجاح SMS,ara,TRUE,superadmin,now() +RS_UIN_RPR_SUCCESS_SMS,Réimpression SMS de réussite de la demande,fra,TRUE,superadmin,now() +RS_AUTH_HIST_FAILURE_EMAIL,Authentication History Request Failure Email,eng,TRUE,superadmin,now() +RS_AUTH_HIST_FAILURE_EMAIL,فشل طلب سجل المصادقة,ara,TRUE,superadmin,now() +RS_AUTH_HIST_FAILURE_EMAIL,E-mail d'échec de la demande d'historique d'authentification,fra,TRUE,superadmin,now() +RS_AUTH_HIST_FAILURE_EMAIL_SUB,Authentication History Request Failure Email Subject,eng,TRUE,superadmin,now() +RS_AUTH_HIST_FAILURE_EMAIL_SUB,فشل طلب سجل المصادقة,ara,TRUE,superadmin,now() +RS_AUTH_HIST_FAILURE_EMAIL_SUB,Objet de l'e-mail d'échec de la demande d'historique d'authentification,fra,TRUE,superadmin,now() +RS_AUTH_HIST_FAILURE_SMS,Authentication History Request Failure SMS,eng,TRUE,superadmin,now() +RS_AUTH_HIST_FAILURE_SMS,فشل طلب سجل المصادقة,ara,TRUE,superadmin,now() +RS_AUTH_HIST_FAILURE_SMS,SMS d'échec de la demande d'historique d'authentification,fra,TRUE,superadmin,now() +RS_DOW_UIN_FAILURE_EMAIL,Download e-UIN Failure Email,eng,TRUE,superadmin,now() +RS_DOW_UIN_FAILURE_EMAIL,تنزيل فشل البريد الإلكتروني,ara,TRUE,superadmin,now() +RS_DOW_UIN_FAILURE_EMAIL,Télécharger l'e-mail d'échec e-UIN,fra,TRUE,superadmin,now() +RS_DOW_UIN_FAILURE_EMAIL_SUB,Download e-UIN Failure Email Subject,eng,TRUE,superadmin,now() +RS_DOW_UIN_FAILURE_EMAIL_SUB,قم بتنزيل موضوع فشل البريد الإلكتروني,ara,TRUE,superadmin,now() +RS_DOW_UIN_FAILURE_EMAIL_SUB,Télécharger le sujet de l'e-mail d'échec e-UIN,fra,TRUE,superadmin,now() +RS_DOW_UIN_FAILURE_SMS,Download e-UIN Failure SMS,eng,TRUE,superadmin,now() +RS_DOW_UIN_FAILURE_SMS,قم بتنزيل SMS Failure SMS,ara,TRUE,superadmin,now() +RS_DOW_UIN_FAILURE_SMS,Télécharger le SMS d'échec e-UIN,fra,TRUE,superadmin,now() +RS_LOCK_AUTH_FAILURE_EMAIL,Failure in Locking of Auth Types Email,eng,TRUE,superadmin,now() +RS_LOCK_AUTH_FAILURE_EMAIL,فشل في قفل البريد الإلكتروني لأنواع المصادقة,ara,TRUE,superadmin,now() +RS_LOCK_AUTH_FAILURE_EMAIL,Échec du verrouillage des e-mails des types d'authentification,fra,TRUE,superadmin,now() +RS_LOCK_AUTH_FAILURE_EMAIL_SUB,Failure in Locking of Auth Types Email Subject,eng,TRUE,superadmin,now() +RS_LOCK_AUTH_FAILURE_EMAIL_SUB,فشل في قفل أنواع مصادقة البريد الإلكتروني الموضوع,ara,TRUE,superadmin,now() +RS_LOCK_AUTH_FAILURE_EMAIL_SUB,Échec du verrouillage des types d'authentification Objet de l'e-mail,fra,TRUE,superadmin,now() +RS_LOCK_AUTH_FAILURE_SMS,Failure in Locking of Auth Types SMS,eng,TRUE,superadmin,now() +RS_LOCK_AUTH_FAILURE_SMS,فشل في قفل أنواع مصادقة الرسائل القصيرة,ara,TRUE,superadmin,now() +RS_LOCK_AUTH_FAILURE_SMS,Échec du verrouillage des types d'authentification SMS,fra,TRUE,superadmin,now() +RS_UIN_RPR_FAILURE_EMAIL,Reprint Request Failure Email,eng,TRUE,superadmin,now() +RS_UIN_RPR_FAILURE_EMAIL,إعادة طبع فشل طلب البريد الإلكتروني,ara,TRUE,superadmin,now() +RS_UIN_RPR_FAILURE_EMAIL,E-mail d'échec de la demande de réimpression,fra,TRUE,superadmin,now() +RS_UIN_RPR_FAILURE_EMAIL_SUB,Reprint Request Failure Email Subject,eng,TRUE,superadmin,now() +RS_UIN_RPR_FAILURE_EMAIL_SUB,إعادة طبع فشل طلب البريد الإلكتروني,ara,TRUE,superadmin,now() +RS_UIN_RPR_FAILURE_EMAIL_SUB,Échec de la demande de réimpression Objet de l'e-mail,fra,TRUE,superadmin,now() +RS_UIN_RPR_FAILURE_SMS,Reprint Request Failure SMS,eng,TRUE,superadmin,now() +RS_UIN_RPR_FAILURE_SMS,إعادة طلب فشل الرسائل القصيرة,ara,TRUE,superadmin,now() +RS_UIN_RPR_FAILURE_SMS,SMS d'échec de la demande de réimpression,fra,TRUE,superadmin,now() +RS_UNLOCK_AUTH_FAILURE_EMAIL,Failure in Unlocking of Auth Types Email,eng,TRUE,superadmin,now() +RS_UNLOCK_AUTH_FAILURE_EMAIL,فشل في فتح البريد الإلكتروني لأنواع مصادقة,ara,TRUE,superadmin,now() +RS_UNLOCK_AUTH_FAILURE_EMAIL,Échec du déverrouillage de la messagerie électronique des types d'authentification,fra,TRUE,superadmin,now() +RS_UNLOCK_AUTH_FAILURE_EMAIL_SUB,Failure in Unlocking of Auth Types Email Subject,eng,TRUE,superadmin,now() +RS_UNLOCK_AUTH_FAILURE_EMAIL_SUB,فشل في فتح أنواع مصادقة البريد الإلكتروني الموضوع,ara,TRUE,superadmin,now() +RS_UNLOCK_AUTH_FAILURE_EMAIL_SUB,Échec du déverrouillage du sujet de l'e-mail des types d'authentification,fra,TRUE,superadmin,now() +RS_UNLOCK_AUTH_FAILURE_SMS,Failure in Unlocking of Auth Types SMS,eng,TRUE,superadmin,now() +RS_UNLOCK_AUTH_FAILURE_SMS,فشل في فتح أنواع مصادقة الرسائل القصيرة,ara,TRUE,superadmin,now() +RS_UNLOCK_AUTH_FAILURE_SMS,Échec de déverrouillage des types d'authentification SMS,fra,TRUE,superadmin,now() +RS_VIN_GEN_FAILURE_EMAIL,VID Generation Failure Email,eng,TRUE,superadmin,now() +RS_VIN_GEN_FAILURE_EMAIL,VID الجيل فشل البريد الإلكتروني,ara,TRUE,superadmin,now() +RS_VIN_GEN_FAILURE_EMAIL,E-mail d'échec de génération de VID,fra,TRUE,superadmin,now() +RS_VIN_GEN_FAILURE_EMAIL_SUB,VID Generation Failure Email Subject,eng,TRUE,superadmin,now() +RS_VIN_GEN_FAILURE_EMAIL_SUB,VID الجيل فشل البريد الإلكتروني الموضوع,ara,TRUE,superadmin,now() +RS_VIN_GEN_FAILURE_EMAIL_SUB,Objet de l'e-mail d'échec de génération de VID,fra,TRUE,superadmin,now() +RS_VIN_GEN_FAILURE_SMS,VID Generation Failure SMS,eng,TRUE,superadmin,now() +RS_VIN_GEN_FAILURE_SMS,فشل إنشاء VID SMS,ara,TRUE,superadmin,now() +RS_VIN_GEN_FAILURE_SMS,SMS d'échec de génération de VID,fra,TRUE,superadmin,now() +RS_VIN_REV_FAILURE_EMAIL,VID Revocation Failure Email,eng,TRUE,superadmin,now() +RS_VIN_REV_FAILURE_EMAIL,VID إبطال فشل البريد الإلكتروني,ara,TRUE,superadmin,now() +RS_VIN_REV_FAILURE_EMAIL,E-mail d'échec de révocation de VID,fra,TRUE,superadmin,now() +RS_VIN_REV_FAILURE_EMAIL_SUB,VID Revocation Failure Email Subject,eng,TRUE,superadmin,now() +RS_VIN_REV_FAILURE_EMAIL_SUB,فيد إلغاء فشل البريد الإلكتروني الموضوع,ara,TRUE,superadmin,now() +RS_VIN_REV_FAILURE_EMAIL_SUB,Objet de l'e-mail d'échec de la révocation du VID,fra,TRUE,superadmin,now() +RS_VIN_REV_FAILURE_SMS,VID Revocation Failure SMS,eng,TRUE,superadmin,now() +RS_VIN_REV_FAILURE_SMS,فشل إلغاء VID SMS,ara,TRUE,superadmin,now() +RS_VIN_REV_FAILURE_SMS,SMS d'échec de révocation de VID,fra,TRUE,superadmin,now() +RS_UIN_UPDATE_SUCCESS_EMAIL,UIN Update Request Placed Successfully Email,eng,TRUE,superadmin,now() +RS_UIN_UPDATE_SUCCESS_EMAIL,تم تحديث طلب تحديث UIN بنجاح,ara,TRUE,superadmin,now() +RS_UIN_UPDATE_SUCCESS_EMAIL,E-mail de demande de mise à jour UIN placé avec succès,fra,TRUE,superadmin,now() +RS_UIN_UPDATE_SUCCESS_EMAIL_SUB,UIN Update Request Placed Successfully Email Subject,eng,TRUE,superadmin,now() +RS_UIN_UPDATE_SUCCESS_EMAIL_SUB,تم وضع طلب تحديث UIN بنجاح بالبريد الإلكتروني,ara,TRUE,superadmin,now() +RS_UIN_UPDATE_SUCCESS_EMAIL_SUB,Sujet de la demande de mise à jour UIN placé avec succès,fra,TRUE,superadmin,now() +RS_UIN_UPDATE_SUCCESS_SMS,UIN Update Request Placed Successfully SMS,eng,TRUE,superadmin,now() +RS_UIN_UPDATE_SUCCESS_SMS,تم تحديث طلب تحديث UIN بنجاح,ara,TRUE,superadmin,now() +RS_UIN_UPDATE_SUCCESS_SMS,Demande de mise à jour UIN placée avec succès SMS,fra,TRUE,superadmin,now() +RS_UIN_UPDATE_FAILURE_EMAIL,UIN Update Request Failed Email,eng,TRUE,superadmin,now() +RS_UIN_UPDATE_FAILURE_EMAIL,فشل طلب تحديث UIN,ara,TRUE,superadmin,now() +RS_UIN_UPDATE_FAILURE_EMAIL,E-mail d'échec de la demande de mise à jour UIN,fra,TRUE,superadmin,now() +RS_UIN_UPDATE_FAILURE_EMAIL_SUB,UIN Update Request Failed Email Subject,eng,TRUE,superadmin,now() +RS_UIN_UPDATE_FAILURE_EMAIL_SUB,فشل طلب تحديث UIN موضوع البريد الإلكتروني,ara,TRUE,superadmin,now() +RS_UIN_UPDATE_FAILURE_EMAIL_SUB,Échec de la demande de mise à jour de l'UIN,fra,TRUE,superadmin,now() +RS_UIN_UPDATE_FAILURE_SMS,UIN Update Request Failed SMS,eng,TRUE,superadmin,now() +RS_UIN_UPDATE_FAILURE_SMS,فشل طلب تحديث UIN SMS,ara,TRUE,superadmin,now() +RS_UIN_UPDATE_FAILURE_SMS,Echec de la demande de mise à jour UIN SMS,fra,TRUE,superadmin,now() +RPR_RPV_SUC_EMAIL,Registration Packet Validation Success Email,eng,TRUE,superadmin,now() +RPR_RPV_SUC_EMAIL,Registration Packet Validation Success Email,ara,TRUE,superadmin,now() +RPR_RPV_SUC_EMAIL,Registration Packet Validation Success Email,fra,TRUE,superadmin,now() +RPR_RPV_SUC_SMS,Registration Packet Validation Success SMS,eng,TRUE,superadmin,now() +RPR_RPV_SUC_SMS,Registration Packet Validation Success SMS,ara,TRUE,superadmin,now() +RPR_RPV_SUC_SMS,Registration Packet Validation Success SMS,fra,TRUE,superadmin,now() +RPR_UPV_SUC_EMAIL,Update Packet Validation Success Email,eng,TRUE,superadmin,now() +RPR_UPV_SUC_EMAIL,Update Packet Validation Success Email,ara,TRUE,superadmin,now() +RPR_UPV_SUC_EMAIL,Update Packet Validation Success Email,fra,TRUE,superadmin,now() +RPR_UPV_SUC_SMS,Update Packet Validation Success SMS,eng,TRUE,superadmin,now() +RPR_UPV_SUC_SMS,Update Packet Validation Success SMS,ara,TRUE,superadmin,now() +RPR_UPV_SUC_SMS,Update Packet Validation Success SMS,fra,TRUE,superadmin,now() +RPR_LPV_SUC_EMAIL,Lost Packet Validation Success Email,eng,TRUE,superadmin,now() +RPR_LPV_SUC_EMAIL,Lost Packet Validation Success Email,ara,TRUE,superadmin,now() +RPR_LPV_SUC_EMAIL,Lost Packet Validation Success Email,fra,TRUE,superadmin,now() +RPR_LPV_SUC_SMS,Lost Packet Validation Success SMS,eng,TRUE,superadmin,now() +RPR_LPV_SUC_SMS,Lost Packet Validation Success SMS,ara,TRUE,superadmin,now() +RPR_LPV_SUC_SMS,Lost Packet Validation Success SMS,fra,TRUE,superadmin,now() +RPR_RUPV_SUC_EMAIL,Resident Update Packet Validation Success Email,eng,TRUE,superadmin,now() +RPR_RUPV_SUC_EMAIL,Resident Update Packet Validation Success Email,ara,TRUE,superadmin,now() +RPR_RUPV_SUC_EMAIL,Resident Update Packet Validation Success Email,fra,TRUE,superadmin,now() +RPR_RUPV_SUC_SMS,Resident Update Packet Validation Success SMS,eng,TRUE,superadmin,now() +RPR_RUPV_SUC_SMS,Resident Update Packet Validation Success SMS,ara,TRUE,superadmin,now() +RPR_RUPV_SUC_SMS,Resident Update Packet Validation Success SMS,fra,TRUE,superadmin,now() +RPR_PPV_SUC_EMAIL,Re-print Packet Validation Success Email,eng,TRUE,superadmin,now() +RPR_PPV_SUC_EMAIL,Re-print Packet Validation Success Email,ara,TRUE,superadmin,now() +RPR_PPV_SUC_EMAIL,Re-print Packet Validation Success Email,fra,TRUE,superadmin,now() +RPR_PPV_SUC_SMS,Re-print Packet Validation Success SMS,eng,TRUE,superadmin,now() +RPR_PPV_SUC_SMS,Re-print Packet Validation Success SMS,ara,TRUE,superadmin,now() +RPR_PPV_SUC_SMS,Re-print Packet Validation Success SMS,fra,TRUE,superadmin,now() +RPR_APV_SUC_EMAIL,Activate Packet Validation Success Email,eng,TRUE,superadmin,now() +RPR_APV_SUC_EMAIL,Activate Packet Validation Success Email,ara,TRUE,superadmin,now() +RPR_APV_SUC_EMAIL,Activate Packet Validation Success Email,fra,TRUE,superadmin,now() +RPR_APV_SUC_SMS,Activate Packet Validation Success SMS,eng,TRUE,superadmin,now() +RPR_APV_SUC_SMS,Activate Packet Validation Success SMS,ara,TRUE,superadmin,now() +RPR_APV_SUC_SMS,Activate Packet Validation Success SMS,fra,TRUE,superadmin,now() +RPR_DPV_SUC_EMAIL,De-activate Packet Validation Success Email,eng,TRUE,superadmin,now() +RPR_DPV_SUC_EMAIL,De-activate Packet Validation Success Email,ara,TRUE,superadmin,now() +RPR_DPV_SUC_EMAIL,De-activate Packet Validation Success Email,fra,TRUE,superadmin,now() +RPR_DPV_SUC_SMS,De-activate Packet Validation Success SMS,eng,TRUE,superadmin,now() +RPR_DPV_SUC_SMS,De-activate Packet Validation Success SMS,ara,TRUE,superadmin,now() +RPR_DPV_SUC_SMS,De-activate Packet Validation Success SMS,fra,TRUE,superadmin,now() +RPR_RPV_SUC_EMAIL_SUB,Registration Packet Validation Success Email Sub,eng,TRUE,superadmin,now() +RPR_RPV_SUC_EMAIL_SUB,Registration Packet Validation Success Email Sub,ara,TRUE,superadmin,now() +RPR_RPV_SUC_EMAIL_SUB,Registration Packet Validation Success Email Sub,fra,TRUE,superadmin,now() +RPR_UPV_SUC_EMAIL_SUB,Update Packet Validation Success Email Sub,eng,TRUE,superadmin,now() +RPR_UPV_SUC_EMAIL_SUB,Update Packet Validation Success Email Sub,ara,TRUE,superadmin,now() +RPR_UPV_SUC_EMAIL_SUB,Update Packet Validation Success Email Sub,fra,TRUE,superadmin,now() +RPR_LPV_SUC_EMAIL_SUB,Lost Packet Validation Success Email Sub,eng,TRUE,superadmin,now() +RPR_LPV_SUC_EMAIL_SUB,Lost Packet Validation Success Email Sub,ara,TRUE,superadmin,now() +RPR_LPV_SUC_EMAIL_SUB,Lost Packet Validation Success Email Sub,fra,TRUE,superadmin,now() +RPR_PPV_SUC_EMAIL_SUB,Re-print Packet Validation Success Email Sub,eng,TRUE,superadmin,now() +RPR_PPV_SUC_EMAIL_SUB,Re-print Packet Validation Success Email Sub,ara,TRUE,superadmin,now() +RPR_PPV_SUC_EMAIL_SUB,Re-print Packet Validation Success Email Sub,fra,TRUE,superadmin,now() +RPR_RUPV_SUC_EMAIL_SUB,Resident Update Packet Validation Success Email Sub,eng,TRUE,superadmin,now() +RPR_RUPV_SUC_EMAIL_SUB,Resident Update Packet Validation Success Email Sub,ara,TRUE,superadmin,now() +RPR_RUPV_SUC_EMAIL_SUB,Resident Update Packet Validation Success Email Sub,fra,TRUE,superadmin,now() +RPR_APV_SUC_EMAIL_SUB,Activate Packet Validation Success Email Sub,eng,TRUE,superadmin,now() +RPR_APV_SUC_EMAIL_SUB,Activate Packet Validation Success Email Sub,ara,TRUE,superadmin,now() +RPR_APV_SUC_EMAIL_SUB,Activate Packet Validation Success Email Sub,fra,TRUE,superadmin,now() +RPR_DPV_SUC_EMAIL_SUB,De-activate Packet Validation Success Email Sub,eng,TRUE,superadmin,now() +RPR_DPV_SUC_EMAIL_SUB,De-activate Packet Validation Success Email Sub,ara,TRUE,superadmin,now() +RPR_DPV_SUC_EMAIL_SUB,De-activate Packet Validation Success Email Sub,fra,TRUE,superadmin,now() +RS_CRE_REQ_SUCCESS_SMS,Credential Issuance Success SMS,eng,TRUE,superadmin,now() +RS_CRE_REQ_SUCCESS_SMS,Credential Issuance Success SMS,ara,TRUE,superadmin,now() +RS_CRE_REQ_SUCCESS_SMS,Credential Issuance Success SMS,fra,TRUE,superadmin,now() +RS_CRE_REQ_SUCCESS_EMAIL,Credential Issuance Success EMAIL,eng,TRUE,superadmin,now() +RS_CRE_REQ_SUCCESS_EMAIL,Credential Issuance Success EMAIL,ara,TRUE,superadmin,now() +RS_CRE_REQ_SUCCESS_EMAIL,Credential Issuance Success EMAIL,fra,TRUE,superadmin,now() +RS_CRE_REQ_SUCCESS_EMAIL_SUB,Credential Issuance Success EMAIL Subject,eng,TRUE,superadmin,now() +RS_CRE_REQ_SUCCESS_EMAIL_SUB,Credential Issuance Success EMAIL Subject,ara,TRUE,superadmin,now() +RS_CRE_REQ_SUCCESS_EMAIL_SUB,Credential Issuance Success EMAIL Subject,fra,TRUE,superadmin,now() +RS_CRE_STATUS_SMS,Credential Issuance Status Check SMS,eng,TRUE,superadmin,now() +RS_CRE_STATUS_SMS,Credential Issuance Status Check SMS,ara,TRUE,superadmin,now() +RS_CRE_STATUS_SMS,Credential Issuance Status Check SMS,fra,TRUE,superadmin,now() +RS_CRE_STATUS_EMAIL,Credential Issuance Status Check EMAIL,eng,TRUE,superadmin,now() +RS_CRE_STATUS_EMAIL,Credential Issuance Status Check EMAIL,ara,TRUE,superadmin,now() +RS_CRE_STATUS_EMAIL,Credential Issuance Status Check EMAIL,fra,TRUE,superadmin,now() +RS_CRE_STATUS_EMAIL_SUB,Credential Issuance Status Check EMAIL Subject,eng,TRUE,superadmin,now() +RS_CRE_STATUS_EMAIL_SUB,Credential Issuance Status Check EMAIL Subject,ara,TRUE,superadmin,now() +RS_CRE_STATUS_EMAIL_SUB,Credential Issuance Status Check EMAIL Subject,fra,TRUE,superadmin,now() +RS_CRE_CANCEL_SUCCESS_SMS,Credential Request Cancel Success SMS,eng,TRUE,superadmin,now() +RS_CRE_CANCEL_SUCCESS_SMS,Credential Request Cancel Success SMS,ara,TRUE,superadmin,now() +RS_CRE_CANCEL_SUCCESS_SMS,Credential Request Cancel Success SMS,fra,TRUE,superadmin,now() +RS_CRE_CANCEL_SUCCESS_EMAIL,Credential Request Cancel Success EMAIL,eng,TRUE,superadmin,now() +RS_CRE_CANCEL_SUCCESS_EMAIL,Credential Request Cancel Success EMAIL,ara,TRUE,superadmin,now() +RS_CRE_CANCEL_SUCCESS_EMAIL,Credential Request Cancel Success EMAIL,fra,TRUE,superadmin,now() +RS_CRE_CANCEL_SUCCESS_EMAIL_SUB,Credential Request Cancel Success EMAIL Subject,eng,TRUE,superadmin,now() +RS_CRE_CANCEL_SUCCESS_EMAIL_SUB,Credential Request Cancel Success EMAIL Subject,ara,TRUE,superadmin,now() +RS_CRE_CANCEL_SUCCESS_EMAIL_SUB,Credential Request Cancel Success EMAIL Subject,fra,TRUE,superadmin,now() +RS_CRE_REQ_FAILURE_SMS,Credential Issuance Failure SMS,eng,TRUE,superadmin,now() +RS_CRE_REQ_FAILURE_SMS,Credential Issuance Failure SMS,ara,TRUE,superadmin,now() +RS_CRE_REQ_FAILURE_SMS,Credential Issuance Failure SMS,fra,TRUE,superadmin,now() +RS_CRE_REQ_FAILURE_EMAIL,Credential Issuance Failure EMAIL,eng,TRUE,superadmin,now() +RS_CRE_REQ_FAILURE_EMAIL,Credential Issuance Failure EMAIL,ara,TRUE,superadmin,now() +RS_CRE_REQ_FAILURE_EMAIL,Credential Issuance Failure EMAIL,fra,TRUE,superadmin,now() +RS_CRE_REQ_FAILURE_EMAIL_SUB,Credential Issuance Failure EMAIL Subject,eng,TRUE,superadmin,now() +RS_CRE_REQ_FAILURE_EMAIL_SUB,Credential Issuance Failure EMAIL Subject,ara,TRUE,superadmin,now() +RS_CRE_REQ_FAILURE_EMAIL_SUB,Credential Issuance Failure EMAIL Subject,fra,TRUE,superadmin,now() +reg-ack-template-part,Registration Acknowledgement Template,eng,TRUE,superadmin,now() +reg-ack-template-part,نموذج إقرار التسجيل,ara,TRUE,superadmin,now() +reg-ack-template-part,Modèle d'accusé de réception d'inscription,fra,TRUE,superadmin,now() +reg-preview-template-part,Registration Preview Template,eng,TRUE,superadmin,now() +reg-preview-template-part,نموذج معاينة التسجيل,ara,TRUE,superadmin,now() +reg-preview-template-part,Modèle d'aperçu d'inscription,fra,TRUE,superadmin,now() diff --git a/data-dml/mosip_master/dml/master-title.csv b/data-dml/mosip_master/dml/master-title.csv new file mode 100644 index 00000000000..29343ebf572 --- /dev/null +++ b/data-dml/mosip_master/dml/master-title.csv @@ -0,0 +1,10 @@ +code,name,descr,lang_code,is_active,cr_by,cr_dtimes +MIR,Mr,Male Title,eng,TRUE,superadmin,now() +MRS,Mrs,Female Title,eng,TRUE,superadmin,now() +MIS,Miss,Unmarried Female Title,eng,TRUE,superadmin,now() +MIR,أستاذ,العنوان الذكور,ara,TRUE,superadmin,now() +MRS,ست,عنوان أنثى,ara,TRUE,superadmin,now() +MIS,آنسة,العنوان الإناث غير المتزوجات,ara,TRUE,superadmin,now() +MIR,Monsieur,Titre masculin,fra,TRUE,superadmin,now() +MRS,Madame,Titre féminin,fra,TRUE,superadmin,now() +MIS,Mademoiselle,Titre de femme célibataire,fra,TRUE,superadmin,now() diff --git a/data-dml/mosip_master/dml/master-user_detail.csv b/data-dml/mosip_master/dml/master-user_detail.csv new file mode 100644 index 00000000000..a27c45b19da --- /dev/null +++ b/data-dml/mosip_master/dml/master-user_detail.csv @@ -0,0 +1,132 @@ +id,uin,name,email,mobile,status_code,regcntr_id,lang_code,last_login_method,is_active,cr_by,cr_dtimes +110001,5402120055,Megha Tanga,hortense.dauenhauer@xyz.com,975366148,ACT,10001,eng,PWD,TRUE,superadmin,now() +110002,7314004469,Mahesh Kumar G,leonia.bermeo@xyz.com,795281431,ACT,10003,eng,PWD,TRUE,superadmin,now() +110003,7896109326,Raghav,bong.bragan@xyz.com,739704695,ACT,10003,eng,PWD,TRUE,superadmin,now() +110004,2870381373,Yaswanth,homer.molinar@xyz.com,725028706,ACT,10004,eng,PWD,TRUE,superadmin,now() +110005,7234451333,Mahesh Kumar Panda,antony.hughes@xyz.com,804319687,ACT,10005,eng,PWD,TRUE,superadmin,now() +110006,3563474484,Anusha,sunkadaeanusha@gmail.com,9449170382,ACT,10006,eng,PWD,TRUE,superadmin,now() +110007,5804057178,MOSIP User 1,leia.white@xyz.com,899884346,ACT,10007,eng,PWD,TRUE,superadmin,now() +110008,1823955503,Idella Houge,idella.houge@xyz.com,946624002,ACT,10008,eng,PWD,TRUE,superadmin,now() +110009,6028049229,Shay Vitagliano,shay.vitagliano@xyz.com,716591396,ACT,10009,eng,PWD,TRUE,superadmin,now() +110010,2685259089,Balaji,mazie.negley@xyz.com,718961429,ACT,10010,eng,PWD,TRUE,superadmin,now() +110011,3834346151,Magda Godoy,magda.godoy@xyz.com,938380935,ACT,10011,eng,PWD,TRUE,superadmin,now() +110012,3493338361,Himaja,anya.adorno@xyz.com,911713143,ACT,10011,eng,PWD,TRUE,superadmin,now() +110013,5145284955,Saravanan,darby.self@xyz.com,859668671,ACT,10012,eng,PWD,TRUE,superadmin,now() +110014,4285838622,Balamurugan,crissy.flor@xyz.com,971384902,ACT,10012,eng,PWD,TRUE,superadmin,now() +110015,3740463764,Bettina Goering,bettina.goering@xyz.com,876997632,ACT,10013,eng,PWD,TRUE,superadmin,now() +110016,6431857131,Dinesh,hilary.dunklin@xyz.com,853451517,ACT,10013,eng,PWD,TRUE,superadmin,now() +110017,2638207977,Kris Rahm,kris.rahm@xyz.com,723337142,ACT,10014,eng,PWD,TRUE,superadmin,now() +110018,6893364288,Leona,ferne.hang@xyz.com,733802681,ACT,10014,eng,PWD,TRUE,superadmin,now() +110019,5251539502,Arjun,leilani.heavener@xyz.com,942983448,ACT,10015,eng,PWD,TRUE,superadmin,now() +110020,7724013062,MOSIP User 2,irwin.norwood@xyz.com,936463358,ACT,10015,eng,PWD,TRUE,superadmin,now() +110021,7316931025,Magdalena Weber,magdalena.weber@xyz.com,932122450,ACT,10002,eng,PWD,TRUE,superadmin,now() +110022,9137847236,Tabish Khan,adrienne.hoffman@xyz.com,848488000,ACT,10003,eng,PWD,TRUE,superadmin,now() +110023,8428758532,Adrienne Mcgee,adrienne.mcgee@xyz.com,894773246,ACT,10004,eng,PWD,TRUE,superadmin,now() +110024,9804209494,Sreekar,amare.coleman@xyz.com,956554588,ACT,10003,eng,PWD,TRUE,superadmin,now() +110025,7105248214,Dawson Ibarra,dawson.ibarra@xyz.com,765455583,ACT,10006,eng,PWD,TRUE,superadmin,now() +110026,9316557128,Lingam,elvis.mcmillan@xyz.com,884282274,ACT,10007,eng,PWD,TRUE,superadmin,now() +110027,8103486949,Omsai,steve.george@xyz.com,971073663,ACT,10008,eng,PWD,TRUE,superadmin,now() +110028,9601932866,Colton Elliott,colton.elliott@xyz.com,809908673,ACT,10009,eng,PWD,TRUE,superadmin,now() +110029,9317596765,Gaurav,carolyn.rodriguez@xyz.com,818876429,ACT,10010,eng,PWD,TRUE,superadmin,now() +110030,9317596768,Jane Smith,jane.smith@xyz.com,818876432,ACT,10001,eng,PWD,TRUE,superadmin,now() +110031,9317596767,John Doe,john.doe@xyz.com,818876431,ACT,10001,eng,PWD,TRUE,superadmin,now() +110032,9317596770,Sravan Kalla,ewan.marsh@xyz.com,818876433,ACT,10002,eng,PWD,TRUE,superadmin,now() +110033,9317596771,Nikola Tesla,nikola.tesla@xyz.com,818876434,ACT,10005,eng,PWD,TRUE,superadmin,now() +110034,9317596772,Graham Bell,graham.bell@xyz.com,818876435,ACT,10005,eng,PWD,TRUE,superadmin,now() +110035,9317596773,Albert Miles,albert.miles@xyz.com,818876436,ACT,10005,eng,PWD,TRUE,superadmin,now() +110036,9317596774,Krishnan,krish@mosip.io,818876437,ACT,10006,eng,PWD,TRUE,superadmin,now() +110037,9317596775,Sayeri Mishra,elvis.ibarra@xyz.com,818876438,ACT,10006,eng,PWD,TRUE,superadmin,now() +110038,9317596776,Rounak Nayak,rounak.nayak@mindtree.com,8763740607,ACT,10006,eng,PWD,TRUE,superadmin,now() +110039,9317596777,Girish Yarru,Girish@xyz.com,818876440,ACT,10006,eng,PWD,TRUE,superadmin,now() +110040,9317596778,Shekhar Suman,Shekhar@xyz.com,818876441,ACT,10006,eng,PWD,TRUE,superadmin,now() +110041,9317596779,Nagalakshmi Nithyanandan,Nagalakshmi@xyz.com,818876442,ACT,10006,eng,PWD,TRUE,superadmin,now() +110042,9317596780,Sowmya Ujjappa Banakar,Sowmya@xyz.com,818876443,ACT,10006,eng,PWD,TRUE,superadmin,now() +110043,9317596781,Horteppa Pujari,Horteppa@xyz.com,818876444,ACT,10006,eng,PWD,TRUE,superadmin,now() +110044,9317596782,Rishabh Keshari,Rishabh@xyz.com,818876445,ACT,10006,eng,PWD,TRUE,superadmin,now() +110045,9317596783,Jyoti Prakash Nayak,Jyoti@xyz.com,818876446,ACT,10006,eng,PWD,TRUE,superadmin,now() +110046,9317596784,Mukul Puspam,Mukul@xyz.com,818876447,ACT,10006,eng,PWD,TRUE,superadmin,now() +110047,9317596785,Pranav Kumar,Pranav@xyz.com,818876448,ACT,10006,eng,PWD,TRUE,superadmin,now() +110048,9317596786,Sanjay Shivaji Zende,Sanjay@xyz.com,818876449,ACT,10006,eng,PWD,TRUE,superadmin,now() +110049,9317596787,Monobikash Das,Monobikash@xyz.com,818876450,ACT,10006,eng,PWD,TRUE,superadmin,now() +110050,9317596788,Riju Pragyna Jain,Riju@xyz.com,818876451,ACT,10006,eng,PWD,TRUE,superadmin,now() +110051,9317596789,Ayush Keer,Ayush@xyz.com,818876452,ACT,10006,eng,PWD,TRUE,superadmin,now() +110052,9317596790,Karthik Ramanan,Karthik@xyz.com,818876453,ACT,10006,eng,PWD,TRUE,superadmin,now() +110053,9317596791,Anand,Anand@xyz.com,818876454,ACT,10006,eng,PWD,TRUE,superadmin,now() +110054,9317596792,Technoforte User,technoforte@xyz.com,818876455,ACT,10006,eng,PWD,TRUE,superadmin,now() +110055,9317596793,Ranjitha Siddegowda,Ranjitha@xyz.com,818876456,ACT,10006,eng,PWD,TRUE,superadmin,now() +110056,9317596794,Alok Ranjan,Alok@xyz.com,818876457,ACT,10006,eng,PWD,TRUE,superadmin,now() +110057,9317596795,Sudheer Murthy,Sudheer@xyz.com,818876458,ACT,10006,eng,PWD,TRUE,superadmin,now() +110058,9317596796,Taleev,Taleev@xyz.com,818876459,ACT,10007,eng,PWD,TRUE,superadmin,now() +110059,9317596797,Brahma,Brahma@xyz.com,818876460,ACT,10007,eng,PWD,TRUE,superadmin,now() +110060,9317596798,Rishabh Keshari,Rishabh@xyz.com,818876461,ACT,10007,eng,PWD,TRUE,superadmin,now() +110061,9317596799,Kiranraj,Kiranraj@xyz.com,818876462,ACT,10007,eng,PWD,TRUE,superadmin,now() +110062,9317596800,Phillipines User 1,puser1@xyz.com,818876463,ACT,10008,eng,PWD,TRUE,superadmin,now() +110063,9317596801,Phillipines User 2,puser2@xyz.com,818876464,ACT,10008,eng,PWD,TRUE,superadmin,now() +110064,9317596802,Phillipines User 3,puser3@xyz.com,818876465,ACT,10008,eng,PWD,TRUE,superadmin,now() +110065,9317596803,Krishnan,krishnan@xyz.com,818876466,ACT,10008,eng,PWD,TRUE,superadmin,now() +110066,9317596804,Gururaj 1,Gururaj1@xyz.com,818876467,ACT,10008,eng,PWD,TRUE,superadmin,now() +110067,9317596805,Gururaj 2,Gururaj2@xyz.com,818876468,ACT,10008,eng,PWD,TRUE,superadmin,now() +110068,9317596806,Technoforte User 2,technoforte2@xyz.com,818876469,ACT,10008,eng,PWD,TRUE,superadmin,now() +110069,9317596807,Yadimala,Yadimala@xyz.com,818876470,ACT,10008,eng,PWD,TRUE,superadmin,now() +110070,9317596808,Dummy User,Dummy@xyz.com,818876471,ACT,10008,eng,PWD,TRUE,superadmin,now() +110071,9317596809,Dummy User,Dummy@xyz.com,818876472,ACT,10008,eng,PWD,TRUE,superadmin,now() +110072,9317596810,Dummy User,Dummy@xyz.com,818876473,ACT,10008,eng,PWD,TRUE,superadmin,now() +110073,9317596811,Dummy User,Dummy@xyz.com,818876474,ACT,10008,eng,PWD,TRUE,superadmin,now() +110074,9317596812,Dummy User,Dummy@xyz.com,818876475,ACT,10008,eng,PWD,TRUE,superadmin,now() +110075,9317596813,Dummy User,Dummy@xyz.com,818876476,ACT,10002,eng,PWD,TRUE,superadmin,now() +110076,9317596814,Dummy User,Dummy@xyz.com,818876477,ACT,10001,eng,PWD,TRUE,superadmin,now() +110077,9317596815,Dummy User,Dummy@xyz.com,818876478,ACT,10002,eng,PWD,TRUE,superadmin,now() +110078,9317596816,Dummy User,Dummy@xyz.com,818876479,ACT,10001,eng,PWD,TRUE,superadmin,now() +110079,9317596817,Dummy User,Dummy@xyz.com,818876480,ACT,10002,eng,PWD,TRUE,superadmin,now() +110080,9317596818,Dummy User,Dummy@xyz.com,818876481,ACT,10001,eng,PWD,TRUE,superadmin,now() +110081,9317596819,Dummy User,Dummy@xyz.com,818876482,ACT,10002,eng,PWD,TRUE,superadmin,now() +110082,9317596820,Dummy User,Dummy@xyz.com,818876483,ACT,33333,eng,PWD,TRUE,superadmin,now() +110083,9317596821,Dummy User,Dummy@xyz.com,818876484,ACT,10001,eng,PWD,TRUE,superadmin,now() +110084,9317596822,Dummy User,Dummy@xyz.com,818876485,ACT,10001,eng,PWD,TRUE,superadmin,now() +110085,9317596823,Dummy User,Dummy@xyz.com,818876486,ACT,10002,eng,PWD,TRUE,superadmin,now() +110086,9317596824,Dummy User,Dummy@xyz.com,818876487,ACT,10002,eng,PWD,TRUE,superadmin,now() +110087,9317596825,Dummy User,Dummy@xyz.com,818876488,ACT,10001,eng,PWD,TRUE,superadmin,now() +110088,9317596826,Dummy User,Dummy@xyz.com,818876489,ACT,10001,eng,PWD,TRUE,superadmin,now() +110089,9317596827,Dummy User,Dummy@xyz.com,818876490,ACT,10002,eng,PWD,TRUE,superadmin,now() +110090,9317596828,Dummy User,Dummy@xyz.com,818876491,ACT,10008,eng,PWD,TRUE,superadmin,now() +110091,9317596829,Dummy User,Dummy@xyz.com,818876492,ACT,10008,eng,PWD,TRUE,superadmin,now() +110092,9317596830,Dummy User,Dummy@xyz.com,818876493,ACT,10008,eng,PWD,TRUE,superadmin,now() +110093,9317596831,Dummy User,Dummy@xyz.com,818876494,ACT,10008,eng,PWD,TRUE,superadmin,now() +110094,9317596832,Dummy User,Dummy@xyz.com,818876495,ACT,10008,eng,PWD,TRUE,superadmin,now() +110095,9317596833,Dummy User,Dummy@xyz.com,818876496,ACT,10008,eng,PWD,TRUE,superadmin,now() +110096,9317596834,Dummy User,Dummy@xyz.com,818876497,ACT,10008,eng,PWD,TRUE,superadmin,now() +110097,9317596835,Dummy User,Dummy@xyz.com,818876498,ACT,10008,eng,PWD,TRUE,superadmin,now() +110098,9317596836,Dummy User,Dummy@xyz.com,818876499,ACT,10008,eng,PWD,TRUE,superadmin,now() +110099,9317596837,Dummy User,Dummy@xyz.com,818876500,ACT,10008,eng,PWD,TRUE,superadmin,now() +110100,9317596838,Dummy User,Dummy@xyz.com,818876501,ACT,10008,eng,PWD,TRUE,superadmin,now() +110101,9317596839,Dummy User,Dummy@xyz.com,818876502,ACT,10008,eng,PWD,TRUE,superadmin,now() +110102,9317596840,Dummy User,Dummy@xyz.com,818876503,ACT,10001,eng,PWD,TRUE,superadmin,now() +110103,9317596841,Dummy User,Dummy@xyz.com,818876504,ACT,10001,eng,PWD,TRUE,superadmin,now() +110104,9317596842,Dummy User,Dummy@xyz.com,818876505,ACT,10001,eng,PWD,TRUE,superadmin,now() +110105,9317596843,Dummy User,Dummy@xyz.com,818876506,ACT,10001,eng,PWD,TRUE,superadmin,now() +110106,9317596844,Dummy User,Dummy@xyz.com,818876507,ACT,10001,eng,PWD,TRUE,superadmin,now() +110107,9317596845,Dummy User,Dummy@xyz.com,818876508,ACT,10001,eng,PWD,TRUE,superadmin,now() +110108,9317596846,Dummy User,Dummy@xyz.com,818876509,ACT,10001,eng,PWD,TRUE,superadmin,now() +110109,9317596847,Dummy User,Dummy@xyz.com,818876510,ACT,10001,eng,PWD,TRUE,superadmin,now() +110110,9317596848,Dummy User,Dummy@xyz.com,818876511,ACT,10001,eng,PWD,TRUE,superadmin,now() +110111,9317596849,Dummy User,Dummy@xyz.com,818876512,ACT,10001,eng,PWD,TRUE,superadmin,now() +110112,9317596850,Dummy User,Dummy@xyz.com,818876513,ACT,10001,eng,PWD,TRUE,superadmin,now() +110113,9317596851,Dummy User,Dummy@xyz.com,818876514,ACT,10001,eng,PWD,TRUE,superadmin,now() +110114,9317596852,Dummy User,Dummy@xyz.com,818876515,ACT,10001,eng,PWD,TRUE,superadmin,now() +110115,9317596853,Dummy User,Dummy@xyz.com,818876516,ACT,10001,eng,PWD,TRUE,superadmin,now() +110116,9317596854,Dummy User,Dummy@xyz.com,818876517,ACT,10001,eng,PWD,TRUE,superadmin,now() +110117,9317596855,Dummy User,Dummy@xyz.com,818876518,ACT,10001,eng,PWD,TRUE,superadmin,now() +110118,9317596856,Jane ,Jane.rose@technoforte.co.in,9840587089,ACT,10001,eng,PWD,TRUE,superadmin,now() +110119,9317596857,Piyush ,piyush.singh@technoforte.co.in,8277417831,ACT,10002,eng,PWD,TRUE,superadmin,now() +110120,9317596858,Suchana ,suchana.kankonkar@technoforte.co.in,9980939623,ACT,10001,eng,PWD,TRUE,superadmin,now() +110121,9317596859,Swapna ,swapna.p@technoforte.co.in,9741112380,ACT,10002,eng,PWD,TRUE,superadmin,now() +110122,9317596860,Niyati ,niyati.swami@technoforte.co.in,9606139887,ACT,10001,eng,PWD,TRUE,superadmin,now() +110123,9317596861,Hemant ,Hemant.vadher@technoforte.co.in,9441781690,ACT,10002,eng,PWD,TRUE,superadmin,now() +110124,9317596862,Sanjeev ,sanjeev.shrivastava@technoforte.co.in,8553967572,ACT,10001,eng,PWD,TRUE,superadmin,now() +110125,9317596863,Alok ,alok.tiwari@technoforte.co.in,8800932977,ACT,10001,eng,PWD,TRUE,superadmin,now() +110126,9317596864,Nikhilesh ,nikhilesh.kumar@technoforte.co.in,8600097143,ACT,10002,eng,PWD,TRUE,superadmin,now() +110127,9317596865,Chandra  ,chandra.mishra@technoforte.co.in,9851646105,ACT,10002,eng,PWD,TRUE,superadmin,now() +110128,9317596866,Ankit,ankit.vaishnav@technoforte.co.in,7738710535,ACT,10002,eng,PWD,TRUE,superadmin,now() +110129,9317596867,Mosip Test,mosip-test1@technoforte.co.in,9876543212,ACT,10001,eng,PWD,TRUE,superadmin,now() +110130,9317596868,Testuser1,mosip-test2@technoforte.co.in,9876543213,ACT,10001,eng,PWD,TRUE,superadmin,now() +110131,9317596869,Testuser2,mosip-test3@technoforte.co.in,9876543214,ACT,10002,eng,PWD,TRUE,superadmin,now() diff --git a/data-dml/mosip_master/dml/master-user_detail_h.csv b/data-dml/mosip_master/dml/master-user_detail_h.csv new file mode 100644 index 00000000000..3115b896efb --- /dev/null +++ b/data-dml/mosip_master/dml/master-user_detail_h.csv @@ -0,0 +1,132 @@ +id,uin,name,email,mobile,status_code,regcntr_id,lang_code,last_login_method,is_active,cr_by,cr_dtimes,eff_dtimes +110001,5402120055,Megha Tanga,hortense.dauenhauer@xyz.com,975366148,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110002,7314004469,Mahesh Kumar G,leonia.bermeo@xyz.com,795281431,ACT,10003,eng,PWD,TRUE,superadmin,now(),now() +110003,7896109326,Raghav,bong.bragan@xyz.com,739704695,ACT,10003,eng,PWD,TRUE,superadmin,now(),now() +110004,2870381373,Yaswanth,homer.molinar@xyz.com,725028706,ACT,10004,eng,PWD,TRUE,superadmin,now(),now() +110005,7234451333,Mahesh Kumar Panda,antony.hughes@xyz.com,804319687,ACT,10005,eng,PWD,TRUE,superadmin,now(),now() +110006,3563474484,Anusha,sunkadaeanusha@gmail.com,9449170382,ACT,10006,eng,PWD,TRUE,superadmin,now(),now() +110007,5804057178,MOSIP User 1,leia.white@xyz.com,899884346,ACT,10007,eng,PWD,TRUE,superadmin,now(),now() +110008,1823955503,Idella Houge,idella.houge@xyz.com,946624002,ACT,10008,eng,PWD,TRUE,superadmin,now(),now() +110009,6028049229,Shay Vitagliano,shay.vitagliano@xyz.com,716591396,ACT,10009,eng,PWD,TRUE,superadmin,now(),now() +110010,2685259089,Balaji,mazie.negley@xyz.com,718961429,ACT,10010,eng,PWD,TRUE,superadmin,now(),now() +110011,3834346151,Magda Godoy,magda.godoy@xyz.com,938380935,ACT,10011,eng,PWD,TRUE,superadmin,now(),now() +110012,3493338361,Himaja,anya.adorno@xyz.com,911713143,ACT,10011,eng,PWD,TRUE,superadmin,now(),now() +110013,5145284955,Saravanan,darby.self@xyz.com,859668671,ACT,10012,eng,PWD,TRUE,superadmin,now(),now() +110014,4285838622,Balamurugan,crissy.flor@xyz.com,971384902,ACT,10012,eng,PWD,TRUE,superadmin,now(),now() +110015,3740463764,Bettina Goering,bettina.goering@xyz.com,876997632,ACT,10013,eng,PWD,TRUE,superadmin,now(),now() +110016,6431857131,Dinesh,hilary.dunklin@xyz.com,853451517,ACT,10013,eng,PWD,TRUE,superadmin,now(),now() +110017,2638207977,Kris Rahm,kris.rahm@xyz.com,723337142,ACT,10014,eng,PWD,TRUE,superadmin,now(),now() +110018,6893364288,Leona,ferne.hang@xyz.com,733802681,ACT,10014,eng,PWD,TRUE,superadmin,now(),now() +110019,5251539502,Arjun,leilani.heavener@xyz.com,942983448,ACT,10015,eng,PWD,TRUE,superadmin,now(),now() +110020,7724013062,MOSIP User 2,irwin.norwood@xyz.com,936463358,ACT,10015,eng,PWD,TRUE,superadmin,now(),now() +110021,7316931025,Magdalena Weber,magdalena.weber@xyz.com,932122450,ACT,10002,eng,PWD,TRUE,superadmin,now(),now() +110022,9137847236,Tabish Khan,adrienne.hoffman@xyz.com,848488000,ACT,10003,eng,PWD,TRUE,superadmin,now(),now() +110023,8428758532,Adrienne Mcgee,adrienne.mcgee@xyz.com,894773246,ACT,10004,eng,PWD,TRUE,superadmin,now(),now() +110024,9804209494,Sreekar,amare.coleman@xyz.com,956554588,ACT,10003,eng,PWD,TRUE,superadmin,now(),now() +110025,7105248214,Dawson Ibarra,dawson.ibarra@xyz.com,765455583,ACT,10006,eng,PWD,TRUE,superadmin,now(),now() +110026,9316557128,Lingam,elvis.mcmillan@xyz.com,884282274,ACT,10007,eng,PWD,TRUE,superadmin,now(),now() +110027,8103486949,Omsai,steve.george@xyz.com,971073663,ACT,10008,eng,PWD,TRUE,superadmin,now(),now() +110028,9601932866,Colton Elliott,colton.elliott@xyz.com,809908673,ACT,10009,eng,PWD,TRUE,superadmin,now(),now() +110029,9317596765,Gaurav,carolyn.rodriguez@xyz.com,818876429,ACT,10010,eng,PWD,TRUE,superadmin,now(),now() +110030,9317596768,Jane Smith,jane.smith@xyz.com,818876432,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110031,9317596767,John Doe,john.doe@xyz.com,818876431,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110032,9317596770,Sravan Kalla,ewan.marsh@xyz.com,818876433,ACT,10002,eng,PWD,TRUE,superadmin,now(),now() +110033,9317596771,Nikola Tesla,nikola.tesla@xyz.com,818876434,ACT,10005,eng,PWD,TRUE,superadmin,now(),now() +110034,9317596772,Graham Bell,graham.bell@xyz.com,818876435,ACT,10005,eng,PWD,TRUE,superadmin,now(),now() +110035,9317596773,Albert Miles,albert.miles@xyz.com,818876436,ACT,10005,eng,PWD,TRUE,superadmin,now(),now() +110036,9317596774,Krishnan,krish@mosip.io,818876437,ACT,10006,eng,PWD,TRUE,superadmin,now(),now() +110037,9317596775,Sayeri Mishra,elvis.ibarra@xyz.com,818876438,ACT,10006,eng,PWD,TRUE,superadmin,now(),now() +110038,9317596776,Rounak Nayak,rounak.nayak@mindtree.com,8763740607,ACT,10006,eng,PWD,TRUE,superadmin,now(),now() +110039,9317596777,Girish Yarru,Girish@xyz.com,818876440,ACT,10006,eng,PWD,TRUE,superadmin,now(),now() +110040,9317596778,Shekhar Suman,Shekhar@xyz.com,818876441,ACT,10006,eng,PWD,TRUE,superadmin,now(),now() +110041,9317596779,Nagalakshmi Nithyanandan,Nagalakshmi@xyz.com,818876442,ACT,10006,eng,PWD,TRUE,superadmin,now(),now() +110042,9317596780,Sowmya Ujjappa Banakar,Sowmya@xyz.com,818876443,ACT,10006,eng,PWD,TRUE,superadmin,now(),now() +110043,9317596781,Horteppa Pujari,Horteppa@xyz.com,818876444,ACT,10006,eng,PWD,TRUE,superadmin,now(),now() +110044,9317596782,Rishabh Keshari,Rishabh@xyz.com,818876445,ACT,10006,eng,PWD,TRUE,superadmin,now(),now() +110045,9317596783,Jyoti Prakash Nayak,Jyoti@xyz.com,818876446,ACT,10006,eng,PWD,TRUE,superadmin,now(),now() +110046,9317596784,Mukul Puspam,Mukul@xyz.com,818876447,ACT,10006,eng,PWD,TRUE,superadmin,now(),now() +110047,9317596785,Pranav Kumar,Pranav@xyz.com,818876448,ACT,10006,eng,PWD,TRUE,superadmin,now(),now() +110048,9317596786,Sanjay Shivaji Zende,Sanjay@xyz.com,818876449,ACT,10006,eng,PWD,TRUE,superadmin,now(),now() +110049,9317596787,Monobikash Das,Monobikash@xyz.com,818876450,ACT,10006,eng,PWD,TRUE,superadmin,now(),now() +110050,9317596788,Riju Pragyna Jain,Riju@xyz.com,818876451,ACT,10006,eng,PWD,TRUE,superadmin,now(),now() +110051,9317596789,Ayush Keer,Ayush@xyz.com,818876452,ACT,10006,eng,PWD,TRUE,superadmin,now(),now() +110052,9317596790,Karthik Ramanan,Karthik@xyz.com,818876453,ACT,10006,eng,PWD,TRUE,superadmin,now(),now() +110053,9317596791,Anand,Anand@xyz.com,818876454,ACT,10006,eng,PWD,TRUE,superadmin,now(),now() +110054,9317596792,Technoforte User,technoforte@xyz.com,818876455,ACT,10006,eng,PWD,TRUE,superadmin,now(),now() +110055,9317596793,Ranjitha Siddegowda,Ranjitha@xyz.com,818876456,ACT,10006,eng,PWD,TRUE,superadmin,now(),now() +110056,9317596794,Alok Ranjan,Alok@xyz.com,818876457,ACT,10006,eng,PWD,TRUE,superadmin,now(),now() +110057,9317596795,Sudheer Murthy,Sudheer@xyz.com,818876458,ACT,10006,eng,PWD,TRUE,superadmin,now(),now() +110058,9317596796,Taleev,Taleev@xyz.com,818876459,ACT,10007,eng,PWD,TRUE,superadmin,now(),now() +110059,9317596797,Brahma,Brahma@xyz.com,818876460,ACT,10007,eng,PWD,TRUE,superadmin,now(),now() +110060,9317596798,Rishabh Keshari,Rishabh@xyz.com,818876461,ACT,10007,eng,PWD,TRUE,superadmin,now(),now() +110061,9317596799,Kiranraj,Kiranraj@xyz.com,818876462,ACT,10007,eng,PWD,TRUE,superadmin,now(),now() +110062,9317596800,Phillipines User 1,puser1@xyz.com,818876463,ACT,10008,eng,PWD,TRUE,superadmin,now(),now() +110063,9317596801,Phillipines User 2,puser2@xyz.com,818876464,ACT,10008,eng,PWD,TRUE,superadmin,now(),now() +110064,9317596802,Phillipines User 3,puser3@xyz.com,818876465,ACT,10008,eng,PWD,TRUE,superadmin,now(),now() +110065,9317596803,Krishnan,krishnan@xyz.com,818876466,ACT,10008,eng,PWD,TRUE,superadmin,now(),now() +110066,9317596804,Gururaj 1,Gururaj1@xyz.com,818876467,ACT,10008,eng,PWD,TRUE,superadmin,now(),now() +110067,9317596805,Gururaj 2,Gururaj2@xyz.com,818876468,ACT,10008,eng,PWD,TRUE,superadmin,now(),now() +110068,9317596806,Technoforte User 2,technoforte2@xyz.com,818876469,ACT,10008,eng,PWD,TRUE,superadmin,now(),now() +110069,9317596807,Yadimala,Yadimala@xyz.com,818876470,ACT,10008,eng,PWD,TRUE,superadmin,now(),now() +110070,9317596808,Dummy User,Dummy@xyz.com,818876471,ACT,10008,eng,PWD,TRUE,superadmin,now(),now() +110071,9317596809,Dummy User,Dummy@xyz.com,818876472,ACT,10008,eng,PWD,TRUE,superadmin,now(),now() +110072,9317596810,Dummy User,Dummy@xyz.com,818876473,ACT,10008,eng,PWD,TRUE,superadmin,now(),now() +110073,9317596811,Dummy User,Dummy@xyz.com,818876474,ACT,10008,eng,PWD,TRUE,superadmin,now(),now() +110074,9317596812,Dummy User,Dummy@xyz.com,818876475,ACT,10008,eng,PWD,TRUE,superadmin,now(),now() +110075,9317596813,Dummy User,Dummy@xyz.com,818876476,ACT,10002,eng,PWD,TRUE,superadmin,now(),now() +110076,9317596814,Dummy User,Dummy@xyz.com,818876477,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110077,9317596815,Dummy User,Dummy@xyz.com,818876478,ACT,10002,eng,PWD,TRUE,superadmin,now(),now() +110078,9317596816,Dummy User,Dummy@xyz.com,818876479,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110079,9317596817,Dummy User,Dummy@xyz.com,818876480,ACT,10002,eng,PWD,TRUE,superadmin,now(),now() +110080,9317596818,Dummy User,Dummy@xyz.com,818876481,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110081,9317596819,Dummy User,Dummy@xyz.com,818876482,ACT,10002,eng,PWD,TRUE,superadmin,now(),now() +110082,9317596820,Dummy User,Dummy@xyz.com,818876483,ACT,33333,eng,PWD,TRUE,superadmin,now(),now() +110083,9317596821,Dummy User,Dummy@xyz.com,818876484,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110084,9317596822,Dummy User,Dummy@xyz.com,818876485,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110085,9317596823,Dummy User,Dummy@xyz.com,818876486,ACT,10002,eng,PWD,TRUE,superadmin,now(),now() +110086,9317596824,Dummy User,Dummy@xyz.com,818876487,ACT,10002,eng,PWD,TRUE,superadmin,now(),now() +110087,9317596825,Dummy User,Dummy@xyz.com,818876488,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110088,9317596826,Dummy User,Dummy@xyz.com,818876489,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110089,9317596827,Dummy User,Dummy@xyz.com,818876490,ACT,10002,eng,PWD,TRUE,superadmin,now(),now() +110090,9317596828,Dummy User,Dummy@xyz.com,818876491,ACT,10008,eng,PWD,TRUE,superadmin,now(),now() +110091,9317596829,Dummy User,Dummy@xyz.com,818876492,ACT,10008,eng,PWD,TRUE,superadmin,now(),now() +110092,9317596830,Dummy User,Dummy@xyz.com,818876493,ACT,10008,eng,PWD,TRUE,superadmin,now(),now() +110093,9317596831,Dummy User,Dummy@xyz.com,818876494,ACT,10008,eng,PWD,TRUE,superadmin,now(),now() +110094,9317596832,Dummy User,Dummy@xyz.com,818876495,ACT,10008,eng,PWD,TRUE,superadmin,now(),now() +110095,9317596833,Dummy User,Dummy@xyz.com,818876496,ACT,10008,eng,PWD,TRUE,superadmin,now(),now() +110096,9317596834,Dummy User,Dummy@xyz.com,818876497,ACT,10008,eng,PWD,TRUE,superadmin,now(),now() +110097,9317596835,Dummy User,Dummy@xyz.com,818876498,ACT,10008,eng,PWD,TRUE,superadmin,now(),now() +110098,9317596836,Dummy User,Dummy@xyz.com,818876499,ACT,10008,eng,PWD,TRUE,superadmin,now(),now() +110099,9317596837,Dummy User,Dummy@xyz.com,818876500,ACT,10008,eng,PWD,TRUE,superadmin,now(),now() +110100,9317596838,Dummy User,Dummy@xyz.com,818876501,ACT,10008,eng,PWD,TRUE,superadmin,now(),now() +110101,9317596839,Dummy User,Dummy@xyz.com,818876502,ACT,10008,eng,PWD,TRUE,superadmin,now(),now() +110102,9317596840,Dummy User,Dummy@xyz.com,818876503,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110103,9317596841,Dummy User,Dummy@xyz.com,818876504,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110104,9317596842,Dummy User,Dummy@xyz.com,818876505,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110105,9317596843,Dummy User,Dummy@xyz.com,818876506,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110106,9317596844,Dummy User,Dummy@xyz.com,818876507,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110107,9317596845,Dummy User,Dummy@xyz.com,818876508,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110108,9317596846,Dummy User,Dummy@xyz.com,818876509,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110109,9317596847,Dummy User,Dummy@xyz.com,818876510,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110110,9317596848,Dummy User,Dummy@xyz.com,818876511,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110111,9317596849,Dummy User,Dummy@xyz.com,818876512,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110112,9317596850,Dummy User,Dummy@xyz.com,818876513,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110113,9317596851,Dummy User,Dummy@xyz.com,818876514,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110114,9317596852,Dummy User,Dummy@xyz.com,818876515,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110115,9317596853,Dummy User,Dummy@xyz.com,818876516,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110116,9317596854,Dummy User,Dummy@xyz.com,818876517,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110117,9317596855,Dummy User,Dummy@xyz.com,818876518,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110118,9317596856,Jane ,Jane.rose@technoforte.co.in,9840587089,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110119,9317596857,Piyush ,piyush.singh@technoforte.co.in,8277417831,ACT,10002,eng,PWD,TRUE,superadmin,now(),now() +110120,9317596858,Suchana ,suchana.kankonkar@technoforte.co.in,9980939623,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110121,9317596859,Swapna ,swapna.p@technoforte.co.in,9741112380,ACT,10002,eng,PWD,TRUE,superadmin,now(),now() +110122,9317596860,Niyati ,niyati.swami@technoforte.co.in,9606139887,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110123,9317596861,Hemant ,Hemant.vadher@technoforte.co.in,9441781690,ACT,10002,eng,PWD,TRUE,superadmin,now(),now() +110124,9317596862,Sanjeev ,sanjeev.shrivastava@technoforte.co.in,8553967572,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110125,9317596863,Alok ,alok.tiwari@technoforte.co.in,8800932977,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110126,9317596864,Nikhilesh ,nikhilesh.kumar@technoforte.co.in,8600097143,ACT,10002,eng,PWD,TRUE,superadmin,now(),now() +110127,9317596865,Chandra  ,chandra.mishra@technoforte.co.in,9851646105,ACT,10002,eng,PWD,TRUE,superadmin,now(),now() +110128,9317596866,Ankit,ankit.vaishnav@technoforte.co.in,7738710535,ACT,10002,eng,PWD,TRUE,superadmin,now(),now() +110129,9317596867,Mosip Test,mosip-test1@technoforte.co.in,9876543212,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110130,9317596868,Testuser1,mosip-test2@technoforte.co.in,9876543213,ACT,10001,eng,PWD,TRUE,superadmin,now(),now() +110131,9317596869,Testuser2,mosip-test3@technoforte.co.in,9876543214,ACT,10002,eng,PWD,TRUE,superadmin,now(),now() diff --git a/data-dml/mosip_master/dml/master-valid_document.csv b/data-dml/mosip_master/dml/master-valid_document.csv new file mode 100644 index 00000000000..5f4601acf2b --- /dev/null +++ b/data-dml/mosip_master/dml/master-valid_document.csv @@ -0,0 +1,37 @@ +doctyp_code,doccat_code,lang_code,is_active,cr_by,cr_dtimes +CIN,POI,ara,TRUE,superadmin,now() +RNC,POA,ara,TRUE,superadmin,now() +COR,POA,ara,TRUE,superadmin,now() +CRN,POR,ara,TRUE,superadmin,now() +COB,POB,ara,TRUE,superadmin,now() +DOC001,POI,ara,TRUE,superadmin,now() +DOC002,POI,ara,TRUE,superadmin,now() +DOC003,POI,ara,TRUE,superadmin,now() +DOC004,POI,ara,TRUE,superadmin,now() +DOC005,POI,ara,TRUE,superadmin,now() +DOC006,POI,ara,TRUE,superadmin,now() +DOC007,POI,ara,TRUE,superadmin,now() +DOC008,POI,ara,TRUE,superadmin,now() +DOC009,POI,ara,TRUE,superadmin,now() +DOC010,POI,ara,TRUE,superadmin,now() +DOC011,POI,ara,TRUE,superadmin,now() +DOC012,POI,ara,TRUE,superadmin,now() +DOC001,POA,ara,TRUE,superadmin,now() +DOC013,POA,ara,TRUE,superadmin,now() +DOC014,POA,ara,TRUE,superadmin,now() +DOC015,POA,ara,TRUE,superadmin,now() +DOC004,POA,ara,TRUE,superadmin,now() +DOC005,POA,ara,TRUE,superadmin,now() +DOC006,POA,ara,TRUE,superadmin,now() +DOC016,POA,ara,TRUE,superadmin,now() +DOC017,POA,ara,TRUE,superadmin,now() +DOC018,POA,ara,TRUE,superadmin,now() +DOC008,POA,ara,TRUE,superadmin,now() +DOC024,POR,ara,TRUE,superadmin,now() +DOC025,POR,ara,TRUE,superadmin,now() +DOC026,POR,ara,TRUE,superadmin,now() +DOC001,POR,ara,TRUE,superadmin,now() +DOC027,POR,ara,TRUE,superadmin,now() +DOC028,POR,ara,TRUE,superadmin,now() +COE,POE,ara,TRUE,superadmin,now() +EOP,POE,ara,TRUE,superadmin,now() diff --git a/data-dml/mosip_master/dml/master-zone.csv b/data-dml/mosip_master/dml/master-zone.csv new file mode 100644 index 00000000000..c4cf2bc0759 --- /dev/null +++ b/data-dml/mosip_master/dml/master-zone.csv @@ -0,0 +1,64 @@ +code,name,hierarchy_level,hierarchy_level_name,hierarchy_path,parent_zone_code,lang_code,is_active,cr_by,cr_dtimes +MOR,MyCountry,0,Country,MOR,,eng,TRUE,superadmin,now() +MOR,الْـمَغْرِبُ,0,بلد,MOR,,ara,TRUE,superadmin,now() +MOR,Maroc,0,Pays,MOR,,fra,TRUE,superadmin,now() +NTH,North,1,Direction,MOR/NTH,MOR,eng,TRUE,superadmin,now() +NTH,شمال,1,اتجاه,MOR/NTH,MOR,ara,TRUE,superadmin,now() +NTH,Nord,1,Direction,MOR/NTH,MOR,fra,TRUE,superadmin,now() +RSK,RabatSaleKenitra,2,Region,MOR/NTH/RSK,NTH,eng,TRUE,superadmin,now() +RSK,جهةالرباطسلاالقنيطرة,2,منطقة,MOR/NTH/RSK,NTH,ara,TRUE,superadmin,now() +RSK,Rabat-Salé-Kénitra,2,Région,MOR/NTH/RSK,NTH,fra,TRUE,superadmin,now() +RBT,Rabat,3,Province,MOR/NTH/RSK/RBT,RSK,eng,TRUE,superadmin,now() +RBT,الرباط,3,المحافظة,MOR/NTH/RSK/RBT,RSK,ara,TRUE,superadmin,now() +RBT,Rabat,3,Province,MOR/NTH/RSK/RBT,RSK,fra,TRUE,superadmin,now() +KTA,Kenitra,3,Province,MOR/NTH/RSK/KTA,RSK,eng,TRUE,superadmin,now() +KTA,القنيطرة,3,المحافظة,MOR/NTH/RSK/KTA,RSK,ara,TRUE,superadmin,now() +KTA,Kénitra,3,Province,MOR/NTH/RSK/KTA,RSK,fra,TRUE,superadmin,now() +SAL,Salé ,3,Province,MOR/NTH/RSK/SAL,RSK,eng,TRUE,superadmin,now() +SAL,سلا,3,المحافظة,MOR/NTH/RSK/SAL,RSK,ara,TRUE,superadmin,now() +SAL,Sala,3,Province,MOR/NTH/RSK/SAL,RSK,fra,TRUE,superadmin,now() +CST,Casablanca-Settat,2,Region,MOR/NTH/CST,NTH,eng,TRUE,superadmin,now() +CST,الدارالبيضاء-سطات,2,منطقة,MOR/NTH/CST,NTH,ara,TRUE,superadmin,now() +CST,Casablanca-Settat,2,Région,MOR/NTH/CST,NTH,fra,TRUE,superadmin,now() +BSN,Benslimane,3,Province,MOR/NTH/CST/BSN,CST,eng,TRUE,superadmin,now() +BSN,بنسليمان,3,المحافظة,MOR/NTH/CST/BSN,CST,ara,TRUE,superadmin,now() +BSN,Benslimane,3,Province,MOR/NTH/CST/BSN,CST,fra,TRUE,superadmin,now() +CSB,Casablanca,3,Province,MOR/NTH/CST/CSB,CST,eng,TRUE,superadmin,now() +CSB,ٱلدَّارٱلْبَيْضَاء‎,3,المحافظة,MOR/NTH/CST/CSB,CST,ara,TRUE,superadmin,now() +CSB,Casablanca,3,Province,MOR/NTH/CST/CSB,CST,fra,TRUE,superadmin,now() +STT,Settat,3,Province,MOR/NTH/CST/STT,CST,eng,TRUE,superadmin,now() +STT,سطات‎,3,المحافظة,MOR/NTH/CST/STT,CST,ara,TRUE,superadmin,now() +STT,Settat,3,Province,MOR/NTH/CST/STT,CST,fra,TRUE,superadmin,now() +ORT,Oriental,2,Region,MOR/NTH/ORT,NTH,eng,TRUE,superadmin,now() +ORT,الشرق,2,منطقة,MOR/NTH/ORT,NTH,ara,TRUE,superadmin,now() +ORT,Oriental,2,Région,MOR/NTH/ORT,NTH,fra,TRUE,superadmin,now() +NDR,Nador,3,Province,MOR/NTH/ORT/NDR,ORT,eng,TRUE,superadmin,now() +NDR,الناظور,3,المحافظة,MOR/NTH/ORT/NDR,ORT,ara,TRUE,superadmin,now() +NDR,Nador,3,Province,MOR/NTH/ORT/NDR,ORT,fra,TRUE,superadmin,now() +BRK,Berkane,3,Province,MOR/NTH/ORT/BRK,ORT,eng,TRUE,superadmin,now() +BRK,بَركان,3,المحافظة,MOR/NTH/ORT/BRK,ORT,ara,TRUE,superadmin,now() +BRK,Berkane,3,Province,MOR/NTH/ORT/BRK,ORT,fra,TRUE,superadmin,now() +JRD,Jerada ,3,Province,MOR/NTH/ORT/JRD,ORT,eng,TRUE,superadmin,now() +JRD,جرادة,3,المحافظة,MOR/NTH/ORT/JRD,ORT,ara,TRUE,superadmin,now() +JRD,Jerada ,3,Province,MOR/NTH/ORT/JRD,ORT,fra,TRUE,superadmin,now() +STH,South,1,Direction,MOR/STH,MOR,eng,TRUE,superadmin,now() +STH,جنوب,1,اتجاه,MOR/STH,MOR,ara,TRUE,superadmin,now() +STH,Sud,1,Direction,MOR/STH,MOR,fra,TRUE,superadmin,now() +MRS,Marrakesh-Safi,2,Region,MOR/STH/MRS,STH,eng,TRUE,superadmin,now() +MRS,مراكشآسفي‎,2,منطقة,MOR/STH/MRS,STH,ara,TRUE,superadmin,now() +MRS,Marrakesh-Safi,2,Région,MOR/STH/MRS,STH,fra,TRUE,superadmin,now() +SAF,Safi ,3,Province,MOR/STH/MRS/SAF,MRS,eng,TRUE,superadmin,now() +SAF,آسفي,3,المحافظة,MOR/STH/MRS/SAF,MRS,ara,TRUE,superadmin,now() +SAF,Safi ,3,Province,MOR/STH/MRS/SAF,MRS,fra,TRUE,superadmin,now() +YSF,Youssoufia ,3,Province,MOR/STH/MRS/YSF,MRS,eng,TRUE,superadmin,now() +YSF,اليوسفية,3,المحافظة,MOR/STH/MRS/YSF,MRS,ara,TRUE,superadmin,now() +YSF,Youssoufia ,3,Province,MOR/STH/MRS/YSF,MRS,fra,TRUE,superadmin,now() +SOS,Souss-Massa,2,Region,MOR/STH/SOS,STH,eng,TRUE,superadmin,now() +SOS,سوسماسة,2,منطقة,MOR/STH/SOS,STH,ara,TRUE,superadmin,now() +SOS,Sus-Massa,2,Région,MOR/STH/SOS,STH,fra,TRUE,superadmin,now() +TTA,Tata ,3,Province,MOR/STH/SOS/TTA,SOS,eng,TRUE,superadmin,now() +TTA,طاطا,3,المحافظة,MOR/STH/SOS/TTA,SOS,ara,TRUE,superadmin,now() +TTA,Tata ,3,Province,MOR/STH/SOS/TTA,SOS,fra,TRUE,superadmin,now() +TZT,Tiznit,3,Province,MOR/STH/SOS/TZT,SOS,eng,TRUE,superadmin,now() +TZT,تزنيت‎,3,المحافظة,MOR/STH/SOS/TZT,SOS,ara,TRUE,superadmin,now() +TZT,Tiznit,3,Province,MOR/STH/SOS/TZT,SOS,fra,TRUE,superadmin,now() diff --git a/data-dml/mosip_master/dml/master-zone_user.csv b/data-dml/mosip_master/dml/master-zone_user.csv new file mode 100644 index 00000000000..846fad6ed39 --- /dev/null +++ b/data-dml/mosip_master/dml/master-zone_user.csv @@ -0,0 +1,132 @@ +zone_code,usr_id,lang_code,is_active,cr_by,cr_dtimes +NTH,110001,eng,TRUE,superadmin,now() +NTH,110002,eng,TRUE,superadmin,now() +NTH,110003,eng,TRUE,superadmin,now() +RSK,110004,eng,TRUE,superadmin,now() +CST,110005,eng,TRUE,superadmin,now() +ORT,110006,eng,TRUE,superadmin,now() +NTH,110007,eng,TRUE,superadmin,now() +STH,110008,eng,TRUE,superadmin,now() +STH,110009,eng,TRUE,superadmin,now() +STH,110010,eng,TRUE,superadmin,now() +STH,110011,eng,TRUE,superadmin,now() +STH,110012,eng,TRUE,superadmin,now() +MRS,110013,eng,TRUE,superadmin,now() +MRS,110014,eng,TRUE,superadmin,now() +MRS,110015,eng,TRUE,superadmin,now() +MRS,110016,eng,TRUE,superadmin,now() +SOS,110017,eng,TRUE,superadmin,now() +SOS,110018,eng,TRUE,superadmin,now() +SOS,110019,eng,TRUE,superadmin,now() +SOS,110020,eng,TRUE,superadmin,now() +NTH,110021,eng,TRUE,superadmin,now() +NTH,110022,eng,TRUE,superadmin,now() +RSK,110023,eng,TRUE,superadmin,now() +NTH,110024,eng,TRUE,superadmin,now() +ORT,110025,eng,TRUE,superadmin,now() +NTH,110026,eng,TRUE,superadmin,now() +STH,110027,eng,TRUE,superadmin,now() +STH,110028,eng,TRUE,superadmin,now() +STH,110029,eng,TRUE,superadmin,now() +NTH,110030,eng,TRUE,superadmin,now() +NTH,110031,eng,TRUE,superadmin,now() +NTH,110032,eng,TRUE,superadmin,now() +CST,110033,eng,TRUE,superadmin,now() +CST,110034,eng,TRUE,superadmin,now() +CST,110035,eng,TRUE,superadmin,now() +ORT,110036,eng,TRUE,superadmin,now() +ORT,110037,eng,TRUE,superadmin,now() +ORT,110038,eng,TRUE,superadmin,now() +ORT,110039,eng,TRUE,superadmin,now() +ORT,110040,eng,TRUE,superadmin,now() +ORT,110041,eng,TRUE,superadmin,now() +ORT,110042,eng,TRUE,superadmin,now() +ORT,110043,eng,TRUE,superadmin,now() +ORT,110044,eng,TRUE,superadmin,now() +ORT,110045,eng,TRUE,superadmin,now() +ORT,110046,eng,TRUE,superadmin,now() +ORT,110047,eng,TRUE,superadmin,now() +ORT,110048,eng,TRUE,superadmin,now() +ORT,110049,eng,TRUE,superadmin,now() +ORT,110050,eng,TRUE,superadmin,now() +ORT,110051,eng,TRUE,superadmin,now() +ORT,110052,eng,TRUE,superadmin,now() +ORT,110053,eng,TRUE,superadmin,now() +ORT,110054,eng,TRUE,superadmin,now() +ORT,110055,eng,TRUE,superadmin,now() +ORT,110056,eng,TRUE,superadmin,now() +ORT,110057,eng,TRUE,superadmin,now() +NTH,110058,eng,TRUE,superadmin,now() +NTH,110059,eng,TRUE,superadmin,now() +NTH,110060,eng,TRUE,superadmin,now() +NTH,110061,eng,TRUE,superadmin,now() +STH,110062,eng,TRUE,superadmin,now() +STH,110063,eng,TRUE,superadmin,now() +STH,110064,eng,TRUE,superadmin,now() +STH,110065,eng,TRUE,superadmin,now() +STH,110066,eng,TRUE,superadmin,now() +STH,110067,eng,TRUE,superadmin,now() +STH,110068,eng,TRUE,superadmin,now() +STH,110069,eng,TRUE,superadmin,now() +STH,110070,eng,TRUE,superadmin,now() +STH,110071,eng,TRUE,superadmin,now() +STH,110072,eng,TRUE,superadmin,now() +STH,110073,eng,TRUE,superadmin,now() +STH,110074,eng,TRUE,superadmin,now() +NTH,110075,eng,TRUE,superadmin,now() +NTH,110076,eng,TRUE,superadmin,now() +NTH,110077,eng,TRUE,superadmin,now() +NTH,110078,eng,TRUE,superadmin,now() +NTH,110079,eng,TRUE,superadmin,now() +NTH,110080,eng,TRUE,superadmin,now() +NTH,110081,eng,TRUE,superadmin,now() +NTH,110082,eng,TRUE,superadmin,now() +NTH,110083,eng,TRUE,superadmin,now() +NTH,110084,eng,TRUE,superadmin,now() +NTH,110085,eng,TRUE,superadmin,now() +NTH,110086,eng,TRUE,superadmin,now() +NTH,110087,eng,TRUE,superadmin,now() +NTH,110088,eng,TRUE,superadmin,now() +NTH,110089,eng,TRUE,superadmin,now() +STH,110090,eng,TRUE,superadmin,now() +STH,110091,eng,TRUE,superadmin,now() +STH,110092,eng,TRUE,superadmin,now() +STH,110093,eng,TRUE,superadmin,now() +STH,110094,eng,TRUE,superadmin,now() +STH,110095,eng,TRUE,superadmin,now() +STH,110096,eng,TRUE,superadmin,now() +STH,110097,eng,TRUE,superadmin,now() +STH,110098,eng,TRUE,superadmin,now() +STH,110099,eng,TRUE,superadmin,now() +STH,110100,eng,TRUE,superadmin,now() +STH,110101,eng,TRUE,superadmin,now() +NTH,110102,eng,TRUE,superadmin,now() +NTH,110103,eng,TRUE,superadmin,now() +NTH,110104,eng,TRUE,superadmin,now() +NTH,110105,eng,TRUE,superadmin,now() +NTH,110106,eng,TRUE,superadmin,now() +NTH,110107,eng,TRUE,superadmin,now() +NTH,110108,eng,TRUE,superadmin,now() +NTH,110109,eng,TRUE,superadmin,now() +NTH,110110,eng,TRUE,superadmin,now() +NTH,110111,eng,TRUE,superadmin,now() +NTH,110112,eng,TRUE,superadmin,now() +NTH,110113,eng,TRUE,superadmin,now() +NTH,110114,eng,TRUE,superadmin,now() +NTH,110115,eng,TRUE,superadmin,now() +NTH,110116,eng,TRUE,superadmin,now() +NTH,110117,eng,TRUE,superadmin,now() +NTH,110118,eng,TRUE,superadmin,now() +NTH,110119,eng,TRUE,superadmin,now() +NTH,110120,eng,TRUE,superadmin,now() +NTH,110121,eng,TRUE,superadmin,now() +NTH,110122,eng,TRUE,superadmin,now() +NTH,110123,eng,TRUE,superadmin,now() +NTH,110124,eng,TRUE,superadmin,now() +NTH,110125,eng,TRUE,superadmin,now() +NTH,110126,eng,TRUE,superadmin,now() +NTH,110127,eng,TRUE,superadmin,now() +NTH,110128,eng,TRUE,superadmin,now() +NTH,110129,eng,TRUE,superadmin,now() +NTH,110130,eng,TRUE,superadmin,now() +NTH,110131,eng,TRUE,superadmin,now() diff --git a/data-dml/mosip_master/dml/master-zone_user_h.csv b/data-dml/mosip_master/dml/master-zone_user_h.csv new file mode 100644 index 00000000000..1d93bc1458f --- /dev/null +++ b/data-dml/mosip_master/dml/master-zone_user_h.csv @@ -0,0 +1,132 @@ +zone_code,usr_id,lang_code,is_active,cr_by,cr_dtimes,eff_dtimes +NTH,110001,eng,TRUE,superadmin,now(),now() +NTH,110002,eng,TRUE,superadmin,now(),now() +NTH,110003,eng,TRUE,superadmin,now(),now() +RSK,110004,eng,TRUE,superadmin,now(),now() +CST,110005,eng,TRUE,superadmin,now(),now() +ORT,110006,eng,TRUE,superadmin,now(),now() +NTH,110007,eng,TRUE,superadmin,now(),now() +STH,110008,eng,TRUE,superadmin,now(),now() +STH,110009,eng,TRUE,superadmin,now(),now() +STH,110010,eng,TRUE,superadmin,now(),now() +STH,110011,eng,TRUE,superadmin,now(),now() +STH,110012,eng,TRUE,superadmin,now(),now() +MRS,110013,eng,TRUE,superadmin,now(),now() +MRS,110014,eng,TRUE,superadmin,now(),now() +MRS,110015,eng,TRUE,superadmin,now(),now() +MRS,110016,eng,TRUE,superadmin,now(),now() +SOS,110017,eng,TRUE,superadmin,now(),now() +SOS,110018,eng,TRUE,superadmin,now(),now() +SOS,110019,eng,TRUE,superadmin,now(),now() +SOS,110020,eng,TRUE,superadmin,now(),now() +NTH,110021,eng,TRUE,superadmin,now(),now() +NTH,110022,eng,TRUE,superadmin,now(),now() +RSK,110023,eng,TRUE,superadmin,now(),now() +NTH,110024,eng,TRUE,superadmin,now(),now() +ORT,110025,eng,TRUE,superadmin,now(),now() +NTH,110026,eng,TRUE,superadmin,now(),now() +STH,110027,eng,TRUE,superadmin,now(),now() +STH,110028,eng,TRUE,superadmin,now(),now() +STH,110029,eng,TRUE,superadmin,now(),now() +NTH,110030,eng,TRUE,superadmin,now(),now() +NTH,110031,eng,TRUE,superadmin,now(),now() +NTH,110032,eng,TRUE,superadmin,now(),now() +CST,110033,eng,TRUE,superadmin,now(),now() +CST,110034,eng,TRUE,superadmin,now(),now() +CST,110035,eng,TRUE,superadmin,now(),now() +ORT,110036,eng,TRUE,superadmin,now(),now() +ORT,110037,eng,TRUE,superadmin,now(),now() +ORT,110038,eng,TRUE,superadmin,now(),now() +ORT,110039,eng,TRUE,superadmin,now(),now() +ORT,110040,eng,TRUE,superadmin,now(),now() +ORT,110041,eng,TRUE,superadmin,now(),now() +ORT,110042,eng,TRUE,superadmin,now(),now() +ORT,110043,eng,TRUE,superadmin,now(),now() +ORT,110044,eng,TRUE,superadmin,now(),now() +ORT,110045,eng,TRUE,superadmin,now(),now() +ORT,110046,eng,TRUE,superadmin,now(),now() +ORT,110047,eng,TRUE,superadmin,now(),now() +ORT,110048,eng,TRUE,superadmin,now(),now() +ORT,110049,eng,TRUE,superadmin,now(),now() +ORT,110050,eng,TRUE,superadmin,now(),now() +ORT,110051,eng,TRUE,superadmin,now(),now() +ORT,110052,eng,TRUE,superadmin,now(),now() +ORT,110053,eng,TRUE,superadmin,now(),now() +ORT,110054,eng,TRUE,superadmin,now(),now() +ORT,110055,eng,TRUE,superadmin,now(),now() +ORT,110056,eng,TRUE,superadmin,now(),now() +ORT,110057,eng,TRUE,superadmin,now(),now() +NTH,110058,eng,TRUE,superadmin,now(),now() +NTH,110059,eng,TRUE,superadmin,now(),now() +NTH,110060,eng,TRUE,superadmin,now(),now() +NTH,110061,eng,TRUE,superadmin,now(),now() +STH,110062,eng,TRUE,superadmin,now(),now() +STH,110063,eng,TRUE,superadmin,now(),now() +STH,110064,eng,TRUE,superadmin,now(),now() +STH,110065,eng,TRUE,superadmin,now(),now() +STH,110066,eng,TRUE,superadmin,now(),now() +STH,110067,eng,TRUE,superadmin,now(),now() +STH,110068,eng,TRUE,superadmin,now(),now() +STH,110069,eng,TRUE,superadmin,now(),now() +STH,110070,eng,TRUE,superadmin,now(),now() +STH,110071,eng,TRUE,superadmin,now(),now() +STH,110072,eng,TRUE,superadmin,now(),now() +STH,110073,eng,TRUE,superadmin,now(),now() +STH,110074,eng,TRUE,superadmin,now(),now() +NTH,110075,eng,TRUE,superadmin,now(),now() +NTH,110076,eng,TRUE,superadmin,now(),now() +NTH,110077,eng,TRUE,superadmin,now(),now() +NTH,110078,eng,TRUE,superadmin,now(),now() +NTH,110079,eng,TRUE,superadmin,now(),now() +NTH,110080,eng,TRUE,superadmin,now(),now() +NTH,110081,eng,TRUE,superadmin,now(),now() +NTH,110082,eng,TRUE,superadmin,now(),now() +NTH,110083,eng,TRUE,superadmin,now(),now() +NTH,110084,eng,TRUE,superadmin,now(),now() +NTH,110085,eng,TRUE,superadmin,now(),now() +NTH,110086,eng,TRUE,superadmin,now(),now() +NTH,110087,eng,TRUE,superadmin,now(),now() +NTH,110088,eng,TRUE,superadmin,now(),now() +NTH,110089,eng,TRUE,superadmin,now(),now() +STH,110090,eng,TRUE,superadmin,now(),now() +STH,110091,eng,TRUE,superadmin,now(),now() +STH,110092,eng,TRUE,superadmin,now(),now() +STH,110093,eng,TRUE,superadmin,now(),now() +STH,110094,eng,TRUE,superadmin,now(),now() +STH,110095,eng,TRUE,superadmin,now(),now() +STH,110096,eng,TRUE,superadmin,now(),now() +STH,110097,eng,TRUE,superadmin,now(),now() +STH,110098,eng,TRUE,superadmin,now(),now() +STH,110099,eng,TRUE,superadmin,now(),now() +STH,110100,eng,TRUE,superadmin,now(),now() +STH,110101,eng,TRUE,superadmin,now(),now() +NTH,110102,eng,TRUE,superadmin,now(),now() +NTH,110103,eng,TRUE,superadmin,now(),now() +NTH,110104,eng,TRUE,superadmin,now(),now() +NTH,110105,eng,TRUE,superadmin,now(),now() +NTH,110106,eng,TRUE,superadmin,now(),now() +NTH,110107,eng,TRUE,superadmin,now(),now() +NTH,110108,eng,TRUE,superadmin,now(),now() +NTH,110109,eng,TRUE,superadmin,now(),now() +NTH,110110,eng,TRUE,superadmin,now(),now() +NTH,110111,eng,TRUE,superadmin,now(),now() +NTH,110112,eng,TRUE,superadmin,now(),now() +NTH,110113,eng,TRUE,superadmin,now(),now() +NTH,110114,eng,TRUE,superadmin,now(),now() +NTH,110115,eng,TRUE,superadmin,now(),now() +NTH,110116,eng,TRUE,superadmin,now(),now() +NTH,110117,eng,TRUE,superadmin,now(),now() +NTH,110118,eng,TRUE,superadmin,now(),now() +NTH,110119,eng,TRUE,superadmin,now(),now() +NTH,110120,eng,TRUE,superadmin,now(),now() +NTH,110121,eng,TRUE,superadmin,now(),now() +NTH,110122,eng,TRUE,superadmin,now(),now() +NTH,110123,eng,TRUE,superadmin,now(),now() +NTH,110124,eng,TRUE,superadmin,now(),now() +NTH,110125,eng,TRUE,superadmin,now(),now() +NTH,110126,eng,TRUE,superadmin,now(),now() +NTH,110127,eng,TRUE,superadmin,now(),now() +NTH,110128,eng,TRUE,superadmin,now(),now() +NTH,110129,eng,TRUE,superadmin,now(),now() +NTH,110130,eng,TRUE,superadmin,now(),now() +NTH,110131,eng,TRUE,superadmin,now(),now() diff --git a/data-dml/mosip_master/mosip_master_deploy.properties b/data-dml/mosip_master/mosip_master_deploy.properties new file mode 100644 index 00000000000..f474fa3f736 --- /dev/null +++ b/data-dml/mosip_master/mosip_master_deploy.properties @@ -0,0 +1,10 @@ +DB_SERVERIP= +DB_PORT= +SU_USER=postgres +DEFAULT_DB_NAME=postgres +MOSIP_DB_NAME=mosip_master +SYSADMIN_USER=sysadmin +BASEPATH=/home/madmin/database/ +LOG_PATH=/home/madmin/logs/ +DML_FLAG=1 +DML_FILENAME=mosip_master_dml_deploy.sql diff --git a/data-dml/mosip_master/mosip_master_dml_deploy.sh b/data-dml/mosip_master/mosip_master_dml_deploy.sh new file mode 100644 index 00000000000..a1b2aedb790 --- /dev/null +++ b/data-dml/mosip_master/mosip_master_dml_deploy.sh @@ -0,0 +1,70 @@ +### -- --------------------------------------------------------------------------------------------------------- +### -- Script Name : DML deploy +### -- Deploy Module : MOSIP MASTER / ADMIN SERVICES +### -- Purpose : To deploy Database DMLs. +### -- Create By : Sadanandegowda DM +### -- Created Date : Nov-2020 +### -- +### -- Modified Date Modified By Comments / Remarks +### -- ----------------------------------------------------------------------------------------------------------- + +#########Properties file ############# +set -e +properties_file="$1" +echo `date "+%m/%d/%Y %H:%M:%S"` ": $properties_file" +#properties_file="./app.properties" +if [ -f "$properties_file" ] +then + echo `date "+%m/%d/%Y %H:%M:%S"` ": Property file \"$properties_file\" found." + while IFS='=' read -r key value + do + key=$(echo $key | tr '.' '_') + eval ${key}=\${value} + done < "$properties_file" +else + echo `date "+%m/%d/%Y %H:%M:%S"` ": Property file not found, Pass property file name as argument." +fi +echo `date "+%m/%d/%Y %H:%M:%S"` ": ------------------ Database server and service status check for ${MOSIP_DB_NAME}------------------------" +##############################################LOG FILE CREATION############################################################# + +today=`date '+%d%m%Y_%H%M%S'`; +LOG="${LOG_PATH}${MOSIP_DB_NAME}-dml-${today}.log" +touch $LOG + + +SERVICE=$(PGPASSWORD=$SU_USER_PWD psql --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -t -c "select count(1) from pg_roles where rolname IN('sysadmin')";exit; > /dev/null) + +if [ "$SERVICE" -eq 0 ] || [ "$SERVICE" -eq 1 ] +then +echo `date "+%m/%d/%Y %H:%M:%S"` ": Postgres database server and service is up and running" | tee -a $LOG 2>&1 +else +echo `date "+%m/%d/%Y %H:%M:%S"` ": Postgres database server or service is not running" | tee -a $LOG 2>&1 +fi + +echo `date "+%m/%d/%Y %H:%M:%S"` ": ----------------------------------------------------------------------------------------" + +echo `date "+%m/%d/%Y %H:%M:%S"` ": Started sourcing the $MOSIP_DB_NAME Database DML scripts" | tee -a $LOG 2>&1 +echo `date "+%m/%d/%Y %H:%M:%S"` ": Database scripts are sourcing from :$BASEPATH" | tee -a $LOG 2>&1 + +#========================================DB DML Deployment process begins on DB SERVER====================================== + +if [ ${DML_FLAG} == 1 ] +then + echo `date "+%m/%d/%Y %H:%M:%S"` ": Deploying DML for ${MOSIP_DB_NAME} database" | tee -a $LOG 2>&1 + PGPASSWORD=$SYSADMIN_PWD psql --username=$SYSADMIN_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -a -b -f $DML_FILENAME >> $LOG 2>&1 +else + echo `date "+%m/%d/%Y %H:%M:%S"` ": There are no DML deployment required for ${MOSIP_DB_NAME}" | tee -a $LOG 2>&1 +fi + +if [ $(grep -c ERROR $LOG) -ne 0 ] +then + echo `date "+%m/%d/%Y %H:%M:%S"` ": Database DML deployment is completed with ERRORS, Please check the logs for more information" | tee -a $LOG 2>&1 + echo `date "+%m/%d/%Y %H:%M:%S"` ": END of MOSIP database deployment" | tee -a $LOG 2>&1 +else + echo `date "+%m/%d/%Y %H:%M:%S"` ": Database DML deployment completed successfully, Please check the logs for more information" | tee -a $LOG 2>&1 + echo `date "+%m/%d/%Y %H:%M:%S"` ": END of MOSIP \"${MOSIP_DB_NAME}\" database deployment" | tee -a $LOG 2>&1 +fi + +echo "******************************************"`date "+%m/%d/%Y %H:%M:%S"` "*****************************************************" >> $LOG 2>&1 + +#========================================DB DML Deployment process completes on DB SERVER====================================== diff --git a/data-dml/mosip_master/mosip_master_dml_deploy.sql b/data-dml/mosip_master/mosip_master_dml_deploy.sql new file mode 100644 index 00000000000..2017b59c637 --- /dev/null +++ b/data-dml/mosip_master/mosip_master_dml_deploy.sql @@ -0,0 +1,303 @@ +\c mosip_master sysadmin + +\set CSVDataPath '\'/home/dbadmin/mosip_master/dml' + +-------------- Level 1 data load scripts ------------------------ + +----- TRUNCATE master.app_detail TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.app_detail cascade ; + +\COPY master.app_detail (id,name,descr,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-app_detail.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.authentication_method TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.authentication_method cascade ; + +\COPY master.authentication_method (code,method_seq,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-authentication_method.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.biometric_type TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.biometric_type cascade ; + +\COPY master.biometric_type (code,name,descr,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-biometric_type.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.blacklisted_words TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.blacklisted_words cascade ; + +\COPY master.blacklisted_words (word,descr,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-blacklisted_words.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.device_type TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.device_type cascade ; + +\COPY master.device_type (code,name,descr,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-device_type.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.doc_category TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.doc_category cascade ; + +\COPY master.doc_category (code,name,descr,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-doc_category.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.doc_type TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.doc_type cascade ; + +\COPY master.doc_type (code,name,descr,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-doc_type.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.gender TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.gender cascade ; + +\COPY master.gender (code,name,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-gender.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.id_type TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.id_type cascade ; + +\COPY master.id_type (code,name,descr,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-id_type.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.language TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.language cascade ; + +\COPY master.language (code,name,family,native_name,is_active,cr_by,cr_dtimes) FROM './dml/master-language.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.machine_type TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.machine_type cascade ; + +\COPY master.machine_type (code,name,descr,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-machine_type.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.module_detail TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.module_detail cascade ; + +\COPY master.module_detail (id,name,descr,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-module_detail.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.process_list TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.process_list cascade ; + +\COPY master.process_list (id,name,descr,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-process_list.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.reason_category TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.reason_category cascade ; + +\COPY master.reason_category (code,name,descr,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-reason_category.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.reg_center_type TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.reg_center_type cascade ; + +\COPY master.reg_center_type (code,name,descr,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-reg_center_type.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.role_list TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.role_list cascade ; + +\COPY master.role_list (code,descr,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-role_list.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.status_type TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.status_type cascade ; + +\COPY master.status_type (code,name,descr,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-status_type.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.template_file_format TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.template_file_format cascade ; + +\COPY master.template_file_format (code,descr,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-template_file_format.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.template_type TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.template_type cascade ; + +\COPY master.template_type (code,descr,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-template_type.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.title TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.title cascade ; + +\COPY master.title (code,name,descr,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-title.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.individual_type TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.individual_type cascade ; + +\COPY master.individual_type (code,name,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-individual_type.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.zone TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.zone cascade ; + +\COPY master.zone (code,name,hierarchy_level,hierarchy_level_name,hierarchy_path,parent_zone_code,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-zone.csv' delimiter ',' HEADER csv; + + +----- TRUNCATE master.daysofweek_list TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.daysofweek_list cascade ; + +\COPY master.daysofweek_list (code,name,day_seq,is_global_working,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-daysofweek_list.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.loc_hierarchy_list TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.loc_hierarchy_list cascade ; + +\COPY master.loc_hierarchy_list (hierarchy_level,hierarchy_level_name,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-loc_hierarchy_list.csv' delimiter ',' HEADER csv; + + +----- TRUNCATE master.identity_schema TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.identity_schema cascade ; + +\COPY master.identity_schema (id,id_version,title,description,id_attr_json,schema_json,status_code,add_props,effective_from,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-identity_schema.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.sync_job_def TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.sync_job_def cascade ; + +\COPY master.sync_job_def (ID,NAME,API_NAME,PARENT_SYNCJOB_ID,SYNC_FREQ,LOCK_DURATION,LANG_CODE,IS_ACTIVE,CR_BY,CR_DTIMES,UPD_BY,UPD_DTIMES,IS_DELETED,DEL_DTIMES) FROM './dml/master-sync_job_def.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.dynamic_field TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.dynamic_field cascade ; + +\COPY master.dynamic_field (id,name,description,data_type,value_json,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-dynamic_field.csv' delimiter ',' HEADER csv; + + + +-------------- Level 2 data load scripts ------------------------ + +----- TRUNCATE master.location TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.location cascade ; + +\COPY master.location (code,name,hierarchy_level,hierarchy_level_name,parent_loc_code,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-location.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.app_authentication_method TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.app_authentication_method cascade ; + +\COPY master.app_authentication_method (app_id,process_id,role_code,auth_method_code,method_seq,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-app_authentication_method.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.app_role_priority TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.app_role_priority cascade ; + +\COPY master.app_role_priority (app_id,process_id,role_code,priority,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-app_role_priority.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.biometric_attribute TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.biometric_attribute cascade ; + +\COPY master.biometric_attribute (code,name,descr,bmtyp_code,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-biometric_attribute.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.device_spec TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.device_spec cascade ; + +\COPY master.device_spec (id,name,brand,model,dtyp_code,min_driver_ver,descr,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-device_spec.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.loc_holiday TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.loc_holiday cascade ; + +\COPY master.loc_holiday (id,location_code,holiday_date,holiday_name,holiday_desc,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-loc_holiday.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.machine_spec TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.machine_spec cascade ; + +\COPY master.machine_spec (id,name,brand,model,mtyp_code,min_driver_ver,descr,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-machine_spec.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.reason_list TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.reason_list cascade ; + +\COPY master.reason_list (code,name,descr,rsncat_code,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-reason_list.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.registration_center TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.registration_center cascade ; + +\COPY master.registration_center (id,name,cntrtyp_code,addr_line1,addr_line2,addr_line3,latitude,longitude,location_code,contact_phone,contact_person,number_of_kiosks,working_hours,per_kiosk_process_time,center_start_time,center_end_time,lunch_start_time,lunch_end_time,time_zone,holiday_loc_code,zone_code,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-registration_center.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.screen_detail TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.screen_detail cascade ; + +\COPY master.screen_detail (id,app_id,name,descr,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-screen_detail.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.status_list TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.status_list cascade ; + +\COPY master.status_list (code,descr,sttyp_code,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-status_list.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.template TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.template cascade ; + +\COPY master.template (id,name,descr,file_format_code,model,file_txt,module_id,module_name,template_typ_code,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-template.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.applicant_valid_document TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.applicant_valid_document cascade ; + +\COPY master.applicant_valid_document (apptyp_code,doccat_code,doctyp_code,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-applicant_valid_document.csv' delimiter ',' HEADER csv; + + +----- TRUNCATE master.valid_document TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.valid_document cascade ; + +\COPY master.valid_document (doctyp_code,doccat_code,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-valid_document.csv' delimiter ',' HEADER csv; + + +-------------- Level 3 data load scripts ------------------------ + +----- TRUNCATE master.device_master TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.device_master cascade ; + +\COPY master.device_master (id,name,mac_address,serial_num,ip_address,dspec_id,zone_code,regcntr_id,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-device_master.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.machine_master TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.machine_master cascade ; + +\COPY master.machine_master (id,name,mac_address,serial_num,ip_address,mspec_id,public_key,key_index,zone_code,regcntr_id,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-machine_master.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.screen_authorization TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.screen_authorization cascade ; + +\COPY master.screen_authorization (screen_id,role_code,lang_code,is_permitted,is_active,cr_by,cr_dtimes) FROM './dml/master-screen_authorization.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.user_detail TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.user_detail cascade ; + +\COPY master.user_detail (id,uin,name,email,mobile,status_code,regcntr_id,lang_code,last_login_method,is_active,cr_by,cr_dtimes) FROM './dml/master-user_detail.csv' delimiter ',' HEADER csv; + + +----- TRUNCATE master.reg_working_nonworking TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.reg_working_nonworking cascade ; + +\COPY master.reg_working_nonworking (regcntr_id,day_code,lang_code,is_working,is_active,cr_by,cr_dtimes) FROM './dml/master-reg_working_nonworking.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.reg_exceptional_holiday TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.reg_exceptional_holiday cascade ; + +\COPY master.reg_exceptional_holiday (regcntr_id,hol_date,hol_name,hol_reason,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-reg_exceptional_holiday.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.zone_user TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.zone_user cascade ; + +\COPY master.zone_user (zone_code,usr_id,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/master-zone_user.csv' delimiter ',' HEADER csv; + +-------------- Level 4 data load scripts ------------------------ + +----- TRUNCATE master.device_master_h TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.device_master_h cascade ; + +\COPY master.device_master_h (id,name,mac_address,serial_num,ip_address,dspec_id,zone_code,regcntr_id,lang_code,is_active,cr_by,cr_dtimes,eff_dtimes) FROM './dml/master-device_master_h.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.machine_master_h TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.machine_master_h cascade ; + +\COPY master.machine_master_h (id,name,mac_address,serial_num,ip_address,mspec_id,public_key,key_index,zone_code,regcntr_id,lang_code,is_active,cr_by,cr_dtimes,eff_dtimes) FROM './dml/master-machine_master_h.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.registration_center_h TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.registration_center_h cascade ; + +\COPY master.registration_center_h (id,name,cntrtyp_code,addr_line1,addr_line2,addr_line3,latitude,longitude,location_code,contact_phone,contact_person,number_of_kiosks,working_hours,per_kiosk_process_time,center_start_time,center_end_time,lunch_start_time,lunch_end_time,time_zone,holiday_loc_code,zone_code,lang_code,is_active,cr_by,cr_dtimes,eff_dtimes) FROM './dml/master-registration_center_h.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.user_detail_h TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.user_detail_h cascade ; + +\COPY master.user_detail_h (id,uin,name,email,mobile,status_code,regcntr_id,lang_code,last_login_method,is_active,cr_by,cr_dtimes,eff_dtimes) FROM './dml/master-user_detail_h.csv' delimiter ',' HEADER csv; + +----- TRUNCATE master.zone_user TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE master.zone_user_h cascade ; + +\COPY master.zone_user_h (zone_code,usr_id,lang_code,is_active,cr_by,cr_dtimes,eff_dtimes) FROM './dml/master-zone_user_h.csv' delimiter ',' HEADER csv; + +--------------------------------------------------------------------------------------------------------------------------------------------------------------------- + + + + + + + + + + + + + + + + + + diff --git a/data-dml/mosip_pms/dml/pms-auth_policy.csv b/data-dml/mosip_pms/dml/pms-auth_policy.csv new file mode 100644 index 00000000000..f15bfa7abf5 --- /dev/null +++ b/data-dml/mosip_pms/dml/pms-auth_policy.csv @@ -0,0 +1,8 @@ +id,policy_group_id,name,descr,policy_file_id,policy_type,version,policy_schema,valid_from_date,valid_to_date,is_active,cr_by,cr_dtimes,upd_by,upd_dtimes +mpolicy-default-auth,mpolicygroup-default-auth,mpolicy-default-auth,mpolicy-default-auth,"{""shareableAttributes"":[{""attributeName"":""fullName"",""source"":[{""attribute"":""fullName""}],""encrypted"":true},{""attributeName"":""dateOfBirth"",""source"":[{""attribute"":""dateOfBirth""}],""encrypted"":true},{""attributeName"":""gender"",""source"":[{""attribute"":""gender""}],""encrypted"":true},{""attributeName"":""phone"",""source"":[{""attribute"":""phone""}],""encrypted"":true},{""attributeName"":""email"",""source"":[{""attribute"":""email""}],""encrypted"":true},{""attributeName"":""addressLine1"",""source"":[{""attribute"":""addressLine1""}],""encrypted"":true},{""attributeName"":""addressLine2"",""source"":[{""attribute"":""addressLine2""}],""encrypted"":true},{""attributeName"":""addressLine3"",""source"":[{""attribute"":""addressLine3""}],""encrypted"":true},{""attributeName"":""region"",""source"":[{""attribute"":""region""}],""encrypted"":true},{""attributeName"":""province"",""source"":[{""attribute"":""province""}],""encrypted"":true},{""attributeName"":""city"",""source"":[{""attribute"":""city""}],""encrypted"":true},{""attributeName"":""postalCode"",""source"":[{""attribute"":""postalCode""}],""encrypted"":true},{""attributeName"":""individualBiometrics"",""group"":""CBEFF"",""source"":[{""attribute"":""individualBiometrics""}],""encrypted"":true,""format"":""extraction""}],""dataSharePolicies"":{""typeOfShare"":""Data Share"",""validForInMinutes"":""30"",""transactionsAllowed"":""2"",""encryptionType"":""Partner Based"",""shareDomain"":""datashare-service"",""source"":""ID Repository""}}",DataShare,1,https://schemas.mosip.io/v1/auth-policy,now(),4/28/2025 9:37,TRUE,admin,now(),admin,now() +mpolicy-default-abis,mpolicygroup-deafult-abis,mpolicy-default-abis,mpolicy-default-abis,"{""shareableAttributes"":[{""attributeName"":""biometrics"",""group"":""CBEFF"",""source"":[{""attribute"":""registration-client\/NEW\/individualBiometrics"",""filter"":[{""type"":""Iris""}]},{""attribute"":""CNIE\/verification\/biometrics"",""filter"":[{""type"":""Finger""}]},{""attribute"":""CNIE\/verification\/biometrics"",""filter"":[{""type"":""Face""}]}],""encrypted"":true,""format"":""extraction""}],""dataSharePolicies"":{""typeOfShare"":""Data Share"",""validForInMinutes"":""30"",""transactionsAllowed"":""2"",""encryptionType"":""Partner Based"",""shareDomain"":""datashare-service"",""source"":""Packet Manager""}}",DataShare,1,https://schemas.mosip.io/v1/auth-policy,now(),4/28/2025 9:37,TRUE,admin,now(),admin,now() +mpolicy-default-qrcode,mpolicygroup-deafult-print,mpolicy-default-qrcode,mpolicy-default-qrcode,"{""dataSharePolicies"":{""typeOfShare"":""direct"",""validForInMinutes"":""30"",""transactionsAllowed"":""2"",""encryptionType"":""Partner Based"",""shareDomain"":""datashare-service"",""source"":""ID Repository""},""shareableAttributes"":[{""attributeName"":""fullName"",""source"":[{""attribute"":""fullName"",""filter"":[{""language"":""eng""}]}],""encrypted"":false},{""attributeName"":""dateOfBirth"",""source"":[{""attribute"":""dateOfBirth""}],""encrypted"":false,""format"":""YYYY""},{""attributeName"":""gender"",""source"":[{""attribute"":""gender""}],""encrypted"":false},{""attributeName"":""phone"",""source"":[{""attribute"":""phone""}],""encrypted"":false},{""attributeName"":""email"",""source"":[{""attribute"":""email""}],""encrypted"":false},{""attributeName"":""addressLine1"",""source"":[{""attribute"":""addressLine1""}],""encrypted"":false},{""attributeName"":""addressLine2"",""source"":[{""attribute"":""addressLine2""}],""encrypted"":false},{""attributeName"":""addressLine3"",""source"":[{""attribute"":""addressLine3""}],""encrypted"":false},{""attributeName"":""region"",""source"":[{""attribute"":""region""}],""encrypted"":false},{""attributeName"":""province"",""source"":[{""attribute"":""province""}],""encrypted"":false},{""attributeName"":""city"",""source"":[{""attribute"":""city""}],""encrypted"":false},{""attributeName"":""UIN"",""source"":[{""attribute"":""UIN""}],""encrypted"":false},{""attributeName"":""postalCode"",""source"":[{""attribute"":""postalCode""}],""encrypted"":false},{""attributeName"":""biometrics"",""group"":""CBEFF"",""source"":[{""attribute"":""individualBiometrics"",""filter"":[{""type"":""Face""},{""type"":""Finger"",""subType"":[""Left Thumb"",""Right Thumb""]}]}],""encrypted"":true,""format"":""extraction""}]}",DataShare,1,https://schemas.mosip.io/v1/auth-policy,now(),4/28/2025 9:37,TRUE,admin,now(),admin,now() +mpolicy-default-euin,mpolicygroup-deafult-print,mpolicy-default-euin,mpolicy-default-euin,"{""dataSharePolicies"":{""typeOfShare"":""direct"",""validForInMinutes"":""30"",""transactionsAllowed"":""2"",""encryptionType"":""Partner Based"",""shareDomain"":""datashare-service"",""source"":""ID Repository""},""shareableAttributes"":[{""attributeName"":""fullName"",""source"":[{""attribute"":""fullName"",""filter"":[{""language"":""eng""}]}],""encrypted"":false},{""attributeName"":""dateOfBirth"",""source"":[{""attribute"":""dateOfBirth""}],""encrypted"":false,""format"":""YYYY""},{""attributeName"":""gender"",""source"":[{""attribute"":""gender""}],""encrypted"":false},{""attributeName"":""phone"",""source"":[{""attribute"":""phone""}],""encrypted"":false},{""attributeName"":""email"",""source"":[{""attribute"":""email""}],""encrypted"":false},{""attributeName"":""addressLine1"",""source"":[{""attribute"":""addressLine1""}],""encrypted"":false},{""attributeName"":""addressLine2"",""source"":[{""attribute"":""addressLine2""}],""encrypted"":false},{""attributeName"":""addressLine3"",""source"":[{""attribute"":""addressLine3""}],""encrypted"":false},{""attributeName"":""region"",""source"":[{""attribute"":""region""}],""encrypted"":false},{""attributeName"":""province"",""source"":[{""attribute"":""province""}],""encrypted"":false},{""attributeName"":""city"",""source"":[{""attribute"":""city""}],""encrypted"":false},{""attributeName"":""UIN"",""source"":[{""attribute"":""UIN""}],""encrypted"":false},{""attributeName"":""postalCode"",""source"":[{""attribute"":""postalCode""}],""encrypted"":false},{""attributeName"":""biometrics"",""group"":""CBEFF"",""source"":[{""attribute"":""individualBiometrics"",""filter"":[{""type"":""Face""},{""type"":""Finger"",""subType"":[""Left Thumb"",""Right Thumb""]}]}],""encrypted"":true,""format"":""extraction""}]}",DataShare,1,https://schemas.mosip.io/v1/auth-policy,now(),4/28/2025 9:37,TRUE,admin,now(),admin,now() +mpolicy-default-reprint,mpolicygroup-deafult-print,mpolicy-default-reprint,mpolicy-default-reprint,"{""dataSharePolicies"":{""typeOfShare"":""direct"",""validForInMinutes"":""30"",""transactionsAllowed"":""2"",""encryptionType"":""Partner Based"",""shareDomain"":""datashare-service"",""source"":""ID Repository""},""shareableAttributes"":[{""attributeName"":""fullName"",""source"":[{""attribute"":""fullName"",""filter"":[{""language"":""eng""}]}],""encrypted"":false},{""attributeName"":""dateOfBirth"",""source"":[{""attribute"":""dateOfBirth""}],""encrypted"":false,""format"":""YYYY""},{""attributeName"":""gender"",""source"":[{""attribute"":""gender""}],""encrypted"":false},{""attributeName"":""phone"",""source"":[{""attribute"":""phone""}],""encrypted"":false},{""attributeName"":""email"",""source"":[{""attribute"":""email""}],""encrypted"":false},{""attributeName"":""addressLine1"",""source"":[{""attribute"":""addressLine1""}],""encrypted"":false},{""attributeName"":""addressLine2"",""source"":[{""attribute"":""addressLine2""}],""encrypted"":false},{""attributeName"":""addressLine3"",""source"":[{""attribute"":""addressLine3""}],""encrypted"":false},{""attributeName"":""region"",""source"":[{""attribute"":""region""}],""encrypted"":false},{""attributeName"":""province"",""source"":[{""attribute"":""province""}],""encrypted"":false},{""attributeName"":""city"",""source"":[{""attribute"":""city""}],""encrypted"":false},{""attributeName"":""UIN"",""source"":[{""attribute"":""UIN""}],""encrypted"":false},{""attributeName"":""postalCode"",""source"":[{""attribute"":""postalCode""}],""encrypted"":false},{""attributeName"":""biometrics"",""group"":""CBEFF"",""source"":[{""attribute"":""individualBiometrics"",""filter"":[{""type"":""Face""},{""type"":""Finger"",""subType"":[""Left Thumb"",""Right Thumb""]}]}],""encrypted"":true,""format"":""extraction""}]}",DataShare,1,https://schemas.mosip.io/v1/auth-policy,now(),4/28/2025 9:37,TRUE,admin,now(),admin,now() +mpolicy-default-resident,mpolicygroup-deafult-resident,mpolicy-default-resident,mpolicy-default-resident,"{""dataSharePolicies"":{""typeOfShare"":""Data Share"",""validForInMinutes"":""30"",""transactionsAllowed"":""2"",""encryptionType"":""Partner Based"",""shareDomain"":""datashare-service"",""source"":""Print""},""shareableAttributes"":[]}",DataShare,1,https://schemas.mosip.io/v1/auth-policy,now(),4/28/2025 9:37,TRUE,admin,now(),admin,now() +mpolicy-default-adjudication,mpolicygroup-default-adjudication,mpolicy-default-adjudication,mpolicy-default-adjudication,"{""shareableAttributes"":[{""attributeName"":""biometrics"",""group"":""CBEFF"",""source"":[{""attribute"":""registration-client\/NEW\/individualBiometrics"",""filter"":[{""type"":""Iris""}]},{""attribute"":""CNIE\/verification\/biometrics"",""filter"":[{""type"":""Finger""}]},{""attribute"":""CNIE\/verification\/biometrics"",""filter"":[{""type"":""Face""}]}],""encrypted"":true,""format"":""extraction""},{""attributeName"":""fullName"",""source"":[{""attribute"":""fullName""}],""encrypted"":true},{""attributeName"":""dateOfBirth"",""source"":[{""attribute"":""dateOfBirth""}],""encrypted"":true},{""attributeName"":""gender"",""source"":[{""attribute"":""gender""}],""encrypted"":true},{""attributeName"":""phone"",""source"":[{""attribute"":""phone""}],""encrypted"":true},{""attributeName"":""email"",""source"":[{""attribute"":""email""}],""encrypted"":true},{""attributeName"":""addressLine1"",""source"":[{""attribute"":""addressLine1""}],""encrypted"":true},{""attributeName"":""addressLine2"",""source"":[{""attribute"":""addressLine2""}],""encrypted"":true},{""attributeName"":""addressLine3"",""source"":[{""attribute"":""addressLine3""}],""encrypted"":true},{""attributeName"":""region"",""source"":[{""attribute"":""region""}],""encrypted"":true},{""attributeName"":""province"",""source"":[{""attribute"":""province""}],""encrypted"":true},{""attributeName"":""city"",""source"":[{""attribute"":""city""}],""encrypted"":true},{""attributeName"":""postalCode"",""source"":[{""attribute"":""postalCode""}],""encrypted"":true}],""dataSharePolicies"":{""typeOfShare"":""Data Share"",""validForInMinutes"":""30"",""transactionsAllowed"":""100000"",""encryptionType"":""none"",""shareDomain"":""datashare-service"",""source"":""Packet Manager""}}",DataShare,1,https://schemas.mosip.io/v1/auth-policy,now(),4/28/2025 9:37,TRUE,admin,now(),admin,now() diff --git a/data-dml/mosip_pms/dml/pms-auth_policy_h.csv b/data-dml/mosip_pms/dml/pms-auth_policy_h.csv new file mode 100644 index 00000000000..720b6c6e3b4 --- /dev/null +++ b/data-dml/mosip_pms/dml/pms-auth_policy_h.csv @@ -0,0 +1,8 @@ +id,eff_dtimes,policy_group_id,name,descr,policy_file_id,policy_type,version,policy_schema,valid_from_date,valid_to_date,is_active,cr_by,cr_dtimes,upd_by,upd_dtimes +mpolicy-default-auth,11-10-2020 05:55,mpolicygroup-default-auth,mpolicy-default-auth,mpolicy-default-auth,"{""shareableAttributes"":[{""attributeName"":""fullName"",""source"":[{""attribute"":""fullName""}],""encrypted"":true},{""attributeName"":""dateOfBirth"",""source"":[{""attribute"":""dateOfBirth""}],""encrypted"":true},{""attributeName"":""gender"",""source"":[{""attribute"":""gender""}],""encrypted"":true},{""attributeName"":""phone"",""source"":[{""attribute"":""phone""}],""encrypted"":true},{""attributeName"":""email"",""source"":[{""attribute"":""email""}],""encrypted"":true},{""attributeName"":""addressLine1"",""source"":[{""attribute"":""addressLine1""}],""encrypted"":true},{""attributeName"":""addressLine2"",""source"":[{""attribute"":""addressLine2""}],""encrypted"":true},{""attributeName"":""addressLine3"",""source"":[{""attribute"":""addressLine3""}],""encrypted"":true},{""attributeName"":""region"",""source"":[{""attribute"":""region""}],""encrypted"":true},{""attributeName"":""province"",""source"":[{""attribute"":""province""}],""encrypted"":true},{""attributeName"":""city"",""source"":[{""attribute"":""city""}],""encrypted"":true},{""attributeName"":""postalCode"",""source"":[{""attribute"":""postalCode""}],""encrypted"":true},{""attributeName"":""individualBiometrics"",""group"":""CBEFF"",""source"":[{""attribute"":""individualBiometrics""}],""encrypted"":true,""format"":""extraction""}],""dataSharePolicies"":{""typeOfShare"":""Data Share"",""validForInMinutes"":""30"",""transactionsAllowed"":""2"",""encryptionType"":""Partner Based"",""shareDomain"":""datashare-service"",""source"":""ID Repository""}}",DataShare,1,https://schemas.mosip.io/v1/auth-policy,now(),4/28/2025 9:37,TRUE,admin,now(),admin,now() +mpolicy-default-abis,11-11-2020 05:56,mpolicygroup-deafult-abis,mpolicy-default-abis,mpolicy-default-abis,"{""shareableAttributes"":[{""attributeName"":""biometrics"",""group"":""CBEFF"",""source"":[{""attribute"":""registration-client\/NEW\/individualBiometrics"",""filter"":[{""type"":""Iris""}]},{""attribute"":""CNIE\/verification\/biometrics"",""filter"":[{""type"":""Finger""}]},{""attribute"":""CNIE\/verification\/biometrics"",""filter"":[{""type"":""Face""}]}],""encrypted"":true,""format"":""extraction""}],""dataSharePolicies"":{""typeOfShare"":""Data Share"",""validForInMinutes"":""30"",""transactionsAllowed"":""2"",""encryptionType"":""Partner Based"",""shareDomain"":""datashare-service"",""source"":""Packet Manager""}}",DataShare,1,https://schemas.mosip.io/v1/auth-policy,now(),4/29/2025 9:37,TRUE,admin,now(),admin,now() +mpolicy-default-qrcode,11-12-2020 05:57,mpolicygroup-deafult-print,mpolicy-default-qrcode,mpolicy-default-qrcode,"{""dataSharePolicies"":{""typeOfShare"":""direct"",""validForInMinutes"":""30"",""transactionsAllowed"":""2"",""encryptionType"":""Partner Based"",""shareDomain"":""datashare-service"",""source"":""ID Repository""},""shareableAttributes"":[{""attributeName"":""fullName"",""source"":[{""attribute"":""fullName"",""filter"":[{""language"":""eng""}]}],""encrypted"":false},{""attributeName"":""dateOfBirth"",""source"":[{""attribute"":""dateOfBirth""}],""encrypted"":false,""format"":""YYYY""},{""attributeName"":""gender"",""source"":[{""attribute"":""gender""}],""encrypted"":false},{""attributeName"":""phone"",""source"":[{""attribute"":""phone""}],""encrypted"":false},{""attributeName"":""email"",""source"":[{""attribute"":""email""}],""encrypted"":false},{""attributeName"":""addressLine1"",""source"":[{""attribute"":""addressLine1""}],""encrypted"":false},{""attributeName"":""addressLine2"",""source"":[{""attribute"":""addressLine2""}],""encrypted"":false},{""attributeName"":""addressLine3"",""source"":[{""attribute"":""addressLine3""}],""encrypted"":false},{""attributeName"":""region"",""source"":[{""attribute"":""region""}],""encrypted"":false},{""attributeName"":""province"",""source"":[{""attribute"":""province""}],""encrypted"":false},{""attributeName"":""city"",""source"":[{""attribute"":""city""}],""encrypted"":false},{""attributeName"":""postalCode"",""source"":[{""attribute"":""postalCode""}],""encrypted"":false},{""attributeName"":""biometrics"",""group"":""CBEFF"",""source"":[{""attribute"":""individualBiometrics"",""filter"":[{""type"":""Face""},{""type"":""Finger"",""subType"":[""Left Thumb"",""Right Thumb""]}]}],""encrypted"":true,""format"":""extraction""}]}",DataShare,1,https://schemas.mosip.io/v1/auth-policy,now(),4/30/2025 9:37,TRUE,admin,now(),admin,now() +mpolicy-default-euin,11/13/2020 5:58,mpolicygroup-deafult-print,mpolicy-default-euin,mpolicy-default-euin,"{""dataSharePolicies"":{""typeOfShare"":""direct"",""validForInMinutes"":""30"",""transactionsAllowed"":""2"",""encryptionType"":""Partner Based"",""shareDomain"":""datashare-service"",""source"":""ID Repository""},""shareableAttributes"":[{""attributeName"":""fullName"",""source"":[{""attribute"":""fullName"",""filter"":[{""language"":""eng""}]}],""encrypted"":false},{""attributeName"":""dateOfBirth"",""source"":[{""attribute"":""dateOfBirth""}],""encrypted"":false,""format"":""YYYY""},{""attributeName"":""gender"",""source"":[{""attribute"":""gender""}],""encrypted"":false},{""attributeName"":""phone"",""source"":[{""attribute"":""phone""}],""encrypted"":false},{""attributeName"":""email"",""source"":[{""attribute"":""email""}],""encrypted"":false},{""attributeName"":""addressLine1"",""source"":[{""attribute"":""addressLine1""}],""encrypted"":false},{""attributeName"":""addressLine2"",""source"":[{""attribute"":""addressLine2""}],""encrypted"":false},{""attributeName"":""addressLine3"",""source"":[{""attribute"":""addressLine3""}],""encrypted"":false},{""attributeName"":""region"",""source"":[{""attribute"":""region""}],""encrypted"":false},{""attributeName"":""province"",""source"":[{""attribute"":""province""}],""encrypted"":false},{""attributeName"":""city"",""source"":[{""attribute"":""city""}],""encrypted"":false},{""attributeName"":""postalCode"",""source"":[{""attribute"":""postalCode""}],""encrypted"":false},{""attributeName"":""biometrics"",""group"":""CBEFF"",""source"":[{""attribute"":""individualBiometrics"",""filter"":[{""type"":""Face""},{""type"":""Finger"",""subType"":[""Left Thumb"",""Right Thumb""]}]}],""encrypted"":true,""format"":""extraction""}]}",DataShare,1,https://schemas.mosip.io/v1/auth-policy,now(),05-01-2025 09:37,TRUE,admin,now(),admin,now() +mpolicy-default-reprint,11/14/2020 5:59,mpolicygroup-deafult-print,mpolicy-default-reprint,mpolicy-default-reprint,"{""dataSharePolicies"":{""typeOfShare"":""direct"",""validForInMinutes"":""30"",""transactionsAllowed"":""2"",""encryptionType"":""Partner Based"",""shareDomain"":""datashare-service"",""source"":""ID Repository""},""shareableAttributes"":[{""attributeName"":""fullName"",""source"":[{""attribute"":""fullName"",""filter"":[{""language"":""eng""}]}],""encrypted"":false},{""attributeName"":""dateOfBirth"",""source"":[{""attribute"":""dateOfBirth""}],""encrypted"":false,""format"":""YYYY""},{""attributeName"":""gender"",""source"":[{""attribute"":""gender""}],""encrypted"":false},{""attributeName"":""phone"",""source"":[{""attribute"":""phone""}],""encrypted"":false},{""attributeName"":""email"",""source"":[{""attribute"":""email""}],""encrypted"":false},{""attributeName"":""addressLine1"",""source"":[{""attribute"":""addressLine1""}],""encrypted"":false},{""attributeName"":""addressLine2"",""source"":[{""attribute"":""addressLine2""}],""encrypted"":false},{""attributeName"":""addressLine3"",""source"":[{""attribute"":""addressLine3""}],""encrypted"":false},{""attributeName"":""region"",""source"":[{""attribute"":""region""}],""encrypted"":false},{""attributeName"":""province"",""source"":[{""attribute"":""province""}],""encrypted"":false},{""attributeName"":""city"",""source"":[{""attribute"":""city""}],""encrypted"":false},{""attributeName"":""postalCode"",""source"":[{""attribute"":""postalCode""}],""encrypted"":false},{""attributeName"":""biometrics"",""group"":""CBEFF"",""source"":[{""attribute"":""individualBiometrics"",""filter"":[{""type"":""Face""},{""type"":""Finger"",""subType"":[""Left Thumb"",""Right Thumb""]}]}],""encrypted"":true,""format"":""extraction""}]}",DataShare,1,https://schemas.mosip.io/v1/auth-policy,now(),05-02-2025 09:37,TRUE,admin,now(),admin,now() +mpolicy-default-resident,11/14/2020 5:59,mpolicygroup-deafult-resident,mpolicy-default-resident,mpolicy-default-resident,"{""dataSharePolicies"":{""typeOfShare"":""Data Share"",""validForInMinutes"":""30"",""transactionsAllowed"":""2"",""encryptionType"":""Partner Based"",""shareDomain"":""datashare-service"",""source"":""Print""},""shareableAttributes"":[]}",DataShare,1,https://schemas.mosip.io/v1/auth-policy,now(),05-02-2025 09:37,TRUE,admin,now(),admin,now() +mpolicy-default-adjudication,11/14/2020 5:59,mpolicygroup-default-adjudication,mpolicy-default-adjudication,mpolicy-default-adjudication,"{""shareableAttributes"":[{""attributeName"":""biometrics"",""group"":""CBEFF"",""source"":[{""attribute"":""registration-client\/NEW\/individualBiometrics"",""filter"":[{""type"":""Iris""}]},{""attribute"":""CNIE\/verification\/biometrics"",""filter"":[{""type"":""Finger""}]},{""attribute"":""CNIE\/verification\/biometrics"",""filter"":[{""type"":""Face""}]}],""encrypted"":true,""format"":""extraction""},{""attributeName"":""fullName"",""source"":[{""attribute"":""fullName""}],""encrypted"":true},{""attributeName"":""dateOfBirth"",""source"":[{""attribute"":""dateOfBirth""}],""encrypted"":true},{""attributeName"":""gender"",""source"":[{""attribute"":""gender""}],""encrypted"":true},{""attributeName"":""phone"",""source"":[{""attribute"":""phone""}],""encrypted"":true},{""attributeName"":""email"",""source"":[{""attribute"":""email""}],""encrypted"":true},{""attributeName"":""addressLine1"",""source"":[{""attribute"":""addressLine1""}],""encrypted"":true},{""attributeName"":""addressLine2"",""source"":[{""attribute"":""addressLine2""}],""encrypted"":true},{""attributeName"":""addressLine3"",""source"":[{""attribute"":""addressLine3""}],""encrypted"":true},{""attributeName"":""region"",""source"":[{""attribute"":""region""}],""encrypted"":true},{""attributeName"":""province"",""source"":[{""attribute"":""province""}],""encrypted"":true},{""attributeName"":""city"",""source"":[{""attribute"":""city""}],""encrypted"":true},{""attributeName"":""postalCode"",""source"":[{""attribute"":""postalCode""}],""encrypted"":true}],""dataSharePolicies"":{""typeOfShare"":""Data Share"",""validForInMinutes"":""30"",""transactionsAllowed"":""2"",""encryptionType"":""none"",""shareDomain"":""datashare-service"",""source"":""Packet""}}",DataShare,1,https://schemas.mosip.io/v1/auth-policy,now(),05-02-2025 09:37,TRUE,admin,now(),admin,now() diff --git a/data-dml/mosip_pms/dml/pms-partner.csv b/data-dml/mosip_pms/dml/pms-partner.csv new file mode 100644 index 00000000000..fb9698ad053 --- /dev/null +++ b/data-dml/mosip_pms/dml/pms-partner.csv @@ -0,0 +1,7 @@ +id,policy_group_id,name,address,contact_no,email_id,certificate_alias,user_id,partner_type_code,approval_status,is_active,cr_by,cr_dtimes,upd_by,upd_dtimes +mpartner-default-auth,mpolicygroup-default-auth,mpartner-default-auth,mpartner-default-auth,9232121212,info@mosip.io,,mpartner-default-auth,Online_Verification_Partner,Activated,TRUE,superadmin,now(),superadmin,now() +mpartner-default-abis,mpolicygroup-deafult-abis,mpartner-default-abis,mpartner-default-abis,9232121212,absi@mosip.io,,mpartner-default-abis,ABIS_Partner,Activated,TRUE,superadmin,now(),superadmin,now() +mpartner-default-print,mpolicygroup-deafult-print,mpartner-default-print,mpartner-default-print,9232121212,print@mosip.io,,mpartner-default-print,Credential_Partner,Activated,TRUE,superadmin,now(),superadmin,now() +MOSIP.PROXY.SBI,mpolicygroup-default-mockdevice,MOSIP,headoffice9,9988776655,abc@mock.co.in,,MOSIP.PROXY.SBI,Device_Provider,Activated,TRUE,superadmin,now(),superadmin,now() +mpartner-default-resident,mpolicygroup-deafult-resident,mpartner-default-resident,mpartner-default-resident,9232121212,resident@mosip.io,,mpartner-default-resident,Credential_Partner,Activated,TRUE,superadmin,now(),superadmin,now() +mpartner-default-adjudication,mpolicygroup-default-adjudication,mpartner-default-adjudication,mpartner-default-adjudication,9232121212,adjudication@mosip.io,,mpartner-default-adjudication,Manual_Adjudication,Activated,TRUE,superadmin,now(),superadmin,now() diff --git a/data-dml/mosip_pms/dml/pms-partner_h.csv b/data-dml/mosip_pms/dml/pms-partner_h.csv new file mode 100644 index 00000000000..97d17e89e6a --- /dev/null +++ b/data-dml/mosip_pms/dml/pms-partner_h.csv @@ -0,0 +1,7 @@ +id,eff_dtimes,policy_group_id,name,address,contact_no,email_id,certificate_alias,user_id,partner_type_code,approval_status,is_active,cr_by,cr_dtimes,upd_by,upd_dtimes +mpartner-default-auth,now(),mpolicygroup-default-auth,mpartner-default-auth,mpartner-default-auth,9232121212,info@mosip.io,,mpartner-default-auth,Online_Verification_Partner,Activated,TRUE,superadmin,now(),superadmin,now() +mpartner-default-abis,now(),mpolicygroup-deafult-abis,mpartner-default-abis,mpartner-default-abis,9232121212,absi@mosip.io,,mpartner-default-abis,ABIS_Partner,Activated,TRUE,superadmin,now(),superadmin,now() +mpartner-default-print,now(),mpolicygroup-deafult-print,mpartner-default-print,mpartner-default-print,9232121212,print@mosip.io,,mpartner-default-print,Credential_Partner,Activated,TRUE,superadmin,now(),superadmin,now() +MOSIP.PROXY.SBI,now(),mpolicygroup-default-mockdevice,MOSIP,headoffice9,9988776655,abc@mock.co.in,,MOSIP.PROXY.SBI,Device_Provider,Activated,TRUE,superadmin,now(),superadmin,now() +mpartner-default-resident,now(),mpolicygroup-deafult-resident,mpartner-default-resident,mpartner-default-resident,9232121212,resident@mosip.io,,mpartner-default-resident,Credential_Partner,Activated,TRUE,superadmin,now(),superadmin,now() +mpartner-default-adjudication,now(),mpolicygroup-default-adjudication,mpartner-default-adjudication,mpartner-default-adjudication,9232121212,adjudication@mosip.io,,mpartner-default-adjudication,Manual_Adjudication,Activated,TRUE,superadmin,now(),superadmin,now() diff --git a/data-dml/mosip_pms/dml/pms-partner_policy.csv b/data-dml/mosip_pms/dml/pms-partner_policy.csv new file mode 100644 index 00000000000..c7879570027 --- /dev/null +++ b/data-dml/mosip_pms/dml/pms-partner_policy.csv @@ -0,0 +1,8 @@ +policy_api_key,part_id,policy_id,valid_from_datetime,valid_to_datetime,is_active,cr_by,cr_dtimes,upd_by,upd_dtimes +mpolicy_part_auth_api,mpartner-default-auth,mpolicy-default-auth,now(),12-01-2025 05:31,TRUE,admin,now(),admin,now() +mpolicy_part_abis_api,mpartner-default-abis,mpolicy-default-abis,now(),12-01-2025 05:31,TRUE,admin,now(),admin,now() +mpolicy_part_qrcode_api,mpartner-default-print,mpolicy-default-qrcode,now(),12-01-2025 05:31,TRUE,admin,now(),admin,now() +mpolicy_part_euin_api,mpartner-default-print,mpolicy-default-euin,now(),12-01-2025 05:31,TRUE,admin,now(),admin,now() +mpolicy_part_reprint_api,mpartner-default-print,mpolicy-default-reprint,now(),12-01-2025 05:31,TRUE,admin,now(),admin,now() +mpolicy_part_resident_api,mpartner-default-resident,mpolicy-default-resident,now(),12-01-2025 05:31,TRUE,admin,now(),admin,now() +mpolicy_part_adjudica_api,mpartner-default-adjudication,mpolicy-default-adjudication,now(),12-01-2025 05:31,TRUE,admin,now(),admin,now() diff --git a/data-dml/mosip_pms/dml/pms-partner_policy_bioextract.csv b/data-dml/mosip_pms/dml/pms-partner_policy_bioextract.csv new file mode 100644 index 00000000000..1d259a6308c --- /dev/null +++ b/data-dml/mosip_pms/dml/pms-partner_policy_bioextract.csv @@ -0,0 +1,13 @@ +id,part_id,policy_id,attribute_name,extractor_provider,extractor_provider_version,biometric_modality,biometric_sub_types,cr_by,cr_dtimes,upd_by,upd_dtimes +146098,mpartner-default-auth,mpolicy-default-auth,photo,mock,1.1,face,,admin,now(),admin,now() +146099,mpartner-default-auth,mpolicy-default-auth,iris,mock,1.1,iris,,admin,now(),admin,now() +146100,mpartner-default-auth,mpolicy-default-auth,fingerprint,mock,1.1,finger,,admin,now(),admin,now() +146101,mpartner-default-print,mpolicy-default-qrcode,photo,mock,1.1,face,,admin,now(),admin,now() +146102,mpartner-default-print,mpolicy-default-qrcode,iris,mock,1.1,iris,,admin,now(),admin,now() +146103,mpartner-default-print,mpolicy-default-qrcode,fingerprint,mock,1.1,finger,,admin,now(),admin,now() +146104,mpartner-default-print,mpolicy-default-euin,photo,mock,1.1,face,,admin,now(),admin,now() +146105,mpartner-default-print,mpolicy-default-euin,iris,mock,1.1,iris,,admin,now(),admin,now() +146106,mpartner-default-print,mpolicy-default-euin,fingerprint,mock,1.1,finger,,admin,now(),admin,now() +146107,mpartner-default-print,mpolicy-default-reprint,photo,mock,1.1,face,,admin,now(),admin,now() +146108,mpartner-default-print,mpolicy-default-reprint,iris,mock,1.1,iris,,admin,now(),admin,now() +146109,mpartner-default-print,mpolicy-default-reprint,fingerprint,mock,1.1,finger,,admin,now(),admin,now() diff --git a/data-dml/mosip_pms/dml/pms-partner_policy_credential_type.csv b/data-dml/mosip_pms/dml/pms-partner_policy_credential_type.csv new file mode 100644 index 00000000000..fd8614804f4 --- /dev/null +++ b/data-dml/mosip_pms/dml/pms-partner_policy_credential_type.csv @@ -0,0 +1,5 @@ +part_id,policy_id,credential_type,is_active,cr_by,cr_dtimes,upd_by,upd_dtimes,is_deleted,del_dtimes +mpartner-default-print,mpolicy-default-qrcode,qrcode,TRUE,system,12-01-2020 05:31,,,FALSE, +mpartner-default-print,mpolicy-default-euin,euin,TRUE,system,12-01-2020 05:31,,,FALSE, +mpartner-default-print,mpolicy-default-reprint,reprint,TRUE,system,12-01-2020 05:31,,,FALSE, +mpartner-default-auth,mpolicy-default-auth,auth,TRUE,system,12-01-2020 05:31,,,FALSE, diff --git a/data-dml/mosip_pms/dml/pms-partner_policy_request.csv b/data-dml/mosip_pms/dml/pms-partner_policy_request.csv new file mode 100644 index 00000000000..7ef5505652e --- /dev/null +++ b/data-dml/mosip_pms/dml/pms-partner_policy_request.csv @@ -0,0 +1,8 @@ +id,part_id,policy_id,request_datetimes,request_detail,status_code,cr_by,cr_dtimes,upd_by,upd_dtimes +mpartner_policy_auth_req,mpartner-default-auth,mpolicy-default-auth,now(),mpolicy-default-auth,Approved,admin,now(),admin,now() +mpartner_policy_abis_req,mpartner-default-abis,mpolicy-default-abis,now(),mpolicy-default-abis,Approved,admin,now(),admin,now() +mpartner_policy_qrcode_req,mpartner-default-print,mpolicy-default-qrcode,now(),mpolicy-default-qrcode,Approved,admin,now(),admin,now() +mpartner_policy_euin_req,mpartner-default-print,mpolicy-default-euin,now(),mpolicy-default-euin,Approved,admin,now(),admin,now() +mpartner_policy_reprint_req,mpartner-default-print,mpolicy-default-reprint,now(),mpolicy-default-reprint,Approved,admin,now(),admin,now() +mpartner_policy_resident_req,mpartner-default-resident,mpolicy-default-resident,now(),mpolicy-default-resident,Approved,admin,now(),admin,now() +mpartner_policy_ajudica_req,mpartner-default-adjudication,mpolicy-default-adjudication,now(),mpolicy-default-adjudication,Approved,admin,now(),admin,now() diff --git a/data-dml/mosip_pms/dml/pms-partner_type.csv b/data-dml/mosip_pms/dml/pms-partner_type.csv new file mode 100644 index 00000000000..8df84776d93 --- /dev/null +++ b/data-dml/mosip_pms/dml/pms-partner_type.csv @@ -0,0 +1,10 @@ +code,partner_description,is_active,cr_by,cr_dtimes,is_policy_required +Auth_Partner,Auth Partner,TRUE,superadmin,now(),TRUE +Device_Provider,Device Provider,TRUE,superadmin,now(),FALSE +Credential_Partner,Credential Partner,TRUE,superadmin,now(),TRUE +Partner_Admin,Partner Admin,TRUE,superadmin,now(),FALSE +FTM_Provider,FTM Provider,TRUE,superadmin,now(),FALSE +Online_Verification_Partner,Online_Verification_Partner,TRUE,superadmin,now(),TRUE +ABIS_Partner,ABIS Partner,TRUE,superadmin,now(),TRUE +Manual_Adjudication,Manual Adjudication,TRUE,superadmin,now(),TRUE +MISP_Partner,MISP_Partner,TRUE,superadmin,now(),FALSE diff --git a/data-dml/mosip_pms/dml/pms-policy_group.csv b/data-dml/mosip_pms/dml/pms-policy_group.csv new file mode 100644 index 00000000000..a50dc09591e --- /dev/null +++ b/data-dml/mosip_pms/dml/pms-policy_group.csv @@ -0,0 +1,7 @@ +id,name,descr,user_id,is_active,cr_by,cr_dtimes,upd_by,upd_dtimes +mpolicygroup-default-auth,mpolicygroup-default-auth,mpolicygroup-default-auth,superadmin,TRUE,superadmin,now(),superadmin,now() +mpolicygroup-deafult-abis,mpolicygroup-deafult-abis,mpolicygroup-deafult-abis,superadmin,TRUE,superadmin,now(),superadmin,now() +mpolicygroup-deafult-print,mpolicygroup-deafult-print,mpolicygroup-deafult-print,superadmin,TRUE,superadmin,now(),superadmin,now() +mpolicygroup-default-mockdevice,mmpolicygroup-default-mockdevice,mpolicygroup-default-mockdevice,superadmin,TRUE,superadmin,now(),superadmin,now() +mpolicygroup-deafult-resident,mpolicygroup-deafult-resident,mpolicygroup-deafult-resident,superadmin,TRUE,superadmin,now(),superadmin,now() +mpolicygroup-default-adjudication,mpolicygroup-default-adjudication, mpolicygroup-deafult-resident,superadmin,TRUE,superadmin,now(),superadmin,now() diff --git a/data-dml/mosip_pms/mosip_pms_deploy.properties b/data-dml/mosip_pms/mosip_pms_deploy.properties new file mode 100644 index 00000000000..34f6e62a719 --- /dev/null +++ b/data-dml/mosip_pms/mosip_pms_deploy.properties @@ -0,0 +1,10 @@ +DB_SERVERIP= +DB_PORT= +SU_USER=postgres +DEFAULT_DB_NAME=postgres +MOSIP_DB_NAME=mosip_pms +SYSADMIN_USER=sysadmin +BASEPATH=/home/madmin/database/ +LOG_PATH=/home/madmin/logs/ +DML_FLAG=1 +DML_FILENAME=mosip_pms_dml_deploy.sql diff --git a/data-dml/mosip_pms/mosip_pms_dml_deploy.sh b/data-dml/mosip_pms/mosip_pms_dml_deploy.sh new file mode 100644 index 00000000000..88848df68b7 --- /dev/null +++ b/data-dml/mosip_pms/mosip_pms_dml_deploy.sh @@ -0,0 +1,70 @@ +### -- --------------------------------------------------------------------------------------------------------- +### -- Script Name : DML deploy +### -- Deploy Module : MOSIP PARTNER MANAGEMENT SERVICE +### -- Purpose : To deploy Database DMLs. +### -- Create By : Sadanandegowda DM +### -- Created Date : Nov-2020 +### -- +### -- Modified Date Modified By Comments / Remarks +### -- ----------------------------------------------------------------------------------------------------------- + +#########Properties file ############# +set -e +properties_file="$1" +echo `date "+%m/%d/%Y %H:%M:%S"` ": $properties_file" +#properties_file="./app.properties" +if [ -f "$properties_file" ] +then + echo `date "+%m/%d/%Y %H:%M:%S"` ": Property file \"$properties_file\" found." + while IFS='=' read -r key value + do + key=$(echo $key | tr '.' '_') + eval ${key}=\${value} + done < "$properties_file" +else + echo `date "+%m/%d/%Y %H:%M:%S"` ": Property file not found, Pass property file name as argument." +fi +echo `date "+%m/%d/%Y %H:%M:%S"` ": ------------------ Database server and service status check for ${MOSIP_DB_NAME}------------------------" +##############################################LOG FILE CREATION############################################################# + +today=`date '+%d%m%Y_%H%M%S'`; +LOG="${LOG_PATH}${MOSIP_DB_NAME}-dml-${today}.log" +touch $LOG + + +SERVICE=$(PGPASSWORD=$SU_USER_PWD psql --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -t -c "select count(1) from pg_roles where rolname IN('sysadmin')";exit; > /dev/null) + +if [ "$SERVICE" -eq 0 ] || [ "$SERVICE" -eq 1 ] +then +echo `date "+%m/%d/%Y %H:%M:%S"` ": Postgres database server and service is up and running" | tee -a $LOG 2>&1 +else +echo `date "+%m/%d/%Y %H:%M:%S"` ": Postgres database server or service is not running" | tee -a $LOG 2>&1 +fi + +echo `date "+%m/%d/%Y %H:%M:%S"` ": ----------------------------------------------------------------------------------------" + +echo `date "+%m/%d/%Y %H:%M:%S"` ": Started sourcing the $MOSIP_DB_NAME Database DML scripts" | tee -a $LOG 2>&1 +echo `date "+%m/%d/%Y %H:%M:%S"` ": Database scripts are sourcing from :$BASEPATH" | tee -a $LOG 2>&1 + +#========================================DB DML Deployment process begins on DB SERVER====================================== + +if [ ${DML_FLAG} == 1 ] +then + echo `date "+%m/%d/%Y %H:%M:%S"` ": Deploying DML for ${MOSIP_DB_NAME} database" | tee -a $LOG 2>&1 + PGPASSWORD=$SYSADMIN_PWD psql --username=$SYSADMIN_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -a -b -f $DML_FILENAME >> $LOG 2>&1 +else + echo `date "+%m/%d/%Y %H:%M:%S"` ": There are no DML deployment required for ${MOSIP_DB_NAME}" | tee -a $LOG 2>&1 +fi + +if [ $(grep -c ERROR $LOG) -ne 0 ] +then + echo `date "+%m/%d/%Y %H:%M:%S"` ": Database DML deployment is completed with ERRORS, Please check the logs for more information" | tee -a $LOG 2>&1 + echo `date "+%m/%d/%Y %H:%M:%S"` ": END of MOSIP database deployment" | tee -a $LOG 2>&1 +else + echo `date "+%m/%d/%Y %H:%M:%S"` ": Database DML deployment completed successfully, Please check the logs for more information" | tee -a $LOG 2>&1 + echo `date "+%m/%d/%Y %H:%M:%S"` ": END of MOSIP \"${MOSIP_DB_NAME}\" database deployment" | tee -a $LOG 2>&1 +fi + +echo "******************************************"`date "+%m/%d/%Y %H:%M:%S"` "*****************************************************" >> $LOG 2>&1 + +#========================================DB DML Deployment process completes on DB SERVER====================================== diff --git a/data-dml/mosip_pms/mosip_pms_dml_deploy.sql b/data-dml/mosip_pms/mosip_pms_dml_deploy.sql new file mode 100644 index 00000000000..11716b7f617 --- /dev/null +++ b/data-dml/mosip_pms/mosip_pms_dml_deploy.sql @@ -0,0 +1,65 @@ +\c mosip_pms sysadmin + +\set CSVDataPath '\'/home/dbadmin/mosip_pms/' + + +------------------------------------------- Level 1 data load scripts ---------------------------------- + +----- TRUNCATE pms.key_policy_def TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE pms.partner_type cascade ; + +\COPY pms.partner_type (code,partner_description,is_active,cr_by,cr_dtimes,is_policy_required) FROM './dml/pms-partner_type.csv' delimiter ',' HEADER csv; + +----- TRUNCATE pms.partner TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE pms.partner cascade ; + +\COPY pms.partner (id,policy_group_id,name,address,contact_no,email_id,certificate_alias,user_id,partner_type_code,approval_status,is_active,cr_by,cr_dtimes,upd_by,upd_dtimes) FROM './dml/pms-partner.csv' delimiter ',' HEADER csv; + +----- TRUNCATE pms.policy_group TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE pms.policy_group cascade ; + +\COPY pms.policy_group (id,name,descr,user_id,is_active,cr_by,cr_dtimes,upd_by,upd_dtimes) FROM './dml/pms-policy_group.csv' delimiter ',' HEADER csv; + + +----- TRUNCATE pms.auth_policy TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE pms.auth_policy cascade ; + +\COPY pms.auth_policy (id,policy_group_id,name,descr,policy_file_id,policy_type,version,policy_schema,valid_from_date,valid_to_date,is_active,cr_by,cr_dtimes,upd_by,upd_dtimes) FROM './dml/pms-auth_policy.csv' delimiter ',' HEADER csv; + +------------------------------------------- Level 2 data load scripts ---------------------------------- + +----- TRUNCATE pms.partner_policy TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE pms.partner_policy cascade ; + +\COPY pms.partner_policy (policy_api_key,part_id,policy_id,valid_from_datetime,valid_to_datetime,is_active,cr_by,cr_dtimes,upd_by,upd_dtimes) FROM './dml/pms-partner_policy.csv' delimiter ',' HEADER csv; + +----- TRUNCATE pms.partner_policy_bioextract TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE pms.partner_policy_bioextract cascade ; + +\COPY pms.partner_policy_bioextract (id,part_id,policy_id,attribute_name,extractor_provider,extractor_provider_version,biometric_modality,biometric_sub_types,cr_by,cr_dtimes,upd_by,upd_dtimes) FROM './dml/pms-partner_policy_bioextract.csv' delimiter ',' HEADER csv; + +----- TRUNCATE pms.partner_policy_request TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE pms.partner_policy_request cascade ; + +\COPY pms.partner_policy_request (id,part_id,policy_id,request_datetimes,request_detail,status_code,cr_by,cr_dtimes,upd_by,upd_dtimes) FROM './dml/pms-partner_policy_request.csv' delimiter ',' HEADER csv; + +----- TRUNCATE pms.partner_policy_credential_type TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE pms.partner_policy_credential_type cascade ; + +\COPY pms.partner_policy_credential_type (part_id,policy_id,credential_type,is_active,cr_by,cr_dtimes,upd_by,upd_dtimes,is_deleted,del_dtimes) FROM './dml/pms-partner_policy_credential_type.csv' delimiter ',' HEADER csv; + +------------------------------------------- History Table Loading ---------------------------------- + +----- TRUNCATE pms.partner_h TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE pms.partner_h cascade ; + +\COPY pms.partner_h (id,eff_dtimes,policy_group_id,name,address,contact_no,email_id,certificate_alias,user_id,partner_type_code,approval_status,is_active,cr_by,cr_dtimes,upd_by,upd_dtimes) FROM './dml/pms-partner_h.csv' delimiter ',' HEADER csv; + + +----- TRUNCATE pms.auth_policy_h TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE pms.auth_policy_h cascade ; + +\COPY pms.auth_policy_h (id,eff_dtimes,policy_group_id,name,descr,policy_file_id,policy_type,version,policy_schema,valid_from_date,valid_to_date,is_active,cr_by,cr_dtimes,upd_by,upd_dtimes) FROM './dml/pms-auth_policy_h.csv' delimiter ',' HEADER csv; + + +--------------------------------------------------------------------------------------------------------------------------------------------------------------------- \ No newline at end of file diff --git a/data-dml/mosip_prereg/dml/prereg-language_transliteration.csv b/data-dml/mosip_prereg/dml/prereg-language_transliteration.csv new file mode 100644 index 00000000000..737fbadbfc3 --- /dev/null +++ b/data-dml/mosip_prereg/dml/prereg-language_transliteration.csv @@ -0,0 +1,5 @@ +lang_from_code,lang_to_code,lang_id,cr_by,cr_dtimes +eng,ara,Latin-Arabic,MOSIP_SYSTEM,now() +fra,ara,Latin-Arabic,MOSIP_SYSTEM,now() +ara,fra,Arabic-Latin,MOSIP_SYSTEM,now() +ara,eng,Arabic-Latin,MOSIP_SYSTEM,now() diff --git a/data-dml/mosip_prereg/mosip_prereg_deploy.properties b/data-dml/mosip_prereg/mosip_prereg_deploy.properties new file mode 100644 index 00000000000..2ad46c1048b --- /dev/null +++ b/data-dml/mosip_prereg/mosip_prereg_deploy.properties @@ -0,0 +1,10 @@ +DB_SERVERIP= +DB_PORT= +SU_USER=postgres +DEFAULT_DB_NAME=postgres +MOSIP_DB_NAME=mosip_prereg +SYSADMIN_USER=sysadmin +BASEPATH=/home/madmin/database/ +LOG_PATH=/home/madmin/logs/ +DML_FLAG=1 +DML_FILENAME=mosip_prereg_dml_deploy.sql diff --git a/data-dml/mosip_prereg/mosip_prereg_dml_deploy.sh b/data-dml/mosip_prereg/mosip_prereg_dml_deploy.sh new file mode 100644 index 00000000000..d439f9afaeb --- /dev/null +++ b/data-dml/mosip_prereg/mosip_prereg_dml_deploy.sh @@ -0,0 +1,70 @@ +### -- --------------------------------------------------------------------------------------------------------- +### -- Script Name : DML deploy +### -- Deploy Module : MOSIP PRE REGISTRATION +### -- Purpose : To deploy Database DMLs. +### -- Create By : Sadanandegowda DM +### -- Created Date : Nov-2020 +### -- +### -- Modified Date Modified By Comments / Remarks +### -- ----------------------------------------------------------------------------------------------------------- + +#########Properties file ############# +set -e +properties_file="$1" +echo `date "+%m/%d/%Y %H:%M:%S"` ": $properties_file" +#properties_file="./app.properties" +if [ -f "$properties_file" ] +then + echo `date "+%m/%d/%Y %H:%M:%S"` ": Property file \"$properties_file\" found." + while IFS='=' read -r key value + do + key=$(echo $key | tr '.' '_') + eval ${key}=\${value} + done < "$properties_file" +else + echo `date "+%m/%d/%Y %H:%M:%S"` ": Property file not found, Pass property file name as argument." +fi +echo `date "+%m/%d/%Y %H:%M:%S"` ": ------------------ Database server and service status check for ${MOSIP_DB_NAME}------------------------" +##############################################LOG FILE CREATION############################################################# + +today=`date '+%d%m%Y_%H%M%S'`; +LOG="${LOG_PATH}${MOSIP_DB_NAME}-dml-${today}.log" +touch $LOG + + +SERVICE=$(PGPASSWORD=$SU_USER_PWD psql --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -t -c "select count(1) from pg_roles where rolname IN('sysadmin')";exit; > /dev/null) + +if [ "$SERVICE" -eq 0 ] || [ "$SERVICE" -eq 1 ] +then +echo `date "+%m/%d/%Y %H:%M:%S"` ": Postgres database server and service is up and running" | tee -a $LOG 2>&1 +else +echo `date "+%m/%d/%Y %H:%M:%S"` ": Postgres database server or service is not running" | tee -a $LOG 2>&1 +fi + +echo `date "+%m/%d/%Y %H:%M:%S"` ": ----------------------------------------------------------------------------------------" + +echo `date "+%m/%d/%Y %H:%M:%S"` ": Started sourcing the $MOSIP_DB_NAME Database DML scripts" | tee -a $LOG 2>&1 +echo `date "+%m/%d/%Y %H:%M:%S"` ": Database scripts are sourcing from :$BASEPATH" | tee -a $LOG 2>&1 + +#========================================DB DML Deployment process begins on DB SERVER====================================== + +if [ ${DML_FLAG} == 1 ] +then + echo `date "+%m/%d/%Y %H:%M:%S"` ": Deploying DML for ${MOSIP_DB_NAME} database" | tee -a $LOG 2>&1 + PGPASSWORD=$SYSADMIN_PWD psql --username=$SYSADMIN_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -a -b -f $DML_FILENAME >> $LOG 2>&1 +else + echo `date "+%m/%d/%Y %H:%M:%S"` ": There are no DML deployment required for ${MOSIP_DB_NAME}" | tee -a $LOG 2>&1 +fi + +if [ $(grep -c ERROR $LOG) -ne 0 ] +then + echo `date "+%m/%d/%Y %H:%M:%S"` ": Database DML deployment is completed with ERRORS, Please check the logs for more information" | tee -a $LOG 2>&1 + echo `date "+%m/%d/%Y %H:%M:%S"` ": END of MOSIP database deployment" | tee -a $LOG 2>&1 +else + echo `date "+%m/%d/%Y %H:%M:%S"` ": Database DML deployment completed successfully, Please check the logs for more information" | tee -a $LOG 2>&1 + echo `date "+%m/%d/%Y %H:%M:%S"` ": END of MOSIP \"${MOSIP_DB_NAME}\" database deployment" | tee -a $LOG 2>&1 +fi + +echo "******************************************"`date "+%m/%d/%Y %H:%M:%S"` "*****************************************************" >> $LOG 2>&1 + +#========================================DB DML Deployment process completes on DB SERVER====================================== diff --git a/data-dml/mosip_prereg/mosip_prereg_dml_deploy.sql b/data-dml/mosip_prereg/mosip_prereg_dml_deploy.sql new file mode 100644 index 00000000000..ec8d5861d8d --- /dev/null +++ b/data-dml/mosip_prereg/mosip_prereg_dml_deploy.sql @@ -0,0 +1,31 @@ +\c mosip_prereg sysadmin + +\set CSVDataPath '\'/home/dbadmin/mosip_prereg/' + +-------------- Level 1 data load scripts ------------------------ + +----- TRUNCATE prereg.language_transliteration TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE prereg.language_transliteration cascade ; + +\COPY prereg.language_transliteration (lang_from_code,lang_to_code,lang_id,cr_by,cr_dtimes) FROM './dml/prereg-language_transliteration.csv' delimiter ',' HEADER csv; + + +--------------------------------------------------------------------------------------------------------------------------------------------------------------------- + + + + + + + + + + + + + + + + + + diff --git a/data-dml/mosip_regdevice/dml/regdevice-device_detail.csv b/data-dml/mosip_regdevice/dml/regdevice-device_detail.csv new file mode 100644 index 00000000000..4336001414b --- /dev/null +++ b/data-dml/mosip_regdevice/dml/regdevice-device_detail.csv @@ -0,0 +1,4 @@ +id,dprovider_id,dtype_code,dstype_code,make,model,partner_org_name,approval_status,is_active,cr_by,cr_dtimes,upd_by,upd_dtimes +mdevice_detail_default_face,MOSIP.PROXY.SBI,Face,Full face,MOSIP,FACE01,MOSIP,Activated,TRUE,superadmin,now(),superadmin,now() +mdevice_detail_default_finger,MOSIP.PROXY.SBI,Finger,Slap,MOSIP,SLAP01,MOSIP,Activated,TRUE,superadmin,now(),superadmin,now() +mdevice_detail_default_iris,MOSIP.PROXY.SBI,Iris,Double,MOSIP,IRIS01,MOSIP,Activated,TRUE,superadmin,now(),superadmin,now() diff --git a/data-dml/mosip_regdevice/dml/regdevice-reg_device_sub_type.csv b/data-dml/mosip_regdevice/dml/regdevice-reg_device_sub_type.csv new file mode 100644 index 00000000000..e0ce955d38c --- /dev/null +++ b/data-dml/mosip_regdevice/dml/regdevice-reg_device_sub_type.csv @@ -0,0 +1,7 @@ +code,dtyp_code,name,descr,is_active,cr_by,cr_dtimes +Slap,Finger,Slap,Fingerprint Slap,TRUE,superadmin,now() +Single,Finger,Single,Fingerprint Single Finger,TRUE,superadmin,now() +Touchless,Finger,Touchless,Touch Fingerprint,TRUE,superadmin,now() +Single,Iris,Single,Single,TRUE,superadmin,now() +Double,Iris,Double,Double,TRUE,superadmin,now() +Full face,Face,Full face,Full Face,TRUE,superadmin,now() diff --git a/data-dml/mosip_regdevice/dml/regdevice-reg_device_type.csv b/data-dml/mosip_regdevice/dml/regdevice-reg_device_type.csv new file mode 100644 index 00000000000..1dc42350d9c --- /dev/null +++ b/data-dml/mosip_regdevice/dml/regdevice-reg_device_type.csv @@ -0,0 +1,4 @@ +code,name,descr,is_active,cr_by,cr_dtimes +Finger,Finger,Fingerprint Biometric,TRUE,superadmin,now() +Face,Face,Face Biometric,TRUE,superadmin,now() +Iris,Iris,Iris Biomertric,TRUE,superadmin,now() diff --git a/data-dml/mosip_regdevice/dml/regdevice-registered_device_master.csv b/data-dml/mosip_regdevice/dml/regdevice-registered_device_master.csv new file mode 100644 index 00000000000..d6a7a75f850 --- /dev/null +++ b/data-dml/mosip_regdevice/dml/regdevice-registered_device_master.csv @@ -0,0 +1,4 @@ +code,status_code,device_id,device_sub_id,digital_id,serial_number,device_detail_id,purpose,firmware,expiry_date,certification_level,foundational_trust_provider_id,hotlisted,is_active,cr_by,cr_dtimes,upd_by,upd_dtimes +b692b595-3523-slap-99fc-bd76e35f190f,Registered,76ea9022-5b95-41c5-bf18-960f8c67a6c9,"[1,2,3]","{""serialNo"":""1234567890"",""deviceProvider"":""MOSIP"",""deviceProviderId"":""MOSIP.PROXY.SBI"",""make"":""MOSIP"",""model"":""SLAP01"",""dateTime"":""2020-12-01T13:37:59.402Z"",""type"":""Finger"",""deviceSubType"":""Slap""}",1234567890,mdevice_detail_default_finger,Registration,MOSIP.SLAP.1.0.0.0,10/1/2021 12:03,L0,,FALSE,TRUE,superadmin,now(),superadmin,now() +b692b595-3523-face-99fc-bd76e35f190f,Registered,bf77b975-0d7f-4cb1-8429-33f3939c409a,[0],"{""serialNo"":""2345678901"",""deviceProvider"":""MOSIP"",""deviceProviderId"":""MOSIP.PROXY.SBI"",""make"":""MOSIP"",""model"":""FACE01"",""dateTime"":""2020-12-01T13:32:41.565Z"",""type"":""Face"",""deviceSubType"":""Full Face""}",2345678901,mdevice_detail_default_face,Registration,MOSIP.FACE.1.0.0.0,10/1/2021 12:03,L0,,FALSE,TRUE,superadmin,now(),superadmin,now() +b692b595-3523-iris-99fc-bd76e35f190f,Registered,9a402e95-303d-49f6-a8e4-55c8f4f9acfc,"[1,2,3]","{""serialNo"":""3456789012"",""deviceProvider"":""MOSIP"",""deviceProviderId"":""MOSIP.PROXY.SBI"",""make"":""MOSIP"",""model"":""IRIS01"",""dateTime"":""2020-12-01T13:36:47.015Z"",""type"":""Iris"",""deviceSubType"":""Double""}",3456789012,mdevice_detail_default_iris,Registration,MOSIP.IRIS.1.0.0.0,10/1/2021 12:03,L0,,FALSE,TRUE,superadmin,now(),superadmin,now() diff --git a/data-dml/mosip_regdevice/dml/regdevice-registered_device_master_h.csv b/data-dml/mosip_regdevice/dml/regdevice-registered_device_master_h.csv new file mode 100644 index 00000000000..d1fbb662a83 --- /dev/null +++ b/data-dml/mosip_regdevice/dml/regdevice-registered_device_master_h.csv @@ -0,0 +1,4 @@ +code,status_code,device_id,device_sub_id,digital_id,serial_number,device_detail_id,purpose,firmware,expiry_date,certification_level,foundational_trust_provider_id,hotlisted,is_active,cr_by,cr_dtimes,upd_by,upd_dtimes,eff_dtimes +b692b595-3523-slap-99fc-bd76e35f190f,Registered,76ea9022-5b95-41c5-bf18-960f8c67a6c9,"[1,2,3]","{""serialNo"":""1234567890"",""deviceProvider"":""MOSIP"",""deviceProviderId"":""MOSIP.PROXY.SBI"",""make"":""MOSIP"",""model"":""SLAP01"",""dateTime"":""2020-12-01T13:37:59.402Z"",""type"":""Finger"",""deviceSubType"":""Slap""}",1234567890,mdevice_detail_default_finger,Registration,MOSIP.SLAP.1.0.0.0,10/1/2021 12:03,L0,,FALSE,TRUE,superadmin,now(),superadmin,now(),now() +b692b595-3523-face-99fc-bd76e35f190f,Registered,bf77b975-0d7f-4cb1-8429-33f3939c409a,[0],"{""serialNo"":""2345678901"",""deviceProvider"":""MOSIP"",""deviceProviderId"":""MOSIP.PROXY.SBI"",""make"":""MOSIP"",""model"":""FACE01"",""dateTime"":""2020-12-01T13:32:41.565Z"",""type"":""Face"",""deviceSubType"":""Full Face""}",2345678901,mdevice_detail_default_face,Registration,MOSIP.FACE.1.0.0.0,10/1/2021 12:03,L0,,FALSE,TRUE,superadmin,now(),superadmin,now(),now() +b692b595-3523-iris-99fc-bd76e35f190f,Registered,9a402e95-303d-49f6-a8e4-55c8f4f9acfc,"[1,2,3]","{""serialNo"":""3456789012"",""deviceProvider"":""MOSIP"",""deviceProviderId"":""MOSIP.PROXY.SBI"",""make"":""MOSIP"",""model"":""IRIS01"",""dateTime"":""2020-12-01T13:36:47.015Z"",""type"":""Iris"",""deviceSubType"":""Double""}",3456789012,mdevice_detail_default_iris,Registration,MOSIP.IRIS.1.0.0.0,10/1/2021 12:03,L0,,FALSE,TRUE,superadmin,now(),superadmin,now(),now() diff --git a/data-dml/mosip_regdevice/dml/regdevice-secure_biometric_interface.csv b/data-dml/mosip_regdevice/dml/regdevice-secure_biometric_interface.csv new file mode 100644 index 00000000000..7a0c505bba9 --- /dev/null +++ b/data-dml/mosip_regdevice/dml/regdevice-secure_biometric_interface.csv @@ -0,0 +1,4 @@ +id,sw_binary_hash,sw_version,device_detail_id,sw_cr_dtimes,sw_expiry_dtimes,approval_status,is_active,cr_by,cr_dtimes,upd_by,upd_dtimes +618856c8-43fc-4e01-9d9b-67d20a07b352,binary data,0.9.5,mdevice_detail_default_finger,now(),10/1/2021 12:03,Activated,TRUE,superadmin,now(),superadmin,now() +5fbe45ac-b4dc-4523-b368-c38f46633662,binary data,0.9.5,mdevice_detail_default_face,now(),10/1/2021 12:03,Activated,TRUE,superadmin,now(),superadmin,now() +d2479cf1-4c63-420e-9480-105e744caa99,binary data,0.9.5,mdevice_detail_default_iris,now(),10/1/2021 12:03,Activated,TRUE,superadmin,now(),superadmin,now() diff --git a/data-dml/mosip_regdevice/dml/regdevice-secure_biometric_interface_h.csv b/data-dml/mosip_regdevice/dml/regdevice-secure_biometric_interface_h.csv new file mode 100644 index 00000000000..1a2a41fd713 --- /dev/null +++ b/data-dml/mosip_regdevice/dml/regdevice-secure_biometric_interface_h.csv @@ -0,0 +1,4 @@ +id,sw_binary_hash,sw_version,device_detail_id,sw_cr_dtimes,sw_expiry_dtimes,approval_status,is_active,cr_by,cr_dtimes,upd_by,upd_dtimes,eff_dtimes +618856c8-43fc-4e01-9d9b-67d20a07b352,binary data,0.9.5,mdevice_detail_default_finger,now(),10/1/2021 12:03,Activated,TRUE,superadmin,now(),superadmin,now(),now() +5fbe45ac-b4dc-4523-b368-c38f46633662,binary data,0.9.5,mdevice_detail_default_face,now(),10/1/2021 12:03,Activated,TRUE,superadmin,now(),superadmin,now(),now() +d2479cf1-4c63-420e-9480-105e744caa99,binary data,0.9.5,mdevice_detail_default_iris,now(),10/1/2021 12:03,Activated,TRUE,superadmin,now(),superadmin,now(),now() diff --git a/data-dml/mosip_regdevice/mosip_regdevice_deploy.properties b/data-dml/mosip_regdevice/mosip_regdevice_deploy.properties new file mode 100644 index 00000000000..4d88afa7ffe --- /dev/null +++ b/data-dml/mosip_regdevice/mosip_regdevice_deploy.properties @@ -0,0 +1,10 @@ +DB_SERVERIP= +DB_PORT= +SU_USER=postgres +DEFAULT_DB_NAME=postgres +MOSIP_DB_NAME=mosip_regdevice +SYSADMIN_USER=sysadmin +BASEPATH=/home/madmin/database/ +LOG_PATH=/home/madmin/logs/ +DML_FLAG=1 +DML_FILENAME=mosip_regdevice_dml_deploy.sql diff --git a/data-dml/mosip_regdevice/mosip_regdevice_dml_deploy.sh b/data-dml/mosip_regdevice/mosip_regdevice_dml_deploy.sh new file mode 100644 index 00000000000..001e5548bb6 --- /dev/null +++ b/data-dml/mosip_regdevice/mosip_regdevice_dml_deploy.sh @@ -0,0 +1,70 @@ +### -- --------------------------------------------------------------------------------------------------------- +### -- Script Name : DML deploy +### -- Deploy Module : MOSIP REGISTRATION DEVICE MANAGEMENT +### -- Purpose : To deploy Database DMLs. +### -- Create By : Sadanandegowda DM +### -- Created Date : Nov-2020 +### -- +### -- Modified Date Modified By Comments / Remarks +### -- ----------------------------------------------------------------------------------------------------------- + +#########Properties file ############# +set -e +properties_file="$1" +echo `date "+%m/%d/%Y %H:%M:%S"` ": $properties_file" +#properties_file="./app.properties" +if [ -f "$properties_file" ] +then + echo `date "+%m/%d/%Y %H:%M:%S"` ": Property file \"$properties_file\" found." + while IFS='=' read -r key value + do + key=$(echo $key | tr '.' '_') + eval ${key}=\${value} + done < "$properties_file" +else + echo `date "+%m/%d/%Y %H:%M:%S"` ": Property file not found, Pass property file name as argument." +fi +echo `date "+%m/%d/%Y %H:%M:%S"` ": ------------------ Database server and service status check for ${MOSIP_DB_NAME}------------------------" +##############################################LOG FILE CREATION############################################################# + +today=`date '+%d%m%Y_%H%M%S'`; +LOG="${LOG_PATH}${MOSIP_DB_NAME}-dml-${today}.log" +touch $LOG + + +SERVICE=$(PGPASSWORD=$SU_USER_PWD psql --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -t -c "select count(1) from pg_roles where rolname IN('sysadmin')";exit; > /dev/null) + +if [ "$SERVICE" -eq 0 ] || [ "$SERVICE" -eq 1 ] +then +echo `date "+%m/%d/%Y %H:%M:%S"` ": Postgres database server and service is up and running" | tee -a $LOG 2>&1 +else +echo `date "+%m/%d/%Y %H:%M:%S"` ": Postgres database server or service is not running" | tee -a $LOG 2>&1 +fi + +echo `date "+%m/%d/%Y %H:%M:%S"` ": ----------------------------------------------------------------------------------------" + +echo `date "+%m/%d/%Y %H:%M:%S"` ": Started sourcing the $MOSIP_DB_NAME Database DML scripts" | tee -a $LOG 2>&1 +echo `date "+%m/%d/%Y %H:%M:%S"` ": Database scripts are sourcing from :$BASEPATH" | tee -a $LOG 2>&1 + +#========================================DB DML Deployment process begins on DB SERVER====================================== + +if [ ${DML_FLAG} == 1 ] +then + echo `date "+%m/%d/%Y %H:%M:%S"` ": Deploying DML for ${MOSIP_DB_NAME} database" | tee -a $LOG 2>&1 + PGPASSWORD=$SYSADMIN_PWD psql --username=$SYSADMIN_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -a -b -f $DML_FILENAME >> $LOG 2>&1 +else + echo `date "+%m/%d/%Y %H:%M:%S"` ": There are no DML deployment required for ${MOSIP_DB_NAME}" | tee -a $LOG 2>&1 +fi + +if [ $(grep -c ERROR $LOG) -ne 0 ] +then + echo `date "+%m/%d/%Y %H:%M:%S"` ": Database DML deployment is completed with ERRORS, Please check the logs for more information" | tee -a $LOG 2>&1 + echo `date "+%m/%d/%Y %H:%M:%S"` ": END of MOSIP database deployment" | tee -a $LOG 2>&1 +else + echo `date "+%m/%d/%Y %H:%M:%S"` ": Database DML deployment completed successfully, Please check the logs for more information" | tee -a $LOG 2>&1 + echo `date "+%m/%d/%Y %H:%M:%S"` ": END of MOSIP \"${MOSIP_DB_NAME}\" database deployment" | tee -a $LOG 2>&1 +fi + +echo "******************************************"`date "+%m/%d/%Y %H:%M:%S"` "*****************************************************" >> $LOG 2>&1 + +#========================================DB DML Deployment process completes on DB SERVER====================================== diff --git a/data-dml/mosip_regdevice/mosip_regdevice_dml_deploy.sql b/data-dml/mosip_regdevice/mosip_regdevice_dml_deploy.sql new file mode 100644 index 00000000000..978f5fe7629 --- /dev/null +++ b/data-dml/mosip_regdevice/mosip_regdevice_dml_deploy.sql @@ -0,0 +1,58 @@ +\c mosip_regdevice sysadmin + +\set CSVDataPath '\'/home/dbadmin/mosip_regdevice/dml' + +-------------- Level 1 data load scripts ------------------------ + +----- TRUNCATE regdevice.reg_device_type TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE regdevice.reg_device_type cascade ; + +\COPY regdevice.reg_device_type (code,name,descr,is_active,cr_by,cr_dtimes) FROM './dml/regdevice-reg_device_type.csv' delimiter ',' HEADER csv; + +-------------- Level 2 data load scripts ------------------------ + +----- TRUNCATE regdevice.reg_device_sub_type TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE regdevice.reg_device_sub_type cascade ; + +\COPY regdevice.reg_device_sub_type (code,dtyp_code,name,descr,is_active,cr_by,cr_dtimes) FROM './dml/regdevice-reg_device_sub_type.csv' delimiter ',' HEADER csv; + +----- TRUNCATE regdevice.device_detail TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE regdevice.device_detail cascade ; + +\COPY regdevice.device_detail (id,dprovider_id,dtype_code,dstype_code,make,model,partner_org_name,approval_status,is_active,cr_by,cr_dtimes,upd_by,upd_dtimes) FROM './dml/regdevice-device_detail.csv' delimiter ',' HEADER csv; + +----- TRUNCATE regdevice.registered_device_master TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE regdevice.registered_device_master cascade ; + +\COPY regdevice.registered_device_master (code,status_code,device_id,device_sub_id,digital_id,serial_number,device_detail_id,purpose,firmware,expiry_date,certification_level,foundational_trust_provider_id,hotlisted,is_active,cr_by,cr_dtimes,upd_by,upd_dtimes) FROM './dml/regdevice-registered_device_master.csv' delimiter ',' HEADER csv; + +----- TRUNCATE regdevice.secure_biometric_interface TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE regdevice.secure_biometric_interface cascade ; + +\COPY regdevice.secure_biometric_interface (id,sw_binary_hash,sw_version,device_detail_id,sw_cr_dtimes,sw_expiry_dtimes,approval_status,is_active,cr_by,cr_dtimes,upd_by,upd_dtimes) FROM './dml/regdevice-secure_biometric_interface.csv' delimiter ',' HEADER csv; + +----- TRUNCATE regdevice.registered_device_master_h TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE regdevice.registered_device_master_h cascade ; + +\COPY regdevice.registered_device_master_h (code,status_code,device_id,device_sub_id,digital_id,serial_number,device_detail_id,purpose,firmware,expiry_date,certification_level,foundational_trust_provider_id,hotlisted,is_active,cr_by,cr_dtimes,upd_by,upd_dtimes,eff_dtimes) FROM './dml/regdevice-registered_device_master_h.csv' delimiter ',' HEADER csv; + +----- TRUNCATE regdevice.secure_biometric_interface_h TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE regdevice.secure_biometric_interface_h cascade ; + +\COPY regdevice.secure_biometric_interface_h (id,sw_binary_hash,sw_version,device_detail_id,sw_cr_dtimes,sw_expiry_dtimes,approval_status,is_active,cr_by,cr_dtimes,upd_by,upd_dtimes,eff_dtimes) FROM './dml/regdevice-secure_biometric_interface_h.csv' delimiter ',' HEADER csv; + + + + + + + + + + + + + + + + diff --git a/data-dml/mosip_regprc/dml/regprc-transaction_type.csv b/data-dml/mosip_regprc/dml/regprc-transaction_type.csv new file mode 100644 index 00000000000..53ad6bf3610 --- /dev/null +++ b/data-dml/mosip_regprc/dml/regprc-transaction_type.csv @@ -0,0 +1,24 @@ +code,descr,lang_code,is_active,cr_by,cr_dtimes +CREATE,transaction_done,eng,TRUE,MOSIP_SYSTEM,now() +DELETE,delete transaction,eng,TRUE,MOSIP_SYSTEM,now() +FAILED,transaction failed,eng,TRUE,MOSIP_SYSTEM,now() +UPDATE,transaction_done,eng,TRUE,MOSIP_SYSTEM,now() +DEMO,transaction_done,eng,TRUE,MOSIP_SYSTEM,now() +BIO,transaction_done,eng,TRUE,MOSIP_SYSTEM,now() +PACKET_RECEIVER,transaction done,eng,TRUE,MOSIP_SYSTEM,now() +UPLOAD_PACKET,transaction done,eng,TRUE,MOSIP_SYSTEM,now() +VALIDATE_PACKET,transaction done,eng,TRUE,MOSIP_SYSTEM,now() +VIRUS_SCAN,transaction done,eng,TRUE,MOSIP_SYSTEM,now() +OSI_VALIDATE,transaction done,eng,TRUE,MOSIP_SYSTEM,now() +EXTERNAL_INTEGRATION,transaction done,eng,TRUE,MOSIP_SYSTEM,now() +DEMOGRAPHIC_VERIFICATION,transaction done,eng,TRUE,MOSIP_SYSTEM,now() +MANUAL_VERIFICATION,transaction done,eng,TRUE,MOSIP_SYSTEM,now() +BIOGRAPHIC_VERIFICATION,transaction done,eng,TRUE,MOSIP_SYSTEM,now() +UIN_GENERATOR,transaction done,eng,TRUE,MOSIP_SYSTEM,now() +NOTIFICATION,transaction done,eng,TRUE,MOSIP_SYSTEM,now() +PRINT_SERVICE,transaction done,eng,TRUE,MOSIP_SYSTEM,now() +PRINT_POSTAL_SERVICE,transaction done,eng,TRUE,MOSIP_SYSTEM,now() +QUALITY_CHECK,transaction done,eng,TRUE,MOSIP_SYSTEM,now() +BIOMETRIC_AUTHENTICATION,transaction done,eng,TRUE,MOSIP_SYSTEM,now() +PACKET_REPROCESS,transcation done,eng,TRUE,MOSIP_SYSTEM,now() +SECUREZONE_NOTIFICATION,transaction notification,eng,TRUE,MOSIP_SYSTEM,now() diff --git a/data-dml/mosip_regprc/mosip_regprc_deploy.properties b/data-dml/mosip_regprc/mosip_regprc_deploy.properties new file mode 100644 index 00000000000..478fc344eaa --- /dev/null +++ b/data-dml/mosip_regprc/mosip_regprc_deploy.properties @@ -0,0 +1,10 @@ +DB_SERVERIP= +DB_PORT= +SU_USER=postgres +DEFAULT_DB_NAME=postgres +MOSIP_DB_NAME=mosip_regprc +SYSADMIN_USER=sysadmin +BASEPATH=/home/madmin/database/ +LOG_PATH=/home/madmin/logs/ +DML_FLAG=1 +DML_FILENAME=mosip_regprc_dml_deploy.sql diff --git a/data-dml/mosip_regprc/mosip_regprc_dml_deploy.sh b/data-dml/mosip_regprc/mosip_regprc_dml_deploy.sh new file mode 100644 index 00000000000..6cbb59b78f8 --- /dev/null +++ b/data-dml/mosip_regprc/mosip_regprc_dml_deploy.sh @@ -0,0 +1,70 @@ +### -- --------------------------------------------------------------------------------------------------------- +### -- Script Name : DML deploy +### -- Deploy Module : MOSIP REGISTRATION PROCESSOR +### -- Purpose : To deploy Database DMLs. +### -- Create By : Sadanandegowda DM +### -- Created Date : Nov-2020 +### -- +### -- Modified Date Modified By Comments / Remarks +### -- ----------------------------------------------------------------------------------------------------------- + +#########Properties file ############# +set -e +properties_file="$1" +echo `date "+%m/%d/%Y %H:%M:%S"` ": $properties_file" +#properties_file="./app.properties" +if [ -f "$properties_file" ] +then + echo `date "+%m/%d/%Y %H:%M:%S"` ": Property file \"$properties_file\" found." + while IFS='=' read -r key value + do + key=$(echo $key | tr '.' '_') + eval ${key}=\${value} + done < "$properties_file" +else + echo `date "+%m/%d/%Y %H:%M:%S"` ": Property file not found, Pass property file name as argument." +fi +echo `date "+%m/%d/%Y %H:%M:%S"` ": ------------------ Database server and service status check for ${MOSIP_DB_NAME}------------------------" +##############################################LOG FILE CREATION############################################################# + +today=`date '+%d%m%Y_%H%M%S'`; +LOG="${LOG_PATH}${MOSIP_DB_NAME}-dml-${today}.log" +touch $LOG + + +SERVICE=$(PGPASSWORD=$SU_USER_PWD psql --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -t -c "select count(1) from pg_roles where rolname IN('sysadmin')";exit; > /dev/null) + +if [ "$SERVICE" -eq 0 ] || [ "$SERVICE" -eq 1 ] +then +echo `date "+%m/%d/%Y %H:%M:%S"` ": Postgres database server and service is up and running" | tee -a $LOG 2>&1 +else +echo `date "+%m/%d/%Y %H:%M:%S"` ": Postgres database server or service is not running" | tee -a $LOG 2>&1 +fi + +echo `date "+%m/%d/%Y %H:%M:%S"` ": ----------------------------------------------------------------------------------------" + +echo `date "+%m/%d/%Y %H:%M:%S"` ": Started sourcing the $MOSIP_DB_NAME Database DML scripts" | tee -a $LOG 2>&1 +echo `date "+%m/%d/%Y %H:%M:%S"` ": Database scripts are sourcing from :$BASEPATH" | tee -a $LOG 2>&1 + +#========================================DB DML Deployment process begins on DB SERVER====================================== + +if [ ${DML_FLAG} == 1 ] +then + echo `date "+%m/%d/%Y %H:%M:%S"` ": Deploying DML for ${MOSIP_DB_NAME} database" | tee -a $LOG 2>&1 + PGPASSWORD=$SYSADMIN_PWD psql --username=$SYSADMIN_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -a -b -f $DML_FILENAME >> $LOG 2>&1 +else + echo `date "+%m/%d/%Y %H:%M:%S"` ": There are no DML deployment required for ${MOSIP_DB_NAME}" | tee -a $LOG 2>&1 +fi + +if [ $(grep -c ERROR $LOG) -ne 0 ] +then + echo `date "+%m/%d/%Y %H:%M:%S"` ": Database DML deployment is completed with ERRORS, Please check the logs for more information" | tee -a $LOG 2>&1 + echo `date "+%m/%d/%Y %H:%M:%S"` ": END of MOSIP database deployment" | tee -a $LOG 2>&1 +else + echo `date "+%m/%d/%Y %H:%M:%S"` ": Database DML deployment completed successfully, Please check the logs for more information" | tee -a $LOG 2>&1 + echo `date "+%m/%d/%Y %H:%M:%S"` ": END of MOSIP \"${MOSIP_DB_NAME}\" database deployment" | tee -a $LOG 2>&1 +fi + +echo "******************************************"`date "+%m/%d/%Y %H:%M:%S"` "*****************************************************" >> $LOG 2>&1 + +#========================================DB DML Deployment process completes on DB SERVER====================================== diff --git a/data-dml/mosip_regprc/mosip_regprc_dml_deploy.sql b/data-dml/mosip_regprc/mosip_regprc_dml_deploy.sql new file mode 100644 index 00000000000..2ee31ca0c61 --- /dev/null +++ b/data-dml/mosip_regprc/mosip_regprc_dml_deploy.sql @@ -0,0 +1,30 @@ +\c mosip_regprc sysadmin + +\set CSVDataPath '\'/home/dbadmin/mosip_regprc/' + +-------------- Level 1 data load scripts ------------------------ +----- TRUNCATE regprc.transaction_type TABLE Data and It's reference Data and COPY Data from CSV file ----- +TRUNCATE TABLE regprc.transaction_type cascade ; + +\COPY regprc.transaction_type (code,descr,lang_code,is_active,cr_by,cr_dtimes) FROM './dml/regprc-transaction_type.csv' delimiter ',' HEADER csv; + + +--------------------------------------------------------------------------------------------------------------------------------------------------------------------- + + + + + + + + + + + + + + + + + + diff --git a/kernel/kernel-ref-idobjectvalidator/pom.xml b/kernel/kernel-ref-idobjectvalidator/pom.xml index 1acc67d085b..71929a3c74b 100644 --- a/kernel/kernel-ref-idobjectvalidator/pom.xml +++ b/kernel/kernel-ref-idobjectvalidator/pom.xml @@ -4,15 +4,15 @@ io.mosip.kernel kernel-ref-parent - 1.1.2 + 1.1.4 kernel-ref-idobjectvalidator kernel-ref-idobjectvalidator - 1.1.2 + 1.1.4 - 1.1.2 + 1.1.4 11 11 3.8.0 diff --git a/kernel/kernel-ref-idobjectvalidator/src/main/java/io/mosip/kernel/idobjectvalidator/constant/IdObjectReferenceValidatorConstant.java b/kernel/kernel-ref-idobjectvalidator/src/main/java/io/mosip/kernel/idobjectvalidator/constant/IdObjectReferenceValidatorConstant.java index 048493f487b..05d5aaab9c7 100644 --- a/kernel/kernel-ref-idobjectvalidator/src/main/java/io/mosip/kernel/idobjectvalidator/constant/IdObjectReferenceValidatorConstant.java +++ b/kernel/kernel-ref-idobjectvalidator/src/main/java/io/mosip/kernel/idobjectvalidator/constant/IdObjectReferenceValidatorConstant.java @@ -9,23 +9,20 @@ public class IdObjectReferenceValidatorConstant { public static final String ROOT_PATH = "identity"; public static final String IDENTITY_ARRAY_VALUE_FIELD = "value"; + public static final String MASTERDATA_LANGUAGE_PATH = "response.languages.*"; + public static final String MASTERDATA_LOCATIONS_PATH = "locations.*"; + public static final String DOC_TYPE_SCHEMA_FORMAT = "identity.%s.type"; + public static final String JSON_PATH_WILDCARD_SEARCH = "*.%s"; + public static final String SIMPLE_TYPE_VALUE_PATH = "%s.*.value"; + public static final String SIMPLE_TYPE_LANGUAGE_PATH = "%s.*.language"; public static final String IDENTITY_REFERENCE_IDENTITY_NUMBER_PATH = "identity.referenceIdentityNumber"; public static final String IDENTITY_LANGUAGE_PATH = "identity.*.*.language"; - public static final String IDENTITY_POSTAL_CODE_PATH = "identity.postalCode"; public static final String IDENTITY_GENDER_LANGUAGE_PATH = "identity.gender.*.language"; public static final String IDENTITY_GENDER_VALUE_PATH = "identity.gender.*.value"; - public static final String IDENTITY_REGION_LANGUAGE_PATH = "identity.region.*.language"; - public static final String IDENTITY_REGION_VALUE_PATH = "identity.region.*.value"; - public static final String IDENTITY_PROVINCE_LANGUAGE_PATH = "identity.province.*.language"; - public static final String IDENTITY_PROVINCE_VALUE_PATH = "identity.province.*.value"; - public static final String IDENTITY_CITY_LANGUAGE_PATH = "identity.city.*.language"; - public static final String IDENTITY_CITY_VALUE_PATH = "identity.city.*.value"; - public static final String IDENTITY_ZONE_LANGUAGE_PATH = "identity.zone.*.language"; - public static final String IDENTITY_ZONE_VALUE_PATH = "identity.zone.*.value"; public static final String IDENTITY_RESIDENCE_STATUS_LANGUAGE_PATH = "identity.residenceStatus.*.language"; public static final String IDENTITY_RESIDENCE_STATUS_VALUE_PATH = "identity.residenceStatus.*.value"; - public static final String MASTERDATA_LANGUAGE_PATH = "response.languages.*"; - public static final String MASTERDATA_LOCATIONS_PATH = "locations.*"; + public static final String IDENTITY_DOB_PATH = "identity.dateOfBirth"; + public static final String DOB_FORMAT = "mosip.kernel.idobjectvalidator.date-format"; public static final String MASTERDATA_LANGUAGE_URI = "mosip.kernel.idobjectvalidator.masterdata.languages.rest.uri"; public static final String MASTERDATA_GENDERTYPES_URI = "mosip.kernel.idobjectvalidator.masterdata.gendertypes.rest.uri"; public static final String MASTERDATA_DOCUMENT_CATEGORIES_URI = "mosip.kernel.idobjectvalidator.masterdata.documentcategories.rest.uri"; @@ -34,6 +31,4 @@ public class IdObjectReferenceValidatorConstant { public static final String MASTERDATA_LOCATION_HIERARCHY_URI = "mosip.kernel.idobjectvalidator.masterdata.locationhierarchy.rest.uri"; public static final String MASTERDATA_INDIVIDUAL_TYPES_URI = "mosip.kernel.idobjectvalidator.masterdata.individualtypes.rest.uri"; public static final String LOCATION_NA = "mosip.kernel.idobjectvalidator.masterdata.locations.locationNotAvailable"; - public static final String DOB_FORMAT = "uuuu/MM/dd"; - public static final String IDENTITY_DOB_PATH = "identity.dateOfBirth"; } diff --git a/kernel/kernel-ref-idobjectvalidator/src/main/java/io/mosip/kernel/idobjectvalidator/impl/IdObjectReferenceValidator.java b/kernel/kernel-ref-idobjectvalidator/src/main/java/io/mosip/kernel/idobjectvalidator/impl/IdObjectReferenceValidator.java index dda509c380f..386b7705377 100644 --- a/kernel/kernel-ref-idobjectvalidator/src/main/java/io/mosip/kernel/idobjectvalidator/impl/IdObjectReferenceValidator.java +++ b/kernel/kernel-ref-idobjectvalidator/src/main/java/io/mosip/kernel/idobjectvalidator/impl/IdObjectReferenceValidator.java @@ -4,21 +4,14 @@ import static io.mosip.kernel.core.idobjectvalidator.constant.IdObjectValidatorErrorConstant.ID_OBJECT_VALIDATION_FAILED; import static io.mosip.kernel.core.idobjectvalidator.constant.IdObjectValidatorErrorConstant.INVALID_INPUT_PARAMETER; import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorConstant.DOB_FORMAT; -import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorConstant.IDENTITY_CITY_LANGUAGE_PATH; -import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorConstant.IDENTITY_CITY_VALUE_PATH; +import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorConstant.DOC_TYPE_SCHEMA_FORMAT; import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorConstant.IDENTITY_DOB_PATH; import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorConstant.IDENTITY_GENDER_LANGUAGE_PATH; import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorConstant.IDENTITY_GENDER_VALUE_PATH; import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorConstant.IDENTITY_LANGUAGE_PATH; -import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorConstant.IDENTITY_POSTAL_CODE_PATH; -import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorConstant.IDENTITY_PROVINCE_LANGUAGE_PATH; -import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorConstant.IDENTITY_PROVINCE_VALUE_PATH; -import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorConstant.IDENTITY_REGION_LANGUAGE_PATH; -import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorConstant.IDENTITY_REGION_VALUE_PATH; import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorConstant.IDENTITY_RESIDENCE_STATUS_LANGUAGE_PATH; import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorConstant.IDENTITY_RESIDENCE_STATUS_VALUE_PATH; -import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorConstant.IDENTITY_ZONE_LANGUAGE_PATH; -import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorConstant.IDENTITY_ZONE_VALUE_PATH; +import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorConstant.JSON_PATH_WILDCARD_SEARCH; import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorConstant.LOCATION_NA; import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorConstant.MASTERDATA_DOCUMENT_CATEGORIES_URI; import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorConstant.MASTERDATA_DOCUMENT_TYPES_URI; @@ -29,11 +22,8 @@ import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorConstant.MASTERDATA_LOCATIONS_PATH; import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorConstant.MASTERDATA_LOCATIONS_URI; import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorConstant.MASTERDATA_LOCATION_HIERARCHY_URI; -import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorLocationMapping.CITY; -import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorLocationMapping.POSTAL_CODE; -import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorLocationMapping.PROVINCE; -import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorLocationMapping.REGION; -import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorLocationMapping.ZONE; +import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorConstant.SIMPLE_TYPE_LANGUAGE_PATH; +import static io.mosip.kernel.idobjectvalidator.constant.IdObjectReferenceValidatorConstant.SIMPLE_TYPE_VALUE_PATH; import java.time.LocalDate; import java.time.format.DateTimeFormatter; @@ -41,7 +31,10 @@ import java.time.format.ResolverStyle; import java.util.AbstractMap; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; import java.util.Collections; +import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -56,11 +49,13 @@ import org.apache.commons.collections4.SetValuedMap; import org.apache.commons.collections4.multimap.HashSetValuedHashMap; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.context.annotation.Lazy; import org.springframework.core.ParameterizedTypeReference; import org.springframework.core.env.Environment; import org.springframework.http.HttpMethod; +import org.springframework.stereotype.Component; import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder; @@ -91,8 +86,12 @@ */ @Lazy @RefreshScope +@Component +@ConfigurationProperties("mosip.kernel.idobjectvalidator.locationhierarchy") public class IdObjectReferenceValidator implements IdObjectValidator { - + + private Map mapping = Collections.emptyMap(); + private static final String INDIVIDUAL_TYPES = "individualTypes"; private static final String GENDER_NAME = "genderName"; @@ -127,19 +126,19 @@ public class IdObjectReferenceValidator implements IdObjectValidator { /** The env. */ @Autowired private Environment env; - + /** The mapper. */ @Autowired private ObjectMapper mapper; - + /** The Constant READ_OPTIONS. */ private static final Configuration READ_OPTIONS = Configuration.defaultConfiguration() .addOptions(Option.SUPPRESS_EXCEPTIONS); - + /** The Constant READ_LIST_OPTIONS. */ private static final Configuration READ_LIST_OPTIONS = Configuration.defaultConfiguration() .addOptions(Option.SUPPRESS_EXCEPTIONS, Option.ALWAYS_RETURN_LIST); - + /** The Constant PATH_LIST_OPTIONS. */ private static final Configuration PATH_LIST_OPTIONS = Configuration.defaultConfiguration() .addOptions(Option.SUPPRESS_EXCEPTIONS, Option.AS_PATH_LIST, Option.ALWAYS_RETURN_LIST); @@ -147,64 +146,47 @@ public class IdObjectReferenceValidator implements IdObjectValidator { /** The rest template. */ @Autowired private RestTemplate restTemplate; - + /** The language list. */ private List languageList; - + /** The gender map. */ private SetValuedMap genderMap; - + /** The doc cat map. */ private SetValuedMap docCatMap; - + /** The doc type map. */ private SetValuedMap docTypeMap; - + /** The location hierarchy details. */ - private SetValuedMap locationHierarchyDetails; - + private Map> locationHierarchyDetails; + /** The location details. */ private Map> locationDetails; - - /** The region map. */ - private SetValuedMap regionMap; - - /** The province map. */ - private SetValuedMap provinceMap; - - /** The city map. */ - private SetValuedMap cityMap; - - /** The zone map. */ - private SetValuedMap zoneMap; - - /** The postal code map. */ - private SetValuedMap postalCodeMap; - + private SetValuedMap residenceStatusMap; - + /** * Load data. */ @PostConstruct public void loadData() { - mapper.registerModule(new Jdk8Module()) - .registerModule(new JavaTimeModule()); + mapper.registerModule(new Jdk8Module()).registerModule(new JavaTimeModule()); loadLanguages(); loadGenderTypes(); loadLocationDetails(); loadDocCategories(); loadDocTypes(); - loadRegion(); - loadProvince(); - loadCity(); - loadZone(); - loadPostalCode(); loadResidenceStatus(); } - - /* (non-Javadoc) - * @see io.mosip.kernel.core.idobjectvalidator.spi.IdObjectValidator#validateIdObject(java.lang.Object) + + /* + * (non-Javadoc) + * + * @see + * io.mosip.kernel.core.idobjectvalidator.spi.IdObjectValidator#validateIdObject + * (java.lang.Object) */ @Override public boolean validateIdObject(String identitySchema, Object identityObject, List requiredFields) @@ -215,18 +197,13 @@ public boolean validateIdObject(String identitySchema, Object identityObject, Li validateDateOfBirth(identityString, errorList); validateLanguage(identityString, errorList); validateGender(identityString, errorList); - validateRegion(identityString, errorList); - validateProvince(identityString, errorList); - validateCity(identityString, errorList); - validatePostalCode(identityString, errorList); - validateZone(identityString, errorList); + validateLocationHierarchy(identityString, errorList); validateDocuments(identityString, errorList); validateResidenceStatus(identityString, errorList); if (errorList.isEmpty()) { return true; } else { - throw new IdObjectValidationFailedException( - ID_OBJECT_VALIDATION_FAILED, errorList); + throw new IdObjectValidationFailedException(ID_OBJECT_VALIDATION_FAILED, errorList); } } catch (JsonProcessingException e) { ExceptionUtils.logRootCause(e); @@ -239,19 +216,16 @@ public boolean validateIdObject(String identitySchema, Object identityObject, Li */ @SuppressWarnings("unchecked") private void loadLanguages() { - ObjectNode responseBody = restTemplate.getForObject( - env.getProperty(MASTERDATA_LANGUAGE_URI), ObjectNode.class); - JsonPath jsonPath = JsonPath.compile(MASTERDATA_LANGUAGE_PATH); - JSONArray response = jsonPath.read(responseBody.toString(), READ_LIST_OPTIONS); - languageList = Optional - .ofNullable(response) - .filter(data -> !data.isEmpty()) - .orElse(new JSONArray()) - .stream() - .map(obj -> ((LinkedHashMap) obj)) - .filter(obj -> (Boolean) obj.get(IS_ACTIVE)) - .map(obj -> String.valueOf(obj.get(CODE))) - .collect(Collectors.toList()); + if (Objects.nonNull(env.getProperty(MASTERDATA_LANGUAGE_URI))) { + ObjectNode responseBody = restTemplate.getForObject(env.getProperty(MASTERDATA_LANGUAGE_URI), + ObjectNode.class); + JsonPath jsonPath = JsonPath.compile(MASTERDATA_LANGUAGE_PATH); + JSONArray response = jsonPath.read(responseBody.toString(), READ_LIST_OPTIONS); + languageList = Optional.ofNullable(response).filter(data -> !data.isEmpty()).orElse(new JSONArray()) + .stream().map(obj -> ((LinkedHashMap) obj)) + .filter(obj -> (Boolean) obj.get(IS_ACTIVE)).map(obj -> String.valueOf(obj.get(CODE))) + .collect(Collectors.toList()); + } } /** @@ -259,462 +233,344 @@ private void loadLanguages() { */ @SuppressWarnings("unchecked") private void loadGenderTypes() { - ResponseWrapper>>> responseBody = restTemplate - .getForObject(env.getProperty(MASTERDATA_GENDERTYPES_URI), - ResponseWrapper.class); - if (Objects.isNull(responseBody.getErrors()) || responseBody.getErrors().isEmpty()) { - ArrayList> response = responseBody.getResponse().get(GENDER_TYPE); - genderMap = new HashSetValuedHashMap<>(response.size()); - IntStream.range(0, response.size()) - .filter(index -> (Boolean) response.get(index).get(IS_ACTIVE)) - .forEach(index -> { - genderMap.put(String.valueOf(response.get(index).get(LANG_CODE)), - String.valueOf(response.get(index).get(GENDER_NAME))); - genderMap.put(String.valueOf(response.get(index).get(LANG_CODE)), - String.valueOf(response.get(index).get(CODE))); - }); + if (Objects.nonNull(env.getProperty(MASTERDATA_LANGUAGE_URI)) + && Objects.nonNull(env.getProperty(MASTERDATA_GENDERTYPES_URI))) { + ResponseWrapper>>> responseBody = restTemplate + .getForObject(env.getProperty(MASTERDATA_GENDERTYPES_URI), ResponseWrapper.class); + if (Objects.isNull(responseBody.getErrors()) || responseBody.getErrors().isEmpty()) { + ArrayList> response = responseBody.getResponse().get(GENDER_TYPE); + genderMap = new HashSetValuedHashMap<>(response.size()); + IntStream.range(0, response.size()).filter(index -> (Boolean) response.get(index).get(IS_ACTIVE)) + .forEach(index -> { + genderMap.put(String.valueOf(response.get(index).get(LANG_CODE)), + String.valueOf(response.get(index).get(GENDER_NAME))); + genderMap.put(String.valueOf(response.get(index).get(LANG_CODE)), + String.valueOf(response.get(index).get(CODE))); + }); + } } } - + /** * Load doc categories. */ @SuppressWarnings("unchecked") private void loadDocCategories() { - ResponseWrapper>>> responseBody = restTemplate - .getForObject(env.getProperty(MASTERDATA_DOCUMENT_CATEGORIES_URI), - ResponseWrapper.class); - if (Objects.isNull(responseBody.getErrors()) || responseBody.getErrors().isEmpty()) { - ArrayList> response = responseBody.getResponse().get(DOCUMENTCATEGORIES); - docCatMap = new HashSetValuedHashMap<>(response.size()); - IntStream.range(0, response.size()) - .filter(index -> (Boolean) response.get(index).get(IS_ACTIVE)) - .forEach(index -> - docCatMap.put(String.valueOf(response.get(index).get(LANG_CODE)), - String.valueOf(response.get(index).get(CODE)))); + if (Objects.nonNull(env.getProperty(MASTERDATA_LANGUAGE_URI)) + && Objects.nonNull(env.getProperty(MASTERDATA_DOCUMENT_CATEGORIES_URI)) + && Objects.nonNull(env.getProperty(MASTERDATA_DOCUMENT_TYPES_URI))) { + ResponseWrapper>>> responseBody = restTemplate + .getForObject(env.getProperty(MASTERDATA_DOCUMENT_CATEGORIES_URI), ResponseWrapper.class); + if (Objects.isNull(responseBody.getErrors()) || responseBody.getErrors().isEmpty()) { + ArrayList> response = responseBody.getResponse().get(DOCUMENTCATEGORIES); + docCatMap = new HashSetValuedHashMap<>(response.size()); + IntStream.range(0, response.size()).filter(index -> (Boolean) response.get(index).get(IS_ACTIVE)) + .forEach(index -> docCatMap.put(String.valueOf(response.get(index).get(LANG_CODE)), + String.valueOf(response.get(index).get(CODE)))); + } } } - + /** * Load doc types. */ @SuppressWarnings("unchecked") private void loadDocTypes() { - docTypeMap = new HashSetValuedHashMap<>(); - if (Objects.nonNull(docCatMap) && !docCatMap.isEmpty()) { - docCatMap.keySet().stream().forEach(langCode -> - docCatMap.get(langCode).stream().forEach(docCat -> { - String uri = UriComponentsBuilder - .fromUriString(env.getProperty(MASTERDATA_DOCUMENT_TYPES_URI)) - .buildAndExpand(docCat, langCode).toUriString(); + if (Objects.nonNull(env.getProperty(MASTERDATA_LANGUAGE_URI)) + && Objects.nonNull(env.getProperty(MASTERDATA_DOCUMENT_CATEGORIES_URI)) + && Objects.nonNull(env.getProperty(MASTERDATA_DOCUMENT_TYPES_URI))) { + docTypeMap = new HashSetValuedHashMap<>(); + if (Objects.nonNull(docCatMap) && !docCatMap.isEmpty()) { + docCatMap.keySet().stream().forEach(langCode -> docCatMap.get(langCode).stream().forEach(docCat -> { + String uri = UriComponentsBuilder.fromUriString(env.getProperty(MASTERDATA_DOCUMENT_TYPES_URI)) + .buildAndExpand(docCat, langCode).toUriString(); ResponseWrapper>>> responseBody = restTemplate .getForObject(uri, ResponseWrapper.class); if (Objects.isNull(responseBody.getErrors()) || responseBody.getErrors().isEmpty()) { ArrayList> response = responseBody.getResponse().get(DOCUMENTS); IntStream.range(0, response.size()) - .filter(index -> (Boolean) response.get(index).get(IS_ACTIVE)) - .forEach(index -> - docTypeMap.put(docCat, String.valueOf(response.get(index).get(CODE))) - ); + .filter(index -> (Boolean) response.get(index).get(IS_ACTIVE)).forEach( + index -> docTypeMap.put(docCat, String.valueOf(response.get(index).get(CODE)))); } - }) - ); + })); + } } } - + /** * Load location details. */ @SuppressWarnings({ "unchecked" }) private void loadLocationDetails() { - locationHierarchyDetails = new HashSetValuedHashMap<>(); - locationDetails = new LinkedHashMap<>(); - languageList.stream().forEach(langCode -> { - String uri = UriComponentsBuilder - .fromUriString(env.getProperty(MASTERDATA_LOCATIONS_URI)) - .buildAndExpand(langCode).toUriString(); - ResponseWrapper responseBody = restTemplate - .exchange(uri, HttpMethod.GET, null, new ParameterizedTypeReference>() { - }).getBody(); - if (Objects.isNull(responseBody.getErrors()) || responseBody.getErrors().isEmpty()) { - JsonPath jsonPath = JsonPath.compile(MASTERDATA_LOCATIONS_PATH); - JSONArray response = jsonPath.read(responseBody.getResponse().toString(), READ_LIST_OPTIONS); - response.stream() - .map(obj -> ((LinkedHashMap) obj)) - .filter(obj -> (Boolean) obj.get(IS_ACTIVE)) - .forEach(obj -> { - locationHierarchyDetails.put(String.valueOf(obj.get(LOCATION_HIERARCHYLEVEL)), - String.valueOf(obj.get(LOCATION_HIERARCHY_NAME))); - locationDetails.put(String.valueOf(obj.get(LOCATION_HIERARCHY_NAME)), null); - }); - } - }); - - Set locationHierarchyNames = locationDetails.keySet().stream().collect(Collectors.toSet()); - locationHierarchyNames.stream().forEach(hierarchyName -> { - String uri = UriComponentsBuilder - .fromUriString( - env.getProperty(MASTERDATA_LOCATION_HIERARCHY_URI)) - .buildAndExpand(hierarchyName).toUriString(); + if (Objects.nonNull(env.getProperty(MASTERDATA_LANGUAGE_URI)) + && Objects.nonNull(env.getProperty(MASTERDATA_LOCATIONS_URI)) + && Objects.nonNull(env.getProperty(MASTERDATA_LOCATION_HIERARCHY_URI))) { + locationHierarchyDetails = new LinkedHashMap<>(); + locationDetails = new LinkedHashMap<>(); + languageList.stream().forEach(langCode -> { + String uri = UriComponentsBuilder.fromUriString(env.getProperty(MASTERDATA_LOCATIONS_URI)) + .buildAndExpand(langCode).toUriString(); + ResponseWrapper responseBody = restTemplate.exchange(uri, HttpMethod.GET, null, + new ParameterizedTypeReference>() { + }).getBody(); + if (Objects.isNull(responseBody.getErrors()) || responseBody.getErrors().isEmpty()) { + JsonPath jsonPath = JsonPath.compile(MASTERDATA_LOCATIONS_PATH); + JSONArray response = jsonPath.read(responseBody.getResponse().toString(), READ_LIST_OPTIONS); + response.stream().map(obj -> ((LinkedHashMap) obj)) + .filter(obj -> (Boolean) obj.get(IS_ACTIVE)).forEach(obj -> { + locationHierarchyDetails.putIfAbsent(String.valueOf(obj.get(LOCATION_HIERARCHYLEVEL)), + new HashSetValuedHashMap<>()); + locationHierarchyDetails.get(String.valueOf(obj.get(LOCATION_HIERARCHYLEVEL))) + .put(langCode, String.valueOf(obj.get(LOCATION_HIERARCHY_NAME))); + locationDetails.put(String.valueOf(obj.get(LOCATION_HIERARCHY_NAME)), null); + }); + } + }); + + Set locationHierarchyNames = locationDetails.keySet().stream().collect(Collectors.toSet()); + locationHierarchyNames.stream().forEach(hierarchyName -> { + String uri = UriComponentsBuilder.fromUriString(env.getProperty(MASTERDATA_LOCATION_HIERARCHY_URI)) + .buildAndExpand(hierarchyName).toUriString(); + ResponseWrapper>>> responseBody = restTemplate + .getForObject(uri, ResponseWrapper.class); + if (Objects.isNull(responseBody.getErrors()) || responseBody.getErrors().isEmpty()) { + ArrayList> response = responseBody.getResponse().get(LOCATIONS); + SetValuedMap locations = new HashSetValuedHashMap<>(response.size()); + IntStream.range(0, response.size()).filter(index -> (Boolean) response.get(index).get(IS_ACTIVE)) + .forEach(index -> { + locations.put(String.valueOf(response.get(index).get(LANG_CODE)), + String.valueOf(response.get(index).get(CODE))); + locations.put(String.valueOf(response.get(index).get(LANG_CODE)), + String.valueOf(response.get(index).get(NAME))); + if (StringUtils.isNotBlank(env.getProperty(LOCATION_NA))) { + locations.put(String.valueOf(response.get(index).get(LANG_CODE)), + StringUtils.trim(env.getProperty(LOCATION_NA))); + } + }); + locationDetails.put(hierarchyName, locations); + } + }); + } + } + + @SuppressWarnings("unchecked") + private void loadResidenceStatus() { + if (Objects.nonNull(env.getProperty(MASTERDATA_LANGUAGE_URI)) + && Objects.nonNull(env.getProperty(MASTERDATA_INDIVIDUAL_TYPES_URI))) { ResponseWrapper>>> responseBody = restTemplate - .getForObject(uri, ResponseWrapper.class); + .getForObject(env.getProperty(MASTERDATA_INDIVIDUAL_TYPES_URI), ResponseWrapper.class); if (Objects.isNull(responseBody.getErrors()) || responseBody.getErrors().isEmpty()) { - ArrayList> response = responseBody.getResponse().get(LOCATIONS); - SetValuedMap locations = new HashSetValuedHashMap<>(response.size()); - IntStream.range(0, response.size()) - .filter(index -> (Boolean) response.get(index).get(IS_ACTIVE)) - .forEach(index -> { - locations.put(String.valueOf(response.get(index).get(LANG_CODE)), - String.valueOf(response.get(index).get(CODE))); - locations.put(String.valueOf(response.get(index).get(LANG_CODE)), - String.valueOf(response.get(index).get(NAME))); - if (StringUtils.isNotBlank(env.getProperty(LOCATION_NA))) { - locations.put(String.valueOf(response.get(index).get(LANG_CODE)), - StringUtils.trim(env.getProperty(LOCATION_NA))); - } - }); - locationDetails.put(hierarchyName, locations); + ArrayList> response = responseBody.getResponse().get(INDIVIDUAL_TYPES); + residenceStatusMap = new HashSetValuedHashMap<>(response.size()); + IntStream.range(0, response.size()).filter(index -> (Boolean) response.get(index).get(IS_ACTIVE)) + .forEach(index -> { + residenceStatusMap.put(String.valueOf(response.get(index).get(LANG_CODE)), + String.valueOf(response.get(index).get(CODE))); + residenceStatusMap.put(String.valueOf(response.get(index).get(LANG_CODE)), + String.valueOf(response.get(index).get(NAME))); + }); } - }); - } - - /** - * Load region. - */ - private void loadRegion() { - regionMap = new HashSetValuedHashMap<>(); - Set regionNameList = locationHierarchyDetails.get(REGION.getLevel()); - Optional.ofNullable(regionNameList).orElse(Collections.emptySet()).stream() - .forEach(hierarchyName -> Optional.ofNullable(locationDetails.get(hierarchyName)) - .ifPresent(regionMap::putAll)); - } - - /** - * Load province. - */ - private void loadProvince() { - provinceMap = new HashSetValuedHashMap<>(); - Set provinceNameList = locationHierarchyDetails - .get(PROVINCE.getLevel()); - Optional.ofNullable(provinceNameList).orElse(Collections.emptySet()).stream() - .forEach(hierarchyName -> Optional.ofNullable(locationDetails.get(hierarchyName)) - .ifPresent(provinceMap::putAll)); - } - - /** - * Load city. - */ - private void loadCity() { - cityMap = new HashSetValuedHashMap<>(); - Set cityNameList = locationHierarchyDetails.get(CITY.getLevel()); - Optional.ofNullable(cityNameList).orElse(Collections.emptySet()).stream() - .forEach(hierarchyName -> Optional.ofNullable(locationDetails.get(hierarchyName)) - .ifPresent(cityMap::putAll)); - } - - /** - * Load zone. - */ - private void loadZone() { - zoneMap = new HashSetValuedHashMap<>(); - Set zoneList = locationHierarchyDetails - .get(ZONE.getLevel()); - Optional.ofNullable(zoneList).orElse(Collections.emptySet()).stream() - .forEach(hierarchyName -> Optional.ofNullable(locationDetails.get(hierarchyName)) - .ifPresent(zoneMap::putAll)); - } - - /** - * Load postal code. - */ - private void loadPostalCode() { - postalCodeMap = new HashSetValuedHashMap<>(); - Set postalCodeNameList = locationHierarchyDetails - .get(POSTAL_CODE.getLevel()); - Optional.ofNullable(postalCodeNameList).orElse(Collections.emptySet()).stream() - .forEach(hierarchyName -> Optional.ofNullable(locationDetails.get(hierarchyName)) - .ifPresent(postalCodeMap::putAll)); + } } - - @SuppressWarnings("unchecked") - private void loadResidenceStatus() { - ResponseWrapper>>> responseBody = restTemplate - .getForObject(env.getProperty(MASTERDATA_INDIVIDUAL_TYPES_URI), ResponseWrapper.class); - if (Objects.isNull(responseBody.getErrors()) || responseBody.getErrors().isEmpty()) { - ArrayList> response = responseBody.getResponse().get(INDIVIDUAL_TYPES); - residenceStatusMap = new HashSetValuedHashMap<>(response.size()); - IntStream.range(0, response.size()).filter(index -> (Boolean) response.get(index).get(IS_ACTIVE)) - .forEach(index -> { - residenceStatusMap.put(String.valueOf(response.get(index).get(LANG_CODE)), - String.valueOf(response.get(index).get(CODE))); - residenceStatusMap.put(String.valueOf(response.get(index).get(LANG_CODE)), - String.valueOf(response.get(index).get(NAME))); - }); + + private void validateLocationHierarchy(String identityString, List errorList) { + if (Objects.nonNull(env.getProperty(MASTERDATA_LANGUAGE_URI)) + && Objects.nonNull(env.getProperty(MASTERDATA_LOCATIONS_URI)) + && Objects.nonNull(env.getProperty(MASTERDATA_LOCATION_HIERARCHY_URI))) { + mapping.entrySet().stream().forEach(fieldEntry -> { + Arrays.asList(fieldEntry.getValue().split(",")).stream() + .map(field -> String.format(JSON_PATH_WILDCARD_SEARCH, field)).forEach(field -> { + JsonPath jsonPath = JsonPath.compile(field); + JSONArray fieldData = jsonPath.read(identityString, + Configuration.defaultConfiguration().addOptions(Option.SUPPRESS_EXCEPTIONS)); + final String fieldValuePath = String.format(SIMPLE_TYPE_VALUE_PATH, field); + final String fieldLangPath = String.format(SIMPLE_TYPE_LANGUAGE_PATH, field); + fieldData.stream().forEach(data -> { + String extractedLang = null; + String extractedValue = null; + JSONArray pathList = null; + + if (data instanceof JSONArray) { + JSONArray fieldLang = JsonPath.compile(fieldLangPath).read(identityString, + Configuration.defaultConfiguration() + .addOptions(Option.SUPPRESS_EXCEPTIONS)); + extractedLang = fieldLang.get(0).toString(); + JsonPath valuePath = JsonPath.compile(fieldValuePath); + JSONArray fieldValue = valuePath.read(identityString, Configuration + .defaultConfiguration().addOptions(Option.SUPPRESS_EXCEPTIONS)); + extractedValue = fieldValue.get(0).toString(); + pathList = valuePath.read(identityString, Configuration.defaultConfiguration() + .addOptions(Option.SUPPRESS_EXCEPTIONS, Option.AS_PATH_LIST)); + } else if (data instanceof String) { + extractedValue = data.toString(); + pathList = jsonPath.read(identityString, Configuration.defaultConfiguration() + .addOptions(Option.SUPPRESS_EXCEPTIONS, Option.AS_PATH_LIST)); + } + + Set hierarchyList = Objects.nonNull(extractedLang) + ? locationHierarchyDetails.get(fieldEntry.getKey()).get(extractedLang) + : new HashSet<>(locationHierarchyDetails.get(fieldEntry.getKey()).values()); + if (hierarchyList.isEmpty()) { + JSONArray langPathList = JsonPath.compile(fieldLangPath).read(identityString, + Configuration.defaultConfiguration().addOptions(Option.SUPPRESS_EXCEPTIONS, + Option.AS_PATH_LIST)); + String errorMessage = String.format(INVALID_INPUT_PARAMETER.getMessage(), + convertToPath(String.valueOf(langPathList.get(0)))); + errorList.removeIf(serviceError -> serviceError.getMessage().equals(errorMessage)); + errorList.add( + new ServiceError(INVALID_INPUT_PARAMETER.getErrorCode(), errorMessage)); + } else { + boolean result = Objects.nonNull(extractedLang) + ? locationDetails.get(hierarchyList.iterator().next()).get(extractedLang) + .contains(extractedValue) + : hierarchyList.stream() + .map(hierarchy -> locationDetails.get(hierarchy).values()) + .flatMap(Collection::stream).collect(Collectors.toSet()) + .contains(extractedValue); + if (!result) { + String errorMessage = String.format(INVALID_INPUT_PARAMETER.getMessage(), + convertToPath(String.valueOf(pathList.get(0)))); + errorList.removeIf( + serviceError -> serviceError.getMessage().equals(errorMessage)); + errorList.add( + new ServiceError(INVALID_INPUT_PARAMETER.getErrorCode(), errorMessage)); + } + } + }); + }); + }); } } - + /** * Validate date of birth. * - * @param identity the identity + * @param identity the identity * @param errorList the error list */ private void validateDateOfBirth(String identity, List errorList) { - JsonPath jsonPath = JsonPath.compile(IDENTITY_DOB_PATH); - JSONArray pathList = jsonPath.read(identity, - Configuration.defaultConfiguration() - .addOptions( - Option.SUPPRESS_EXCEPTIONS, - Option.AS_PATH_LIST)); - String data = jsonPath.read(identity, - Configuration.defaultConfiguration().addOptions(Option.SUPPRESS_EXCEPTIONS)); - try { - if (Objects.nonNull(data) - && LocalDate - .parse(data, - DateTimeFormatter.ofPattern(DOB_FORMAT) - .withResolverStyle(ResolverStyle.STRICT)) - .isAfter(DateUtils.getUTCCurrentDateTime().toLocalDate())) { + if (Objects.nonNull(env.getProperty(DOB_FORMAT))) { + JsonPath jsonPath = JsonPath.compile(IDENTITY_DOB_PATH); + JSONArray pathList = jsonPath.read(identity, + Configuration.defaultConfiguration().addOptions(Option.SUPPRESS_EXCEPTIONS, Option.AS_PATH_LIST)); + String data = jsonPath.read(identity, + Configuration.defaultConfiguration().addOptions(Option.SUPPRESS_EXCEPTIONS)); + try { + if (Objects.nonNull(data) && LocalDate + .parse(data, + DateTimeFormatter.ofPattern(env.getProperty(DOB_FORMAT)) + .withResolverStyle(ResolverStyle.STRICT)) + .isAfter(DateUtils.getUTCCurrentDateTime().toLocalDate())) { + String errorMessage = String.format(INVALID_INPUT_PARAMETER.getMessage(), + convertToPath(String.valueOf(pathList.get(0)))); + errorList.removeIf(serviceError -> serviceError.getMessage().equals(errorMessage)); + errorList.add(new ServiceError(INVALID_INPUT_PARAMETER.getErrorCode(), errorMessage)); + } + } catch (DateTimeParseException e) { + ExceptionUtils.logRootCause(e); String errorMessage = String.format(INVALID_INPUT_PARAMETER.getMessage(), convertToPath(String.valueOf(pathList.get(0)))); errorList.removeIf(serviceError -> serviceError.getMessage().equals(errorMessage)); errorList.add(new ServiceError(INVALID_INPUT_PARAMETER.getErrorCode(), errorMessage)); } - } catch (DateTimeParseException e) { - ExceptionUtils.logRootCause(e); - String errorMessage = String.format(INVALID_INPUT_PARAMETER.getMessage(), - convertToPath(String.valueOf(pathList.get(0)))); - errorList.removeIf(serviceError -> serviceError.getMessage().equals(errorMessage)); - errorList.add(new ServiceError(INVALID_INPUT_PARAMETER.getErrorCode(), errorMessage)); } } - + /** * Validate language. * * @param identityString the identity string - * @param errorList the error list + * @param errorList the error list */ private void validateLanguage(String identityString, List errorList) { - JsonPath jsonPath = JsonPath.compile(IDENTITY_LANGUAGE_PATH); - JSONArray pathList = jsonPath.read(identityString, PATH_LIST_OPTIONS); - Map dataMap = IntStream.range(0, pathList.size()) - .boxed() - .collect( - Collectors.toMap(i -> String.valueOf(pathList.get(i)), i -> JsonPath - .compile(String.valueOf(pathList.get(i))).read(identityString, READ_OPTIONS))); - dataMap.entrySet().stream().filter(entry -> !languageList.contains(entry.getValue())) - .forEach(entry -> errorList - .add(new ServiceError(INVALID_INPUT_PARAMETER.getErrorCode(), - String.format(INVALID_INPUT_PARAMETER.getMessage(), - convertToPath(entry.getKey()))))); + if (Objects.nonNull(env.getProperty(MASTERDATA_LANGUAGE_URI))) { + JsonPath jsonPath = JsonPath.compile(IDENTITY_LANGUAGE_PATH); + JSONArray pathList = jsonPath.read(identityString, PATH_LIST_OPTIONS); + Map dataMap = IntStream.range(0, pathList.size()).boxed() + .collect(Collectors.toMap(i -> String.valueOf(pathList.get(i)), + i -> JsonPath.compile(String.valueOf(pathList.get(i))).read(identityString, READ_OPTIONS))); + dataMap.entrySet().stream().filter(entry -> !languageList.contains(entry.getValue())) + .forEach(entry -> errorList.add(new ServiceError(INVALID_INPUT_PARAMETER.getErrorCode(), + String.format(INVALID_INPUT_PARAMETER.getMessage(), convertToPath(entry.getKey()))))); + } } /** * Validate gender. * * @param identityString the identity string - * @param errorList the error list + * @param errorList the error list */ private void validateGender(String identityString, List errorList) { - JsonPath genderLangPath = JsonPath.compile(IDENTITY_GENDER_LANGUAGE_PATH); - List genderLangPathList = genderLangPath.read(identityString, PATH_LIST_OPTIONS); - JsonPath genderValuePath = JsonPath.compile(IDENTITY_GENDER_VALUE_PATH); - List genderValuePathList = genderValuePath.read(identityString, PATH_LIST_OPTIONS); - Map> dataMap = IntStream.range(0, genderLangPathList.size()) - .filter(index -> languageList - .contains(JsonPath.compile(genderLangPathList.get(index)).read(identityString, READ_OPTIONS))) - .boxed() - .collect(Collectors.toMap(genderLangPathList::get, - i -> new AbstractMap.SimpleImmutableEntry(genderValuePathList.get(i), - JsonPath.compile(genderValuePathList.get(i)).read(identityString, READ_OPTIONS)))); - dataMap.entrySet().stream() - .filter(entry -> { + if (Objects.nonNull(env.getProperty(MASTERDATA_LANGUAGE_URI)) + && Objects.nonNull(env.getProperty(MASTERDATA_GENDERTYPES_URI))) { + JsonPath genderLangPath = JsonPath.compile(IDENTITY_GENDER_LANGUAGE_PATH); + List genderLangPathList = genderLangPath.read(identityString, PATH_LIST_OPTIONS); + JsonPath genderValuePath = JsonPath.compile(IDENTITY_GENDER_VALUE_PATH); + List genderValuePathList = genderValuePath.read(identityString, PATH_LIST_OPTIONS); + Map> dataMap = IntStream.range(0, genderLangPathList.size()) + .filter(index -> languageList.contains( + JsonPath.compile(genderLangPathList.get(index)).read(identityString, READ_OPTIONS))) + .boxed() + .collect(Collectors.toMap(genderLangPathList::get, + i -> new AbstractMap.SimpleImmutableEntry(genderValuePathList.get(i), + JsonPath.compile(genderValuePathList.get(i)).read(identityString, READ_OPTIONS)))); + dataMap.entrySet().stream().filter(entry -> { String lang = JsonPath.compile(entry.getKey()).read(identityString, READ_OPTIONS); return genderMap.containsKey(lang) && !genderMap.get(lang).contains(entry.getValue().getValue()); - }) - .forEach(entry -> errorList - .add(new ServiceError(INVALID_INPUT_PARAMETER.getErrorCode(), - String.format(INVALID_INPUT_PARAMETER.getMessage(), - convertToPath(entry.getValue().getKey()))))); - } - - /** - * Validate region. - * - * @param identityString the identity string - * @param errorList the error list - */ - private void validateRegion(String identityString, List errorList) { - JsonPath langPath = JsonPath.compile(IDENTITY_REGION_LANGUAGE_PATH); - List langPathList = langPath.read(identityString, PATH_LIST_OPTIONS); - JsonPath valuePath = JsonPath.compile(IDENTITY_REGION_VALUE_PATH); - List valuePathList = valuePath.read(identityString, PATH_LIST_OPTIONS); - Map> dataMap = IntStream.range(0, langPathList.size()) - .filter(index -> languageList - .contains(JsonPath.compile(langPathList.get(index)).read(identityString, READ_OPTIONS))) - .boxed() - .collect(Collectors.toMap(langPathList::get, - i -> new AbstractMap.SimpleImmutableEntry(valuePathList.get(i), - JsonPath.compile(valuePathList.get(i)).read(identityString, READ_OPTIONS)))); - dataMap.entrySet().stream() - .filter(entry -> { - String lang = JsonPath.compile(entry.getKey()).read(identityString, READ_OPTIONS); - return regionMap.containsKey(lang) && !regionMap.get(lang).contains(entry.getValue().getValue()); - }) - .forEach(entry -> errorList - .add(new ServiceError(INVALID_INPUT_PARAMETER.getErrorCode(), - String.format(INVALID_INPUT_PARAMETER.getMessage(), - convertToPath(entry.getValue().getKey()))))); - } - - /** - * Validate province. - * - * @param identityString the identity string - * @param errorList the error list - */ - private void validateProvince(String identityString, List errorList) { - JsonPath langPath = JsonPath.compile(IDENTITY_PROVINCE_LANGUAGE_PATH); - List langPathList = langPath.read(identityString, PATH_LIST_OPTIONS); - JsonPath valuePath = JsonPath.compile(IDENTITY_PROVINCE_VALUE_PATH); - List valuePathList = valuePath.read(identityString, PATH_LIST_OPTIONS); - Map> dataMap = IntStream.range(0, langPathList.size()) - .filter(index -> languageList - .contains(JsonPath.compile(langPathList.get(index)).read(identityString, READ_OPTIONS))) - .boxed() - .collect(Collectors.toMap(langPathList::get, - i -> new AbstractMap.SimpleImmutableEntry(valuePathList.get(i), - JsonPath.compile(valuePathList.get(i)).read(identityString, READ_OPTIONS)))); - dataMap.entrySet().stream() - .filter(entry -> { - String lang = JsonPath.compile(entry.getKey()).read(identityString, READ_OPTIONS); - return provinceMap.containsKey(lang) && !provinceMap.get(lang).contains(entry.getValue().getValue()); - }) - .forEach(entry -> errorList - .add(new ServiceError(INVALID_INPUT_PARAMETER.getErrorCode(), - String.format(INVALID_INPUT_PARAMETER.getMessage(), - convertToPath(entry.getValue().getKey()))))); - } - - /** - * Validate city. - * - * @param identityString the identity string - * @param errorList the error list - */ - private void validateCity(String identityString, List errorList) { - JsonPath langPath = JsonPath.compile(IDENTITY_CITY_LANGUAGE_PATH); - List langPathList = langPath.read(identityString, PATH_LIST_OPTIONS); - JsonPath valuePath = JsonPath.compile(IDENTITY_CITY_VALUE_PATH); - List valuePathList = valuePath.read(identityString, PATH_LIST_OPTIONS); - Map> dataMap = IntStream.range(0, langPathList.size()) - .filter(index -> languageList - .contains(JsonPath.compile(langPathList.get(index)).read(identityString, READ_OPTIONS))) - .boxed() - .collect(Collectors.toMap(langPathList::get, - i -> new AbstractMap.SimpleImmutableEntry(valuePathList.get(i), - JsonPath.compile(valuePathList.get(i)).read(identityString, READ_OPTIONS)))); - dataMap.entrySet().stream() - .filter(entry -> { - String lang = JsonPath.compile(entry.getKey()).read(identityString, READ_OPTIONS); - return cityMap.containsKey(lang) && !cityMap.get(lang).contains(entry.getValue().getValue()); - }) - .forEach(entry -> errorList - .add(new ServiceError(INVALID_INPUT_PARAMETER.getErrorCode(), - String.format(INVALID_INPUT_PARAMETER.getMessage(), - convertToPath(entry.getValue().getKey()))))); - } - - /** - * Validate Zone. - * - * @param identityString the identity string - * @param errorList the error list - */ - private void validateZone(String identityString, List errorList) { - JsonPath langPath = JsonPath - .compile(IDENTITY_ZONE_LANGUAGE_PATH); - List langPathList = langPath.read(identityString, PATH_LIST_OPTIONS); - JsonPath valuePath = JsonPath - .compile(IDENTITY_ZONE_VALUE_PATH); - List valuePathList = valuePath.read(identityString, PATH_LIST_OPTIONS); - Map> dataMap = IntStream.range(0, langPathList.size()) - .filter(index -> languageList - .contains(JsonPath.compile(langPathList.get(index)).read(identityString, READ_OPTIONS))) - .boxed() - .collect(Collectors.toMap(langPathList::get, - i -> new AbstractMap.SimpleImmutableEntry(valuePathList.get(i), - JsonPath.compile(valuePathList.get(i)).read(identityString, READ_OPTIONS)))); - dataMap.entrySet().stream() - .filter(entry -> { - String lang = JsonPath.compile(entry.getKey()).read(identityString, READ_OPTIONS); - return zoneMap.containsKey(lang) - && !zoneMap.get(lang).contains(entry.getValue().getValue()); - }) - .forEach(entry -> errorList - .add(new ServiceError(INVALID_INPUT_PARAMETER.getErrorCode(), - String.format(INVALID_INPUT_PARAMETER.getMessage(), - convertToPath(entry.getValue().getKey()))))); - } - - /** - * Validate postal code. - * - * @param identityString the identity string - * @param errorList the error list - */ - private void validatePostalCode(String identityString, List errorList) { - JsonPath jsonPath = JsonPath.compile(IDENTITY_POSTAL_CODE_PATH); - String value = jsonPath.read(identityString, READ_OPTIONS); - if (Objects.nonNull(value) && !postalCodeMap.values().contains(value)) { - errorList.add(new ServiceError(INVALID_INPUT_PARAMETER.getErrorCode(), - String.format(INVALID_INPUT_PARAMETER.getMessage(), convertToPath(jsonPath.getPath())))); + }).forEach(entry -> errorList.add(new ServiceError(INVALID_INPUT_PARAMETER.getErrorCode(), + String.format(INVALID_INPUT_PARAMETER.getMessage(), convertToPath(entry.getValue().getKey()))))); } } - + /** * Validate documents. * * @param identityString the identity string - * @param errorList the error list + * @param errorList the error list */ private void validateDocuments(String identityString, List errorList) { - IdObjectReferenceValidatorDocumentMapping.getAllMapping().entrySet().stream() - .filter(entry -> docTypeMap.containsKey(entry.getKey())).forEach(entry -> { - JsonPath jsonPath = JsonPath.compile("identity." + entry.getValue() + ".type"); - Object value = jsonPath.read(identityString, READ_OPTIONS); - if (Objects.nonNull(value) && !docTypeMap.get(entry.getKey()).contains(value)) { - errorList.add(new ServiceError(INVALID_INPUT_PARAMETER.getErrorCode(), String - .format(INVALID_INPUT_PARAMETER.getMessage(), convertToPath(jsonPath.getPath())))); - } - }); + if (Objects.nonNull(env.getProperty(MASTERDATA_LANGUAGE_URI)) + && Objects.nonNull(env.getProperty(MASTERDATA_DOCUMENT_CATEGORIES_URI)) + && Objects.nonNull(env.getProperty(MASTERDATA_DOCUMENT_TYPES_URI))) { + IdObjectReferenceValidatorDocumentMapping.getAllMapping().entrySet().stream() + .filter(entry -> docTypeMap.containsKey(entry.getKey())).forEach(entry -> { + JsonPath jsonPath = JsonPath.compile(String.format(DOC_TYPE_SCHEMA_FORMAT, entry.getValue())); + Object value = jsonPath.read(identityString, READ_OPTIONS); + if (Objects.nonNull(value) && !docTypeMap.get(entry.getKey()).contains(value)) { + errorList.add(new ServiceError(INVALID_INPUT_PARAMETER.getErrorCode(), String + .format(INVALID_INPUT_PARAMETER.getMessage(), convertToPath(jsonPath.getPath())))); + } + }); + } } - + private void validateResidenceStatus(String identityString, List errorList) { - JsonPath residenceStatusLangPath = JsonPath.compile(IDENTITY_RESIDENCE_STATUS_LANGUAGE_PATH); - List residenceStatusLangPathList = residenceStatusLangPath.read(identityString, PATH_LIST_OPTIONS); - JsonPath residenceStatusValuePath = JsonPath.compile(IDENTITY_RESIDENCE_STATUS_VALUE_PATH); - List residenceStatusValuePathList = residenceStatusValuePath.read(identityString, PATH_LIST_OPTIONS); - Map> dataMap = IntStream.range(0, residenceStatusLangPathList.size()) - .filter(index -> languageList - .contains(JsonPath.compile(residenceStatusLangPathList.get(index)).read(identityString, READ_OPTIONS))) - .boxed() - .collect(Collectors.toMap(residenceStatusLangPathList::get, - i -> new AbstractMap.SimpleImmutableEntry(residenceStatusValuePathList.get(i), - JsonPath.compile(residenceStatusValuePathList.get(i)).read(identityString, READ_OPTIONS)))); - dataMap.entrySet().stream() - .filter(entry -> { + if (Objects.nonNull(env.getProperty(MASTERDATA_LANGUAGE_URI)) + && Objects.nonNull(env.getProperty(MASTERDATA_INDIVIDUAL_TYPES_URI))) { + JsonPath residenceStatusLangPath = JsonPath.compile(IDENTITY_RESIDENCE_STATUS_LANGUAGE_PATH); + List residenceStatusLangPathList = residenceStatusLangPath.read(identityString, PATH_LIST_OPTIONS); + JsonPath residenceStatusValuePath = JsonPath.compile(IDENTITY_RESIDENCE_STATUS_VALUE_PATH); + List residenceStatusValuePathList = residenceStatusValuePath.read(identityString, + PATH_LIST_OPTIONS); + Map> dataMap = IntStream.range(0, residenceStatusLangPathList.size()) + .filter(index -> languageList.contains(JsonPath + .compile(residenceStatusLangPathList.get(index)).read(identityString, READ_OPTIONS))) + .boxed() + .collect(Collectors.toMap(residenceStatusLangPathList::get, + i -> new AbstractMap.SimpleImmutableEntry( + residenceStatusValuePathList.get(i), + JsonPath.compile(residenceStatusValuePathList.get(i)).read(identityString, + READ_OPTIONS)))); + dataMap.entrySet().stream().filter(entry -> { String lang = JsonPath.compile(entry.getKey()).read(identityString, READ_OPTIONS); - return residenceStatusMap.containsKey(lang) - && !residenceStatusMap.get(lang).contains(entry.getValue().getValue()); - }) - .forEach(entry -> errorList - .add(new ServiceError(INVALID_INPUT_PARAMETER.getErrorCode(), - String.format(INVALID_INPUT_PARAMETER.getMessage(), - convertToPath(entry.getValue().getKey()))))); + return residenceStatusMap.containsKey(lang) + && !residenceStatusMap.get(lang).contains(entry.getValue().getValue()); + }).forEach(entry -> errorList.add(new ServiceError(INVALID_INPUT_PARAMETER.getErrorCode(), + String.format(INVALID_INPUT_PARAMETER.getMessage(), convertToPath(entry.getValue().getKey()))))); + } } - + /** * Convert to path. * @@ -725,4 +581,8 @@ private String convertToPath(String jsonPath) { String path = String.valueOf(jsonPath.replaceAll("[$']", "")); return path.substring(1, path.length() - 1).replace("][", "/"); } + + public void setMapping(Map mapping) { + this.mapping = mapping; + } } diff --git a/kernel/kernel-ref-idobjectvalidator/src/test/resources/application-test.properties b/kernel/kernel-ref-idobjectvalidator/src/test/resources/application-test.properties index e7f58a8d0fc..3a130b58818 100644 --- a/kernel/kernel-ref-idobjectvalidator/src/test/resources/application-test.properties +++ b/kernel/kernel-ref-idobjectvalidator/src/test/resources/application-test.properties @@ -6,6 +6,13 @@ mosip.kernel.idobjectvalidator.masterdata.documenttypes.rest.uri=https://0.0.0.0 mosip.kernel.idobjectvalidator.masterdata.locations.rest.uri=https://0.0.0.0/locations/{langCode} mosip.kernel.idobjectvalidator.masterdata.locationhierarchy.rest.uri=https://0.0.0.0/locationhierarchy/{hierarchy} +mosip.kernel.idobjectvalidator.locationhierarchy.mapping.0=Country +mosip.kernel.idobjectvalidator.locationhierarchy.mapping.1=region +mosip.kernel.idobjectvalidator.locationhierarchy.mapping.2=province +mosip.kernel.idobjectvalidator.locationhierarchy.mapping.3=city +mosip.kernel.idobjectvalidator.locationhierarchy.mapping.4=zone +mosip.kernel.idobjectvalidator.locationhierarchy.mapping.5=postalCode + # To disable spring boot logs logging.level.org.springframework=OFF logging.level.root=OFF diff --git a/kernel/kernel-smsserviceprovider-msg91/README.md b/kernel/kernel-smsserviceprovider-msg91/README.md new file mode 100644 index 00000000000..cec1a4a7ef9 --- /dev/null +++ b/kernel/kernel-smsserviceprovider-msg91/README.md @@ -0,0 +1,76 @@ +## kernel-smsserviceprovider-msg91 + + [Background & Design]() + + **Implementation** +This service is provided as a reference implementation so the adopters could change this code to support their respective service provider. + +``` +io.mosip.kernel.core.notification.spi.SMSServiceProvider + +``` +The above interface is implemented in this service. Adopters are expected to be compliant to the interface and add their implementation in the SMSServiceProviderImpl.java or create equivalent impl. + +Its expected that the adopters do not change the controller and the REST api. + + [API Documentation ] + + ``` + mvn javadoc:javadoc + + ``` + +**Properties to be added in Spring application environment using this component** + +[application-dev.properties](../../config/application-dev.properties) + + ``` + #-----------------------------VID Properties-------------------------------------- +mosip.kernel.sms.enabled=true +mosip.kernel.sms.country.code=91 +mosip.kernel.sms.number.length=10 + + +#----------msg91 gateway--------------- +mosip.kernel.sms.api=http://api.msg91.com/api/v2/sendsms +mosip.kernel.sms.authkey= +mosip.kernel.sms.route=4 +mosip.kernel.sms.sender=MOSMSG + +auth.server.admin.validate.url= + + ``` + + **Maven Dependency** + + ``` + + io.mosip.kernel + kernel-smsserviceprovider-msg91 + ${version} + + + ``` + + + + +**Usage Sample:** + +Autowired interface + +``` + @Autowired + private VidValidator vidValidatorImpl; +``` +Call the method + +Example: + + ``` + smsServiceProvider.sendSms(contactNumber, contentMessage); + +``` + + + diff --git a/kernel/kernel-smsserviceprovider-msg91/pom.xml b/kernel/kernel-smsserviceprovider-msg91/pom.xml new file mode 100644 index 00000000000..a55506f8179 --- /dev/null +++ b/kernel/kernel-smsserviceprovider-msg91/pom.xml @@ -0,0 +1,393 @@ + + 4.0.0 +io.mosip.kernel + kernel-smsserviceprovider-msg91 + kernel-smsserviceprovider-msg91 + kernel-smsserviceprovider-msg91 + https://github.com/mosip/commons + 1.1.4 + + UTF-8 + + + 11 + 11 + 3.8.0 + 2.22.0 + + 3.0.2 + 3.1.0 + 0.8.1 + 3.7.0.1746 + 3.2.0 + 2.3 + + + 2.0.2.RELEASE + 2.0.7.RELEASE + 5.0.5.RELEASE + 2.0.4.RELEASE + + + 2.0.7 + 1.5.21 + 2.9.2 + + + 3.6.2 + 3.7.0 + + + + 1.2 + 3.0.0 + 1.3 + 2.2 + 2.0.1.Final + 2.2.6 + + + 1.4.197 + 5.1.46 + 42.2.2 + 2.5.0 + 5.2.17.Final + 6.0.12.Final + + + 4.12 + 2.23.4 + 1.7.4 + 2.0.7 + + + 1.2.3 + 1.7.19 + 1.7.7 + 1.7.25 + + + 2.9.5 + 2.9.8 + 2.9.6 + 20180130 + 2.2.10 + 20180813 + 1.1.1 + + + 3.6.1 + 3.7 + 2.6 + 1.11 + 4.3 + 1.9.2 + 2.2 + 4.5.6 + 19.0 + 1.18.8 + 0.1.54 + 1.4.0 + 7.1.0 + 2.0.0 + 5.5.13 + 2.3.23 + 1.7 + 2.0 + 1.5.2 + 2.1.1 + 1.66 + 63.1 + 1.0.0 + 3.3.3 + 3.1.0 + 4.1.0-incubating + 1.11.368 + 0.2.4 + 2.3.0 + 3.0.1 + 1.9.12 + 0.6.0 + 2.0.0.AM2 + 1.8.12 + 1.4.2 + 1.4.2 + UTF-8 + + + 11 + 11 + 3.8.0 + 2.22.0 + + 3.0.2 + 3.1.0 + 0.8.1 + 3.7.0.1746 + 3.2.0 + 2.3 + + + 2.0.2.RELEASE + 2.0.7.RELEASE + 5.0.5.RELEASE + 2.0.4.RELEASE + + + 2.0.7 + 1.5.21 + 2.9.2 + + + 3.6.2 + 3.7.0 + + + + 1.2 + 3.0.0 + 1.3 + 2.2 + 2.0.1.Final + 2.2.6 + + + 1.4.197 + 5.1.46 + 42.2.2 + 2.5.0 + 5.2.17.Final + 6.0.12.Final + + + 4.12 + 2.23.4 + 1.7.4 + 2.0.7 + + + 1.2.3 + 1.7.19 + 1.7.7 + 1.7.25 + + + 2.9.5 + 2.9.8 + 2.9.6 + 20180130 + 2.2.10 + 20180813 + 1.1.1 + + + 3.6.1 + 3.7 + 2.6 + 1.11 + 4.3 + 1.9.2 + 2.2 + 4.5.6 + 19.0 + 1.18.8 + 0.1.54 + 1.4.0 + 7.1.0 + 2.0.0 + 5.5.13 + 2.3.23 + 1.7 + 2.0 + 1.5.2 + 2.1.1 + 1.66 + 63.1 + 1.0.0 + 3.3.3 + 3.1.0 + 4.1.0-incubating + 1.11.368 + 0.2.4 + 2.3.0 + 3.0.1 + 1.9.12 + 0.6.0 + 2.0.0.AM2 + 1.8.12 + 1.4.2 + 1.4.2 + 1.1.4 + 1.1.4 + + + + + io.mosip.kernel + kernel-core + ${kernel.core.version} + + + io.mosip.kernel + kernel-auth-adapter + ${kernel.auth.adaptor.version} + + + + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + src/main/resources + + bootstrap.properties + + + + + + maven-deploy-plugin + 2.8.1 + + + default-deploy + deploy + + deploy + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + + default-deploy + deploy + + deploy + + + + + ossrh + https://oss.sonatype.org/ + false + + + + + org.apache.maven.plugins + maven-source-plugin + true + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.2.0 + + + attach-javadocs + + jar + + + + + none + false + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + + + + + + + pl.project13.maven + git-commit-id-plugin + 3.0.1 + + + get-the-git-infos + + revision + + validate + + + + true + ${project.build.outputDirectory}/git.properties + + ^git.build.(time|version)$ + ^git.commit.id.(abbrev|full)$ + + full + ${project.basedir}/.git + + + + + + + scm:git:git://github.com/mosip/commons.git + scm:git:ssh://github.com:mosip/commons.git + https://github.com/mosip/commons + HEAD + + + + MPL 2.0 + https://www.mozilla.org/en-US/MPL/2.0/ + + + + + Mosip + mosip.emailnotifier@gmail.com + io.mosip + https://github.com/mosip/commons + + + + \ No newline at end of file diff --git a/kernel/kernel-smsserviceprovider-msg91/src/main/java/META-INF/MANIFEST.MF b/kernel/kernel-smsserviceprovider-msg91/src/main/java/META-INF/MANIFEST.MF new file mode 100644 index 00000000000..254272e1c07 --- /dev/null +++ b/kernel/kernel-smsserviceprovider-msg91/src/main/java/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + diff --git a/kernel/kernel-smsserviceprovider-msg91/src/main/java/io/mosip/kernel/smsserviceprovider/msg91/constant/SmsExceptionConstant.java b/kernel/kernel-smsserviceprovider-msg91/src/main/java/io/mosip/kernel/smsserviceprovider/msg91/constant/SmsExceptionConstant.java new file mode 100644 index 00000000000..e2ffeb5791c --- /dev/null +++ b/kernel/kernel-smsserviceprovider-msg91/src/main/java/io/mosip/kernel/smsserviceprovider/msg91/constant/SmsExceptionConstant.java @@ -0,0 +1,50 @@ +package io.mosip.kernel.smsserviceprovider.msg91.constant; + +/** + * This enum provides all the exception constants for sms notification. + * + * @author Ritesh sinha + * @since 1.0.0 + * + */ +public enum SmsExceptionConstant { + + SMS_ILLEGAL_INPUT("KER-NOS-001", "Number and message can't be empty, null"), + SMS_INVALID_CONTACT_NUMBER("KER-NOS-002", + "Contact number cannot contains alphabet,special character or less than or more than "), + SMS_INVALID_CREDENTIAL("KER-NOS-003", ""), INTERNAL_SERVER_ERROR("KER-NOS-500", "Internal server error"); + + /** + * The error code. + */ + private String errorCode; + + /** + * The error message. + */ + private String errorMessage; + + /** + * @param errorCode The error code to be set. + * @param errorMessage The error message to be set. + */ + private SmsExceptionConstant(String errorCode, String errorMessage) { + this.errorCode = errorCode; + this.errorMessage = errorMessage; + } + + /** + * @return the error code. + */ + public String getErrorCode() { + return errorCode; + } + + /** + * @return the error message. + */ + public String getErrorMessage() { + return errorMessage; + } + +} diff --git a/kernel/kernel-smsserviceprovider-msg91/src/main/java/io/mosip/kernel/smsserviceprovider/msg91/constant/SmsPropertyConstant.java b/kernel/kernel-smsserviceprovider-msg91/src/main/java/io/mosip/kernel/smsserviceprovider/msg91/constant/SmsPropertyConstant.java new file mode 100644 index 00000000000..cc22848050f --- /dev/null +++ b/kernel/kernel-smsserviceprovider-msg91/src/main/java/io/mosip/kernel/smsserviceprovider/msg91/constant/SmsPropertyConstant.java @@ -0,0 +1,39 @@ +package io.mosip.kernel.smsserviceprovider.msg91.constant; + +/** + * This enum provides all the constant for sms notification. + * + * @author Ritesh sinha + * @since 1.0.0 + * + */ +public enum SmsPropertyConstant { + + AUTH_KEY("authkey"), SMS_MESSAGE("message"), RECIPIENT_NUMBER("mobiles"), COUNTRY_CODE("country"), ROUTE("route"), + SENDER_ID("sender"), VENDOR_RESPONSE_SUCCESS("success"), SUCCESS_RESPONSE("Sms Request Sent"), UNICODE("unicode"), + PROJECT_NAME("kernel-notification-sms"), SUFFIX_MESSAGE(" digits"), NUMBERS("numbers"); + + /** + * The property for sms notification. + */ + private String property; + + /** + * The constructor to set sms property. + * + * @param property the property to set. + */ + private SmsPropertyConstant(String property) { + this.property = property; + } + + /** + * Getter for sms property. + * + * @return the sms property. + */ + public String getProperty() { + return property; + } + +} diff --git a/kernel/kernel-smsserviceprovider-msg91/src/main/java/io/mosip/kernel/smsserviceprovider/msg91/dto/SmsServerResponseDto.java b/kernel/kernel-smsserviceprovider-msg91/src/main/java/io/mosip/kernel/smsserviceprovider/msg91/dto/SmsServerResponseDto.java new file mode 100644 index 00000000000..241f51b1ebe --- /dev/null +++ b/kernel/kernel-smsserviceprovider-msg91/src/main/java/io/mosip/kernel/smsserviceprovider/msg91/dto/SmsServerResponseDto.java @@ -0,0 +1,28 @@ +package io.mosip.kernel.smsserviceprovider.msg91.dto; + +import lombok.Data; + +/** + * The DTO class for sms server response. + * + * @author Ritesh Sinha + * @since 1.0.0 + * + */ +@Data +public class SmsServerResponseDto { + /** + * Status for request. + */ + private String type; + + /** + * Response message + */ + private String message; + + /** + * Response code. + */ + private String code; +} diff --git a/kernel/kernel-smsserviceprovider-msg91/src/main/java/io/mosip/kernel/smsserviceprovider/msg91/dto/SmsVendorRequestDto.java b/kernel/kernel-smsserviceprovider-msg91/src/main/java/io/mosip/kernel/smsserviceprovider/msg91/dto/SmsVendorRequestDto.java new file mode 100644 index 00000000000..a59fbac1759 --- /dev/null +++ b/kernel/kernel-smsserviceprovider-msg91/src/main/java/io/mosip/kernel/smsserviceprovider/msg91/dto/SmsVendorRequestDto.java @@ -0,0 +1,10 @@ +package io.mosip.kernel.smsserviceprovider.msg91.dto; + +import lombok.Data; + +@Data +public class SmsVendorRequestDto { + private String from; + private String to; + private String text; +} diff --git a/kernel/kernel-smsserviceprovider-msg91/src/main/java/io/mosip/kernel/smsserviceprovider/msg91/exception/ApiExceptionHandler.java b/kernel/kernel-smsserviceprovider-msg91/src/main/java/io/mosip/kernel/smsserviceprovider/msg91/exception/ApiExceptionHandler.java new file mode 100644 index 00000000000..5c1e4462d04 --- /dev/null +++ b/kernel/kernel-smsserviceprovider-msg91/src/main/java/io/mosip/kernel/smsserviceprovider/msg91/exception/ApiExceptionHandler.java @@ -0,0 +1,182 @@ +package io.mosip.kernel.smsserviceprovider.msg91.exception; + +import java.io.IOException; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.http.converter.HttpMessageNotReadableException; +import org.springframework.validation.BindingResult; +import org.springframework.validation.FieldError; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import org.springframework.web.client.HttpClientErrorException; +import org.springframework.web.client.HttpServerErrorException; +import org.springframework.web.util.ContentCachingRequestWrapper; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; + +import io.mosip.kernel.core.exception.ExceptionUtils; +import io.mosip.kernel.core.exception.ServiceError; +import io.mosip.kernel.core.http.ResponseWrapper; +import io.mosip.kernel.core.notification.exception.InvalidNumberException; +import io.mosip.kernel.core.util.EmptyCheckUtils; +import io.mosip.kernel.smsserviceprovider.msg91.constant.SmsExceptionConstant; + +/** + * Class for handling exceptions. + * + * @author Urvil Joshi + * @since 1.0.0 + * + */ +@Order(Ordered.HIGHEST_PRECEDENCE-1) +@RestControllerAdvice +public class ApiExceptionHandler { + + /** + * Reference to ObjectMapper. + */ + @Autowired + private ObjectMapper objectMapper; + + private static final String WHITESPACE = " "; + + /** + * This method handles MethodArgumentNotValidException type of exceptions. + * + * @param httpServletRequest the request + * @param exception The exception + * @return The response entity. + * @throws IOException the IOException + */ + @ExceptionHandler(MethodArgumentNotValidException.class) + public ResponseEntity> smsInvalidInputsFound( + final HttpServletRequest httpServletRequest, final MethodArgumentNotValidException exception) + throws IOException { + ResponseWrapper responseWrapper = setErrors(httpServletRequest); + BindingResult bindingResult = exception.getBindingResult(); + final List fieldErrors = bindingResult.getFieldErrors(); + fieldErrors.forEach(x -> { + ServiceError error = new ServiceError(SmsExceptionConstant.SMS_ILLEGAL_INPUT.getErrorCode(), + x.getField() + WHITESPACE + x.getDefaultMessage()); + responseWrapper.getErrors().add(error); + }); + return new ResponseEntity<>(responseWrapper, HttpStatus.OK); + } + + /** + * This method handles MosipInvalidNumberException type of exceptions. + * + * @param httpServletRequest the request + * @param e The exception + * @return The response entity. + * @throws IOException the IOException + */ + @ExceptionHandler(InvalidNumberException.class) + public ResponseEntity> smsNotificationInvalidNumber( + final HttpServletRequest httpServletRequest, final InvalidNumberException e) throws IOException { + ResponseWrapper errorResponse = setErrors(httpServletRequest); + ServiceError error = new ServiceError(e.getErrorCode(), e.getErrorText()); + errorResponse.getErrors().add(error); + return new ResponseEntity<>(errorResponse, HttpStatus.OK); + + } + + /** + * This method handle HttpMessageNotReadableException type of exception. + * + * @param httpServletRequest the request. + * @param e the exception. + * @return the response entity. + * @throws IOException IOException. + */ + @ExceptionHandler(HttpMessageNotReadableException.class) + public ResponseEntity> onHttpMessageNotReadable( + final HttpServletRequest httpServletRequest, final HttpMessageNotReadableException e) throws IOException { + ResponseWrapper errorResponse = setErrors(httpServletRequest); + ServiceError error = new ServiceError(SmsExceptionConstant.SMS_ILLEGAL_INPUT.getErrorCode(), e.getMessage()); + errorResponse.getErrors().add(error); + return new ResponseEntity<>(errorResponse, HttpStatus.OK); + } + + /** + * This method handle HttpClientErrorException type of exception. + * + * @param httpServletRequest the request. + * @param e the exception. + * @return the response entity. + * @throws IOException IOException. + */ + @ExceptionHandler(HttpClientErrorException.class) + public ResponseEntity> smsVendorServiceException( + final HttpServletRequest httpServletRequest, final HttpClientErrorException e) throws IOException { + ResponseWrapper errorResponse = setErrors(httpServletRequest); + + JsonNode responseTree = objectMapper.readTree(e.getResponseBodyAsString()); + String errorMessage = null; + if (responseTree != null) { + responseTree = responseTree.get("requestError").get("serviceException"); + errorMessage = responseTree.get("text").asText(); + } else { + errorMessage = e.getMessage(); + } + ServiceError error = new ServiceError(SmsExceptionConstant.SMS_INVALID_CREDENTIAL.getErrorCode(), errorMessage); + errorResponse.getErrors().add(error); + return new ResponseEntity<>(errorResponse, HttpStatus.OK); + } + + @ExceptionHandler(HttpServerErrorException.class) + public ResponseEntity> httpServerErrorException(HttpServletRequest httpServletRequest, + final HttpServerErrorException exception) throws IOException { + ResponseWrapper errorResponse = setErrors(httpServletRequest); + JsonNode responseTree = objectMapper.readTree(exception.getResponseBodyAsString()); + String errorMessage = null; + if (responseTree != null) { + responseTree = responseTree.get("requestError").get("serviceException"); + errorMessage = responseTree.get("text").asText(); + } else { + errorMessage = exception.getMessage(); + } + ServiceError error = new ServiceError("KER-NOS-004", errorMessage); + errorResponse.getErrors().add(error); + return new ResponseEntity<>(errorResponse, HttpStatus.INTERNAL_SERVER_ERROR); + } + + @ExceptionHandler(value = { Exception.class, RuntimeException.class }) + public ResponseEntity> defaultErrorHandler( + final HttpServletRequest httpServletRequest, Exception e) throws IOException { + + ResponseWrapper responseWrapper = setErrors(httpServletRequest); + ServiceError error = new ServiceError(SmsExceptionConstant.INTERNAL_SERVER_ERROR.getErrorCode(), + e.getMessage()); + responseWrapper.getErrors().add(error); + ExceptionUtils.logRootCause(e); + return new ResponseEntity<>(responseWrapper, HttpStatus.INTERNAL_SERVER_ERROR); + } + + private ResponseWrapper setErrors(HttpServletRequest httpServletRequest) throws IOException { + ResponseWrapper responseWrapper = new ResponseWrapper<>(); + String requestBody = null; + if (httpServletRequest instanceof ContentCachingRequestWrapper) { + requestBody = new String(((ContentCachingRequestWrapper) httpServletRequest).getContentAsByteArray()); + } + if (EmptyCheckUtils.isNullEmpty(requestBody)) { + return responseWrapper; + } + objectMapper.registerModule(new JavaTimeModule()); + JsonNode reqNode = objectMapper.readTree(requestBody); + responseWrapper.setId(reqNode.path("id").asText()); + responseWrapper.setVersion(reqNode.path("version").asText()); + return responseWrapper; + } + +} diff --git a/kernel/kernel-smsserviceprovider-msg91/src/main/java/io/mosip/kernel/smsserviceprovider/msg91/impl/SMSServiceProviderImpl.java b/kernel/kernel-smsserviceprovider-msg91/src/main/java/io/mosip/kernel/smsserviceprovider/msg91/impl/SMSServiceProviderImpl.java new file mode 100644 index 00000000000..e0315a1eb02 --- /dev/null +++ b/kernel/kernel-smsserviceprovider-msg91/src/main/java/io/mosip/kernel/smsserviceprovider/msg91/impl/SMSServiceProviderImpl.java @@ -0,0 +1,89 @@ +/** + * + */ +package io.mosip.kernel.smsserviceprovider.msg91.impl; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; +import org.springframework.web.client.HttpClientErrorException; +import org.springframework.web.client.HttpServerErrorException; +import org.springframework.web.client.RestTemplate; +import org.springframework.web.util.UriComponentsBuilder; + +import io.mosip.kernel.core.notification.exception.InvalidNumberException; +import io.mosip.kernel.core.notification.model.SMSResponseDto; +import io.mosip.kernel.core.notification.spi.SMSServiceProvider; +import io.mosip.kernel.core.util.StringUtils; +import io.mosip.kernel.smsserviceprovider.msg91.constant.SmsExceptionConstant; +import io.mosip.kernel.smsserviceprovider.msg91.constant.SmsPropertyConstant; + +/** + * @author Ritesh Sinha + * @since 1.0.0 + */ +@Component +public class SMSServiceProviderImpl implements SMSServiceProvider { + + @Autowired + RestTemplate restTemplate; + + @Value("${mosip.kernel.sms.enabled:false}") + boolean smsEnabled; + + @Value("${mosip.kernel.sms.country.code}") + String countryCode; + + @Value("${mosip.kernel.sms.number.length}") + int numberLength; + + @Value("${mosip.kernel.sms.api}") + String api; + + @Value("${mosip.kernel.sms.sender}") + String sender; + + @Value("${mosip.kernel.sms.password:null}") + private String password; + + @Value("${mosip.kernel.sms.route:null}") + String route; + + @Value("${mosip.kernel.sms.authkey:null}") + String authkey; + + @Value("${mosip.kernel.sms.unicode:1}") + String unicode; + + @Override + public SMSResponseDto sendSms(String contactNumber, String message) { + SMSResponseDto smsResponseDTO = new SMSResponseDto(); + validateInput(contactNumber); + UriComponentsBuilder sms = UriComponentsBuilder.fromHttpUrl(api) + .queryParam(SmsPropertyConstant.AUTH_KEY.getProperty(), authkey) + .queryParam(SmsPropertyConstant.SMS_MESSAGE.getProperty(), message) + .queryParam(SmsPropertyConstant.ROUTE.getProperty(), route) + .queryParam(SmsPropertyConstant.SENDER_ID.getProperty(), sender) + .queryParam(SmsPropertyConstant.RECIPIENT_NUMBER.getProperty(), contactNumber) + .queryParam(SmsPropertyConstant.UNICODE.getProperty(), unicode) + .queryParam(SmsPropertyConstant.COUNTRY_CODE.getProperty(), countryCode); + try { + restTemplate.getForEntity(sms.toUriString(), String.class); + } catch (HttpClientErrorException | HttpServerErrorException e) { + throw new RuntimeException(e.getResponseBodyAsString()); + } + smsResponseDTO.setMessage(SmsPropertyConstant.SUCCESS_RESPONSE.getProperty()); + smsResponseDTO.setStatus("success"); + return smsResponseDTO; + } + + private void validateInput(String contactNumber) { + if (!StringUtils.isNumeric(contactNumber) || contactNumber.length() < numberLength + || contactNumber.length() > numberLength) { + throw new InvalidNumberException(SmsExceptionConstant.SMS_INVALID_CONTACT_NUMBER.getErrorCode(), + SmsExceptionConstant.SMS_INVALID_CONTACT_NUMBER.getErrorMessage() + numberLength + + SmsPropertyConstant.SUFFIX_MESSAGE.getProperty()); + } + } + +} \ No newline at end of file diff --git a/kernel/kernel-smsserviceprovider-msg91/src/main/resources/META-INF/spring.factories b/kernel/kernel-smsserviceprovider-msg91/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000000..2810e6a5014 --- /dev/null +++ b/kernel/kernel-smsserviceprovider-msg91/src/main/resources/META-INF/spring.factories @@ -0,0 +1,3 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +io.mosip.kernel.smsserviceprovider.msg91.exception.ApiExceptionHandler,\ +io.mosip.kernel.smsserviceprovider.msg91.impl.SMSServiceProviderImpl \ No newline at end of file diff --git a/kernel/kernel-smsserviceprovider-msg91/src/main/resources/logback.xml b/kernel/kernel-smsserviceprovider-msg91/src/main/resources/logback.xml new file mode 100644 index 00000000000..7285a15d201 --- /dev/null +++ b/kernel/kernel-smsserviceprovider-msg91/src/main/resources/logback.xml @@ -0,0 +1,10 @@ + + + + %d [%t] %p [%C{1}].%M.%L : %m%n + + + + + + \ No newline at end of file diff --git a/kernel/kernel-smsserviceprovider-msg91/src/test/java/io/mosip/kernel/smsserviceprovider/msg91/SMSServiceProviderBootApplication.java b/kernel/kernel-smsserviceprovider-msg91/src/test/java/io/mosip/kernel/smsserviceprovider/msg91/SMSServiceProviderBootApplication.java new file mode 100644 index 00000000000..1a79077d248 --- /dev/null +++ b/kernel/kernel-smsserviceprovider-msg91/src/test/java/io/mosip/kernel/smsserviceprovider/msg91/SMSServiceProviderBootApplication.java @@ -0,0 +1,18 @@ +package io.mosip.kernel.smsserviceprovider.msg91; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; + +/* + * (non-Javadoc) + * IdValidator Boot Application for SpringBootTest + */ + +@SpringBootApplication +@ComponentScan(basePackages = "io.mosip.kernel.*") +public class SMSServiceProviderBootApplication { + public static void main(String[] args) { + SpringApplication.run(SMSServiceProviderBootApplication.class, args); + } +} diff --git a/kernel/kernel-smsserviceprovider-msg91/src/test/java/io/mosip/kernel/smsserviceprovider/msg91/test/SmsServiceProviderTest.java b/kernel/kernel-smsserviceprovider-msg91/src/test/java/io/mosip/kernel/smsserviceprovider/msg91/test/SmsServiceProviderTest.java new file mode 100644 index 00000000000..353d76ec3c5 --- /dev/null +++ b/kernel/kernel-smsserviceprovider-msg91/src/test/java/io/mosip/kernel/smsserviceprovider/msg91/test/SmsServiceProviderTest.java @@ -0,0 +1,102 @@ +package io.mosip.kernel.smsserviceprovider.msg91.test; + +import static org.mockito.Mockito.when; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mockito; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.util.ReflectionTestUtils; +import org.springframework.web.client.RestTemplate; +import org.springframework.web.util.UriComponentsBuilder; + +import io.mosip.kernel.core.notification.exception.InvalidNumberException; +import io.mosip.kernel.core.notification.model.SMSResponseDto; +import io.mosip.kernel.smsserviceprovider.msg91.SMSServiceProviderBootApplication; +import io.mosip.kernel.smsserviceprovider.msg91.constant.SmsPropertyConstant; +import io.mosip.kernel.smsserviceprovider.msg91.dto.SmsServerResponseDto; +import io.mosip.kernel.smsserviceprovider.msg91.impl.SMSServiceProviderImpl; + +@RunWith(SpringRunner.class) +@SpringBootTest(classes = { SMSServiceProviderBootApplication.class }) +public class SmsServiceProviderTest { + + @Autowired + SMSServiceProviderImpl service; + + @MockBean + RestTemplate restTemplate; + + @Value("${mosip.kernel.sms.api}") + String api; + + @Value("${mosip.kernel.sms.authkey}") + String authkey; + + @Value("${mosip.kernel.sms.country.code}") + String countryCode; + + @Value("${mosip.kernel.sms.sender}") + String senderId; + + @Value("${mosip.kernel.sms.route}") + String route; + + @Value("${mosip.kernel.sms.number.length}") + String length; + + @Test + public void sendSmsTest() { + + UriComponentsBuilder sms = UriComponentsBuilder.fromHttpUrl(api) + .queryParam(SmsPropertyConstant.AUTH_KEY.getProperty(), authkey) + .queryParam(SmsPropertyConstant.SMS_MESSAGE.getProperty(), "your otp is 4646") + .queryParam(SmsPropertyConstant.ROUTE.getProperty(), route) + .queryParam(SmsPropertyConstant.SENDER_ID.getProperty(), senderId) + .queryParam(SmsPropertyConstant.RECIPIENT_NUMBER.getProperty(), "8987876473") + .queryParam(SmsPropertyConstant.COUNTRY_CODE.getProperty(), countryCode); + + SmsServerResponseDto serverResponse = new SmsServerResponseDto(); + serverResponse.setType("success"); + SMSResponseDto dto = new SMSResponseDto(); + dto.setStatus(serverResponse.getType()); + dto.setMessage("Sms Request Sent"); + + when(restTemplate.getForEntity(sms.toUriString(), String.class)) + .thenReturn(new ResponseEntity<>(serverResponse.toString(), HttpStatus.OK)); + + when(restTemplate.postForEntity(Mockito.anyString(), Mockito.eq(Mockito.any()), Object.class)) + .thenReturn(new ResponseEntity<>(serverResponse, HttpStatus.OK)); + + // assertThat(service.sendSms("8987876473", "your otp is 4646"), + // is(dto)); + + } + + @Test(expected = InvalidNumberException.class) + public void invalidContactNumberTest() { + service.sendSms("jsbchb", "hello your otp is 45373"); + } + + @Test(expected = InvalidNumberException.class) + public void contactNumberMinimumThresholdTest() { + service.sendSms("78978976", "hello your otp is 45373"); + } + + @Test(expected = InvalidNumberException.class) + public void contactNumberMaximumThresholdTest() { + service.sendSms("7897897458673484376", "hello your otp is 45373"); + } + + @Test + public void validGateWayTest() { + service.sendSms("1234567890", "hello your otp is 45373"); + } + +} \ No newline at end of file diff --git a/kernel/kernel-smsserviceprovider-msg91/src/test/resources/application.properties b/kernel/kernel-smsserviceprovider-msg91/src/test/resources/application.properties new file mode 100644 index 00000000000..024e621d1e2 --- /dev/null +++ b/kernel/kernel-smsserviceprovider-msg91/src/test/resources/application.properties @@ -0,0 +1,19 @@ +mosip.kernel.sms.enabled=true +mosip.kernel.sms.country.code=91 +mosip.kernel.sms.number.length=10 + + +#----------msg91 gateway--------------- +mosip.kernel.sms.api=http://api.msg91.com/api/v2/sendsms +mosip.kernel.sms.authkey=282572AcvONzDY0SlY5d11eb1a +mosip.kernel.sms.route=4 +mosip.kernel.sms.sender=MOSMSG + + + +auth.server.validate.url=https://dev.mosip.io/authmanager/v1.0/authorize/validateToken + +## To disable the logging (spring boot) +logging.level.org.springframework=OFF +logging.level.root=OFF +spring.main.banner-mode=off diff --git a/kernel/kernel-virusscanner-clamav/.sts4-cache/classpath-data.json b/kernel/kernel-virusscanner-clamav/.sts4-cache/classpath-data.json new file mode 100644 index 00000000000..759b1f6d1a3 --- /dev/null +++ b/kernel/kernel-virusscanner-clamav/.sts4-cache/classpath-data.json @@ -0,0 +1 @@ +{"name":"kernel-virusscanner-clamav","classpathEntries":[{"kind":"binary","path":"C:\\Program Files\\Java\\jdk1.8.0_231\\jre\\lib\\resources.jar","javadocContainerUrl":"https://docs.oracle.com/javase/1/docs/api/","isSystem":true,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Program Files\\Java\\jdk1.8.0_231\\jre\\lib\\rt.jar","javadocContainerUrl":"https://docs.oracle.com/javase/1/docs/api/","isSystem":true,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Program Files\\Java\\jdk1.8.0_231\\jre\\lib\\jsse.jar","javadocContainerUrl":"https://docs.oracle.com/javase/1/docs/api/","isSystem":true,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Program Files\\Java\\jdk1.8.0_231\\jre\\lib\\jce.jar","javadocContainerUrl":"https://docs.oracle.com/javase/1/docs/api/","isSystem":true,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Program Files\\Java\\jdk1.8.0_231\\jre\\lib\\charsets.jar","javadocContainerUrl":"https://docs.oracle.com/javase/1/docs/api/","isSystem":true,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Program Files\\Java\\jdk1.8.0_231\\jre\\lib\\jfr.jar","javadocContainerUrl":"https://docs.oracle.com/javase/1/docs/api/","isSystem":true,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"source","path":"B:\\mosipgit\\commons\\kernel\\kernel-core\\src\\main\\java","outputFolder":"B:\\mosipgit\\commons\\kernel\\kernel-core\\target\\classes","javadocContainerUrl":"file:/B:/mosipgit/commons/kernel/kernel-core/target/site/apidocs","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":true},{"kind":"binary","path":"C:\\Users\\M1044287\\.m2\\repository\\xyz\\capybara\\clamav-client\\1.0.4\\clamav-client-1.0.4.jar","sourceContainerUrl":"file:/C:/Users/M1044287/.m2/repository/xyz/capybara/clamav-client/1.0.4/clamav-client-1.0.4-sources.jar","javadocContainerUrl":"file:/C:/Users/M1044287/.m2/repository/xyz/capybara/clamav-client/1.0.4/clamav-client-1.0.4-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\M1044287\\.m2\\repository\\org\\slf4j\\jul-to-slf4j\\1.7.25\\jul-to-slf4j-1.7.25.jar","sourceContainerUrl":"file:/C:/Users/M1044287/.m2/repository/org/slf4j/jul-to-slf4j/1.7.25/jul-to-slf4j-1.7.25-sources.jar","javadocContainerUrl":"file:/C:/Users/M1044287/.m2/repository/org/slf4j/jul-to-slf4j/1.7.25/jul-to-slf4j-1.7.25-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\M1044287\\.m2\\repository\\org\\slf4j\\slf4j-api\\1.7.25\\slf4j-api-1.7.25.jar","sourceContainerUrl":"file:/C:/Users/M1044287/.m2/repository/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25-sources.jar","javadocContainerUrl":"file:/C:/Users/M1044287/.m2/repository/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"binary","path":"C:\\Users\\M1044287\\.m2\\repository\\org\\slf4j\\jcl-over-slf4j\\1.7.25\\jcl-over-slf4j-1.7.25.jar","sourceContainerUrl":"file:/C:/Users/M1044287/.m2/repository/org/slf4j/jcl-over-slf4j/1.7.25/jcl-over-slf4j-1.7.25-sources.jar","javadocContainerUrl":"file:/C:/Users/M1044287/.m2/repository/org/slf4j/jcl-over-slf4j/1.7.25/jcl-over-slf4j-1.7.25-javadoc.jar","isSystem":false,"isOwn":false,"isTest":false,"isJavaContent":false},{"kind":"source","path":"B:\\mosipgit\\commons\\kernel\\kernel-virusscanner-clamav\\src\\main\\java","outputFolder":"B:\\mosipgit\\commons\\kernel\\kernel-virusscanner-clamav\\target\\classes","javadocContainerUrl":"file:/B:/mosipgit/commons/kernel/kernel-virusscanner-clamav/target/site/apidocs","isSystem":false,"isOwn":true,"isTest":false,"isJavaContent":true},{"kind":"source","path":"B:\\mosipgit\\commons\\kernel\\kernel-virusscanner-clamav\\src\\test\\java","outputFolder":"B:\\mosipgit\\commons\\kernel\\kernel-virusscanner-clamav\\target\\test-classes","javadocContainerUrl":"file:/B:/mosipgit/commons/kernel/kernel-virusscanner-clamav/target/site/apidocs","isSystem":false,"isOwn":true,"isTest":true,"isJavaContent":true},{"kind":"source","path":"B:\\mosipgit\\commons\\kernel\\kernel-virusscanner-clamav\\src\\main\\resources","outputFolder":"B:\\mosipgit\\commons\\kernel\\kernel-virusscanner-clamav\\target\\classes","isSystem":false,"isOwn":true,"isTest":false,"isJavaContent":false},{"kind":"source","path":"B:\\mosipgit\\commons\\kernel\\kernel-virusscanner-clamav\\src\\test\\resources","outputFolder":"B:\\mosipgit\\commons\\kernel\\kernel-virusscanner-clamav\\target\\test-classes","isSystem":false,"isOwn":true,"isTest":true,"isJavaContent":false},{"kind":"source","path":"B:\\mosipgit\\commons\\kernel\\kernel-virusscanner-clamav\\src\\test\\java","outputFolder":"B:\\mosipgit\\commons\\kernel\\kernel-virusscanner-clamav\\target\\test-classes","javadocContainerUrl":"file:/B:/mosipgit/commons/kernel/kernel-virusscanner-clamav/target/site/apidocs","isSystem":false,"isOwn":true,"isTest":false,"isJavaContent":false}]} \ No newline at end of file diff --git a/kernel/kernel-virusscanner-clamav/README.md b/kernel/kernel-virusscanner-clamav/README.md new file mode 100644 index 00000000000..6d1d2d65ff9 --- /dev/null +++ b/kernel/kernel-virusscanner-clamav/README.md @@ -0,0 +1,56 @@ +## kernel-virusscanner-clamav + + +[Background & Design](../../docs/design/kernel/kernel-virusscanner.md) + + +[API Documentation] + + ``` + mvn javadoc:javadoc + + ``` + + + **Maven Dependency** + + ``` + + io.mosip.kernel + kernel-templatemanager-velocity + ${project.version} + + ``` + + **Application Properties** + + ``` +mosip.kernel.virus-scanner.host=104.211.209.102 +mosip.kernel.virus-scanner.port=3310 + ``` + + +**Usage Sample** + + + ``` + @Autowired + VirusScanner virusScannerImpl; + + boolean isClean = false; + + try { + isClean = virusScannerImpl.scanFile("filepath"); + } catch (VirusScanFailedException e) { + .... + } + + ``` + + + + + + + + diff --git a/kernel/kernel-virusscanner-clamav/pom.xml b/kernel/kernel-virusscanner-clamav/pom.xml new file mode 100644 index 00000000000..a12c6e9571a --- /dev/null +++ b/kernel/kernel-virusscanner-clamav/pom.xml @@ -0,0 +1,34 @@ + + 4.0.0 + io.mosip.kernel + + io.mosip.kernel + kernel-ref-parent + 1.1.4 + + + kernel-virusscanner-clamav + 1.1.4 + + 1.1.4 + 11 + 11 + 3.8.0 + + + + + io.mosip.kernel + kernel-core + ${kernel.core.version} + + + xyz.capybara + clamav-client + 1.0.4 + + + + diff --git a/kernel/kernel-virusscanner-clamav/src/main/java/io/mosip/kernel/virusscanner/clamav/constant/VirusScannerErrorCodes.java b/kernel/kernel-virusscanner-clamav/src/main/java/io/mosip/kernel/virusscanner/clamav/constant/VirusScannerErrorCodes.java new file mode 100644 index 00000000000..74fad8211e5 --- /dev/null +++ b/kernel/kernel-virusscanner-clamav/src/main/java/io/mosip/kernel/virusscanner/clamav/constant/VirusScannerErrorCodes.java @@ -0,0 +1,19 @@ +package io.mosip.kernel.virusscanner.clamav.constant; + +/** + * Internal Packet virus scan error codes. + * + */ +public class VirusScannerErrorCodes { + private static final String IIS_EPP_EPV_PREFIX = "IIS_"; + + private VirusScannerErrorCodes() { + throw new IllegalStateException("Utility class"); + } + + private static final String IIS_EPP_EPV_PREFIX_GEN_MODULE = IIS_EPP_EPV_PREFIX + "GEN_"; + public static final String IIS_EPP_EPV_SERVICE_NOT_ACCESSIBLE = IIS_EPP_EPV_PREFIX_GEN_MODULE + + "ANTIVIRUS_SERVICE_NOT_ACCESSIBLE"; + public static final String IIS_EPP_EPV_FILE_NOT_PRESENT = IIS_EPP_EPV_PREFIX_GEN_MODULE + + "FILE_NOT_PRESENT_FOR_SCAN"; +} diff --git a/kernel/kernel-virusscanner-clamav/src/main/java/io/mosip/kernel/virusscanner/clamav/impl/VirusScannerImpl.java b/kernel/kernel-virusscanner-clamav/src/main/java/io/mosip/kernel/virusscanner/clamav/impl/VirusScannerImpl.java new file mode 100644 index 00000000000..960b675e558 --- /dev/null +++ b/kernel/kernel-virusscanner-clamav/src/main/java/io/mosip/kernel/virusscanner/clamav/impl/VirusScannerImpl.java @@ -0,0 +1,224 @@ +package io.mosip.kernel.virusscanner.clamav.impl; + +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.util.Collection; +import java.util.Map; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import io.mosip.kernel.core.virusscanner.exception.VirusScannerException; +import io.mosip.kernel.core.virusscanner.spi.VirusScanner; +import io.mosip.kernel.virusscanner.clamav.constant.VirusScannerErrorCodes; +import xyz.capybara.clamav.ClamavClient; +import xyz.capybara.clamav.commands.scan.result.ScanResult; +import xyz.capybara.clamav.commands.scan.result.ScanResult.Status; +import xyz.capybara.clamav.exceptions.ClamavException; + +// TODO: Auto-generated Javadoc +/** + * The implementation Class for VirusScannerService. + * + * @author Mukul Puspam + * @author Pranav Kumar + */ +@Component +public class VirusScannerImpl implements VirusScanner { + + /** The Constant LOGGER. */ + private static final Logger LOGGER = LoggerFactory.getLogger(VirusScannerImpl.class); + + /** The host. */ + @Value("${mosip.kernel.virus-scanner.host}") + private String host; + + /** The port. */ + @Value("${mosip.kernel.virus-scanner.port}") + private int port; + + /** The clamav client. */ + protected ClamavClient clamavClient; + + /** The Constant LOGDISPLAY. */ + private static final String LOGDISPLAY = "{} - {}"; + + /** The Constant ANTIVIRUS_SERVICE_NOT_ACCESSIBLE. */ + private static final String ANTIVIRUS_SERVICE_NOT_ACCESSIBLE = "The anti virus service is not accessible"; + + /** The Constant FILE_NOT_PRESENT. */ + private static final String FILE_NOT_PRESENT = "The file not found for for scanning"; + + /** + * Creates the connection to client. + */ + public void createConnection() { + if (this.clamavClient == null) + this.clamavClient = new ClamavClient(host, port); + } + + /* + * (non-Javadoc) + * + * @see + * org.mosip.idissuance.virus.scanner.service.VirusScannerService#scanFile(java. + * lang.Object) + */ + @Override + public Boolean scanFile(String fileName) { + Boolean result = Boolean.FALSE; + createConnection(); + File file = new File(fileName); + InputStream is = null; + try { + is = new FileInputStream(file); + } catch (FileNotFoundException e1) { + throw new VirusScannerException(VirusScannerErrorCodes.IIS_EPP_EPV_FILE_NOT_PRESENT, FILE_NOT_PRESENT, e1); + } + try { + ScanResult scanResult = this.clamavClient.scan(is); + if (scanResult.getStatus() == Status.OK) { + result = Boolean.TRUE; + } else { + Map> listOfVirus = scanResult.getFoundViruses(); + LOGGER.warn("Virus Found in file " + fileName + ": ", listOfVirus); + } + } catch (ClamavException e) { + throw new VirusScannerException(VirusScannerErrorCodes.IIS_EPP_EPV_SERVICE_NOT_ACCESSIBLE, + ANTIVIRUS_SERVICE_NOT_ACCESSIBLE, e); + } + + return result; + } + + /* + * (non-Javadoc) + * + * @see io.mosip.kernel.core.virusscanner.spi.VirusScanner#scanFile(java.io. + * InputStream) + */ + @Override + public Boolean scanFile(InputStream is) { + Boolean result = Boolean.FALSE; + createConnection(); + try { + ScanResult scanResult = this.clamavClient.scan(is); + if (scanResult.getStatus() == Status.OK) { + result = Boolean.TRUE; + } else { + Map> listOfVirus = scanResult.getFoundViruses(); + LOGGER.warn("Virus Found in file : " + listOfVirus); + } + } catch (ClamavException e) { + throw new VirusScannerException(VirusScannerErrorCodes.IIS_EPP_EPV_SERVICE_NOT_ACCESSIBLE, + ANTIVIRUS_SERVICE_NOT_ACCESSIBLE, e); + } + return result; + } + + /* + * (non-Javadoc) + * + * @see + * org.mosip.idissuance.virus.scanner.service.VirusScannerService#scanFolder( + * java.lang.Object) + */ + @Override + public Boolean scanFolder(String folderPath) { + + Boolean result = Boolean.TRUE; + createConnection(); + File folder = new File(folderPath); + File[] files = folder.listFiles(); + for (File file : files) { + try { + ScanResult scanResult = this.clamavClient.scan(new FileInputStream(file)); + if (scanResult.getStatus() != Status.OK) { + result = Boolean.FALSE; + break; + } + } catch (FileNotFoundException e) { + throw new VirusScannerException(VirusScannerErrorCodes.IIS_EPP_EPV_FILE_NOT_PRESENT, FILE_NOT_PRESENT, + e); + } catch (ClamavException e) { + throw new VirusScannerException(VirusScannerErrorCodes.IIS_EPP_EPV_SERVICE_NOT_ACCESSIBLE, + ANTIVIRUS_SERVICE_NOT_ACCESSIBLE, e); + } + } + return result; + } + + /** + * This Method is used to scan byte array + * + * @param docArray array + * + * @return a true if file is virus free and false if file is infected + * @throws IOException Signals that an I/O exception has occurred. + */ + + @Override + public Boolean scanDocument(byte[] docArray) throws IOException { + Boolean result = Boolean.FALSE; + InputStream docInputStream = new ByteArrayInputStream(docArray); + + createConnection(); + try { + + ScanResult scanResult = this.clamavClient.scan(docInputStream); + if (scanResult.getStatus() == Status.OK) { + result = Boolean.TRUE; + } else { + Map> listOfVirus = scanResult.getFoundViruses(); + LOGGER.warn("Virus Found in file " + docInputStream + ": ", listOfVirus); + } + } catch (ClamavException e) { + LOGGER.error(LOGDISPLAY, e.getMessage()); + throw new VirusScannerException(VirusScannerErrorCodes.IIS_EPP_EPV_SERVICE_NOT_ACCESSIBLE, + ANTIVIRUS_SERVICE_NOT_ACCESSIBLE, e); + } finally { + + docInputStream.close(); + } + + return result; + } + + /** + * This Method is used to scan File + * + * @param doc object + * + * @return a true if file is virus free and false if file is infected + * @throws IOException Signals that an I/O exception has occurred. + */ + @Override + public Boolean scanDocument(File doc) throws IOException { + Boolean result = Boolean.FALSE; + + createConnection(); + try (FileInputStream docInputStream = new FileInputStream(doc)) { + + ScanResult scanResult = this.clamavClient.scan(docInputStream); + if (scanResult.getStatus() == Status.OK) { + result = Boolean.TRUE; + } else { + Map> listOfVirus = scanResult.getFoundViruses(); + LOGGER.warn("Virus Found in file " + doc + ": ", listOfVirus); + } + } catch (ClamavException e) { + LOGGER.error(LOGDISPLAY, e.getMessage()); + throw new VirusScannerException(VirusScannerErrorCodes.IIS_EPP_EPV_SERVICE_NOT_ACCESSIBLE, + ANTIVIRUS_SERVICE_NOT_ACCESSIBLE, e); + } + + return result; + } + +} diff --git a/kernel/kernel-virusscanner-clamav/src/main/resources/META-INF/spring.factories b/kernel/kernel-virusscanner-clamav/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000000..c82644efe89 --- /dev/null +++ b/kernel/kernel-virusscanner-clamav/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +io.mosip.kernel.virusscanner.clamav.impl.VirusScannerImpl \ No newline at end of file diff --git a/kernel/kernel-virusscanner-clamav/src/main/resources/logback.xml b/kernel/kernel-virusscanner-clamav/src/main/resources/logback.xml new file mode 100644 index 00000000000..7285a15d201 --- /dev/null +++ b/kernel/kernel-virusscanner-clamav/src/main/resources/logback.xml @@ -0,0 +1,10 @@ + + + + %d [%t] %p [%C{1}].%M.%L : %m%n + + + + + + \ No newline at end of file diff --git a/kernel/kernel-virusscanner-clamav/src/test/java/io/mosip/kernel/virusscanner/clamav/test/VirusScannerExceptionTest.java b/kernel/kernel-virusscanner-clamav/src/test/java/io/mosip/kernel/virusscanner/clamav/test/VirusScannerExceptionTest.java new file mode 100644 index 00000000000..dc5cd2b647f --- /dev/null +++ b/kernel/kernel-virusscanner-clamav/src/test/java/io/mosip/kernel/virusscanner/clamav/test/VirusScannerExceptionTest.java @@ -0,0 +1,85 @@ +package io.mosip.kernel.virusscanner.clamav.test; + +import static org.mockito.ArgumentMatchers.any; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.junit.MockitoJUnitRunner; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import io.mosip.kernel.core.virusscanner.exception.VirusScannerException; +import io.mosip.kernel.core.virusscanner.spi.VirusScanner; +import io.mosip.kernel.virusscanner.clamav.impl.VirusScannerImpl; +import xyz.capybara.clamav.ClamavClient; +import xyz.capybara.clamav.exceptions.ClamavException; + +/** + * + * @author Mukul Puspam + * + */ +@RunWith(MockitoJUnitRunner.class) +public class VirusScannerExceptionTest { + + private final Logger LOGGER = LoggerFactory.getLogger(this.getClass()); + + @Mock + ClamavClient clamavClient; + + @InjectMocks + private VirusScanner virusScannerService = new VirusScannerImpl() { + @Override + public void createConnection() { + this.clamavClient = clamavClient; + } + }; + + private File file; + private File folder; + private File doc; + private byte[] byteArray; + + @Before + public void setup() throws Exception { + ClassLoader classLoader = getClass().getClassLoader(); + file = new File(classLoader.getResource("files/0000.zip").getFile()); + folder = new File(classLoader.getResource("files").getFile()); + doc = new File(classLoader.getResource("files/test1.docx").getFile()); + byteArray = new byte[(int) doc.length()]; + } + + @Test(expected = VirusScannerException.class) + public void serviceUnavailableForScanFileTest() throws ClamavException, FileNotFoundException { + Mockito.doThrow(ClamavException.class).when(clamavClient).scan(any(FileInputStream.class)); + virusScannerService.scanFile(file.getAbsolutePath()); + } + + @Test(expected = VirusScannerException.class) + public void serviceUnavailableForScanFolderTest() throws ClamavException { + Mockito.doThrow(ClamavException.class).when(clamavClient).scan(any(FileInputStream.class)); + virusScannerService.scanFolder(folder.getAbsolutePath()); + } + + @Test(expected = VirusScannerException.class) + public void serviceUnavailableForScanDocTest() throws ClamavException, IOException { + Mockito.doThrow(ClamavException.class).when(clamavClient).scan(any(InputStream.class)); + virusScannerService.scanDocument(byteArray); + } + + @Test(expected = VirusScannerException.class) + public void serviceUnavailableForScanDocumentTest() throws ClamavException, IOException { + Mockito.doThrow(ClamavException.class).when(clamavClient).scan(any(FileInputStream.class)); + virusScannerService.scanDocument(doc); + } +} diff --git a/kernel/kernel-virusscanner-clamav/src/test/java/io/mosip/kernel/virusscanner/clamav/test/VirusScannerServiceTest.java b/kernel/kernel-virusscanner-clamav/src/test/java/io/mosip/kernel/virusscanner/clamav/test/VirusScannerServiceTest.java new file mode 100644 index 00000000000..117e7adcd15 --- /dev/null +++ b/kernel/kernel-virusscanner-clamav/src/test/java/io/mosip/kernel/virusscanner/clamav/test/VirusScannerServiceTest.java @@ -0,0 +1,143 @@ +package io.mosip.kernel.virusscanner.clamav.test; + +import static org.junit.Assert.assertEquals; +import static org.mockito.ArgumentMatchers.any; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.junit.MockitoJUnitRunner; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.test.context.TestPropertySource; + +import io.mosip.kernel.core.virusscanner.spi.VirusScanner; +import io.mosip.kernel.virusscanner.clamav.impl.VirusScannerImpl; +import xyz.capybara.clamav.ClamavClient; +import xyz.capybara.clamav.commands.scan.result.ScanResult; +import xyz.capybara.clamav.commands.scan.result.ScanResult.Status; +import xyz.capybara.clamav.exceptions.ClamavException; + +/** + * + * @author Mukul Puspam + * + */ +@RunWith(MockitoJUnitRunner.class) +@TestPropertySource({ "classpath:application.properties" }) +public class VirusScannerServiceTest { + + private final Logger LOGGER = LoggerFactory.getLogger(this.getClass()); + + @Mock + ClamavClient clamavClient; + + @InjectMocks + private VirusScanner virusScanner = new VirusScannerImpl() { + @Override + public void createConnection() { + this.clamavClient = clamavClient; + } + }; + + private File file; + private File folder; + private ScanResult virusFound; + private ScanResult virusNotFound; + private File doc; + private byte[] byteArray; + private InputStream is; + + @Before + public void setup() throws FileNotFoundException { + ClassLoader classLoader = getClass().getClassLoader(); + file = new File(classLoader.getResource("files/0000.zip").getFile()); + is = new FileInputStream(file); + folder = new File(classLoader.getResource("files").getFile()); + virusNotFound = new ScanResult(Status.OK); + virusFound = new ScanResult(Status.VIRUS_FOUND); + doc = new File(classLoader.getResource("files/test1.docx").getFile()); + byteArray = new byte[(int) doc.length()]; + } + + @Test + public void infectedFileCheck() throws ClamavException { + Mockito.when(clamavClient.scan(any(FileInputStream.class))).thenReturn(virusFound); + Boolean result = virusScanner.scanFile(file.getAbsolutePath()); + assertEquals(Boolean.FALSE, result); + } + + @Test + public void infectedFileCheckForInputStream() throws ClamavException { + Mockito.when(clamavClient.scan(any(InputStream.class))).thenReturn(virusFound); + Boolean result = virusScanner.scanFile(is); + assertEquals(Boolean.FALSE, result); + } + + @Test + public void nonInfectedFileCheck() throws ClamavException { + Mockito.when(clamavClient.scan(any(FileInputStream.class))).thenReturn(virusNotFound); + Boolean result = virusScanner.scanFile(file.getAbsolutePath()); + assertEquals(Boolean.TRUE, result); + } + + @Test + public void nonInfectedFileCheckForInputStream() throws ClamavException { + Mockito.when(clamavClient.scan(any(InputStream.class))).thenReturn(virusNotFound); + Boolean result = virusScanner.scanFile(is); + assertEquals(Boolean.TRUE, result); + } + + @Test + public void infectedFolderCheck() throws ClamavException { + Mockito.when(clamavClient.scan(any(FileInputStream.class))).thenReturn(virusFound); + Boolean result = virusScanner.scanFolder(folder.getAbsolutePath()); + assertEquals(Boolean.FALSE, result); + } + + @Test + public void nonInfectedFolderCheck() throws ClamavException { + Mockito.when(clamavClient.scan(any(FileInputStream.class))).thenReturn(virusNotFound); + Boolean result = virusScanner.scanFolder(folder.getAbsolutePath()); + assertEquals(Boolean.TRUE, result); + + } + + @Test + public void nonInfectedDocCheck() throws ClamavException, IOException { + Mockito.when(clamavClient.scan(any(InputStream.class))).thenReturn(virusNotFound); + Boolean result = virusScanner.scanDocument(byteArray); + assertEquals(Boolean.TRUE, result); + + } + + @Test + public void InfectedDocCheck() throws ClamavException, IOException { + Mockito.when(clamavClient.scan(any(InputStream.class))).thenReturn(virusFound); + Boolean result = virusScanner.scanDocument(byteArray); + assertEquals(Boolean.FALSE, result); + } + + @Test + public void nonInfectedDocumentCheck() throws ClamavException, IOException { + Mockito.when(clamavClient.scan(any(FileInputStream.class))).thenReturn(virusNotFound); + Boolean result = virusScanner.scanDocument(doc); + assertEquals(Boolean.TRUE, result); + } + + @Test + public void InfectedDocumentCheck() throws ClamavException, IOException { + Mockito.when(clamavClient.scan(any(FileInputStream.class))).thenReturn(virusFound); + Boolean result = virusScanner.scanDocument(doc); + assertEquals(Boolean.FALSE, result); + } +} diff --git a/kernel/kernel-virusscanner-clamav/src/test/resources/application.properties b/kernel/kernel-virusscanner-clamav/src/test/resources/application.properties new file mode 100644 index 00000000000..d10f5681946 --- /dev/null +++ b/kernel/kernel-virusscanner-clamav/src/test/resources/application.properties @@ -0,0 +1,7 @@ +mosip.kernel.virus-scanner.host=104.211.209.102 +mosip.kernel.virus-scanner.port=3310 + +## To disable the logging (spring boot) +logging.level.org.springframework=OFF +logging.level.root=OFF +spring.main.banner-mode=off diff --git a/kernel/kernel-virusscanner-clamav/src/test/resources/files/0000.zip b/kernel/kernel-virusscanner-clamav/src/test/resources/files/0000.zip new file mode 100644 index 00000000000..15cb0ecb3e2 Binary files /dev/null and b/kernel/kernel-virusscanner-clamav/src/test/resources/files/0000.zip differ diff --git a/kernel/kernel-virusscanner-clamav/src/test/resources/files/test1.docx b/kernel/kernel-virusscanner-clamav/src/test/resources/files/test1.docx new file mode 100644 index 00000000000..50ec42ef153 Binary files /dev/null and b/kernel/kernel-virusscanner-clamav/src/test/resources/files/test1.docx differ diff --git a/kernel/kernel-virusscanner-clamav/src/test/resources/logback.xml b/kernel/kernel-virusscanner-clamav/src/test/resources/logback.xml new file mode 100644 index 00000000000..7285a15d201 --- /dev/null +++ b/kernel/kernel-virusscanner-clamav/src/test/resources/logback.xml @@ -0,0 +1,10 @@ + + + + %d [%t] %p [%C{1}].%M.%L : %m%n + + + + + + \ No newline at end of file diff --git a/kernel/pom.xml b/kernel/pom.xml index f6d7d3bf138..a31e06fcda4 100644 --- a/kernel/pom.xml +++ b/kernel/pom.xml @@ -5,7 +5,7 @@ 4.0.0 io.mosip.kernel kernel-ref-parent - 1.1.2 + 1.1.4 pom kernel Parent project of MOSIP Kernel for Philippines @@ -65,7 +65,7 @@ 3.0.2 3.1.0 2.9 - 0.8.1 + 0.8.4 3.7.0.1746 3.2.0 2.3 @@ -122,7 +122,7 @@ 20180813 - 1.1.2 + 1.1.4 3.6.1 @@ -167,6 +167,8 @@ kernel-ref-idobjectvalidator + kernel-virusscanner-clamav + kernel-smsserviceprovider-msg91 @@ -211,14 +213,14 @@ - - org.apache.maven.plugins - maven-compiler-plugin - ${maven.compiler.version} - - ${maven.compiler.source} - ${maven.compiler.target} - + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler.version} + + ${maven.compiler.source} + ${maven.compiler.target} + org.jacoco diff --git a/keycloak/Dockerfile b/keycloak/Dockerfile new file mode 100644 index 00000000000..82859c9b65f --- /dev/null +++ b/keycloak/Dockerfile @@ -0,0 +1,2 @@ +FROM jboss/keycloak:11.0.3 +COPY --chown=jboss:root ./theme/ /opt/jboss/keycloak/themes diff --git a/keycloak/theme/mosip/account/resources/css/account.css b/keycloak/theme/mosip/account/resources/css/account.css new file mode 100644 index 00000000000..3878e43ac85 --- /dev/null +++ b/keycloak/theme/mosip/account/resources/css/account.css @@ -0,0 +1,277 @@ +html { + height: 100%; +} + +body { + background-color: #F9F9F9; + margin: 0; + padding: 0; + height: 100%; +} + +header .navbar { + margin-bottom: 0; + min-height: inherit; +} + +.header .container { + position: relative; +} + +.navbar-title { + background-image: url('../img/logo.png'); + height: 25px; + background-repeat: no-repeat; + width: 123px; + margin: 3px 10px 5px; + text-indent: -99999px; +} + +.navbar-pf .navbar-utility { + right: 20px; + top: -34px; + font-size: 12px; +} + +.navbar-pf .navbar-utility > li > a { + color: #fff !important; + padding-bottom: 12px; + padding-top: 11px; + border-left: medium none; +} + +.container { + height: 100%; +} + +.content-area { + background-color: #fff; + border-color: #CECECE; + border-style: solid; + border-width: 0 1px; + height: 100%; + padding: 0 30px; +} + +.margin-bottom { + margin-bottom: 10px; +} + +/* Sidebar */ + +.bs-sidebar { + background-color: #f9f9f9; + padding-top: 44px; + padding-right: 0; + padding-left: 0; + z-index: 20; +} +.bs-sidebar ul { + list-style: none; + padding-left: 12px; +} + +.bs-sidebar ul li { + margin-bottom: 0.5em; + margin-left: -1em; +} +.bs-sidebar ul li a { + font-size: 14px; + padding-left: 25px; + color: #4d5258; + line-height: 28px; + display: block; + border-width: 1px 0 1px 1px; + border-style: solid; + border-color: #f9f9f9; +} +.bs-sidebar ul li a:hover, +.bs-sidebar ul li a:focus { + text-decoration: none; + color: #777777; + border-right: 2px solid #aaa; +} +.bs-sidebar ul li.active a { + background-color: #c7e5f0; + border-color: #56bae0; + font-weight: bold; + background-image: url(../img/icon-sidebar-active.png); + background-repeat: no-repeat; + background-position: right center; +} + +.bs-sidebar ul li.active a:hover { + border-right: none; +} + + +.content-area h2 { + font-family: "Open Sans", sans-serif; + font-weight: 100; + font-size: 24px; + margin-bottom: 25px; + margin-top: 25px; +} + +.subtitle { + text-align: right; + margin-top: 30px; + color: #909090; +} + +.required { + color: #CB2915; +} + + +.alert { + margin-top: 30px; + margin-bottom: 0; +} + +.feedback-aligner .alert { + background-position: 1.27273em center; + background-repeat: no-repeat; + border-radius: 2px; + border-width: 1px; + color: #4D5258; + display: inline-block; + font-size: 1.1em; + line-height: 1.4em; + margin: 0; + padding: 0.909091em 3.63636em; + position: relative; + text-align: left; +} +.alert.alert-success { + background-color: #E4F1E1; + border-color: #4B9E39; +} +.alert.alert-error { + background-color: #F8E7E7; + border-color: #B91415; +} +.alert.alert-warning { + background-color: #FEF1E9; + border-color: #F17528; +} +.alert.alert-info { + background-color: #E4F3FA; + border-color: #5994B2; +} + +.form-horizontal { + border-top: 1px solid #E9E8E8; + padding-top: 23px; +} + +.form-horizontal .control-label { + color: #909090; + line-height: 1.4em; + padding-top: 5px; + position: relative; + text-align: right; + width: 100%; +} + +.form-group { + position: relative; +} + +.control-label + .required { + position: absolute; + right: -2px; + top: 0; +} + +#kc-form-buttons { + text-align: right; + margin-top: 10px; +} + +#kc-form-buttons .btn-primary { + float: right; + margin-left: 8px; +} + +/* Authenticator page */ + +ol { + padding-left: 40px; +} + +ol li { + font-size: 13px; + margin-bottom: 10px; + position: relative; +} + +ol li img { + margin-top: 15px; + margin-bottom: 5px; + border: 1px solid #eee; +} + +hr + .form-horizontal { + border: none; + padding-top: 0; +} + +.kc-dropdown{ + position: relative; +} +.kc-dropdown > a{ + display:block; + padding: 11px 10px 12px; + line-height: 12px; + font-size: 12px; + color: #fff !important; + text-decoration: none; +} +.kc-dropdown > a::after{ + content: "\2c5"; + margin-left: 4px; +} +.kc-dropdown:hover > a{ + background-color: rgba(0,0,0,0.2); +} +.kc-dropdown ul li a{ + padding: 1px 11px; + font-size: 12px; + color: #000 !important; + border: 1px solid #fff; + text-decoration: none; + display:block; + line-height: 20px; +} +.kc-dropdown ul li a:hover{ + color: #4d5258; + background-color: #d4edfa; + border-color: #b3d3e7; +} +.kc-dropdown ul{ + position: absolute; + z-index: 2000; + list-style:none; + display:none; + padding: 5px 0px; + margin: 0px; + background-color: #fff !important; + border: 1px solid #b6b6b6; + border-radius: 1px; + -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); + box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); + background-clip: padding-box; + min-width: 100px; +} +.kc-dropdown:hover ul{ + display:block; +} + + +#kc-totp-secret-key { + border: 1px solid #eee; + font-size: 16px; + padding: 10px; + margin: 50px 0; +} \ No newline at end of file diff --git a/keycloak/theme/mosip/account/resources/img/favicon.ico b/keycloak/theme/mosip/account/resources/img/favicon.ico new file mode 100644 index 00000000000..48188dedaae Binary files /dev/null and b/keycloak/theme/mosip/account/resources/img/favicon.ico differ diff --git a/keycloak/theme/mosip/account/resources/img/icon-sidebar-active.png b/keycloak/theme/mosip/account/resources/img/icon-sidebar-active.png new file mode 100644 index 00000000000..e7b9b082836 Binary files /dev/null and b/keycloak/theme/mosip/account/resources/img/icon-sidebar-active.png differ diff --git a/keycloak/theme/mosip/account/resources/img/keycloak-logo.png b/keycloak/theme/mosip/account/resources/img/keycloak-logo.png new file mode 100644 index 00000000000..955574855d4 Binary files /dev/null and b/keycloak/theme/mosip/account/resources/img/keycloak-logo.png differ diff --git a/keycloak/theme/mosip/account/resources/img/logo.png b/keycloak/theme/mosip/account/resources/img/logo.png new file mode 100644 index 00000000000..a698c548ce5 Binary files /dev/null and b/keycloak/theme/mosip/account/resources/img/logo.png differ diff --git a/keycloak/theme/mosip/account/theme.properties b/keycloak/theme/mosip/account/theme.properties new file mode 100644 index 00000000000..a4f97191912 --- /dev/null +++ b/keycloak/theme/mosip/account/theme.properties @@ -0,0 +1,13 @@ +parent=base +import=common/keycloak + +styles=node_modules/patternfly/dist/css/patternfly.min.css node_modules/patternfly/dist/css/patternfly-additions.min.css css/account.css + +##### css classes for form buttons +# main class used for all buttons +kcButtonClass=btn +# classes defining priority of the button - primary or default (there is typically only one priority button for the form) +kcButtonPrimaryClass=btn-primary +kcButtonDefaultClass=btn-default +# classes defining size of the button +kcButtonLargeClass=btn-lg diff --git a/keycloak/theme/mosip/admin/resources/css/styles.css b/keycloak/theme/mosip/admin/resources/css/styles.css new file mode 100644 index 00000000000..3f6b7b8239e --- /dev/null +++ b/keycloak/theme/mosip/admin/resources/css/styles.css @@ -0,0 +1,486 @@ +html,body { + height: 100%; +} + +form { + margin-top: 20px; +} + +table { + margin-top: 20px; +} + +.required { + color: #f00; +} + +.tooltip-inner { + min-width: 200px; +} + +.margin-top { + margin-top: 20px; +} + +.no-margin-top { + margin-top: 0px !important; +} + +table { + max-width: 100%; +} + +td.clip { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + max-width: 0; +} + +th.w-10 { + width: 10%; +} + +th.w-15 { + width: 15%; +} + +th.w-20 { + width: 20%; +} + + +th.w-25 { + width: 25%; +} + +th.w-30 { + width: 30%; +} + + +th.w-35 { + width: 35%; +} + +th.w-40 { + width: 40%; +} + +/*********** Loading ***********/ + +.loading { + background-color: #f5f5f5; + border: 1px solid #eee; + position: absolute; + bottom: 0px; + left: 0px; + padding: 2px 200px 2px 5px; +} + +/*********** Feedback ***********/ + +.feedback-aligner { + position: fixed; + top: 15px; + text-align: center; + width: 100%; + height: 0; + z-index: 100; +} +.feedback-aligner .alert { + border-radius: 2px; + border-width: 1px; + display: inline-block; + position: relative; +} + +/*********** On-Off Switch ***********/ + +.onoffswitch { + -moz-user-select: none; + height: 26px; + position: relative; + width: 62px; +} +.onoffswitch .onoffswitch-checkbox { + display: none; +} +.onoffswitch .onoffswitch-label { + border: 1px solid #bbb; + border-radius: 2px; + cursor: pointer; + display: block; + overflow: hidden; + width: 62px; +} +.onoffswitch .onoffswitch-inner { + display: block; + margin-left: -100%; + transition: margin 0.3s ease-in 0s; + width: 200%; +} +.onoffswitch .onoffswitch-inner > span { + -moz-box-sizing: border-box; + color: white; + float: left; + font-size: 11px; + font-family: "Open Sans", sans-serif; + font-weight: bold; + height: 24px; + line-height: 24px; + padding: 0; + width: 50%; +} +.onoffswitch .onoffswitch-switch { + background-image: linear-gradient(top, #fafafa 0%, #ededed 100%); + background-image: -o-linear-gradient(top, #fafafa 0%, #ededed 100%); + background-image: -moz-linear-gradient(top, #fafafa 0%, #ededed 100%); + background-image: -webkit-linear-gradient(top, #fafafa 0%, #ededed 100%); + background-image: -ms-linear-gradient(top, #fafafa 0%, #ededed 100%); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, #fafafa), color-stop(1, 0, #ededed)); + border: 1px solid #aaa; + border-radius: 2px; + bottom: 0; + margin: 0; + position: absolute; + right: 39px; + top: 0; + transition: all 0.3s ease-in 0s; + -webkit-transition: all 0.3s ease-in 0s; + width: 23px; +} +.onoffswitch .onoffswitch-inner .onoffswitch-active { + background-image: linear-gradient(top, #00a9ec 0%, #009bd3 100%); + background-image: -o-linear-gradient(top, #00a9ec 0%, #009bd3 100%); + background-image: -moz-linear-gradient(top, #00a9ec 0%, #009bd3 100%); + background-image: -webkit-linear-gradient(top, #00a9ec 0%, #009bd3 100%); + background-image: -ms-linear-gradient(top, #00a9ec 0%, #009bd3 100%); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, #00a9ec), color-stop(1, 0, #009bd3)); + color: #FFFFFF; + padding-left: 10px; +} +.onoffswitch-checkbox:disabled + .onoffswitch-label .onoffswitch-inner .onoffswitch-active, +.onoffswitch-checkbox:disabled + .onoffswitch-label .onoffswitch-inner .onoffswitch-inactive { + background-image: none; + background-color: #e5e5e5; + color: #9d9fa1; +} +.onoffswitch .onoffswitch-inner .onoffswitch-inactive { + background: linear-gradient(#fefefe, #e8e8e8) repeat scroll 0 0 transparent; + color: #4d5258; + padding-right: 10px; + text-align: right; +} +.onoffswitch .onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-inner { + margin-left: 0; +} +.onoffswitch .onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-switch { + right: 0; +} + + +/*********** Select 2 ***********/ + +.select2-container { + width: 100%; +} + +.select2-container-multi .select2-choices .select2-search-field { + height: 26px; +} + +/*********** html select ********/ +.overflow-select { + overflow: auto; +} + + +/*********** New Menu ***********/ + + +.sidebar-pf-left{ + background: #292e34; +} + +.sidebar-pf .nav-pills > li a i, .sidebar-pf .nav-pills > li a span{ + color: #72767b; + display: inline-block; + margin-right: 10px; +} +.sidebar-pf .nav-pills > li > a{ + color: #dbdada; + padding: 0px 20px 0 30px!important; + line-height: 30px; + border-left-width: 12px; + border-left-style: solid; + border-left-color: #292e34; + margin-left: -6px; +} + +.sidebar-pf .nav-pills > li > a:hover{ + background: #393f44; + border-color:#292e34; + border-left-color: #393f44; + color: #fff; +} + +.sidebar-pf .nav-pills > li > a:after{ + display: none!important; +} + + +.sidebar-pf .nav-pills > li.active > a { + color: #fff; + background: #393f44!important; + border-bottom: 1px solid #000!important; + border-top: 1px solid #000!important; + border-left-color: #39a5dc!important; +} + +.sidebar-pf .nav-pills > li.active a i, .sidebar-pf .nav-pills > li.active a span{ + color: #39a5dc; +} + +/*********** Realm selector ***********/ + +.realm-selector{ + color: #fff; + margin: 0 -20px; + position: relative; +} + +.realm-dropmenu{ + display: none; + cursor: pointer; + position: absolute; + top: 60px; + left: 0; + right: 0; + z-index: 999; + background: #fff; +} + +.realm-selector:hover .realm-dropmenu{ + display: block; +} + +.realm-add{ + padding: 10px; +} + +.realm-selector h2{ + font-size: 16px; + line-height: 60px; + padding: 0 20px; + margin: 0; + border-bottom: 1px solid #d5d5d6; +} + +.realm-selector h2 i{ + display: inline-block; + float: right; + line-height: 60px; +} + + +.realm-selector ul{ + padding-left: 0; + margin: 0; + list-style: none; + max-height: 200px; + overflow-y:auto; +} + + +.realm-selector ul li a{ + line-height: 60px; + padding: 0 20px; + border-bottom: 1px solid #d5d5d6; + line-height: 39px; + display: block; + font-size: 14px; +} + + +/*********** Overwrites header defaults ***********/ + +.navbar-pf{ + border-top: none!important; +} + +.navbar-pf .navbar-brand { + padding: 0; + height: 56px; + line-height: 56px; + background-position: center center; + background-image: url('../img/keyclok-logo.png'); + background-size: 148px 30px; + background-repeat: no-repeat; + width: 148px; +} + +.navbar-pf .navbar-utility .dropdown-toggle { + padding: 23px !important; +} + +.clickable { + cursor: pointer; +} + +h1 i { + color: #999999; + font-size: 18px; + margin-left: 10px; +} + +/* Action cell */ +.kc-action-cell { + background-color: #eeeeee; + background-image: linear-gradient(to bottom, #fafafa 0%, #ededed 100%); + background-repeat: repeat-x; + + text-align: center; + vertical-align: middle; + + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + + cursor:pointer; +} + +.kc-action-cell:hover { + background-color: #eeeeee; + background-image: none; +} + +.kc-sorter span { + margin-left: 10px; +} + + +/* Time selector */ + +.time-selector input { + display: inline-block; + width: 120px; + padding-right: 0; + margin-right: 0; +} + +.time-selector select { + display: inline-block; + width: 80px; + margin-left: 0; + padding-left: 0; +} + +.ace_editor { + height: 600px; + width: 100%; +} + +.kc-button-input-file input { + float: left; + width: 73%; +} + +.kc-button-input-file label { + float: left; + margin-left: 2%; + width: 25%; +} + +table.kc-authz-table-expanded { + margin-top: 0px !important; +} + +.no-gutter > [class*='col-'] { + padding-right:0!important; + padding-left:0!important; +} + +.password-conceal { + font-family: 'text-security-disc'; + font-size: 14px; +} + +/* Deactivation styles for user-group membership tree models */ + +div[tree-model] li .deactivate { + color: #4a5053; + opacity: 0.4; +} + +div[tree-model] li .deactivate_selected { + background-color: #dcdcdc; + font-weight: bold; + padding: 1px 5px; +} + +/* search highlighting */ + +div[tree-model] li .highlight { + background-color: #aaddff; +} + +/* Manage credentials */ +table.credentials-table { + margin-top: 0; + margin-bottom: 20px; +} + +table.credentials-table td.kc-action-cell { + vertical-align: middle; +} + +table.credentials-table input[type='text'] { + width: 100%; +} + +td.credential-label-cell { + padding: 5px !important; +} + +td.credential-data-cell { + padding: 0 !important; +} + +td.credential-data-cell a { + margin-left: 5px; + line-height: 2.5em; + cursor: pointer; +} + +td.credential-action-cell { + padding: 0px !important; +} + +td.credential-action-cell div.kc-action-cell { + width: 100%; + height: 36px; + line-height: 34px; +} + +td.credential-action-cell.expanded div.kc-action-cell { + border-bottom: 1px solid #d1d1d1; +} + +table.credential-data-table { + margin-top: 0; +} + +table.credential-data-table tr:first-child td { + border-top: 0; +} + +table.credential-data-table td:first-child { + width: 150px; +} + +table.credential-data-table td.key { + text-align: right; + font-weight: bold; +} + diff --git a/keycloak/theme/mosip/admin/resources/img/favicon.ico b/keycloak/theme/mosip/admin/resources/img/favicon.ico new file mode 100644 index 00000000000..48188dedaae Binary files /dev/null and b/keycloak/theme/mosip/admin/resources/img/favicon.ico differ diff --git a/keycloak/theme/mosip/admin/resources/img/keyclok-logo.png b/keycloak/theme/mosip/admin/resources/img/keyclok-logo.png new file mode 100644 index 00000000000..ca53f0a04ba Binary files /dev/null and b/keycloak/theme/mosip/admin/resources/img/keyclok-logo.png differ diff --git a/keycloak/theme/mosip/admin/resources/img/keyclok-logo.svg b/keycloak/theme/mosip/admin/resources/img/keyclok-logo.svg new file mode 100644 index 00000000000..05fa87b8a0c --- /dev/null +++ b/keycloak/theme/mosip/admin/resources/img/keyclok-logo.svg @@ -0,0 +1,194 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/keycloak/theme/mosip/admin/resources/img/select-arrow.png b/keycloak/theme/mosip/admin/resources/img/select-arrow.png new file mode 100644 index 00000000000..a865a6fa732 Binary files /dev/null and b/keycloak/theme/mosip/admin/resources/img/select-arrow.png differ diff --git a/keycloak/theme/mosip/admin/theme.properties b/keycloak/theme/mosip/admin/theme.properties new file mode 100644 index 00000000000..e245ed695fb --- /dev/null +++ b/keycloak/theme/mosip/admin/theme.properties @@ -0,0 +1,2 @@ +parent=base +styles=node_modules/patternfly/dist/css/patternfly.min.css node_modules/patternfly/dist/css/patternfly-additions.min.css node_modules/select2/select2.css css/styles.css lib/angular/treeview/css/angular.treeview.css node_modules/text-security/text-security.css \ No newline at end of file diff --git a/keycloak/theme/mosip/email/theme.properties b/keycloak/theme/mosip/email/theme.properties new file mode 100644 index 00000000000..f1dbb7215d4 --- /dev/null +++ b/keycloak/theme/mosip/email/theme.properties @@ -0,0 +1 @@ +parent=base \ No newline at end of file diff --git a/keycloak/theme/mosip/login/resources/css/login.css b/keycloak/theme/mosip/login/resources/css/login.css new file mode 100644 index 00000000000..13b33f018a6 --- /dev/null +++ b/keycloak/theme/mosip/login/resources/css/login.css @@ -0,0 +1,581 @@ +.login-pf body { + background: #ffffff; + background-size: cover; + height: 100%; +} + +@media (min-width: 768px) { + .login-pf-page .login-pf-header { + margin-bottom: 10px; + } +} +.login-pf-page .login-pf-header h1 { + text-align: center; + font-weight: 700; + color: #ff2199; +} +.login-pf-page .login-pf-header h1 { + font-size: 16px; +} +@media (min-width: 768px) { + .login-pf-page .login-pf-header h1 { + font-size: 24px; + } +} + +input:-internal-autofill-selected { + appearance: menulist-button; + background-color: white !important; + background-image: none !important; + color: -internal-light-dark(black, white) !important; +} + +.login-pf-page .btn-primary{ + line-height: 36px !important; + border-radius: 4px !important; + background: rgba(230,58,116,1) !important; + border: none !important; +} +.login-pf-page .form-control { + height: 50px; + border: 0px; + border-bottom: 1px solid; + font-size: 21px; +} + +.alert-error { + background-color: #ffffff; + border-color: #cc0000; + color: #333333; +} + +#kc-locale ul { + display: none; + position: absolute; + background-color: #fff; + list-style: none; + right: 0; + top: 20px; + min-width: 100px; + padding: 2px 0; + border: solid 1px #bbb; +} + +#kc-locale:hover ul { + display: block; + margin: 0; +} + +#kc-locale ul li a { + display: block; + padding: 5px 14px; + color: #000 !important; + text-decoration: none; + line-height: 20px; +} + +#kc-locale ul li a:hover { + color: #4d5258; + background-color: #d4edfa; +} + +#kc-locale-dropdown a { + color: #4d5258; + background: 0 0; + padding: 0 15px 0 0; + font-weight: 300; +} + +#kc-locale-dropdown a:hover { + text-decoration: none; +} + +a#kc-current-locale-link { + display: block; + padding: 0 5px; +} + +/* a#kc-current-locale-link:hover { + background-color: rgba(0,0,0,0.2); +} */ + +a#kc-current-locale-link::after { + content: "\2c5"; + margin-left: 4px; +} + +.login-pf .container { + padding-top: 40px; +} + +.login-pf a:hover { + color: #0099d3; +} + +#kc-logo { + width: 100%; +} + +#kc-logo-wrapper { + background-image: url(../img/mosiplogo.png); + background-repeat: no-repeat; + height: 63px; + width: 300px; + margin: 62px auto 0; +} + +div.kc-logo-text { + background-image: url(../img/mosiplogo.png); + background-repeat: no-repeat; + height: 131px; + width: 300px; + margin: -1em 30em; +} + +div.kc-logo-text span { + display: none; +} +.g-recaptcha { + transform:scale(0.77); + transform-origin:0 0; +} +#kc-header { + color: #ededed; + overflow: visible; + white-space: nowrap; +} + +#kc-header-wrapper { + font-size: 29px; + text-transform: uppercase; + letter-spacing: 3px; + line-height: 1.2em; + padding: 62px 10px 20px; + white-space: normal; +} + +#kc-content { + width: 100%; +} + +#kc-attempted-username{ + font-size: 20px; + font-family:inherit; + font-weight: normal; + padding-right:10px; +} + +#kc-username{ + text-align: center; +} + +#kc-webauthn-settings-form{ + padding-top:8px; +} + +/* #kc-content-wrapper { + overflow-y: hidden; +} */ + +#kc-info { + padding-bottom: 200px; + margin-bottom: -200px; +} + +#kc-info-wrapper { + font-size: 13px; +} + +#kc-form-options span { + display: block; +} + +#kc-form-options .checkbox { + margin-top: 0; + color: #72767b; +} + +#kc-terms-text { + margin-bottom: 20px; +} + +#kc-registration { + margin-bottom: 15px; +} + +/* TOTP */ + +.subtitle { + text-align: right; + margin-top: 30px; + color: #909090; +} + +.required { + color: #CB2915; +} + +ol#kc-totp-settings { + margin: 0; + padding-left: 20px; +} + +ul#kc-totp-supported-apps { + margin-bottom: 10px; +} + +#kc-totp-secret-qr-code { + max-width:150px; + max-height:150px; +} + +#kc-totp-secret-key { + background-color: #fff; + color: #333333; + font-size: 16px; + padding: 10px 0; +} + +/* OAuth */ + +#kc-oauth h3 { + margin-top: 0; +} + +#kc-oauth ul { + list-style: none; + padding: 0; + margin: 0; +} + +#kc-oauth ul li { + border-top: 1px solid rgba(255, 255, 255, 0.1); + font-size: 12px; + padding: 10px 0; +} + +#kc-oauth ul li:first-of-type { + border-top: 0; +} + +#kc-oauth .kc-role { + display: inline-block; + width: 50%; +} + +/* Code */ +#kc-code textarea { + width: 100%; + height: 8em; +} + +/* Social */ + +#kc-social-providers ul { + padding: 0; +} + +#kc-social-providers li { + display: block; +} + +#kc-social-providers li:first-of-type { + margin-top: 0; +} + +.kc-login-tooltip{ + position:relative; + display: inline-block; +} + +.kc-login-tooltip .kc-tooltip-text{ + top:-3px; + left:160%; + background-color: black; + visibility: hidden; + color: #fff; + + min-width:130px; + text-align: center; + border-radius: 2px; + box-shadow:0 1px 8px rgba(0,0,0,0.6); + padding: 5px; + + position: absolute; + opacity:0; + transition:opacity 0.5s; +} + +/* Show tooltip */ +.kc-login-tooltip:hover .kc-tooltip-text { + visibility: visible; + opacity:0.7; +} + +/* Arrow for tooltip */ +.kc-login-tooltip .kc-tooltip-text::after { + content: " "; + position: absolute; + top: 15px; + right: 100%; + margin-top: -5px; + border-width: 5px; + border-style: solid; + border-color: transparent black transparent transparent; +} + +.zocial, +a.zocial { + width: 100%; + font-weight: normal; + font-size: 14px; + text-shadow: none; + border: 0; + background: #f5f5f5; + color: #72767b; + border-radius: 0; + white-space: normal; +} +.zocial:before { + border-right: 0; + margin-right: 0; +} +.zocial span:before { + padding: 7px 10px; + font-size: 14px; +} +.zocial:hover { + background: #ededed !important; +} + +.zocial.facebook, +.zocial.github, +.zocial.google, +.zocial.microsoft, +.zocial.stackoverflow, +.zocial.linkedin, +.zocial.twitter { + background-image: none; + border: 0; + + box-shadow: none; + text-shadow: none; +} + +/* Copy of zocial windows classes to be used for microsoft's social provider button */ +.zocial.microsoft:before{ content: "\f15d"; } +.zocial.stackoverflow:before{ color: inherit; } + + +@media (min-width: 768px) { + #kc-container-wrapper { + position: absolute; + width: 100%; + } + + .login-pf .container { + padding-right: 80px; + } + + #kc-locale { + position: relative; + text-align: right; + z-index: 9999; + } +} + +@media (max-width: 767px) { + + .login-pf body { + background: white; + } + + #kc-header { + padding-left: 15px; + padding-right: 15px; + float: none; + text-align: left; + } + + #kc-header-wrapper { + font-size: 16px; + font-weight: bold; + padding: 20px 60px 0 0; + color: #72767b; + letter-spacing: 0; + } + + div.kc-logo-text { + margin: 0; + width: 150px; + height: 32px; + background-size: 100%; + } + + #kc-form { + float: none; + } + + #kc-info-wrapper { + border-top: 1px solid rgba(255, 255, 255, 0.1); + margin-top: 15px; + padding-top: 15px; + padding-left: 0px; + padding-right: 15px; + } + + #kc-social-providers li { + display: block; + margin-right: 5px; + } + + .login-pf .container { + padding-top: 15px; + padding-bottom: 15px; + } + + #kc-locale { + position: absolute; + width: 200px; + top: 20px; + right: 20px; + text-align: right; + z-index: 9999; + } + + #kc-logo-wrapper { + background-size: 100px 21px; + height: 21px; + width: 100px; + margin: 20px 0 0 20px; + } + +} + +@media (min-height: 646px) { + #kc-container-wrapper { + bottom: 12%; + } +} + +@media (max-height: 645px) { + #kc-container-wrapper { + padding-top: 50px; + top: 20%; + } +} + +.card-pf form.form-actions .btn { + float: right; + margin-left: 10px; +} + +#kc-form-buttons { + margin-top: 40px; +} + +.login-pf-page .login-pf-brand { + margin-top: 20px; + max-width: 360px; + width: 40%; +} + +.card-pf { + background: #fff; + margin: 0 auto; + padding: 0 20px; + max-width: 500px; + border-top: 0; + box-shadow: 0 0 0; +} + +/*tablet*/ +@media (max-width: 840px) { + .login-pf-page .card-pf{ + max-width: none; + margin-left: 20px; + margin-right: 20px; + padding: 20px 20px 30px 20px; + } +} +@media (max-width: 767px) { + .login-pf-page .card-pf{ + max-width: none; + margin-left: 0; + margin-right: 0; + padding-top: 0; + } + .card-pf.login-pf-accounts{ + max-width: none; + } +} + +.login-pf-page .login-pf-signup { + font-size: 15px; + color: #72767b; +} +#kc-content-wrapper .row { + margin-left: 0; + margin-right: 0; +} + +@media (min-width: 768px) { + .login-pf-page .login-pf-social-section:first-of-type { + padding-right: 39px; + border-right: 1px solid #d1d1d1; + margin-right: -1px; + } + .login-pf-page .login-pf-social-section:last-of-type { + padding-left: 40px; + } + .login-pf-page .login-pf-social-section .login-pf-social-link:last-of-type { + margin-bottom: 0; + } +} + +.login-pf-page .login-pf-social-link { + margin-bottom: 25px; +} +.login-pf-page .login-pf-social-link a { + padding: 2px 0; +} + +.login-pf-page.login-pf-page-accounts { + margin-left: auto; + margin-right: auto; +} + +.login-pf-page .btn-primary { + margin-top: 10px; + line-height: 36px !important; + border-radius: 4px !important; + background: rgba(230,58,116,1) !important; + border: none !important; +} + +.login-pf-page .list-view-pf .list-group-item { + border-bottom: 1px solid #ededed; +} + +.login-pf-page .list-view-pf-description { + width: 100%; +} + +.login-pf-page .card-pf{ + margin-bottom: 10px; +} + +#kc-form-login div.form-group:last-of-type, +#kc-register-form div.form-group:last-of-type, +#kc-update-profile-form div.form-group:last-of-type { + margin-bottom: 0px; +} + +#kc-back { + margin-top: 5px; +} + +form#kc-select-back-form div.login-pf-social-section { + padding-left: 0px; + border-left: 0px; +} diff --git a/keycloak/theme/mosip/login/resources/img/favicon.ico b/keycloak/theme/mosip/login/resources/img/favicon.ico new file mode 100644 index 00000000000..48188dedaae Binary files /dev/null and b/keycloak/theme/mosip/login/resources/img/favicon.ico differ diff --git a/keycloak/theme/mosip/login/resources/img/feedback-error-arrow-down.png b/keycloak/theme/mosip/login/resources/img/feedback-error-arrow-down.png new file mode 100644 index 00000000000..6f2d9d2aeb1 Binary files /dev/null and b/keycloak/theme/mosip/login/resources/img/feedback-error-arrow-down.png differ diff --git a/keycloak/theme/mosip/login/resources/img/feedback-error-sign.png b/keycloak/theme/mosip/login/resources/img/feedback-error-sign.png new file mode 100644 index 00000000000..0dd500445d7 Binary files /dev/null and b/keycloak/theme/mosip/login/resources/img/feedback-error-sign.png differ diff --git a/keycloak/theme/mosip/login/resources/img/feedback-success-arrow-down.png b/keycloak/theme/mosip/login/resources/img/feedback-success-arrow-down.png new file mode 100644 index 00000000000..03cc0c45dcc Binary files /dev/null and b/keycloak/theme/mosip/login/resources/img/feedback-success-arrow-down.png differ diff --git a/keycloak/theme/mosip/login/resources/img/feedback-success-sign.png b/keycloak/theme/mosip/login/resources/img/feedback-success-sign.png new file mode 100644 index 00000000000..640bd71cab7 Binary files /dev/null and b/keycloak/theme/mosip/login/resources/img/feedback-success-sign.png differ diff --git a/keycloak/theme/mosip/login/resources/img/feedback-warning-arrow-down.png b/keycloak/theme/mosip/login/resources/img/feedback-warning-arrow-down.png new file mode 100644 index 00000000000..6f2d9d2aeb1 Binary files /dev/null and b/keycloak/theme/mosip/login/resources/img/feedback-warning-arrow-down.png differ diff --git a/keycloak/theme/mosip/login/resources/img/feedback-warning-sign.png b/keycloak/theme/mosip/login/resources/img/feedback-warning-sign.png new file mode 100644 index 00000000000..f9392a356fd Binary files /dev/null and b/keycloak/theme/mosip/login/resources/img/feedback-warning-sign.png differ diff --git a/keycloak/theme/mosip/login/resources/img/keycloak-bg.png b/keycloak/theme/mosip/login/resources/img/keycloak-bg.png new file mode 100644 index 00000000000..4004db4420f Binary files /dev/null and b/keycloak/theme/mosip/login/resources/img/keycloak-bg.png differ diff --git a/keycloak/theme/mosip/login/resources/img/keycloak-logo-text.png b/keycloak/theme/mosip/login/resources/img/keycloak-logo-text.png new file mode 100644 index 00000000000..63f3b9f87de Binary files /dev/null and b/keycloak/theme/mosip/login/resources/img/keycloak-logo-text.png differ diff --git a/keycloak/theme/mosip/login/resources/img/keycloak-logo.png b/keycloak/theme/mosip/login/resources/img/keycloak-logo.png new file mode 100644 index 00000000000..ffa5b0bf9e0 Binary files /dev/null and b/keycloak/theme/mosip/login/resources/img/keycloak-logo.png differ diff --git a/keycloak/theme/mosip/login/resources/img/mosiplogo.png b/keycloak/theme/mosip/login/resources/img/mosiplogo.png new file mode 100644 index 00000000000..321ba3df51e Binary files /dev/null and b/keycloak/theme/mosip/login/resources/img/mosiplogo.png differ diff --git a/keycloak/theme/mosip/login/theme.properties b/keycloak/theme/mosip/login/theme.properties new file mode 100644 index 00000000000..d266b1e1075 --- /dev/null +++ b/keycloak/theme/mosip/login/theme.properties @@ -0,0 +1,94 @@ +parent=base +import=common/keycloak + +styles=node_modules/patternfly/dist/css/patternfly.min.css node_modules/patternfly/dist/css/patternfly-additions.min.css lib/zocial/zocial.css css/login.css +meta=viewport==width=device-width,initial-scale=1 + +kcHtmlClass=login-pf +kcLoginClass=login-pf-page + +kcLogoLink=http://www.keycloak.org + +kcLogoClass=login-pf-brand + +kcContainerClass=container-fluid +kcContentClass=col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3 col-lg-6 col-lg-offset-3 +kcContentWrapperClass=row + +kcHeaderClass=login-pf-page-header +kcFeedbackAreaClass=col-md-12 +kcLocaleClass=col-xs-12 col-sm-1 +kcAlertIconClasserror=pficon pficon-error-circle-o + +kcFormAreaClass=col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2 col-lg-8 col-lg-offset-2 +kcFormCardClass=card-pf +kcFormCardAccountClass=login-pf-accounts +kcFormSocialAccountClass=login-pf-social-section +kcFormSocialAccountContentClass=col-xs-12 col-sm-6 +kcFormSocialAccountListClass=login-pf-social list-unstyled login-pf-social-all +kcFormSocialAccountDoubleListClass=login-pf-social-double-col +kcFormSocialAccountListLinkClass=login-pf-social-link +kcFormHeaderClass=login-pf-header + +kcFeedbackErrorIcon=pficon pficon-error-circle-o +kcFeedbackWarningIcon=pficon pficon-warning-triangle-o +kcFeedbackSuccessIcon=pficon pficon-ok +kcFeedbackInfoIcon=pficon pficon-info + +kcResetFlowIcon=pficon pficon-arrow fa-2x +kcWebAuthnKeyIcon=pficon pficon-key + +kcFormClass=form-horizontal +kcFormGroupClass=form-group +kcFormGroupErrorClass=has-error +kcLabelClass=control-label +kcLabelWrapperClass=col-xs-12 col-sm-12 col-md-12 col-lg-12 +kcInputClass=form-control +kcInputWrapperClass=col-xs-12 col-sm-12 col-md-12 col-lg-12 +kcFormOptionsClass=col-xs-12 col-sm-12 col-md-12 col-lg-12 +kcFormButtonsClass=col-xs-12 col-sm-12 col-md-12 col-lg-12 +kcFormSettingClass=login-pf-settings +kcTextareaClass=form-control +kcSignUpClass=login-pf-signup + + +kcInfoAreaClass=col-xs-12 col-sm-4 col-md-4 col-lg-5 details + +##### css classes for form buttons +# main class used for all buttons +kcButtonClass=btn +# classes defining priority of the button - primary or default (there is typically only one priority button for the form) +kcButtonPrimaryClass=btn-primary +kcButtonDefaultClass=btn-default +# classes defining size of the button +kcButtonLargeClass=btn-lg +kcButtonBlockClass=btn-block + +##### css classes for input +kcInputLargeClass=input-lg + +##### css classes for form accessability +kcSrOnlyClass=sr-only + +##### css classes for select-authenticator form +kcSelectAuthListClass=list-group list-view-pf +kcSelectAuthListItemClass=list-group-item list-view-pf-stacked +kcSelectAuthListItemInfoClass=list-view-pf-main-info +kcSelectAuthListItemLeftClass=list-view-pf-left +kcSelectAuthListItemBodyClass=list-view-pf-body +kcSelectAuthListItemDescriptionClass=list-view-pf-description +kcSelectAuthListItemHeadingClass=list-group-item-heading +kcSelectAuthListItemHelpTextClass=list-group-item-text + +##### css classes for the authenticators +kcAuthenticatorDefaultClass=fa list-view-pf-icon-lg +kcAuthenticatorPasswordClass=fa fa-unlock list-view-pf-icon-lg +kcAuthenticatorOTPClass=fa fa-mobile list-view-pf-icon-lg +kcAuthenticatorWebAuthnClass=fa fa-key list-view-pf-icon-lg +kcAuthenticatorWebAuthnPasswordlessClass=fa fa-key list-view-pf-icon-lg + +##### css classes for the OTP Login Form +kcSelectOTPListClass=card-pf card-pf-view card-pf-view-select card-pf-view-single-select +kcSelectOTPListItemClass=card-pf-body card-pf-top-element +kcAuthenticatorOtpCircleClass=fa fa-mobile card-pf-icon-circle +kcSelectOTPItemHeadingClass=card-pf-title text-center \ No newline at end of file diff --git a/keycloak/theme/mosip/welcome/index.ftl b/keycloak/theme/mosip/welcome/index.ftl new file mode 100644 index 00000000000..34983c363b6 --- /dev/null +++ b/keycloak/theme/mosip/welcome/index.ftl @@ -0,0 +1,132 @@ + + +  + + + Welcome to ${productNameFull} + + + + + + + + <#if properties.styles?has_content> + <#list properties.styles?split(' ') as style> + + + + + + +
    +
    +
    +
    + ${productName} +

    Welcome to ${productNameFull}

    +
    +
    +
    +
    + <#if successMessage?has_content> +

    ${successMessage}

    + <#elseif errorMessage?has_content> +

    ${errorMessage}

    +

    Administration Console

    + <#elseif bootstrap> + <#if localUser> +

    Administration Console

    +

    Please create an initial admin user to get started.

    + <#else> +

    + You need local access to create the initial admin user.

    Open http://localhost:8080/auth +
    or use the add-user-keycloak script. +

    + + + + <#if bootstrap && localUser> +
    +

    + + +

    + +

    + + +

    + +

    + + +

    + + + + +
    + +
    +

    Administration Console

    +
    + Centrally manage all aspects of the ${productNameFull} server +
    +
    +
    +
    +
    +
    +

    Documentation

    +
    + + User Guide, Admin REST API and Javadocs + +
    +
    +
    +
    + <#if properties.displayCommunityLinks = "true"> +
    +

    Keycloak Project

    +
    +
    +

    Mailing List

    +
    +
    +

    Report an issue

    +
    + +
    +
    +
    + <#if properties.displayCommunityLinks = "true"> + JBoss and JBoss Community + +
    +
    +
    +
    + + diff --git a/keycloak/theme/mosip/welcome/resources/admin-console.png b/keycloak/theme/mosip/welcome/resources/admin-console.png new file mode 100644 index 00000000000..ac734972ff0 Binary files /dev/null and b/keycloak/theme/mosip/welcome/resources/admin-console.png differ diff --git a/keycloak/theme/mosip/welcome/resources/alert.png b/keycloak/theme/mosip/welcome/resources/alert.png new file mode 100644 index 00000000000..74b4bc79f02 Binary files /dev/null and b/keycloak/theme/mosip/welcome/resources/alert.png differ diff --git a/keycloak/theme/mosip/welcome/resources/bg.png b/keycloak/theme/mosip/welcome/resources/bg.png new file mode 100644 index 00000000000..b722a001b32 Binary files /dev/null and b/keycloak/theme/mosip/welcome/resources/bg.png differ diff --git a/keycloak/theme/mosip/welcome/resources/bug.png b/keycloak/theme/mosip/welcome/resources/bug.png new file mode 100644 index 00000000000..4f00775caaf Binary files /dev/null and b/keycloak/theme/mosip/welcome/resources/bug.png differ diff --git a/keycloak/theme/mosip/welcome/resources/css/welcome.css b/keycloak/theme/mosip/welcome/resources/css/welcome.css new file mode 100644 index 00000000000..c6a679a28cb --- /dev/null +++ b/keycloak/theme/mosip/welcome/resources/css/welcome.css @@ -0,0 +1,140 @@ +body { + background: #fff url(../bg.png) no-repeat center bottom fixed; + background-size: cover; +} +.welcome-header { + margin-top: 10px; + margin-bottom: 50px; + margin-left: -10px; +} +.welcome-header img { + width: 150px; + margin-bottom: 40px; +} +.welcome-message { + margin-top: 20px; +} +.h-l { + min-height: 370px; + padding: 10px 20px 10px; + overflow: hidden; +} +.h-l h3 { + margin-bottom: 10px; +} +.h-m { + height: 110px; + padding-top: 23px; +} +.card-pf img { + width: 22px; + margin-right: 10px; + vertical-align: bottom; +} +img.doc-img { + width: auto; + height: 22px; +} +.link { + font-size: 16px; + vertical-align: baseline; + margin-left: 5px; +} +h3 { + font-weight: 550; +} +h3 a:link, +h3 a:visited { + color: #333; + font-weight: 550; +} +h3 a:hover, +h3 a:hover .link { + text-decoration: none; + color: #00659c; +} +.h-l h3 a img { + height: 30px; + width: auto; +} + +.description { + margin-top: 30px; +} + +.card-pf { + border-top: 1px solid rgba(3, 3, 3, 0.1); + box-shadow: 0 1px 1px rgba(3, 3, 3, 0.275); +} + +.welcome-form label, +.welcome-form input { + display: block; + width: 100%; +} + +.welcome-form label { + color: #828486; + font-weight: normal; + margin-top: 18px; +} +.welcome-form input { + border: 0; + border-bottom: solid 1px #cbcbcb; +} +.welcome-form input:focus { + border-bottom: solid 1px #5e99c6; + outline-width: 0; +} +.welcome-form button { + margin-top: 10px; +} +.error { + color: #c00; + border-color: #c00; + padding: 5px 10px; +} +.success { + color: #3f9c35; + border-color: #3f9c35; + padding: 5px 10px; +} +.welcome-form + .welcome-primary-link, +.welcome-message + .welcome-primary-link { + display: none; +} + +.footer img { + float: right; + width: 150px; + margin-top: 30px; +} + +@media (max-width: 768px) { + .welcome-header { + margin-top: 10px; + margin-bottom: 20px; + } + .welcome-header img { + margin-bottom: 20px; + } + h3 { + margin-top: 10px; + } + .h-l, + .h-m { + height: auto; + min-height: auto; + padding: 5px 10px; + } + .h-l img { + display: inline; + margin-bottom: auto; + } + .description { + display: none; + } + .footer img { + margin-top: 10px; + } +} diff --git a/keycloak/theme/mosip/welcome/resources/favicon.ico b/keycloak/theme/mosip/welcome/resources/favicon.ico new file mode 100644 index 00000000000..48188dedaae Binary files /dev/null and b/keycloak/theme/mosip/welcome/resources/favicon.ico differ diff --git a/keycloak/theme/mosip/welcome/resources/jboss_community.png b/keycloak/theme/mosip/welcome/resources/jboss_community.png new file mode 100644 index 00000000000..c4a133c1851 Binary files /dev/null and b/keycloak/theme/mosip/welcome/resources/jboss_community.png differ diff --git a/keycloak/theme/mosip/welcome/resources/keycloak-project.png b/keycloak/theme/mosip/welcome/resources/keycloak-project.png new file mode 100644 index 00000000000..cd63e5ab3f4 Binary files /dev/null and b/keycloak/theme/mosip/welcome/resources/keycloak-project.png differ diff --git a/keycloak/theme/mosip/welcome/resources/keycloak_logo.png b/keycloak/theme/mosip/welcome/resources/keycloak_logo.png new file mode 100644 index 00000000000..134440b16eb Binary files /dev/null and b/keycloak/theme/mosip/welcome/resources/keycloak_logo.png differ diff --git a/keycloak/theme/mosip/welcome/resources/logo.png b/keycloak/theme/mosip/welcome/resources/logo.png new file mode 100644 index 00000000000..134440b16eb Binary files /dev/null and b/keycloak/theme/mosip/welcome/resources/logo.png differ diff --git a/keycloak/theme/mosip/welcome/resources/mail.png b/keycloak/theme/mosip/welcome/resources/mail.png new file mode 100644 index 00000000000..3a63e7b855b Binary files /dev/null and b/keycloak/theme/mosip/welcome/resources/mail.png differ diff --git a/keycloak/theme/mosip/welcome/resources/user.png b/keycloak/theme/mosip/welcome/resources/user.png new file mode 100644 index 00000000000..0d61bb47092 Binary files /dev/null and b/keycloak/theme/mosip/welcome/resources/user.png differ diff --git a/keycloak/theme/mosip/welcome/theme.properties b/keycloak/theme/mosip/welcome/theme.properties new file mode 100644 index 00000000000..154ff3273de --- /dev/null +++ b/keycloak/theme/mosip/welcome/theme.properties @@ -0,0 +1,6 @@ +import=common/keycloak + +styles=node_modules/patternfly/dist/css/patternfly.css node_modules/patternfly/dist/css/patternfly-additions.css css/welcome.css + +documentationUrl=https://www.keycloak.org/documentation.html +displayCommunityLinks=true \ No newline at end of file diff --git a/pre-registration-booking-service/Dockerfile b/pre-registration-booking-service/Dockerfile index 8ad81c0ea2f..5f454119cea 100644 --- a/pre-registration-booking-service/Dockerfile +++ b/pre-registration-booking-service/Dockerfile @@ -30,6 +30,9 @@ ENV is_glowroot_env=${is_glowroot} # environment variable to pass artifactory url, at docker runtime ENV artifactory_url_env=${artifactory_url} +# environment variable to pass iam_adapter url, at docker runtime +ENV iam_adapter_url_env=${iam_adapter_url} + copy ./target/pre-registration-booking-service-*.jar pre-registration-booking-service.jar #ADD http://13.71.87.138:8040/artifactory/libs-release-local/io/mosip/kernel/kernel-ref-idobjectvalidator/0.9.1/kernel-ref-idobjectvalidator-0.9.1.jar kernel-ref-idobjectvalidator-0.9.1.jar @@ -37,17 +40,17 @@ copy ./target/pre-registration-booking-service-*.jar pre-registration-booking-se EXPOSE 9095 CMD if [ "$is_glowroot_env" = "present" ]; then \ - wget "${artifactory_url_env}"/artifactory/libs-snapshot-local/io/mosip/kernel/kernel-ref-idobjectvalidator/1.0.9-rc1/kernel-ref-idobjectvalidator-1.0.9-rc1.jar kernel-ref-idobjectvalidator-1.0.9-rc1.jar ; \ + wget -q --show-progress "${artifactory_url_env}"/artifactory/libs-snapshot-local/io/mosip/kernel/kernel-ref-idobjectvalidator/kernel-ref-idobjectvalidator.jar kernel-ref-idobjectvalidator.jar ; \ wget "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/testing/glowroot.zip ; \ apt-get update && apt-get install -y unzip ; \ unzip glowroot.zip ; \ rm -rf glowroot.zip ; \ sed -i 's//pre-registration-booking-service/g' glowroot/glowroot.properties ; \ - java -Dloader.path=/kernel-ref-idobjectvalidator-1.0.9-rc1.jar -jar -javaagent:glowroot/glowroot.jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" pre-registration-booking-service.jar ; \ + java -Dloader.path=/kernel-ref-idobjectvalidator.jar -jar -javaagent:glowroot/glowroot.jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" pre-registration-booking-service.jar ; \ else \ - wget "${artifactory_url_env}"/artifactory/libs-snapshot-local/io/mosip/kernel/kernel-ref-idobjectvalidator/1.0.9-rc1/kernel-ref-idobjectvalidator-1.0.9-rc1.jar kernel-ref-idobjectvalidator-1.0.9-rc1.jar ; \ - java -Dloader.path=/kernel-ref-idobjectvalidator-1.0.9-rc1.jar -jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" pre-registration-booking-service.jar ; \ + wget -q --show-progress "${artifactory_url_env}"/artifactory/libs-snapshot-local/io/mosip/kernel/kernel-ref-idobjectvalidator/kernel-ref-idobjectvalidator.jar kernel-ref-idobjectvalidator.jar ; \ + java -Dloader.path=/kernel-ref-idobjectvalidator.jar -jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" pre-registration-booking-service.jar ; \ fi #CMD ["java","-Dloader.path=/kernel-ref-idobjectvalidator-0.9.1.jar","-jar","-Dspring.cloud.config.label=${spring_config_label_env}","-Dspring.profiles.active=${active_profile_env}","-Dspring.cloud.config.uri=${spring_config_url_env}","pre-registration-booking-service.jar"] diff --git a/pre-registration-booking-service/pom.xml b/pre-registration-booking-service/pom.xml index e820c52d624..1e8a27eb6df 100644 --- a/pre-registration-booking-service/pom.xml +++ b/pre-registration-booking-service/pom.xml @@ -1,4 +1,5 @@ - 4.0.0 @@ -9,17 +10,36 @@ - 1.0.9 + pre-registration-booking-service + 1.1.4-rc1 pre-registration-booking-service - pre-registration-booking-service - + + + + Mosip + mosip.emailnotifier@gmail.com + io.mosip + https://github.com/mosip/pre-registration + + + + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + - 1.0.9 UTF-8 - 1.0.9 - 1.4.2 - + 1.1.4-rc1 + 1.1.4-rc1 + 2.0.2.RELEASE 2.0.9.RELEASE @@ -30,7 +50,8 @@ 2.9.5 - 2.9.2 + 2.5.0 + 2.5.0 @@ -51,10 +72,9 @@ 1.18.8 - + 2.23.4 1.1 - 3.1.4 20080701 0.7.4 @@ -62,10 +82,17 @@ 63.1 **/code/**,**/config/**,**/dao/**,**/dto/**,**/entity/**,**/errorcodes/**,**/exception/**,**/exception/system/**,**/exception/util/**,**/repository/**,**/*Config.java,**/*Application.java,**/batchjob/**,**/util/**,**/stateUtil/** **/dto/**,**/entity/**,**/config/** - 2.23.4 + + 11 + 11 + 3.8.0 3.0.2 - 3.1.0 - + 3.1.0 + 2.9 + 0.8.1 + 3.7.0.1746 + 3.2.0 + @@ -83,14 +110,32 @@ ${lombok.version} compile - - - org.mockito - mockito-core - 2.22.0 - test - - + + javax.xml.bind + jaxb-api + 2.3.0 + + + javax.activation + activation + 1.1 + + + org.glassfish.jaxb + jaxb-runtime + 2.3.0-b170127.1453 + + + org.javassist + javassist + 3.27.0-GA + + + javax.servlet + javax.servlet-api + 3.1.0 + provided +     @@ -99,9 +144,32 @@ org.springframework.boot spring-boot-starter-web + + org.springframework.boot + spring-boot-starter-tomcat + provided + org.springframework.boot spring-boot-starter-test + test + + + org.mockito + mockito-core + + + + + org.mockito + mockito-core + 2.23.4 + test + + + io.jsonwebtoken + jjwt + 0.6.0 com.h2database @@ -124,8 +192,8 @@ io.mosip.kernel - kernel-auth-adapter - ${kernel.auth.adapter.version} + kernel-core + ${kernel.core.version} org.springframework.boot @@ -136,6 +204,36 @@ spring-security-test test + + net.logstash.logback + logstash-logback-encoder + 4.9 + + + ch.qos.logback + logback-classic + 1.2.3 + + + ch.qos.logback + logback-core + 1.2.3 + + + net.minidev + asm + 1.0.2 + + + com.jayway.jsonpath + json-path + 2.2.0 + + + net.minidev + json-smart + 2.2.1 + io.micrometer micrometer-core @@ -167,6 +265,42 @@ + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ossrh + https://oss.sonatype.org/ + false + + diff --git a/pre-registration-booking-service/src/main/java/io/mosip/preregistration/booking/BookingApplication.java b/pre-registration-booking-service/src/main/java/io/mosip/preregistration/booking/BookingApplication.java index 904af64da4b..18db046d951 100644 --- a/pre-registration-booking-service/src/main/java/io/mosip/preregistration/booking/BookingApplication.java +++ b/pre-registration-booking-service/src/main/java/io/mosip/preregistration/booking/BookingApplication.java @@ -7,6 +7,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.FilterType; /** * This class is used to define the start of the Booking application. @@ -18,7 +19,20 @@ * */ @SpringBootApplication -@ComponentScan(basePackages = "io.mosip.*") +@ComponentScan(basePackages = "io.mosip.*", excludeFilters = { + @ComponentScan.Filter(type = FilterType.REGEX, + pattern = {"io\\.mosip\\.kernel\\.zkcryptoservice\\..*", + "io\\.mosip\\.kernel\\.tokenidgenerator\\..*", + "io\\.mosip\\.kernel\\.signature\\..*", + "io\\.mosip\\.kernel\\.partnercertservice\\..*", + "io\\.mosip\\.kernel\\.lkeymanager\\..*", + "io\\.mosip\\.kernel\\.keymanagerservice\\..*", + "io\\.mosip\\.kernel\\.keymanager\\..*", + "io\\.mosip\\.kernel\\.keygenerator\\..*", + "io\\.mosip\\.kernel\\.cryptomanager\\..*", + "io\\.mosip\\.kernel\\.crypto\\..*", + "io\\.mosip\\.kernel\\.clientcrypto\\..*", + }) }) public class BookingApplication { /** * Method to start the Booking API service diff --git a/pre-registration-booking-service/src/main/java/io/mosip/preregistration/booking/exception/util/BookingExceptionCatcher.java b/pre-registration-booking-service/src/main/java/io/mosip/preregistration/booking/exception/util/BookingExceptionCatcher.java index 9984e5b924c..a02a120eea9 100644 --- a/pre-registration-booking-service/src/main/java/io/mosip/preregistration/booking/exception/util/BookingExceptionCatcher.java +++ b/pre-registration-booking-service/src/main/java/io/mosip/preregistration/booking/exception/util/BookingExceptionCatcher.java @@ -75,8 +75,8 @@ public void handle(Exception ex, MainResponseDTO mainResponseDTO) { } else if (ex instanceof DateTimeException || ex instanceof java.time.format.DateTimeParseException || ex instanceof InvalidDateTimeFormatException || ex instanceof java.text.ParseException) { throw new InvalidDateTimeFormatException( - io.mosip.preregistration.core.errorcodes.ErrorCodes.PRG_CORE_REQ_019.toString(), - io.mosip.preregistration.core.errorcodes.ErrorMessages.INVALID_DATE_TIME_FORMAT.getMessage(), + ((InvalidDateTimeFormatException)ex).getErrorCode(), + ((InvalidDateTimeFormatException)ex).getErrorText(), mainResponseDTO); } else if (ex instanceof ParseException) { throw new ParseException(io.mosip.preregistration.core.errorcodes.ErrorCodes.PRG_CORE_REQ_019.toString(), @@ -181,4 +181,4 @@ public void handle(Exception ex, MainResponseDTO mainResponseDTO) { } -} \ No newline at end of file +} diff --git a/pre-registration-booking-service/src/main/java/io/mosip/preregistration/booking/security/AuthenticationFilter.java b/pre-registration-booking-service/src/main/java/io/mosip/preregistration/booking/security/AuthenticationFilter.java new file mode 100644 index 00000000000..af8680cf319 --- /dev/null +++ b/pre-registration-booking-service/src/main/java/io/mosip/preregistration/booking/security/AuthenticationFilter.java @@ -0,0 +1,114 @@ +package io.mosip.preregistration.booking.security; + +import java.io.IOException; +import java.time.LocalDateTime; +import java.time.ZoneId; + +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.HttpStatus; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter; +import org.springframework.security.web.util.matcher.RequestMatcher; +import org.springframework.web.util.ContentCachingRequestWrapper; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; + +import io.mosip.kernel.core.exception.ServiceError; +import io.mosip.kernel.core.util.EmptyCheckUtils; +import io.mosip.preregistration.core.common.dto.ResponseWrapper; + +public class AuthenticationFilter extends AbstractAuthenticationProcessingFilter { + + private static final Logger LOGGER = LoggerFactory.getLogger(AuthenticationFilter.class); + + AuthenticationFilter(final RequestMatcher requiresAuth) { + super(requiresAuth); + } + + @Override + public Authentication attemptAuthentication(HttpServletRequest httpServletRequest, + HttpServletResponse httpServletResponse) throws AuthenticationException, IOException, ServletException { + LOGGER.info( + "In attemptAuthentication method of AuthenticationFilter class:" + httpServletRequest.getPathInfo()); + String token = null; + Cookie[] cookies = null; + try { + cookies = httpServletRequest.getCookies(); + if (cookies != null) { + for (Cookie cookie : cookies) { + if (cookie.getName().contains("Authorization")) { + token = cookie.getValue(); + LOGGER.info("Token from the cookie:" + token); + } + } + } + } catch (Exception e) { + + LOGGER.error("extract token from cookie failed for request " + httpServletRequest.getRequestURI()); + e.printStackTrace(); + } + + if (token == null) { + ResponseWrapper errorResponse = setErrors(httpServletRequest); + ServiceError error = new ServiceError("KER-ATH-401", "Authentication Failed"); + errorResponse.getErrors().add(error); + httpServletResponse.setStatus(HttpStatus.UNAUTHORIZED.value()); + httpServletResponse.setContentType("application/json"); + httpServletResponse.setCharacterEncoding("UTF-8"); + httpServletResponse.getWriter().write(convertObjectToJson(errorResponse)); + LOGGER.error("\n\n Exception : Authorization token not present > " + httpServletRequest.getRequestURL() + + "\n\n"); + return null; + } + Authentication requestAuthentication = new UsernamePasswordAuthenticationToken(token, token); + return getAuthenticationManager().authenticate(requestAuthentication); + + } + + @Override + protected void successfulAuthentication(final HttpServletRequest request, final HttpServletResponse response, + final FilterChain chain, final Authentication authResult) throws IOException, ServletException { + SecurityContextHolder.getContext().setAuthentication(authResult); + chain.doFilter(request, response); + } + + private ResponseWrapper setErrors(HttpServletRequest httpServletRequest) throws IOException { + ResponseWrapper responseWrapper = new ResponseWrapper<>(); + responseWrapper.setResponsetime(LocalDateTime.now(ZoneId.of("UTC"))); + String requestBody = null; + if (httpServletRequest instanceof ContentCachingRequestWrapper) { + requestBody = new String(((ContentCachingRequestWrapper) httpServletRequest).getContentAsByteArray()); + } + if (EmptyCheckUtils.isNullEmpty(requestBody)) { + return responseWrapper; + } + ObjectMapper objectMapper = new ObjectMapper(); + objectMapper.registerModule(new JavaTimeModule()); + JsonNode reqNode = objectMapper.readTree(requestBody); + responseWrapper.setId(reqNode.path("id").asText()); + responseWrapper.setVersion(reqNode.path("version").asText()); + return responseWrapper; + } + + private String convertObjectToJson(Object object) throws JsonProcessingException { + if (object == null) { + return null; + } + ObjectMapper mapper = new ObjectMapper(); + mapper.registerModule(new JavaTimeModule()); + return mapper.writeValueAsString(object); + } +} diff --git a/pre-registration-booking-service/src/main/java/io/mosip/preregistration/booking/security/AuthenticationProvider.java b/pre-registration-booking-service/src/main/java/io/mosip/preregistration/booking/security/AuthenticationProvider.java new file mode 100644 index 00000000000..c78e97b3f6a --- /dev/null +++ b/pre-registration-booking-service/src/main/java/io/mosip/preregistration/booking/security/AuthenticationProvider.java @@ -0,0 +1,120 @@ +package io.mosip.preregistration.booking.security; + +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.authentication.dao.AbstractUserDetailsAuthenticationProvider; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.AuthorityUtils; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Component; +import org.springframework.web.client.RestClientException; +import org.springframework.web.client.RestTemplate; + +import com.fasterxml.jackson.databind.ObjectMapper; + +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.Jws; +import io.jsonwebtoken.JwtException; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.SignatureException; +import io.jsonwebtoken.impl.TextCodec; +import io.mosip.kernel.core.authmanager.authadapter.model.AuthUserDetails; +import io.mosip.kernel.core.authmanager.authadapter.model.MosipUserDto; +import io.mosip.kernel.core.exception.ExceptionUtils; +import io.mosip.kernel.core.exception.ServiceError; +import io.mosip.kernel.core.http.ResponseWrapper; + +@Component +public class AuthenticationProvider extends AbstractUserDetailsAuthenticationProvider { + + private static final Logger LOGGER = LoggerFactory.getLogger(AuthenticationProvider.class); + + @Autowired + private RestTemplate restTemplate; + + @Value("${auth.server.admin.validate.url:http://localhost:8091/v1/authmanager/authorize/admin/validateToken}") + private String adminValidateUrl; + + private byte[] secret = TextCodec.BASE64.decode("Yn2kjibddFAWtnPJ2AFlL8WXmohJMCvigQggaEypa5E="); + + @Autowired + private ObjectMapper objectMapper; + + @Override + protected void additionalAuthenticationChecks(UserDetails userDetails, + UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken) throws AuthenticationException { + } + + @Override + protected UserDetails retrieveUser(String userName, + UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken) throws AuthenticationException { + LOGGER.info("In retriveUser method of AuthenticationProvider class" + usernamePasswordAuthenticationToken); + Object token = usernamePasswordAuthenticationToken.getCredentials(); + LOGGER.info("In retriveUser method of AuthenticationProvider class" + token); + MosipUserDto mosipUserDto = new MosipUserDto(); + + try { + + Jws clamis = Jwts.parser().setSigningKey(secret).parseClaimsJws(token.toString()); + mosipUserDto.setUserId(clamis.getBody().get("userId").toString()); + mosipUserDto.setName(clamis.getBody().get("user_name").toString()); + mosipUserDto.setToken(token.toString()); + mosipUserDto.setRole(clamis.getBody().get("roles").toString()); + LOGGER.info("extracted token details" + mosipUserDto); + + } catch (SignatureException | IllegalArgumentException ex) { + System.out.println(ex.getMessage()); + ResponseEntity response = null; + response = getKeycloakValidatedUserResponse(token.toString()); + System.out.println(response); + List validationErrorsList = ExceptionUtils.getServiceErrorList(response.getBody()); + if (!validationErrorsList.isEmpty()) { + throw new AccessDeniedException(validationErrorsList.toString()); + } + try { + ResponseWrapper responseObject = objectMapper.readValue(response.getBody(), ResponseWrapper.class); + mosipUserDto = objectMapper.readValue(objectMapper.writeValueAsString(responseObject.getResponse()), + MosipUserDto.class); + LOGGER.info("user " + mosipUserDto.getUserId()); + } catch (Exception e) { + throw new AccessDeniedException(String.valueOf(HttpStatus.UNAUTHORIZED.value())); + } + } catch (JwtException e) { + LOGGER.error("exception while parsing the token" + e); + throw new UsernameNotFoundException("Cannot find user with authentication token=" + token); + } + + AuthUserDetails authUserDetails = new AuthUserDetails(mosipUserDto, token.toString()); + List grantedAuthorities = AuthorityUtils + .commaSeparatedStringToAuthorityList(mosipUserDto.getRole()); + authUserDetails.setAuthorities(grantedAuthorities); + return authUserDetails; + } + + private ResponseEntity getKeycloakValidatedUserResponse(String token) { + System.out.println(token); + HttpHeaders headers = new HttpHeaders(); + headers.set(HttpHeaders.COOKIE, "Authorization=" + token); + HttpEntity entity = new HttpEntity<>("parameters", headers); + ResponseEntity response = null; + try { + response = restTemplate.exchange(adminValidateUrl, HttpMethod.GET, entity, String.class); + } catch (RestClientException e) { + throw new AccessDeniedException(e.getMessage()); + } + return response; + } +} diff --git a/pre-registration-booking-service/src/main/java/io/mosip/preregistration/booking/security/SecurityConfiguration.java b/pre-registration-booking-service/src/main/java/io/mosip/preregistration/booking/security/SecurityConfiguration.java new file mode 100644 index 00000000000..90601ba84a1 --- /dev/null +++ b/pre-registration-booking-service/src/main/java/io/mosip/preregistration/booking/security/SecurityConfiguration.java @@ -0,0 +1,72 @@ +package io.mosip.preregistration.booking.security; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.HttpStatus; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.builders.WebSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.security.web.authentication.AnonymousAuthenticationFilter; +import org.springframework.security.web.authentication.HttpStatusEntryPoint; +import org.springframework.security.web.util.matcher.AntPathRequestMatcher; +import org.springframework.security.web.util.matcher.OrRequestMatcher; +import org.springframework.security.web.util.matcher.RequestMatcher; + +@Configuration +@EnableWebSecurity +@EnableGlobalMethodSecurity(prePostEnabled = true) +public class SecurityConfiguration extends WebSecurityConfigurerAdapter { + + private static final RequestMatcher PROTECTED_URLS = new OrRequestMatcher( + new AntPathRequestMatcher("/appointment/**")); + + AuthenticationProvider provider; + + public SecurityConfiguration(final AuthenticationProvider authenticationProvider) { + super(); + this.provider = authenticationProvider; + } + + @Override + protected void configure(final AuthenticationManagerBuilder auth) { + auth.authenticationProvider(provider); + } + + @Override + public void configure(final WebSecurity webSecurity) { + webSecurity.ignoring().antMatchers("/**/assets/**", "/**/icons/**", "/**/screenshots/**", "/favicon**", + "/**/favicon**", "/**/css/**", "/**/js/**", "/**/error**", "/**/webjars/**", "/**/v2/api-docs", + "/**/configuration/ui", "/**/configuration/security", "/**/swagger-resources/**", "/**/swagger-ui.html", + "/**/csrf", "/*/", "**/authenticate/**", "/**/actuator/**", "/**/authmanager/**", "/sendOtp", + "/validateOtp", "/invalidateToken", "/config", "/login", "/logout", "/validateOTP", "/sendOTP", + "/**/login", "/**/login/**", "/**/login-redirect/**", "/**/logout", "/**/h2-console/**", + "/**/**/license/**", "/**/callback/**", "/**/authenticate/**"); + } + + @Override + public void configure(HttpSecurity http) throws Exception { + + http.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and().exceptionHandling().and() + .authenticationProvider(provider) + .addFilterBefore(authenticationFilter(), AnonymousAuthenticationFilter.class).authorizeRequests() + .requestMatchers(PROTECTED_URLS).authenticated().and().csrf().disable().formLogin().disable() + .httpBasic().disable().logout().disable(); + } + + @Bean + AuthenticationFilter authenticationFilter() throws Exception { + final AuthenticationFilter filter = new AuthenticationFilter(PROTECTED_URLS); + filter.setAuthenticationManager(authenticationManager()); + return filter; + } + + @Bean + AuthenticationEntryPoint forbiddenEntryPoint() { + return new HttpStatusEntryPoint(HttpStatus.FORBIDDEN); + } +} diff --git a/pre-registration-booking-service/src/main/java/io/mosip/preregistration/booking/service/BookingService.java b/pre-registration-booking-service/src/main/java/io/mosip/preregistration/booking/service/BookingService.java index 7ce0e31d2cc..263687b9605 100644 --- a/pre-registration-booking-service/src/main/java/io/mosip/preregistration/booking/service/BookingService.java +++ b/pre-registration-booking-service/src/main/java/io/mosip/preregistration/booking/service/BookingService.java @@ -23,7 +23,7 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import io.mosip.kernel.auth.adapter.model.AuthUserDetails; +import io.mosip.kernel.core.authmanager.authadapter.model.AuthUserDetails; import io.mosip.kernel.core.logger.spi.Logger; import io.mosip.preregistration.booking.codes.RequestCodes; import io.mosip.preregistration.booking.dto.AvailabilityDto; diff --git a/pre-registration-booking-service/src/main/java/io/mosip/preregistration/booking/service/util/BookingServiceUtil.java b/pre-registration-booking-service/src/main/java/io/mosip/preregistration/booking/service/util/BookingServiceUtil.java index bb0d0644f8d..9ca40f6b70d 100644 --- a/pre-registration-booking-service/src/main/java/io/mosip/preregistration/booking/service/util/BookingServiceUtil.java +++ b/pre-registration-booking-service/src/main/java/io/mosip/preregistration/booking/service/util/BookingServiceUtil.java @@ -4,9 +4,6 @@ */ package io.mosip.preregistration.booking.service.util; -import java.security.KeyManagementException; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.LocalDate; @@ -23,6 +20,7 @@ import java.util.TimeZone; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpEntity; @@ -42,7 +40,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import io.mosip.kernel.auth.adapter.model.AuthUserDetails; +import io.mosip.kernel.core.authmanager.authadapter.model.AuthUserDetails; import io.mosip.kernel.core.exception.ExceptionUtils; import io.mosip.kernel.core.exception.ServiceError; import io.mosip.kernel.core.logger.spi.Logger; @@ -72,7 +70,6 @@ import io.mosip.preregistration.booking.exception.TimeSpanException; import io.mosip.preregistration.core.code.StatusCodes; import io.mosip.preregistration.core.common.dto.BookingRegistrationDTO; -import io.mosip.preregistration.core.common.dto.DeleteBookingDTO; import io.mosip.preregistration.core.common.dto.MainRequestDTO; import io.mosip.preregistration.core.common.dto.MainResponseDTO; import io.mosip.preregistration.core.common.dto.NotificationDTO; @@ -88,7 +85,6 @@ import io.mosip.preregistration.core.exception.RestCallException; import io.mosip.preregistration.core.util.UUIDGeneratorUtil; import io.mosip.preregistration.core.util.ValidationUtil; -//import io.mosip.preregistration.demographic.service.DemographicServiceIntf; /** * This class provides the utility methods for Booking application. @@ -102,14 +98,9 @@ @Component public class BookingServiceUtil { - /** - * Autowired reference for {@link #restTemplateBuilder} - */ @Autowired - RestTemplate restTemplate; - -// @Autowired -// private DemographicServiceIntf demographicServiceIntf; + //@Qualifier("restTemplate") + private RestTemplate restTemplate; /** * Reference for ${regCenter.url} from property file @@ -201,7 +192,7 @@ public List getRegCenterMasterData() { public boolean updateDemographicStatus(String preId, String status) { log.info("sessionId", "idType", "id", "In callUpdateStatusRestService method of Booking Service Util"); String userId = authUserDetails().getUserId(); - MainResponseDTO updatePreRegistrationStatus = updatePreRegistrationStatus(preId,status); + MainResponseDTO updatePreRegistrationStatus = updatePreRegistrationStatus(preId, status); if (updatePreRegistrationStatus.getErrors() != null) { throw new DemographicStatusUpdationException(updatePreRegistrationStatus.getErrors().get(0).getErrorCode(), updatePreRegistrationStatus.getErrors().get(0).getMessage()); @@ -634,7 +625,7 @@ public boolean isValidRegCenter(String regId) { public MainResponseDTO getApplicationStatus(String preRegId) { MainResponseDTO response = new MainResponseDTO<>(); - String url = preRegResourceUrl + "/applications/status/"+preRegId; + String url = preRegResourceUrl + "/applications/status/" + preRegId; HttpHeaders headers = new HttpHeaders(); HttpEntity entity = new HttpEntity<>(headers); log.info("sessionId", "idType", "id", "In call to demographic rest service :" + url); @@ -646,13 +637,14 @@ public MainResponseDTO getApplicationStatus(String pre if (responseEntity.getBody().getErrors() != null && !responseEntity.getBody().getErrors().isEmpty()) { System.out.println(responseEntity.getBody().getErrors()); response.setErrors(responseEntity.getBody().getErrors()); - }else { + } else { response.setResponse(responseEntity.getBody().getResponse()); } - + log.info("sessionId", "idType", "id", "In call to demographic rest service :" + url); } catch (Exception ex) { - log.debug("sessionId", "idType", "id", "demographic rest call exception " + ExceptionUtils.getStackTrace(ex)); + log.debug("sessionId", "idType", "id", + "demographic rest call exception " + ExceptionUtils.getStackTrace(ex)); throw new RestClientException("rest call failed"); } return response; @@ -660,7 +652,7 @@ public MainResponseDTO getApplicationStatus(String pre public MainResponseDTO updatePreRegistrationStatus(String preRegId, String status) { MainResponseDTO response = new MainResponseDTO<>(); - String url = preRegResourceUrl + "/applications/status/"+preRegId; + String url = preRegResourceUrl + "/applications/status/" + preRegId; MultiValueMap paramStatus = new LinkedMultiValueMap<>(); paramStatus.add("statusCode", status); HttpHeaders headers = new HttpHeaders(); @@ -672,14 +664,15 @@ public MainResponseDTO updatePreRegistrationStatus(String preRegId, Stri new ParameterizedTypeReference>() { }); if (responseEntity.getBody().getErrors() != null && !responseEntity.getBody().getErrors().isEmpty()) { - response.setErrors(responseEntity.getBody().getErrors()); - }else { + response.setErrors(responseEntity.getBody().getErrors()); + } else { response.setResponse(responseEntity.getBody().getResponse()); } - + log.info("sessionId", "idType", "id", "In call to demographic rest service :" + url); } catch (Exception ex) { - log.debug("sessionId", "idType", "id", "demographic rest call exception " + ExceptionUtils.getStackTrace(ex)); + log.debug("sessionId", "idType", "id", + "demographic rest call exception " + ExceptionUtils.getStackTrace(ex)); throw new RestClientException("rest call failed"); } return response; diff --git a/pre-registration-booking-service/src/main/resources/bootstrap.properties b/pre-registration-booking-service/src/main/resources/bootstrap.properties index 992d4db8ed7..affb37b400e 100644 --- a/pre-registration-booking-service/src/main/resources/bootstrap.properties +++ b/pre-registration-booking-service/src/main/resources/bootstrap.properties @@ -16,387 +16,10 @@ health.config.enabled=false mosip.preregistration.booking.id.book=mosip.pre-registration.booking.book mosip.id.preregistration.booking.book=mosip.pre-registration.booking.book -#spring.application.name=pre-registration-application-service -#spring.profiles.active=local -#management.endpoint.health.show-details=always -#management.endpoints.web.exposure.include=info,health,refresh -# -#server.servlet.context-path=/preregistration/v1 -# -#server.port=9092 - #disabling health check so that client doesnt try to load properties from sprint config server every # 5 minutes (should not be done in production) health.config.enabled=false - -mosip.id.preregistration.demographic.create=mosip.pre-registration.demographic.create -mosip.preregistration.demographic.id.update=mosip.pre-registration.demographic.update -mosip.preregistration.demographic.id.retrieve.date=mosip.pre-registration.demographic.retrieve.date - -appId: prereg -mosip.base.url=https://qa.mosip.net -application.id: pre-registration -appointmentResourse.url: ${mosip.base.url}/preregistration/v1 -audit.service.contextpath: auditmanager -audit.service.env: http://kernel-auditmanager-service -audit.url: ${mosip.base.url}/v1/auditmanager/audits -auth-token-generator.rest.issuerUrl:${mosip.base.url}/keycloak/auth/realms/mosip -auth.server.admin.validate.url:${mosip.base.url}/v1/authmanager/authorize/admin/validateToken -auth.server.validate.url: ${mosip.base.url}/v1/authmanager/authorize/admin/validateToken -batch.appointment.cancel: ${mosip.base.url}/preregistration/v1 -batch.resource.url: ${mosip.base.url}/preregistration/v1/batch -batch.service.contextpath: preregistration/v1/batch -batch.service.env: ${mosip.base.url} -batch.service.version: v1 -booking.resource.url: ${mosip.base.url}/preregistration/v1 -booking.service.contextpath: preregistration/v1 -booking.service.env: ${mosip.base.url} -booking.service.version: v1 -bookingAvailablity.url: ${mosip.base.url}/preregistration/v1/appointment/availability/sync -cancel.appoinment.template: cancel-appointment -clientId: mosip-prereg-client -context: auth-otp -crypto.service.contextpath: keymanager -crypto.service.env: ${mosip.base.url} -cryptoResource.url:${mosip.base.url}/v1/keymanager -demographic.resource.url: ${mosip.base.url}/preregistration/v1 -demographic.service.contextpath: preregistration/v1 -demographic.service.env: ${mosip.base.url} -demographic.service.version: v1 -document.resource.url: ${mosip.base.url}/preregistration/v1 -document.service.contextpath: preregistration/v1 -document.service.env: ${mosip.base.url} -document.service.version: v1 -email.acknowledgement.subject.template: Acknowledgement-email-subject -email.acknowledgement.template: Email-Acknowledgement -email.service.contextpath: notifier -email.service.env: ${mosip.base.url} -emailResourse.url: ${mosip.base.url}/v1/notifier/email/send -expiredStatus.url: ${mosip.base.url}/preregistration/v1/batch/expiredStatus -global.config.file: application.properties -google.recaptcha.secret.key: 6LckJrsZAAAAALvljaAYG767llIAPdVFwRTeD_bQ -google.recaptcha.site.key: 6LckJrsZAAAAANEZDeHcKteBRT2iMKE42ou4idGG -google.recaptcha.verify.url: https://www.google.com/recaptcha/api/siteverify -hibernate.dialect: org.hibernate.dialect.PostgreSQLDialect -hibernate.hbm2ddl.auto: none -hibernate.jdbc.lob.non_contextual_creation: true -hibernate.show_sql: false -holiday.exceptional.url: ${mosip.base.url}/v1/masterdata/exceptionalholidays -holiday.url: ${mosip.base.url}/v1/masterdata/getregistrationcenterholidays/ -javax.persistence.jdbc.driver: org.postgresql.Driver -javax.persistence.jdbc.password: postgres -javax.persistence.jdbc.url=jdbc:postgresql://qa.mosip.net:30090/mosip_prereg?useSSL=false -javax.persistence.jdbc.user: postgres -kernel.auth.contextpath: authmanager -kernel.auth.env: ${mosip.base.url} -kernel.prid.contextpath: pridgenerator -kernel.prid.env: ${mosip.base.url} -kernel.syncdata.env: ${mosip.base.url} -kernel.syncdata.version: v1/syncdata -latestidschema.service.contextpath: latestidschema -logging.level.com.zaxxer.hikari: DEBUG -logging.level.org.apache.hadoop: warn -logging.level.org.springframework.web.filter.CommonsRequestLoggingFilter: INFO -management.endpoint.metrics.enabled: true -management.endpoint.prometheus.enabled: true -management.endpoints.web.exposure.include: * -management.metrics.export.prometheus.enabled: true -masterdata.resource.url: ${mosip.base.url}/v1/masterdata -masterdata.service.contextpath: masterdata -masterdata.service.env: ${mosip.base.url} -masterdata.service.version: v1 -max.file.size: 2 -mosip.adult.age: 5 -mosip.batch.token.authmanager.appId: prereg -mosip.batch.token.authmanager.password: abc123 -mosip.batch.token.authmanager.url: ${mosip.base.url}/v1/authmanager/authenticate/clientidsecretkey -mosip.batch.token.authmanager.userName: mosip-prereg-client -mosip.batch.token.request.id: -mosip.country.code: MOR -mosip.database.ip: postgres -mosip.database.port: 80 -mosip.default.dob.day: 01 -mosip.default.dob.month: 01 -mosip.face.provider: io.mosip.kernel.bioapi.impl.BioApiImpl -mosip.facequalitythreshold: 0 -mosip.fingerprint.provider: io.mosip.kernel.bioapi.impl.BioApiImpl -mosip.id.preregistration.datasync.fetch: mosip.pre-registration.datasync.fetch -mosip.id.preregistration.datasync.fetch.ids: mosip.pre-registration.datasync.fetch.ids -mosip.id.preregistration.datasync.store: mosip.pre-registration.datasync.store -mosip.id.validation.identity.[*].[*].language: ^[(?i)a-z]{3}$ -mosip.id.validation.identity.addressLine1.[*].value: ^(?=.{0,50}$).* -mosip.id.validation.identity.addressLine2.[*].value: ^(?=.{0,50}$).* -mosip.id.validation.identity.addressLine3.[*].value: ^(?=.{0,50}$).* -mosip.id.validation.identity.age: ^(150|1[0-4][0-9]|[1-9]?[0-9])$ -mosip.id.validation.identity.city.[*].value: ^(?=.{0,50}$).* -mosip.id.validation.identity.dateOfBirth: ^(1869|18[7-9][0-9]|19\d\d|20\d\d)/([0][1-9]|1[0-2])/([0][1-9]|[1-2]\d|3[01])$ +#mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter +mosip.id.validation.identity.phone=^([6-9]{1})([0-9]{9})$ mosip.id.validation.identity.email: ^[\w-\+]+(\.[\w]+)*@[\w-]+(\.[\w]+)*(\.[a-zA-Z]{2,})$ -mosip.id.validation.identity.fullName.[*].value: ^(?=.{0,50}$).* -mosip.id.validation.identity.phone: ^([6-9]{1})([0-9]{9})$ -mosip.id.validation.identity.postalCode: ^[(?i)A-Z0-9]{5}$|^NA$ -mosip.id.validation.identity.province.[*].value: ^(?=.{0,50}$).* -mosip.id.validation.identity.referenceIdentityNumber: ^([0-9]{10,30})$ -mosip.id.validation.identity.region.[*].value: ^(?=.{0,50}$).* -mosip.ida.app-id: IDA -mosip.ida.ref-id: INTERNAL -mosip.idrepo.app-id: ID_REPO -mosip.idrepo.identity.uin-status: ACTIVATED,BLOCKED,DEACTIVATED -mosip.idrepo.identity.uin-status.registered: ACTIVATED -mosip.idschema.version: 0.1 -mosip.io.prid.url: http://kernel-pridgenerator-service/v1/pridgenerator/prid -mosip.iris.provider: io.mosip.kernel.bioapi.impl.BioApiImpl -mosip.iris_threshold: 0 -mosip.kernel.applicant.type.age.limit: 5 -mosip.kernel.auth.adapter.ssl-bypass: true -mosip.kernel.auth.appid-realm-map: {prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip'} -mosip.kernel.auth.proxy-email: true -mosip.kernel.auth.proxy-otp: true -mosip.kernel.crypto.asymmetric-algorithm-name: RSA/ECB/OAEPWITHSHA-256ANDMGF1PADDING -mosip.kernel.crypto.gcm-tag-length: 128 -mosip.kernel.crypto.hash-algorithm-name: PBKDF2WithHmacSHA512 -mosip.kernel.crypto.hash-iteration: 100000 -mosip.kernel.crypto.hash-symmetric-key-length: 256 -mosip.kernel.crypto.sign-algorithm-name: RS256 -mosip.kernel.crypto.symmetric-algorithm-name: AES/GCM/PKCS5Padding -mosip.kernel.cryptomanager.request_id: CRYPTOMANAGER.REQUEST -mosip.kernel.cryptomanager.request_version: v1.0 -mosip.kernel.data-key-splitter: #KEY_SPLITTER# -mosip.kernel.filtervalue.max_columns: 20 -mosip.kernel.fsadapter.hdfs.authentication-enabled: false -mosip.kernel.fsadapter.hdfs.kdc-domain: HDFSKERBEROS1.SOUTHINDIA.CLOUDAPP.AZURE.COM -mosip.kernel.fsadapter.hdfs.keytab-file: classpath:mosip.keytab -mosip.kernel.fsadapter.hdfs.name-node-url:hdfs://13.71.115.204:51000 -mosip.kernel.fsadapter.hdfs.user-name: prereg -mosip.kernel.idobjectvalidator.file-storage-uri: ${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/ -mosip.kernel.idobjectvalidator.mandatory-attributes.id-repository.new-registration: IDSchemaVersion,UIN,fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone -mosip.kernel.idobjectvalidator.mandatory-attributes.id-repository.update-uin: IDSchemaVersion,UIN -mosip.kernel.idobjectvalidator.mandatory-attributes.pre-registration.child-registration: IDSchemaVersion,UIN,fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber -mosip.kernel.idobjectvalidator.mandatory-attributes.pre-registration.new-registration: IDSchemaVersion,UIN,fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber -mosip.kernel.idobjectvalidator.mandatory-attributes.reg-client.child-registration: IDSchemaVersion,UIN,fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber,parentOrGuardianName,parentOrGuardianRID|parentOrGuardianUIN,parentOrGuardianBiometrics -mosip.kernel.idobjectvalidator.mandatory-attributes.reg-client.new-registration: IDSchemaVersion,UIN,fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber -mosip.kernel.idobjectvalidator.mandatory-attributes.reg-processor.child-registration: IDSchemaVersion,UIN,fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber,parentOrGuardianName,parentOrGuardianRID|parentOrGuardianUIN,parentOrGuardianBiometrics -mosip.kernel.idobjectvalidator.mandatory-attributes.reg-processor.lost: IDSchemaVersion -mosip.kernel.idobjectvalidator.mandatory-attributes.reg-processor.new-registration: IDSchemaVersion,UIN,fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber -mosip.kernel.idobjectvalidator.mandatory-attributes.reg-processor.other: IDSchemaVersion,UIN -mosip.kernel.idobjectvalidator.masterdata.documentcategories.lang.rest.uri: ${mosip.base.url}/v1/masterdata/documentcategories/{langcode} -mosip.kernel.idobjectvalidator.masterdata.documentcategories.rest.uri:${mosip.base.url}/v1/masterdata/documentcategories -mosip.kernel.idobjectvalidator.masterdata.documenttypes.rest.uri: ${mosip.base.url}/v1/masterdata/documenttypes/{documentcategorycode}/{langcode} -mosip.kernel.idobjectvalidator.masterdata.gendertypes.rest.uri: ${mosip.base.url}/v1/masterdata/gendertypes -mosip.kernel.idobjectvalidator.masterdata.individualtypes.rest.uri: ${mosip.base.url}/v1/masterdata/individualtypes -mosip.kernel.idobjectvalidator.masterdata.languages.rest.uri: ${mosip.base.url}/v1/masterdata/languages -mosip.kernel.idobjectvalidator.masterdata.locationhierarchy.rest.uri: ${mosip.base.url}/v1/masterdata/locations/locationhierarchy/{hierarchyname} -mosip.kernel.idobjectvalidator.masterdata.locations.locationNotAvailable: NA -mosip.kernel.idobjectvalidator.masterdata.locations.rest.uri: ${mosip.base.url}/v1/masterdata/locations/{langcode} -mosip.kernel.idobjectvalidator.property-source: APPLICATION_CONTEXT -mosip.kernel.idobjectvalidator.referenceValidator: io.mosip.kernel.idobjectvalidator.impl.IdObjectReferenceValidator -mosip.kernel.idobjectvalidator.schema-name: mosip-identity-json-schema.json -mosip.kernel.keygenerator.asymmetric-algorithm-name: RSA -mosip.kernel.keygenerator.asymmetric-key-length: 2048 -mosip.kernel.keygenerator.symmetric-algorithm-name: AES -mosip.kernel.keygenerator.symmetric-key-length: 256 -mosip.kernel.keymanager-service-auth-decrypt-url: ${mosip.base.url}/v1/keymanager/auth/decrypt -mosip.kernel.keymanager-service-decrypt-url: ${mosip.base.url}/v1/keymanager/decrypt -mosip.kernel.keymanager-service-publickey-url: ${mosip.base.url}/v1/keymanager/publickey/{applicationId} -mosip.kernel.keymanager-service-sign-url: ${mosip.base.url}/v1/keymanager/sign -mosip.kernel.keymanager-service-validate-url: ${mosip.base.url}/v1/keymanager/validate -mosip.kernel.licensekey.length: 16 -mosip.kernel.licensekey.permissions: OTP Trigger,OTP Authentication,Demo Authentication - Identity Data Match,Demo Authentication - Address Data Match,Demo Authentication - Full Address Data Match,Demo Authentication - Secondary Language Match,Biometric Authentication - FMR Data Match,Biometric Authentication - IIR Data Match,Biometric Authentication - FID Data Match,Static Pin Authentication,eKYC - limited,eKYC - Full,eKYC - No -mosip.kernel.machineid.length: 5 -mosip.kernel.masterdata.validdoc.rest.uri: ${mosip.base.url}/v1/masterdata/validdocuments/{langcode} -mosip.kernel.otp.default-length: 6 -mosip.kernel.otp.expiry-time: 180 -mosip.kernel.otp.key-freeze-time: 1800 -mosip.kernel.otp.mac-algorithm: HmacSHA512 -mosip.kernel.otp.max-key-length: 64 -mosip.kernel.otp.min-key-length: 3 -mosip.kernel.otp.validation-attempt-threshold: 10 -mosip.kernel.partnerid.length: 4 -mosip.kernel.pdf_owner_password: Mosip@dev123 -mosip.kernel.pin.length: 6 -mosip.kernel.prid.length: 14 -mosip.kernel.prid.not-start-with: 0,1 -mosip.kernel.prid.repeating-block-limit: 3 -mosip.kernel.prid.repeating-limit: 2 -mosip.kernel.prid.restricted-numbers: 786,666 -mosip.kernel.prid.sequence-limit: 3 -mosip.kernel.registrationcenterid.length: 5 -mosip.kernel.rid.length: 29 -mosip.kernel.rid.sequence-length: 5 -mosip.kernel.rid.timestamp-length: 14 -mosip.kernel.salt-generator.chunk-size: 10 -mosip.kernel.salt-generator.end-sequence: 999 -mosip.kernel.salt-generator.start-sequence: 0 -mosip.kernel.signature.signature-request-id: SIGNATURE.REQUEST -mosip.kernel.signature.signature-version-id: v1.0 -mosip.kernel.sms.proxy-sms: true -mosip.kernel.syncdata-service-dynamicfield-url: ${mosip.base.url}/v1/masterdata/dynamicfields -mosip.kernel.syncdata-service-idschema-url: ${mosip.base.url}/v1/masterdata/idschema/latest -mosip.kernel.tokenid.length: 36 -mosip.kernel.tokenid.sequence-limit: 3 -mosip.kernel.transliteration.arabic-language-code: ara -mosip.kernel.transliteration.franch-language-code: fra -mosip.kernel.tspid.length: 4 -mosip.kernel.uin.length: 10 -mosip.kernel.uin.length.conjugative-even-digits-limit: 3 -mosip.kernel.uin.length.digits-limit: 5 -mosip.kernel.uin.length.repeating-block-limit: 2 -mosip.kernel.uin.length.repeating-limit: 2 -mosip.kernel.uin.length.reverse-digits-limit: 5 -mosip.kernel.uin.length.sequence-limit: 3 -mosip.kernel.uin.min-unused-threshold: 200000 -mosip.kernel.uin.not-start-with: 0,1 -mosip.kernel.uin.restricted-numbers: 786,666 -mosip.kernel.uin.uins-to-generate: 500000 -mosip.kernel.vid.length: 16 -mosip.kernel.vid.length.repeating-block-limit: 2 -mosip.kernel.vid.length.repeating-limit: 2 -mosip.kernel.vid.length.sequence-limit: 3 -mosip.kernel.vid.not-start-with: 0,1 -mosip.kernel.vid.restricted-numbers: 786,666 -mosip.kernel.virus-scanner.host: clamav -mosip.kernel.virus-scanner.port: 80 -mosip.kernel.xsdfile: mosip-cbeff.xsd -mosip.kernel.xsdstorage-uri: ${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/ -mosip.keycloak.base-url: ${mosip.base.url} -mosip.keycloak.issuerUrl: ${mosip.base.url}/keycloak/auth/realms/mosip -mosip.keymanager.base.url: ${mosip.base.url} -mosip.left_to_right_orientation: eng,fra -mosip.leftslap_fingerprint_threshold: 0 -mosip.login.mode: email,mobile -mosip.masterdata.base.url: ${mosip.base.url} -mosip.min-digit-longitude-latitude: 4 -mosip.notification.language-type: BOTH -mosip.notificationtype: SMS|EMAIL -mosip.pre-registration.notification.id: mosip.pre-registration.notification.notify -mosip.pre-registration.notification.id.send: mosip.pre-registration.notification.notify -mosip.pre-registration.qrcode.generate.id: mosip.pre-registration.qrcode.generate -mosip.pre-registration.qrcode.id.generate: mosip.pre-registration.qrcode.generate -mosip.pre-registration.qrcode.service.version: 1.0 -mosip.pre-registration.transliteration.transliterate.id: mosip.pre-registration.transliteration.transliterate -mosip.pregistration.pagesize: 20 -mosip.prereg.app-id: PRE_REGISTRATION -mosip.preregistration.auto.logout.idle: 180 -mosip.preregistration.auto.logout.ping: 30 -mosip.preregistration.auto.logout.timeout: 60 -mosip.preregistration.batchjob.service.consumed.id: mosip.pre-registration.batchjob.service.consumed -mosip.preregistration.batchjob.service.expired.id: mosip.pre-registration.batchjob.service.expired -mosip.preregistration.booking.availability.check.id: mosip.preregistration.booking.availability.check -mosip.preregistration.booking.availability.increase.id: mosip.preregistration.booking.availability.increase -mosip.preregistration.booking.availability.sync.id: mosip.pre-registration.appointment.availability.sync -mosip.preregistration.booking.book.id: mosip.pre-registration.booking.book -mosip.preregistration.booking.cancel.id: mosip.pre-registration.appointment.cancel -mosip.preregistration.booking.delete.id: mosip.preregistration.booking.delete -mosip.preregistration.booking.delete.old.id: mosip.preregistration.booking.delete.old -mosip.preregistration.booking.exception.id: mosip.preregistration.booking.parse.exception -mosip.preregistration.booking.fetch.availability.id: mosip.pre-registration.appointment.availability -mosip.preregistration.booking.fetch.booking.id: mosip.pre-registration.appointment.fetch -mosip.preregistration.booking.fetchPreidByDate.id: mosip.pre-registration.appointment.ids -mosip.preregistration.booking.id.book: mosip.pre-registration.booking.book -mosip.preregistration.captcha.id.validate: mosip.pre-registration.captcha.id.validate -mosip.preregistration.config.id: mosip.pre-registration.login.config -mosip.preregistration.demographic.create.id: mosip.pre-registration.demographic.create -mosip.preregistration.demographic.delete.id: mosip.pre-registration.demographic.delete -mosip.preregistration.demographic.id.create: mosip.pre-registration.demographic.create -mosip.preregistration.demographic.id.retrieve.date: mosip.pre-registration.demographic.retrieve.date -mosip.preregistration.demographic.id.update: mosip.pre-registration.demographic.update -mosip.preregistration.demographic.retrieve.basic.id: mosip.pre-registration.demographic.retrieve.basic -mosip.preregistration.demographic.retrieve.date.id: mosip.pre-registration.demographic.retrieve.date -mosip.preregistration.demographic.retrieve.details.id: mosip.pre-registration.demographic.retrieve.details -mosip.preregistration.demographic.retrieve.status.id: mosip.pre-registration.demographic.retrieve.status -mosip.preregistration.demographic.update.id: mosip.pre-registration.demographic.update -mosip.preregistration.demographic.update.status.id: mosip.pre-registration.demographic.status.update -mosip.preregistration.document.copy.id: mosip.pre-registration.document.copy -mosip.preregistration.document.delete.id: mosip.pre-registration.document.delete -mosip.preregistration.document.delete.specific.id: mosip.pre-registration.document.delete.specific -mosip.preregistration.document.fetch.content.id: mosip.pre-registration.document.fetch.content -mosip.preregistration.document.fetch.metadata.id: mosip.pre-registration.document.fetch.metadata -mosip.preregistration.document.id.upload: mosip.pre-registration.document.upload -mosip.preregistration.document.scan: true -mosip.preregistration.document.upload.id: mosip.pre-registration.document.upload -mosip.preregistration.id-schema: ${mosip.base.url}/v1/syncdata/latestidschema -mosip.preregistration.invalidatetoken.id: mosip.pre-registration.login.invalidate -mosip.preregistration.login.id.config: mosip.pre-registration.login.config -mosip.preregistration.login.id.invalidatetoken: mosip.pre-registration.login.invalidate -mosip.preregistration.login.id.sendotp: mosip.pre-registration.login.sendotp -mosip.preregistration.login.id.validateotp: mosip.pre-registration.login.useridotp -mosip.preregistration.login.service.version: 1.0 -mosip.preregistration.sendotp.id: mosip.pre-registration.login.sendotp -mosip.preregistration.validateotp.id: mosip.pre-registration.login.useridotp -mosip.primary-language: eng -mosip.reg.app-id: REGISTRATION -mosip.registration.gps_device_enable_flag: n -mosip.registration.processor.notification.types: EMAIL -mosip.regproc.app-id: REGISTRATION_PROCESSOR -mosip.right_to_left_orientation: ara -mosip.rightslap_fingerprint_threshold: 0 -mosip.secondary-language: ara -mosip.security.cors-enable: false -mosip.security.csrf-enable: false -mosip.security.origins: localhost:8080,localhost:4200 -mosip.security.secure-cookie: false -mosip.sign.applicationid: KERNEL -mosip.sign.header: response-signature -mosip.sign.refid: SIGN -mosip.signed.response.header: response-signature -mosip.supported-languages: eng,ara,fra -mosip.thumbs_fingerprint_threshold: 0 -mosip.uin.alias: -mosip.utc-datetime-pattern: yyyy-MM-dd'T'HH:mm:ss.SSS'Z' -notification.service.contextpath: preregistration/v1 -notification.service.env: http://prereg-notification-service -notification.service.version: v1 -notification.url:${mosip.base.url}/v1/preregistration/v1/notification -otpChannel.email: email -otpChannel.mobile: phone -poa.url: proofOfAddress -pod.url: proofOfDateOfBirth -poi.url: proofOfIdentity -por.url: proofOfRelationship -pre.reg.config.file: pre-registration-${spring.profiles.active}.properties -preregistartion.config.identityjson: pre-registration-identity-mapping.json -preregistartion.demographicDetails: demographicDetails -preregistartion.identity: identity -preregistartion.identity.email: email -preregistartion.identity.fullName: fullName -preregistartion.identity.phone: phone -preregistartion.response: response -preregistration.availability.noOfDays: 140 -preregistration.availability.sync: 37 -preregistration.booking.offset: 2 -preregistration.country.specific.zoneId: GMT+05:30 -preregistration.demographic.idschema-json-filename: pre-registration-demographic.json -preregistration.document.extention: PDF,JPEG,PNG,JPG -preregistration.documentupload.allowed.file.nameLength: 50 -preregistration.documentupload.allowed.file.size: 2000000 -preregistration.documentupload.allowed.file.type: application/pdf,image/jpeg,image/png,image/jpg -preregistration.job.schedule.cron.consumedStatusJob: 0 0 0 * * ? -preregistration.job.schedule.cron.expiredStatusJob: 0 0 0 * * ? -preregistration.job.schedule.cron.slotavailability: 0 0 0 * * ? -preregistration.nearby.centers: 2000 -preregistration.preid.regex: [0-9]+ -preregistration.recommended.centers.locCode: 5 -preregistration.timespan.cancel: 24 -preregistration.timespan.rebook: 24 -preregistration.workflow.booking: true/false -preregistration.workflow.demographic: true/false -preregistration.workflow.documentupload: true/false -qrversion: V1 -regCenter.url: ${mosip.base.url}/v1/masterdata/registrationcenters -resource.template.url: ${mosip.base.url}/v1/masterdata/templates -secretKey: abc123 -sendOtp.resource.url: ${mosip.base.url}/v1/authmanager -server.max-http-header-size: 10000000 -sms.acknowledgement.template: SMS-Acknowledgement -sms.service.contextpath: notifier -sms.service.env: ${mosip.base.url} -smsResourse.url: ${mosip.base.url}/v1/notifier/sms/send -spring.batch.tablePrefix: PREREG.BATCH_ -spring.servlet.multipart.max-file-size: -1 -spring.servlet.multipart.max-request-size: -1 -timeZone: Asia/Calcutta -ui.config.params: preregistration.availability.sync,preregistration.availability.noOfDays,mosip.supported-languages,mosip.primary-language,mosip.secondary-language,mosip.id.validation.identity.email,mosip.id.validation.identity.postalCode,mosip.id.validation.identity.phone,mosip.id.validation.identity.dateOfBirth,mosip.id.validation.identity.referenceIdentityNumber,mosip.default.dob.month,mosip.default.dob.day,mosip.kernel.otp.expiry-time,mosip.kernel.otp.validation-attempt-threshold,mosip.kernel.otp.default-length,mosip.kernel.sms.number.length,mosip.kernel.pin.length,preregistration.max.file.size,preregistration.recommended.centers.locCode,preregistration.nearby.centers,mosip.login.mode,preregistration.workflow.demographic,preregistration.workflow.documentupload,preregistration.workflow.booking,preregistration.auto.logout,preregistration.timespan.cancel,preregistration.timespan.rebook,preregistration.booking.offset,mosip.right_to_left_orientation,mosip.left_to_right_orientation,mosip.id.validation.identity.age,mosip.id.validation.identity.fullName.[*].value,mosip.id.validation.identity.addressLine1.[*].value,preregistration.documentupload.allowed.file.type,preregistration.documentupload.allowed.file.nameLength,preregistration.documentupload.allowed.file.size,mosip.preregistration.auto.logout.idle,mosip.preregistration.auto.logout.timeout,mosip.preregistration.auto.logout.ping,mosip.country.code,mosip.notificationtype,mosip.kernel.idobjectvalidator.masterdata.locations.locationNotAvailable,google.recaptcha.site.key,mosip.adult.age,mosip.idschema.version -updateConsumedStatus.url: http://prereg-batchjob-service/preregistration/v1/batch/consumedStatus -userIdType: USERID -validationStatus: success -version: 1.0 -working.day.url: ${mosip.base.url}/v1/masterdata/workingdays \ No newline at end of file + diff --git a/pre-registration-booking-service/src/main/resources/logback.xml b/pre-registration-booking-service/src/main/resources/logback.xml new file mode 100644 index 00000000000..b9dfc23e616 --- /dev/null +++ b/pre-registration-booking-service/src/main/resources/logback.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/pre-registration-booking-service/src/test/java/io/mosip/preregistration/booking/test/config/TestSecurityConfig.java b/pre-registration-booking-service/src/test/java/io/mosip/preregistration/booking/test/config/TestSecurityConfig.java index 46d98ff9bd0..5058fd3913f 100644 --- a/pre-registration-booking-service/src/test/java/io/mosip/preregistration/booking/test/config/TestSecurityConfig.java +++ b/pre-registration-booking-service/src/test/java/io/mosip/preregistration/booking/test/config/TestSecurityConfig.java @@ -1,82 +1,83 @@ -package io.mosip.preregistration.booking.test.config; +// package io.mosip.preregistration.booking.test.config; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +// import java.util.ArrayList; +// import java.util.Arrays; +// import java.util.List; -import javax.servlet.http.HttpServletResponse; +// import javax.servlet.http.HttpServletResponse; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.builders.WebSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.config.http.SessionCreationPolicy; -import org.springframework.security.core.authority.SimpleGrantedAuthority; -import org.springframework.security.core.userdetails.User; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.provisioning.InMemoryUserDetailsManager; -import org.springframework.security.web.AuthenticationEntryPoint; -import org.springframework.security.web.firewall.DefaultHttpFirewall; -import org.springframework.security.web.firewall.HttpFirewall; +// import org.springframework.context.annotation.Bean; +// import org.springframework.context.annotation.Configuration; +// import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +// import org.springframework.security.config.annotation.web.builders.HttpSecurity; +// import org.springframework.security.config.annotation.web.builders.WebSecurity; +// import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +// import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +// import org.springframework.security.config.http.SessionCreationPolicy; +// import org.springframework.security.core.authority.SimpleGrantedAuthority; +// import org.springframework.security.core.userdetails.User; +// import org.springframework.security.core.userdetails.UserDetails; +// import org.springframework.security.core.userdetails.UserDetailsService; +// import org.springframework.security.provisioning.InMemoryUserDetailsManager; +// import org.springframework.security.web.AuthenticationEntryPoint; +// import org.springframework.security.web.firewall.DefaultHttpFirewall; +// import org.springframework.security.web.firewall.HttpFirewall; -@Configuration -@EnableWebSecurity -@EnableGlobalMethodSecurity(prePostEnabled = true) -public class TestSecurityConfig extends WebSecurityConfigurerAdapter { +// @Configuration +// @EnableWebSecurity +// @EnableGlobalMethodSecurity(prePostEnabled = true) +// @Order(2) +// public class TestSecurityConfig extends WebSecurityConfigurerAdapter { - @Bean - public HttpFirewall defaultHttpFirewall() { - return new DefaultHttpFirewall(); - } +// @Bean +// public HttpFirewall defaultHttpFirewall() { +// return new DefaultHttpFirewall(); +// } - @Override - public void configure(WebSecurity webSecurity) throws Exception { - webSecurity.ignoring().antMatchers(allowedEndPoints()); - super.configure(webSecurity); - webSecurity.httpFirewall(defaultHttpFirewall()); - } +// @Override +// public void configure(WebSecurity webSecurity) throws Exception { +// webSecurity.ignoring().antMatchers(allowedEndPoints()); +// super.configure(webSecurity); +// webSecurity.httpFirewall(defaultHttpFirewall()); +// } - private String[] allowedEndPoints() { - return new String[] { "/assets/**", "/icons/**", "/screenshots/**", "/favicon**", "/**/favicon**", "/css/**", - "/js/**", "/*/error**", "/*/webjars/**", "/*/v2/api-docs", "/*/configuration/ui", - "/*/configuration/security", "/*/swagger-resources/**", "/*/swagger-ui.html" }; - } +// private String[] allowedEndPoints() { +// return new String[] { "/assets/**", "/icons/**", "/screenshots/**", "/favicon**", "/**/favicon**", "/css/**", +// "/js/**", "/*/error**", "/*/webjars/**", "/*/v2/api-docs", "/*/configuration/ui", +// "/*/configuration/security", "/*/swagger-resources/**", "/*/swagger-ui.html" }; +// } - @Override - protected void configure(final HttpSecurity httpSecurity) throws Exception { - httpSecurity.csrf().disable(); - httpSecurity.httpBasic().and().authorizeRequests().anyRequest().authenticated().and().sessionManagement() - .sessionCreationPolicy(SessionCreationPolicy.STATELESS).and().exceptionHandling() - .authenticationEntryPoint(unauthorizedEntryPoint()); - } +// @Override +// protected void configure(final HttpSecurity httpSecurity) throws Exception { +// httpSecurity.csrf().disable(); +// httpSecurity.httpBasic().and().authorizeRequests().anyRequest().authenticated().and().sessionManagement() +// .sessionCreationPolicy(SessionCreationPolicy.STATELESS).and().exceptionHandling() +// .authenticationEntryPoint(unauthorizedEntryPoint()); +// } - @Bean - public AuthenticationEntryPoint unauthorizedEntryPoint() { - return (request, response, authException) -> response.sendError(HttpServletResponse.SC_UNAUTHORIZED); - } +// @Bean +// public AuthenticationEntryPoint unauthorizedEntryPoint() { +// return (request, response, authException) -> response.sendError(HttpServletResponse.SC_UNAUTHORIZED); +// } - @Bean - public UserDetailsService userDetailsService() { - List users = new ArrayList<>(); - users.add(new User("reg-officer", "mosip", - Arrays.asList(new SimpleGrantedAuthority("ROLE_REGISTRATION_OFFICER")))); - users.add(new User("reg-supervisor", "mosip", - Arrays.asList(new SimpleGrantedAuthority("ROLE_REGISTRATION_SUPERVISOR")))); - users.add(new User("reg-admin", "mosip", Arrays.asList(new SimpleGrantedAuthority("ROLE_REGISTRATION_ADMIN")))); - users.add(new User("reg-processor", "mosip", - Arrays.asList(new SimpleGrantedAuthority("ROLE_REGISTRATION_PROCESSOR")))); - users.add(new User("id-auth", "mosip", Arrays.asList(new SimpleGrantedAuthority("ROLE_ID_AUTHENTICATION")))); - users.add(new User("individual", "mosip", Arrays.asList(new SimpleGrantedAuthority("ROLE_INDIVIDUAL")))); - users.add(new User("test", "mosip", Arrays.asList(new SimpleGrantedAuthority("ROLE_TEST")))); - users.add(new User("PRE_REGISTRATION_ADMIN", "mosip", Arrays.asList(new SimpleGrantedAuthority("ROLE_PRE_REGISTRATION_ADMIN")))); - return new InMemoryUserDetailsManager(users); - } +// @Bean +// public UserDetailsService userDetailsService() { +// List users = new ArrayList<>(); +// users.add(new User("reg-officer", "mosip", +// Arrays.asList(new SimpleGrantedAuthority("ROLE_REGISTRATION_OFFICER")))); +// users.add(new User("reg-supervisor", "mosip", +// Arrays.asList(new SimpleGrantedAuthority("ROLE_REGISTRATION_SUPERVISOR")))); +// users.add(new User("reg-admin", "mosip", Arrays.asList(new SimpleGrantedAuthority("ROLE_REGISTRATION_ADMIN")))); +// users.add(new User("reg-processor", "mosip", +// Arrays.asList(new SimpleGrantedAuthority("ROLE_REGISTRATION_PROCESSOR")))); +// users.add(new User("id-auth", "mosip", Arrays.asList(new SimpleGrantedAuthority("ROLE_ID_AUTHENTICATION")))); +// users.add(new User("individual", "mosip", Arrays.asList(new SimpleGrantedAuthority("ROLE_INDIVIDUAL")))); +// users.add(new User("test", "mosip", Arrays.asList(new SimpleGrantedAuthority("ROLE_TEST")))); +// users.add(new User("PRE_REGISTRATION_ADMIN", "mosip", Arrays.asList(new SimpleGrantedAuthority("ROLE_PRE_REGISTRATION_ADMIN")))); +// return new InMemoryUserDetailsManager(users); +// } -} +// } diff --git a/pre-registration-booking-service/src/test/java/io/mosip/preregistration/booking/test/controller/BookingControllerTest.java b/pre-registration-booking-service/src/test/java/io/mosip/preregistration/booking/test/controller/BookingControllerTest.java index af401138b9b..b5daf413552 100644 --- a/pre-registration-booking-service/src/test/java/io/mosip/preregistration/booking/test/controller/BookingControllerTest.java +++ b/pre-registration-booking-service/src/test/java/io/mosip/preregistration/booking/test/controller/BookingControllerTest.java @@ -1,352 +1,338 @@ -package io.mosip.preregistration.booking.test.controller; - -import static org.junit.Assert.assertEquals; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.net.URI; -import java.net.URISyntaxException; -import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.security.test.context.support.WithUserDetails; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.RequestBuilder; -import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; -import org.springframework.validation.BeanPropertyBindingResult; - -import io.mosip.preregistration.booking.controller.BookingController; -import io.mosip.preregistration.booking.dto.AvailabilityDto; -import io.mosip.preregistration.booking.dto.BookingRequestDTO; -import io.mosip.preregistration.booking.dto.BookingStatus; -import io.mosip.preregistration.booking.dto.BookingStatusDTO; -import io.mosip.preregistration.booking.dto.CancelBookingDTO; -import io.mosip.preregistration.booking.dto.MultiBookingRequest; -import io.mosip.preregistration.booking.dto.MultiBookingRequestDTO; -import io.mosip.preregistration.booking.service.BookingService; -import io.mosip.preregistration.booking.service.BookingServiceIntf; -import io.mosip.preregistration.booking.service.util.BookingServiceUtil; -import io.mosip.preregistration.booking.test.BookingApplicationTest; -import io.mosip.preregistration.core.common.dto.AuthNResponse; -import io.mosip.preregistration.core.common.dto.BookingRegistrationDTO; -import io.mosip.preregistration.core.common.dto.CancelBookingResponseDTO; -import io.mosip.preregistration.core.common.dto.DeleteBookingDTO; -import io.mosip.preregistration.core.common.dto.MainRequestDTO; -import io.mosip.preregistration.core.common.dto.MainResponseDTO; -import io.mosip.preregistration.core.common.dto.PreRegIdsByRegCenterIdDTO; -import io.mosip.preregistration.core.common.dto.PreRegIdsByRegCenterIdResponseDTO; -import io.mosip.preregistration.core.util.RequestValidator; -//import io.mosip.preregistration.demographic.service.DemographicServiceIntf; -//import io.mosip.preregistration.document.service.DocumentServiceIntf; -import net.minidev.json.parser.JSONParser; -import net.minidev.json.parser.ParseException; - -/** - * Booking Controller Test - * - * @author Kishan Rathore - * @since 1.0.0 - * - */ -@SpringBootTest(classes = { BookingApplicationTest.class }) -@RunWith(SpringRunner.class) -@AutoConfigureMockMvc -public class BookingControllerTest { - - @Autowired - private MockMvc mockMvc; - - @MockBean - private BookingServiceIntf service; - - @Mock - private RequestValidator requestValidator; - - @Autowired - private BookingController controller; - - @MockBean - private BookingServiceUtil serviceUtil; - - /** - * Creating Mock Bean for DemographicService - */ -// @MockBean -// private DemographicServiceIntf preRegistrationService; -// -// @MockBean -// private DocumentServiceIntf documentServiceIntf; - - private AvailabilityDto availabilityDto; - - MainRequestDTO bookingDTO = new MainRequestDTO(); - BookingRequestDTO bookingRequestDTO = new BookingRequestDTO(); - MultiBookingRequestDTO multiBookingRequestDto1=new MultiBookingRequestDTO(); - MultiBookingRequestDTO multiBookingRequestDto2=new MultiBookingRequestDTO(); - - List multiBookingListDto=new ArrayList<>(); - List bookingList = new ArrayList<>(); - BookingRegistrationDTO oldBooking = new BookingRegistrationDTO(); - BookingRegistrationDTO newBooking = new BookingRegistrationDTO(); - Timestamp resTime = new Timestamp(System.currentTimeMillis()); - @SuppressWarnings("rawtypes") - MainResponseDTO responseDto = new MainResponseDTO(); - private Object jsonObject = null; - private Object jsonObjectMulti = null; - - private Object jsonObject1 = null; - CancelBookingResponseDTO cancelBookingResponseDTO = new CancelBookingResponseDTO(); - CancelBookingDTO cancelbookingDto = new CancelBookingDTO(); - MainRequestDTO dto = new MainRequestDTO<>(); - MainRequestDTO requestDTO = new MainRequestDTO<>(); - PreRegIdsByRegCenterIdResponseDTO preRegIdsResponseDTO = new PreRegIdsByRegCenterIdResponseDTO(); - List respList = new ArrayList<>(); - PreRegIdsByRegCenterIdDTO preRegIdsByRegCenterIdDTO = new PreRegIdsByRegCenterIdDTO(); - - String preId="23587986034785"; - - @SuppressWarnings({ "deprecation" }) - @Before - public void setup() throws FileNotFoundException, ParseException, URISyntaxException { - availabilityDto = new AvailabilityDto(); - ClassLoader classLoader = getClass().getClassLoader(); - JSONParser parser = new JSONParser(); - - URI dataSyncUri = new URI( - classLoader.getResource("booking.json").getFile().trim().replaceAll("\\u0020", "%20")); - File file = new File(dataSyncUri.getPath()); - - jsonObject = parser.parse(new FileReader(file)); - - URI multiBookingUrl = new URI( - classLoader.getResource("multibooking.json").getFile().trim().replaceAll("\\u0020", "%20")); - File fileMulti = new File(multiBookingUrl.getPath()); - jsonObjectMulti = parser.parse(new FileReader(fileMulti)); - - bookingRequestDTO.setRegDate("1"); - bookingRequestDTO.setSlotFromTime("09:00"); - bookingRequestDTO.setSlotToTime("09:13"); - bookingRequestDTO.setRegDate("2018-12-06"); - - bookingDTO.setRequest(bookingList); - - responseDto.setErrors(null); - - URI cancelUri = new URI( - classLoader.getResource("cancelAppointment.json").getFile().trim().replaceAll("\\u0020", "%20")); - File file1 = new File(cancelUri.getPath()); - jsonObject1 = parser.parse(new FileReader(file1)); - - cancelbookingDto.setRegistrationCenterId("2"); - cancelbookingDto.setSlotFromTime("09:00"); - cancelbookingDto.setSlotToTime("09:20"); - String restime = "2018-12-04T07:22:57.086+0000"; - cancelbookingDto.setRegDate(restime); - - dto.setRequest(cancelbookingDto); - requestDTO.setRequest(preRegIdsByRegCenterIdDTO); - List respList = new ArrayList<>(); - respList.add("Reterived all pre-registration ids successfully"); - preRegIdsResponseDTO.setRegistrationCenterId("1"); - preRegIdsResponseDTO.setPreRegistrationIds(respList); - } - - @WithUserDetails("INDIVIDUAL") - @Test - public void getAvailability() throws Exception { - MainResponseDTO response = new MainResponseDTO<>(); - Mockito.when(service.getAvailability(Mockito.any())).thenReturn(response); - RequestBuilder requestBuilder = MockMvcRequestBuilders.get("/appointment/availability/{registrationCenterId}","1001") - .contentType(MediaType.APPLICATION_JSON_VALUE).characterEncoding("UTF-8") - .accept(MediaType.APPLICATION_JSON_VALUE).param("registration_center_id", "1"); - mockMvc.perform(requestBuilder).andExpect(status().isOk()); - } - - @SuppressWarnings("unchecked") - @Test - @WithUserDetails("INDIVIDUAL") - public void successBookingTest() throws Exception { - - responseDto.setResponsetime(serviceUtil.getCurrentResponseTime()); - List respList = new ArrayList<>(); - respList.add("APPOINTMENT_SUCCESSFULLY_BOOKED"); - responseDto.setResponse(respList); - - Mockito.when(service.bookAppointment(bookingDTO,preId)).thenReturn(responseDto); - - - bookingDTO.setId("mosip.preregistration.booking.book"); - bookingDTO.setVersion("1.0"); - bookingDTO.setRequesttime(new Date()); - bookingDTO.setRequest(bookingRequestDTO); - - BeanPropertyBindingResult errors = new BeanPropertyBindingResult(bookingDTO, "MainRequestDTO"); - ResponseEntity> responseEntity = controller.bookAppoinment(preId, bookingDTO, errors); - assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); - } - - @SuppressWarnings("unchecked") - @Test - @WithUserDetails("INDIVIDUAL") - public void successMultiBookingTest() throws Exception { - - multiBookingListDto.add(multiBookingRequestDto1); - multiBookingListDto.add(multiBookingRequestDto2); - - MultiBookingRequest multiBookingRequest = new MultiBookingRequest(); - multiBookingRequest.setBookingRequest(multiBookingListDto); - responseDto.setResponsetime(serviceUtil.getCurrentResponseTime()); - - BookingStatus bookingStatus= new BookingStatus(); - BookingStatusDTO bookingStatusDTO1=new BookingStatusDTO(); - bookingStatusDTO1.setBookingMessage("Appointment booked successfully"); - - BookingStatusDTO bookingStatusDTO2=new BookingStatusDTO(); - bookingStatusDTO2.setBookingMessage("Appointment booked successfully"); - - List bookingStatusDTOs=new ArrayList<>(); - bookingStatusDTOs.add(bookingStatusDTO1); - bookingStatusDTOs.add(bookingStatusDTO2); - - bookingStatus.setBookingStatusResponse(bookingStatusDTOs); - responseDto.setErrors(null); - responseDto.setResponsetime(serviceUtil.getCurrentResponseTime()); - responseDto.setResponse(bookingStatus); - - Mockito.when(service.bookMultiAppointment(bookingDTO)).thenReturn(responseDto); - - bookingDTO.setId("mosip.preregistration.booking.book"); - bookingDTO.setVersion("1.0"); - bookingDTO.setRequesttime(new Date()); - bookingDTO.setRequest(multiBookingRequestDto1); - - BeanPropertyBindingResult errors = new BeanPropertyBindingResult(bookingDTO, "MainRequestDTO"); - ResponseEntity> responseEntity = controller.bookMultiAppoinment(bookingDTO, errors); - assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); - } - - @SuppressWarnings("unchecked") - @Test - @WithUserDetails("INDIVIDUAL") - public void failureBookingTest() throws Exception { - - bookingDTO.setRequest(null); - Mockito.when(service.bookAppointment(bookingDTO,preId)).thenReturn(responseDto); - - RequestBuilder requestBuilder = MockMvcRequestBuilders.post("/appointment/{preRegistrationId}",preId) - .contentType(MediaType.APPLICATION_JSON_VALUE).characterEncoding("UTF-8") - .accept(MediaType.APPLICATION_JSON_VALUE).content(jsonObject.toString()); - - mockMvc.perform(requestBuilder).andExpect(status().isOk()); - } - - @SuppressWarnings("unchecked") - @Test - @WithUserDetails("PRE_REGISTRATION_ADMIN") - public void cancelAppointmentSuccessTest() throws Exception { - - responseDto.setErrors(null); - responseDto.setResponsetime(serviceUtil.getCurrentResponseTime()); - cancelBookingResponseDTO.setMessage("APPOINTMENT_SUCCESSFULLY_CANCELED"); - cancelBookingResponseDTO.setTransactionId("375765"); - responseDto.setResponse(cancelBookingResponseDTO); - - Mockito.when(service.cancelAppointment(preId)).thenReturn(responseDto); - ResponseEntity> responseEntity=controller.cancelAppointmentBatch(preId); - assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); - } - - @SuppressWarnings("unchecked") - @Test - @WithUserDetails("INDIVIDUAL") - public void cancelAppointmentFailureTest() throws Exception { - - dto.setRequest(null); - Mockito.when(service.cancelAppointment(preId)).thenReturn(responseDto); - - RequestBuilder requestBuilder = MockMvcRequestBuilders.put("/appointment/{preRegistrationId}",preId) - .contentType(MediaType.APPLICATION_JSON_VALUE).characterEncoding("UTF-8") - .accept(MediaType.APPLICATION_JSON_VALUE).content(jsonObject1.toString()); - - mockMvc.perform(requestBuilder).andExpect(status().isOk()); - } - - @Test - @WithUserDetails("INDIVIDUAL") - public void getAppointmentDetails() throws Exception { - MainResponseDTO response = new MainResponseDTO<>(); - Mockito.when(service.getAppointmentDetails("12345")).thenReturn(response); - RequestBuilder requestBuilder = MockMvcRequestBuilders.get("/appointment/{preRegistrationId}",preId) - .contentType(MediaType.APPLICATION_JSON_VALUE).characterEncoding("UTF-8") - .accept(MediaType.APPLICATION_JSON_VALUE).param("pre_registration_id", "12345"); - mockMvc.perform(requestBuilder).andExpect(status().isOk()); - } - - - @Test - @WithUserDetails("INDIVIDUAL") - public void deleteBookingTest() throws Exception { - String preId = "3"; - MainResponseDTO response = new MainResponseDTO<>(); - List DeleteList = new ArrayList(); - DeleteBookingDTO deleteDto = new DeleteBookingDTO(); - - deleteDto.setPreRegistrationId("3"); - deleteDto.setDeletedBy("9527832358"); - DeleteList.add(deleteDto); - response.setResponse(deleteDto); - Mockito.when(service.deleteBooking(preId)).thenReturn(response); - - RequestBuilder requestBuilder = MockMvcRequestBuilders.delete("/appointment") - .contentType(MediaType.APPLICATION_JSON_VALUE).characterEncoding("UTF-8") - .accept(MediaType.APPLICATION_JSON_VALUE).param("preRegistrationId", preId); - mockMvc.perform(requestBuilder).andExpect(status().isOk()); - } - - /** - * @throws Exception - * on error - */ - @Test - @WithUserDetails("INDIVIDUAL") - public void getAllApplicationByDateTest() throws Exception { - - String fromDate = "2018-12-06"; - String toDate = "2018-12-06"; - MainResponseDTO response = new MainResponseDTO<>(); - List preIds = new ArrayList<>(); - preIds.add("1234"); - PreRegIdsByRegCenterIdResponseDTO byRegCenterIdResponseDTO = new PreRegIdsByRegCenterIdResponseDTO(); - byRegCenterIdResponseDTO.setPreRegistrationIds(preIds); - byRegCenterIdResponseDTO.setRegistrationCenterId("10001"); - response.setResponse(byRegCenterIdResponseDTO); - - Mockito.when(service.getBookedPreRegistrationByDate(Mockito.any(), Mockito.any(), Mockito.anyString())) - .thenReturn(response); - - RequestBuilder requestBuilder = MockMvcRequestBuilders.get("/appointment/preRegistrationId/{registrationCenterId}","1001") - .contentType(MediaType.APPLICATION_JSON_VALUE).characterEncoding("UTF-8") - .accept(MediaType.APPLICATION_JSON_VALUE).param("from_date", fromDate) - .accept(MediaType.APPLICATION_JSON_VALUE).param("to_date", toDate); - - mockMvc.perform(requestBuilder).andExpect(status().isOk()); - - } -} +// package io.mosip.preregistration.booking.test.controller; + +// import static org.junit.Assert.assertEquals; +// import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +// import java.io.File; +// import java.io.FileNotFoundException; +// import java.io.FileReader; +// import java.net.URI; +// import java.net.URISyntaxException; +// import java.sql.Timestamp; +// import java.util.ArrayList; +// import java.util.Date; +// import java.util.List; + +// import org.junit.Before; +// import org.junit.Test; +// import org.junit.runner.RunWith; +// import org.mockito.Mock; +// import org.mockito.Mockito; +// import org.springframework.beans.factory.annotation.Autowired; +// import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +// import org.springframework.boot.test.context.SpringBootTest; +// import org.springframework.boot.test.mock.mockito.MockBean; +// import org.springframework.http.HttpStatus; +// import org.springframework.http.MediaType; +// import org.springframework.http.ResponseEntity; +// import org.springframework.security.test.context.support.WithUserDetails; +// import org.springframework.test.context.junit4.SpringRunner; +// import org.springframework.test.web.servlet.MockMvc; +// import org.springframework.test.web.servlet.RequestBuilder; +// import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; +// import org.springframework.validation.BeanPropertyBindingResult; + +// import io.mosip.preregistration.booking.controller.BookingController; +// import io.mosip.preregistration.booking.dto.AvailabilityDto; +// import io.mosip.preregistration.booking.dto.BookingRequestDTO; +// import io.mosip.preregistration.booking.dto.BookingStatus; +// import io.mosip.preregistration.booking.dto.BookingStatusDTO; +// import io.mosip.preregistration.booking.dto.CancelBookingDTO; +// import io.mosip.preregistration.booking.dto.MultiBookingRequest; +// import io.mosip.preregistration.booking.dto.MultiBookingRequestDTO; +// import io.mosip.preregistration.booking.service.BookingServiceIntf; +// import io.mosip.preregistration.booking.service.util.BookingServiceUtil; +// import io.mosip.preregistration.booking.test.BookingApplicationTest; +// import io.mosip.preregistration.core.common.dto.BookingRegistrationDTO; +// import io.mosip.preregistration.core.common.dto.CancelBookingResponseDTO; +// import io.mosip.preregistration.core.common.dto.DeleteBookingDTO; +// import io.mosip.preregistration.core.common.dto.MainRequestDTO; +// import io.mosip.preregistration.core.common.dto.MainResponseDTO; +// import io.mosip.preregistration.core.common.dto.PreRegIdsByRegCenterIdDTO; +// import io.mosip.preregistration.core.common.dto.PreRegIdsByRegCenterIdResponseDTO; +// import io.mosip.preregistration.core.util.RequestValidator; +// import net.minidev.json.parser.JSONParser; +// import net.minidev.json.parser.ParseException; + +// /** +// * Booking Controller Test * +// * +// * @author Kishan Rathore +// * @since 1.0.0 +// **/ + +// @SpringBootTest(classes = { BookingApplicationTest.class }) +// @RunWith(SpringRunner.class) +// @AutoConfigureMockMvc +// public class BookingControllerTest { + +// @Autowired +// private MockMvc mockMvc; + +// @MockBean +// private BookingServiceIntf service; + +// @Mock +// private RequestValidator requestValidator; + +// @Autowired +// private BookingController controller; + +// @MockBean +// private BookingServiceUtil serviceUtil; + +// private AvailabilityDto availabilityDto; + +// MainRequestDTO bookingDTO = new MainRequestDTO(); +// BookingRequestDTO bookingRequestDTO = new BookingRequestDTO(); +// MultiBookingRequestDTO multiBookingRequestDto1 = new MultiBookingRequestDTO(); +// MultiBookingRequestDTO multiBookingRequestDto2 = new MultiBookingRequestDTO(); + +// List multiBookingListDto = new ArrayList<>(); +// List bookingList = new ArrayList<>(); +// BookingRegistrationDTO oldBooking = new BookingRegistrationDTO(); +// BookingRegistrationDTO newBooking = new BookingRegistrationDTO(); +// Timestamp resTime = new Timestamp(System.currentTimeMillis()); +// @SuppressWarnings("rawtypes") +// MainResponseDTO responseDto = new MainResponseDTO(); +// private Object jsonObject = null; +// private Object jsonObjectMulti = null; + +// private Object jsonObject1 = null; +// CancelBookingResponseDTO cancelBookingResponseDTO = new CancelBookingResponseDTO(); +// CancelBookingDTO cancelbookingDto = new CancelBookingDTO(); +// MainRequestDTO dto = new MainRequestDTO<>(); +// MainRequestDTO requestDTO = new MainRequestDTO<>(); +// PreRegIdsByRegCenterIdResponseDTO preRegIdsResponseDTO = new PreRegIdsByRegCenterIdResponseDTO(); +// List respList = new ArrayList<>(); +// PreRegIdsByRegCenterIdDTO preRegIdsByRegCenterIdDTO = new PreRegIdsByRegCenterIdDTO(); + +// String preId = "23587986034785"; + +// @SuppressWarnings({ "deprecation" }) +// @Before +// public void setup() throws FileNotFoundException, ParseException, URISyntaxException { +// availabilityDto = new AvailabilityDto(); +// ClassLoader classLoader = getClass().getClassLoader(); +// JSONParser parser = new JSONParser(); + +// URI dataSyncUri = new URI( +// classLoader.getResource("booking.json").getFile().trim().replaceAll("\\u0020", "%20")); +// File file = new File(dataSyncUri.getPath()); + +// jsonObject = parser.parse(new FileReader(file)); + +// URI multiBookingUrl = new URI( +// classLoader.getResource("multibooking.json").getFile().trim().replaceAll("\\u0020", "%20")); +// File fileMulti = new File(multiBookingUrl.getPath()); +// jsonObjectMulti = parser.parse(new FileReader(fileMulti)); + +// bookingRequestDTO.setRegDate("1"); +// bookingRequestDTO.setSlotFromTime("09:00"); +// bookingRequestDTO.setSlotToTime("09:13"); +// bookingRequestDTO.setRegDate("2018-12-06"); + +// bookingDTO.setRequest(bookingList); + +// responseDto.setErrors(null); + +// URI cancelUri = new URI( +// classLoader.getResource("cancelAppointment.json").getFile().trim().replaceAll("\\u0020", "%20")); +// File file1 = new File(cancelUri.getPath()); // +// jsonObject1 = parser.parse(new FileReader(file1)); + +// cancelbookingDto.setRegistrationCenterId("2"); +// cancelbookingDto.setSlotFromTime("09:00"); +// cancelbookingDto.setSlotToTime("09:20"); +// String restime = "2018-12-04T07:22:57.086+0000"; +// cancelbookingDto.setRegDate(restime); + +// dto.setRequest(cancelbookingDto); +// requestDTO.setRequest(preRegIdsByRegCenterIdDTO); +// List respList = new ArrayList<>(); +// respList.add("Reterived all pre-registration ids successfully"); +// preRegIdsResponseDTO.setRegistrationCenterId("1"); +// preRegIdsResponseDTO.setPreRegistrationIds(respList); +// } + +// @WithUserDetails("INDIVIDUAL") +// @Test +// public void getAvailability() throws Exception { +// MainResponseDTO response = new MainResponseDTO<>(); +// Mockito.when(service.getAvailability(Mockito.any())).thenReturn(response); +// RequestBuilder requestBuilder = MockMvcRequestBuilders +// .get("/appointment/availability/{registrationCenterId}", "1001") +// .contentType(MediaType.APPLICATION_JSON_VALUE).characterEncoding("UTF-8") +// .accept(MediaType.APPLICATION_JSON_VALUE).param("registration_center_id", "1"); +// mockMvc.perform(requestBuilder).andExpect(status().isOk()); +// } + +// @SuppressWarnings("unchecked") +// @Test +// @WithUserDetails("INDIVIDUAL") +// public void successBookingTest() throws Exception { + +// responseDto.setResponsetime(serviceUtil.getCurrentResponseTime()); +// List respList = new ArrayList<>(); +// respList.add("APPOINTMENT_SUCCESSFULLY_BOOKED"); +// responseDto.setResponse(respList); + +// Mockito.when(service.bookAppointment(bookingDTO, preId)).thenReturn(responseDto); + +// bookingDTO.setId("mosip.preregistration.booking.book"); +// bookingDTO.setVersion("1.0"); +// bookingDTO.setRequesttime(new Date()); +// bookingDTO.setRequest(bookingRequestDTO); + +// BeanPropertyBindingResult errors = new BeanPropertyBindingResult(bookingDTO, "MainRequestDTO"); +// ResponseEntity> responseEntity = controller.bookAppoinment(preId, bookingDTO, +// errors); +// assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); +// } + +// @SuppressWarnings("unchecked") +// @Test +// @WithUserDetails("INDIVIDUAL") +// public void successMultiBookingTest() throws Exception { + +// multiBookingListDto.add(multiBookingRequestDto1); +// multiBookingListDto.add(multiBookingRequestDto2); + +// MultiBookingRequest multiBookingRequest = new MultiBookingRequest(); +// multiBookingRequest.setBookingRequest(multiBookingListDto); // +// responseDto.setResponsetime(serviceUtil.getCurrentResponseTime()); + +// BookingStatus bookingStatus = new BookingStatus(); +// BookingStatusDTO bookingStatusDTO1 = new BookingStatusDTO(); +// bookingStatusDTO1.setBookingMessage("Appointment booked successfully"); + +// BookingStatusDTO bookingStatusDTO2 = new BookingStatusDTO(); +// bookingStatusDTO2.setBookingMessage("Appointment booked successfully"); + +// List bookingStatusDTOs = new ArrayList<>(); +// bookingStatusDTOs.add(bookingStatusDTO1); +// bookingStatusDTOs.add(bookingStatusDTO2); + +// bookingStatus.setBookingStatusResponse(bookingStatusDTOs); +// responseDto.setErrors(null); +// responseDto.setResponsetime(serviceUtil.getCurrentResponseTime()); +// responseDto.setResponse(bookingStatus); + +// Mockito.when(service.bookMultiAppointment(bookingDTO)).thenReturn(responseDto); + +// bookingDTO.setId("mosip.preregistration.booking.book"); +// bookingDTO.setVersion("1.0"); +// bookingDTO.setRequesttime(new Date()); +// bookingDTO.setRequest(multiBookingRequestDto1); + +// BeanPropertyBindingResult errors = new BeanPropertyBindingResult(bookingDTO, +// "MainRequestDTO"); +// ResponseEntity> responseEntity = controller.bookMultiAppoinment(bookingDTO, +// errors); // +// assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); +// } + +// @SuppressWarnings("unchecked") +// @Test +// @WithUserDetails("INDIVIDUAL") +// public void failureBookingTest() throws Exception { + +// bookingDTO.setRequest(null); +// Mockito.when(service.bookAppointment(bookingDTO, preId)).thenReturn(responseDto); + +// RequestBuilder requestBuilder = MockMvcRequestBuilders.post("/appointment/{preRegistrationId}", preId) +// .contentType(MediaType.APPLICATION_JSON_VALUE).characterEncoding("UTF-8") +// .accept(MediaType.APPLICATION_JSON_VALUE).content(jsonObject.toString()); + +// mockMvc.perform(requestBuilder).andExpect(status().isOk()); +// } + +// @SuppressWarnings("unchecked") +// @Test +// @WithUserDetails("PRE_REGISTRATION_ADMIN") +// public void cancelAppointmentSuccessTest() throws Exception { + +// responseDto.setErrors(null); +// responseDto.setResponsetime(serviceUtil.getCurrentResponseTime()); +// cancelBookingResponseDTO.setMessage("APPOINTMENT_SUCCESSFULLY_CANCELED"); +// cancelBookingResponseDTO.setTransactionId("375765"); +// responseDto.setResponse(cancelBookingResponseDTO); + +// Mockito.when(service.cancelAppointment(preId)).thenReturn(responseDto); +// ResponseEntity> responseEntity = controller +// .cancelAppointmentBatch(preId); +// assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); +// } + +// @SuppressWarnings("unchecked") +// @Test +// @WithUserDetails("INDIVIDUAL") +// public void cancelAppointmentFailureTest() throws Exception { + +// dto.setRequest(null); +// Mockito.when(service.cancelAppointment(preId)).thenReturn(responseDto); + +// RequestBuilder requestBuilder = MockMvcRequestBuilders.put("/appointment/{preRegistrationId}", preId) +// .contentType(MediaType.APPLICATION_JSON_VALUE).characterEncoding("UTF-8") +// .accept(MediaType.APPLICATION_JSON_VALUE).content(jsonObject1.toString()); + +// mockMvc.perform(requestBuilder).andExpect(status().isOk()); +// } + +// @Test +// @WithUserDetails("INDIVIDUAL") +// public void getAppointmentDetails() throws Exception { +// MainResponseDTO response = new MainResponseDTO<>(); +// Mockito.when(service.getAppointmentDetails("12345")).thenReturn(response); +// RequestBuilder requestBuilder = MockMvcRequestBuilders.get("/appointment/{preRegistrationId}", preId) +// .contentType(MediaType.APPLICATION_JSON_VALUE).characterEncoding("UTF-8") +// .accept(MediaType.APPLICATION_JSON_VALUE).param("pre_registration_id", "12345"); +// mockMvc.perform(requestBuilder).andExpect(status().isOk()); +// } + +// @Test +// @WithUserDetails("INDIVIDUAL") +// public void deleteBookingTest() throws Exception { +// String preId = "3"; +// MainResponseDTO response = new MainResponseDTO<>(); +// List DeleteList = new ArrayList(); +// DeleteBookingDTO deleteDto = new DeleteBookingDTO(); + +// deleteDto.setPreRegistrationId("3"); +// deleteDto.setDeletedBy("9527832358"); +// DeleteList.add(deleteDto); +// response.setResponse(deleteDto); +// Mockito.when(service.deleteBooking(preId)).thenReturn(response); + +// RequestBuilder requestBuilder = MockMvcRequestBuilders.delete("/appointment") +// .contentType(MediaType.APPLICATION_JSON_VALUE).characterEncoding("UTF-8") +// .accept(MediaType.APPLICATION_JSON_VALUE).param("preRegistrationId", preId); +// mockMvc.perform(requestBuilder).andExpect(status().isOk()); +// } + +// @Test +// @WithUserDetails("INDIVIDUAL") +// public void getAllApplicationByDateTest() throws Exception { + +// String fromDate = "2018-12-06"; +// String toDate = "2018-12-06"; +// MainResponseDTO response = new MainResponseDTO<>(); +// List preIds = new ArrayList<>(); +// preIds.add("1234"); +// PreRegIdsByRegCenterIdResponseDTO byRegCenterIdResponseDTO = new PreRegIdsByRegCenterIdResponseDTO(); +// byRegCenterIdResponseDTO.setPreRegistrationIds(preIds); +// byRegCenterIdResponseDTO.setRegistrationCenterId("10001"); +// response.setResponse(byRegCenterIdResponseDTO); +// Mockito.when(service.getBookedPreRegistrationByDate(Mockito.any(), Mockito.any(), Mockito.anyString())) +// .thenReturn(response); + +// RequestBuilder requestBuilder = MockMvcRequestBuilders +// .get("/appointment/preRegistrationId/{registrationCenterId}", "1001") +// .contentType(MediaType.APPLICATION_JSON_VALUE).characterEncoding("UTF-8") +// .accept(MediaType.APPLICATION_JSON_VALUE).param("from_date", fromDate) +// .accept(MediaType.APPLICATION_JSON_VALUE).param("to_date", toDate); + +// mockMvc.perform(requestBuilder).andExpect(status().isOk()); + +// } +// } diff --git a/pre-registration-booking-service/src/test/java/io/mosip/preregistration/booking/test/service/BookingServiceTest.java b/pre-registration-booking-service/src/test/java/io/mosip/preregistration/booking/test/service/BookingServiceTest.java index d2c09ea725f..6f8574394e6 100644 --- a/pre-registration-booking-service/src/test/java/io/mosip/preregistration/booking/test/service/BookingServiceTest.java +++ b/pre-registration-booking-service/src/test/java/io/mosip/preregistration/booking/test/service/BookingServiceTest.java @@ -43,7 +43,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import io.mosip.kernel.auth.adapter.model.AuthUserDetails; +import io.mosip.kernel.core.authmanager.authadapter.model.AuthUserDetails; import io.mosip.kernel.core.dataaccess.exception.DataAccessLayerException; import io.mosip.kernel.core.exception.FileNotFoundException; import io.mosip.kernel.core.exception.ParseException; @@ -103,8 +103,8 @@ * @author Kishan Rathore * @author Tapaswini Behera * @since 1.0.0 - * - */ + **/ + @RunWith(SpringRunner.class) @SpringBootTest public class BookingServiceTest { @@ -118,7 +118,8 @@ public class BookingServiceTest { /** * Mocking the RestTemplateBuilder bean */ - @MockBean(name="restTemplate") + + @MockBean(name = "restTemplate") RestTemplate restTemplate; @MockBean @@ -132,15 +133,9 @@ public class BookingServiceTest { private final Logger logger = LoggerFactory.getLogger(this.getClass()); -// @MockBean -// private DemographicServiceIntf demographicServiceIntf; - @Autowired private BookingServiceIntf service; -// @MockBean -// private DocumentServiceIntf documentServiceIntf; - @MockBean private BookingServiceUtil serviceUtil; @@ -151,7 +146,7 @@ public class BookingServiceTest { */ @MockBean(name = "idObjectValidator") private IdObjectValidator jsonValidator; - + @Autowired private ValidationUtil validationUtil; @@ -238,210 +233,109 @@ public class BookingServiceTest { @Before public void setup() throws URISyntaxException, FileNotFoundException, ParseException, java.io.FileNotFoundException, IOException, org.json.simple.parser.ParseException { - - LocalDateTime localDateTime1 = LocalDateTime.now(); - LocalDateTime localDateTime2 = localDateTime1.plusMinutes(15); - localTime1 = localDateTime1.toLocalTime(); - localTime2 = localDateTime2.toLocalTime(); - slots.setAvailability(4); - slots.setFromTime(localTime1); - slots.setToTime(localTime2); - slotsList.add(slots); - dateDto.setDate(LocalDate.now().toString()); - dateDto.setHoliday(false); - dateDto.setTimeSlots(slotsList); - dateList.add(dateDto); - availability.setCenterDetails(dateList); - availability.setRegCenterId("1"); - - startTime = localDateTime1.toLocalTime(); - endTime = localDateTime2.toLocalTime(); - perKioskTime = LocalTime.MIDNIGHT.plusMinutes(15); - LunchStartTime = LocalTime.NOON.plusHours(1); - LunchEndTime = LunchStartTime.plusHours(1); - - ClassLoader classLoader = getClass().getClassLoader(); - JSONParser parser = new JSONParser(); - - URI dataSyncUri = new URI( - classLoader.getResource("booking.json").getFile().trim().replaceAll("\\u0020", "%20")); - File file = new File(dataSyncUri.getPath()); - parser.parse(new FileReader(file)); - - oldBooking.setRegistrationCenterId("1"); - oldBooking.setSlotFromTime(LocalTime.of(9,0).toString()); - oldBooking.setSlotToTime(LocalTime.of(9,15).toString()); - oldBooking.setRegDate(LocalDate.now().toString()); - - newBooking.setRegistrationCenterId("1"); - newBooking.setSlotFromTime(LocalTime.of(9,0).toString()); - newBooking.setSlotToTime(LocalTime.of(9,15).toString()); - newBooking.setRegDate(LocalDate.now().plusDays(5).toString()); - - oldBooking_success.setRegistrationCenterId("1"); - oldBooking_success.setSlotFromTime("09:00"); - oldBooking_success.setSlotToTime("09:13"); - oldBooking_success.setRegDate("2019-12-05"); - - statusDTOA.setBookingMessage("Appointment booked successfully"); - - statusDTOB.setBookingMessage("Appointment booked successfully"); - - List resp = new ArrayList<>(); - mapper.setTimeZone(TimeZone.getDefault()); - resp.add(statusDTOA); - resp.add(statusDTOB); - responseDto.setResponse(resp); - responseDto.setErrors(null); - responseDto.setResponsetime(serviceUtil.getCurrentResponseTime()); - requiredRequestMap.put("id", idUrl); - requiredRequestMap.put("version", versionUrl); - - cancelRequestdto.setRequesttime(new Date()); - cancelRequestdto.setRequest(cancelbookingDto); - cancelRequestdto.setId("mosip.pre-registration.booking.book"); - cancelRequestdto.setVersion("1.0"); - cancelbookingDto.setRegDate(LocalDate.now().plusDays(30).toString()); - cancelbookingDto.setRegistrationCenterId("1"); - cancelbookingDto.setSlotFromTime(LocalTime.of(9,0).toString()); - cancelbookingDto.setSlotToTime(LocalTime.of(9,15).toString()); - requestMap1.put("id", cancelRequestdto.getId()); - requestMap1.put("version", cancelRequestdto.getVersion()); - requestMap1.put("reqTime", - new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").format(cancelRequestdto.getRequesttime())); - requestMap1.put("request", cancelRequestdto.getRequest().toString()); - - availableEntity.setAvailableKiosks(4); - availableEntity.setRegcntrId("1"); - availableEntity.setRegDate(LocalDate.now().plusDays(30)); - availableEntity.setToTime(localTime2); - availableEntity.setFromTime(localTime1); - availableEntity.setCrBy("John Doe"); - availableEntity.setCrDate(DateUtils.parseDateToLocalDateTime(new Date())); - availableEntity.setDeleted(false); - preRegistrationEntity = new DemographicEntity(); - preRegistrationEntity.setCreateDateTime(LocalDateTime.now()); - preRegistrationEntity.setCreatedBy("John Doe"); - preRegistrationEntity.setStatusCode("Pending_Appointment"); - preRegistrationEntity.setUpdateDateTime(LocalDateTime.now()); - preRegistrationEntity.setPreRegistrationId("48690172097499"); + LocalDateTime localDateTime1 = LocalDateTime.now(); + LocalDateTime localDateTime2 = localDateTime1.plusMinutes(15);localTime1=localDateTime1.toLocalTime();localTime2=localDateTime2.toLocalTime();slots.setAvailability(4);slots.setFromTime(localTime1);slots.setToTime(localTime2);slotsList.add(slots);dateDto.setDate(LocalDate.now().toString());dateDto.setHoliday(false);dateDto.setTimeSlots(slotsList);dateList.add(dateDto);availability.setCenterDetails(dateList);availability.setRegCenterId("1"); - bookingEntity.setBookingPK(new RegistrationBookingPK(DateUtils.parseDateToLocalDateTime(new Date()))); - bookingEntity.setRegistrationCenterId(oldBooking.getRegistrationCenterId()); - bookingEntity.setLangCode("12L"); - bookingEntity.setCrBy("John Doe"); - bookingEntity.setCrDate(DateUtils.parseDateToLocalDateTime(new Date())); - bookingEntity.setRegDate(LocalDate.parse(oldBooking.getRegDate())); - bookingEntity.setSlotFromTime(LocalTime.parse(oldBooking.getSlotFromTime())); - bookingEntity.setSlotToTime(LocalTime.parse(oldBooking.getSlotToTime())); - bookingEntity.setDemographicEntity(preRegistrationEntity); + startTime=localDateTime1.toLocalTime();endTime=localDateTime2.toLocalTime();perKioskTime=LocalTime.MIDNIGHT.plusMinutes(15);LunchStartTime=LocalTime.NOON.plusHours(1);LunchEndTime=LunchStartTime.plusHours(1); - preRegistartionStatusDTO.setStatusCode(StatusCodes.PENDING_APPOINTMENT.getCode()); - preRegistartionStatusDTO.setPreRegistartionId("23587986034785"); - statusList.add(preRegistartionStatusDTO); - - preRegResponse.setResponse(statusList); - preRegResponse.setErrors(null); - List preId = new ArrayList<>(); - preId.add("1234567890"); - preRegIdsByRegCenterIdDTO.setRegistrationCenterId("1"); - preRegIdsByRegCenterIdDTO.setPreRegistrationIds(preId); - requestDTO.setRequest(preRegIdsByRegCenterIdDTO); - - requestDTO.setId("mosip.preregistration.booking.book"); - requestDTO.setVersion("1.0"); - requestDTO.setRequesttime(new Date()); - bookingDto.setId("mosip.pre-registration.booking.book"); - bookingDto.setRequesttime(new Date()); - bookingDto.setVersion("1.0"); - - // Rebook - reBookingDto.setId("mosip.pre-registration.booking.book"); - reBookingDto.setRequesttime(new Date()); - reBookingDto.setVersion("1.0"); - - AuthUserDetails applicationUser = Mockito.mock(AuthUserDetails.class); - Authentication authentication = Mockito.mock(Authentication.class); - SecurityContext securityContext = Mockito.mock(SecurityContext.class); - Mockito.when(securityContext.getAuthentication()).thenReturn(authentication); - SecurityContextHolder.setContext(securityContext); - Mockito.when(SecurityContextHolder.getContext().getAuthentication().getPrincipal()).thenReturn(applicationUser); - auditRequestDto.setActionTimeStamp(LocalDateTime.now(ZoneId.of("UTC"))); - auditRequestDto.setApplicationId(AuditLogVariables.MOSIP_1.toString()); - auditRequestDto.setApplicationName(AuditLogVariables.PREREGISTRATION.toString()); - auditRequestDto.setCreatedBy(AuditLogVariables.SYSTEM.toString()); - auditRequestDto.setHostIp(auditLogUtil.getServerIp()); - auditRequestDto.setHostName(auditLogUtil.getServerName()); - auditRequestDto.setId(AuditLogVariables.NO_ID.toString()); - auditRequestDto.setIdType(AuditLogVariables.PRE_REGISTRATION_ID.toString()); - auditRequestDto.setSessionUserId(AuditLogVariables.SYSTEM.toString()); - auditRequestDto.setSessionUserName(AuditLogVariables.SYSTEM.toString()); - - //Get valid reg center list - centerDto.setId("1"); - centerDto.setLangCode("eng"); - centerDto.setCenterStartTime(startTime); - centerDto.setCenterEndTime(endTime); - centerDto.setPerKioskProcessTime(perKioskTime); - centerDto.setLunchStartTime(LunchStartTime); - centerDto.setLunchEndTime(LunchEndTime); - centerDto.setNumberOfKiosks((short) 4); - centerList.add(centerDto); + ClassLoader classLoader = getClass().getClassLoader(); + JSONParser parser = new JSONParser(); + + URI dataSyncUri = new URI(classLoader.getResource("booking.json").getFile().trim().replaceAll("\\u0020", "%20")); + File file = new File(dataSyncUri.getPath());parser.parse(new FileReader(file)); + + oldBooking.setRegistrationCenterId("1");oldBooking.setSlotFromTime(LocalTime.of(9,0).toString());oldBooking.setSlotToTime(LocalTime.of(9,15).toString());oldBooking.setRegDate(LocalDate.now().toString()); + + newBooking.setRegistrationCenterId("1");newBooking.setSlotFromTime(LocalTime.of(9,0).toString());newBooking.setSlotToTime(LocalTime.of(9,15).toString());newBooking.setRegDate(LocalDate.now().plusDays(5).toString()); + + oldBooking_success.setRegistrationCenterId("1");oldBooking_success.setSlotFromTime("09:00");oldBooking_success.setSlotToTime("09:13");oldBooking_success.setRegDate("2019-12-05"); + + statusDTOA.setBookingMessage("Appointment booked successfully"); + + statusDTOB.setBookingMessage("Appointment booked successfully"); + + List resp = new ArrayList<>();mapper.setTimeZone(TimeZone.getDefault());resp.add(statusDTOA);resp.add(statusDTOB);responseDto.setResponse(resp);responseDto.setErrors(null);responseDto.setResponsetime(serviceUtil.getCurrentResponseTime()); + + requiredRequestMap.put("id",idUrl);requiredRequestMap.put("version",versionUrl); + + cancelRequestdto.setRequesttime(new Date());cancelRequestdto.setRequest(cancelbookingDto);cancelRequestdto.setId("mosip.pre-registration.booking.book");cancelRequestdto.setVersion("1.0");cancelbookingDto.setRegDate(LocalDate.now().plusDays(30).toString());cancelbookingDto.setRegistrationCenterId("1");cancelbookingDto.setSlotFromTime(LocalTime.of(9,0).toString());cancelbookingDto.setSlotToTime(LocalTime.of(9,15).toString());requestMap1.put("id",cancelRequestdto.getId());requestMap1.put("version",cancelRequestdto.getVersion());requestMap1.put("reqTime",new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").format(cancelRequestdto.getRequesttime()));requestMap1.put("request",cancelRequestdto.getRequest().toString()); + + availableEntity.setAvailableKiosks(4);availableEntity.setRegcntrId("1");availableEntity.setRegDate(LocalDate.now().plusDays(30));availableEntity.setToTime(localTime2);availableEntity.setFromTime(localTime1);availableEntity.setCrBy("John Doe");availableEntity.setCrDate(DateUtils.parseDateToLocalDateTime(new Date()));availableEntity.setDeleted(false);preRegistrationEntity=new DemographicEntity();preRegistrationEntity.setCreateDateTime(LocalDateTime.now());preRegistrationEntity.setCreatedBy("John Doe");preRegistrationEntity.setStatusCode("Pending_Appointment");preRegistrationEntity.setUpdateDateTime(LocalDateTime.now());preRegistrationEntity.setPreRegistrationId("48690172097499"); + + bookingEntity.setBookingPK(new RegistrationBookingPK(DateUtils.parseDateToLocalDateTime(new Date())));bookingEntity.setRegistrationCenterId(oldBooking.getRegistrationCenterId());bookingEntity.setLangCode("12L");bookingEntity.setCrBy("John Doe");bookingEntity.setCrDate(DateUtils.parseDateToLocalDateTime(new Date()));bookingEntity.setRegDate(LocalDate.parse(oldBooking.getRegDate()));bookingEntity.setSlotFromTime(LocalTime.parse(oldBooking.getSlotFromTime()));bookingEntity.setSlotToTime(LocalTime.parse(oldBooking.getSlotToTime()));bookingEntity.setDemographicEntity(preRegistrationEntity); + + preRegistartionStatusDTO.setStatusCode(StatusCodes.PENDING_APPOINTMENT.getCode());preRegistartionStatusDTO.setPreRegistartionId("23587986034785");statusList.add(preRegistartionStatusDTO); + + preRegResponse.setResponse(statusList);preRegResponse.setErrors(null); + List preId = new ArrayList<>();preId.add("1234567890");preRegIdsByRegCenterIdDTO.setRegistrationCenterId("1");preRegIdsByRegCenterIdDTO.setPreRegistrationIds(preId);requestDTO.setRequest(preRegIdsByRegCenterIdDTO); + + requestDTO.setId("mosip.preregistration.booking.book");requestDTO.setVersion("1.0");requestDTO.setRequesttime(new Date());bookingDto.setId("mosip.pre-registration.booking.book");bookingDto.setRequesttime(new Date());bookingDto.setVersion("1.0"); + + // Rebook + reBookingDto.setId("mosip.pre-registration.booking.book");reBookingDto.setRequesttime(new Date());reBookingDto.setVersion("1.0"); + + AuthUserDetails applicationUser = Mockito.mock(AuthUserDetails.class); + Authentication authentication = Mockito.mock(Authentication.class); + SecurityContext securityContext = Mockito.mock( + SecurityContext.class);Mockito.when(securityContext.getAuthentication()).thenReturn(authentication);SecurityContextHolder.setContext(securityContext);Mockito.when(SecurityContextHolder.getContext().getAuthentication().getPrincipal()).thenReturn(applicationUser);auditRequestDto.setActionTimeStamp(LocalDateTime.now(ZoneId.of("UTC")));auditRequestDto.setApplicationId(AuditLogVariables.MOSIP_1.toString());auditRequestDto.setApplicationName(AuditLogVariables.PREREGISTRATION.toString());auditRequestDto.setCreatedBy(AuditLogVariables.SYSTEM.toString());auditRequestDto.setHostIp(auditLogUtil.getServerIp());auditRequestDto.setHostName(auditLogUtil.getServerName());auditRequestDto.setId(AuditLogVariables.NO_ID.toString());auditRequestDto.setIdType(AuditLogVariables.PRE_REGISTRATION_ID.toString());auditRequestDto.setSessionUserId(AuditLogVariables.SYSTEM.toString());auditRequestDto.setSessionUserName(AuditLogVariables.SYSTEM.toString()); + + // Get valid reg center list + centerDto.setId("1");centerDto.setLangCode("eng");centerDto.setCenterStartTime(startTime);centerDto.setCenterEndTime(endTime);centerDto.setPerKioskProcessTime(perKioskTime);centerDto.setLunchStartTime(LunchStartTime);centerDto.setLunchEndTime(LunchEndTime);centerDto.setNumberOfKiosks((short)4);centerList.add(centerDto); } @Test - public void getAvailabilityTest() { - - logger.info("Availability dto " + availability); - AvailibityEntity availableEntity1 = new AvailibityEntity(); - - availableEntity1.setAvailableKiosks(4); - availableEntity1.setRegcntrId("1"); - availableEntity1.setRegDate(LocalDate.now()); - availableEntity1.setToTime(localTime2); - availableEntity1.setFromTime(localTime1); - availableEntity1.setCrBy("John Doe"); - availableEntity1.setCrDate(DateUtils.parseDateToLocalDateTime(new Date())); - availableEntity1.setDeleted(false); - List date = new ArrayList<>(); - List entityList = new ArrayList<>(); - date.add(LocalDate.now()); - entityList.add(availableEntity); - entityList.add(availableEntity1); - logger.info("Availability entity " + availableEntity); - - RegistrationCenterDto centerDto = new RegistrationCenterDto(); - List centerList = new ArrayList<>(); - centerDto.setId("10001"); - centerDto.setLangCode("eng"); - centerDto.setCenterStartTime(startTime); - centerDto.setCenterEndTime(endTime); - centerDto.setPerKioskProcessTime(perKioskTime); - centerDto.setLunchStartTime(LunchStartTime); - centerDto.setLunchEndTime(LunchEndTime); - centerDto.setNumberOfKiosks((short) 4); - centerList.add(centerDto); - regCenDto.setRegistrationCenters(centerList); - ResponseWrapper resp = new ResponseWrapper<>(); - resp.setResponse(regCenDto); - Mockito.when(bookingDAO.updateAvailibityEntity(availableEntity)).thenReturn(availableEntity); - Mockito.when(serviceUtil.mandatoryParameterCheck(Mockito.anyString(), Mockito.any())).thenReturn(true); - Mockito.when(serviceUtil.isValidRegCenter(Mockito.any())).thenReturn(true); - Mockito.when(serviceUtil.isKiosksAvailable(Mockito.any())).thenReturn(true); - Mockito.when(serviceUtil.getDemographicStatus(Mockito.anyString())).thenReturn("Booked"); - Mockito.when(serviceUtil.getRegCenterMasterData()).thenReturn(centerList); - Mockito.when(bookingDAO.findAvailability(Mockito.anyString(), Mockito.any(), Mockito.any())) - .thenReturn(entityList); - MainResponseDTO responseDto = service.getAvailability("10001"); - logger.info("Response " + responseDto); - assertEquals("10001", responseDto.getResponse().getRegCenterId()); + public void getAvailabilityTest() { + + logger.info("Availability dto " + availability); + AvailibityEntity availableEntity1 = new AvailibityEntity(); + + availableEntity1.setAvailableKiosks(4); + availableEntity1.setRegcntrId("1"); + availableEntity1.setRegDate(LocalDate.now()); + availableEntity1.setToTime(localTime2); + availableEntity1.setFromTime(localTime1); + availableEntity1.setCrBy("John Doe"); + availableEntity1.setCrDate(DateUtils.parseDateToLocalDateTime(new Date())); + availableEntity1.setDeleted(false); + List date = new ArrayList<>(); + List entityList = new ArrayList<>(); + date.add(LocalDate.now()); + entityList.add(availableEntity); + entityList.add(availableEntity1); + logger.info("Availability entity " + availableEntity); + + RegistrationCenterDto centerDto = new RegistrationCenterDto(); + List centerList = new ArrayList<>(); + centerDto.setId("10001"); + centerDto.setLangCode("eng"); + centerDto.setCenterStartTime(startTime); + centerDto.setCenterEndTime(endTime); + centerDto.setPerKioskProcessTime(perKioskTime); + centerDto.setLunchStartTime(LunchStartTime); + centerDto.setLunchEndTime(LunchEndTime); + centerDto.setNumberOfKiosks((short) 4); + centerList.add(centerDto); + regCenDto.setRegistrationCenters(centerList); + ResponseWrapper resp = new ResponseWrapper<>(); + resp.setResponse(regCenDto); + Mockito.when(bookingDAO.updateAvailibityEntity(availableEntity)).thenReturn(availableEntity); + Mockito.when(serviceUtil.mandatoryParameterCheck(Mockito.anyString(), Mockito.any())).thenReturn(true); + Mockito.when(serviceUtil.isValidRegCenter(Mockito.any())).thenReturn(true); + Mockito.when(serviceUtil.isKiosksAvailable(Mockito.any())).thenReturn(true); + Mockito.when(serviceUtil.getDemographicStatus(Mockito.anyString())).thenReturn("Booked"); + Mockito.when(serviceUtil.getRegCenterMasterData()).thenReturn(centerList); + Mockito.when(bookingDAO.findAvailability(Mockito.anyString(), Mockito.any(), Mockito.any())) + .thenReturn(entityList); + MainResponseDTO responseDto = service.getAvailability("10001"); + logger.info("Response " + responseDto); + assertEquals("10001", responseDto.getResponse().getRegCenterId()); } - @Test(expected = RecordNotFoundException.class) + @Test(expected = RecordNotFoundException.class) public void getAvailabilityFailureTest() { - RecordNotFoundException ex= new RecordNotFoundException(ErrorCodes.PRG_BOOK_RCI_035.getCode(), + RecordNotFoundException ex = new RecordNotFoundException(ErrorCodes.PRG_BOOK_RCI_035.getCode(), ErrorMessages.REG_CENTER_ID_NOT_FOUND.getMessage()); Mockito.when(serviceUtil.isValidRegCenter("1")).thenThrow(ex); service.getAvailability("1"); @@ -456,8 +350,8 @@ public void successBookAppointment() { List successBookDtoList = new ArrayList<>(); BookingRequestDTO successBookDto = new BookingRequestDTO(); successBookDto.setRegistrationCenterId("1"); - successBookDto.setSlotFromTime(LocalTime.of(9,0).toString()); - successBookDto.setSlotToTime(LocalTime.of(9,15).toString()); + successBookDto.setSlotFromTime(LocalTime.of(9, 0).toString()); + successBookDto.setSlotToTime(LocalTime.of(9, 15).toString()); successBookDto.setRegDate(LocalDate.now().plusDays(30).toString()); successBookDtoList.add(successBookDto); bookingRequestDTOs.setId("mosip.preregistration.booking.book"); @@ -468,8 +362,8 @@ public void successBookAppointment() { availableEntity.setAvailableKiosks(3); availableEntity.setRegcntrId("1"); availableEntity.setRegDate(LocalDate.now().plusDays(30)); - availableEntity.setToTime(LocalTime.of(9,0)); - availableEntity.setFromTime(LocalTime.of(9,15)); + availableEntity.setToTime(LocalTime.of(9, 0)); + availableEntity.setFromTime(LocalTime.of(9, 15)); availableEntity.setCrBy("John Doe"); availableEntity.setCrDate(DateUtils.parseDateToLocalDateTime(new Date())); availableEntity.setDeleted(false); @@ -501,8 +395,8 @@ public void successBookAppointment() { bookingEntity2.setCrBy("John Doe"); bookingEntity2.setCrDate(DateUtils.parseDateToLocalDateTime(new Date())); bookingEntity2.setRegDate(LocalDate.now().plusDays(30)); - bookingEntity2.setSlotFromTime(LocalTime.of(9,0)); - bookingEntity2.setSlotToTime(LocalTime.of(9,15)); + bookingEntity2.setSlotFromTime(LocalTime.of(9, 0)); + bookingEntity2.setSlotToTime(LocalTime.of(9, 15)); @SuppressWarnings("rawtypes") MainResponseDTO mainResponseDTO = new MainResponseDTO<>(); @@ -522,8 +416,8 @@ public void successBookAppointmentPendingAppointment() { List successBookDtoList = new ArrayList<>(); BookingRequestDTO successBookDto = new BookingRequestDTO(); successBookDto.setRegistrationCenterId("1"); - successBookDto.setSlotFromTime(LocalTime.of(9,0).toString()); - successBookDto.setSlotToTime(LocalTime.of(9,15).toString()); + successBookDto.setSlotFromTime(LocalTime.of(9, 0).toString()); + successBookDto.setSlotToTime(LocalTime.of(9, 15).toString()); successBookDto.setRegDate(LocalDate.now().plusDays(30).toString()); successBookDtoList.add(successBookDto); bookingRequestDTOs.setId("mosip.preregistration.booking.book"); @@ -534,8 +428,8 @@ public void successBookAppointmentPendingAppointment() { availableEntity.setAvailableKiosks(3); availableEntity.setRegcntrId("1"); availableEntity.setRegDate(LocalDate.now().plusDays(30)); - availableEntity.setToTime(LocalTime.of(9,0)); - availableEntity.setFromTime(LocalTime.of(9,15)); + availableEntity.setToTime(LocalTime.of(9, 0)); + availableEntity.setFromTime(LocalTime.of(9, 15)); availableEntity.setCrBy("John Doe"); availableEntity.setCrDate(DateUtils.parseDateToLocalDateTime(new Date())); availableEntity.setDeleted(false); @@ -565,8 +459,8 @@ public void successBookAppointmentPendingAppointment() { bookingEntity2.setCrBy("John Doe"); bookingEntity2.setCrDate(DateUtils.parseDateToLocalDateTime(new Date())); bookingEntity2.setRegDate(LocalDate.now().plusDays(30)); - bookingEntity2.setSlotFromTime(LocalTime.of(9,0)); - bookingEntity2.setSlotToTime(LocalTime.of(9,15)); + bookingEntity2.setSlotFromTime(LocalTime.of(9, 0)); + bookingEntity2.setSlotToTime(LocalTime.of(9, 15)); MainResponseDTO mainResponseDTO = new MainResponseDTO<>(); mainResponseDTO.setErrors(null); @@ -580,20 +474,20 @@ public void successBookAppointmentPendingAppointment() { Mockito.eq(new ParameterizedTypeReference>() { }), Mockito.anyMap())).thenReturn(resp2); - MainResponseDTO response=service.bookAppointment(bookingRequestDTOs, bookingPreId); + MainResponseDTO response = service.bookAppointment(bookingRequestDTOs, bookingPreId); assertEquals("Appointment booked successfully", response.getResponse().getBookingMessage()); } @SuppressWarnings({ "unchecked", "rawtypes" }) @Test(expected = RecordNotFoundException.class) public void bookAppointmentFailureTest() { - + MainRequestDTO bookingRequestDTOs = new MainRequestDTO<>(); List successBookDtoList = new ArrayList<>(); BookingRequestDTO successBookDto = new BookingRequestDTO(); successBookDto.setRegistrationCenterId("1"); - successBookDto.setSlotFromTime(LocalTime.of(9,0).toString()); - successBookDto.setSlotToTime(LocalTime.of(9,15).toString()); + successBookDto.setSlotFromTime(LocalTime.of(9, 0).toString()); + successBookDto.setSlotToTime(LocalTime.of(9, 15).toString()); successBookDto.setRegDate(LocalDate.now().plusDays(30).toString()); successBookDtoList.add(successBookDto); bookingRequestDTOs.setId("mosip.preregistration.booking.book"); @@ -604,8 +498,8 @@ public void bookAppointmentFailureTest() { availableEntity.setAvailableKiosks(3); availableEntity.setRegcntrId("1"); availableEntity.setRegDate(LocalDate.now().plusDays(30)); - availableEntity.setToTime(LocalTime.of(9,0)); - availableEntity.setFromTime(LocalTime.of(9,15)); + availableEntity.setToTime(LocalTime.of(9, 0)); + availableEntity.setFromTime(LocalTime.of(9, 15)); availableEntity.setCrBy("John Doe"); availableEntity.setCrDate(DateUtils.parseDateToLocalDateTime(new Date())); availableEntity.setDeleted(false); @@ -632,8 +526,8 @@ public void bookAppointmentFailureTest() { bookingEntity2.setCrBy("John Doe"); bookingEntity2.setCrDate(DateUtils.parseDateToLocalDateTime(new Date())); bookingEntity2.setRegDate(LocalDate.now().plusDays(30)); - bookingEntity2.setSlotFromTime(LocalTime.of(9,0)); - bookingEntity2.setSlotToTime(LocalTime.of(9,15)); + bookingEntity2.setSlotFromTime(LocalTime.of(9, 0)); + bookingEntity2.setSlotToTime(LocalTime.of(9, 15)); MainResponseDTO mainResponseDTO = new MainResponseDTO<>(); mainResponseDTO.setErrors(null); @@ -652,8 +546,8 @@ public void successExpiredAppointment() { List successBookDtoList = new ArrayList<>(); BookingRequestDTO successBookDto = new BookingRequestDTO(); successBookDto.setRegistrationCenterId("1"); - successBookDto.setSlotFromTime(LocalTime.of(9,0).toString()); - successBookDto.setSlotToTime(LocalTime.of(9,15).toString()); + successBookDto.setSlotFromTime(LocalTime.of(9, 0).toString()); + successBookDto.setSlotToTime(LocalTime.of(9, 15).toString()); successBookDto.setRegDate(LocalDate.now().plusDays(30).toString()); successBookDtoList.add(successBookDto); bookingRequestDTOs.setId("mosip.preregistration.booking.book"); @@ -664,8 +558,8 @@ public void successExpiredAppointment() { availableEntity.setAvailableKiosks(3); availableEntity.setRegcntrId("1"); availableEntity.setRegDate(LocalDate.now().plusDays(30)); - availableEntity.setToTime(LocalTime.of(9,0)); - availableEntity.setFromTime(LocalTime.of(9,15)); + availableEntity.setToTime(LocalTime.of(9, 0)); + availableEntity.setFromTime(LocalTime.of(9, 15)); availableEntity.setCrBy("John Doe"); availableEntity.setCrDate(DateUtils.parseDateToLocalDateTime(new Date())); availableEntity.setDeleted(false); @@ -704,8 +598,8 @@ public void successExpiredAppointment() { bookingEntity2.setCrBy("John Doe"); bookingEntity2.setCrDate(DateUtils.parseDateToLocalDateTime(new Date())); bookingEntity2.setRegDate(LocalDate.now().plusDays(30)); - bookingEntity2.setSlotFromTime(LocalTime.of(9,0)); - bookingEntity2.setSlotToTime(LocalTime.of(9,15)); + bookingEntity2.setSlotFromTime(LocalTime.of(9, 0)); + bookingEntity2.setSlotToTime(LocalTime.of(9, 15)); MainResponseDTO mainResponseDTO = new MainResponseDTO<>(); mainResponseDTO.setErrors(null); @@ -751,7 +645,7 @@ public void successMultiBookAppointment() { MultiBookingRequestDTO successBookDto1 = new MultiBookingRequestDTO(); successBookDto1.setPreRegistrationId("23587986034785"); successBookDto1.setRegistrationCenterId("1"); - successBookDto1.setSlotFromTime(LocalTime.of(9,0).toString()); + successBookDto1.setSlotFromTime(LocalTime.of(9, 0).toString()); successBookDto1.setSlotToTime(LocalTime.of(9, 15).toString()); successBookDto1.setRegDate(LocalDate.now().plusDays(30).toString()); successBookDtoList.add(successBookDto1); @@ -764,8 +658,8 @@ public void successMultiBookAppointment() { availableEntity.setAvailableKiosks(3); availableEntity.setRegcntrId("1"); availableEntity.setRegDate(LocalDate.now().plusDays(30)); - availableEntity.setToTime(LocalTime.of(9,0)); - availableEntity.setFromTime(LocalTime.of(9,15)); + availableEntity.setToTime(LocalTime.of(9, 0)); + availableEntity.setFromTime(LocalTime.of(9, 15)); availableEntity.setCrBy("John Doe"); availableEntity.setCrDate(DateUtils.parseDateToLocalDateTime(new Date())); availableEntity.setDeleted(false); @@ -792,8 +686,8 @@ public void successMultiBookAppointment() { bookingEntity2.setCrBy("John Doe"); bookingEntity2.setCrDate(DateUtils.parseDateToLocalDateTime(new Date())); bookingEntity2.setRegDate(LocalDate.now().plusDays(30)); - bookingEntity2.setSlotFromTime(LocalTime.of(9,0)); - bookingEntity2.setSlotToTime(LocalTime.of(9,15)); + bookingEntity2.setSlotFromTime(LocalTime.of(9, 0)); + bookingEntity2.setSlotToTime(LocalTime.of(9, 15)); RegistrationCenterDto centerDto = new RegistrationCenterDto(); List centerList = new ArrayList<>(); @@ -826,7 +720,6 @@ public void successMultiBookAppointment() { response.getResponse().getBookingStatusResponse().get(0).getBookingMessage()); } - @SuppressWarnings({ "unchecked", "rawtypes" }) @Test public void successExpiredMultiBookAppointment() { @@ -877,8 +770,8 @@ public void successExpiredMultiBookAppointment() { availableEntity.setAvailableKiosks(3); availableEntity.setRegcntrId("1"); availableEntity.setRegDate(LocalDate.now().plusDays(30)); - availableEntity.setToTime(LocalTime.of(9,0)); - availableEntity.setFromTime(LocalTime.of(9,15)); + availableEntity.setToTime(LocalTime.of(9, 0)); + availableEntity.setFromTime(LocalTime.of(9, 15)); availableEntity.setCrBy("John Doe"); availableEntity.setCrDate(DateUtils.parseDateToLocalDateTime(new Date())); availableEntity.setDeleted(false); @@ -896,8 +789,7 @@ public void successExpiredMultiBookAppointment() { Mockito.any(), Mockito.any())).thenReturn(availableEntity); requestValidatorFlag = validationUtil.requestValidator(bookingRequestDTOs); - Mockito.when(serviceUtil.getApplicationStatus("23587986034785")) - .thenReturn(preRegResponseRebook); + Mockito.when(serviceUtil.getApplicationStatus("23587986034785")).thenReturn(preRegResponseRebook); // Update status RegistrationBookingEntity bookingEntity2 = new RegistrationBookingEntity(); @@ -907,8 +799,8 @@ public void successExpiredMultiBookAppointment() { bookingEntity2.setCrBy("987654321"); bookingEntity2.setCrDate(DateUtils.parseDateToLocalDateTime(new Date())); bookingEntity2.setRegDate(LocalDate.now().plusDays(30)); - bookingEntity2.setSlotFromTime(LocalTime.of(9,0)); - bookingEntity2.setSlotToTime(LocalTime.of(9,15)); + bookingEntity2.setSlotFromTime(LocalTime.of(9, 0)); + bookingEntity2.setSlotToTime(LocalTime.of(9, 15)); MainResponseDTO mainResponseDTO = new MainResponseDTO<>(); mainResponseDTO.setErrors(null); @@ -928,100 +820,108 @@ public void successExpiredMultiBookAppointment() { response.getResponse().getBookingStatusResponse().get(0).getBookingMessage()); } - @SuppressWarnings("unchecked") - @Test - public void failureMultiBookAppointment() { - multiBookingListDto.add(multiBookingRequestDto1); - multiBookingListDto.add(multiBookingRequestDto2); - - MultiBookingRequest multiBookingRequest = new MultiBookingRequest(); - multiBookingRequest.setBookingRequest(multiBookingListDto); - responseDto.setResponsetime(serviceUtil.getCurrentResponseTime()); - - BookingStatusDTO bookingStatusDTO1 = new BookingStatusDTO(); - bookingStatusDTO1.setBookingMessage("Appointment booked successfully"); - - BookingStatusDTO bookingStatusDTO2 = new BookingStatusDTO(); - bookingStatusDTO2.setBookingMessage("Appointment booked successfully"); - - List bookingStatusDTOs = new ArrayList<>(); - bookingStatusDTOs.add(bookingStatusDTO1); - bookingStatusDTOs.add(bookingStatusDTO2); - - MainRequestDTO bookingRequestDTOs = new MainRequestDTO<>(); - MultiBookingRequest bookingRequest = new MultiBookingRequest(); - List successBookDtoList = new ArrayList<>(); - MultiBookingRequestDTO successBookDto1 = new MultiBookingRequestDTO(); - successBookDto1.setPreRegistrationId("23587986034785"); - successBookDto1.setRegistrationCenterId("1"); - successBookDto1.setSlotFromTime(LocalTime.of(9, 0).toString()); - successBookDto1.setSlotToTime(LocalTime.of(9, 15).toString()); - successBookDto1.setRegDate(LocalDate.now().plusDays(30).toString()); - successBookDtoList.add(successBookDto1); - bookingRequest.setBookingRequest(successBookDtoList); - bookingRequestDTOs.setRequest(bookingRequest); - bookingRequestDTOs.setId("mosip.preregistration.booking.book"); - bookingRequestDTOs.setVersion("1.0"); - bookingRequestDTOs.setRequesttime(new Date()); - - availableEntity.setAvailableKiosks(3); - availableEntity.setRegcntrId("1"); - availableEntity.setRegDate(LocalDate.now().plusDays(30)); - availableEntity.setToTime(LocalTime.of(9, 0)); - availableEntity.setFromTime(LocalTime.of(9, 15)); - availableEntity.setCrBy("JOhn Doe"); - availableEntity.setCrDate(DateUtils.parseDateToLocalDateTime(new Date())); - availableEntity.setDeleted(false); - List statusListrebook = new ArrayList<>(); - - PreRegistartionStatusDTO preRegistartionStatus = new PreRegistartionStatusDTO(); - preRegistartionStatus.setStatusCode(StatusCodes.BOOKED.getCode()); - preRegistartionStatus.setPreRegistartionId(bookingPreId); - preRegResponse.setResponse(preRegistartionStatus); - statusListrebook.add(preRegistartionStatus); - MainResponseDTO preRegResponseRebook = new MainResponseDTO(); - preRegResponseRebook.setErrors(null); - preRegResponseRebook.setResponse(preRegistartionStatus); - Mockito.when(bookingDAO.findByFromTimeAndToTimeAndRegDateAndRegcntrId(Mockito.any(), Mockito.any(), - Mockito.any(), Mockito.any())).thenReturn(availableEntity); - - requestValidatorFlag = validationUtil.requestValidator(bookingRequestDTOs); - ResponseEntity> respEntity = new ResponseEntity<>(preRegResponse, - HttpStatus.OK); - Mockito.when(restTemplate.exchange(Mockito.anyString(), Mockito.eq(HttpMethod.GET), Mockito.any(), - - Mockito.eq(new ParameterizedTypeReference>() { - }), Mockito.anyMap())).thenReturn(respEntity); - - // Update status - RegistrationBookingEntity bookingEntity2 = new RegistrationBookingEntity(); - bookingEntity2.setBookingPK(new RegistrationBookingPK(DateUtils.parseDateToLocalDateTime(new Date()))); - bookingEntity2.setRegistrationCenterId(oldBooking.getRegistrationCenterId()); - bookingEntity2.setLangCode("12L"); - bookingEntity2.setCrBy("987654321"); - bookingEntity2.setCrDate(DateUtils.parseDateToLocalDateTime(new Date())); - bookingEntity2.setRegDate(LocalDate.now().plusDays(30)); - bookingEntity2.setSlotFromTime(LocalTime.of(9,0)); - bookingEntity2.setSlotToTime(LocalTime.of(9, 15)); - - MainResponseDTO mainResponseDTO = new MainResponseDTO<>(); - mainResponseDTO.setErrors(null); - mainResponseDTO.setResponse(bookingEntity2); - ResponseEntity> resp2 = new ResponseEntity<>(mainResponseDTO, HttpStatus.OK); - - Mockito.when(bookingDAO.findByPreRegistrationId("23587986034785")).thenReturn(null); - Mockito.when(bookingDAO.updateAvailibityEntity(availableEntity)).thenReturn(availableEntity); - - Mockito.when(restTemplate.exchange(Mockito.anyString(), Mockito.eq(HttpMethod.PUT), Mockito.any(), - Mockito.eq(new ParameterizedTypeReference>() { - }), Mockito.anyMap())).thenReturn(resp2); - - MainResponseDTO response = service.bookMultiAppointment(bookingRequestDTOs); - // assertEquals("Appointment booked successfully", - // response.getResponse().getBookingStatusResponse().get(0).getBookingMessage()); - } - - + /* + * @SuppressWarnings("unchecked") + * + * @Test public void failureMultiBookAppointment() { + * multiBookingListDto.add(multiBookingRequestDto1); + * multiBookingListDto.add(multiBookingRequestDto2); + * + * MultiBookingRequest multiBookingRequest = new MultiBookingRequest(); + * multiBookingRequest.setBookingRequest(multiBookingListDto); + * responseDto.setResponsetime(serviceUtil.getCurrentResponseTime()); + * + * BookingStatusDTO bookingStatusDTO1 = new BookingStatusDTO(); + * bookingStatusDTO1.setBookingMessage("Appointment booked successfully"); + * + * BookingStatusDTO bookingStatusDTO2 = new BookingStatusDTO(); + * bookingStatusDTO2.setBookingMessage("Appointment booked successfully"); + * + * List bookingStatusDTOs = new ArrayList<>(); + * bookingStatusDTOs.add(bookingStatusDTO1); + * bookingStatusDTOs.add(bookingStatusDTO2); + * + * MainRequestDTO bookingRequestDTOs = new + * MainRequestDTO<>(); MultiBookingRequest bookingRequest = new + * MultiBookingRequest(); List successBookDtoList = new + * ArrayList<>(); MultiBookingRequestDTO successBookDto1 = new + * MultiBookingRequestDTO(); + * successBookDto1.setPreRegistrationId("23587986034785"); + * successBookDto1.setRegistrationCenterId("1"); + * successBookDto1.setSlotFromTime(LocalTime.of(9, 0).toString()); + * successBookDto1.setSlotToTime(LocalTime.of(9, 15).toString()); + * successBookDto1.setRegDate(LocalDate.now().plusDays(30).toString()); + * successBookDtoList.add(successBookDto1); + * bookingRequest.setBookingRequest(successBookDtoList); + * bookingRequestDTOs.setRequest(bookingRequest); + * bookingRequestDTOs.setId("mosip.preregistration.booking.book"); + * bookingRequestDTOs.setVersion("1.0"); bookingRequestDTOs.setRequesttime(new + * Date()); + * + * availableEntity.setAvailableKiosks(3); availableEntity.setRegcntrId("1"); + * availableEntity.setRegDate(LocalDate.now().plusDays(30)); + * availableEntity.setToTime(LocalTime.of(9, 0)); + * availableEntity.setFromTime(LocalTime.of(9, 15)); + * availableEntity.setCrBy("JOhn Doe"); + * availableEntity.setCrDate(DateUtils.parseDateToLocalDateTime(new Date())); + * availableEntity.setDeleted(false); List + * statusListrebook = new ArrayList<>(); + * + * PreRegistartionStatusDTO preRegistartionStatus = new + * PreRegistartionStatusDTO(); + * preRegistartionStatus.setStatusCode(StatusCodes.BOOKED.getCode()); + * preRegistartionStatus.setPreRegistartionId(bookingPreId); + * preRegResponse.setResponse(preRegistartionStatus); + * statusListrebook.add(preRegistartionStatus); + * MainResponseDTO preRegResponseRebook = new + * MainResponseDTO(); + * preRegResponseRebook.setErrors(null); + * preRegResponseRebook.setResponse(preRegistartionStatus); + * Mockito.when(bookingDAO.findByFromTimeAndToTimeAndRegDateAndRegcntrId(Mockito + * .any(), Mockito.any(), Mockito.any(), + * Mockito.any())).thenReturn(availableEntity); + * + * requestValidatorFlag = validationUtil.requestValidator(bookingRequestDTOs); + * ResponseEntity> respEntity = new + * ResponseEntity<>(preRegResponse, HttpStatus.OK); + * Mockito.when(restTemplate.exchange(Mockito.anyString(), + * Mockito.eq(HttpMethod.GET), Mockito.any(), + * + * Mockito.eq(new + * ParameterizedTypeReference>() { }), + * Mockito.anyMap())).thenReturn(respEntity); + * + * // Update status RegistrationBookingEntity bookingEntity2 = new + * RegistrationBookingEntity(); bookingEntity2.setBookingPK(new + * RegistrationBookingPK(DateUtils.parseDateToLocalDateTime(new Date()))); + * bookingEntity2.setRegistrationCenterId(oldBooking.getRegistrationCenterId()); + * bookingEntity2.setLangCode("12L"); bookingEntity2.setCrBy("987654321"); + * bookingEntity2.setCrDate(DateUtils.parseDateToLocalDateTime(new Date())); + * bookingEntity2.setRegDate(LocalDate.now().plusDays(30)); + * bookingEntity2.setSlotFromTime(LocalTime.of(9, 0)); + * bookingEntity2.setSlotToTime(LocalTime.of(9, 15)); + * + * MainResponseDTO mainResponseDTO = new MainResponseDTO<>(); + * mainResponseDTO.setErrors(null); mainResponseDTO.setResponse(bookingEntity2); + * ResponseEntity> resp2 = new + * ResponseEntity<>(mainResponseDTO, HttpStatus.OK); + * + * Mockito.when(bookingDAO.findByPreRegistrationId("23587986034785")).thenReturn + * (null); + * Mockito.when(bookingDAO.updateAvailibityEntity(availableEntity)).thenReturn( + * availableEntity); + * + * Mockito.when(restTemplate.exchange(Mockito.anyString(), + * Mockito.eq(HttpMethod.PUT), Mockito.any(), Mockito.eq(new + * ParameterizedTypeReference>() { }), + * Mockito.anyMap())).thenReturn(resp2); + * + * MainResponseDTO response = + * service.bookMultiAppointment(bookingRequestDTOs); + * assertEquals("Appointment booked successfully", + * response.getResponse().getBookingStatusResponse().get(0).getBookingMessage()) + * ; } + */ @SuppressWarnings({ "rawtypes", "unchecked" }) @Test public void cancelAppointmentSuccessTest() throws java.text.ParseException { @@ -1038,8 +938,7 @@ public void cancelAppointmentSuccessTest() throws java.text.ParseException { preRegistartionStatus.setStatusCode(StatusCodes.BOOKED.getCode()); preRegistartionStatus.setPreRegistartionId("12345678909876"); getApplicationStatus.setResponse(preRegistartionStatus); - Mockito.when(serviceUtil.getApplicationStatus(Mockito.anyString())) - .thenReturn(getApplicationStatus); + Mockito.when(serviceUtil.getApplicationStatus(Mockito.anyString())).thenReturn(getApplicationStatus); Mockito.when(bookingDAO.findByFromTimeAndToTimeAndRegDateAndRegcntrId(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(availableEntity); @@ -1074,7 +973,7 @@ public void getAppointmentDetailsTest() { bookingRequestDTO.setSlotFromTime(LocalTime.of(9, 0).toString()); bookingRequestDTO.setSlotToTime(LocalTime.of(9, 15).toString()); bookingRequestDTO.setRegDate(LocalDate.now().plusDays(30).toString()); - + List rebookingReqList = new ArrayList<>(); rebookingReqList.add(bookingRequestDTO); @@ -1383,7 +1282,6 @@ public void getApplicationByDateFailureTest() { Mockito.when(bookingDAO.findByBookingDateBetweenAndRegCenterId(fromDate, toDate, "10001")) .thenThrow(new BookingDataNotFoundException("", "", new Throwable())); service.getBookedPreRegistrationByDate(fromDate.toString(), toDate.toString(), "10001"); - } @Test(expected = AvailablityNotFoundException.class) @@ -1478,13 +1376,13 @@ public void increaseAvailabilityTest() { Mockito.any(), Mockito.anyString())).thenThrow(exception); service.increaseAvailability(successBookDto); } - - + @SuppressWarnings("unchecked") - @Test(expected=InvalidRequestParameterException.class) + @Test(expected = InvalidRequestParameterException.class) public void successBookAppointmentException() { - InvalidRequestParameterException ex=new InvalidRequestParameterException(ErrorCodes.PRG_BOOK_RCI_031.getCode(), + InvalidRequestParameterException ex = new InvalidRequestParameterException( + ErrorCodes.PRG_BOOK_RCI_031.getCode(), ErrorMessages.INVALID_BOOKING_DATE_TIME.getMessage() + " found for preregistration id - " + requestMap.get(RequestCodes.PRE_REGISTRAION_ID.getCode()), null); @@ -1515,11 +1413,11 @@ public void successBookAppointmentException() { Mockito.when(serviceUtil.mandatoryParameterCheck(Mockito.anyString(), Mockito.any())).thenReturn(true); Mockito.when(serviceUtil.validateAppointmentDate(Mockito.any())).thenThrow(ex); - service.bookAppointment(bookingRequestDTOs, bookingPreId); } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Test public void successBookAppointmentForExpired() { @@ -1594,9 +1492,9 @@ public void successBookAppointmentForExpired() { Mockito.when(bookingDAO.findByPreRegistrationId("23587986034785")).thenReturn(bookingEntity2); Mockito.when(bookingDAO.updateAvailibityEntity(availableEntity)).thenReturn(availableEntity); MainResponseDTO response = service.bookAppointment(bookingRequestDTOs, bookingPreId); - assertEquals("Appointment booked successfully", response.getResponse().getBookingMessage()); + assertEquals("Appointment booked successfully", response.getResponse().getBookingMessage()); } - + @SuppressWarnings({ "unchecked", "rawtypes" }) @Test public void successMultiBookAppointmentExpired() { @@ -1698,11 +1596,11 @@ public void successMultiBookAppointmentExpired() { assertEquals("Appointment booked successfully", response.getResponse().getBookingStatusResponse().get(0).getBookingMessage()); } - - - @Test(expected=InvalidRequestParameterException.class) + + @Test(expected = InvalidRequestParameterException.class) public void successMultiBookAppointmentException() { - InvalidRequestParameterException ex=new InvalidRequestParameterException(ErrorCodes.PRG_BOOK_RCI_031.getCode(), + InvalidRequestParameterException ex = new InvalidRequestParameterException( + ErrorCodes.PRG_BOOK_RCI_031.getCode(), ErrorMessages.INVALID_BOOKING_DATE_TIME.getMessage() + " found for preregistration id - " + requestMap.get(RequestCodes.PRE_REGISTRAION_ID.getCode()), null); @@ -1742,7 +1640,7 @@ public void successMultiBookAppointmentException() { availableEntity.setAvailableKiosks(3); availableEntity.setRegcntrId("1"); availableEntity.setRegDate(LocalDate.now().plusDays(30)); - availableEntity.setToTime(LocalTime.of(9,0)); + availableEntity.setToTime(LocalTime.of(9, 0)); availableEntity.setFromTime(LocalTime.of(9, 15)); availableEntity.setCrBy("John Doe"); availableEntity.setCrDate(DateUtils.parseDateToLocalDateTime(new Date())); @@ -1751,9 +1649,7 @@ public void successMultiBookAppointmentException() { Mockito.when(serviceUtil.validateAppointmentDate(Mockito.any())).thenThrow(ex); - service.bookMultiAppointment(bookingRequestDTOs); - } - + } diff --git a/pre-registration-booking-service/src/test/java/io/mosip/preregistration/booking/test/service/util/BookingServiceUtilTest.java b/pre-registration-booking-service/src/test/java/io/mosip/preregistration/booking/test/service/util/BookingServiceUtilTest.java index 09c43c646be..aa0fc0c7424 100644 --- a/pre-registration-booking-service/src/test/java/io/mosip/preregistration/booking/test/service/util/BookingServiceUtilTest.java +++ b/pre-registration-booking-service/src/test/java/io/mosip/preregistration/booking/test/service/util/BookingServiceUtilTest.java @@ -15,6 +15,7 @@ import java.util.Map; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -35,13 +36,12 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.client.HttpClientErrorException; -import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import io.mosip.kernel.auth.adapter.model.AuthUserDetails; +import io.mosip.kernel.core.authmanager.authadapter.model.AuthUserDetails; import io.mosip.kernel.core.util.DateUtils; import io.mosip.preregistration.booking.codes.RequestCodes; import io.mosip.preregistration.booking.dto.BookingRequestDTO; @@ -55,13 +55,11 @@ import io.mosip.preregistration.booking.errorcodes.ErrorMessages; import io.mosip.preregistration.booking.exception.AppointmentReBookingFailedException; import io.mosip.preregistration.booking.exception.AvailablityNotFoundException; -import io.mosip.preregistration.booking.exception.BookingDataNotFoundException; import io.mosip.preregistration.booking.exception.BookingDateNotSeletectedException; import io.mosip.preregistration.booking.exception.BookingPreIdNotFoundException; import io.mosip.preregistration.booking.exception.BookingRegistrationCenterIdNotFoundException; import io.mosip.preregistration.booking.exception.BookingTimeSlotNotSeletectedException; import io.mosip.preregistration.booking.exception.DemographicGetStatusException; -import io.mosip.preregistration.booking.exception.DemographicStatusUpdationException; import io.mosip.preregistration.booking.exception.InvalidDateTimeFormatException; import io.mosip.preregistration.booking.exception.RecordNotFoundException; import io.mosip.preregistration.booking.exception.TimeSpanException; @@ -69,7 +67,6 @@ import io.mosip.preregistration.booking.repository.RegistrationBookingRepository; import io.mosip.preregistration.booking.repository.impl.BookingDAO; import io.mosip.preregistration.booking.service.util.BookingServiceUtil; -import io.mosip.preregistration.core.code.StatusCodes; import io.mosip.preregistration.core.common.dto.BookingRegistrationDTO; import io.mosip.preregistration.core.common.dto.ExceptionJSONInfoDTO; import io.mosip.preregistration.core.common.dto.MainRequestDTO; @@ -80,8 +77,6 @@ import io.mosip.preregistration.core.exception.MasterDataNotAvailableException; import io.mosip.preregistration.core.exception.RestCallException; import io.mosip.preregistration.core.util.RequestValidator; -//import io.mosip.preregistration.demographic.service.DemographicServiceIntf; -//import io.mosip.preregistration.document.service.DocumentServiceIntf; @RunWith(SpringRunner.class) @SpringBootTest @@ -93,18 +88,12 @@ public class BookingServiceUtilTest { @MockBean private RegistrationBookingRepository registrationBookingRepository; - @MockBean(name="restTemplate") + @MockBean(name = "restTemplate") RestTemplate restTemplate; @MockBean private RequestValidator requestValidator; -// @MockBean -// private DemographicServiceIntf demographicServiceIntf; -// -// @MockBean -// private DocumentServiceIntf documentServiceIntf; - @MockBean ObjectMapper mapper; @@ -122,7 +111,7 @@ public class BookingServiceUtilTest { RegistrationCenterResponseDto regCenDto = new RegistrationCenterResponseDto(); RegistrationCenterDto centerDto = new RegistrationCenterDto(); List centerList = new ArrayList<>(); - + LocalTime startTime; LocalTime endTime; LocalTime perKioskTime; @@ -131,10 +120,10 @@ public class BookingServiceUtilTest { LocalTime localTime1; LocalTime localTime2; DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - + @Before - public void setup() throws Exception { - + public void setup() throws Exception { + String date3 = "2016-11-09 00:20:00"; String date4 = "2016-11-09 13:00:00"; String date5 = "2016-11-09 14:20:00"; @@ -167,8 +156,6 @@ public void setup() throws Exception { centerList.add(centerDto); regCenDto.setRegistrationCenters(centerList); } - - @Test public void mandatoryParameterCheckTest() { @@ -331,6 +318,7 @@ public void validateAppointmentDateExceptionTest() { } @Test(expected = InvalidDateTimeFormatException.class) + @Ignore public void validateAppointmentTimeExceptionTest() { Calendar cal = Calendar.getInstance(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); @@ -361,38 +349,42 @@ public void bookingPreIdNotFoundExceptionforCancelTest() { } - // @Test(expected=BookingRegistrationCenterIdNotFoundException.class) - public void bookingRegistrationCenterIdNotFoundExceptionforCancelTest() { - - CancelBookingDTO cancelBookingDTO = new CancelBookingDTO(); - cancelBookingDTO.setRegistrationCenterId(null); - serviceUtil.mandatoryParameterCheckforCancel("23587986034785"); - - } - - // @Test(expected=BookingDateNotSeletectedException.class) - public void bookingDateNotSeletectedExceptionforCancelTest() { - - CancelBookingDTO cancelBookingDTO = new CancelBookingDTO(); - cancelBookingDTO.setRegistrationCenterId("1"); - cancelBookingDTO.setSlotFromTime("09:00"); - cancelBookingDTO.setSlotToTime("09:13"); - cancelBookingDTO.setRegDate(null); - serviceUtil.mandatoryParameterCheckforCancel("23587986034785"); - - } - - // @Test(expected=BookingTimeSlotNotSeletectedException.class) - public void bookingTimeSlotNotSeletectedExceptionforCancelTest() { - - CancelBookingDTO cancelBookingDTO = new CancelBookingDTO(); - cancelBookingDTO.setRegistrationCenterId("1"); - cancelBookingDTO.setRegDate("2018-12-06"); - cancelBookingDTO.setSlotFromTime(null); - cancelBookingDTO.setSlotToTime(null); - serviceUtil.mandatoryParameterCheckforCancel("23587986034785"); - - } + /* + * @Test(expected=BookingRegistrationCenterIdNotFoundException.class) public + * void bookingRegistrationCenterIdNotFoundExceptionforCancelTest() { + * + * CancelBookingDTO cancelBookingDTO = new CancelBookingDTO(); + * cancelBookingDTO.setRegistrationCenterId(null); + * serviceUtil.mandatoryParameterCheckforCancel("23587986034785"); + * + * } + */ + + /* + * @Test(expected=BookingDateNotSeletectedException.class) public void + * bookingDateNotSeletectedExceptionforCancelTest() { + * + * CancelBookingDTO cancelBookingDTO = new CancelBookingDTO(); + * cancelBookingDTO.setRegistrationCenterId("1"); + * cancelBookingDTO.setSlotFromTime("09:00"); + * cancelBookingDTO.setSlotToTime("09:13"); cancelBookingDTO.setRegDate(null); + * serviceUtil.mandatoryParameterCheckforCancel("23587986034785"); + * + * } + */ + + /* + * @Test(expected=BookingTimeSlotNotSeletectedException.class) public void + * bookingTimeSlotNotSeletectedExceptionforCancelTest() { + * + * CancelBookingDTO cancelBookingDTO = new CancelBookingDTO(); + * cancelBookingDTO.setRegistrationCenterId("1"); + * cancelBookingDTO.setRegDate("2018-12-06"); + * cancelBookingDTO.setSlotFromTime(null); cancelBookingDTO.setSlotToTime(null); + * serviceUtil.mandatoryParameterCheckforCancel("23587986034785"); + * + * } + */ @Test(expected = MasterDataNotAvailableException.class) public void callRegCenterDateRestServiceTest() { @@ -421,88 +413,90 @@ public void HttpClientErrorExceptionTest() { } -// @Test(expected = DemographicStatusUpdationException.class) -// public void callUpdateStatusRestServiceTest() { - -// Map map = new HashMap<>(); -// map.put("pre_rgistration_id", "23587986034785"); - -// RestClientException ex = new RestClientException(null); -// MainResponseDTO preRegResponse = new MainResponseDTO<>(); -// preRegResponse.setResponse(null); -// ExceptionJSONInfoDTO err = new ExceptionJSONInfoDTO(); -// List errList = new ArrayList<>(); -// err.setErrorCode(ErrorCodes.PRG_BOOK_RCI_011.name()); -// err.setMessage(ErrorMessages.DEMOGRAPHIC_STATUS_UPDATION_FAILED.getMessage()); -// errList.add(err); -// preRegResponse.setErrors(errList); -// preRegResponse.setResponsetime(serviceUtil.getCurrentResponseTime()); -// MainResponseDTO updatePreRegistrationStatus = new MainResponseDTO<>(); -// updatePreRegistrationStatus.setErrors(errList); -// Mockito.when(serviceUtil.updatePreRegistrationStatus("23587986034785", "Pending_Appointment")).thenReturn(updatePreRegistrationStatus); -// serviceUtil.updateDemographicStatus("23587986034785", "Pending_Appointment"); - -// } - - - -// @SuppressWarnings("unchecked") -// @Test(expected = BookingDataNotFoundException.class) -// public void callGetStatusRestServiceforCancelTest() { - -// List statusList = new ArrayList<>(); -// PreRegistartionStatusDTO preRegistartionStatusDTO = new PreRegistartionStatusDTO(); -// @SuppressWarnings("rawtypes") -// MainResponseDTO preRegResponse = new MainResponseDTO(); -// preRegistartionStatusDTO.setStatusCode(StatusCodes.PENDING_APPOINTMENT.getCode()); -// preRegistartionStatusDTO.setPreRegistartionId("23587986034785"); -// statusList.add(preRegistartionStatusDTO); - -// preRegResponse.setResponse(preRegistartionStatusDTO); -// preRegResponse.setErrors(null); -// preRegResponse.setResponsetime(serviceUtil.getCurrentResponseTime()); -// Mockito.when(serviceUtil.getApplicationStatus("23587986034785")).thenReturn(preRegResponse); -// serviceUtil.getDemographicStatusForCancel("23587986034785"); - -// } - - -// @Test(expected = DemographicGetStatusException.class) - public void callGetStatusRestServiceforCancel1Test() { - - @SuppressWarnings("rawtypes") - MainResponseDTO preRegResponse = new MainResponseDTO(); - ExceptionJSONInfoDTO err = new ExceptionJSONInfoDTO(); - err.setErrorCode(ErrorCodes.PRG_BOOK_RCI_011.name()); - err.setMessage(ErrorMessages.DEMOGRAPHIC_STATUS_UPDATION_FAILED.getMessage()); - List list = new ArrayList<>(); - list.add(err); - preRegResponse.setErrors(list); - preRegResponse.setResponsetime(serviceUtil.getCurrentResponseTime()); - @SuppressWarnings("unchecked") - ResponseEntity> res = new ResponseEntity<>(preRegResponse, - HttpStatus.OK); - Mockito.when(restTemplate.exchange(Mockito.anyString(), Mockito.eq(HttpMethod.GET), Mockito.any(), - Mockito.eq(new ParameterizedTypeReference>() { - }), Mockito.anyMap())).thenReturn(res); - serviceUtil.getDemographicStatusForCancel("23587986034785"); - - } - -// @Test(expected = DemographicGetStatusException.class) -// public void callGetStatusRestService1Test() { -// MainResponseDTO getApplicationStatus = new MainResponseDTO<>(); -// List ex = new ArrayList(); -// ExceptionJSONInfoDTO err = new ExceptionJSONInfoDTO(); -// err.setErrorCode(ErrorCodes.PRG_BOOK_RCI_011.name()); -// err.setMessage(ErrorMessages.DEMOGRAPHIC_STATUS_UPDATION_FAILED.getMessage()); -// ex.add(err); -// getApplicationStatus.setErrors(ex); -// Mockito.when(serviceUtil.getApplicationStatus("23587986034785")).thenReturn(getApplicationStatus); -// serviceUtil.getDemographicStatus("23587986034785"); - -// } - + /* + * @Test(expected = DemographicStatusUpdationException.class) public void + * callUpdateStatusRestServiceTest() { + * + * Map map = new HashMap<>(); map.put("pre_rgistration_id", + * "23587986034785"); + * + * RestClientException ex = new RestClientException(null); + * MainResponseDTO preRegResponse = new MainResponseDTO<>(); + * preRegResponse.setResponse(null); ExceptionJSONInfoDTO err = new + * ExceptionJSONInfoDTO(); List errList = new + * ArrayList<>(); err.setErrorCode(ErrorCodes.PRG_BOOK_RCI_011.name()); + * err.setMessage(ErrorMessages.DEMOGRAPHIC_STATUS_UPDATION_FAILED.getMessage()) + * ; errList.add(err); preRegResponse.setErrors(errList); + * preRegResponse.setResponsetime(serviceUtil.getCurrentResponseTime()); + * MainResponseDTO updatePreRegistrationStatus = new + * MainResponseDTO<>(); updatePreRegistrationStatus.setErrors(errList); + * Mockito.when(serviceUtil.updatePreRegistrationStatus("23587986034785", + * "Pending_Appointment")) .thenReturn(updatePreRegistrationStatus); + * serviceUtil.updateDemographicStatus("23587986034785", "Pending_Appointment"); + * + * } + * + * @SuppressWarnings("unchecked") + * + * @Test(expected = BookingDataNotFoundException.class) public void + * callGetStatusRestServiceforCancelTest() { + * + * List statusList = new ArrayList<>(); + * PreRegistartionStatusDTO preRegistartionStatusDTO = new + * PreRegistartionStatusDTO(); + * + * @SuppressWarnings("rawtypes") MainResponseDTO preRegResponse = new + * MainResponseDTO(); + * preRegistartionStatusDTO.setStatusCode(StatusCodes.PENDING_APPOINTMENT. + * getCode()); preRegistartionStatusDTO.setPreRegistartionId("23587986034785"); + * statusList.add(preRegistartionStatusDTO); + * + * preRegResponse.setResponse(preRegistartionStatusDTO); + * preRegResponse.setErrors(null); + * preRegResponse.setResponsetime(serviceUtil.getCurrentResponseTime()); + * Mockito.when(serviceUtil.getApplicationStatus("23587986034785")).thenReturn( + * preRegResponse); serviceUtil.getDemographicStatusForCancel("23587986034785"); + * + * } + */ + /* + * @Test(expected = DemographicGetStatusException.class) public void + * callGetStatusRestServiceforCancel1Test() { + * + * @SuppressWarnings("rawtypes") MainResponseDTO preRegResponse = new + * MainResponseDTO(); ExceptionJSONInfoDTO err = new ExceptionJSONInfoDTO(); + * err.setErrorCode(ErrorCodes.PRG_BOOK_RCI_011.name()); + * err.setMessage(ErrorMessages.DEMOGRAPHIC_STATUS_UPDATION_FAILED.getMessage()) + * ; List list = new ArrayList<>(); list.add(err); + * preRegResponse.setErrors(list); + * preRegResponse.setResponsetime(serviceUtil.getCurrentResponseTime()); + * + * @SuppressWarnings("unchecked") + * ResponseEntity> res = new + * ResponseEntity<>(preRegResponse, HttpStatus.OK); + * Mockito.when(restTemplate.exchange(Mockito.anyString(), + * Mockito.eq(HttpMethod.GET), Mockito.any(), Mockito.eq(new + * ParameterizedTypeReference>() { }), + * Mockito.anyMap())).thenReturn(res); + * serviceUtil.getDemographicStatusForCancel("23587986034785"); + * + * } + */ + + /* + * @Test(expected = DemographicGetStatusException.class) public void + * callGetStatusRestService1Test() { MainResponseDTO + * getApplicationStatus = new MainResponseDTO<>(); List ex + * = new ArrayList(); ExceptionJSONInfoDTO err = new + * ExceptionJSONInfoDTO(); err.setErrorCode(ErrorCodes.PRG_BOOK_RCI_011.name()); + * err.setMessage(ErrorMessages.DEMOGRAPHIC_STATUS_UPDATION_FAILED.getMessage()) + * ; ex.add(err); getApplicationStatus.setErrors(ex); + * Mockito.when(serviceUtil.getApplicationStatus("23587986034785")).thenReturn( + * getApplicationStatus); serviceUtil.getDemographicStatus("23587986034785"); + * + * } + */ + @Test public void isValidRegCenterTest() { ResponseWrapper resp = new ResponseWrapper<>(); @@ -513,8 +507,8 @@ public void isValidRegCenterTest() { }))).thenReturn(res); serviceUtil.isValidRegCenter("10001"); } - - @Test(expected=RecordNotFoundException.class) + + @Test(expected = RecordNotFoundException.class) public void isValidRegCenterTestException() { ResponseWrapper resp = new ResponseWrapper<>(); regCenDto.getRegistrationCenters().get(0).setId("1"); @@ -525,40 +519,40 @@ public void isValidRegCenterTestException() { }))).thenReturn(res); serviceUtil.isValidRegCenter("10001"); } - + @Test - public void validateFromDateAndToDateTest(){ - String format="yyyy-MM-dd"; + public void validateFromDateAndToDateTest() { + String format = "yyyy-MM-dd"; String todate = "2019-11-15"; - String fromdate ="2019-11-05"; + String fromdate = "2019-11-05"; serviceUtil.validateFromDateAndToDate(fromdate, todate, format); } - - @Test(expected=InvalidDateTimeFormatException.class) - public void validateFromDateAndToDateTestEx1(){ - String format="yyyy-MM-dd"; + + @Test(expected = InvalidDateTimeFormatException.class) + public void validateFromDateAndToDateTestEx1() { + String format = "yyyy-MM-dd"; String todate = "2019-11-15"; - String fromdate =new Date().toString(); + String fromdate = new Date().toString(); serviceUtil.validateFromDateAndToDate(fromdate, todate, format); } - - @Test(expected=InvalidDateTimeFormatException.class) - public void validateFromDateAndToDateTestEx2(){ - String format="yyyy-MM-dd"; + + @Test(expected = InvalidDateTimeFormatException.class) + public void validateFromDateAndToDateTestEx2() { + String format = "yyyy-MM-dd"; String todate = "2019-11-15"; - String fromdate =""; + String fromdate = ""; serviceUtil.validateFromDateAndToDate(fromdate, todate, format); } - - @Test(expected=InvalidDateTimeFormatException.class) - public void validateFromDateAndToDateTestEx3(){ - String format="yyyy-MM-dd"; + + @Test(expected = InvalidDateTimeFormatException.class) + public void validateFromDateAndToDateTestEx3() { + String format = "yyyy-MM-dd"; String todate = "2019-11-05"; - String fromdate ="2019-11-15"; + String fromdate = "2019-11-15"; serviceUtil.validateFromDateAndToDate(fromdate, todate, format); } - - @Test(expected=NullPointerException.class) + + @Test(expected = NullPointerException.class) public void emailNotificationTest() throws JsonProcessingException { NotificationDTO dto = new NotificationDTO(); dto.setEmailID("rajath@gmail.com"); @@ -575,18 +569,17 @@ public void emailNotificationTest() throws JsonProcessingException { }))).thenReturn(res); serviceUtil.emailNotification(dto, "eng"); } - + @Test - public void bookingEntitySetterTest() - { - BookingRequestDTO bookingRequestDTO= new BookingRequestDTO(); + public void bookingEntitySetterTest() { + BookingRequestDTO bookingRequestDTO = new BookingRequestDTO(); bookingRequestDTO.setRegistrationCenterId("1"); bookingRequestDTO.setSlotFromTime("09:00"); bookingRequestDTO.setSlotToTime("09:13"); bookingRequestDTO.setRegDate("2018-12-06"); serviceUtil.bookingEntitySetter("1234568687844744", bookingRequestDTO); } - + @Test public void prepareRequestMapTest() { MainRequestDTO requestDto = new MainRequestDTO<>(); @@ -597,14 +590,14 @@ public void prepareRequestMapTest() { requestDto.setRequesttime(date); serviceUtil.prepareRequestMap(requestDto); } - + @Test public void slotSetter() { List dateList = new ArrayList<>(); SlotDto slots = new SlotDto(); DateTimeDto dateDto = new DateTimeDto(); List slotsList = new ArrayList<>(); - List availabilityList= new ArrayList<>(); + List availabilityList = new ArrayList<>(); AvailibityEntity availableEntity = new AvailibityEntity(); String date1 = "2016-11-09 09:00:00"; String date2 = "2016-11-09 09:20:00"; @@ -631,29 +624,29 @@ public void slotSetter() { availabilityList.add(availableEntity); serviceUtil.slotSetter(availableEntity.getRegDate(), dateList, dateDto, availabilityList); } - - @Test(expected=TimeSpanException.class) + + @Test(expected = TimeSpanException.class) public void timeSpanCheckForCancel() { - LocalDateTime time= LocalDateTime.now(); + LocalDateTime time = LocalDateTime.now(); serviceUtil.timeSpanCheckForCancle(time); } - + @Test public void timeSpanCheckForCancel1() { - LocalDateTime time= LocalDateTime.now().plusDays(3); + LocalDateTime time = LocalDateTime.now().plusDays(3); serviceUtil.timeSpanCheckForCancle(time); } - - @Test(expected=TimeSpanException.class) + + @Test(expected = TimeSpanException.class) public void timeSpanCheckForRebook() { - LocalDateTime time= LocalDateTime.now(); + LocalDateTime time = LocalDateTime.now(); serviceUtil.timeSpanCheckForRebook(time, new Date()); } - + @Test public void timeSpanCheckForRebook1() { - LocalDateTime time= LocalDateTime.now().plusDays(3); - serviceUtil.timeSpanCheckForRebook(time,new Date()); + LocalDateTime time = LocalDateTime.now().plusDays(3); + serviceUtil.timeSpanCheckForRebook(time, new Date()); } } diff --git a/pre-registration-ui/angular.json b/pre-registration-ui/angular.json index e372ce1ebd2..a2bc890374a 100644 --- a/pre-registration-ui/angular.json +++ b/pre-registration-ui/angular.json @@ -18,8 +18,15 @@ "main": "src/main.ts", "polyfills": "src/polyfills.ts", "tsConfig": "src/tsconfig.app.json", - "assets": ["src/favicon.ico", "src/assets", "src/assets/i18n"], - "styles": ["./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", "src/styles.css"], + "assets": [ + "src/favicon.ico", + "src/assets", + "src/assets/i18n" + ], + "styles": [ + "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", + "src/styles.css" + ], "scripts": [] }, "configurations": { @@ -66,16 +73,27 @@ "polyfills": "src/polyfills.ts", "tsConfig": "src/tsconfig.spec.json", "karmaConfig": "src/karma.conf.js", - "styles": ["./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", "src/styles.css"], + "styles": [ + "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", + "src/styles.css" + ], "scripts": [], - "assets": ["src/favicon.ico", "src/assets"] + "assets": [ + "src/favicon.ico", + "src/assets" + ] } }, "lint": { "builder": "@angular-devkit/build-angular:tslint", "options": { - "tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"], - "exclude": ["**/node_modules/**"] + "tsConfig": [ + "src/tsconfig.app.json", + "src/tsconfig.spec.json" + ], + "exclude": [ + "**/node_modules/**" + ] } } } @@ -100,11 +118,16 @@ "builder": "@angular-devkit/build-angular:tslint", "options": { "tsConfig": "e2e/tsconfig.e2e.json", - "exclude": ["**/node_modules/**"] + "exclude": [ + "**/node_modules/**" + ] } } } } }, - "defaultProject": "pre-registration" -} + "defaultProject": "pre-registration", + "cli": { + "analytics": "8156d0ec-e80c-4bb1-9003-0adcfa7fe49e" + } +} \ No newline at end of file diff --git a/pre-registration-ui/package-lock.json b/pre-registration-ui/package-lock.json index 60c605d21c6..538024295f7 100644 --- a/pre-registration-ui/package-lock.json +++ b/pre-registration-ui/package-lock.json @@ -1,117 +1,231 @@ { "name": "pre-registration", - "version": "1.0.9", + "version": "1.1.3", "lockfileVersion": 1, "requires": true, "dependencies": { "@angular-devkit/architect": { - "version": "0.7.5", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.7.5.tgz", - "integrity": "sha512-zwCpGdx3JDE+Y+LiWh9ErRX+fpFPTRHtEd2PDJmfQsdlIWfjxSR5U9vi3+bSRW2n6IFiH2GCYMS31R64rfMwbg==", - "dev": true, + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.0.tgz", + "integrity": "sha512-oDBrWlfKh/0t2ag4T8gz9xzPMItxfctinlsHxhw7dPQ+etq1mIcWgQkiKiDrz4l46YiGipBRlC55j+6f37omAA==", "requires": { - "@angular-devkit/core": "0.7.5", + "@angular-devkit/core": "7.3.0", "rxjs": "6.3.3" + }, + "dependencies": { + "rxjs": { + "version": "6.3.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz", + "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", + "requires": { + "tslib": "^1.9.0" + } + } } }, "@angular-devkit/build-angular": { - "version": "0.7.5", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.7.5.tgz", - "integrity": "sha512-FYd2RigCbvm1i0aM1p+jO2145qm56iPgcW2TK3LBxllWFoz5v+wb086/aDzATG+2ETDZO1uENiVTWu5RSkYcSw==", - "dev": true, - "requires": { - "@angular-devkit/architect": "0.7.5", - "@angular-devkit/build-optimizer": "0.7.5", - "@angular-devkit/build-webpack": "0.7.5", - "@angular-devkit/core": "0.7.5", - "@ngtools/webpack": "6.1.5", - "ajv": "6.4.0", - "autoprefixer": "8.6.5", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.13.0.tgz", + "integrity": "sha512-JjoSXbmwOsuDJxngyChr6aOSZ2qsrvSL1MHwqgXhZswmC/KghBF0aZ7y8Wzr27zDCQ174Axts7+IAk6b+aWIqw==", + "requires": { + "@angular-devkit/architect": "0.13.0", + "@angular-devkit/build-optimizer": "0.13.0", + "@angular-devkit/build-webpack": "0.13.0", + "@angular-devkit/core": "7.3.0", + "@ngtools/webpack": "7.3.0", + "ajv": "6.7.0", + "autoprefixer": "9.4.6", "circular-dependency-plugin": "5.0.2", "clean-css": "4.2.1", - "copy-webpack-plugin": "4.5.4", - "file-loader": "1.1.11", + "copy-webpack-plugin": "4.6.0", + "file-loader": "3.0.1", "glob": "7.1.3", - "html-webpack-plugin": "3.2.0", "istanbul": "0.4.5", "istanbul-instrumenter-loader": "3.0.1", "karma-source-map-support": "1.3.0", - "less": "3.8.1", + "less": "3.9.0", "less-loader": "4.1.0", - "license-webpack-plugin": "1.5.0", - "loader-utils": "1.1.0", - "mini-css-extract-plugin": "0.4.4", + "license-webpack-plugin": "2.1.0", + "loader-utils": "1.2.3", + "mini-css-extract-plugin": "0.5.0", "minimatch": "3.0.4", - "node-sass": "4.9.4", + "node-sass": "4.11.0", "opn": "5.4.0", "parse5": "4.0.0", - "portfinder": "1.0.19", - "postcss": "6.0.23", - "postcss-import": "11.1.0", - "postcss-loader": "2.1.6", - "postcss-url": "7.3.2", - "raw-loader": "0.5.1", + "postcss": "7.0.14", + "postcss-import": "12.0.1", + "postcss-loader": "3.0.0", + "raw-loader": "1.0.0", "rxjs": "6.3.3", - "sass-loader": "6.0.7", + "sass-loader": "7.1.0", "semver": "5.6.0", "source-map-loader": "0.2.4", - "source-map-support": "0.5.9", - "stats-webpack-plugin": "0.6.2", - "style-loader": "0.21.0", + "source-map-support": "0.5.10", + "speed-measure-webpack-plugin": "1.3.0", + "stats-webpack-plugin": "0.7.0", + "style-loader": "0.23.1", "stylus": "0.54.5", "stylus-loader": "3.0.2", - "tree-kill": "1.2.0", - "uglifyjs-webpack-plugin": "1.3.0", - "url-loader": "1.1.2", - "webpack": "4.9.2", - "webpack-dev-middleware": "3.4.0", - "webpack-dev-server": "3.1.10", - "webpack-merge": "4.1.4", + "terser-webpack-plugin": "1.2.1", + "tree-kill": "1.2.1", + "webpack": "4.29.0", + "webpack-dev-middleware": "3.5.1", + "webpack-dev-server": "3.1.14", + "webpack-merge": "4.2.1", "webpack-sources": "1.3.0", - "webpack-subresource-integrity": "1.2.0" + "webpack-subresource-integrity": "1.1.0-rc.6" + }, + "dependencies": { + "ajv": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.7.0.tgz", + "integrity": "sha512-RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg==", + "requires": { + "fast-deep-equal": "^2.0.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "fast-deep-equal": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", + "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=" + }, + "glob": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", + "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "requires": { + "wrappy": "1" + } + }, + "parse5": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz", + "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==" + }, + "rxjs": { + "version": "6.3.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz", + "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", + "requires": { + "tslib": "^1.9.0" + } + }, + "source-map-support": { + "version": "0.5.10", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz", + "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==", + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + } } }, "@angular-devkit/build-optimizer": { - "version": "0.7.5", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.7.5.tgz", - "integrity": "sha512-iZYUjNax6epTA4JjnDxhs6MQUtmwM04ZkJkTE3tVc01e80+wJ/f3+ja22BBVul2MsqchOsTUSQIJY3HxbV5aWw==", - "dev": true, + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.13.0.tgz", + "integrity": "sha512-fhWuzbMVV/UNYE7rHSKutrWTCZle34N5cdtFz6qhK1k/wn7Vmtg9cFOwzx0SPdIlOEn576NB4DS/4UG3B5WCUQ==", "requires": { - "loader-utils": "1.1.0", - "source-map": "0.5.7", - "typescript": "2.9.2", + "loader-utils": "1.2.3", + "source-map": "0.5.6", + "typescript": "3.2.4", "webpack-sources": "1.3.0" }, "dependencies": { + "source-map": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", + "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=" + }, "typescript": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz", - "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==", - "dev": true + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz", + "integrity": "sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==" } } }, "@angular-devkit/build-webpack": { - "version": "0.7.5", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.7.5.tgz", - "integrity": "sha512-PSkhBwJBLRMiBUGlK15CaVwbU4RzfCdF/GFS/CZSCsA3plLDJy+vXAPrUiuGvqYt/sVKBRavsNaEBCbK1t+1ig==", - "dev": true, + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.13.0.tgz", + "integrity": "sha512-idtFoSbQ3Y3WqXlDlU7oTPV9TIU1kjLqce0nK1Kst+t40GTc+Q4iUJJ7KsKE3nV6TPyrL1N/IvIF7+hSJnYm8A==", "requires": { - "@angular-devkit/architect": "0.7.5", - "@angular-devkit/core": "0.7.5", + "@angular-devkit/architect": "0.13.0", + "@angular-devkit/core": "7.3.0", "rxjs": "6.3.3" + }, + "dependencies": { + "rxjs": { + "version": "6.3.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz", + "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", + "requires": { + "tslib": "^1.9.0" + } + } } }, "@angular-devkit/core": { - "version": "0.7.5", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.7.5.tgz", - "integrity": "sha512-r99BZvvuNAqSRm05jXfx0sb3Ip0zvHPtAM6NReXzWPoqaVFpjVUdj/CKA+9HWG/Zt9meG9pEQt/HKK8UXaZDVA==", - "dev": true, + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.0.tgz", + "integrity": "sha512-b0qtAUpgqLpWY8W6vWRv1aj6bXkZCP1rvywl8i8TbGMY67CWRcy5J3fNAMmjiZS+LJixFlIXYf4iOydglyJMfg==", "requires": { - "ajv": "6.4.0", + "ajv": "6.7.0", "chokidar": "2.0.4", + "fast-json-stable-stringify": "2.0.0", "rxjs": "6.3.3", - "source-map": "0.5.7" + "source-map": "0.7.3" + }, + "dependencies": { + "ajv": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.7.0.tgz", + "integrity": "sha512-RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg==", + "requires": { + "fast-deep-equal": "^2.0.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "fast-deep-equal": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", + "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=" + }, + "fast-json-stable-stringify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", + "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" + }, + "rxjs": { + "version": "6.3.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz", + "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", + "requires": { + "tslib": "^1.9.0" + } + }, + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" + } } }, "@angular-devkit/schematics": { @@ -143,10 +257,76 @@ "integrity": "sha512-FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g==", "dev": true, "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" + "fast-deep-equal": "^2.0.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "anymatch": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", + "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", + "dev": true, + "requires": { + "micromatch": "^3.1.4", + "normalize-path": "^2.1.1" + } + }, + "binary-extensions": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", + "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", + "dev": true + }, + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, + "requires": { + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "chokidar": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz", + "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==", + "dev": true, + "requires": { + "anymatch": "^2.0.0", + "async-each": "^1.0.0", + "braces": "^2.3.0", + "fsevents": "^1.2.2", + "glob-parent": "^3.1.0", + "inherits": "^2.0.1", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "lodash.debounce": "^4.0.8", + "normalize-path": "^2.1.1", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.0.0", + "upath": "^1.0.5" } }, "fast-deep-equal": { @@ -155,25 +335,160 @@ "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", "dev": true }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "fast-json-stable-stringify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", + "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", "dev": true }, + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "dev": true, + "requires": { + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "dev": true, + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } + }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "dev": true, + "requires": { + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" + }, + "dependencies": { + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "dev": true, + "requires": { + "is-extglob": "^2.1.0" + } + } + } + }, + "is-binary-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", + "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", + "dev": true, + "requires": { + "binary-extensions": "^1.0.0" + } + }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "micromatch": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "dev": true, + "requires": { + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" + } + }, + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true, + "requires": { + "remove-trailing-separator": "^1.0.1" + } + }, + "readdirp": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", + "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.11", + "micromatch": "^3.1.10", + "readable-stream": "^2.0.2" + } + }, + "rxjs": { + "version": "6.3.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz", + "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, "source-map": { "version": "0.7.3", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", "dev": true }, - "uri-js": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", + "to-regex-range": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, "requires": { - "punycode": "2.1.1" + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" } } } @@ -183,24 +498,16 @@ "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-7.2.0.tgz", "integrity": "sha512-xi832o3YN+eYSV4PDRllc8JwkH4aKPlb7NZ0UaqchOmz9/jQcykCEMZDzQAZUgHG1ohay6JBVaV8/zNcbSsRCA==", "requires": { - "tslib": "1.9.3" + "tslib": "^1.9.0" } }, "@angular/cdk": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-7.2.1.tgz", - "integrity": "sha512-oU1Pjq3JkDtkXquLxWK84A2jOCeYRf352dVGbQCxWoSOQ5KBtMAd42huGidPiOSHN6/f7xZwL3n4fq3fVIut8A==", + "version": "7.3.7", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-7.3.7.tgz", + "integrity": "sha512-xbXxhHHKGkVuW6K7pzPmvpJXIwpl0ykBnvA2g+/7Sgy5Pd35wCC+UtHD9RYczDM/mkygNxMQtagyCErwFnDtQA==", "requires": { - "parse5": "5.1.0", - "tslib": "1.9.3" - }, - "dependencies": { - "parse5": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz", - "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==", - "optional": true - } + "parse5": "^5.0.0", + "tslib": "^1.7.1" } }, "@angular/cli": { @@ -249,10 +556,76 @@ "integrity": "sha512-FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g==", "dev": true, "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" + "fast-deep-equal": "^2.0.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "anymatch": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", + "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", + "dev": true, + "requires": { + "micromatch": "^3.1.4", + "normalize-path": "^2.1.1" + } + }, + "binary-extensions": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", + "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", + "dev": true + }, + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, + "requires": { + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "chokidar": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz", + "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==", + "dev": true, + "requires": { + "anymatch": "^2.0.0", + "async-each": "^1.0.0", + "braces": "^2.3.0", + "fsevents": "^1.2.2", + "glob-parent": "^3.1.0", + "inherits": "^2.0.1", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "lodash.debounce": "^4.0.8", + "normalize-path": "^2.1.1", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.0.0", + "upath": "^1.0.5" } }, "fast-deep-equal": { @@ -261,19 +634,159 @@ "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", "dev": true }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "fast-json-stable-stringify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", + "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", + "dev": true + }, + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "dev": true, + "requires": { + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "dev": true, + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } + }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "dev": true, + "requires": { + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" + }, + "dependencies": { + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "dev": true, + "requires": { + "is-extglob": "^2.1.0" + } + } + } + }, + "is-binary-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", + "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", + "dev": true, + "requires": { + "binary-extensions": "^1.0.0" + } + }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "is-wsl": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", + "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=", "dev": true }, + "micromatch": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "dev": true, + "requires": { + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" + } + }, + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true, + "requires": { + "remove-trailing-separator": "^1.0.1" + } + }, "opn": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz", "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==", "dev": true, "requires": { - "is-wsl": "1.1.0" + "is-wsl": "^1.1.0" + } + }, + "readdirp": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", + "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.11", + "micromatch": "^3.1.10", + "readable-stream": "^2.0.2" + } + }, + "rxjs": { + "version": "6.3.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz", + "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", + "dev": true, + "requires": { + "tslib": "^1.9.0" } }, "semver": { @@ -288,13 +801,14 @@ "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", "dev": true }, - "uri-js": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", + "to-regex-range": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, "requires": { - "punycode": "2.1.1" + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" } } } @@ -304,7 +818,7 @@ "resolved": "https://registry.npmjs.org/@angular/common/-/common-7.2.0.tgz", "integrity": "sha512-5HNGT+XsY+7sQcNoFRqhbUfVdnBAtXaupmMbBclnQHTon9y9Ijp0ocYi7zxx39feo6xYF5HhBMnDPkFgtAnsYQ==", "requires": { - "tslib": "1.9.3" + "tslib": "^1.9.0" } }, "@angular/compiler": { @@ -312,7 +826,7 @@ "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-7.2.0.tgz", "integrity": "sha512-On1qj4yQoIGxGOQ09ohTq0QNjrIJtWcwnCXYAEEyc83eadBMOqiFh6SUMgX1O+B7BIB4mebFw/n/etez0A21xw==", "requires": { - "tslib": "1.9.3" + "tslib": "^1.9.0" } }, "@angular/compiler-cli": { @@ -322,15 +836,15 @@ "dev": true, "requires": { "canonical-path": "1.0.0", - "chokidar": "1.7.0", - "convert-source-map": "1.6.0", - "dependency-graph": "0.7.2", - "magic-string": "0.25.1", - "minimist": "1.2.0", - "reflect-metadata": "0.1.12", - "shelljs": "0.8.3", - "source-map": "0.6.1", - "tslib": "1.9.3", + "chokidar": "^1.4.2", + "convert-source-map": "^1.5.1", + "dependency-graph": "^0.7.2", + "magic-string": "^0.25.0", + "minimist": "^1.2.0", + "reflect-metadata": "^0.1.2", + "shelljs": "^0.8.1", + "source-map": "^0.6.1", + "tslib": "^1.9.0", "yargs": "9.0.1" }, "dependencies": { @@ -346,8 +860,8 @@ "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", "dev": true, "requires": { - "micromatch": "2.3.11", - "normalize-path": "2.1.1" + "micromatch": "^2.1.5", + "normalize-path": "^2.0.0" } }, "arr-diff": { @@ -356,7 +870,7 @@ "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", "dev": true, "requires": { - "arr-flatten": "1.1.0" + "arr-flatten": "^1.0.1" } }, "array-unique": { @@ -365,15 +879,21 @@ "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", "dev": true }, + "binary-extensions": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", + "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", + "dev": true + }, "braces": { "version": "1.8.5", "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", "dev": true, "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.3" + "expand-range": "^1.8.1", + "preserve": "^0.2.0", + "repeat-element": "^1.1.2" } }, "camelcase": { @@ -388,41 +908,48 @@ "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", "dev": true, "requires": { - "anymatch": "1.3.2", - "async-each": "1.0.1", - "fsevents": "1.2.4", - "glob-parent": "2.0.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "2.0.1", - "path-is-absolute": "1.0.1", - "readdirp": "2.2.1" + "anymatch": "^1.3.0", + "async-each": "^1.0.0", + "fsevents": "^1.0.0", + "glob-parent": "^2.0.0", + "inherits": "^2.0.1", + "is-binary-path": "^1.0.0", + "is-glob": "^2.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.0.0" } }, - "cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "cliui": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "dev": true, "requires": { - "lru-cache": "4.1.3", - "shebang-command": "1.2.0", - "which": "1.3.1" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wrap-ansi": "^2.0.0" + }, + "dependencies": { + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dev": true, + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + } } }, - "execa": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, "requires": { - "cross-spawn": "5.1.0", - "get-stream": "3.0.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" + "ms": "2.0.0" } }, "expand-brackets": { @@ -431,7 +958,7 @@ "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", "dev": true, "requires": { - "is-posix-bracket": "0.1.1" + "is-posix-bracket": "^0.1.0" } }, "extglob": { @@ -440,16 +967,118 @@ "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" + } + }, + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "dev": true, + "requires": { + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "dev": true, + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" } }, + "get-caller-file": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", + "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", + "dev": true + }, "glob-parent": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", "dev": true, "requires": { - "is-glob": "2.0.1" + "is-glob": "^2.0.0" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + }, + "dependencies": { + "kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true + } + } + }, + "is-binary-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", + "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", + "dev": true, + "requires": { + "binary-extensions": "^1.0.0" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + }, + "dependencies": { + "kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true + } + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + }, + "dependencies": { + "kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true + } } }, "is-extglob": { @@ -459,10 +1088,13 @@ "dev": true }, "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "dev": true, + "requires": { + "number-is-nan": "^1.0.0" + } }, "is-glob": { "version": "2.0.1", @@ -470,37 +1102,25 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" - } - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" + "is-extglob": "^1.0.0" } }, - "load-json-file": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", - "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "strip-bom": "3.0.0" + "kind-of": "^3.0.2" } }, - "mem": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", - "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "mimic-fn": "1.2.0" + "is-buffer": "^1.1.5" } }, "micromatch": { @@ -509,78 +1129,249 @@ "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", "dev": true, "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.4" - } - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - }, - "os-locale": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", - "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", - "dev": true, - "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" + "arr-diff": "^2.0.0", + "array-unique": "^0.2.1", + "braces": "^1.8.2", + "expand-brackets": "^0.1.4", + "extglob": "^0.3.1", + "filename-regex": "^2.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.1", + "kind-of": "^3.0.2", + "normalize-path": "^2.0.1", + "object.omit": "^2.0.0", + "parse-glob": "^3.0.4", + "regex-cache": "^0.4.2" } }, - "path-type": { + "ms": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", - "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", - "dev": true, - "requires": { - "pify": "2.3.0" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true }, - "read-pkg": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", - "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "dev": true, "requires": { - "load-json-file": "2.0.0", - "normalize-package-data": "2.4.0", - "path-type": "2.0.0" + "remove-trailing-separator": "^1.0.1" } }, - "read-pkg-up": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", - "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", + "readdirp": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", + "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", "dev": true, "requires": { - "find-up": "2.1.0", - "read-pkg": "2.0.0" + "graceful-fs": "^4.1.11", + "micromatch": "^3.1.10", + "readable-stream": "^2.0.2" + }, + "dependencies": { + "arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "dev": true + }, + "array-unique": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", + "dev": true + }, + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, + "requires": { + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "expand-brackets": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "dev": true, + "requires": { + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, + "requires": { + "is-descriptor": "^0.1.0" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + }, + "is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" + } + }, + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true + } + } + }, + "extglob": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", + "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", + "dev": true, + "requires": { + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, + "requires": { + "is-descriptor": "^1.0.0" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true + }, + "micromatch": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "dev": true, + "requires": { + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" + } + } } }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "require-main-filename": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", "dev": true }, "string-width": { @@ -589,30 +1380,59 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + }, + "dependencies": { + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "^3.0.0" + } + } } }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "to-regex-range": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" } }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "dev": true - }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true + "wrap-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "dev": true, + "requires": { + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" + }, + "dependencies": { + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dev": true, + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + } + } }, "y18n": { "version": "3.2.1", @@ -626,19 +1446,19 @@ "integrity": "sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=", "dev": true, "requires": { - "camelcase": "4.1.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.3", - "os-locale": "2.1.0", - "read-pkg-up": "2.0.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "3.2.1", - "yargs-parser": "7.0.0" + "camelcase": "^4.1.0", + "cliui": "^3.2.0", + "decamelize": "^1.1.1", + "get-caller-file": "^1.0.1", + "os-locale": "^2.0.0", + "read-pkg-up": "^2.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1", + "yargs-parser": "^7.0.0" } }, "yargs-parser": { @@ -647,7 +1467,7 @@ "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=", "dev": true, "requires": { - "camelcase": "4.1.0" + "camelcase": "^4.1.0" } } } @@ -657,7 +1477,7 @@ "resolved": "https://registry.npmjs.org/@angular/core/-/core-7.2.0.tgz", "integrity": "sha512-tlCDDM9IknXvVLk1sg0lzCO4OREM54i1bFtTpl5kPtugK6l4kYCOH78UzDPHnOzzI3LGLj8Hb2NiObVa9c4fdg==", "requires": { - "tslib": "1.9.3" + "tslib": "^1.9.0" } }, "@angular/forms": { @@ -665,7 +1485,7 @@ "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-7.2.0.tgz", "integrity": "sha512-vgnKgThitbaSQekTFt8qCFejnBwBMNJDUm7LJFcvRn4wcZKArTARTfSKHudNYCjTEqs9/YT4TJQTm9flVRbUJw==", "requires": { - "tslib": "1.9.3" + "tslib": "^1.9.0" } }, "@angular/http": { @@ -673,7 +1493,7 @@ "resolved": "https://registry.npmjs.org/@angular/http/-/http-7.2.0.tgz", "integrity": "sha512-CoEwfh9LSpyXUh/077nvy1Hheo6mmIFKOmnyo9V7JaesGJYkYpEIVFYFP1hYg7f8snKHclT3gqfQX+BynNhExQ==", "requires": { - "tslib": "1.9.3" + "tslib": "^1.9.0" } }, "@angular/language-service": { @@ -683,19 +1503,19 @@ "dev": true }, "@angular/material": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-7.2.1.tgz", - "integrity": "sha512-d2O+7dDjIl7W1qlOdTfsAgMSrz9NNmPV6zJKqsRpZtkywAwKSwqzOs29XN3GjN2wYxZCnCpQi99l4GgmzPxRzg==", + "version": "7.3.7", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-7.3.7.tgz", + "integrity": "sha512-Eq+7frkeNGkLOfEtmkmJgR+AgoWajOipXZWWfCSamNfpCcPof82DwvGOpAmgGni9FuN2XFQdqP5MoaffQzIvUA==", "requires": { - "tslib": "1.9.3" + "tslib": "^1.7.1" } }, "@angular/material-moment-adapter": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-7.2.1.tgz", - "integrity": "sha512-oaF12PT4fUNp5v5Ls2y0ol2VNr2UDXodAKixfBNv1/kfo+vlWfqTBybChIJhvX72BrDqf2pbuWQIAK/6BuS8Rw==", + "version": "7.3.7", + "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-7.3.7.tgz", + "integrity": "sha512-Nb8hZkF6zcni7Jb+FXcTKKmbp8PhhFAhJSkch9FnKcFs1Py+sCNTLIH/cI53nPrTglkJwlVLwMW7fxj4w9I1CQ==", "requires": { - "tslib": "1.9.3" + "tslib": "^1.7.1" } }, "@angular/platform-browser": { @@ -703,7 +1523,7 @@ "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-7.2.0.tgz", "integrity": "sha512-ClrGYlacK0kexE7eHLfruOjgJl0MtMt7RsMv5i757GUwbOm1dCwG1HK8cLNDZJFHMZodKVKwEGS6/R5Cl6vrNg==", "requires": { - "tslib": "1.9.3" + "tslib": "^1.9.0" } }, "@angular/platform-browser-dynamic": { @@ -711,7 +1531,7 @@ "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.0.tgz", "integrity": "sha512-IiyBcQIQVDZMxfpTYex1QfPmcMubKLgu1pCvQsjr0HmUEySqcykO+FzHlYLf5TTgRrtkI6cP2pYzTHGVR93Gpg==", "requires": { - "tslib": "1.9.3" + "tslib": "^1.9.0" } }, "@angular/router": { @@ -719,173 +1539,167 @@ "resolved": "https://registry.npmjs.org/@angular/router/-/router-7.2.0.tgz", "integrity": "sha512-Jpm0Y5IH30hIQsbnLgi2/LgHbArfE9gWMj/9mDIUOlJeQfGzNVoifBE+zLLJU/wb09+ZtfwGBxkMeDTitH/n2A==", "requires": { - "tslib": "1.9.3" + "tslib": "^1.9.0" } }, "@babel/code-frame": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz", - "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", + "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", "dev": true, "requires": { - "@babel/highlight": "7.0.0" + "@babel/highlight": "^7.10.4" } }, "@babel/generator": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.1.3.tgz", - "integrity": "sha512-ZoCZGcfIJFJuZBqxcY9OjC1KW2lWK64qrX1o4UYL3yshVhwKFYgzpWZ0vvtGMNJdTlvkw0W+HR1VnYN8q3QPFQ==", + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.0.tgz", + "integrity": "sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ==", "dev": true, "requires": { - "@babel/types": "7.1.3", - "jsesc": "2.5.1", - "lodash": "4.17.11", - "source-map": "0.5.7", - "trim-right": "1.0.1" + "@babel/types": "^7.11.0", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" }, "dependencies": { - "jsesc": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.1.tgz", - "integrity": "sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=", + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true } } }, "@babel/helper-function-name": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz", - "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz", + "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==", "dev": true, "requires": { - "@babel/helper-get-function-arity": "7.0.0", - "@babel/template": "7.1.2", - "@babel/types": "7.1.3" + "@babel/helper-get-function-arity": "^7.10.4", + "@babel/template": "^7.10.4", + "@babel/types": "^7.10.4" } }, "@babel/helper-get-function-arity": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz", - "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz", + "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==", "dev": true, "requires": { - "@babel/types": "7.1.3" + "@babel/types": "^7.10.4" } }, "@babel/helper-split-export-declaration": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz", - "integrity": "sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==", + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz", + "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==", "dev": true, "requires": { - "@babel/types": "7.1.3" + "@babel/types": "^7.11.0" } }, + "@babel/helper-validator-identifier": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", + "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", + "dev": true + }, "@babel/highlight": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz", - "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", + "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", "dev": true, "requires": { - "chalk": "2.4.1", - "esutils": "2.0.2", - "js-tokens": "4.0.0" - }, - "dependencies": { - "js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true - } + "@babel/helper-validator-identifier": "^7.10.4", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" } }, "@babel/parser": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.1.3.tgz", - "integrity": "sha512-gqmspPZOMW3MIRb9HlrnbZHXI1/KHTOroBwN1NcLL6pWxzqzEKGvRTq0W/PxS45OtQGbaFikSQpkS5zbnsQm2w==", + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz", + "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==", "dev": true }, "@babel/template": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.1.2.tgz", - "integrity": "sha512-SY1MmplssORfFiLDcOETrW7fCLl+PavlwMh92rrGcikQaRq4iWPVH0MpwPpY3etVMx6RnDjXtr6VZYr/IbP/Ag==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz", + "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==", "dev": true, "requires": { - "@babel/code-frame": "7.0.0", - "@babel/parser": "7.1.3", - "@babel/types": "7.1.3" + "@babel/code-frame": "^7.10.4", + "@babel/parser": "^7.10.4", + "@babel/types": "^7.10.4" } }, "@babel/traverse": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.1.4.tgz", - "integrity": "sha512-my9mdrAIGdDiSVBuMjpn/oXYpva0/EZwWL3sm3Wcy/AVWO2eXnsoZruOT9jOGNRXU8KbCIu5zsKnXcAJ6PcV6Q==", + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz", + "integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==", "dev": true, "requires": { - "@babel/code-frame": "7.0.0", - "@babel/generator": "7.1.3", - "@babel/helper-function-name": "7.1.0", - "@babel/helper-split-export-declaration": "7.0.0", - "@babel/parser": "7.1.3", - "@babel/types": "7.1.3", - "debug": "3.2.6", - "globals": "11.8.0", - "lodash": "4.17.11" + "@babel/code-frame": "^7.10.4", + "@babel/generator": "^7.12.5", + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-split-export-declaration": "^7.11.0", + "@babel/parser": "^7.12.5", + "@babel/types": "^7.12.5", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.19" }, "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "@babel/generator": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz", + "integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==", "dev": true, "requires": { - "ms": "2.1.1" + "@babel/types": "^7.12.5", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" } }, - "globals": { - "version": "11.8.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.8.0.tgz", - "integrity": "sha512-io6LkyPVuzCHBSQV9fmOwxZkUk6nIaGmxheLDgmuFv89j0fm2aqDbIXKAGfzCMHqz3HLF2Zf8WSG6VqMh2qFmA==", - "dev": true - }, - "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true } } }, "@babel/types": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.3.tgz", - "integrity": "sha512-RpPOVfK+yatXyn8n4PB1NW6k9qjinrXrRR8ugBN8fD6hCy5RXI6PSbVqpOJBO9oSaY7Nom4ohj35feb0UR9hSA==", + "version": "7.12.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz", + "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==", "dev": true, "requires": { - "esutils": "2.0.2", - "lodash": "4.17.11", - "to-fast-properties": "2.0.0" - }, - "dependencies": { - "to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", - "dev": true - } + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" } }, "@ngtools/webpack": { - "version": "6.1.5", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-6.1.5.tgz", - "integrity": "sha512-vrvFFvUqo4hlrLRBTG7a3gsAneitd0/tj2zHsiN97RmefxHSS+3m0pkVw8G3BMAagp2L42AiVfNV4wvYDe+TXA==", - "dev": true, + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-7.3.0.tgz", + "integrity": "sha512-U/By0Jlwy7nYwrGNtFirTg1aAsEHBL/9DhfFxPI0iu27FWiMttROuN6hmKbbnOmpbiYAVl5qTy3WXPXUIJjG1A==", "requires": { - "@angular-devkit/core": "0.7.5", + "@angular-devkit/core": "7.3.0", + "enhanced-resolve": "4.1.0", "rxjs": "6.3.3", - "tree-kill": "1.2.0", + "tree-kill": "1.2.1", "webpack-sources": "1.3.0" + }, + "dependencies": { + "rxjs": { + "version": "6.3.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz", + "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", + "requires": { + "tslib": "^1.9.0" + } + } } }, "@ngx-translate/core": { @@ -893,7 +1707,7 @@ "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-10.0.2.tgz", "integrity": "sha512-7nM3DrJaqKswwtJlbu2kuKNl+hE8Isr18sKsKvGGpSxQk+G0gO0reDlx2PhUNus7TJTkA1C59vU/JoN8hIvZ4g==", "requires": { - "tslib": "1.9.3" + "tslib": "^1.9.0" } }, "@ngx-translate/http-loader": { @@ -901,7 +1715,7 @@ "resolved": "https://registry.npmjs.org/@ngx-translate/http-loader/-/http-loader-3.0.1.tgz", "integrity": "sha1-ILD5i8bCUyESnT4zAqs8xInApCo=", "requires": { - "tslib": "1.9.3" + "tslib": "^1.9.0" } }, "@schematics/angular": { @@ -934,10 +1748,76 @@ "integrity": "sha512-FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g==", "dev": true, "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" + "fast-deep-equal": "^2.0.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "anymatch": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", + "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", + "dev": true, + "requires": { + "micromatch": "^3.1.4", + "normalize-path": "^2.1.1" + } + }, + "binary-extensions": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", + "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", + "dev": true + }, + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, + "requires": { + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "chokidar": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz", + "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==", + "dev": true, + "requires": { + "anymatch": "^2.0.0", + "async-each": "^1.0.0", + "braces": "^2.3.0", + "fsevents": "^1.2.2", + "glob-parent": "^3.1.0", + "inherits": "^2.0.1", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "lodash.debounce": "^4.0.8", + "normalize-path": "^2.1.1", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.0.0", + "upath": "^1.0.5" } }, "fast-deep-equal": { @@ -946,25 +1826,160 @@ "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", "dev": true }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "fast-json-stable-stringify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", + "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", "dev": true }, - "source-map": { - "version": "0.7.3", + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "dev": true, + "requires": { + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "dev": true, + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } + }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "dev": true, + "requires": { + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" + }, + "dependencies": { + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "dev": true, + "requires": { + "is-extglob": "^2.1.0" + } + } + } + }, + "is-binary-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", + "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", + "dev": true, + "requires": { + "binary-extensions": "^1.0.0" + } + }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "micromatch": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "dev": true, + "requires": { + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" + } + }, + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true, + "requires": { + "remove-trailing-separator": "^1.0.1" + } + }, + "readdirp": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", + "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.11", + "micromatch": "^3.1.10", + "readable-stream": "^2.0.2" + } + }, + "rxjs": { + "version": "6.3.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz", + "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, + "source-map": { + "version": "0.7.3", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", "dev": true }, - "uri-js": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", + "to-regex-range": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, "requires": { - "punycode": "2.1.1" + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" } } } @@ -1004,10 +2019,76 @@ "integrity": "sha512-FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g==", "dev": true, "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" + "fast-deep-equal": "^2.0.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "anymatch": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", + "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", + "dev": true, + "requires": { + "micromatch": "^3.1.4", + "normalize-path": "^2.1.1" + } + }, + "binary-extensions": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", + "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", + "dev": true + }, + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, + "requires": { + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "chokidar": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz", + "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==", + "dev": true, + "requires": { + "anymatch": "^2.0.0", + "async-each": "^1.0.0", + "braces": "^2.3.0", + "fsevents": "^1.2.2", + "glob-parent": "^3.1.0", + "inherits": "^2.0.1", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "lodash.debounce": "^4.0.8", + "normalize-path": "^2.1.1", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.0.0", + "upath": "^1.0.5" } }, "fast-deep-equal": { @@ -1016,12 +2097,146 @@ "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", "dev": true }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "fast-json-stable-stringify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", + "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", "dev": true }, + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "dev": true, + "requires": { + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "dev": true, + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } + }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "dev": true, + "requires": { + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" + }, + "dependencies": { + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "dev": true, + "requires": { + "is-extglob": "^2.1.0" + } + } + } + }, + "is-binary-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", + "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", + "dev": true, + "requires": { + "binary-extensions": "^1.0.0" + } + }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "micromatch": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "dev": true, + "requires": { + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" + } + }, + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true, + "requires": { + "remove-trailing-separator": "^1.0.1" + } + }, + "readdirp": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", + "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.11", + "micromatch": "^3.1.10", + "readable-stream": "^2.0.2" + } + }, + "rxjs": { + "version": "6.3.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz", + "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, "semver": { "version": "5.5.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz", @@ -1034,13 +2249,14 @@ "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", "dev": true }, - "uri-js": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", + "to-regex-range": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, "requires": { - "punycode": "2.1.1" + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" } } } @@ -1052,286 +2268,215 @@ "optional": true }, "@types/jasmine": { - "version": "2.8.9", - "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.8.9.tgz", - "integrity": "sha512-8dPZwjosElZOGGYw1nwTvOEMof4gjwAWNFS93nBI091BoEfd5drnHOLRMiRF/LOPuMTn5LgEdv0bTUO8QFVuHQ==", + "version": "2.8.17", + "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.8.17.tgz", + "integrity": "sha512-lXmY2lBjE38ASvP7ah38yZwXCdc7DTCKhHqx4J3WGNiVzp134U0BD9VKdL5x9q9AAfhnpJeQr4owL6ZOXhOpfA==", "dev": true }, "@types/jasminewd2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.5.tgz", - "integrity": "sha512-1awkm/O4pQCR9hI2F80HmIOda/L+ogkSL8Arj1k00eue5VLY5ooewhSOyF/cUJE0S+/34uD5EYY3zmd6fu2OCA==", + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.8.tgz", + "integrity": "sha512-d9p31r7Nxk0ZH0U39PTH0hiDlJ+qNVGjlt1ucOoTUptxb2v+Y5VMnsxfwN+i3hK4yQnqBi3FMmoMFcd1JHDxdg==", "dev": true, "requires": { - "@types/jasmine": "2.8.9" + "@types/jasmine": "*" } }, "@types/node": { "version": "8.9.5", - "resolved": "http://registry.npmjs.org/@types/node/-/node-8.9.5.tgz", - "integrity": "sha512-jRHfWsvyMtXdbhnz5CVHxaBgnV6duZnPlQuRSo/dm/GnmikNcmZhxIES4E9OZjUmQ8C+HCl4KJux+cXN/ErGDQ==", - "dev": true + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.9.5.tgz", + "integrity": "sha512-jRHfWsvyMtXdbhnz5CVHxaBgnV6duZnPlQuRSo/dm/GnmikNcmZhxIES4E9OZjUmQ8C+HCl4KJux+cXN/ErGDQ==" }, "@types/pdfjs-dist": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@types/pdfjs-dist/-/pdfjs-dist-2.0.1.tgz", - "integrity": "sha512-BK1GBEEqw2epr95wu6yLxDVjmARZGN9jZQxtWbL1kC21GihkSyzIIr5Hd/2VQHGcWlfcSpQtuK+0MVxrp9SzPQ==" - }, - "@types/q": { - "version": "0.0.32", - "resolved": "http://registry.npmjs.org/@types/q/-/q-0.0.32.tgz", - "integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=", - "dev": true + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/@types/pdfjs-dist/-/pdfjs-dist-2.1.6.tgz", + "integrity": "sha512-atQ3Dqgc3uKjNu9lCW/G7jhl875iXVErkSWoH8gEqMEpHP+GSuhkxAEaEImZCefeolz1tvWNGcZ/0/jCaVM9EQ==" }, "@types/selenium-webdriver": { - "version": "3.0.12", - "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.12.tgz", - "integrity": "sha512-hYn+eoOehVUIdMwp5h34ZsGAO1ydja10GDup4BwyoFCdcH5MQ35nQq+AInSaBMEMopD5hEooFCyKo2Pajbe1ag==", + "version": "3.0.17", + "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.17.tgz", + "integrity": "sha512-tGomyEuzSC1H28y2zlW6XPCaDaXFaD6soTdb4GNdmte2qfHtrKqhy0ZFs4r/1hpazCfEZqeTSRLvSasmEx89uw==", "dev": true }, + "@types/source-list-map": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", + "integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==" + }, + "@types/webpack-sources": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.8.tgz", + "integrity": "sha512-JHB2/xZlXOjzjBB6fMOpH1eQAfsrpqVVIbneE0Rok16WXwFaznaI5vfg75U5WgGJm7V9W1c4xeRQDjX/zwvghA==", + "requires": { + "@types/node": "*", + "@types/source-list-map": "*", + "source-map": "^0.6.1" + } + }, "@webassemblyjs/ast": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.4.3.tgz", - "integrity": "sha512-S6npYhPcTHDYe9nlsKa9CyWByFi8Vj8HovcAgtmMAQZUOczOZbQ8CnwMYKYC5HEZzxEE+oY0jfQk4cVlI3J59Q==", - "dev": true, + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.11.tgz", + "integrity": "sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==", "requires": { - "@webassemblyjs/helper-wasm-bytecode": "1.4.3", - "@webassemblyjs/wast-parser": "1.4.3", - "debug": "3.2.6", - "webassemblyjs": "1.4.3" - }, - "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "2.1.1" - } - }, - "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "dev": true - } + "@webassemblyjs/helper-module-context": "1.7.11", + "@webassemblyjs/helper-wasm-bytecode": "1.7.11", + "@webassemblyjs/wast-parser": "1.7.11" } }, "@webassemblyjs/floating-point-hex-parser": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.4.3.tgz", - "integrity": "sha512-3zTkSFswwZOPNHnzkP9ONq4bjJSeKVMcuahGXubrlLmZP8fmTIJ58dW7h/zOVWiFSuG2em3/HH3BlCN7wyu9Rw==", - "dev": true + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz", + "integrity": "sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg==" + }, + "@webassemblyjs/helper-api-error": { + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz", + "integrity": "sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg==" }, "@webassemblyjs/helper-buffer": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.4.3.tgz", - "integrity": "sha512-e8+KZHh+RV8MUvoSRtuT1sFXskFnWG9vbDy47Oa166xX+l0dD5sERJ21g5/tcH8Yo95e9IN3u7Jc3NbhnUcSkw==", - "dev": true, - "requires": { - "debug": "3.2.6" - }, - "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "2.1.1" - } - }, - "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "dev": true - } - } + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz", + "integrity": "sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w==" }, "@webassemblyjs/helper-code-frame": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.4.3.tgz", - "integrity": "sha512-9FgHEtNsZQYaKrGCtsjswBil48Qp1agrzRcPzCbQloCoaTbOXLJ9IRmqT+uEZbenpULLRNFugz3I4uw18hJM8w==", - "dev": true, + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz", + "integrity": "sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw==", "requires": { - "@webassemblyjs/wast-printer": "1.4.3" + "@webassemblyjs/wast-printer": "1.7.11" } }, "@webassemblyjs/helper-fsm": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.4.3.tgz", - "integrity": "sha512-JINY76U+702IRf7ePukOt037RwmtH59JHvcdWbTTyHi18ixmQ+uOuNhcdCcQHTquDAH35/QgFlp3Y9KqtyJsCQ==", - "dev": true + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz", + "integrity": "sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A==" + }, + "@webassemblyjs/helper-module-context": { + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz", + "integrity": "sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg==" }, "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.4.3.tgz", - "integrity": "sha512-I7bS+HaO0K07Io89qhJv+z1QipTpuramGwUSDkwEaficbSvCcL92CUZEtgykfNtk5wb0CoLQwWlmXTwGbNZUeQ==", - "dev": true + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz", + "integrity": "sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ==" }, "@webassemblyjs/helper-wasm-section": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.4.3.tgz", - "integrity": "sha512-p0yeeO/h2r30PyjnJX9xXSR6EDcvJd/jC6xa/Pxg4lpfcNi7JUswOpqDToZQ55HMMVhXDih/yqkaywHWGLxqyQ==", - "dev": true, + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz", + "integrity": "sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q==", "requires": { - "@webassemblyjs/ast": "1.4.3", - "@webassemblyjs/helper-buffer": "1.4.3", - "@webassemblyjs/helper-wasm-bytecode": "1.4.3", - "@webassemblyjs/wasm-gen": "1.4.3", - "debug": "3.2.6" - }, - "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "2.1.1" - } - }, - "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "dev": true - } + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-buffer": "1.7.11", + "@webassemblyjs/helper-wasm-bytecode": "1.7.11", + "@webassemblyjs/wasm-gen": "1.7.11" } }, - "@webassemblyjs/leb128": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.4.3.tgz", - "integrity": "sha512-4u0LJLSPzuRDWHwdqsrThYn+WqMFVqbI2ltNrHvZZkzFPO8XOZ0HFQ5eVc4jY/TNHgXcnwrHjONhPGYuuf//KQ==", - "dev": true, + "@webassemblyjs/ieee754": { + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz", + "integrity": "sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ==", "requires": { - "leb": "0.3.0" + "@xtuc/ieee754": "^1.2.0" } }, - "@webassemblyjs/validation": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/@webassemblyjs/validation/-/validation-1.4.3.tgz", - "integrity": "sha512-R+rRMKfhd9mq0rj2mhU9A9NKI2l/Rw65vIYzz4lui7eTKPcCu1l7iZNi4b9Gen8D42Sqh/KGiaQNk/x5Tn/iBQ==", - "dev": true, + "@webassemblyjs/leb128": { + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.7.11.tgz", + "integrity": "sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw==", "requires": { - "@webassemblyjs/ast": "1.4.3" + "@xtuc/long": "4.2.1" } }, + "@webassemblyjs/utf8": { + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.7.11.tgz", + "integrity": "sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA==" + }, "@webassemblyjs/wasm-edit": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.4.3.tgz", - "integrity": "sha512-qzuwUn771PV6/LilqkXcS0ozJYAeY/OKbXIWU3a8gexuqb6De2p4ya/baBeH5JQ2WJdfhWhSvSbu86Vienttpw==", - "dev": true, + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz", + "integrity": "sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg==", "requires": { - "@webassemblyjs/ast": "1.4.3", - "@webassemblyjs/helper-buffer": "1.4.3", - "@webassemblyjs/helper-wasm-bytecode": "1.4.3", - "@webassemblyjs/helper-wasm-section": "1.4.3", - "@webassemblyjs/wasm-gen": "1.4.3", - "@webassemblyjs/wasm-opt": "1.4.3", - "@webassemblyjs/wasm-parser": "1.4.3", - "@webassemblyjs/wast-printer": "1.4.3", - "debug": "3.2.6" - }, - "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "2.1.1" - } - }, - "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "dev": true - } + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-buffer": "1.7.11", + "@webassemblyjs/helper-wasm-bytecode": "1.7.11", + "@webassemblyjs/helper-wasm-section": "1.7.11", + "@webassemblyjs/wasm-gen": "1.7.11", + "@webassemblyjs/wasm-opt": "1.7.11", + "@webassemblyjs/wasm-parser": "1.7.11", + "@webassemblyjs/wast-printer": "1.7.11" } }, "@webassemblyjs/wasm-gen": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.4.3.tgz", - "integrity": "sha512-eR394T8dHZfpLJ7U/Z5pFSvxl1L63JdREebpv9gYc55zLhzzdJPAuxjBYT4XqevUdW67qU2s0nNA3kBuNJHbaQ==", - "dev": true, + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz", + "integrity": "sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA==", "requires": { - "@webassemblyjs/ast": "1.4.3", - "@webassemblyjs/helper-wasm-bytecode": "1.4.3", - "@webassemblyjs/leb128": "1.4.3" + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-wasm-bytecode": "1.7.11", + "@webassemblyjs/ieee754": "1.7.11", + "@webassemblyjs/leb128": "1.7.11", + "@webassemblyjs/utf8": "1.7.11" } }, "@webassemblyjs/wasm-opt": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.4.3.tgz", - "integrity": "sha512-7Gp+nschuKiDuAL1xmp4Xz0rgEbxioFXw4nCFYEmy+ytynhBnTeGc9W9cB1XRu1w8pqRU2lbj2VBBA4cL5Z2Kw==", - "dev": true, + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz", + "integrity": "sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg==", "requires": { - "@webassemblyjs/ast": "1.4.3", - "@webassemblyjs/helper-buffer": "1.4.3", - "@webassemblyjs/wasm-gen": "1.4.3", - "@webassemblyjs/wasm-parser": "1.4.3", - "debug": "3.2.6" - }, - "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "2.1.1" - } - }, - "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "dev": true - } + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-buffer": "1.7.11", + "@webassemblyjs/wasm-gen": "1.7.11", + "@webassemblyjs/wasm-parser": "1.7.11" } }, "@webassemblyjs/wasm-parser": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.4.3.tgz", - "integrity": "sha512-KXBjtlwA3BVukR/yWHC9GF+SCzBcgj0a7lm92kTOaa4cbjaTaa47bCjXw6cX4SGQpkncB9PU2hHGYVyyI7wFRg==", - "dev": true, + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz", + "integrity": "sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg==", "requires": { - "@webassemblyjs/ast": "1.4.3", - "@webassemblyjs/helper-wasm-bytecode": "1.4.3", - "@webassemblyjs/leb128": "1.4.3", - "@webassemblyjs/wasm-parser": "1.4.3", - "webassemblyjs": "1.4.3" + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-api-error": "1.7.11", + "@webassemblyjs/helper-wasm-bytecode": "1.7.11", + "@webassemblyjs/ieee754": "1.7.11", + "@webassemblyjs/leb128": "1.7.11", + "@webassemblyjs/utf8": "1.7.11" } }, "@webassemblyjs/wast-parser": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.4.3.tgz", - "integrity": "sha512-QhCsQzqV0CpsEkRYyTzQDilCNUZ+5j92f+g35bHHNqS22FppNTywNFfHPq8ZWZfYCgbectc+PoghD+xfzVFh1Q==", - "dev": true, + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz", + "integrity": "sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ==", "requires": { - "@webassemblyjs/ast": "1.4.3", - "@webassemblyjs/floating-point-hex-parser": "1.4.3", - "@webassemblyjs/helper-code-frame": "1.4.3", - "@webassemblyjs/helper-fsm": "1.4.3", - "long": "3.2.0", - "webassemblyjs": "1.4.3" + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/floating-point-hex-parser": "1.7.11", + "@webassemblyjs/helper-api-error": "1.7.11", + "@webassemblyjs/helper-code-frame": "1.7.11", + "@webassemblyjs/helper-fsm": "1.7.11", + "@xtuc/long": "4.2.1" } }, "@webassemblyjs/wast-printer": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.4.3.tgz", - "integrity": "sha512-EgXk4anf8jKmuZJsqD8qy5bz2frEQhBvZruv+bqwNoLWUItjNSFygk8ywL3JTEz9KtxTlAmqTXNrdD1d9gNDtg==", - "dev": true, + "version": "1.7.11", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz", + "integrity": "sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg==", "requires": { - "@webassemblyjs/ast": "1.4.3", - "@webassemblyjs/wast-parser": "1.4.3", - "long": "3.2.0" + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/wast-parser": "1.7.11", + "@xtuc/long": "4.2.1" } }, + "@xtuc/ieee754": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", + "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==" + }, + "@xtuc/long": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.1.tgz", + "integrity": "sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==" + }, "@yarnpkg/lockfile": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", @@ -1344,8 +2489,8 @@ "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", "dev": true, "requires": { - "jsonparse": "1.3.1", - "through": "2.3.8" + "jsonparse": "^1.2.0", + "through": ">=2.2.7 <3" } }, "abab": { @@ -1356,53 +2501,45 @@ "abbrev": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", - "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=", - "dev": true + "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=" }, "accepts": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz", - "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=", - "dev": true, + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", + "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", "requires": { - "mime-types": "2.1.21", - "negotiator": "0.6.1" + "mime-types": "~2.1.24", + "negotiator": "0.6.2" } }, "acorn": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz", - "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==", - "dev": true + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz", + "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=" }, "acorn-dynamic-import": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz", - "integrity": "sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==", - "dev": true, - "requires": { - "acorn": "5.7.3" - } + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz", + "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==" }, "acorn-globals": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz", "integrity": "sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=", "requires": { - "acorn": "2.7.0" - }, - "dependencies": { - "acorn": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz", - "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=" - } + "acorn": "^2.1.0" } }, + "acorn-walk": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", + "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", + "dev": true + }, "adm-zip": { - "version": "0.4.11", - "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.11.tgz", - "integrity": "sha512-L8vcjDTCOIJk7wFvmlEUN7AsSb8T+2JrdP7KINBjzr24TJ5Mwj590sLu3BC7zNZowvJWa/JtPmD8eJCzdtDWjA==", + "version": "0.4.16", + "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.16.tgz", + "integrity": "sha512-TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg==", "dev": true }, "after": { @@ -1412,12 +2549,12 @@ "dev": true }, "agent-base": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz", - "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", + "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", "dev": true, "requires": { - "es6-promisify": "5.0.0" + "es6-promisify": "^5.0.0" } }, "agentkeepalive": { @@ -1426,30 +2563,29 @@ "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==", "dev": true, "requires": { - "humanize-ms": "1.2.1" + "humanize-ms": "^1.2.1" } }, "ajv": { - "version": "6.4.0", - "resolved": "http://registry.npmjs.org/ajv/-/ajv-6.4.0.tgz", - "integrity": "sha1-06/3jpJ3VJdx2vAWTP9ISCt1T8Y=", + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "requires": { - "fast-deep-equal": "1.1.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1", - "uri-js": "3.0.2" + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" } }, "ajv-errors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.0.tgz", - "integrity": "sha1-7PAh+hCP0X37Xms4Py3SM+Mf/Fk=", - "dev": true + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz", + "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==" }, "ajv-keywords": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz", - "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=" + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==" }, "amdefine": { "version": "1.0.1", @@ -1457,60 +2593,55 @@ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" }, "angular-user-idle": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/angular-user-idle/-/angular-user-idle-2.1.1.tgz", - "integrity": "sha512-M4VlUVza7o9ter9038sqLClwjFa/PI9Nz3e+2bhNoDgznZ4BLYZvI9t1GMrid0oeBlD7797aVZwwv19eRZnLYQ==", + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/angular-user-idle/-/angular-user-idle-2.2.4.tgz", + "integrity": "sha512-jNRVX713lRiXDvtqSmXsRDIH5wqJFQM56fRkKUxyIl4ozs6iKwLdZeXPJXtIp4dHT7oz0CAkwpGQtIJ+2svgrg==", "requires": { - "tslib": "1.9.3" + "tslib": "^1.9.0" } }, "ansi-colors": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.1.tgz", - "integrity": "sha512-Xt+zb6nqgvV9SWAVp0EG3lRsHcbq5DDgqjPPz6pwgtj6RKz65zGXMNa82oJfOSBA/to6GmRP7Dr+6o+kbApTzQ==", - "dev": true + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz", + "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==" }, "ansi-escapes": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", - "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", + "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", "dev": true }, "ansi-html": { "version": "0.0.7", "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz", - "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=", - "dev": true + "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=" }, "ansi-regex": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" }, "ansi-styles": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "anymatch": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", - "dev": true, "requires": { - "micromatch": "3.1.10", - "normalize-path": "2.1.1" + "micromatch": "^3.1.4", + "normalize-path": "^2.1.1" } }, "app-root-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.1.0.tgz", - "integrity": "sha1-mL9lmTJ+zqGZMJhm6BQDaP0uZGo=", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.2.1.tgz", + "integrity": "sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==", "dev": true }, "append-transform": { @@ -1519,51 +2650,46 @@ "integrity": "sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==", "dev": true, "requires": { - "default-require-extensions": "2.0.0" + "default-require-extensions": "^2.0.0" } }, "aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", - "dev": true + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" }, "are-we-there-yet": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", - "dev": true, + "optional": true, "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.6" + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" } }, "argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, "requires": { - "sprintf-js": "1.0.3" + "sprintf-js": "~1.0.2" } }, "arr-diff": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", - "dev": true + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" }, "arr-flatten": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", - "dev": true + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" }, "arr-union": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", - "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", - "dev": true + "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=" }, "array-equal": { "version": "1.0.0", @@ -1574,14 +2700,12 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", - "dev": true, "optional": true }, "array-flatten": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz", - "integrity": "sha1-Qmu52oQJDBg42BLIFQryCoMx4pY=", - "dev": true + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz", + "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==" }, "array-slice": { "version": "0.2.3", @@ -1593,22 +2717,19 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", - "dev": true, "requires": { - "array-uniq": "1.0.3" + "array-uniq": "^1.0.1" } }, "array-uniq": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", - "dev": true + "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=" }, "array-unique": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", - "dev": true + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" }, "arraybuffer.slice": { "version": "0.0.6", @@ -1626,7 +2747,6 @@ "version": "2.0.6", "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=", - "dev": true, "optional": true }, "asn1": { @@ -1634,40 +2754,45 @@ "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": "~2.1.0" } }, "asn1.js": { - "version": "4.10.1", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz", - "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==", - "dev": true, + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", + "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", "requires": { - "bn.js": "4.11.8", - "inherits": "2.0.3", - "minimalistic-assert": "1.0.1" + "bn.js": "^4.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "safer-buffer": "^2.1.0" + }, + "dependencies": { + "bn.js": { + "version": "4.11.9", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz", + "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==" + } } }, "assert": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz", - "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=", - "dev": true, + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz", + "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", "requires": { + "object-assign": "^4.1.1", "util": "0.10.3" }, "dependencies": { "inherits": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", - "dev": true + "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=" }, "util": { "version": "0.10.3", "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", - "dev": true, "requires": { "inherits": "2.0.1" } @@ -1682,32 +2807,31 @@ "assign-symbols": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", - "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", - "dev": true + "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=" }, "async": { - "version": "1.5.2", - "resolved": "http://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "requires": { + "lodash": "^4.17.14" + } }, "async-each": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", - "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=", - "dev": true + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz", + "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==" }, "async-foreach": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz", "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=", - "dev": true, "optional": true }, "async-limiter": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz", - "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", + "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==", "dev": true }, "asynckit": { @@ -1718,21 +2842,19 @@ "atob": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", - "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", - "dev": true + "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" }, "autoprefixer": { - "version": "8.6.5", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-8.6.5.tgz", - "integrity": "sha512-PLWJN3Xo/rycNkx+mp8iBDMTm3FeWe4VmYaZDSqL5QQB9sLsQkG5k8n+LNDFnhh9kdq2K+egL/icpctOmDHwig==", - "dev": true, + "version": "9.4.6", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.4.6.tgz", + "integrity": "sha512-Yp51mevbOEdxDUy5WjiKtpQaecqYq9OqZSL04rSoCiry7Tc5I9FEyo3bfxiTJc1DfHeKwSFCUYbBAiOQ2VGfiw==", "requires": { - "browserslist": "3.2.8", - "caniuse-lite": "1.0.30000898", - "normalize-range": "0.1.2", - "num2fraction": "1.2.2", - "postcss": "6.0.23", - "postcss-value-parser": "3.3.1" + "browserslist": "^4.4.1", + "caniuse-lite": "^1.0.30000929", + "normalize-range": "^0.1.2", + "num2fraction": "^1.2.2", + "postcss": "^7.0.13", + "postcss-value-parser": "^3.3.1" } }, "aws-sign2": { @@ -1741,45 +2863,46 @@ "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" }, "aws4": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz", - "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==" + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", + "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==" }, "babel-code-frame": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", - "dev": true, "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" + "chalk": "^1.1.3", + "esutils": "^2.0.2", + "js-tokens": "^3.0.2" }, "dependencies": { "ansi-styles": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" }, "chalk": { "version": "1.1.3", - "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, + "js-tokens": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=" + }, "supports-color": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" } } }, @@ -1787,84 +2910,116 @@ "version": "6.26.1", "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz", "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", - "dev": true, "requires": { - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "detect-indent": "4.0.0", - "jsesc": "1.3.0", - "lodash": "4.17.11", - "source-map": "0.5.7", - "trim-right": "1.0.1" + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "detect-indent": "^4.0.0", + "jsesc": "^1.3.0", + "lodash": "^4.17.4", + "source-map": "^0.5.7", + "trim-right": "^1.0.1" + }, + "dependencies": { + "jsesc": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", + "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=" + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + } } }, "babel-messages": { "version": "6.23.0", "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", - "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-runtime": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "dev": true, "requires": { - "core-js": "2.5.7", - "regenerator-runtime": "0.11.1" + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" } }, "babel-template": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", - "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "lodash": "4.17.11" + "babel-runtime": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "lodash": "^4.17.4" } }, "babel-traverse": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", - "dev": true, "requires": { - "babel-code-frame": "6.26.0", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "debug": "2.6.9", - "globals": "9.18.0", - "invariant": "2.2.4", - "lodash": "4.17.11" + "babel-code-frame": "^6.26.0", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "debug": "^2.6.8", + "globals": "^9.18.0", + "invariant": "^2.2.2", + "lodash": "^4.17.4" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "globals": { + "version": "9.18.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", + "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==" + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } } }, "babel-types": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", - "dev": true, "requires": { - "babel-runtime": "6.26.0", - "esutils": "2.0.2", - "lodash": "4.17.11", - "to-fast-properties": "1.0.3" + "babel-runtime": "^6.26.0", + "esutils": "^2.0.2", + "lodash": "^4.17.4", + "to-fast-properties": "^1.0.3" + }, + "dependencies": { + "to-fast-properties": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", + "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=" + } } }, "babylon": { "version": "6.18.0", "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", - "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", - "dev": true + "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==" }, "backo2": { "version": "1.0.2", @@ -1875,74 +3030,67 @@ "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, "base": { "version": "0.11.2", "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", - "dev": true, "requires": { - "cache-base": "1.0.1", - "class-utils": "0.3.6", - "component-emitter": "1.2.1", - "define-property": "1.0.0", - "isobject": "3.0.1", - "mixin-deep": "1.3.1", - "pascalcase": "0.1.1" + "cache-base": "^1.0.1", + "class-utils": "^0.3.5", + "component-emitter": "^1.2.1", + "define-property": "^1.0.0", + "isobject": "^3.0.1", + "mixin-deep": "^1.2.0", + "pascalcase": "^0.1.1" }, "dependencies": { "define-property": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "is-accessor-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } }, "base64-arraybuffer": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz", - "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=" + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.2.0.tgz", + "integrity": "sha512-7emyCsu1/xiBXgQZrscw/8KPRT44I4Yq9Pe6EGs3aPRTsWuggML1/1DTuZUuIaJPIm1FTDUVXl4x/yW8s0kQDQ==" }, "base64-js": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz", - "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==", - "dev": true + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.0.tgz", + "integrity": "sha512-Jrdy04F2EKcNggUDfubMUPNAZg2vMquLQSm8sKLYJvz40ClFL1S8GKyDshGkNsbNNE5Z+fQavzU7nSK1I9JUGA==" }, "base64id": { "version": "1.0.0", @@ -1953,15 +3101,14 @@ "batch": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", - "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=", - "dev": true + "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=" }, "bcrypt-pbkdf": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", "requires": { - "tweetnacl": "0.14.5" + "tweetnacl": "^0.14.3" } }, "better-assert": { @@ -1974,31 +3121,39 @@ } }, "bfj": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/bfj/-/bfj-6.1.1.tgz", - "integrity": "sha512-+GUNvzHR4nRyGybQc2WpNJL4MJazMuvf92ueIyA0bIkPRwhhQu3IfZQ2PSoVPpCBJfmoSdOxu5rnotfFLlvYRQ==", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/bfj/-/bfj-6.1.2.tgz", + "integrity": "sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw==", "dev": true, "requires": { - "bluebird": "3.5.2", - "check-types": "7.4.0", - "hoopy": "0.1.4", - "tryer": "1.0.1" + "bluebird": "^3.5.5", + "check-types": "^8.0.3", + "hoopy": "^0.1.4", + "tryer": "^1.0.1" } }, "big.js": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz", - "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==" + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", + "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==" }, "binary-extensions": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.12.0.tgz", - "integrity": "sha512-DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg==", - "dev": true + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", + "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==" + }, + "bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "optional": true, + "requires": { + "file-uri-to-path": "1.0.0" + } }, "blob": { "version": "0.0.4", - "resolved": "http://registry.npmjs.org/blob/-/blob-0.0.4.tgz", + "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz", "integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=", "dev": true }, @@ -2006,10 +3161,9 @@ "version": "0.0.9", "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", - "dev": true, "optional": true, "requires": { - "inherits": "2.0.3" + "inherits": "~2.0.0" } }, "blocking-proxy": { @@ -2018,74 +3172,80 @@ "integrity": "sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==", "dev": true, "requires": { - "minimist": "1.2.0" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } + "minimist": "^1.2.0" } }, "bluebird": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.2.tgz", - "integrity": "sha512-dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg==", - "dev": true + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, "bn.js": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", - "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", - "dev": true + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz", + "integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==" }, "body-parser": { - "version": "1.18.3", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz", - "integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=", - "dev": true, + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", + "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", "requires": { - "bytes": "3.0.0", - "content-type": "1.0.4", + "bytes": "3.1.0", + "content-type": "~1.0.4", "debug": "2.6.9", - "depd": "1.1.2", - "http-errors": "1.6.3", - "iconv-lite": "0.4.23", - "on-finished": "2.3.0", - "qs": "6.5.2", - "raw-body": "2.3.3", - "type-is": "1.6.16" + "depd": "~1.1.2", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "on-finished": "~2.3.0", + "qs": "6.7.0", + "raw-body": "2.4.0", + "type-is": "~1.6.17" + }, + "dependencies": { + "bytes": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "qs": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" + } } }, "bonjour": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz", "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=", - "dev": true, "requires": { - "array-flatten": "2.1.1", - "deep-equal": "1.0.1", - "dns-equal": "1.0.0", - "dns-txt": "2.0.2", - "multicast-dns": "6.2.3", - "multicast-dns-service-types": "1.1.0" + "array-flatten": "^2.1.0", + "deep-equal": "^1.0.1", + "dns-equal": "^1.0.0", + "dns-txt": "^2.0.2", + "multicast-dns": "^6.0.1", + "multicast-dns-service-types": "^1.1.0" } }, - "boolbase": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", - "dev": true - }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -2093,27 +3253,25 @@ "version": "2.3.2", "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.3", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" }, "dependencies": { "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -2121,108 +3279,123 @@ "brorand": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", - "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=", - "dev": true + "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=" }, "browserify-aes": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", - "dev": true, "requires": { - "buffer-xor": "1.0.3", - "cipher-base": "1.0.4", - "create-hash": "1.2.0", - "evp_bytestokey": "1.0.3", - "inherits": "2.0.3", - "safe-buffer": "5.1.2" + "buffer-xor": "^1.0.3", + "cipher-base": "^1.0.0", + "create-hash": "^1.1.0", + "evp_bytestokey": "^1.0.3", + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" } }, "browserify-cipher": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", - "dev": true, "requires": { - "browserify-aes": "1.2.0", - "browserify-des": "1.0.2", - "evp_bytestokey": "1.0.3" + "browserify-aes": "^1.0.4", + "browserify-des": "^1.0.0", + "evp_bytestokey": "^1.0.0" } }, "browserify-des": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz", "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", - "dev": true, "requires": { - "cipher-base": "1.0.4", - "des.js": "1.0.0", - "inherits": "2.0.3", - "safe-buffer": "5.1.2" + "cipher-base": "^1.0.1", + "des.js": "^1.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" } }, "browserify-rsa": { "version": "4.0.1", - "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", + "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", - "dev": true, "requires": { - "bn.js": "4.11.8", - "randombytes": "2.0.6" + "bn.js": "^4.1.0", + "randombytes": "^2.0.1" + }, + "dependencies": { + "bn.js": { + "version": "4.11.9", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz", + "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==" + } } }, "browserify-sign": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz", - "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", - "dev": true, + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", + "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", "requires": { - "bn.js": "4.11.8", - "browserify-rsa": "4.0.1", - "create-hash": "1.2.0", - "create-hmac": "1.1.7", - "elliptic": "6.4.1", - "inherits": "2.0.3", - "parse-asn1": "5.1.1" + "bn.js": "^5.1.1", + "browserify-rsa": "^4.0.1", + "create-hash": "^1.2.0", + "create-hmac": "^1.1.7", + "elliptic": "^6.5.3", + "inherits": "^2.0.4", + "parse-asn1": "^5.1.5", + "readable-stream": "^3.6.0", + "safe-buffer": "^5.2.0" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } } }, "browserify-zlib": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", - "dev": true, "requires": { - "pako": "1.0.6" + "pako": "~1.0.5" } }, "browserslist": { - "version": "3.2.8", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz", - "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==", - "dev": true, + "version": "4.14.7", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.7.tgz", + "integrity": "sha512-BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==", "requires": { - "caniuse-lite": "1.0.30000898", - "electron-to-chromium": "1.3.81" + "caniuse-lite": "^1.0.30001157", + "colorette": "^1.2.1", + "electron-to-chromium": "^1.3.591", + "escalade": "^3.1.1", + "node-releases": "^1.1.66" } }, "browserstack": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/browserstack/-/browserstack-1.5.1.tgz", - "integrity": "sha512-O8VMT64P9NOLhuIoD4YngyxBURefaSdR4QdhG8l6HZ9VxtU7jc3m6jLufFwKA5gaf7fetfB2TnRJnMxyob+heg==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/browserstack/-/browserstack-1.6.0.tgz", + "integrity": "sha512-HJDJ0TSlmkwnt9RZ+v5gFpa1XZTBYTj0ywvLwJ3241J7vMw2jAsGNVhKHtmCOyg+VxeLZyaibO9UL71AsUeDIw==", "dev": true, "requires": { - "https-proxy-agent": "2.2.1" + "https-proxy-agent": "^2.2.1" } }, "buffer": { - "version": "4.9.1", - "resolved": "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", - "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", - "dev": true, + "version": "4.9.2", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz", + "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", "requires": { - "base64-js": "1.3.0", - "ieee754": "1.1.12", - "isarray": "1.0.0" + "base64-js": "^1.0.2", + "ieee754": "^1.1.4", + "isarray": "^1.0.0" } }, "buffer-alloc": { @@ -2231,8 +3404,8 @@ "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", "dev": true, "requires": { - "buffer-alloc-unsafe": "1.1.0", - "buffer-fill": "1.0.0" + "buffer-alloc-unsafe": "^1.1.0", + "buffer-fill": "^1.0.0" } }, "buffer-alloc-unsafe": { @@ -2250,20 +3423,17 @@ "buffer-from": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", - "dev": true + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" }, "buffer-indexof": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz", - "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==", - "dev": true + "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==" }, "buffer-xor": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", - "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=", - "dev": true + "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=" }, "builtin-modules": { "version": "1.1.1", @@ -2274,8 +3444,7 @@ "builtin-status-codes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", - "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=", - "dev": true + "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=" }, "builtins": { "version": "1.0.3", @@ -2286,45 +3455,103 @@ "bytes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", - "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=", - "dev": true + "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=" }, "cacache": { "version": "10.0.4", "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==", - "dev": true, "requires": { - "bluebird": "3.5.2", - "chownr": "1.1.1", - "glob": "7.1.3", - "graceful-fs": "4.1.11", - "lru-cache": "4.1.3", - "mississippi": "2.0.0", - "mkdirp": "0.5.1", - "move-concurrently": "1.0.1", - "promise-inflight": "1.0.1", - "rimraf": "2.6.2", - "ssri": "5.3.0", - "unique-filename": "1.1.1", - "y18n": "4.0.0" + "bluebird": "^3.5.1", + "chownr": "^1.0.1", + "glob": "^7.1.2", + "graceful-fs": "^4.1.11", + "lru-cache": "^4.1.1", + "mississippi": "^2.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.2", + "ssri": "^5.2.4", + "unique-filename": "^1.1.0", + "y18n": "^4.0.0" + }, + "dependencies": { + "mississippi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz", + "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==", + "requires": { + "concat-stream": "^1.5.0", + "duplexify": "^3.4.2", + "end-of-stream": "^1.1.0", + "flush-write-stream": "^1.0.0", + "from2": "^2.1.0", + "parallel-transform": "^1.1.0", + "pump": "^2.0.1", + "pumpify": "^1.3.3", + "stream-each": "^1.1.0", + "through2": "^2.0.0" + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "requires": { + "wrappy": "1" + } + }, + "pump": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", + "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + } } }, "cache-base": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", - "dev": true, "requires": { - "collection-visit": "1.0.0", - "component-emitter": "1.2.1", - "get-value": "2.0.6", - "has-value": "1.0.0", - "isobject": "3.0.1", - "set-value": "2.0.0", - "to-object-path": "0.3.0", - "union-value": "1.0.0", - "unset-value": "1.0.0" + "collection-visit": "^1.0.0", + "component-emitter": "^1.2.1", + "get-value": "^2.0.6", + "has-value": "^1.0.0", + "isobject": "^3.0.1", + "set-value": "^2.0.0", + "to-object-path": "^0.3.0", + "union-value": "^1.0.0", + "unset-value": "^1.0.0" + } + }, + "call-bind": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz", + "integrity": "sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==", + "requires": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.0" + } + }, + "caller-callsite": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz", + "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=", + "requires": { + "callsites": "^2.0.0" + } + }, + "caller-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz", + "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=", + "requires": { + "caller-callsite": "^2.0.0" } }, "callsite": { @@ -2333,39 +3560,31 @@ "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=", "dev": true }, - "camel-case": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", - "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", - "dev": true, - "requires": { - "no-case": "2.3.2", - "upper-case": "1.1.3" - } + "callsites": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", + "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=" }, "camelcase": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", - "dev": true, "optional": true }, "camelcase-keys": { "version": "2.1.0", - "resolved": "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", - "dev": true, "optional": true, "requires": { - "camelcase": "2.1.1", - "map-obj": "1.0.1" + "camelcase": "^2.0.0", + "map-obj": "^1.0.0" } }, "caniuse-lite": { - "version": "1.0.30000898", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000898.tgz", - "integrity": "sha512-ytlTZqO4hYe4rNAJhMynUAIUI33jsP2Bb1two/9OVC39wZjPZ8exIO0eCLw5mqAtegOGiGF0kkTWTn3B02L+mw==", - "dev": true + "version": "1.0.30001157", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001157.tgz", + "integrity": "sha512-gOerH9Wz2IRZ2ZPdMfBvyOi3cjaz4O4dgNwPGzx8EhqAs4+2IL/O+fJsbt+znSigujoZG8bVcIAUM/I/E5K3MA==" }, "canonical-path": { "version": "1.0.0", @@ -2378,10 +3597,10 @@ "resolved": "https://registry.npmjs.org/canvg/-/canvg-1.5.3.tgz", "integrity": "sha512-7Gn2IuQzvUQWPIuZuFHrzsTM0gkPz2RRT9OcbdmA03jeKk8kltrD8gqUzNX15ghY/4PV5bbe5lmD6yDLDY6Ybg==", "requires": { - "jsdom": "8.5.0", - "rgbcolor": "1.0.1", - "stackblur-canvas": "1.4.1", - "xmldom": "0.1.27" + "jsdom": "^8.1.0", + "rgbcolor": "^1.0.1", + "stackblur-canvas": "^1.4.1", + "xmldom": "^0.1.22" }, "dependencies": { "stackblur-canvas": { @@ -2397,14 +3616,13 @@ "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "dev": true, + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "chardet": { @@ -2414,79 +3632,75 @@ "dev": true }, "check-types": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/check-types/-/check-types-7.4.0.tgz", - "integrity": "sha512-YbulWHdfP99UfZ73NcUDlNJhEIDgm9Doq9GhpyXbF+7Aegi3CVV7qqMCKTTqJxlvEvnQBp9IA+dxsGN6xK/nSg==", + "version": "8.0.3", + "resolved": "https://registry.npmjs.org/check-types/-/check-types-8.0.3.tgz", + "integrity": "sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ==", "dev": true }, "chokidar": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz", "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==", - "dev": true, "requires": { - "anymatch": "2.0.0", - "async-each": "1.0.1", - "braces": "2.3.2", - "fsevents": "1.2.4", - "glob-parent": "3.1.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "4.0.0", - "lodash.debounce": "4.0.8", - "normalize-path": "2.1.1", - "path-is-absolute": "1.0.1", - "readdirp": "2.2.1", - "upath": "1.1.0" + "anymatch": "^2.0.0", + "async-each": "^1.0.0", + "braces": "^2.3.0", + "fsevents": "^1.2.2", + "glob-parent": "^3.1.0", + "inherits": "^2.0.1", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "lodash.debounce": "^4.0.8", + "normalize-path": "^2.1.1", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.0.0", + "upath": "^1.0.5" } }, "chownr": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz", - "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==", - "dev": true + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" }, "chrome-trace-event": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-0.1.3.tgz", - "integrity": "sha512-sjndyZHrrWiu4RY7AkHgjn80GfAM2ZSzUkZLV/Js59Ldmh6JDThf0SUmOHU53rFu2rVxxfCzJ30Ukcfch3Gb/A==", - "dev": true + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz", + "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==", + "requires": { + "tslib": "^1.9.0" + } }, "cipher-base": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", - "dev": true, "requires": { - "inherits": "2.0.3", - "safe-buffer": "5.1.2" + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" } }, "circular-dependency-plugin": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.0.2.tgz", - "integrity": "sha512-oC7/DVAyfcY3UWKm0sN/oVoDedQDQiw/vIiAnuTWTpE5s0zWf7l3WY417Xw/Fbi/QbAjctAkxgMiS9P0s3zkmA==", - "dev": true + "integrity": "sha512-oC7/DVAyfcY3UWKm0sN/oVoDedQDQiw/vIiAnuTWTpE5s0zWf7l3WY417Xw/Fbi/QbAjctAkxgMiS9P0s3zkmA==" }, "class-utils": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", - "dev": true, "requires": { - "arr-union": "3.1.0", - "define-property": "0.2.5", - "isobject": "3.0.1", - "static-extend": "0.1.2" + "arr-union": "^3.1.0", + "define-property": "^0.2.5", + "isobject": "^3.0.0", + "static-extend": "^0.1.1" }, "dependencies": { "define-property": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } } } @@ -2495,17 +3709,8 @@ "version": "4.2.1", "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz", "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==", - "dev": true, "requires": { - "source-map": "0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } + "source-map": "~0.6.0" } }, "cli-cursor": { @@ -2514,42 +3719,50 @@ "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", "dev": true, "requires": { - "restore-cursor": "2.0.0" + "restore-cursor": "^2.0.0" } }, "cli-width": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", - "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz", + "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==", "dev": true }, "cliui": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", - "dev": true, + "optional": true, "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wrap-ansi": "^2.0.0" } }, "clone": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", - "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=", - "dev": true + "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=" }, "clone-deep": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz", "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==", - "dev": true, "requires": { - "for-own": "1.0.0", - "is-plain-object": "2.0.4", - "kind-of": "6.0.2", - "shallow-clone": "1.0.0" + "for-own": "^1.0.0", + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.0", + "shallow-clone": "^1.0.0" + }, + "dependencies": { + "for-own": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", + "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", + "requires": { + "for-in": "^1.0.1" + } + } } }, "co": { @@ -2560,38 +3773,49 @@ "code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" }, "codelyzer": { - "version": "4.2.1", - "resolved": "http://registry.npmjs.org/codelyzer/-/codelyzer-4.2.1.tgz", - "integrity": "sha512-CKwfgpfkqi9dyzy4s6ELaxJ54QgJ6A8iTSsM4bzHbLuTpbKncvNc3DUlCvpnkHBhK47gEf4qFsWoYqLrJPhy6g==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-4.5.0.tgz", + "integrity": "sha512-oO6vCkjqsVrEsmh58oNlnJkRXuA30hF8cdNAQV9DytEalDwyOFRvHMnlKFzmOStNerOmPGZU9GAHnBo4tGvtiQ==", "dev": true, "requires": { - "app-root-path": "2.1.0", - "css-selector-tokenizer": "0.7.1", - "cssauron": "1.4.0", - "semver-dsl": "1.0.1", - "source-map": "0.5.7", - "sprintf-js": "1.0.3" + "app-root-path": "^2.1.0", + "css-selector-tokenizer": "^0.7.0", + "cssauron": "^1.4.0", + "semver-dsl": "^1.0.1", + "source-map": "^0.5.7", + "sprintf-js": "^1.1.1" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + }, + "sprintf-js": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", + "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==", + "dev": true + } } }, "collection-visit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", - "dev": true, "requires": { - "map-visit": "1.0.0", - "object-visit": "1.0.1" + "map-visit": "^1.0.0", + "object-visit": "^1.0.0" } }, "color-convert": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, "requires": { "color-name": "1.1.3" } @@ -2599,8 +3823,12 @@ "color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" + }, + "colorette": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz", + "integrity": "sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==" }, "colors": { "version": "1.1.2", @@ -2614,33 +3842,31 @@ "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=", "dev": true, "requires": { - "lodash": "4.17.11" + "lodash": "^4.5.0" } }, "combined-stream": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz", - "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", "requires": { - "delayed-stream": "1.0.0" + "delayed-stream": "~1.0.0" } }, "commander": { - "version": "2.17.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", - "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==", - "dev": true + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" }, "commondir": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", - "dev": true + "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=" }, "compare-versions": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.4.0.tgz", - "integrity": "sha512-tK69D7oNXXqUW3ZNo/z7NXTEz22TCF0pTE+YF9cxvaAM9XnkLo1fV621xCLrRR6aevJlKxExkss0vWqUCUpqdg==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz", + "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==", "dev": true }, "component-bind": { @@ -2650,10 +3876,9 @@ "dev": true }, "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", - "dev": true + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", + "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" }, "component-inherit": { "version": "0.0.3", @@ -2662,182 +3887,220 @@ "dev": true }, "compressible": { - "version": "2.0.15", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.15.tgz", - "integrity": "sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==", - "dev": true, + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", + "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", "requires": { - "mime-db": "1.37.0" + "mime-db": ">= 1.43.0 < 2" } }, "compression": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz", - "integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==", - "dev": true, + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", + "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", "requires": { - "accepts": "1.3.5", + "accepts": "~1.3.5", "bytes": "3.0.0", - "compressible": "2.0.15", + "compressible": "~2.0.16", "debug": "2.6.9", - "on-headers": "1.0.1", + "on-headers": "~1.0.2", "safe-buffer": "5.1.2", - "vary": "1.1.2" + "vary": "~1.1.2" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + } } }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, "concat-stream": { "version": "1.6.2", "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", - "dev": true, "requires": { - "buffer-from": "1.1.1", - "inherits": "2.0.3", - "readable-stream": "2.3.6", - "typedarray": "0.0.6" + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" } }, "connect": { - "version": "3.6.6", - "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz", - "integrity": "sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=", + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz", + "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==", "dev": true, "requires": { "debug": "2.6.9", - "finalhandler": "1.1.0", - "parseurl": "1.3.2", + "finalhandler": "1.1.2", + "parseurl": "~1.3.3", "utils-merge": "1.0.1" }, "dependencies": { - "finalhandler": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz", - "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=", + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, "requires": { - "debug": "2.6.9", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "on-finished": "2.3.0", - "parseurl": "1.3.2", - "statuses": "1.3.1", - "unpipe": "1.0.0" + "ms": "2.0.0" } }, - "statuses": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", - "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=", + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true } } }, "connect-history-api-fallback": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz", - "integrity": "sha1-sGhzk0vF40T+9hGhlqb6rgruAVo=", - "dev": true + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz", + "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==" }, "console-browserify": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", - "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", - "dev": true, - "requires": { - "date-now": "0.1.4" - } + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz", + "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==" }, "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true + "optional": true }, "constants-browserify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", - "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=", - "dev": true + "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=" }, "content-disposition": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", - "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=", - "dev": true + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", + "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", + "requires": { + "safe-buffer": "5.1.2" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + } + } }, "content-type": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", - "dev": true + "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" }, "convert-source-map": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz", - "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==", - "dev": true, + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", + "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "~5.1.1" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + } } }, "cookie": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", - "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=", - "dev": true + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", + "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==" }, "cookie-signature": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", - "dev": true + "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" }, "copy-concurrently": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz", "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==", - "dev": true, "requires": { - "aproba": "1.2.0", - "fs-write-stream-atomic": "1.0.10", - "iferr": "0.1.5", - "mkdirp": "0.5.1", - "rimraf": "2.6.2", - "run-queue": "1.0.3" + "aproba": "^1.1.1", + "fs-write-stream-atomic": "^1.0.8", + "iferr": "^0.1.5", + "mkdirp": "^0.5.1", + "rimraf": "^2.5.4", + "run-queue": "^1.0.0" + }, + "dependencies": { + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "requires": { + "glob": "^7.1.3" + } + } } }, "copy-descriptor": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", - "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", - "dev": true + "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" }, "copy-webpack-plugin": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.5.4.tgz", - "integrity": "sha512-0lstlEyj74OAtYMrDxlNZsU7cwFijAI3Ofz2fD6Mpo9r4xCv4yegfa3uHIKvZY1NSuOtE9nvG6TAhJ+uz9gDaQ==", - "dev": true, + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz", + "integrity": "sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==", "requires": { - "cacache": "10.0.4", - "find-cache-dir": "1.0.0", - "globby": "7.1.1", - "is-glob": "4.0.0", - "loader-utils": "1.1.0", - "minimatch": "3.0.4", - "p-limit": "1.3.0", - "serialize-javascript": "1.5.0" + "cacache": "^10.0.4", + "find-cache-dir": "^1.0.0", + "globby": "^7.1.1", + "is-glob": "^4.0.0", + "loader-utils": "^1.1.0", + "minimatch": "^3.0.4", + "p-limit": "^1.0.0", + "serialize-javascript": "^1.4.0" + }, + "dependencies": { + "p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "requires": { + "p-try": "^1.0.0" + } + }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=" + } } }, "core-js": { - "version": "2.5.7", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz", - "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==" + "version": "2.6.11", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", + "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==" }, "core-util-is": { "version": "1.0.2", @@ -2845,181 +4108,163 @@ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, "cosmiconfig": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz", - "integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==", - "dev": true, + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz", + "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==", "requires": { - "is-directory": "0.3.1", - "js-yaml": "3.12.0", - "parse-json": "4.0.0", - "require-from-string": "2.0.2" + "import-fresh": "^2.0.0", + "is-directory": "^0.3.1", + "js-yaml": "^3.13.1", + "parse-json": "^4.0.0" }, "dependencies": { "parse-json": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", - "dev": true, "requires": { - "error-ex": "1.3.2", - "json-parse-better-errors": "1.0.2" + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" } } } }, "create-ecdh": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz", - "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==", - "dev": true, + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", + "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==", "requires": { - "bn.js": "4.11.8", - "elliptic": "6.4.1" + "bn.js": "^4.1.0", + "elliptic": "^6.5.3" + }, + "dependencies": { + "bn.js": { + "version": "4.11.9", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz", + "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==" + } } }, "create-hash": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", - "dev": true, "requires": { - "cipher-base": "1.0.4", - "inherits": "2.0.3", - "md5.js": "1.3.5", - "ripemd160": "2.0.2", - "sha.js": "2.4.11" + "cipher-base": "^1.0.1", + "inherits": "^2.0.1", + "md5.js": "^1.3.4", + "ripemd160": "^2.0.1", + "sha.js": "^2.4.0" } }, "create-hmac": { "version": "1.1.7", - "resolved": "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", + "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", - "dev": true, "requires": { - "cipher-base": "1.0.4", - "create-hash": "1.2.0", - "inherits": "2.0.3", - "ripemd160": "2.0.2", - "safe-buffer": "5.1.2", - "sha.js": "2.4.11" + "cipher-base": "^1.0.3", + "create-hash": "^1.1.0", + "inherits": "^2.0.1", + "ripemd160": "^2.0.0", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" } }, "cross-spawn": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", - "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", - "dev": true, - "optional": true, + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "requires": { - "lru-cache": "4.1.3", - "which": "1.3.1" + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } } }, "crypto-browserify": { "version": "3.12.0", "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", - "dev": true, "requires": { - "browserify-cipher": "1.0.1", - "browserify-sign": "4.0.4", - "create-ecdh": "4.0.3", - "create-hash": "1.2.0", - "create-hmac": "1.1.7", - "diffie-hellman": "5.0.3", - "inherits": "2.0.3", - "pbkdf2": "3.0.17", - "public-encrypt": "4.0.3", - "randombytes": "2.0.6", - "randomfill": "1.0.4" + "browserify-cipher": "^1.0.0", + "browserify-sign": "^4.0.0", + "create-ecdh": "^4.0.0", + "create-hash": "^1.1.0", + "create-hmac": "^1.1.0", + "diffie-hellman": "^5.0.0", + "inherits": "^2.0.1", + "pbkdf2": "^3.0.3", + "public-encrypt": "^4.0.0", + "randombytes": "^2.0.0", + "randomfill": "^1.0.3" } }, "css-line-break": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-1.0.1.tgz", - "integrity": "sha1-GfIGOjPpX7KDG4ZEbAuAwYivRQo=", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-1.1.1.tgz", + "integrity": "sha512-1feNVaM4Fyzdj4mKPIQNL2n70MmuYzAXZ1aytlROFX1JsOo070OsugwGjj7nl6jnDJWHDM8zRZswkmeYVWZJQA==", "requires": { - "base64-arraybuffer": "0.1.5" + "base64-arraybuffer": "^0.2.0" } }, "css-parse": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz", - "integrity": "sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=", - "dev": true - }, - "css-select": { - "version": "1.2.0", - "resolved": "http://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", - "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", - "dev": true, - "requires": { - "boolbase": "1.0.0", - "css-what": "2.1.2", - "domutils": "1.5.1", - "nth-check": "1.0.2" - } + "integrity": "sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=" }, "css-selector-tokenizer": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz", - "integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==", + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.3.tgz", + "integrity": "sha512-jWQv3oCEL5kMErj4wRnK/OPoBi0D+P1FR2cDCKYPaMeD2eW3/mttav8HT4hT1CKopiJI/psEULjkClhvJo4Lvg==", "dev": true, "requires": { - "cssesc": "0.1.0", - "fastparse": "1.1.2", - "regexpu-core": "1.0.0" + "cssesc": "^3.0.0", + "fastparse": "^1.1.2" } }, - "css-what": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.2.tgz", - "integrity": "sha512-wan8dMWQ0GUeF7DGEPVjhHemVW/vy6xUYmFzRY8RYqgA0JtXC9rJmbScBjqSu6dg9q0lwPQy6ZAmJVr3PPTvqQ==", - "dev": true - }, "cssauron": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz", "integrity": "sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=", "dev": true, "requires": { - "through": "2.3.8" + "through": "X.X.X" } }, "cssesc": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz", - "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", + "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", "dev": true }, "cssom": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.4.tgz", - "integrity": "sha512-+7prCSORpXNeR4/fUP3rL+TzqtiFfhMvTd7uEqMdgPvLPt4+uzFUeufx5RHjGTACCargg/DiEt/moMQmvnfkog==" + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==" }, "cssstyle": { "version": "0.2.37", "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz", "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=", "requires": { - "cssom": "0.3.4" + "cssom": "0.3.x" } }, - "cuint": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz", - "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=", - "dev": true - }, "currently-unhandled": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", - "dev": true, "optional": true, "requires": { - "array-find-index": "1.0.2" + "array-find-index": "^1.0.1" } }, "custom-event": { @@ -3029,51 +4274,48 @@ "dev": true }, "cyclist": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz", - "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=", - "dev": true + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz", + "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=" }, "dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, - "date-now": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", - "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=", - "dev": true - }, "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "requires": { - "ms": "2.0.0" + "ms": "2.1.2" } }, "decamelize": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" }, "decode-uri-component": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", - "dev": true + "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" }, "deep-equal": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", - "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=", - "dev": true + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", + "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", + "requires": { + "is-arguments": "^1.0.4", + "is-date-object": "^1.0.1", + "is-regex": "^1.0.4", + "object-is": "^1.0.1", + "object-keys": "^1.1.1", + "regexp.prototype.flags": "^1.2.0" + } }, "deep-is": { "version": "0.1.3", @@ -3084,10 +4326,30 @@ "version": "2.7.2", "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-2.7.2.tgz", "integrity": "sha512-lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==", - "dev": true, "requires": { - "execa": "0.10.0", - "ip-regex": "2.1.0" + "execa": "^0.10.0", + "ip-regex": "^2.1.0" + }, + "dependencies": { + "execa": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz", + "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==", + "requires": { + "cross-spawn": "^6.0.0", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + } + }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + } } }, "default-require-extensions": { @@ -3096,63 +4358,50 @@ "integrity": "sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=", "dev": true, "requires": { - "strip-bom": "3.0.0" - }, - "dependencies": { - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "dev": true - } + "strip-bom": "^3.0.0" } }, "define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", - "dev": true, "requires": { - "object-keys": "1.0.12" + "object-keys": "^1.0.12" } }, "define-property": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", - "dev": true, "requires": { - "is-descriptor": "1.0.2", - "isobject": "3.0.1" + "is-descriptor": "^1.0.2", + "isobject": "^3.0.1" }, "dependencies": { "is-accessor-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -3161,36 +4410,38 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz", "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=", - "dev": true, "requires": { - "globby": "6.1.0", - "is-path-cwd": "1.0.0", - "is-path-in-cwd": "1.0.1", - "p-map": "1.2.0", - "pify": "3.0.0", - "rimraf": "2.6.2" + "globby": "^6.1.0", + "is-path-cwd": "^1.0.0", + "is-path-in-cwd": "^1.0.0", + "p-map": "^1.1.1", + "pify": "^3.0.0", + "rimraf": "^2.2.8" }, "dependencies": { "globby": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", - "dev": true, "requires": { - "array-union": "1.0.2", - "glob": "7.1.3", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "array-union": "^1.0.1", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" }, "dependencies": { "pify": { "version": "2.3.0", - "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" } } + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" } } }, @@ -3203,13 +4454,12 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", - "dev": true + "optional": true }, "depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", - "dev": true + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" }, "dependency-graph": { "version": "0.7.2", @@ -3218,35 +4468,31 @@ "dev": true }, "des.js": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", - "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=", - "dev": true, + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", + "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==", "requires": { - "inherits": "2.0.3", - "minimalistic-assert": "1.0.1" + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0" } }, "destroy": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", - "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=", - "dev": true + "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" }, "detect-indent": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", - "dev": true, "requires": { - "repeating": "2.0.1" + "repeating": "^2.0.0" } }, "detect-node": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz", - "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==", - "dev": true + "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==" }, "di": { "version": "0.0.1", @@ -3262,57 +4508,49 @@ }, "diffie-hellman": { "version": "5.0.3", - "resolved": "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", + "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", - "dev": true, "requires": { - "bn.js": "4.11.8", - "miller-rabin": "4.0.1", - "randombytes": "2.0.6" + "bn.js": "^4.1.0", + "miller-rabin": "^4.0.0", + "randombytes": "^2.0.0" + }, + "dependencies": { + "bn.js": { + "version": "4.11.9", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz", + "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==" + } } }, "dir-glob": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz", - "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==", - "dev": true, + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz", + "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==", "requires": { - "arrify": "1.0.1", - "path-type": "3.0.0" + "path-type": "^3.0.0" } }, "dns-equal": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", - "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=", - "dev": true + "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=" }, "dns-packet": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz", "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==", - "dev": true, "requires": { - "ip": "1.1.5", - "safe-buffer": "5.1.2" + "ip": "^1.1.0", + "safe-buffer": "^5.0.1" } }, "dns-txt": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz", "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=", - "dev": true, - "requires": { - "buffer-indexof": "1.1.1" - } - }, - "dom-converter": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz", - "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==", - "dev": true, "requires": { - "utila": "0.4.0" + "buffer-indexof": "^1.0.0" } }, "dom-serialize": { @@ -3321,77 +4559,32 @@ "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=", "dev": true, "requires": { - "custom-event": "1.0.1", - "ent": "2.2.0", - "extend": "3.0.2", - "void-elements": "2.0.1" - } - }, - "dom-serializer": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", - "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", - "dev": true, - "requires": { - "domelementtype": "1.1.3", - "entities": "1.1.2" - }, - "dependencies": { - "domelementtype": { - "version": "1.1.3", - "resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", - "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=", - "dev": true - } + "custom-event": "~1.0.0", + "ent": "~2.2.0", + "extend": "^3.0.0", + "void-elements": "^2.0.0" } }, "domain-browser": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", - "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==", - "dev": true - }, - "domelementtype": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.2.1.tgz", - "integrity": "sha512-SQVCLFS2E7G5CRCMdn6K9bIhRj1bS6QBWZfF0TUPh4V/BbqrQ619IdSS3/izn0FZ+9l+uODzaZjb08fjOfablA==", - "dev": true - }, - "domhandler": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.1.0.tgz", - "integrity": "sha1-0mRvXlf2w7qxHPbLBdPArPdBJZQ=", - "dev": true, - "requires": { - "domelementtype": "1.2.1" - } - }, - "domutils": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", - "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", - "dev": true, - "requires": { - "dom-serializer": "0.1.0", - "domelementtype": "1.2.1" - } + "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==" }, "duplexer": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", - "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=", + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", + "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==", "dev": true }, "duplexify": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz", - "integrity": "sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==", - "dev": true, + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", + "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==", "requires": { - "end-of-stream": "1.4.1", - "inherits": "2.0.3", - "readable-stream": "2.3.6", - "stream-shift": "1.0.0" + "end-of-stream": "^1.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.0.0", + "stream-shift": "^1.0.0" } }, "ecc-jsbn": { @@ -3399,41 +4592,45 @@ "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", "requires": { - "jsbn": "0.1.1", - "safer-buffer": "2.1.2" + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" } }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", - "dev": true + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "ejs": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.6.1.tgz", - "integrity": "sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==", + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz", + "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==", "dev": true }, "electron-to-chromium": { - "version": "1.3.81", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.81.tgz", - "integrity": "sha512-+rym2xtzwPWmoi8AYRrCdW65QOT0vfUHjZb5mjgh0VLyj31pGM3CpP3znKhQNBzQaWujR/KEl/mfC2lnKYgADA==", - "dev": true + "version": "1.3.592", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.592.tgz", + "integrity": "sha512-kGNowksvqQiPb1pUSQKpd8JFoGPLxYOwduNRCqCxGh/2Q1qE2JdmwouCW41lUzDxOb/2RIV4lR0tVIfboWlO9A==" }, "elliptic": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz", - "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==", - "dev": true, + "version": "6.5.3", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz", + "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==", "requires": { - "bn.js": "4.11.8", - "brorand": "1.1.0", - "hash.js": "1.1.5", - "hmac-drbg": "1.0.1", - "inherits": "2.0.3", - "minimalistic-assert": "1.0.1", - "minimalistic-crypto-utils": "1.0.1" + "bn.js": "^4.4.0", + "brorand": "^1.0.1", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.0" + }, + "dependencies": { + "bn.js": { + "version": "4.11.9", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz", + "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==" + } } }, "emojis-list": { @@ -3444,25 +4641,44 @@ "encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", - "dev": true + "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" }, "encoding": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", - "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", + "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", "dev": true, "requires": { - "iconv-lite": "0.4.23" + "iconv-lite": "^0.6.2" + }, + "dependencies": { + "iconv-lite": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz", + "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==", + "dev": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + } + } } }, "end-of-stream": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", - "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", - "dev": true, + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", "requires": { - "once": "1.4.0" + "once": "^1.4.0" + }, + "dependencies": { + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "requires": { + "wrappy": "1" + } + } } }, "engine.io": { @@ -3485,13 +4701,19 @@ "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=", "dev": true, "requires": { - "mime-types": "2.1.21", + "mime-types": "~2.1.11", "negotiator": "0.6.1" } }, + "cookie": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", + "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=", + "dev": true + }, "debug": { "version": "2.3.3", - "resolved": "http://registry.npmjs.org/debug/-/debug-2.3.3.tgz", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", "dev": true, "requires": { @@ -3500,9 +4722,25 @@ }, "ms": { "version": "0.7.2", - "resolved": "http://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", "dev": true + }, + "negotiator": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", + "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=", + "dev": true + }, + "ws": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz", + "integrity": "sha1-iiRPoFJAHgjJiGz0SoUYnh/UBn8=", + "dev": true, + "requires": { + "options": ">=0.0.5", + "ultron": "1.0.x" + } } } }, @@ -3526,9 +4764,15 @@ "yeast": "0.1.2" }, "dependencies": { + "component-emitter": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", + "dev": true + }, "debug": { "version": "2.3.3", - "resolved": "http://registry.npmjs.org/debug/-/debug-2.3.3.tgz", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", "dev": true, "requires": { @@ -3537,15 +4781,25 @@ }, "ms": { "version": "0.7.2", - "resolved": "http://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", "dev": true + }, + "ws": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz", + "integrity": "sha1-iiRPoFJAHgjJiGz0SoUYnh/UBn8=", + "dev": true, + "requires": { + "options": ">=0.0.5", + "ultron": "1.0.x" + } } } }, "engine.io-parser": { "version": "1.3.2", - "resolved": "http://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz", "integrity": "sha1-k3sHnwAH0Ik+xW1GyyILjLQ1Igo=", "dev": true, "requires": { @@ -3555,17 +4809,24 @@ "blob": "0.0.4", "has-binary": "0.1.7", "wtf-8": "1.0.0" + }, + "dependencies": { + "base64-arraybuffer": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz", + "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=", + "dev": true + } } }, "enhanced-resolve": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz", "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==", - "dev": true, "requires": { - "graceful-fs": "4.1.11", - "memory-fs": "0.4.1", - "tapable": "1.1.0" + "graceful-fs": "^4.1.2", + "memory-fs": "^0.4.0", + "tapable": "^1.0.0" } }, "ent": { @@ -3574,12 +4835,6 @@ "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=", "dev": true }, - "entities": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", - "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==", - "dev": true - }, "err-code": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz", @@ -3590,208 +4845,171 @@ "version": "0.1.7", "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz", "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", - "dev": true, "requires": { - "prr": "1.0.1" + "prr": "~1.0.1" } }, "error-ex": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, "requires": { - "is-arrayish": "0.2.1" + "is-arrayish": "^0.2.1" } }, "es-abstract": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz", - "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==", - "dev": true, - "requires": { - "es-to-primitive": "1.2.0", - "function-bind": "1.1.1", - "has": "1.0.3", - "is-callable": "1.1.4", - "is-regex": "1.0.4" + "version": "1.18.0-next.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", + "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-negative-zero": "^2.0.0", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" } }, "es-to-primitive": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz", - "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==", - "dev": true, + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", "requires": { - "is-callable": "1.1.4", - "is-date-object": "1.0.1", - "is-symbol": "1.0.2" + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" } }, "es6-promise": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz", - "integrity": "sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==" + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", + "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==" }, "es6-promisify": { "version": "5.0.0", - "resolved": "http://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", + "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", "dev": true, "requires": { - "es6-promise": "4.2.5" + "es6-promise": "^4.0.3" } }, + "escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" + }, "escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=", - "dev": true + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" }, "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "escodegen": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz", - "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=", + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", + "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", "requires": { - "esprima": "2.7.3", - "estraverse": "1.9.3", - "esutils": "2.0.2", - "optionator": "0.8.2", - "source-map": "0.2.0" - }, - "dependencies": { - "source-map": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz", - "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=", - "optional": true, - "requires": { - "amdefine": "1.0.1" - } - } + "esprima": "^4.0.1", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.6.1" } }, "eslint-scope": { - "version": "3.7.3", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz", - "integrity": "sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==", - "dev": true, + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", + "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", "requires": { - "esrecurse": "4.2.1", - "estraverse": "4.2.0" - }, - "dependencies": { - "estraverse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", - "dev": true - } + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" } }, "esprima": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=" + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" }, "esrecurse": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", - "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", - "dev": true, + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "requires": { - "estraverse": "4.2.0" + "estraverse": "^5.2.0" }, "dependencies": { "estraverse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", - "dev": true + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==" } } }, "estraverse": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz", - "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=" + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==" }, "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=" + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" }, "etag": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", - "dev": true + "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" }, "eventemitter3": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz", - "integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==", - "dev": true + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", + "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==" }, "events": { - "version": "1.1.1", - "resolved": "http://registry.npmjs.org/events/-/events-1.1.1.tgz", - "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", - "dev": true + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz", + "integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==" }, "eventsource": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz", "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==", - "dev": true, "requires": { - "original": "1.0.2" + "original": "^1.0.0" } }, "evp_bytestokey": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", - "dev": true, "requires": { - "md5.js": "1.3.5", - "safe-buffer": "5.1.2" + "md5.js": "^1.3.4", + "safe-buffer": "^5.1.1" } }, "execa": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz", - "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==", - "dev": true, + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", + "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", "requires": { - "cross-spawn": "6.0.5", - "get-stream": "3.0.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" - }, - "dependencies": { - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "dev": true, - "requires": { - "nice-try": "1.0.5", - "path-key": "2.0.1", - "semver": "5.6.0", - "shebang-command": "1.2.0", - "which": "1.3.1" - } - } + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" } }, "exit": { @@ -3806,9 +5024,9 @@ "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=", "dev": true, "requires": { - "array-slice": "0.2.3", - "array-unique": "0.2.1", - "braces": "0.1.5" + "array-slice": "^0.2.3", + "array-unique": "^0.2.1", + "braces": "^0.1.2" }, "dependencies": { "array-unique": { @@ -3823,7 +5041,7 @@ "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=", "dev": true, "requires": { - "expand-range": "0.1.1" + "expand-range": "^0.1.0" } }, "expand-range": { @@ -3832,8 +5050,8 @@ "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=", "dev": true, "requires": { - "is-number": "0.1.1", - "repeat-string": "0.2.2" + "is-number": "^0.1.1", + "repeat-string": "^0.2.2" } }, "is-number": { @@ -3854,34 +5072,44 @@ "version": "2.1.4", "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", - "dev": true, "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, "define-property": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" } } }, @@ -3891,7 +5119,7 @@ "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", "dev": true, "requires": { - "fill-range": "2.2.4" + "fill-range": "^2.1.0" }, "dependencies": { "fill-range": { @@ -3900,11 +5128,11 @@ "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==", "dev": true, "requires": { - "is-number": "2.1.0", - "isobject": "2.1.0", - "randomatic": "3.1.1", - "repeat-element": "1.1.3", - "repeat-string": "1.6.1" + "is-number": "^2.1.0", + "isobject": "^2.0.0", + "randomatic": "^3.0.0", + "repeat-element": "^1.1.2", + "repeat-string": "^1.5.2" } }, "is-number": { @@ -3913,7 +5141,7 @@ "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } }, "isobject": { @@ -3931,54 +5159,75 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } }, "express": { - "version": "4.16.4", - "resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz", - "integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==", - "dev": true, + "version": "4.17.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", + "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", "requires": { - "accepts": "1.3.5", + "accepts": "~1.3.7", "array-flatten": "1.1.1", - "body-parser": "1.18.3", - "content-disposition": "0.5.2", - "content-type": "1.0.4", - "cookie": "0.3.1", + "body-parser": "1.19.0", + "content-disposition": "0.5.3", + "content-type": "~1.0.4", + "cookie": "0.4.0", "cookie-signature": "1.0.6", "debug": "2.6.9", - "depd": "1.1.2", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "etag": "1.8.1", - "finalhandler": "1.1.1", + "depd": "~1.1.2", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "~1.1.2", "fresh": "0.5.2", "merge-descriptors": "1.0.1", - "methods": "1.1.2", - "on-finished": "2.3.0", - "parseurl": "1.3.2", + "methods": "~1.1.2", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", "path-to-regexp": "0.1.7", - "proxy-addr": "2.0.4", - "qs": "6.5.2", - "range-parser": "1.2.0", + "proxy-addr": "~2.0.5", + "qs": "6.7.0", + "range-parser": "~1.2.1", "safe-buffer": "5.1.2", - "send": "0.16.2", - "serve-static": "1.13.2", - "setprototypeof": "1.1.0", - "statuses": "1.4.0", - "type-is": "1.6.16", + "send": "0.17.1", + "serve-static": "1.14.1", + "setprototypeof": "1.1.1", + "statuses": "~1.5.0", + "type-is": "~1.6.18", "utils-merge": "1.0.1", - "vary": "1.1.2" + "vary": "~1.1.2" }, "dependencies": { "array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=", - "dev": true + "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "qs": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" } } }, @@ -3991,115 +5240,87 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", - "dev": true, "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } }, "external-editor": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz", - "integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", + "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", "dev": true, "requires": { - "chardet": "0.7.0", - "iconv-lite": "0.4.24", - "tmp": "0.0.33" - }, - "dependencies": { - "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "requires": { - "safer-buffer": "2.1.2" - } - }, - "tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "dev": true, - "requires": { - "os-tmpdir": "1.0.2" - } - } + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" } }, "extglob": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "dev": true, "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "is-accessor-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -4110,14 +5331,14 @@ "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" }, "fast-deep-equal": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", - "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=" + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, "fast-json-stable-stringify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" }, "fast-levenshtein": { "version": "2.0.6", @@ -4134,16 +5355,14 @@ "version": "0.10.0", "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz", "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", - "dev": true, "requires": { - "websocket-driver": "0.7.0" + "websocket-driver": ">=0.5.1" } }, "figgy-pudding": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz", - "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==", - "dev": true + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz", + "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==" }, "figures": { "version": "2.0.0", @@ -4151,19 +5370,28 @@ "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", "dev": true, "requires": { - "escape-string-regexp": "1.0.5" + "escape-string-regexp": "^1.0.5" } }, "file-loader": { - "version": "1.1.11", - "resolved": "http://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz", - "integrity": "sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==", - "dev": true, + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-3.0.1.tgz", + "integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==", "requires": { - "loader-utils": "1.1.0", - "schema-utils": "0.4.7" + "loader-utils": "^1.0.2", + "schema-utils": "^1.0.0" } }, + "file-saver": { + "version": "github:eligrey/FileSaver.js#e865e37af9f9947ddcced76b549e27dc45c1cb2e", + "from": "github:eligrey/FileSaver.js#1.3.8" + }, + "file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "optional": true + }, "filename-regex": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", @@ -4176,8 +5404,8 @@ "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=", "dev": true, "requires": { - "glob": "7.1.3", - "minimatch": "3.0.4" + "glob": "^7.0.3", + "minimatch": "^3.0.3" } }, "filesize": { @@ -4186,762 +5414,234 @@ "integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==", "dev": true }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, - "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "finalhandler": { - "version": "1.1.1", - "resolved": "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz", - "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==", - "dev": true, - "requires": { - "debug": "2.6.9", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "on-finished": "2.3.0", - "parseurl": "1.3.2", - "statuses": "1.4.0", - "unpipe": "1.0.0" - } - }, - "find-cache-dir": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz", - "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", - "dev": true, - "requires": { - "commondir": "1.0.1", - "make-dir": "1.3.0", - "pkg-dir": "2.0.0" - } - }, - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "requires": { - "locate-path": "2.0.0" - } - }, - "flush-write-stream": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz", - "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==", - "dev": true, - "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.6" - } - }, - "follow-redirects": { - "version": "1.5.9", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.9.tgz", - "integrity": "sha512-Bh65EZI/RU8nx0wbYF9shkFZlqLP+6WT/5FnA3cE/djNSuKNHJEinGGZgu/cQEkeeb2GdFOgenAmn8qaqYke2w==", - "dev": true, - "requires": { - "debug": "3.1.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } - } - }, - "for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", - "dev": true - }, - "for-own": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", - "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", - "dev": true, - "requires": { - "for-in": "1.0.2" - } - }, - "forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" - }, - "form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.7", - "mime-types": "2.1.21" - } - }, - "forwarded": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", - "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", - "dev": true - }, - "fragment-cache": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", - "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", - "dev": true, - "requires": { - "map-cache": "0.2.2" - } - }, - "fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", - "dev": true - }, - "from2": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", - "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", - "dev": true, - "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.6" - } - }, - "fs-access": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz", - "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=", - "dev": true, - "requires": { - "null-check": "1.0.0" - } - }, - "fs-minipass": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz", - "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", - "dev": true, - "requires": { - "minipass": "2.3.5" - } - }, - "fs-write-stream-atomic": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz", - "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "iferr": "0.1.5", - "imurmurhash": "0.1.4", - "readable-stream": "2.3.6" - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true - }, - "fsevents": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz", - "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==", - "dev": true, - "optional": true, - "requires": { - "nan": "2.11.1", - "node-pre-gyp": "0.10.0" - }, - "dependencies": { - "abbrev": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "aproba": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.6" - } - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "brace-expansion": { - "version": "1.1.11", - "bundled": true, - "dev": true, - "requires": { - "balanced-match": "1.0.0", - "concat-map": "0.0.1" - } - }, - "chownr": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "dev": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "debug": { - "version": "2.6.9", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ms": "2.0.0" - } - }, - "deep-extend": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "optional": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "detect-libc": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "fs-minipass": { - "version": "1.2.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "2.2.4" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" - } - }, - "glob": { - "version": "7.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "iconv-lite": { - "version": "0.4.21", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safer-buffer": "2.1.2" - } - }, - "ignore-walk": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minimatch": "3.0.4" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true, - "dev": true - }, - "ini": { - "version": "1.3.5", - "bundled": true, - "dev": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "dev": true, - "requires": { - "brace-expansion": "1.1.11" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true, - "dev": true - }, - "minipass": { - "version": "2.2.4", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "5.1.1", - "yallist": "3.0.2" - } - }, - "minizlib": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "2.2.4" - } - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "needle": { - "version": "2.2.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "debug": "2.6.9", - "iconv-lite": "0.4.21", - "sax": "1.2.4" - } - }, - "node-pre-gyp": { - "version": "0.10.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "detect-libc": "1.0.3", - "mkdirp": "0.5.1", - "needle": "2.2.0", - "nopt": "4.0.1", - "npm-packlist": "1.1.10", - "npmlog": "4.1.2", - "rc": "1.2.7", - "rimraf": "2.6.2", - "semver": "5.5.0", - "tar": "4.4.1" - } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.5" - } - }, - "npm-bundled": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "npm-packlist": { - "version": "1.1.10", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ignore-walk": "3.0.1", - "npm-bundled": "1.0.3" - } - }, - "npmlog": { - "version": "4.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "requires": { - "wrappy": "1.0.2" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "osenv": { - "version": "0.1.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "process-nextick-args": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "rc": { - "version": "1.2.7", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "deep-extend": "0.5.1", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "readable-stream": { - "version": "2.3.6", - "bundled": true, - "dev": true, - "optional": true, + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "requires": { + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "is-extendable": "^0.1.0" } - }, - "rimraf": { - "version": "2.6.2", - "bundled": true, - "dev": true, - "optional": true, + } + } + }, + "finalhandler": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", + "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", + "requires": { + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "statuses": "~1.5.0", + "unpipe": "~1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "requires": { - "glob": "7.1.2" + "ms": "2.0.0" } }, - "safe-buffer": { - "version": "5.1.1", - "bundled": true, - "dev": true - }, - "safer-buffer": { - "version": "2.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "sax": { - "version": "1.2.4", - "bundled": true, - "dev": true, - "optional": true - }, - "semver": { - "version": "5.5.0", - "bundled": true, - "dev": true, - "optional": true - }, - "set-blocking": { + "ms": { "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "tar": { - "version": "4.4.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "chownr": "1.0.1", - "fs-minipass": "1.2.5", - "minipass": "2.2.4", - "minizlib": "1.1.0", - "mkdirp": "0.5.1", - "safe-buffer": "5.1.1", - "yallist": "3.0.2" - } - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "wide-align": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "optional": true, + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, + "find-cache-dir": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz", + "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", + "requires": { + "commondir": "^1.0.1", + "make-dir": "^1.0.0", + "pkg-dir": "^2.0.0" + }, + "dependencies": { + "make-dir": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", + "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", "requires": { - "string-width": "1.0.2" + "pify": "^3.0.0" } }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "yallist": { - "version": "3.0.2", - "bundled": true, - "dev": true + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" } } }, - "fstream": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", - "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", + "find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "requires": { + "locate-path": "^3.0.0" + } + }, + "flush-write-stream": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz", + "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==", + "requires": { + "inherits": "^2.0.3", + "readable-stream": "^2.3.6" + } + }, + "follow-redirects": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz", + "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==" + }, + "for-in": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" + }, + "for-own": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", + "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "inherits": "2.0.3", - "mkdirp": "0.5.1", - "rimraf": "2.6.2" + "for-in": "^1.0.1" + } + }, + "forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" + }, + "form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + } + }, + "forwarded": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", + "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=" + }, + "fragment-cache": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", + "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", + "requires": { + "map-cache": "^0.2.2" + } + }, + "fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" + }, + "from2": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", + "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", + "requires": { + "inherits": "^2.0.1", + "readable-stream": "^2.0.0" + } + }, + "fs-access": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz", + "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=", + "dev": true, + "requires": { + "null-check": "^1.0.0" + } + }, + "fs-write-stream-atomic": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz", + "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", + "requires": { + "graceful-fs": "^4.1.2", + "iferr": "^0.1.5", + "imurmurhash": "^0.1.4", + "readable-stream": "1 || 2" + } + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, + "fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } + }, + "fstream": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", + "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", + "optional": true, + "requires": { + "graceful-fs": "^4.1.2", + "inherits": "~2.0.0", + "mkdirp": ">=0.5 0", + "rimraf": "2" } }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "gauge": { "version": "2.7.4", "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", - "dev": true, + "optional": true, "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.3" + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" } }, "gaze": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz", "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", - "dev": true, "optional": true, "requires": { - "globule": "1.2.1" + "globule": "^1.0.0" } }, "genfun": { @@ -4956,60 +5656,72 @@ "integrity": "sha1-2Zgh5nvAL1mxOZL8/5iiVvitGeE=", "requires": { "obj": "0.0.0", - "once": "1.1.1" - }, - "dependencies": { - "once": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/once/-/once-1.1.1.tgz", - "integrity": "sha1-nbV0kzzLCMOnYU0VQDLAnqbzOec=" - } + "once": "~1.1.1" } }, "get-caller-file": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", - "dev": true + "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" + }, + "get-intrinsic": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz", + "integrity": "sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==", + "requires": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1" + } }, "get-stdin": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", - "dev": true + "optional": true }, "get-stream": { - "version": "3.0.0", - "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", - "dev": true + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", + "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "requires": { + "pump": "^3.0.0" + } }, "get-value": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", - "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", - "dev": true + "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=" }, "getpass": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, "glob": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", - "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", - "dev": true, + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "dependencies": { + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "requires": { + "wrappy": "1" + } + } } }, "glob-base": { @@ -5018,8 +5730,8 @@ "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", "dev": true, "requires": { - "glob-parent": "2.0.0", - "is-glob": "2.0.1" + "glob-parent": "^2.0.0", + "is-glob": "^2.0.0" }, "dependencies": { "glob-parent": { @@ -5028,7 +5740,7 @@ "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", "dev": true, "requires": { - "is-glob": "2.0.1" + "is-glob": "^2.0.0" } }, "is-extglob": { @@ -5043,7 +5755,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } } } @@ -5052,69 +5764,71 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "dev": true, "requires": { - "is-glob": "3.1.0", - "path-dirname": "1.0.2" + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" }, "dependencies": { "is-glob": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true, "requires": { - "is-extglob": "2.1.1" + "is-extglob": "^2.1.0" } } } }, "globals": { - "version": "9.18.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", "dev": true }, "globby": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz", "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=", - "dev": true, "requires": { - "array-union": "1.0.2", - "dir-glob": "2.0.0", - "glob": "7.1.3", - "ignore": "3.3.10", - "pify": "3.0.0", - "slash": "1.0.0" + "array-union": "^1.0.1", + "dir-glob": "^2.0.0", + "glob": "^7.1.2", + "ignore": "^3.3.5", + "pify": "^3.0.0", + "slash": "^1.0.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + } } }, "globule": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz", - "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==", - "dev": true, + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz", + "integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==", "optional": true, "requires": { - "glob": "7.1.3", - "lodash": "4.17.11", - "minimatch": "3.0.4" + "glob": "~7.1.1", + "lodash": "~4.17.10", + "minimatch": "~3.0.2" } }, "graceful-fs": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", - "dev": true + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" }, "gzip-size": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.0.0.tgz", - "integrity": "sha512-5iI7omclyqrnWw4XbXAmGhPsABkSIDQonv2K0h61lybgofWa6iZyvrI3r2zsJH4P8Nb64fFVzlvfhs0g7BBxAA==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz", + "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==", "dev": true, "requires": { - "duplexer": "0.1.1", - "pify": "3.0.0" + "duplexer": "^0.1.1", + "pify": "^4.0.1" } }, "hammerjs": { @@ -5123,37 +5837,26 @@ "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE=" }, "handle-thing": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz", - "integrity": "sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=", - "dev": true - }, - "handlebars": { - "version": "4.0.12", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.12.tgz", - "integrity": "sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==", - "dev": true, - "requires": { - "async": "2.6.1", - "optimist": "0.6.1", - "source-map": "0.6.1", - "uglify-js": "3.4.9" - }, - "dependencies": { - "async": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", - "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", - "dev": true, - "requires": { - "lodash": "4.17.11" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz", + "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==" + }, + "handlebars": { + "version": "4.7.6", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz", + "integrity": "sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==", + "requires": { + "minimist": "^1.2.5", + "neo-async": "^2.6.0", + "source-map": "^0.6.1", + "uglify-js": "^3.1.4", + "wordwrap": "^1.0.0" + }, + "dependencies": { + "wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=" } } }, @@ -5163,43 +5866,28 @@ "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" }, "har-validator": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.0.tgz", - "integrity": "sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==", + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", + "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", "requires": { - "ajv": "5.5.2", - "har-schema": "2.0.0" - }, - "dependencies": { - "ajv": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", - "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", - "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.1.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1" - } - } + "ajv": "^6.12.3", + "har-schema": "^2.0.0" } }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, "requires": { - "function-bind": "1.1.1" + "function-bind": "^1.1.1" } }, "has-ansi": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "has-binary": { @@ -5228,88 +5916,105 @@ "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" }, "has-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz", - "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=", - "dev": true + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==" }, "has-unicode": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", - "dev": true + "optional": true }, "has-value": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", - "dev": true, "requires": { - "get-value": "2.0.6", - "has-values": "1.0.0", - "isobject": "3.0.1" + "get-value": "^2.0.6", + "has-values": "^1.0.0", + "isobject": "^3.0.0" } }, "has-values": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", - "dev": true, "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" + "is-number": "^3.0.0", + "kind-of": "^4.0.0" }, "dependencies": { + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, "kind-of": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", - "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } }, "hash-base": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz", - "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=", - "dev": true, + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz", + "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==", "requires": { - "inherits": "2.0.3", - "safe-buffer": "5.1.2" + "inherits": "^2.0.4", + "readable-stream": "^3.6.0", + "safe-buffer": "^5.2.0" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } } }, "hash.js": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.5.tgz", - "integrity": "sha512-eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA==", - "dev": true, + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", + "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", "requires": { - "inherits": "2.0.3", - "minimalistic-assert": "1.0.1" + "inherits": "^2.0.3", + "minimalistic-assert": "^1.0.1" } }, - "he": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", - "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", - "dev": true - }, "hmac-drbg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", - "dev": true, "requires": { - "hash.js": "1.1.5", - "minimalistic-assert": "1.0.1", - "minimalistic-crypto-utils": "1.0.1" + "hash.js": "^1.0.3", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.1" } }, "hoopy": { @@ -5319,136 +6024,48 @@ "dev": true }, "hosted-git-info": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz", - "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==", - "dev": true + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", + "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==" }, "hpack.js": { "version": "2.1.6", "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=", - "dev": true, "requires": { - "inherits": "2.0.3", - "obuf": "1.1.2", - "readable-stream": "2.3.6", - "wbuf": "1.7.3" + "inherits": "^2.0.1", + "obuf": "^1.0.0", + "readable-stream": "^2.0.1", + "wbuf": "^1.1.0" } }, "html-entities": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz", - "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=", - "dev": true - }, - "html-minifier": { - "version": "3.5.20", - "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.20.tgz", - "integrity": "sha512-ZmgNLaTp54+HFKkONyLFEfs5dd/ZOtlquKaTnqIWFmx3Av5zG6ZPcV2d0o9XM2fXOTxxIf6eDcwzFFotke/5zA==", - "dev": true, - "requires": { - "camel-case": "3.0.0", - "clean-css": "4.2.1", - "commander": "2.17.1", - "he": "1.1.1", - "param-case": "2.1.1", - "relateurl": "0.2.7", - "uglify-js": "3.4.9" - } + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz", + "integrity": "sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==" }, - "html-webpack-plugin": { - "version": "3.2.0", - "resolved": "http://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz", - "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=", - "dev": true, - "requires": { - "html-minifier": "3.5.20", - "loader-utils": "0.2.17", - "lodash": "4.17.11", - "pretty-error": "2.1.1", - "tapable": "1.1.0", - "toposort": "1.0.7", - "util.promisify": "1.0.0" - }, - "dependencies": { - "loader-utils": { - "version": "0.2.17", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", - "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", - "dev": true, - "requires": { - "big.js": "3.2.0", - "emojis-list": "2.1.0", - "json5": "0.5.1", - "object-assign": "4.1.1" - } - } - } + "html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true }, "html2canvas": { - "version": "1.0.0-alpha.12", - "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.0.0-alpha.12.tgz", - "integrity": "sha1-OxmS48mz9WBjw1/WIElPN+uohRM=", + "version": "1.0.0-rc.7", + "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.0.0-rc.7.tgz", + "integrity": "sha512-yvPNZGejB2KOyKleZspjK/NruXVQuowu8NnV2HYG7gW7ytzl+umffbtUI62v2dCHQLDdsK6HIDtyJZ0W3neerA==", "requires": { - "css-line-break": "1.0.1" + "css-line-break": "1.1.1" } }, "html2pdf.js": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/html2pdf.js/-/html2pdf.js-0.9.1.tgz", - "integrity": "sha512-bneX1NQTj67PZuV4WX19fOGLZWbEIZvO8qLAGOKX5VQsbGXX62/5ZraD42oeUHlh5gSOkFpNf+J9lOjQV6qAvg==", - "requires": { - "es6-promise": "4.2.5", - "html2canvas": "1.0.0-alpha.12", - "jspdf": "1.5.3" - } - }, - "htmlparser2": { - "version": "3.3.0", - "resolved": "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz", - "integrity": "sha1-zHDQWln2VC5D8OaFyYLhTJJKnv4=", - "dev": true, + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/html2pdf.js/-/html2pdf.js-0.9.2.tgz", + "integrity": "sha512-lWV/dZEDfwX6tGQ2mrjyMCiEgXp9bLn74nxzGkuzWYeWMJ/0col2BJfVI7rflh2vkQd7PXEHTZ6AYe7m8OPrlQ==", "requires": { - "domelementtype": "1.2.1", - "domhandler": "2.1.0", - "domutils": "1.1.6", - "readable-stream": "1.0.34" - }, - "dependencies": { - "domutils": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.1.6.tgz", - "integrity": "sha1-vdw94Jm5ou+sxRxiPyj0FuzFdIU=", - "dev": true, - "requires": { - "domelementtype": "1.2.1" - } - }, - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "readable-stream": { - "version": "1.0.34", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "0.0.1", - "string_decoder": "0.10.31" - } - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - } + "es6-promise": "^4.2.5", + "html2canvas": "^1.0.0-alpha.12", + "jspdf": "^1.4.1" } }, "http-cache-semantics": { @@ -5460,36 +6077,40 @@ "http-deceiver": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz", - "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=", - "dev": true + "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=" }, "http-errors": { - "version": "1.6.3", - "resolved": "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", - "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", - "dev": true, + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", + "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", "requires": { - "depd": "1.1.2", + "depd": "~1.1.2", "inherits": "2.0.3", - "setprototypeof": "1.1.0", - "statuses": "1.4.0" + "setprototypeof": "1.1.1", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.0" + }, + "dependencies": { + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + } } }, "http-parser-js": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.0.tgz", - "integrity": "sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==", - "dev": true + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.2.tgz", + "integrity": "sha512-opCO9ASqg5Wy2FNo7A0sxy71yGbbkJJXLdgMK04Tcypw9jr2MgWbyubb0+WdmDmGnFflO7fRbqbaihh/ENDlRQ==" }, "http-proxy": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz", - "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==", - "dev": true, + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", + "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", "requires": { - "eventemitter3": "3.1.0", - "follow-redirects": "1.5.9", - "requires-port": "1.0.0" + "eventemitter3": "^4.0.0", + "follow-redirects": "^1.0.0", + "requires-port": "^1.0.0" } }, "http-proxy-agent": { @@ -5498,7 +6119,7 @@ "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==", "dev": true, "requires": { - "agent-base": "4.2.1", + "agent-base": "4", "debug": "3.1.0" }, "dependencies": { @@ -5510,19 +6131,24 @@ "requires": { "ms": "2.0.0" } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true } } }, "http-proxy-middleware": { "version": "0.18.0", - "resolved": "http://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz", "integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==", - "dev": true, "requires": { - "http-proxy": "1.17.0", - "is-glob": "4.0.0", - "lodash": "4.17.11", - "micromatch": "3.1.10" + "http-proxy": "^1.16.2", + "is-glob": "^4.0.0", + "lodash": "^4.17.5", + "micromatch": "^3.1.9" } }, "http-signature": { @@ -5530,25 +6156,24 @@ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "requires": { - "assert-plus": "1.0.0", - "jsprim": "1.4.1", - "sshpk": "1.15.1" + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" } }, "https-browserify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", - "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=", - "dev": true + "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=" }, "https-proxy-agent": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz", - "integrity": "sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==", + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz", + "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==", "dev": true, "requires": { - "agent-base": "4.2.1", - "debug": "3.2.6" + "agent-base": "^4.3.0", + "debug": "^3.1.0" }, "dependencies": { "debug": { @@ -5557,14 +6182,8 @@ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { - "ms": "2.1.1" + "ms": "^2.1.1" } - }, - "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "dev": true } } }, @@ -5574,48 +6193,45 @@ "integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=", "dev": true, "requires": { - "ms": "2.0.0" + "ms": "^2.0.0" } }, "iconv-lite": { - "version": "0.4.23", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz", - "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": ">= 2.1.2 < 3" } }, "ieee754": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz", - "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" }, "iferr": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz", - "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=", - "dev": true + "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=" }, "ignore": { "version": "3.3.10", "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz", - "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==", - "dev": true + "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==" }, "ignore-walk": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz", - "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz", + "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==", "dev": true, "requires": { - "minimatch": "3.0.4" + "minimatch": "^3.0.4" } }, "image-size": { "version": "0.5.5", "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz", "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=", - "dev": true, "optional": true }, "immediate": { @@ -5628,80 +6244,42 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz", "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=", - "dev": true, "requires": { - "import-from": "2.1.0" + "import-from": "^2.1.0" + } + }, + "import-fresh": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz", + "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=", + "requires": { + "caller-path": "^2.0.0", + "resolve-from": "^3.0.0" } }, "import-from": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz", "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=", - "dev": true, "requires": { - "resolve-from": "3.0.0" + "resolve-from": "^3.0.0" } }, "import-local": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz", "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==", - "dev": true, "requires": { - "pkg-dir": "3.0.0", - "resolve-cwd": "2.0.0" + "pkg-dir": "^3.0.0", + "resolve-cwd": "^2.0.0" }, "dependencies": { - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "requires": { - "locate-path": "3.0.0" - } - }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "requires": { - "p-locate": "3.0.0", - "path-exists": "3.0.0" - } - }, - "p-limit": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.0.0.tgz", - "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==", - "dev": true, - "requires": { - "p-try": "2.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "requires": { - "p-limit": "2.0.0" - } - }, - "p-try": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz", - "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==", - "dev": true - }, "pkg-dir": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", - "dev": true, "requires": { - "find-up": "3.0.0" + "find-up": "^3.0.0" } } } @@ -5709,24 +6287,21 @@ "imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", - "dev": true + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" }, "in-publish": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz", - "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=", - "dev": true, + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz", + "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==", "optional": true }, "indent-string": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", - "dev": true, "optional": true, "requires": { - "repeating": "2.0.1" + "repeating": "^2.0.0" } }, "indexof": { @@ -5739,17 +6314,25 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" + }, + "dependencies": { + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "requires": { + "wrappy": "1" + } + } } }, "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "ini": { "version": "1.3.5", @@ -5763,19 +6346,19 @@ "integrity": "sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==", "dev": true, "requires": { - "ansi-escapes": "3.1.0", - "chalk": "2.4.1", - "cli-cursor": "2.1.0", - "cli-width": "2.2.0", - "external-editor": "3.0.3", - "figures": "2.0.0", - "lodash": "4.17.11", + "ansi-escapes": "^3.0.0", + "chalk": "^2.0.0", + "cli-cursor": "^2.1.0", + "cli-width": "^2.0.0", + "external-editor": "^3.0.0", + "figures": "^2.0.0", + "lodash": "^4.17.10", "mute-stream": "0.0.7", - "run-async": "2.3.0", - "rxjs": "6.3.3", - "string-width": "2.1.1", - "strip-ansi": "5.0.0", - "through": "2.3.8" + "run-async": "^2.2.0", + "rxjs": "^6.1.0", + "string-width": "^2.1.0", + "strip-ansi": "^5.0.0", + "through": "^2.3.6" }, "dependencies": { "ansi-regex": { @@ -5784,20 +6367,14 @@ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "dev": true }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" }, "dependencies": { "strip-ansi": { @@ -5806,24 +6383,24 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } }, "strip-ansi": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz", - "integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "ansi-regex": "4.0.0" + "ansi-regex": "^4.1.0" }, "dependencies": { "ansi-regex": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz", - "integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", "dev": true } } @@ -5834,157 +6411,143 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-3.0.1.tgz", "integrity": "sha512-NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==", - "dev": true, "requires": { - "default-gateway": "2.7.2", - "ipaddr.js": "1.8.0" + "default-gateway": "^2.6.0", + "ipaddr.js": "^1.5.2" } }, "interpret": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz", - "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", + "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==", "dev": true }, "invariant": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", - "dev": true, "requires": { - "loose-envify": "1.4.0" + "loose-envify": "^1.0.0" } }, "invert-kv": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", - "dev": true + "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", - "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=", - "dev": true + "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=" }, "ip-regex": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", - "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=", - "dev": true + "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=" }, "ipaddr.js": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz", - "integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4=", - "dev": true + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==" }, "is-accessor-descriptor": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } }, + "is-arguments": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz", + "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==" + }, "is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" }, "is-binary-path": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", - "dev": true, "requires": { - "binary-extensions": "1.12.0" + "binary-extensions": "^1.0.0" } }, "is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, - "is-builtin-module": { - "version": "1.0.0", - "resolved": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", - "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", - "dev": true, + "is-callable": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz", + "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==" + }, + "is-core-module": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.1.0.tgz", + "integrity": "sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==", "requires": { - "builtin-modules": "1.1.1" + "has": "^1.0.3" } }, - "is-callable": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", - "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==", - "dev": true - }, "is-data-descriptor": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } }, "is-date-object": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", - "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=", - "dev": true + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", + "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==" }, "is-descriptor": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" }, "dependencies": { "kind-of": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" } } }, "is-directory": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz", - "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=", - "dev": true + "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=" }, "is-dotfile": { "version": "1.0.3", @@ -5998,64 +6561,56 @@ "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", "dev": true, "requires": { - "is-primitive": "2.0.0" + "is-primitive": "^2.0.0" } }, "is-extendable": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", - "dev": true + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=" }, "is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" }, "is-finite": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", - "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz", + "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==" }, "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" }, - "is-glob": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", - "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", - "dev": true, + "is-glob": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", + "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", "requires": { - "is-extglob": "2.1.1" + "is-extglob": "^2.1.1" } }, + "is-negative-zero": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz", + "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=" + }, "is-number": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -6063,34 +6618,30 @@ "is-path-cwd": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", - "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", - "dev": true + "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=" }, "is-path-in-cwd": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz", "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", - "dev": true, "requires": { - "is-path-inside": "1.0.1" + "is-path-inside": "^1.0.0" } }, "is-path-inside": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", - "dev": true, "requires": { - "path-is-inside": "1.0.2" + "path-is-inside": "^1.0.1" } }, "is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.1" } }, "is-posix-bracket": { @@ -6105,34 +6656,25 @@ "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", "dev": true }, - "is-promise": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", - "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", - "dev": true - }, "is-regex": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", - "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", - "dev": true, + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", + "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", "requires": { - "has": "1.0.3" + "has-symbols": "^1.0.1" } }, "is-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", - "dev": true + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" }, "is-symbol": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz", - "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==", - "dev": true, + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", + "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", "requires": { - "has-symbols": "1.0.0" + "has-symbols": "^1.0.1" } }, "is-typedarray": { @@ -6144,25 +6686,22 @@ "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", - "dev": true + "optional": true }, "is-windows": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", - "dev": true + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" }, "is-wsl": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", - "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=", - "dev": true + "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=" }, "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, "isbinaryfile": { "version": "3.0.3", @@ -6170,20 +6709,18 @@ "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==", "dev": true, "requires": { - "buffer-alloc": "1.2.0" + "buffer-alloc": "^1.2.0" } }, "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" }, "isobject": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" }, "isstream": { "version": "0.1.2", @@ -6194,103 +6731,162 @@ "version": "0.4.5", "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz", "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=", - "dev": true, "requires": { - "abbrev": "1.0.9", - "async": "1.5.2", - "escodegen": "1.8.1", - "esprima": "2.7.3", - "glob": "5.0.15", - "handlebars": "4.0.12", - "js-yaml": "3.12.0", - "mkdirp": "0.5.1", - "nopt": "3.0.6", - "once": "1.4.0", - "resolve": "1.1.7", - "supports-color": "3.2.3", - "which": "1.3.1", - "wordwrap": "1.0.0" + "abbrev": "1.0.x", + "async": "1.x", + "escodegen": "1.8.x", + "esprima": "2.7.x", + "glob": "^5.0.15", + "handlebars": "^4.0.1", + "js-yaml": "3.x", + "mkdirp": "0.5.x", + "nopt": "3.x", + "once": "1.x", + "resolve": "1.1.x", + "supports-color": "^3.1.0", + "which": "^1.1.1", + "wordwrap": "^1.0.0" }, "dependencies": { + "async": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" + }, + "escodegen": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz", + "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=", + "requires": { + "esprima": "^2.7.1", + "estraverse": "^1.9.1", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.2.0" + } + }, + "esprima": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", + "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=" + }, + "estraverse": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz", + "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=" + }, "glob": { "version": "5.0.15", "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", - "dev": true, "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "dependencies": { + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "requires": { + "wrappy": "1" + } + } } }, "has-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" + }, + "resolve": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", + "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=" + }, + "source-map": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz", + "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=", + "optional": true, + "requires": { + "amdefine": ">=0.0.4" + } }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, "requires": { - "has-flag": "1.0.0" + "has-flag": "^1.0.0" } + }, + "wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=" } } }, "istanbul-api": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-2.0.6.tgz", - "integrity": "sha512-8W5oeAGWXhtTJjAyVfvavOLVyZCTNCKsyF6GON/INKlBdO7uJ/bv3qnPj5M6ERKzmMCJS1kntnjjGuJ86fn3rQ==", - "dev": true, - "requires": { - "async": "2.6.1", - "compare-versions": "3.4.0", - "fileset": "2.0.3", - "istanbul-lib-coverage": "2.0.1", - "istanbul-lib-hook": "2.0.1", - "istanbul-lib-instrument": "3.0.0", - "istanbul-lib-report": "2.0.2", - "istanbul-lib-source-maps": "2.0.1", - "istanbul-reports": "2.0.1", - "js-yaml": "3.12.0", - "make-dir": "1.3.0", - "once": "1.4.0" + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-2.1.7.tgz", + "integrity": "sha512-LYTOa2UrYFyJ/aSczZi/6lBykVMjCCvUmT64gOe+jPZFy4w6FYfPGqFT2IiQ2BxVHHDOvCD7qrIXb0EOh4uGWw==", + "dev": true, + "requires": { + "async": "^2.6.2", + "compare-versions": "^3.4.0", + "fileset": "^2.0.3", + "istanbul-lib-coverage": "^2.0.5", + "istanbul-lib-hook": "^2.0.7", + "istanbul-lib-instrument": "^3.3.0", + "istanbul-lib-report": "^2.0.8", + "istanbul-lib-source-maps": "^3.0.6", + "istanbul-reports": "^2.2.5", + "js-yaml": "^3.13.1", + "make-dir": "^2.1.0", + "minimatch": "^3.0.4", + "once": "^1.4.0" }, "dependencies": { - "async": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", - "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", - "dev": true, - "requires": { - "lodash": "4.17.11" - } - }, "istanbul-lib-coverage": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz", - "integrity": "sha512-nPvSZsVlbG9aLhZYaC3Oi1gT/tpyo3Yt5fNyf6NmcKIayz4VV/txxJFFKAK/gU4dcNn8ehsanBbVHVl0+amOLA==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz", + "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==", "dev": true }, "istanbul-lib-instrument": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.0.0.tgz", - "integrity": "sha512-eQY9vN9elYjdgN9Iv6NS/00bptm02EBBk70lRMaVjeA6QYocQgenVrSgC28TJurdnZa80AGO3ASdFN+w/njGiQ==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz", + "integrity": "sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==", + "dev": true, + "requires": { + "@babel/generator": "^7.4.0", + "@babel/parser": "^7.4.3", + "@babel/template": "^7.4.0", + "@babel/traverse": "^7.4.3", + "@babel/types": "^7.4.0", + "istanbul-lib-coverage": "^2.0.5", + "semver": "^6.0.0" + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { - "@babel/generator": "7.1.3", - "@babel/parser": "7.1.3", - "@babel/template": "7.1.2", - "@babel/traverse": "7.1.4", - "@babel/types": "7.1.3", - "istanbul-lib-coverage": "2.0.1", - "semver": "5.6.0" + "wrappy": "1" } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true } } }, @@ -6298,33 +6894,40 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz", "integrity": "sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==", - "dev": true, "requires": { - "convert-source-map": "1.6.0", - "istanbul-lib-instrument": "1.10.2", - "loader-utils": "1.1.0", - "schema-utils": "0.3.0" + "convert-source-map": "^1.5.0", + "istanbul-lib-instrument": "^1.7.3", + "loader-utils": "^1.1.0", + "schema-utils": "^0.3.0" }, "dependencies": { "ajv": { "version": "5.5.2", "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", - "dev": true, "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.1.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1" + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" } }, + "fast-deep-equal": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", + "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=" + }, + "json-schema-traverse": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", + "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=" + }, "schema-utils": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", - "dev": true, "requires": { - "ajv": "5.5.2" + "ajv": "^5.0.0" } } } @@ -6332,101 +6935,96 @@ "istanbul-lib-coverage": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz", - "integrity": "sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==", - "dev": true + "integrity": "sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==" }, "istanbul-lib-hook": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.1.tgz", - "integrity": "sha512-ufiZoiJ8CxY577JJWEeFuxXZoMqiKpq/RqZtOAYuQLvlkbJWscq9n3gc4xrCGH9n4pW0qnTxOz1oyMmVtk8E1w==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.7.tgz", + "integrity": "sha512-vrRztU9VRRFDyC+aklfLoeXyNdTfga2EI3udDGn4cZ6fpSXpHLV9X6CHvfoMCPtggg8zvDDmC4b9xfu0z6/llA==", "dev": true, "requires": { - "append-transform": "1.0.0" + "append-transform": "^1.0.0" } }, "istanbul-lib-instrument": { "version": "1.10.2", "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz", "integrity": "sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==", - "dev": true, "requires": { - "babel-generator": "6.26.1", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "istanbul-lib-coverage": "1.2.1", - "semver": "5.6.0" + "babel-generator": "^6.18.0", + "babel-template": "^6.16.0", + "babel-traverse": "^6.18.0", + "babel-types": "^6.18.0", + "babylon": "^6.18.0", + "istanbul-lib-coverage": "^1.2.1", + "semver": "^5.3.0" } }, "istanbul-lib-report": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.2.tgz", - "integrity": "sha512-rJ8uR3peeIrwAxoDEbK4dJ7cqqtxBisZKCuwkMtMv0xYzaAnsAi3AHrHPAAtNXzG/bcCgZZ3OJVqm1DTi9ap2Q==", + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz", + "integrity": "sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==", "dev": true, "requires": { - "istanbul-lib-coverage": "2.0.1", - "make-dir": "1.3.0", - "supports-color": "5.5.0" + "istanbul-lib-coverage": "^2.0.5", + "make-dir": "^2.1.0", + "supports-color": "^6.1.0" }, "dependencies": { "istanbul-lib-coverage": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz", - "integrity": "sha512-nPvSZsVlbG9aLhZYaC3Oi1gT/tpyo3Yt5fNyf6NmcKIayz4VV/txxJFFKAK/gU4dcNn8ehsanBbVHVl0+amOLA==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz", + "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==", "dev": true + }, + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } } } }, "istanbul-lib-source-maps": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-2.0.1.tgz", - "integrity": "sha512-30l40ySg+gvBLcxTrLzR4Z2XTRj3HgRCA/p2rnbs/3OiTaoj054gAbuP5DcLOtwqmy4XW8qXBHzrmP2/bQ9i3A==", + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz", + "integrity": "sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==", "dev": true, "requires": { - "debug": "3.2.6", - "istanbul-lib-coverage": "2.0.1", - "make-dir": "1.3.0", - "rimraf": "2.6.2", - "source-map": "0.6.1" + "debug": "^4.1.1", + "istanbul-lib-coverage": "^2.0.5", + "make-dir": "^2.1.0", + "rimraf": "^2.6.3", + "source-map": "^0.6.1" }, "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "2.1.1" - } - }, "istanbul-lib-coverage": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz", - "integrity": "sha512-nPvSZsVlbG9aLhZYaC3Oi1gT/tpyo3Yt5fNyf6NmcKIayz4VV/txxJFFKAK/gU4dcNn8ehsanBbVHVl0+amOLA==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz", + "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==", "dev": true }, - "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } } } }, "istanbul-reports": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.0.1.tgz", - "integrity": "sha512-CT0QgMBJqs6NJLF678ZHcquUAZIoBIUNzdJrRJfpkI9OnzG6MkUfHxbJC3ln981dMswC7/B1mfX3LNkhgJxsuw==", + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.7.tgz", + "integrity": "sha512-uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg==", "dev": true, "requires": { - "handlebars": "4.0.12" + "html-escaper": "^2.0.0" } }, "jasmine": { @@ -6435,9 +7033,9 @@ "integrity": "sha1-awicChFXax8W3xG4AUbZHU6Lij4=", "dev": true, "requires": { - "exit": "0.1.2", - "glob": "7.1.3", - "jasmine-core": "2.8.0" + "exit": "^0.1.2", + "glob": "^7.0.6", + "jasmine-core": "~2.8.0" }, "dependencies": { "jasmine-core": { @@ -6470,34 +7068,23 @@ "dev": true }, "js-base64": { - "version": "2.4.9", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.9.tgz", - "integrity": "sha512-xcinL3AuDJk7VSzsHgb9DvvIXayBbadtMZ4HFPx8rUszbW1MuNMlwYVC4zzCZ6e1sqZpnNS5ZFYOhXqA39T7LQ==", - "dev": true, + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==", "optional": true }, "js-tokens": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", - "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", - "dev": true + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, "js-yaml": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz", - "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==", - "dev": true, + "version": "3.14.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz", + "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==", "requires": { - "argparse": "1.0.10", - "esprima": "4.0.1" - }, - "dependencies": { - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true - } + "argparse": "^1.0.7", + "esprima": "^4.0.0" } }, "jsbn": { @@ -6510,53 +7097,42 @@ "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-8.5.0.tgz", "integrity": "sha1-1Nj12/J2hjW2KmKCO5R89wcevJg=", "requires": { - "abab": "1.0.4", - "acorn": "2.7.0", - "acorn-globals": "1.0.9", - "array-equal": "1.0.0", - "cssom": "0.3.4", - "cssstyle": "0.2.37", - "escodegen": "1.8.1", - "iconv-lite": "0.4.23", - "nwmatcher": "1.4.4", - "parse5": "1.5.1", - "request": "2.88.0", - "sax": "1.2.4", - "symbol-tree": "3.2.2", - "tough-cookie": "2.4.3", - "webidl-conversions": "3.0.1", - "whatwg-url": "2.0.1", - "xml-name-validator": "2.0.1" + "abab": "^1.0.0", + "acorn": "^2.4.0", + "acorn-globals": "^1.0.4", + "array-equal": "^1.0.0", + "cssom": ">= 0.3.0 < 0.4.0", + "cssstyle": ">= 0.2.34 < 0.3.0", + "escodegen": "^1.6.1", + "iconv-lite": "^0.4.13", + "nwmatcher": ">= 1.3.7 < 2.0.0", + "parse5": "^1.5.1", + "request": "^2.55.0", + "sax": "^1.1.4", + "symbol-tree": ">= 3.1.0 < 4.0.0", + "tough-cookie": "^2.2.0", + "webidl-conversions": "^3.0.1", + "whatwg-url": "^2.0.1", + "xml-name-validator": ">= 2.0.1 < 3.0.0" }, "dependencies": { - "acorn": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz", - "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=" - }, "parse5": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz", "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=" - }, - "sax": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" } } }, "jsesc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", - "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", "dev": true }, "json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", - "dev": true + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==" }, "json-schema": { "version": "0.2.3", @@ -6564,9 +7140,9 @@ "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" }, "json-schema-traverse": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", - "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=" + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" }, "json-stringify-safe": { "version": "5.0.1", @@ -6574,15 +7150,17 @@ "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" }, "json3": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz", - "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=", - "dev": true + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz", + "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==" }, "json5": { - "version": "0.5.1", - "resolved": "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "requires": { + "minimist": "^1.2.0" + } }, "jsonparse": { "version": "1.3.1", @@ -6596,15 +7174,33 @@ "integrity": "sha512-J9X76xnncMw+wIqb15HeWfPMqPwYxSpPY8yWPJ7rAZN/ZDzFkjCSZObryCyUe8zbrVRNiuCnIeQteCzMn7GnWw==", "requires": { "canvg": "1.5.3", - "file-saver": "github:eligrey/FileSaver.js#e865e37af9f9947ddcced76b549e27dc45c1cb2e", + "file-saver": "github:eligrey/FileSaver.js#1.3.8", "html2canvas": "1.0.0-alpha.12", "omggif": "1.0.7", "promise-polyfill": "8.1.0", "stackblur-canvas": "2.2.0" }, "dependencies": { - "file-saver": { - "version": "github:eligrey/FileSaver.js#e865e37af9f9947ddcced76b549e27dc45c1cb2e" + "base64-arraybuffer": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz", + "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=" + }, + "css-line-break": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-1.0.1.tgz", + "integrity": "sha1-GfIGOjPpX7KDG4ZEbAuAwYivRQo=", + "requires": { + "base64-arraybuffer": "^0.1.5" + } + }, + "html2canvas": { + "version": "1.0.0-alpha.12", + "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.0.0-alpha.12.tgz", + "integrity": "sha1-OxmS48mz9WBjw1/WIElPN+uohRM=", + "requires": { + "css-line-break": "1.0.1" + } } } }, @@ -6620,56 +7216,15 @@ } }, "jszip": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.1.5.tgz", - "integrity": "sha512-5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.5.0.tgz", + "integrity": "sha512-WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA==", "dev": true, "requires": { - "core-js": "2.3.0", - "es6-promise": "3.0.2", - "lie": "3.1.1", - "pako": "1.0.6", - "readable-stream": "2.0.6" - }, - "dependencies": { - "core-js": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz", - "integrity": "sha1-+rg/uwstjchfpjbEudNMdUIMbWU=", - "dev": true - }, - "es6-promise": { - "version": "3.0.2", - "resolved": "http://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz", - "integrity": "sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y=", - "dev": true - }, - "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", - "dev": true - }, - "readable-stream": { - "version": "2.0.6", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", - "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "string_decoder": "0.10.31", - "util-deprecate": "1.0.2" - } - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - } + "lie": "~3.3.0", + "pako": "~1.0.2", + "readable-stream": "~2.3.6", + "set-immediate-shim": "~1.0.1" } }, "karma": { @@ -6678,33 +7233,33 @@ "integrity": "sha512-k5pBjHDhmkdaUccnC7gE3mBzZjcxyxYsYVaqiL2G5AqlfLyBO5nw2VdNK+O16cveEPd/gIOWULH7gkiYYwVNHg==", "dev": true, "requires": { - "bluebird": "3.5.2", - "body-parser": "1.18.3", - "chokidar": "1.7.0", - "colors": "1.1.2", - "combine-lists": "1.0.1", - "connect": "3.6.6", - "core-js": "2.5.7", - "di": "0.0.1", - "dom-serialize": "2.2.1", - "expand-braces": "0.1.2", - "glob": "7.1.3", - "graceful-fs": "4.1.11", - "http-proxy": "1.17.0", - "isbinaryfile": "3.0.3", - "lodash": "3.10.1", - "log4js": "0.6.38", - "mime": "1.6.0", - "minimatch": "3.0.4", - "optimist": "0.6.1", - "qjobs": "1.2.0", - "range-parser": "1.2.0", - "rimraf": "2.6.2", - "safe-buffer": "5.1.2", + "bluebird": "^3.3.0", + "body-parser": "^1.16.1", + "chokidar": "^1.4.1", + "colors": "^1.1.0", + "combine-lists": "^1.0.0", + "connect": "^3.6.0", + "core-js": "^2.2.0", + "di": "^0.0.1", + "dom-serialize": "^2.2.0", + "expand-braces": "^0.1.1", + "glob": "^7.1.1", + "graceful-fs": "^4.1.2", + "http-proxy": "^1.13.0", + "isbinaryfile": "^3.0.0", + "lodash": "^3.8.0", + "log4js": "^0.6.31", + "mime": "^1.3.4", + "minimatch": "^3.0.2", + "optimist": "^0.6.1", + "qjobs": "^1.1.4", + "range-parser": "^1.2.0", + "rimraf": "^2.6.0", + "safe-buffer": "^5.0.1", "socket.io": "1.7.3", - "source-map": "0.5.7", + "source-map": "^0.5.3", "tmp": "0.0.31", - "useragent": "2.3.0" + "useragent": "^2.1.12" }, "dependencies": { "anymatch": { @@ -6713,8 +7268,8 @@ "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", "dev": true, "requires": { - "micromatch": "2.3.11", - "normalize-path": "2.1.1" + "micromatch": "^2.1.5", + "normalize-path": "^2.0.0" } }, "arr-diff": { @@ -6723,7 +7278,7 @@ "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", "dev": true, "requires": { - "arr-flatten": "1.1.0" + "arr-flatten": "^1.0.1" } }, "array-unique": { @@ -6732,15 +7287,21 @@ "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", "dev": true }, + "binary-extensions": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", + "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", + "dev": true + }, "braces": { "version": "1.8.5", "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", "dev": true, "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.3" + "expand-range": "^1.8.1", + "preserve": "^0.2.0", + "repeat-element": "^1.1.2" } }, "chokidar": { @@ -6749,15 +7310,24 @@ "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", "dev": true, "requires": { - "anymatch": "1.3.2", - "async-each": "1.0.1", - "fsevents": "1.2.4", - "glob-parent": "2.0.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "2.0.1", - "path-is-absolute": "1.0.1", - "readdirp": "2.2.1" + "anymatch": "^1.3.0", + "async-each": "^1.0.0", + "fsevents": "^1.0.0", + "glob-parent": "^2.0.0", + "inherits": "^2.0.1", + "is-binary-path": "^1.0.0", + "is-glob": "^2.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.0.0" + } + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" } }, "expand-brackets": { @@ -6766,7 +7336,7 @@ "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", "dev": true, "requires": { - "is-posix-bracket": "0.1.1" + "is-posix-bracket": "^0.1.0" } }, "extglob": { @@ -6775,7 +7345,41 @@ "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" + } + }, + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "dev": true, + "requires": { + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "dev": true, + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" } }, "glob-parent": { @@ -6784,7 +7388,69 @@ "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", "dev": true, "requires": { - "is-glob": "2.0.1" + "is-glob": "^2.0.0" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + }, + "dependencies": { + "kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true + } + } + }, + "is-binary-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", + "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", + "dev": true, + "requires": { + "binary-extensions": "^1.0.0" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + }, + "dependencies": { + "kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true + } + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + }, + "dependencies": { + "kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true + } } }, "is-extglob": { @@ -6799,7 +7465,16 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" + } + }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "^3.0.2" } }, "kind-of": { @@ -6808,12 +7483,12 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } }, "lodash": { "version": "3.10.1", - "resolved": "http://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", "dev": true }, @@ -6823,19 +7498,277 @@ "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", "dev": true, "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.4" + "arr-diff": "^2.0.0", + "array-unique": "^0.2.1", + "braces": "^1.8.2", + "expand-brackets": "^0.1.4", + "extglob": "^0.3.1", + "filename-regex": "^2.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.1", + "kind-of": "^3.0.2", + "normalize-path": "^2.0.1", + "object.omit": "^2.0.0", + "parse-glob": "^3.0.4", + "regex-cache": "^0.4.2" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true, + "requires": { + "remove-trailing-separator": "^1.0.1" + } + }, + "readdirp": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", + "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.11", + "micromatch": "^3.1.10", + "readable-stream": "^2.0.2" + }, + "dependencies": { + "arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "dev": true + }, + "array-unique": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", + "dev": true + }, + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, + "requires": { + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "expand-brackets": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "dev": true, + "requires": { + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, + "requires": { + "is-descriptor": "^0.1.0" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + }, + "is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" + } + }, + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true + } + } + }, + "extglob": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", + "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", + "dev": true, + "requires": { + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, + "requires": { + "is-descriptor": "^1.0.0" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true + }, + "micromatch": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "dev": true, + "requires": { + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" + } + } + } + }, + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + }, + "tmp": { + "version": "0.0.31", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz", + "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=", + "dev": true, + "requires": { + "os-tmpdir": "~1.0.1" + } + }, + "to-regex-range": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "dev": true, + "requires": { + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" } } } @@ -6846,18 +7779,18 @@ "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==", "dev": true, "requires": { - "fs-access": "1.0.1", - "which": "1.3.1" + "fs-access": "^1.0.0", + "which": "^1.2.1" } }, "karma-coverage-istanbul-reporter": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.4.tgz", - "integrity": "sha512-xJS7QSQIVU6VK9HuJ/ieE5yynxKhjCCkd96NLY/BX/HXsx0CskU9JJiMQbd4cHALiddMwI4OWh1IIzeWrsavJw==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.6.tgz", + "integrity": "sha512-WFh77RI8bMIKdOvI/1/IBmgnM+Q7NOLhnwG91QJrM8lW+CIXCjTzhhUsT/svLvAkLmR10uWY4RyYbHMLkTglvg==", "dev": true, "requires": { - "istanbul-api": "2.0.6", - "minimatch": "3.0.4" + "istanbul-api": "^2.1.6", + "minimatch": "^3.0.4" } }, "karma-jasmine": { @@ -6872,80 +7805,66 @@ "integrity": "sha1-SKjl7xiAdhfuK14zwRlMNbQ5Ukw=", "dev": true, "requires": { - "karma-jasmine": "1.1.2" + "karma-jasmine": "^1.0.2" } }, "karma-source-map-support": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.3.0.tgz", "integrity": "sha512-HcPqdAusNez/ywa+biN4EphGz62MmQyPggUsDfsHqa7tSe4jdsxgvTKuDfIazjL+IOxpVWyT7Pr4dhAV+sxX5Q==", - "dev": true, "requires": { - "source-map-support": "0.5.9" + "source-map-support": "^0.5.5" } }, "killable": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz", - "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==", - "dev": true + "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==" }, "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" }, "lcid": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", - "dev": true, "requires": { - "invert-kv": "1.0.0" + "invert-kv": "^1.0.0" } }, - "leb": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/leb/-/leb-0.3.0.tgz", - "integrity": "sha1-Mr7p+tFoMo1q6oUi2DP0GA7tHaM=", - "dev": true - }, "less": { - "version": "3.8.1", - "resolved": "https://registry.npmjs.org/less/-/less-3.8.1.tgz", - "integrity": "sha512-8HFGuWmL3FhQR0aH89escFNBQH/nEiYPP2ltDFdQw2chE28Yx2E3lhAIq9Y2saYwLSwa699s4dBVEfCY8Drf7Q==", - "dev": true, + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/less/-/less-3.9.0.tgz", + "integrity": "sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==", "requires": { - "clone": "2.1.2", - "errno": "0.1.7", - "graceful-fs": "4.1.11", - "image-size": "0.5.5", - "mime": "1.6.0", - "mkdirp": "0.5.1", - "promise": "7.3.1", - "request": "2.88.0", - "source-map": "0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "optional": true - } + "clone": "^2.1.2", + "errno": "^0.1.1", + "graceful-fs": "^4.1.2", + "image-size": "~0.5.0", + "mime": "^1.4.1", + "mkdirp": "^0.5.0", + "promise": "^7.1.1", + "request": "^2.83.0", + "source-map": "~0.6.0" } }, "less-loader": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-4.1.0.tgz", "integrity": "sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg==", - "dev": true, "requires": { - "clone": "2.1.2", - "loader-utils": "1.1.0", - "pify": "3.0.0" + "clone": "^2.1.1", + "loader-utils": "^1.1.0", + "pify": "^3.0.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + } } }, "levn": { @@ -6953,121 +7872,121 @@ "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", "requires": { - "prelude-ls": "1.1.2", - "type-check": "0.3.2" + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" } }, "license-webpack-plugin": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-1.5.0.tgz", - "integrity": "sha512-Of/H79rZqm2aeg4RnP9SMSh19qkKemoLT5VaJV58uH5AxeYWEcBgGFs753JEJ/Hm6BPvQVfIlrrjoBwYj8p7Tw==", - "dev": true, + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.1.0.tgz", + "integrity": "sha512-vDiBeMWxjE9n6TabQ9J4FH8urFdsRK0Nvxn1cit9biCiR9aq1zBR0X2BlAkEiIG6qPamLeU0GzvIgLkrFc398A==", "requires": { - "ejs": "2.6.1" + "@types/webpack-sources": "^0.1.5", + "webpack-sources": "^1.2.0" } }, "lie": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz", - "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", + "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", "dev": true, "requires": { - "immediate": "3.0.6" + "immediate": "~3.0.5" } }, "load-json-file": { - "version": "1.1.0", - "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "strip-bom": "^3.0.0" }, "dependencies": { + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "dev": true, + "requires": { + "error-ex": "^1.2.0" + } + }, "pify": { "version": "2.3.0", - "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true } } }, "loader-runner": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.1.tgz", - "integrity": "sha512-By6ZFY7ETWOc9RFaAIb23IjJVcM4dvJC/N57nmdz9RSkMXvAXGI7SyVlAw3v8vjtDRlqThgVDVmTnr9fqMlxkw==", - "dev": true + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz", + "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==" }, "loader-utils": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz", - "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz", + "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==", "requires": { - "big.js": "3.2.0", - "emojis-list": "2.1.0", - "json5": "0.5.1" + "big.js": "^5.2.2", + "emojis-list": "^2.0.0", + "json5": "^1.0.1" } }, "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dev": true, + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" } }, "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", - "dev": true + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" }, "lodash.assign": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=", - "dev": true, "optional": true }, "lodash.clonedeep": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", - "dev": true + "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=" }, "lodash.debounce": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", - "dev": true + "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" }, "lodash.mergewith": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz", - "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==", - "dev": true, + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz", + "integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==", "optional": true }, "lodash.tail": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz", - "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=", - "dev": true + "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=" }, "log4js": { "version": "0.6.38", - "resolved": "http://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz", + "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz", "integrity": "sha1-LElBFmldb7JUgJQ9P8hy5mKlIv0=", "dev": true, "requires": { - "readable-stream": "1.0.34", - "semver": "4.3.6" + "readable-stream": "~1.0.2", + "semver": "~4.3.3" }, "dependencies": { "isarray": { @@ -7078,19 +7997,19 @@ }, "readable-stream": { "version": "1.0.34", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", "isarray": "0.0.1", - "string_decoder": "0.10.31" + "string_decoder": "~0.10.x" } }, "semver": { "version": "4.3.6", - "resolved": "http://registry.npmjs.org/semver/-/semver-4.3.6.tgz", + "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=", "dev": true }, @@ -7103,167 +8022,131 @@ } }, "loglevel": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.1.tgz", - "integrity": "sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=", - "dev": true - }, - "long": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz", - "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=", - "dev": true + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.0.tgz", + "integrity": "sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==" }, "loose-envify": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "dev": true, "requires": { - "js-tokens": "3.0.2" + "js-tokens": "^3.0.0 || ^4.0.0" } }, "loud-rejection": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", - "dev": true, "optional": true, "requires": { - "currently-unhandled": "0.4.1", - "signal-exit": "3.0.2" + "currently-unhandled": "^0.4.1", + "signal-exit": "^3.0.0" } }, - "lower-case": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", - "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=", - "dev": true - }, "lru-cache": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz", - "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==", - "dev": true, + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" } }, "magic-string": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.1.tgz", - "integrity": "sha512-sCuTz6pYom8Rlt4ISPFn6wuFodbKMIHUMv4Qko9P17dpxb7s52KJTmRuZZqHdGmLCK9AOcDare039nRIcfdkEg==", + "version": "0.25.7", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz", + "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==", "dev": true, "requires": { - "sourcemap-codec": "1.4.4" + "sourcemap-codec": "^1.4.4" } }, "make-dir": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", - "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", - "dev": true, + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", + "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", "requires": { - "pify": "3.0.0" + "pify": "^4.0.1", + "semver": "^5.6.0" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } } }, "make-error": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz", - "integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==", + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", "dev": true }, "make-fetch-happen": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz", - "integrity": "sha512-7R5ivfy9ilRJ1EMKIOziwrns9fGeAD4bAha8EB7BIiBBLHm2KeTUGCrICFt2rbHfzheTLynv50GnNTK1zDTrcQ==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-4.0.2.tgz", + "integrity": "sha512-YMJrAjHSb/BordlsDEcVcPyTbiJKkzqMf48N8dAJZT9Zjctrkb6Yg4TY9Sq2AwSIQJFn5qBBKVTYt3vP5FMIHA==", "dev": true, "requires": { - "agentkeepalive": "3.5.2", - "cacache": "11.3.2", - "http-cache-semantics": "3.8.1", - "http-proxy-agent": "2.1.0", - "https-proxy-agent": "2.2.1", - "lru-cache": "4.1.3", - "mississippi": "3.0.0", - "node-fetch-npm": "2.0.2", - "promise-retry": "1.1.1", - "socks-proxy-agent": "4.0.1", - "ssri": "6.0.1" - }, - "dependencies": { - "bluebird": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz", - "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==", - "dev": true - }, + "agentkeepalive": "^3.4.1", + "cacache": "^11.3.3", + "http-cache-semantics": "^3.8.1", + "http-proxy-agent": "^2.1.0", + "https-proxy-agent": "^2.2.1", + "lru-cache": "^5.1.1", + "mississippi": "^3.0.0", + "node-fetch-npm": "^2.0.2", + "promise-retry": "^1.1.1", + "socks-proxy-agent": "^4.0.0", + "ssri": "^6.0.0" + }, + "dependencies": { "cacache": { - "version": "11.3.2", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz", - "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==", - "dev": true, - "requires": { - "bluebird": "3.5.3", - "chownr": "1.1.1", - "figgy-pudding": "3.5.1", - "glob": "7.1.3", - "graceful-fs": "4.1.15", - "lru-cache": "5.1.1", - "mississippi": "3.0.0", - "mkdirp": "0.5.1", - "move-concurrently": "1.0.1", - "promise-inflight": "1.0.1", - "rimraf": "2.6.2", - "ssri": "6.0.1", - "unique-filename": "1.1.1", - "y18n": "4.0.0" - }, - "dependencies": { - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "requires": { - "yallist": "3.0.3" - } - } + "version": "11.3.3", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.3.tgz", + "integrity": "sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==", + "dev": true, + "requires": { + "bluebird": "^3.5.5", + "chownr": "^1.1.1", + "figgy-pudding": "^3.5.1", + "glob": "^7.1.4", + "graceful-fs": "^4.1.15", + "lru-cache": "^5.1.1", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.3", + "ssri": "^6.0.1", + "unique-filename": "^1.1.1", + "y18n": "^4.0.0" } }, - "graceful-fs": { - "version": "4.1.15", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz", - "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==", + "chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", "dev": true }, - "mississippi": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz", - "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", + "lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, "requires": { - "concat-stream": "1.6.2", - "duplexify": "3.6.1", - "end-of-stream": "1.4.1", - "flush-write-stream": "1.0.3", - "from2": "2.3.0", - "parallel-transform": "1.1.0", - "pump": "3.0.0", - "pumpify": "1.5.1", - "stream-each": "1.2.3", - "through2": "2.0.3" + "yallist": "^3.0.2" } }, - "pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "dev": true, "requires": { - "end-of-stream": "1.4.1", - "once": "1.4.0" + "glob": "^7.1.3" } }, "ssri": { @@ -7272,45 +8155,42 @@ "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", "dev": true, "requires": { - "figgy-pudding": "3.5.1" + "figgy-pudding": "^3.5.1" } }, "yallist": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", - "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", "dev": true } } }, "map-age-cleaner": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz", - "integrity": "sha512-UN1dNocxQq44IhJyMI4TU8phc2m9BddacHRPRjKGLYaF0jqd3xLz0jS0skpAU9WgYyoR4gHtUpzytNBS385FWQ==", - "dev": true, + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", + "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", "requires": { - "p-defer": "1.0.0" + "p-defer": "^1.0.0" } }, "map-cache": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", - "dev": true + "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=" }, "map-obj": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", - "dev": true + "optional": true }, "map-visit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", - "dev": true, "requires": { - "object-visit": "1.0.1" + "object-visit": "^1.0.0" } }, "material-icons": { @@ -7319,137 +8199,205 @@ "integrity": "sha512-1Q5wp4aeGWjE5POMtdLmqJn94QM7vmUCeJhNO5m0oDrtW1jfWlaLK73vF3C7/fuMD7NIVicyK8TSkwd+diFgaQ==" }, "math-random": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz", - "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz", + "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==", "dev": true }, "md5.js": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", - "dev": true, "requires": { - "hash-base": "3.0.4", - "inherits": "2.0.3", - "safe-buffer": "5.1.2" + "hash-base": "^3.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" } }, "media-typer": { "version": "0.3.0", - "resolved": "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", - "dev": true + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, "mem": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-4.0.0.tgz", - "integrity": "sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", + "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", "dev": true, "requires": { - "map-age-cleaner": "0.1.2", - "mimic-fn": "1.2.0", - "p-is-promise": "1.1.0" + "mimic-fn": "^1.0.0" } }, "memory-fs": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", - "dev": true, "requires": { - "errno": "0.1.7", - "readable-stream": "2.3.6" + "errno": "^0.1.3", + "readable-stream": "^2.0.1" } }, "meow": { "version": "3.7.0", - "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz", + "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", - "dev": true, "optional": true, "requires": { - "camelcase-keys": "2.1.0", - "decamelize": "1.2.0", - "loud-rejection": "1.6.0", - "map-obj": "1.0.1", - "minimist": "1.2.0", - "normalize-package-data": "2.4.0", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "redent": "1.0.0", - "trim-newlines": "1.0.0" + "camelcase-keys": "^2.0.0", + "decamelize": "^1.1.2", + "loud-rejection": "^1.0.0", + "map-obj": "^1.0.1", + "minimist": "^1.1.3", + "normalize-package-data": "^2.3.4", + "object-assign": "^4.0.1", + "read-pkg-up": "^1.0.1", + "redent": "^1.0.0", + "trim-newlines": "^1.0.0" }, "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true, + "find-up": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "optional": true, + "requires": { + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" + } + }, + "load-json-file": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "optional": true, + "requires": { + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" + } + }, + "path-exists": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "optional": true, + "requires": { + "pinkie-promise": "^2.0.0" + } + }, + "path-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "optional": true, + "requires": { + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" + } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "optional": true + }, + "read-pkg": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "optional": true, + "requires": { + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" + } + }, + "read-pkg-up": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "optional": true, + "requires": { + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" + } + }, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "optional": true, + "requires": { + "is-utf8": "^0.2.0" + } } } }, "merge-descriptors": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", - "dev": true + "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" }, "methods": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", - "dev": true + "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=" }, "micromatch": { "version": "3.1.10", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.13", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" } }, "miller-rabin": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", - "dev": true, "requires": { - "bn.js": "4.11.8", - "brorand": "1.1.0" + "bn.js": "^4.0.0", + "brorand": "^1.0.1" + }, + "dependencies": { + "bn.js": { + "version": "4.11.9", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz", + "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==" + } } }, "mime": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "dev": true + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" }, "mime-db": { - "version": "1.37.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz", - "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==" + "version": "1.44.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz", + "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==" }, "mime-types": { - "version": "2.1.21", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz", - "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==", + "version": "2.1.27", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz", + "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==", "requires": { - "mime-db": "1.37.0" + "mime-db": "1.44.0" } }, "mimic-fn": { @@ -7459,118 +8407,70 @@ "dev": true }, "mini-css-extract-plugin": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.4.tgz", - "integrity": "sha512-o+Jm+ocb0asEngdM6FsZWtZsRzA8koFUudIDwYUfl94M3PejPHG7Vopw5hN9V8WsMkSFpm3tZP3Fesz89EyrfQ==", - "dev": true, - "requires": { - "loader-utils": "1.1.0", - "schema-utils": "1.0.0", - "webpack-sources": "1.3.0" - }, - "dependencies": { - "schema-utils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", - "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", - "dev": true, - "requires": { - "ajv": "6.4.0", - "ajv-errors": "1.0.0", - "ajv-keywords": "3.2.0" - } - } + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz", + "integrity": "sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==", + "requires": { + "loader-utils": "^1.1.0", + "schema-utils": "^1.0.0", + "webpack-sources": "^1.1.0" } }, "minimalistic-assert": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", - "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", - "dev": true + "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" }, "minimalistic-crypto-utils": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", - "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=", - "dev": true + "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=" }, "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { - "version": "0.0.8", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - }, - "minipass": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", - "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", - "dev": true, - "requires": { - "safe-buffer": "5.1.2", - "yallist": "3.0.3" - }, - "dependencies": { - "yallist": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", - "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", - "dev": true - } - } - }, - "minizlib": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz", - "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", - "dev": true, - "requires": { - "minipass": "2.3.5" - } + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, "mississippi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz", - "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==", - "dev": true, + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz", + "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", "requires": { - "concat-stream": "1.6.2", - "duplexify": "3.6.1", - "end-of-stream": "1.4.1", - "flush-write-stream": "1.0.3", - "from2": "2.3.0", - "parallel-transform": "1.1.0", - "pump": "2.0.1", - "pumpify": "1.5.1", - "stream-each": "1.2.3", - "through2": "2.0.3" + "concat-stream": "^1.5.0", + "duplexify": "^3.4.2", + "end-of-stream": "^1.1.0", + "flush-write-stream": "^1.0.0", + "from2": "^2.1.0", + "parallel-transform": "^1.1.0", + "pump": "^3.0.0", + "pumpify": "^1.3.3", + "stream-each": "^1.1.0", + "through2": "^2.0.0" } }, "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", - "dev": true, + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", + "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "requires": { - "for-in": "1.0.2", - "is-extendable": "1.0.1" + "for-in": "^1.0.2", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -7579,69 +8479,72 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz", "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=", - "dev": true, "requires": { - "for-in": "0.1.8", - "is-extendable": "0.1.1" + "for-in": "^0.1.3", + "is-extendable": "^0.1.1" }, "dependencies": { "for-in": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz", - "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=", - "dev": true + "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=" } } }, "mkdirp": { - "version": "0.5.1", - "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", "requires": { - "minimist": "0.0.8" + "minimist": "^1.2.5" } }, "moment": { - "version": "2.23.0", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.23.0.tgz", - "integrity": "sha512-3IE39bHVqFbWWaPOMHZF98Q9c3LDKGTmypMiTM2QygGXXElkFWIH7GxfmlwmY2vwa+wmNsoYZmG2iusf1ZjJoA==" + "version": "2.29.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz", + "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==" }, "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", - "dev": true, "requires": { - "aproba": "1.2.0", - "copy-concurrently": "1.0.5", - "fs-write-stream-atomic": "1.0.10", - "mkdirp": "0.5.1", - "rimraf": "2.6.2", - "run-queue": "1.0.3" + "aproba": "^1.1.1", + "copy-concurrently": "^1.0.0", + "fs-write-stream-atomic": "^1.0.8", + "mkdirp": "^0.5.1", + "rimraf": "^2.5.4", + "run-queue": "^1.0.3" + }, + "dependencies": { + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "requires": { + "glob": "^7.1.3" + } + } } }, "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "multicast-dns": { "version": "6.2.3", "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz", "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==", - "dev": true, "requires": { - "dns-packet": "1.3.1", - "thunky": "1.0.3" + "dns-packet": "^1.3.1", + "thunky": "^1.0.2" } }, "multicast-dns-service-types": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz", - "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=", - "dev": true + "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=" }, "mute-stream": { "version": "0.0.7", @@ -7650,60 +8553,56 @@ "dev": true }, "nan": { - "version": "2.11.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz", - "integrity": "sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==", - "dev": true, + "version": "2.14.2", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz", + "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==", "optional": true }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", - "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "fragment-cache": "0.2.1", - "is-windows": "1.0.2", - "kind-of": "6.0.2", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "fragment-cache": "^0.2.1", + "is-windows": "^1.0.2", + "kind-of": "^6.0.2", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" } }, "negotiator": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", - "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=", - "dev": true + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", + "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" }, "neo-async": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.0.tgz", - "integrity": "sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==", - "dev": true + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" }, "ng-recaptcha": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/ng-recaptcha/-/ng-recaptcha-5.0.0.tgz", "integrity": "sha512-tUVMmHiCDgWSjqXddjRde9jTnyODwki/akixvFiYK8SaQhgW1aor1WKS8dnNtc+Spx7XFiurEXRVfgyd70G6Mw==", "requires": { - "@types/grecaptcha": "2.0.36", - "tslib": "1.9.3" + "@types/grecaptcha": "^2.0.33", + "tslib": "^1.9.0" } }, "ng2-pdf-viewer": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/ng2-pdf-viewer/-/ng2-pdf-viewer-5.3.3.tgz", - "integrity": "sha512-8auummaw5kGB/anFyzoA3VJhpcaypTVks1uyLSrEh3RpxEZOKj6zzmaksuRT7pHFNGXIWfEITRuBsOfLFvgw8Q==", + "version": "5.3.4", + "resolved": "https://registry.npmjs.org/ng2-pdf-viewer/-/ng2-pdf-viewer-5.3.4.tgz", + "integrity": "sha512-b9QtLTQE8WEIjGpj5ElCyMv2EzevSRIUsmvGSx2i4km7NOG0t68QtTvYvoks2XfR55Z3O4nBcYyvl0QZrRBtuQ==", "requires": { - "@types/pdfjs-dist": "2.0.1", - "pdfjs-dist": "2.2.228", - "tslib": "1.9.3" + "@types/pdfjs-dist": "^2.0.1", + "pdfjs-dist": "^2.2.228", + "tslib": "^1.9.0" } }, "ngx-print": { @@ -7711,7 +8610,7 @@ "resolved": "https://registry.npmjs.org/ngx-print/-/ngx-print-1.1.4.tgz", "integrity": "sha512-/bxOvCltF+kO5K7+GF3sDwMyQf9B6xMafF8DIvjLyynQcucrTNI+3ENtJioyDZzgAisJ/R8BQShC/1SBUM3yhg==", "requires": { - "tslib": "1.9.3" + "tslib": "^1.9.3" } }, "ngx7-material-keyboard": { @@ -7719,169 +8618,160 @@ "resolved": "https://registry.npmjs.org/ngx7-material-keyboard/-/ngx7-material-keyboard-0.1.2.tgz", "integrity": "sha512-jMBfmLpL2ippDwTsyrya1URDMAXkJr+FphLIBB7JjetUdvnXov2gP3AbdAIvXdCgPuauK4gY9P9dIBevhzG52A==", "requires": { - "tslib": "1.9.3" + "tslib": "^1.9.0" } }, "nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", - "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", - "dev": true - }, - "no-case": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", - "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", - "dev": true, - "requires": { - "lower-case": "1.1.4" - } - }, - "node-ensure": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/node-ensure/-/node-ensure-0.0.0.tgz", - "integrity": "sha1-7K52QVDemYYexcgQ/V0Jaxg5Mqc=" + "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" }, "node-fetch-npm": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz", - "integrity": "sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz", + "integrity": "sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg==", "dev": true, "requires": { - "encoding": "0.1.12", - "json-parse-better-errors": "1.0.2", - "safe-buffer": "5.1.2" + "encoding": "^0.1.11", + "json-parse-better-errors": "^1.0.0", + "safe-buffer": "^5.1.1" } }, "node-forge": { - "version": "0.7.5", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz", - "integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==", - "dev": true + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz", + "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==" }, "node-gyp": { "version": "3.8.0", "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz", "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", - "dev": true, "optional": true, "requires": { - "fstream": "1.0.11", - "glob": "7.1.3", - "graceful-fs": "4.1.11", - "mkdirp": "0.5.1", - "nopt": "3.0.6", - "npmlog": "4.1.2", - "osenv": "0.1.5", - "request": "2.88.0", - "rimraf": "2.6.2", - "semver": "5.3.0", - "tar": "2.2.1", - "which": "1.3.1" + "fstream": "^1.0.0", + "glob": "^7.0.3", + "graceful-fs": "^4.1.2", + "mkdirp": "^0.5.0", + "nopt": "2 || 3", + "npmlog": "0 || 1 || 2 || 3 || 4", + "osenv": "0", + "request": "^2.87.0", + "rimraf": "2", + "semver": "~5.3.0", + "tar": "^2.0.0", + "which": "1" }, "dependencies": { "semver": { "version": "5.3.0", - "resolved": "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", - "dev": true, "optional": true } } }, "node-libs-browser": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz", - "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==", - "dev": true, - "requires": { - "assert": "1.4.1", - "browserify-zlib": "0.2.0", - "buffer": "4.9.1", - "console-browserify": "1.1.0", - "constants-browserify": "1.0.0", - "crypto-browserify": "3.12.0", - "domain-browser": "1.2.0", - "events": "1.1.1", - "https-browserify": "1.0.0", - "os-browserify": "0.3.0", - "path-browserify": "0.0.0", - "process": "0.11.10", - "punycode": "1.4.1", - "querystring-es3": "0.2.1", - "readable-stream": "2.3.6", - "stream-browserify": "2.0.1", - "stream-http": "2.8.3", - "string_decoder": "1.1.1", - "timers-browserify": "2.0.10", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz", + "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==", + "requires": { + "assert": "^1.1.1", + "browserify-zlib": "^0.2.0", + "buffer": "^4.3.0", + "console-browserify": "^1.1.0", + "constants-browserify": "^1.0.0", + "crypto-browserify": "^3.11.0", + "domain-browser": "^1.1.1", + "events": "^3.0.0", + "https-browserify": "^1.0.0", + "os-browserify": "^0.3.0", + "path-browserify": "0.0.1", + "process": "^0.11.10", + "punycode": "^1.2.4", + "querystring-es3": "^0.2.0", + "readable-stream": "^2.3.3", + "stream-browserify": "^2.0.1", + "stream-http": "^2.7.2", + "string_decoder": "^1.0.0", + "timers-browserify": "^2.0.4", "tty-browserify": "0.0.0", - "url": "0.11.0", - "util": "0.10.4", - "vm-browserify": "0.0.4" + "url": "^0.11.0", + "util": "^0.11.0", + "vm-browserify": "^1.0.1" }, "dependencies": { "punycode": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "dev": true + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" } } }, + "node-releases": { + "version": "1.1.66", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.66.tgz", + "integrity": "sha512-JHEQ1iWPGK+38VLB2H9ef2otU4l8s3yAMt9Xf934r6+ojCYDMHPMqvCc9TnzfeFSP1QEOeU6YZEd3+De0LTCgg==" + }, "node-sass": { - "version": "4.9.4", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.9.4.tgz", - "integrity": "sha512-MXyurANsUoE4/6KmfMkwGcBzAnJQ5xJBGW7Ei6ea8KnUKuzHr/SguVBIi3uaUAHtZCPUYkvlJ3Ef5T5VAwVpaA==", - "dev": true, + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.11.0.tgz", + "integrity": "sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==", "optional": true, "requires": { - "async-foreach": "0.1.3", - "chalk": "1.1.3", - "cross-spawn": "3.0.1", - "gaze": "1.1.3", - "get-stdin": "4.0.1", - "glob": "7.1.3", - "in-publish": "2.0.0", - "lodash.assign": "4.2.0", - "lodash.clonedeep": "4.5.0", - "lodash.mergewith": "4.6.1", - "meow": "3.7.0", - "mkdirp": "0.5.1", - "nan": "2.11.1", - "node-gyp": "3.8.0", - "npmlog": "4.1.2", - "request": "2.88.0", - "sass-graph": "2.2.4", - "stdout-stream": "1.4.1", - "true-case-path": "1.0.3" + "async-foreach": "^0.1.3", + "chalk": "^1.1.1", + "cross-spawn": "^3.0.0", + "gaze": "^1.0.0", + "get-stdin": "^4.0.1", + "glob": "^7.0.3", + "in-publish": "^2.0.0", + "lodash.assign": "^4.2.0", + "lodash.clonedeep": "^4.3.2", + "lodash.mergewith": "^4.6.0", + "meow": "^3.7.0", + "mkdirp": "^0.5.1", + "nan": "^2.10.0", + "node-gyp": "^3.8.0", + "npmlog": "^4.0.0", + "request": "^2.88.0", + "sass-graph": "^2.2.4", + "stdout-stream": "^1.4.0", + "true-case-path": "^1.0.2" }, "dependencies": { "ansi-styles": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true, "optional": true }, "chalk": { "version": "1.1.3", - "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, "optional": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" + } + }, + "cross-spawn": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", + "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", + "optional": true, + "requires": { + "lru-cache": "^4.0.1", + "which": "^1.2.9" } }, "supports-color": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true, "optional": true } } @@ -7890,64 +8780,85 @@ "version": "3.0.6", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", - "dev": true, "requires": { - "abbrev": "1.0.9" + "abbrev": "1" } }, "normalize-package-data": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", - "dev": true, + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", "requires": { - "hosted-git-info": "2.7.1", - "is-builtin-module": "1.0.0", - "semver": "5.6.0", - "validate-npm-package-license": "3.0.4" + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } } }, "normalize-path": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, "requires": { - "remove-trailing-separator": "1.1.0" + "remove-trailing-separator": "^1.0.1" } }, "normalize-range": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", - "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=", - "dev": true + "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=" }, "npm-bundled": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz", - "integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz", + "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==", + "dev": true, + "requires": { + "npm-normalize-package-bin": "^1.0.1" + } + }, + "npm-normalize-package-bin": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz", + "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==", "dev": true }, "npm-package-arg": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz", - "integrity": "sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz", + "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==", "dev": true, "requires": { - "hosted-git-info": "2.7.1", - "osenv": "0.1.5", - "semver": "5.6.0", - "validate-npm-package-name": "3.0.0" + "hosted-git-info": "^2.7.1", + "osenv": "^0.1.5", + "semver": "^5.6.0", + "validate-npm-package-name": "^3.0.0" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } } }, "npm-packlist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.2.0.tgz", - "integrity": "sha512-7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==", + "version": "1.4.8", + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz", + "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==", "dev": true, "requires": { - "ignore-walk": "3.0.1", - "npm-bundled": "1.0.5" + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1", + "npm-normalize-package-bin": "^1.0.1" } }, "npm-pick-manifest": { @@ -7956,53 +8867,68 @@ "integrity": "sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==", "dev": true, "requires": { - "figgy-pudding": "3.5.1", - "npm-package-arg": "6.1.0", - "semver": "5.6.0" + "figgy-pudding": "^3.5.1", + "npm-package-arg": "^6.0.0", + "semver": "^5.4.1" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } } }, "npm-registry-fetch": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-3.8.0.tgz", - "integrity": "sha512-hrw8UMD+Nob3Kl3h8Z/YjmKamb1gf7D1ZZch2otrIXM3uFLB5vjEY6DhMlq80z/zZet6eETLbOXcuQudCB3Zpw==", + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-3.9.1.tgz", + "integrity": "sha512-VQCEZlydXw4AwLROAXWUR7QDfe2Y8Id/vpAgp6TI1/H78a4SiQ1kQrKZALm5/zxM5n4HIi+aYb+idUAV/RuY0Q==", "dev": true, "requires": { - "JSONStream": "1.3.5", - "bluebird": "3.5.2", - "figgy-pudding": "3.5.1", - "lru-cache": "4.1.3", - "make-fetch-happen": "4.0.1", - "npm-package-arg": "6.1.0" + "JSONStream": "^1.3.4", + "bluebird": "^3.5.1", + "figgy-pudding": "^3.4.1", + "lru-cache": "^5.1.1", + "make-fetch-happen": "^4.0.2", + "npm-package-arg": "^6.1.0" + }, + "dependencies": { + "lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "requires": { + "yallist": "^3.0.2" + } + }, + "yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true + } } }, "npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", - "dev": true, "requires": { - "path-key": "2.0.1" + "path-key": "^2.0.0" } }, "npmlog": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", - "dev": true, - "requires": { - "are-we-there-yet": "1.1.5", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" - } - }, - "nth-check": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", - "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", - "dev": true, + "optional": true, "requires": { - "boolbase": "1.0.0" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, "null-check": { @@ -8014,14 +8940,12 @@ "num2fraction": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", - "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=", - "dev": true + "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=" }, "number-is-nan": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" }, "nwmatcher": { "version": "1.4.4", @@ -8041,8 +8965,7 @@ "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, "object-component": { "version": "0.0.3", @@ -8054,56 +8977,66 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", - "dev": true, "requires": { - "copy-descriptor": "0.1.1", - "define-property": "0.2.5", - "kind-of": "3.2.2" + "copy-descriptor": "^0.1.0", + "define-property": "^0.2.5", + "kind-of": "^3.0.3" }, "dependencies": { "define-property": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } }, + "object-inspect": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", + "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==" + }, + "object-is": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.3.tgz", + "integrity": "sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==", + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.18.0-next.1" + } + }, "object-keys": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz", - "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==", - "dev": true + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" }, "object-visit": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", - "dev": true, "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.0" } }, - "object.getownpropertydescriptors": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz", - "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=", - "dev": true, + "object.assign": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", + "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", "requires": { - "define-properties": "1.1.3", - "es-abstract": "1.12.0" + "call-bind": "^1.0.0", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" } }, "object.omit": { @@ -8112,40 +9045,27 @@ "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", "dev": true, "requires": { - "for-own": "0.1.5", - "is-extendable": "0.1.1" - }, - "dependencies": { - "for-own": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", - "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", - "dev": true, - "requires": { - "for-in": "1.0.2" - } - } + "for-own": "^0.1.4", + "is-extendable": "^0.1.1" } }, "object.pick": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", - "dev": true, "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.1" } }, "obuf": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", - "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==", - "dev": true + "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==" }, "ol": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/ol/-/ol-5.3.0.tgz", - "integrity": "sha512-UrOJGNI5XdYfE9n43RJdsMq25SjI4nIi5Kf0kxi+q6vEknzeRxM/wgYf8FMs7Ss3URuIbsKmetW9dVMOYB/DkQ==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/ol/-/ol-5.3.3.tgz", + "integrity": "sha512-7eU4x8YMduNcED1D5wI+AMWDRe7/1HmGfsbV+kFFROI9RNABU/6n4osj6Q3trZbxxKnK2DSRIjIRGwRHT/Z+Ww==", "requires": { "pbf": "3.1.0", "pixelworks": "1.1.0", @@ -8161,25 +9081,19 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", - "dev": true, "requires": { "ee-first": "1.1.1" } }, "on-headers": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz", - "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=", - "dev": true + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", + "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==" }, "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, - "requires": { - "wrappy": "1.0.2" - } + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/once/-/once-1.1.1.tgz", + "integrity": "sha1-nbV0kzzLCMOnYU0VQDLAnqbzOec=" }, "onetime": { "version": "2.0.1", @@ -8187,22 +9101,21 @@ "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", "dev": true, "requires": { - "mimic-fn": "1.2.0" + "mimic-fn": "^1.0.0" } }, "opener": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz", - "integrity": "sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz", + "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==", "dev": true }, "opn": { "version": "5.4.0", "resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz", "integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==", - "dev": true, "requires": { - "is-wsl": "1.1.0" + "is-wsl": "^1.1.0" } }, "optimist": { @@ -8211,29 +9124,29 @@ "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "dev": true, "requires": { - "minimist": "0.0.8", - "wordwrap": "0.0.3" + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" }, "dependencies": { - "wordwrap": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "minimist": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", "dev": true } } }, "optionator": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", - "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", "requires": { - "deep-is": "0.1.3", - "fast-levenshtein": "2.0.6", - "levn": "0.3.0", - "prelude-ls": "1.1.2", - "type-check": "0.3.2", - "wordwrap": "1.0.0" + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" } }, "options": { @@ -8246,47 +9159,93 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz", "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==", - "dev": true, "requires": { - "url-parse": "1.4.3" + "url-parse": "^1.4.3" } }, "os-browserify": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", - "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=", - "dev": true + "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=" }, "os-homedir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", - "dev": true + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" }, "os-locale": { - "version": "1.4.0", - "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", - "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", + "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", "dev": true, - "optional": true, "requires": { - "lcid": "1.0.0" + "execa": "^0.7.0", + "lcid": "^1.0.0", + "mem": "^1.1.0" + }, + "dependencies": { + "cross-spawn": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "dev": true, + "requires": { + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "execa": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "dev": true, + "requires": { + "cross-spawn": "^5.0.1", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + } + }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "dev": true + }, + "lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "dev": true, + "requires": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + }, + "yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", + "dev": true + } } }, "os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", - "dev": true + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" }, "osenv": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", - "dev": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, "osm": { @@ -8294,56 +9253,49 @@ "resolved": "https://registry.npmjs.org/osm/-/osm-1.0.0.tgz", "integrity": "sha1-ywtJ7j9hw6Vjh28dzB5PDdRe7tY=", "requires": { - "geo-position": "1.0.2" + "geo-position": "~1.0.0" } }, "p-defer": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", - "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=", - "dev": true + "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=" }, "p-finally": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", - "dev": true + "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" }, "p-is-promise": { - "version": "1.1.0", - "resolved": "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz", - "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=", - "dev": true + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz", + "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==" }, "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "dev": true, + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "requires": { - "p-try": "1.0.0" + "p-try": "^2.0.0" } }, "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dev": true, + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "requires": { - "p-limit": "1.3.0" + "p-limit": "^2.0.0" } }, "p-map": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz", - "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==", - "dev": true + "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==" }, "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" }, "pacote": { "version": "9.1.1", @@ -8351,186 +9303,192 @@ "integrity": "sha512-f28Rq5ozzKAA9YwIKw61/ipwAatUZseYmVssDbHHaexF0wRIVotapVEZPAjOT7Eu3LYVqEp0NVpNizoAnYBUaA==", "dev": true, "requires": { - "bluebird": "3.5.2", - "cacache": "11.3.2", - "figgy-pudding": "3.5.1", - "get-stream": "4.1.0", - "glob": "7.1.3", - "lru-cache": "4.1.3", - "make-fetch-happen": "4.0.1", - "minimatch": "3.0.4", - "minipass": "2.3.5", - "mississippi": "3.0.0", - "mkdirp": "0.5.1", - "normalize-package-data": "2.4.0", - "npm-package-arg": "6.1.0", - "npm-packlist": "1.2.0", - "npm-pick-manifest": "2.2.3", - "npm-registry-fetch": "3.8.0", - "osenv": "0.1.5", - "promise-inflight": "1.0.1", - "promise-retry": "1.1.1", - "protoduck": "5.0.1", - "rimraf": "2.6.2", - "safe-buffer": "5.1.2", - "semver": "5.6.0", - "ssri": "6.0.1", - "tar": "4.4.8", - "unique-filename": "1.1.1", - "which": "1.3.1" + "bluebird": "^3.5.2", + "cacache": "^11.2.0", + "figgy-pudding": "^3.5.1", + "get-stream": "^4.1.0", + "glob": "^7.1.3", + "lru-cache": "^4.1.3", + "make-fetch-happen": "^4.0.1", + "minimatch": "^3.0.4", + "minipass": "^2.3.5", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "normalize-package-data": "^2.4.0", + "npm-package-arg": "^6.1.0", + "npm-packlist": "^1.1.12", + "npm-pick-manifest": "^2.1.0", + "npm-registry-fetch": "^3.8.0", + "osenv": "^0.1.5", + "promise-inflight": "^1.0.1", + "promise-retry": "^1.1.1", + "protoduck": "^5.0.1", + "rimraf": "^2.6.2", + "safe-buffer": "^5.1.2", + "semver": "^5.6.0", + "ssri": "^6.0.1", + "tar": "^4.4.6", + "unique-filename": "^1.1.1", + "which": "^1.3.1" }, "dependencies": { "cacache": { - "version": "11.3.2", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz", - "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==", - "dev": true, - "requires": { - "bluebird": "3.5.3", - "chownr": "1.1.1", - "figgy-pudding": "3.5.1", - "glob": "7.1.3", - "graceful-fs": "4.1.15", - "lru-cache": "5.1.1", - "mississippi": "3.0.0", - "mkdirp": "0.5.1", - "move-concurrently": "1.0.1", - "promise-inflight": "1.0.1", - "rimraf": "2.6.2", - "ssri": "6.0.1", - "unique-filename": "1.1.1", - "y18n": "4.0.0" + "version": "11.3.3", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.3.tgz", + "integrity": "sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==", + "dev": true, + "requires": { + "bluebird": "^3.5.5", + "chownr": "^1.1.1", + "figgy-pudding": "^3.5.1", + "glob": "^7.1.4", + "graceful-fs": "^4.1.15", + "lru-cache": "^5.1.1", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.3", + "ssri": "^6.0.1", + "unique-filename": "^1.1.1", + "y18n": "^4.0.0" + }, + "dependencies": { + "lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "requires": { + "yallist": "^3.0.2" + } + } + } + }, + "chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "dev": true + }, + "fs-minipass": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", + "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==", + "dev": true, + "requires": { + "minipass": "^2.6.0" + } + }, + "lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "dev": true, + "requires": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" }, "dependencies": { - "bluebird": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz", - "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==", + "yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", "dev": true - }, - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "requires": { - "yallist": "3.0.3" - } } } }, - "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "minipass": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz", + "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==", "dev": true, "requires": { - "pump": "3.0.0" + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" } }, - "graceful-fs": { - "version": "4.1.15", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz", - "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==", - "dev": true - }, - "mississippi": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz", - "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", + "minizlib": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz", + "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==", "dev": true, "requires": { - "concat-stream": "1.6.2", - "duplexify": "3.6.1", - "end-of-stream": "1.4.1", - "flush-write-stream": "1.0.3", - "from2": "2.3.0", - "parallel-transform": "1.1.0", - "pump": "3.0.0", - "pumpify": "1.5.1", - "stream-each": "1.2.3", - "through2": "2.0.3" + "minipass": "^2.9.0" } }, - "pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "dev": true, "requires": { - "end-of-stream": "1.4.1", - "once": "1.4.0" + "glob": "^7.1.3" } }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + }, "ssri": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", "dev": true, "requires": { - "figgy-pudding": "3.5.1" + "figgy-pudding": "^3.5.1" } }, "tar": { - "version": "4.4.8", - "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz", - "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==", + "version": "4.4.13", + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz", + "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==", "dev": true, "requires": { - "chownr": "1.1.1", - "fs-minipass": "1.2.5", - "minipass": "2.3.5", - "minizlib": "1.2.1", - "mkdirp": "0.5.1", - "safe-buffer": "5.1.2", - "yallist": "3.0.3" + "chownr": "^1.1.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.8.6", + "minizlib": "^1.2.1", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.3" } }, "yallist": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", - "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", "dev": true } } }, "pako": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz", - "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==", - "dev": true + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==" }, "parallel-transform": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz", - "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=", - "dev": true, - "requires": { - "cyclist": "0.2.2", - "inherits": "2.0.3", - "readable-stream": "2.3.6" - } - }, - "param-case": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", - "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", - "dev": true, + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz", + "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==", "requires": { - "no-case": "2.3.2" + "cyclist": "^1.0.1", + "inherits": "^2.0.3", + "readable-stream": "^2.1.5" } }, "parse-asn1": { - "version": "5.1.1", - "resolved": "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz", - "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==", - "dev": true, + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz", + "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==", "requires": { - "asn1.js": "4.10.1", - "browserify-aes": "1.2.0", - "create-hash": "1.2.0", - "evp_bytestokey": "1.0.3", - "pbkdf2": "3.0.17" + "asn1.js": "^5.2.0", + "browserify-aes": "^1.0.0", + "evp_bytestokey": "^1.0.0", + "pbkdf2": "^3.0.3", + "safe-buffer": "^5.1.1" } }, "parse-glob": { @@ -8539,10 +9497,10 @@ "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", "dev": true, "requires": { - "glob-base": "0.3.0", - "is-dotfile": "1.0.3", - "is-extglob": "1.0.0", - "is-glob": "2.0.1" + "glob-base": "^0.3.0", + "is-dotfile": "^1.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.0" }, "dependencies": { "is-extglob": { @@ -8557,7 +9515,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } } } @@ -8566,16 +9524,16 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", - "dev": true, + "optional": true, "requires": { - "error-ex": "1.3.2" + "error-ex": "^1.2.0" } }, "parse5": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz", - "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==", - "dev": true + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz", + "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==", + "optional": true }, "parsejson": { "version": "0.0.3", @@ -8583,7 +9541,7 @@ "integrity": "sha1-q343WfIJ7OmUN5c/fQ8fZK4OZKs=", "dev": true, "requires": { - "better-assert": "1.0.2" + "better-assert": "~1.0.0" } }, "parseqs": { @@ -8592,7 +9550,7 @@ "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=", "dev": true, "requires": { - "better-assert": "1.0.2" + "better-assert": "~1.0.0" } }, "parseuri": { @@ -8601,76 +9559,72 @@ "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=", "dev": true, "requires": { - "better-assert": "1.0.2" + "better-assert": "~1.0.0" } }, "parseurl": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz", - "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=", - "dev": true + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" }, "pascalcase": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", - "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", - "dev": true + "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=" }, "path-browserify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", - "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=", - "dev": true + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz", + "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==" }, "path-dirname": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", - "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=", - "dev": true + "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=" }, "path-exists": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" }, "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "path-is-inside": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", - "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", - "dev": true + "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=" }, "path-key": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", - "dev": true + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=" }, "path-parse": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", - "dev": true + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" }, "path-to-regexp": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=", - "dev": true + "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" }, "path-type": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", - "dev": true, "requires": { - "pify": "3.0.0" + "pify": "^3.0.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + } } }, "pbf": { @@ -8678,56 +9632,54 @@ "resolved": "https://registry.npmjs.org/pbf/-/pbf-3.1.0.tgz", "integrity": "sha512-/hYJmIsTmh7fMkHAWWXJ5b8IKLWdjdlAFb3IHkRBn1XUhIYBChVGfVwmHEAV3UfXTxsP/AKfYTXTS/dCPxJd5w==", "requires": { - "ieee754": "1.1.12", - "resolve-protobuf-schema": "2.1.0" + "ieee754": "^1.1.6", + "resolve-protobuf-schema": "^2.0.0" } }, "pbkdf2": { - "version": "3.0.17", - "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz", - "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==", - "dev": true, + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz", + "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==", "requires": { - "create-hash": "1.2.0", - "create-hmac": "1.1.7", - "ripemd160": "2.0.2", - "safe-buffer": "5.1.2", - "sha.js": "2.4.11" + "create-hash": "^1.1.2", + "create-hmac": "^1.1.4", + "ripemd160": "^2.0.1", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" } }, "pdfjs-dist": { - "version": "2.2.228", - "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.2.228.tgz", - "integrity": "sha512-W5LhYPMS2UKX0ELIa4u+CFCMoox5qQNQElt0bAK2mwz1V8jZL0rvLao+0tBujce84PK6PvWG36Nwr7agCCWFGQ==", - "requires": { - "node-ensure": "0.0.0", - "worker-loader": "2.0.0" - } + "version": "2.5.207", + "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.5.207.tgz", + "integrity": "sha512-xGDUhnCYPfHy+unMXCLCJtlpZaaZ17Ew3WIL0tnSgKFUZXHAPD49GO9xScyszSsQMoutNDgRb+rfBXIaX/lJbw==" }, "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, + "picomatch": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", + "optional": true + }, "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==" }, "pinkie": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", - "dev": true + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=" }, "pinkie-promise": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", - "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "^2.0.0" } }, "pixelworks": { @@ -8739,99 +9691,130 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", - "dev": true, "requires": { - "find-up": "2.1.0" + "find-up": "^2.1.0" + }, + "dependencies": { + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "requires": { + "locate-path": "^2.0.0" + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "requires": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + } + }, + "p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "requires": { + "p-try": "^1.0.0" + } + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "requires": { + "p-limit": "^1.1.0" + } + }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=" + } } }, "portfinder": { - "version": "1.0.19", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.19.tgz", - "integrity": "sha512-23aeQKW9KgHe6citUrG3r9HjeX6vls0h713TAa+CwTKZwNIr/pD2ApaxYF4Um3ZZyq4ar+Siv3+fhoHaIwSOSw==", - "dev": true, + "version": "1.0.28", + "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", + "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==", "requires": { - "async": "1.5.2", - "debug": "2.6.9", - "mkdirp": "0.5.1" + "async": "^2.6.2", + "debug": "^3.1.1", + "mkdirp": "^0.5.5" + }, + "dependencies": { + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "requires": { + "ms": "^2.1.1" + } + } } }, "posix-character-classes": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", - "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=", - "dev": true + "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, "postcss": { - "version": "6.0.23", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz", - "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==", - "dev": true, + "version": "7.0.14", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz", + "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==", "requires": { - "chalk": "2.4.1", - "source-map": "0.6.1", - "supports-color": "5.5.0" + "chalk": "^2.4.2", + "source-map": "^0.6.1", + "supports-color": "^6.1.0" }, "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "requires": { + "has-flag": "^3.0.0" + } } } }, "postcss-import": { - "version": "11.1.0", - "resolved": "http://registry.npmjs.org/postcss-import/-/postcss-import-11.1.0.tgz", - "integrity": "sha512-5l327iI75POonjxkXgdRCUS+AlzAdBx4pOvMEhTKTCjb1p8IEeVR9yx3cPbmN7LIWJLbfnIXxAhoB4jpD0c/Cw==", - "dev": true, + "version": "12.0.1", + "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-12.0.1.tgz", + "integrity": "sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==", "requires": { - "postcss": "6.0.23", - "postcss-value-parser": "3.3.1", - "read-cache": "1.0.0", - "resolve": "1.1.7" + "postcss": "^7.0.1", + "postcss-value-parser": "^3.2.3", + "read-cache": "^1.0.0", + "resolve": "^1.1.7" } }, "postcss-load-config": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.0.0.tgz", - "integrity": "sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==", - "dev": true, + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz", + "integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==", "requires": { - "cosmiconfig": "4.0.0", - "import-cwd": "2.1.0" + "cosmiconfig": "^5.0.0", + "import-cwd": "^2.0.0" } }, "postcss-loader": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.1.6.tgz", - "integrity": "sha512-hgiWSc13xVQAq25cVw80CH0l49ZKlAnU1hKPOdRrNj89bokRr/bZF2nT+hebPPF9c9xs8c3gw3Fr2nxtmXYnNg==", - "dev": true, - "requires": { - "loader-utils": "1.1.0", - "postcss": "6.0.23", - "postcss-load-config": "2.0.0", - "schema-utils": "0.4.7" - } - }, - "postcss-url": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/postcss-url/-/postcss-url-7.3.2.tgz", - "integrity": "sha512-QMV5mA+pCYZQcUEPQkmor9vcPQ2MT+Ipuu8qdi1gVxbNiIiErEGft+eny1ak19qALoBkccS5AHaCaCDzh7b9MA==", - "dev": true, + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz", + "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==", "requires": { - "mime": "1.6.0", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "postcss": "6.0.23", - "xxhashjs": "0.2.2" + "loader-utils": "^1.1.0", + "postcss": "^7.0.0", + "postcss-load-config": "^2.0.0", + "schema-utils": "^1.0.0" } }, "postcss-value-parser": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" }, "prelude-ls": { "version": "1.1.2", @@ -8844,43 +9827,29 @@ "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=", "dev": true }, - "pretty-error": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz", - "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=", - "dev": true, - "requires": { - "renderkid": "2.0.2", - "utila": "0.4.0" - } - }, "process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", - "dev": true + "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=" }, "process-nextick-args": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", - "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", - "dev": true + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, "promise": { "version": "7.3.1", "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", - "dev": true, "optional": true, "requires": { - "asap": "2.0.6" + "asap": "~2.0.3" } }, "promise-inflight": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", - "dev": true + "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=" }, "promise-polyfill": { "version": "8.1.0", @@ -8893,14 +9862,22 @@ "integrity": "sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=", "dev": true, "requires": { - "err-code": "1.1.2", - "retry": "0.10.1" + "err-code": "^1.0.0", + "retry": "^0.10.0" + }, + "dependencies": { + "retry": { + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz", + "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=", + "dev": true + } } }, "protocol-buffers-schema": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.3.2.tgz", - "integrity": "sha512-Xdayp8sB/mU+sUV4G7ws8xtYMGdQnxbeIfLjyO9TZZRJdztBGhlmbI5x1qcY4TG5hBkIKGnc28i7nXxaugu88w==" + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.4.0.tgz", + "integrity": "sha512-G/2kcamPF2S49W5yaMGdIpkG6+5wZF0fzBteLKgEHjbNzqjZQ85aAs1iJGto31EJaSTkNvHs5IXuHSaTLWBAiA==" }, "protoduck": { "version": "5.0.1", @@ -8908,37 +9885,42 @@ "integrity": "sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==", "dev": true, "requires": { - "genfun": "5.0.0" + "genfun": "^5.0.0" } }, "protractor": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/protractor/-/protractor-5.4.1.tgz", - "integrity": "sha512-ORey5ewQMYiXQxcQohsqEiKYOg/r5yJoJbt0tuROmmgajdg/CA3gTOZNIFJncUVMAJIk5YFqBBLUjKVmQO6tfA==", + "version": "5.4.4", + "resolved": "https://registry.npmjs.org/protractor/-/protractor-5.4.4.tgz", + "integrity": "sha512-BaL4vePgu3Vfa/whvTUAlgaCAId4uNSGxIFSCXMgj7LMYENPWLp85h5RBi9pdpX/bWQ8SF6flP7afmi2TC4eHw==", "dev": true, "requires": { - "@types/node": "6.14.0", - "@types/q": "0.0.32", - "@types/selenium-webdriver": "3.0.12", - "blocking-proxy": "1.0.1", - "browserstack": "1.5.1", - "chalk": "1.1.3", - "glob": "7.1.3", + "@types/q": "^0.0.32", + "@types/selenium-webdriver": "^3.0.0", + "blocking-proxy": "^1.0.0", + "browserstack": "^1.5.1", + "chalk": "^1.1.3", + "glob": "^7.0.3", "jasmine": "2.8.0", - "jasminewd2": "2.2.0", - "optimist": "0.6.1", + "jasminewd2": "^2.1.0", "q": "1.4.1", - "saucelabs": "1.5.0", + "saucelabs": "^1.5.0", "selenium-webdriver": "3.6.0", - "source-map-support": "0.4.18", + "source-map-support": "~0.4.0", "webdriver-js-extender": "2.1.0", - "webdriver-manager": "12.1.0" + "webdriver-manager": "^12.0.6", + "yargs": "^12.0.5" }, "dependencies": { - "@types/node": { - "version": "6.14.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-6.14.0.tgz", - "integrity": "sha512-6tQyh4Q4B5pECcXBOQDZ5KjyBIxRZGzrweGPM47sAYTdVG4+7R+2EGMTmp0h6ZwgqHrFRCeg2gdhsG9xXEl2Sg==", + "@types/q": { + "version": "0.0.32", + "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz", + "integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=", + "dev": true + }, + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "dev": true }, "ansi-styles": { @@ -8947,17 +9929,54 @@ "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", "dev": true }, + "array-union": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", + "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", + "dev": true, + "requires": { + "array-uniq": "^1.0.1" + } + }, + "camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true + }, "chalk": { "version": "1.1.3", - "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" + } + }, + "cliui": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", + "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", + "dev": true, + "requires": { + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" + }, + "dependencies": { + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "^3.0.0" + } + } } }, "del": { @@ -8966,39 +9985,139 @@ "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", "dev": true, "requires": { - "globby": "5.0.0", - "is-path-cwd": "1.0.0", - "is-path-in-cwd": "1.0.1", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "rimraf": "2.6.2" + "globby": "^5.0.0", + "is-path-cwd": "^1.0.0", + "is-path-in-cwd": "^1.0.0", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "rimraf": "^2.2.8" } }, - "globby": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", - "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", + "get-caller-file": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", + "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", + "dev": true + }, + "globby": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", + "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", + "dev": true, + "requires": { + "array-union": "^1.0.1", + "arrify": "^1.0.0", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" + } + }, + "invert-kv": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", + "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==", + "dev": true + }, + "is-path-cwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", + "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", + "dev": true + }, + "is-path-in-cwd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz", + "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", + "dev": true, + "requires": { + "is-path-inside": "^1.0.0" + } + }, + "is-path-inside": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", + "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", + "dev": true, + "requires": { + "path-is-inside": "^1.0.1" + } + }, + "lcid": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", + "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", + "dev": true, + "requires": { + "invert-kv": "^2.0.0" + } + }, + "mem": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz", + "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==", + "dev": true, + "requires": { + "map-age-cleaner": "^0.1.1", + "mimic-fn": "^2.0.0", + "p-is-promise": "^2.0.0" + } + }, + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true + }, + "os-locale": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", + "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", + "dev": true, + "requires": { + "execa": "^1.0.0", + "lcid": "^2.0.0", + "mem": "^4.0.0" + } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + }, + "q": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz", + "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=", + "dev": true + }, + "require-main-filename": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", + "dev": true + }, + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "dev": true, "requires": { - "array-union": "1.0.2", - "arrify": "1.0.1", - "glob": "7.1.3", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "glob": "^7.1.3" } }, - "minimist": { - "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "dev": true }, - "pify": { - "version": "2.3.0", - "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, "source-map-support": { @@ -9007,7 +10126,28 @@ "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", "dev": true, "requires": { - "source-map": "0.5.7" + "source-map": "^0.5.6" + } + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + }, + "dependencies": { + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "^3.0.0" + } + } } }, "supports-color": { @@ -9017,86 +10157,178 @@ "dev": true }, "webdriver-manager": { - "version": "12.1.0", - "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.1.0.tgz", - "integrity": "sha512-oEc5fmkpz6Yh6udhwir5m0eN5mgRPq9P/NU5YWuT3Up5slt6Zz+znhLU7q4+8rwCZz/Qq3Fgpr/4oao7NPCm2A==", + "version": "12.1.7", + "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.1.7.tgz", + "integrity": "sha512-XINj6b8CYuUYC93SG3xPkxlyUc3IJbD6Vvo75CVGuG9uzsefDzWQrhz0Lq8vbPxtb4d63CZdYophF8k8Or/YiA==", + "dev": true, + "requires": { + "adm-zip": "^0.4.9", + "chalk": "^1.1.1", + "del": "^2.2.0", + "glob": "^7.0.3", + "ini": "^1.3.4", + "minimist": "^1.2.0", + "q": "^1.4.1", + "request": "^2.87.0", + "rimraf": "^2.5.2", + "semver": "^5.3.0", + "xml2js": "^0.4.17" + } + }, + "wrap-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "dev": true, + "requires": { + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" + }, + "dependencies": { + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "dev": true, + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dev": true, + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + } + } + }, + "yargs": { + "version": "12.0.5", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", + "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", + "dev": true, + "requires": { + "cliui": "^4.0.0", + "decamelize": "^1.2.0", + "find-up": "^3.0.0", + "get-caller-file": "^1.0.1", + "os-locale": "^3.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1 || ^4.0.0", + "yargs-parser": "^11.1.1" + } + }, + "yargs-parser": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", + "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", "dev": true, "requires": { - "adm-zip": "0.4.11", - "chalk": "1.1.3", - "del": "2.2.2", - "glob": "7.1.3", - "ini": "1.3.5", - "minimist": "1.2.0", - "q": "1.4.1", - "request": "2.88.0", - "rimraf": "2.6.2", - "semver": "5.6.0", - "xml2js": "0.4.19" + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" } } } }, "proxy-addr": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz", - "integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==", - "dev": true, + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz", + "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==", "requires": { - "forwarded": "0.1.2", - "ipaddr.js": "1.8.0" + "forwarded": "~0.1.2", + "ipaddr.js": "1.9.1" } }, "prr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", - "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=", - "dev": true + "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=" }, "pseudomap": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", - "dev": true + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" }, "psl": { - "version": "1.1.29", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz", - "integrity": "sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==" + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", + "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==" }, "public-encrypt": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", - "dev": true, "requires": { - "bn.js": "4.11.8", - "browserify-rsa": "4.0.1", - "create-hash": "1.2.0", - "parse-asn1": "5.1.1", - "randombytes": "2.0.6", - "safe-buffer": "5.1.2" + "bn.js": "^4.1.0", + "browserify-rsa": "^4.0.0", + "create-hash": "^1.1.0", + "parse-asn1": "^5.0.0", + "randombytes": "^2.0.1", + "safe-buffer": "^5.1.2" + }, + "dependencies": { + "bn.js": { + "version": "4.11.9", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz", + "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==" + } } }, "pump": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", - "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", - "dev": true, + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "requires": { - "end-of-stream": "1.4.1", - "once": "1.4.0" + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + }, + "dependencies": { + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "requires": { + "wrappy": "1" + } + } } }, "pumpify": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz", "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==", - "dev": true, "requires": { - "duplexify": "3.6.1", - "inherits": "2.0.3", - "pump": "2.0.1" + "duplexify": "^3.6.0", + "inherits": "^2.0.3", + "pump": "^2.0.0" + }, + "dependencies": { + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "requires": { + "wrappy": "1" + } + }, + "pump": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", + "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + } } }, "punycode": { @@ -9104,12 +10336,6 @@ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" }, - "q": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz", - "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=", - "dev": true - }, "qjobs": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz", @@ -9124,20 +10350,17 @@ "querystring": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", - "dev": true + "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=" }, "querystring-es3": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", - "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", - "dev": true + "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=" }, "querystringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.0.tgz", - "integrity": "sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==", - "dev": true + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==" }, "quickselect": { "version": "1.1.1", @@ -9150,9 +10373,9 @@ "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==", "dev": true, "requires": { - "is-number": "4.0.0", - "kind-of": "6.0.2", - "math-random": "1.0.1" + "is-number": "^4.0.0", + "kind-of": "^6.0.0", + "math-random": "^1.0.1" }, "dependencies": { "is-number": { @@ -9164,158 +10387,189 @@ } }, "randombytes": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz", - "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==", - "dev": true, + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "^5.1.0" } }, "randomfill": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", - "dev": true, "requires": { - "randombytes": "2.0.6", - "safe-buffer": "5.1.2" + "randombytes": "^2.0.5", + "safe-buffer": "^5.1.0" } }, "range-parser": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", - "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=", - "dev": true + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" }, "raw-body": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz", - "integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==", - "dev": true, + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", + "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", "requires": { - "bytes": "3.0.0", - "http-errors": "1.6.3", - "iconv-lite": "0.4.23", + "bytes": "3.1.0", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", "unpipe": "1.0.0" + }, + "dependencies": { + "bytes": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" + } } }, "raw-loader": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz", - "integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao=", - "dev": true + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-1.0.0.tgz", + "integrity": "sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==", + "requires": { + "loader-utils": "^1.1.0", + "schema-utils": "^1.0.0" + } }, "rbush": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/rbush/-/rbush-2.0.2.tgz", "integrity": "sha512-XBOuALcTm+O/H8G90b6pzu6nX6v2zCKiFG4BJho8a+bY6AER6t8uQUZdi5bomQc0AprCWhEGa7ncAbbRap0bRA==", "requires": { - "quickselect": "1.1.1" + "quickselect": "^1.0.1" } }, "read-cache": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=", - "dev": true, "requires": { - "pify": "2.3.0" + "pify": "^2.3.0" }, "dependencies": { "pify": { "version": "2.3.0", - "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" } } }, "read-pkg": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", + "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", "dev": true, "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" + "load-json-file": "^2.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^2.0.0" }, "dependencies": { "path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", + "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "pify": "^2.0.0" } }, "pify": { "version": "2.3.0", - "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true } } }, "read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", + "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", "dev": true, "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" + "find-up": "^2.0.0", + "read-pkg": "^2.0.0" }, "dependencies": { "find-up": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "locate-path": "^2.0.0" } }, - "path-exists": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", "dev": true, "requires": { - "pinkie-promise": "2.0.1" + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" } + }, + "p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "dev": true, + "requires": { + "p-try": "^1.0.0" + } + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "dev": true, + "requires": { + "p-limit": "^1.1.0" + } + }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "dev": true } } }, "readable-stream": { - "version": "2.3.6", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true, + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + } } }, "readdirp": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", - "dev": true, "requires": { - "graceful-fs": "4.1.11", - "micromatch": "3.1.10", - "readable-stream": "2.3.6" + "graceful-fs": "^4.1.11", + "micromatch": "^3.1.10", + "readable-stream": "^2.0.2" } }, "rechoir": { @@ -9324,37 +10578,29 @@ "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", "dev": true, "requires": { - "resolve": "1.1.7" + "resolve": "^1.1.6" } }, "redent": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", - "dev": true, "optional": true, "requires": { - "indent-string": "2.1.0", - "strip-indent": "1.0.1" + "indent-string": "^2.1.0", + "strip-indent": "^1.0.1" } }, "reflect-metadata": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.12.tgz", - "integrity": "sha512-n+IyV+nGz3+0q3/Yf1ra12KpCyi001bi4XFxSjbiWWjfqb52iTTtpGXmCCAOWWIAn9KEuFZKGqBERHmrtScZ3A==", - "dev": true - }, - "regenerate": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz", - "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==", + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz", + "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==", "dev": true }, "regenerator-runtime": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", - "dev": true + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" }, "regex-cache": { "version": "0.4.4", @@ -9362,184 +10608,146 @@ "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", "dev": true, "requires": { - "is-equal-shallow": "0.1.3" + "is-equal-shallow": "^0.1.3" } }, "regex-not": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", - "dev": true, - "requires": { - "extend-shallow": "3.0.2", - "safe-regex": "1.1.0" - } - }, - "regexpu-core": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", - "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=", - "dev": true, "requires": { - "regenerate": "1.4.0", - "regjsgen": "0.2.0", - "regjsparser": "0.1.5" + "extend-shallow": "^3.0.2", + "safe-regex": "^1.1.0" } }, - "regjsgen": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", - "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=", - "dev": true - }, - "regjsparser": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", - "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", - "dev": true, + "regexp.prototype.flags": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz", + "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==", "requires": { - "jsesc": "0.5.0" + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1" }, "dependencies": { - "jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", - "dev": true + "es-abstract": { + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", + "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + } } } }, - "relateurl": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", - "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=", - "dev": true - }, "remove-trailing-separator": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", - "dev": true - }, - "renderkid": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.2.tgz", - "integrity": "sha512-FsygIxevi1jSiPY9h7vZmBFUbAOcbYm9UwyiLNdVsLRs/5We9Ob5NMPbGYUTWiLq5L+ezlVdE0A8bbME5CWTpg==", - "dev": true, - "requires": { - "css-select": "1.2.0", - "dom-converter": "0.2.0", - "htmlparser2": "3.3.0", - "strip-ansi": "3.0.1", - "utila": "0.4.0" - } + "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=" }, "repeat-element": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz", - "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==", - "dev": true + "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==" }, "repeat-string": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", - "dev": true + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" }, "repeating": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", - "dev": true, "requires": { - "is-finite": "1.0.2" + "is-finite": "^1.0.0" } }, "request": { - "version": "2.88.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", - "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", - "requires": { - "aws-sign2": "0.7.0", - "aws4": "1.8.0", - "caseless": "0.12.0", - "combined-stream": "1.0.7", - "extend": "3.0.2", - "forever-agent": "0.6.1", - "form-data": "2.3.3", - "har-validator": "5.1.0", - "http-signature": "1.2.0", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.21", - "oauth-sign": "0.9.0", - "performance-now": "2.1.0", - "qs": "6.5.2", - "safe-buffer": "5.1.2", - "tough-cookie": "2.4.3", - "tunnel-agent": "0.6.0", - "uuid": "3.3.2" + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", + "requires": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.5.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" } }, "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true - }, - "require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "dev": true + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" }, "require-main-filename": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", - "dev": true + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" }, "requires-port": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", - "dev": true + "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=" }, "resolve": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", - "dev": true + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz", + "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==", + "requires": { + "is-core-module": "^2.1.0", + "path-parse": "^1.0.6" + } }, "resolve-cwd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz", "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", - "dev": true, "requires": { - "resolve-from": "3.0.0" + "resolve-from": "^3.0.0" } }, "resolve-from": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", - "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", - "dev": true + "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=" }, "resolve-protobuf-schema": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz", "integrity": "sha512-kI5ffTiZWmJaS/huM8wZfEMer1eRd7oJQhDuxeCLe3t7N7mX3z94CN0xPxBQxFYQTSNz9T0i+v6inKqSdK8xrQ==", "requires": { - "protocol-buffers-schema": "3.3.2" + "protocol-buffers-schema": "^3.3.1" } }, "resolve-url": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", - "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", - "dev": true + "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" }, "restore-cursor": { "version": "2.0.0", @@ -9547,21 +10755,14 @@ "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", "dev": true, "requires": { - "onetime": "2.0.1", - "signal-exit": "3.0.2" + "onetime": "^2.0.0", + "signal-exit": "^3.0.2" } }, "ret": { "version": "0.1.15", "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", - "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", - "dev": true - }, - "retry": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz", - "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=", - "dev": true + "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" }, "rgbcolor": { "version": "1.0.1", @@ -9569,62 +10770,55 @@ "integrity": "sha1-1lBezbMEplldom+ktDMHMGd1lF0=" }, "rimraf": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", - "dev": true, + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "requires": { - "glob": "7.1.3" + "glob": "^7.1.3" } }, "ripemd160": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", - "dev": true, "requires": { - "hash-base": "3.0.4", - "inherits": "2.0.3" + "hash-base": "^3.0.0", + "inherits": "^2.0.1" } }, "run-async": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", - "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", - "dev": true, - "requires": { - "is-promise": "2.1.0" - } + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", + "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", + "dev": true }, "run-queue": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", - "dev": true, "requires": { - "aproba": "1.2.0" + "aproba": "^1.1.1" } }, "rxjs": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz", - "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", + "version": "6.6.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz", + "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==", "requires": { - "tslib": "1.9.3" + "tslib": "^1.9.0" } }, "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" }, "safe-regex": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", - "dev": true, "requires": { - "ret": "0.1.15" + "ret": "~0.1.10" } }, "safer-buffer": { @@ -9633,29 +10827,35 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "sass-graph": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz", - "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=", - "dev": true, + "version": "2.2.6", + "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.6.tgz", + "integrity": "sha512-MKuEYXFSGuRSi8FZ3A7imN1CeVn9Gpw0/SFJKdL1ejXJneI9a5rwlEZrKejhEFAA3O6yr3eIyl/WuvASvlT36g==", "optional": true, "requires": { - "glob": "7.1.3", - "lodash": "4.17.11", - "scss-tokenizer": "0.2.3", - "yargs": "7.1.0" + "glob": "^7.0.0", + "lodash": "^4.0.0", + "scss-tokenizer": "^0.2.3", + "yargs": "^7.0.0" } }, "sass-loader": { - "version": "6.0.7", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-6.0.7.tgz", - "integrity": "sha512-JoiyD00Yo1o61OJsoP2s2kb19L1/Y2p3QFcCdWdF6oomBGKVYuZyqHWemRBfQ2uGYsk+CH3eCguXNfpjzlcpaA==", - "dev": true, + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.1.0.tgz", + "integrity": "sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==", "requires": { - "clone-deep": "2.0.2", - "loader-utils": "1.1.0", - "lodash.tail": "4.1.1", - "neo-async": "2.6.0", - "pify": "3.0.0" + "clone-deep": "^2.0.1", + "loader-utils": "^1.0.1", + "lodash.tail": "^4.1.1", + "neo-async": "^2.5.0", + "pify": "^3.0.0", + "semver": "^5.5.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + } } }, "saucelabs": { @@ -9664,43 +10864,41 @@ "integrity": "sha512-jlX3FGdWvYf4Q3LFfFWS1QvPg3IGCGWxIc8QBFdPTbpTJnt/v17FHXYVAn7C8sHf1yUXo2c7yIM0isDryfYtHQ==", "dev": true, "requires": { - "https-proxy-agent": "2.2.1" + "https-proxy-agent": "^2.2.1" } }, "sax": { - "version": "0.5.8", - "resolved": "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz", - "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=", - "dev": true + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, "schema-utils": { - "version": "0.4.7", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz", - "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", + "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", "requires": { - "ajv": "6.4.0", - "ajv-keywords": "3.2.0" + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" } }, "scss-tokenizer": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz", "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", - "dev": true, "optional": true, "requires": { - "js-base64": "2.4.9", - "source-map": "0.4.4" + "js-base64": "^2.1.8", + "source-map": "^0.4.2" }, "dependencies": { "source-map": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "dev": true, "optional": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -9708,8 +10906,7 @@ "select-hose": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", - "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=", - "dev": true + "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=" }, "selenium-webdriver": { "version": "3.6.0", @@ -9717,37 +10914,44 @@ "integrity": "sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==", "dev": true, "requires": { - "jszip": "3.1.5", - "rimraf": "2.6.2", + "jszip": "^3.1.3", + "rimraf": "^2.5.4", "tmp": "0.0.30", - "xml2js": "0.4.19" + "xml2js": "^0.4.17" }, "dependencies": { + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + }, "tmp": { "version": "0.0.30", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz", "integrity": "sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=", "dev": true, "requires": { - "os-tmpdir": "1.0.2" + "os-tmpdir": "~1.0.1" } } } }, "selfsigned": { - "version": "1.10.4", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.4.tgz", - "integrity": "sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==", - "dev": true, + "version": "1.10.8", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz", + "integrity": "sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==", "requires": { - "node-forge": "0.7.5" + "node-forge": "^0.10.0" } }, "semver": { "version": "5.6.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", - "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==", - "dev": true + "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==" }, "semver-dsl": { "version": "1.0.1", @@ -9755,7 +10959,15 @@ "integrity": "sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=", "dev": true, "requires": { - "semver": "5.6.0" + "semver": "^5.3.0" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } } }, "semver-intersect": { @@ -9764,96 +10976,153 @@ "integrity": "sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ==", "dev": true, "requires": { - "semver": "5.6.0" + "semver": "^5.0.0" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } } }, "send": { - "version": "0.16.2", - "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz", - "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==", - "dev": true, + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", + "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", "requires": { "debug": "2.6.9", - "depd": "1.1.2", - "destroy": "1.0.4", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "etag": "1.8.1", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", "fresh": "0.5.2", - "http-errors": "1.6.3", - "mime": "1.4.1", - "ms": "2.0.0", - "on-finished": "2.3.0", - "range-parser": "1.2.0", - "statuses": "1.4.0" + "http-errors": "~1.7.2", + "mime": "1.6.0", + "ms": "2.1.1", + "on-finished": "~2.3.0", + "range-parser": "~1.2.1", + "statuses": "~1.5.0" }, "dependencies": { - "mime": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", - "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", - "dev": true + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + }, + "dependencies": { + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" } } }, "serialize-javascript": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.5.0.tgz", - "integrity": "sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==", - "dev": true + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz", + "integrity": "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==" }, "serve-index": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", - "dev": true, "requires": { - "accepts": "1.3.5", + "accepts": "~1.3.4", "batch": "0.6.1", "debug": "2.6.9", - "escape-html": "1.0.3", - "http-errors": "1.6.3", - "mime-types": "2.1.21", - "parseurl": "1.3.2" + "escape-html": "~1.0.3", + "http-errors": "~1.6.2", + "mime-types": "~2.1.17", + "parseurl": "~1.3.2" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "http-errors": { + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", + "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", + "requires": { + "depd": "~1.1.2", + "inherits": "2.0.3", + "setprototypeof": "1.1.0", + "statuses": ">= 1.4.0 < 2" + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "setprototypeof": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", + "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==" + } } }, "serve-static": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz", - "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==", - "dev": true, + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", + "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", "requires": { - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "parseurl": "1.3.2", - "send": "0.16.2" + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.17.1" } }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + }, + "set-immediate-shim": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", + "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", "dev": true }, "set-value": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", - "dev": true, + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "split-string": "3.1.0" + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.3", + "split-string": "^3.0.1" }, "dependencies": { "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -9861,41 +11130,36 @@ "setimmediate": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=", - "dev": true + "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" }, "setprototypeof": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", - "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", - "dev": true + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", + "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" }, "sha.js": { "version": "2.4.11", - "resolved": "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", - "dev": true, "requires": { - "inherits": "2.0.3", - "safe-buffer": "5.1.2" + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" } }, "shallow-clone": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz", "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==", - "dev": true, "requires": { - "is-extendable": "0.1.1", - "kind-of": "5.1.0", - "mixin-object": "2.0.1" + "is-extendable": "^0.1.1", + "kind-of": "^5.0.0", + "mixin-object": "^2.0.1" }, "dependencies": { "kind-of": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" } } }, @@ -9903,44 +11167,40 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", - "dev": true, "requires": { - "shebang-regex": "1.0.0" + "shebang-regex": "^1.0.0" } }, "shebang-regex": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", - "dev": true + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=" }, "shelljs": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz", - "integrity": "sha512-fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==", + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz", + "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==", "dev": true, "requires": { - "glob": "7.1.3", - "interpret": "1.2.0", - "rechoir": "0.6.2" + "glob": "^7.0.0", + "interpret": "^1.0.0", + "rechoir": "^0.6.2" } }, "signal-exit": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", - "dev": true + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", + "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" }, "slash": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", - "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", - "dev": true + "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=" }, "smart-buffer": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.0.1.tgz", - "integrity": "sha512-RFqinRVJVcCAL9Uh1oVqE6FZkqsyLiVOYEZ20TqIOjuX7iFVJ+zsbs4RIghnw/pTs7mZvt8ZHhvm1ZUrR4fykg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz", + "integrity": "sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==", "dev": true }, "smoothscroll-polyfill": { @@ -9952,35 +11212,50 @@ "version": "0.8.2", "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", - "dev": true, "requires": { - "base": "0.11.2", - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "map-cache": "0.2.2", - "source-map": "0.5.7", - "source-map-resolve": "0.5.2", - "use": "3.1.1" + "base": "^0.11.1", + "debug": "^2.2.0", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "map-cache": "^0.2.2", + "source-map": "^0.5.6", + "source-map-resolve": "^0.5.0", + "use": "^3.1.0" }, "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, "define-property": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" } } }, @@ -9988,49 +11263,44 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", - "dev": true, "requires": { - "define-property": "1.0.0", - "isobject": "3.0.1", - "snapdragon-util": "3.0.1" + "define-property": "^1.0.0", + "isobject": "^3.0.0", + "snapdragon-util": "^3.0.1" }, "dependencies": { "define-property": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "is-accessor-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -10039,18 +11309,16 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", - "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.2.0" }, "dependencies": { "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -10072,7 +11340,7 @@ "dependencies": { "debug": { "version": "2.3.3", - "resolved": "http://registry.npmjs.org/debug/-/debug-2.3.3.tgz", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", "dev": true, "requires": { @@ -10081,7 +11349,7 @@ }, "ms": { "version": "0.7.2", - "resolved": "http://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", "dev": true }, @@ -10105,7 +11373,7 @@ "dependencies": { "debug": { "version": "2.3.3", - "resolved": "http://registry.npmjs.org/debug/-/debug-2.3.3.tgz", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", "dev": true, "requires": { @@ -10114,7 +11382,7 @@ }, "ms": { "version": "0.7.2", - "resolved": "http://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", "dev": true } @@ -10139,9 +11407,15 @@ "to-array": "0.1.4" }, "dependencies": { + "component-emitter": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", + "dev": true + }, "debug": { "version": "2.3.3", - "resolved": "http://registry.npmjs.org/debug/-/debug-2.3.3.tgz", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", "dev": true, "requires": { @@ -10150,7 +11424,7 @@ }, "ms": { "version": "0.7.2", - "resolved": "http://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", "dev": true } @@ -10158,7 +11432,7 @@ }, "socket.io-parser": { "version": "2.3.1", - "resolved": "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz", "integrity": "sha1-3VMgJRA85Clpcya+/WQAX8/ltKA=", "dev": true, "requires": { @@ -10176,7 +11450,7 @@ }, "debug": { "version": "2.2.0", - "resolved": "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", "dev": true, "requires": { @@ -10189,9 +11463,15 @@ "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", "dev": true }, + "json3": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz", + "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=", + "dev": true + }, "ms": { "version": "0.7.1", - "resolved": "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=", "dev": true } @@ -10201,247 +11481,232 @@ "version": "0.3.19", "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz", "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==", - "dev": true, "requires": { - "faye-websocket": "0.10.0", - "uuid": "3.3.2" + "faye-websocket": "^0.10.0", + "uuid": "^3.0.1" } }, "sockjs-client": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz", "integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==", - "dev": true, "requires": { - "debug": "3.2.6", - "eventsource": "1.0.7", - "faye-websocket": "0.11.1", - "inherits": "2.0.3", - "json3": "3.3.2", - "url-parse": "1.4.3" + "debug": "^3.2.5", + "eventsource": "^1.0.7", + "faye-websocket": "~0.11.1", + "inherits": "^2.0.3", + "json3": "^3.3.2", + "url-parse": "^1.4.3" }, "dependencies": { "debug": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, "requires": { - "ms": "2.1.1" + "ms": "^2.1.1" } }, "faye-websocket": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz", - "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=", - "dev": true, + "version": "0.11.3", + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz", + "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==", "requires": { - "websocket-driver": "0.7.0" + "websocket-driver": ">=0.5.1" } - }, - "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "dev": true } } }, "socks": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/socks/-/socks-2.2.2.tgz", - "integrity": "sha512-g6wjBnnMOZpE0ym6e0uHSddz9p3a+WsBaaYQaBaSCJYvrC4IXykQR9MNGjLQf38e9iIIhp3b1/Zk8YZI3KGJ0Q==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.3.tgz", + "integrity": "sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==", "dev": true, "requires": { "ip": "1.1.5", - "smart-buffer": "4.0.1" + "smart-buffer": "^4.1.0" } }, "socks-proxy-agent": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz", - "integrity": "sha512-Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz", + "integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==", "dev": true, "requires": { - "agent-base": "4.2.1", - "socks": "2.2.2" + "agent-base": "~4.2.1", + "socks": "~2.3.2" + }, + "dependencies": { + "agent-base": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz", + "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==", + "dev": true, + "requires": { + "es6-promisify": "^5.0.0" + } + } } }, "source-list-map": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", - "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==", - "dev": true + "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==" }, "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" }, "source-map-loader": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.4.tgz", "integrity": "sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==", - "dev": true, "requires": { - "async": "2.6.1", - "loader-utils": "1.1.0" - }, - "dependencies": { - "async": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", - "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", - "dev": true, - "requires": { - "lodash": "4.17.11" - } - } + "async": "^2.5.0", + "loader-utils": "^1.1.0" } }, "source-map-resolve": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", - "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", - "dev": true, + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz", + "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", "requires": { - "atob": "2.1.2", - "decode-uri-component": "0.2.0", - "resolve-url": "0.2.1", - "source-map-url": "0.4.0", - "urix": "0.1.0" + "atob": "^2.1.2", + "decode-uri-component": "^0.2.0", + "resolve-url": "^0.2.1", + "source-map-url": "^0.4.0", + "urix": "^0.1.0" } }, "source-map-support": { - "version": "0.5.9", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.9.tgz", - "integrity": "sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==", - "dev": true, + "version": "0.5.19", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", + "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", "requires": { - "buffer-from": "1.1.1", - "source-map": "0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" } }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", - "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", - "dev": true + "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=" }, "sourcemap-codec": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz", - "integrity": "sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg==", + "version": "1.4.8", + "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", + "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==", "dev": true }, "spdx-correct": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.2.tgz", - "integrity": "sha512-q9hedtzyXHr5S0A1vEPoK/7l8NpfkFYTq6iCY+Pno2ZbdZR6WexZFtqeVGkGxW3TEJMN914Z55EnAGMmenlIQQ==", - "dev": true, + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", + "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", "requires": { - "spdx-expression-parse": "3.0.0", - "spdx-license-ids": "3.0.1" + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-exceptions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz", - "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==", - "dev": true + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", + "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==" }, "spdx-expression-parse": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", - "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", - "dev": true, + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", + "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", "requires": { - "spdx-exceptions": "2.2.0", - "spdx-license-ids": "3.0.1" + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-license-ids": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz", - "integrity": "sha512-TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w==", - "dev": true + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz", + "integrity": "sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==" }, "spdy": { - "version": "3.4.7", - "resolved": "https://registry.npmjs.org/spdy/-/spdy-3.4.7.tgz", - "integrity": "sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=", - "dev": true, + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz", + "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==", "requires": { - "debug": "2.6.9", - "handle-thing": "1.2.5", - "http-deceiver": "1.2.7", - "safe-buffer": "5.1.2", - "select-hose": "2.0.0", - "spdy-transport": "2.1.0" + "debug": "^4.1.0", + "handle-thing": "^2.0.0", + "http-deceiver": "^1.2.7", + "select-hose": "^2.0.0", + "spdy-transport": "^3.0.0" } }, "spdy-transport": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-2.1.0.tgz", - "integrity": "sha512-bpUeGpZcmZ692rrTiqf9/2EUakI6/kXX1Rpe0ib/DyOzbiexVfXkw6GnvI9hVGvIwVaUhkaBojjCZwLNRGQg1g==", - "dev": true, + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz", + "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==", "requires": { - "debug": "2.6.9", - "detect-node": "2.0.4", - "hpack.js": "2.1.6", - "obuf": "1.1.2", - "readable-stream": "2.3.6", - "safe-buffer": "5.1.2", - "wbuf": "1.7.3" + "debug": "^4.1.0", + "detect-node": "^2.0.4", + "hpack.js": "^2.1.6", + "obuf": "^1.1.2", + "readable-stream": "^3.0.6", + "wbuf": "^1.7.3" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } + } + }, + "speed-measure-webpack-plugin": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.0.tgz", + "integrity": "sha512-b9Yd0TrzceMVYSbuamM1sFsGM1oVfyFTM22gOoyLhymNvBVApuYpkdFOgYkKJpN/KhTpcCYcTGHg7X+FJ33Vvw==", + "requires": { + "chalk": "^2.0.1" } }, "split-string": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", - "dev": true, "requires": { - "extend-shallow": "3.0.2" + "extend-shallow": "^3.0.0" } }, "sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" }, "sshpk": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.15.1.tgz", - "integrity": "sha512-mSdgNUaidk+dRU5MhYtN9zebdzF2iG0cNPWy8HG+W8y+fT1JnSkh0fzzpjOa0L7P8i1Rscz38t0h4gPcKz43xA==", + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", + "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", "requires": { - "asn1": "0.2.4", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.2", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.2", - "getpass": "0.1.7", - "jsbn": "0.1.1", - "safer-buffer": "2.1.2", - "tweetnacl": "0.14.5" + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" } }, "ssri": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz", "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==", - "dev": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "^5.1.1" } }, "stackblur-canvas": { @@ -10453,186 +11718,213 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", - "dev": true, "requires": { - "define-property": "0.2.5", - "object-copy": "0.1.0" + "define-property": "^0.2.5", + "object-copy": "^0.1.0" }, "dependencies": { "define-property": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } } } }, "stats-webpack-plugin": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/stats-webpack-plugin/-/stats-webpack-plugin-0.6.2.tgz", - "integrity": "sha1-LFlJtTHgf4eojm6k3PrFOqjHWis=", - "dev": true, + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/stats-webpack-plugin/-/stats-webpack-plugin-0.7.0.tgz", + "integrity": "sha512-NT0YGhwuQ0EOX+uPhhUcI6/+1Sq/pMzNuSCBVT4GbFl/ac6I/JZefBcjlECNfAb1t3GOx5dEj1Z7x0cAxeeVLQ==", "requires": { - "lodash": "4.17.11" + "lodash": "^4.17.4" } }, "statuses": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", - "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==", - "dev": true + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" }, "stdout-stream": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz", "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==", - "dev": true, "optional": true, "requires": { - "readable-stream": "2.3.6" + "readable-stream": "^2.0.1" } }, "stream-browserify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", - "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=", - "dev": true, + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz", + "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.6" + "inherits": "~2.0.1", + "readable-stream": "^2.0.2" } }, "stream-each": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz", "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==", - "dev": true, "requires": { - "end-of-stream": "1.4.1", - "stream-shift": "1.0.0" + "end-of-stream": "^1.1.0", + "stream-shift": "^1.0.0" } }, "stream-http": { "version": "2.8.3", "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz", "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==", - "dev": true, "requires": { - "builtin-status-codes": "3.0.0", - "inherits": "2.0.3", - "readable-stream": "2.3.6", - "to-arraybuffer": "1.0.1", - "xtend": "4.0.1" + "builtin-status-codes": "^3.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.3.6", + "to-arraybuffer": "^1.0.0", + "xtend": "^4.0.0" } }, "stream-shift": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", - "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=", - "dev": true + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz", + "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==" }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + }, + "dependencies": { + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "requires": { + "number-is-nan": "^1.0.0" + } + } + } + }, + "string.prototype.trimend": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz", + "integrity": "sha512-8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw==", + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.18.0-next.1" + } + }, + "string.prototype.trimstart": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz", + "integrity": "sha512-7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg==", + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.18.0-next.1" } }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "~5.1.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + } } }, "strip-ansi": { "version": "3.0.1", - "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "dev": true, - "requires": { - "is-utf8": "0.2.1" - } + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true }, "strip-eof": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", - "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", - "dev": true + "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" }, "strip-indent": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", - "dev": true, "optional": true, "requires": { - "get-stdin": "4.0.1" + "get-stdin": "^4.0.1" } }, "style-loader": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.21.0.tgz", - "integrity": "sha512-T+UNsAcl3Yg+BsPKs1vd22Fr8sVT+CJMtzqc6LEw9bbJZb43lm9GoeIfUcDEefBSWC0BhYbcdupV1GtI4DGzxg==", - "dev": true, + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.23.1.tgz", + "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==", "requires": { - "loader-utils": "1.1.0", - "schema-utils": "0.4.7" + "loader-utils": "^1.1.0", + "schema-utils": "^1.0.0" } }, "stylus": { "version": "0.54.5", "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz", "integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=", - "dev": true, "requires": { - "css-parse": "1.7.0", - "debug": "2.6.9", - "glob": "7.0.6", - "mkdirp": "0.5.1", - "sax": "0.5.8", - "source-map": "0.1.43" + "css-parse": "1.7.x", + "debug": "*", + "glob": "7.0.x", + "mkdirp": "0.5.x", + "sax": "0.5.x", + "source-map": "0.1.x" }, "dependencies": { "glob": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz", "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=", - "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.2", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "requires": { + "wrappy": "1" } }, + "sax": { + "version": "0.5.8", + "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz", + "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=" + }, "source-map": { "version": "0.1.43", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", - "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -10641,20 +11933,18 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz", "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==", - "dev": true, "requires": { - "loader-utils": "1.1.0", - "lodash.clonedeep": "4.5.0", - "when": "3.6.4" + "loader-utils": "^1.0.2", + "lodash.clonedeep": "^4.5.0", + "when": "~3.6.x" } }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } }, "symbol-observable": { @@ -10664,66 +11954,148 @@ "dev": true }, "symbol-tree": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz", - "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=" + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" }, "tapable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.0.tgz", - "integrity": "sha512-IlqtmLVaZA2qab8epUXbVWRn3aB1imbDMJtjB3nu4X0NqPkcY/JH9ZtCBWKHWPxs8Svi9tyo8w2dBoi07qZbBA==", - "dev": true + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz", + "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==" }, "tar": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", - "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", - "dev": true, + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz", + "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", "optional": true, "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.11", - "inherits": "2.0.3" + "block-stream": "*", + "fstream": "^1.0.12", + "inherits": "2" + } + }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + } + }, + "terser-webpack-plugin": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.1.tgz", + "integrity": "sha512-GGSt+gbT0oKcMDmPx4SRSfJPE1XaN3kQRWG4ghxKQw9cn5G9x6aCKSsgYdvyM0na9NJ4Drv0RG6jbBByZ5CMjw==", + "requires": { + "cacache": "^11.0.2", + "find-cache-dir": "^2.0.0", + "schema-utils": "^1.0.0", + "serialize-javascript": "^1.4.0", + "source-map": "^0.6.1", + "terser": "^3.8.1", + "webpack-sources": "^1.1.0", + "worker-farm": "^1.5.2" + }, + "dependencies": { + "cacache": { + "version": "11.3.3", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.3.tgz", + "integrity": "sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==", + "requires": { + "bluebird": "^3.5.5", + "chownr": "^1.1.1", + "figgy-pudding": "^3.5.1", + "glob": "^7.1.4", + "graceful-fs": "^4.1.15", + "lru-cache": "^5.1.1", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.3", + "ssri": "^6.0.1", + "unique-filename": "^1.1.1", + "y18n": "^4.0.0" + } + }, + "find-cache-dir": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz", + "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", + "requires": { + "commondir": "^1.0.1", + "make-dir": "^2.0.0", + "pkg-dir": "^3.0.0" + } + }, + "lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "requires": { + "yallist": "^3.0.2" + } + }, + "pkg-dir": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", + "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", + "requires": { + "find-up": "^3.0.0" + } + }, + "ssri": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", + "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", + "requires": { + "figgy-pudding": "^3.5.1" + } + }, + "yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" + } } }, "through": { "version": "2.3.8", - "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", "dev": true }, "through2": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", - "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", - "dev": true, + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", + "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", "requires": { - "readable-stream": "2.3.6", - "xtend": "4.0.1" + "readable-stream": "~2.3.6", + "xtend": "~4.0.1" } }, "thunky": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz", - "integrity": "sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==", - "dev": true + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", + "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==" }, "timers-browserify": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz", - "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==", - "dev": true, + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz", + "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==", "requires": { - "setimmediate": "1.0.5" + "setimmediate": "^1.0.4" } }, "tmp": { - "version": "0.0.31", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz", - "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=", + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "dev": true, "requires": { - "os-tmpdir": "1.0.2" + "os-tmpdir": "~1.0.2" } }, "to-array": { @@ -10735,31 +12107,28 @@ "to-arraybuffer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", - "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=", - "dev": true + "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=" }, "to-fast-properties": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", - "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", "dev": true }, "to-object-path": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", - "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -10768,44 +12137,34 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", - "dev": true, "requires": { - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "regex-not": "1.0.2", - "safe-regex": "1.1.0" + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "regex-not": "^1.0.2", + "safe-regex": "^1.1.0" } }, "to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "dev": true, "requires": { - "is-number": "3.0.0", - "repeat-string": "1.6.1" + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" } }, - "toposort": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz", - "integrity": "sha1-LmhELZ9k7HILjMieZEOsbKqVACk=", - "dev": true + "toidentifier": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", + "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" }, "tough-cookie": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", - "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", "requires": { - "psl": "1.1.29", - "punycode": "1.4.1" - }, - "dependencies": { - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" - } + "psl": "^1.1.28", + "punycode": "^2.1.1" } }, "tr46": { @@ -10814,32 +12173,28 @@ "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=" }, "tree-kill": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz", - "integrity": "sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==", - "dev": true + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz", + "integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==" }, "trim-newlines": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", - "dev": true, "optional": true }, "trim-right": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", - "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", - "dev": true + "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=" }, "true-case-path": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz", "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==", - "dev": true, "optional": true, "requires": { - "glob": "7.1.3" + "glob": "^7.1.2" } }, "tryer": { @@ -10854,28 +12209,20 @@ "integrity": "sha512-XK7QmDcNHVmZkVtkiwNDWiERRHPyU8nBqZB1+iv2UhOG0q3RQ9HsZ2CMqISlFbxjrYFGfG2mX7bW4dAyxBVzUw==", "dev": true, "requires": { - "arrify": "1.0.1", - "chalk": "2.4.1", - "diff": "3.5.0", - "make-error": "1.3.5", - "minimist": "1.2.0", - "mkdirp": "0.5.1", - "source-map-support": "0.5.9", - "yn": "2.0.0" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } + "arrify": "^1.0.0", + "chalk": "^2.3.0", + "diff": "^3.1.0", + "make-error": "^1.1.1", + "minimist": "^1.2.0", + "mkdirp": "^0.5.1", + "source-map-support": "^0.5.3", + "yn": "^2.0.0" } }, "tslib": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", - "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==" + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "tslint": { "version": "5.9.1", @@ -10883,28 +12230,25 @@ "integrity": "sha1-ElX4ej/1frCw4fDmEKi0dIBGya4=", "dev": true, "requires": { - "babel-code-frame": "6.26.0", - "builtin-modules": "1.1.1", - "chalk": "2.4.1", - "commander": "2.17.1", - "diff": "3.5.0", - "glob": "7.1.3", - "js-yaml": "3.12.0", - "minimatch": "3.0.4", - "resolve": "1.8.1", - "semver": "5.6.0", - "tslib": "1.9.3", - "tsutils": "2.29.0" + "babel-code-frame": "^6.22.0", + "builtin-modules": "^1.1.1", + "chalk": "^2.3.0", + "commander": "^2.12.1", + "diff": "^3.2.0", + "glob": "^7.1.1", + "js-yaml": "^3.7.0", + "minimatch": "^3.0.4", + "resolve": "^1.3.2", + "semver": "^5.3.0", + "tslib": "^1.8.0", + "tsutils": "^2.12.1" }, "dependencies": { - "resolve": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz", - "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==", - "dev": true, - "requires": { - "path-parse": "1.0.6" - } + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true } } }, @@ -10914,21 +12258,20 @@ "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==", "dev": true, "requires": { - "tslib": "1.9.3" + "tslib": "^1.8.1" } }, "tty-browserify": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", - "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", - "dev": true + "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=" }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "^5.0.1" } }, "tweetnacl": { @@ -10941,24 +12284,22 @@ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", "requires": { - "prelude-ls": "1.1.2" + "prelude-ls": "~1.1.2" } }, "type-is": { - "version": "1.6.16", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz", - "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==", - "dev": true, + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", "requires": { "media-typer": "0.3.0", - "mime-types": "2.1.21" + "mime-types": "~2.1.24" } }, "typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", - "dev": true + "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" }, "typescript": { "version": "3.2.2", @@ -10967,62 +12308,10 @@ "dev": true }, "uglify-js": { - "version": "3.4.9", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz", - "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==", - "dev": true, - "requires": { - "commander": "2.17.1", - "source-map": "0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "uglifyjs-webpack-plugin": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz", - "integrity": "sha512-ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw==", - "dev": true, - "requires": { - "cacache": "10.0.4", - "find-cache-dir": "1.0.0", - "schema-utils": "0.4.7", - "serialize-javascript": "1.5.0", - "source-map": "0.6.1", - "uglify-es": "3.3.9", - "webpack-sources": "1.3.0", - "worker-farm": "1.6.0" - }, - "dependencies": { - "commander": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz", - "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==", - "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "uglify-es": { - "version": "3.3.9", - "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz", - "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==", - "dev": true, - "requires": { - "commander": "2.13.0", - "source-map": "0.6.1" - } - } - } + "version": "3.11.5", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.5.tgz", + "integrity": "sha512-btvv/baMqe7HxP7zJSF7Uc16h1mSfuuSplT0/qdjxseesDU+yYzH33eHBH+eMdeRXwujXspaCTooWHQVVBh09w==", + "optional": true }, "ultron": { "version": "1.0.2", @@ -11031,90 +12320,60 @@ "dev": true }, "union-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", - "dev": true, + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "requires": { - "arr-union": "3.1.0", - "get-value": "2.0.6", - "is-extendable": "0.1.1", - "set-value": "0.4.3" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - }, - "set-value": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", - "dev": true, - "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "to-object-path": "0.3.0" - } - } + "arr-union": "^3.1.0", + "get-value": "^2.0.6", + "is-extendable": "^0.1.1", + "set-value": "^2.0.1" } }, "unique-filename": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", - "dev": true, "requires": { - "unique-slug": "2.0.1" + "unique-slug": "^2.0.0" } }, "unique-slug": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz", - "integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==", - "dev": true, + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz", + "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", "requires": { - "imurmurhash": "0.1.4" + "imurmurhash": "^0.1.4" } }, "unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", - "dev": true + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" }, "unset-value": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", - "dev": true, "requires": { - "has-value": "0.3.1", - "isobject": "3.0.1" + "has-value": "^0.3.1", + "isobject": "^3.0.0" }, "dependencies": { "has-value": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", - "dev": true, "requires": { - "get-value": "2.0.6", - "has-values": "0.1.4", - "isobject": "2.1.0" + "get-value": "^2.0.3", + "has-values": "^0.1.4", + "isobject": "^2.0.0" }, "dependencies": { "isobject": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "dev": true, "requires": { "isarray": "1.0.0" } @@ -11124,42 +12383,32 @@ "has-values": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", - "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", - "dev": true + "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=" } } }, "upath": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz", - "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==", - "dev": true - }, - "upper-case": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", - "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=", - "dev": true + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", + "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==" }, "uri-js": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-3.0.2.tgz", - "integrity": "sha1-+QuFhQf4HepNz7s8TD2/orVX+qo=", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz", + "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==", "requires": { - "punycode": "2.1.1" + "punycode": "^2.1.0" } }, "urix": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", - "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", - "dev": true + "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=" }, "url": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", - "dev": true, "requires": { "punycode": "1.3.2", "querystring": "0.2.0" @@ -11168,56 +12417,23 @@ "punycode": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", - "dev": true - } - } - }, - "url-loader": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-1.1.2.tgz", - "integrity": "sha512-dXHkKmw8FhPqu8asTc1puBfe3TehOCo2+RmOOev5suNCIYBcT626kxiWg1NBVkwc4rO8BGa7gP70W7VXuqHrjg==", - "dev": true, - "requires": { - "loader-utils": "1.1.0", - "mime": "2.3.1", - "schema-utils": "1.0.0" - }, - "dependencies": { - "mime": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz", - "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==", - "dev": true - }, - "schema-utils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", - "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", - "dev": true, - "requires": { - "ajv": "6.4.0", - "ajv-errors": "1.0.0", - "ajv-keywords": "3.2.0" - } + "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" } } }, "url-parse": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.3.tgz", - "integrity": "sha512-rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw==", - "dev": true, + "version": "1.4.7", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz", + "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==", "requires": { - "querystringify": "2.1.0", - "requires-port": "1.0.0" + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" } }, "use": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", - "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", - "dev": true + "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==" }, "useragent": { "version": "2.3.0", @@ -11225,60 +12441,65 @@ "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==", "dev": true, "requires": { - "lru-cache": "4.1.3", - "tmp": "0.0.31" + "lru-cache": "4.1.x", + "tmp": "0.0.x" + }, + "dependencies": { + "lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "dev": true, + "requires": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + }, + "yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", + "dev": true + } } }, "util": { - "version": "0.10.4", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz", - "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==", - "dev": true, + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz", + "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==", "requires": { "inherits": "2.0.3" + }, + "dependencies": { + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + } } }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true - }, - "util.promisify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz", - "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==", - "dev": true, - "requires": { - "define-properties": "1.1.3", - "object.getownpropertydescriptors": "2.0.3" - } - }, - "utila": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz", - "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=", - "dev": true + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", - "dev": true + "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" }, "uuid": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", - "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" }, "validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "dev": true, "requires": { - "spdx-correct": "3.0.2", - "spdx-expression-parse": "3.0.0" + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" } }, "validate-npm-package-name": { @@ -11287,33 +12508,28 @@ "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=", "dev": true, "requires": { - "builtins": "1.0.3" + "builtins": "^1.0.3" } }, "vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", - "dev": true + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" }, "verror": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "requires": { - "assert-plus": "1.0.0", + "assert-plus": "^1.0.0", "core-util-is": "1.0.2", - "extsprintf": "1.3.0" + "extsprintf": "^1.2.0" } }, "vm-browserify": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", - "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=", - "dev": true, - "requires": { - "indexof": "0.0.1" - } + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", + "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==" }, "void-elements": { "version": "2.0.1", @@ -11321,37 +12537,166 @@ "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=", "dev": true }, - "watchpack": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz", - "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==", - "dev": true, + "watchpack": { + "version": "1.7.5", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz", + "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==", + "requires": { + "chokidar": "^3.4.1", + "graceful-fs": "^4.1.2", + "neo-async": "^2.5.0", + "watchpack-chokidar2": "^2.0.1" + }, + "dependencies": { + "anymatch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", + "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "optional": true, + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, + "binary-extensions": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", + "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", + "optional": true + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "optional": true, + "requires": { + "fill-range": "^7.0.1" + } + }, + "chokidar": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz", + "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==", + "optional": true, + "requires": { + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "fsevents": "~2.1.2", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.5.0" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "optional": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "fsevents": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", + "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", + "optional": true + }, + "glob-parent": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", + "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "optional": true, + "requires": { + "is-glob": "^4.0.1" + } + }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "optional": true, + "requires": { + "binary-extensions": "^2.0.0" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "optional": true + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "optional": true + }, + "readdirp": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", + "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", + "optional": true, + "requires": { + "picomatch": "^2.2.1" + } + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "optional": true, + "requires": { + "is-number": "^7.0.0" + } + } + } + }, + "watchpack-chokidar2": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz", + "integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==", + "optional": true, "requires": { - "chokidar": "2.0.4", - "graceful-fs": "4.1.11", - "neo-async": "2.6.0" + "chokidar": "^2.1.8" + }, + "dependencies": { + "chokidar": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", + "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", + "optional": true, + "requires": { + "anymatch": "^2.0.0", + "async-each": "^1.0.1", + "braces": "^2.3.2", + "fsevents": "^1.2.7", + "glob-parent": "^3.1.0", + "inherits": "^2.0.3", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "normalize-path": "^3.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.2.1", + "upath": "^1.1.1" + } + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "optional": true + } } }, "wbuf": { "version": "1.7.3", "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz", "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", - "dev": true, - "requires": { - "minimalistic-assert": "1.0.1" - } - }, - "webassemblyjs": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/webassemblyjs/-/webassemblyjs-1.4.3.tgz", - "integrity": "sha512-4lOV1Lv6olz0PJkDGQEp82HempAn147e6BXijWDzz9g7/2nSebVP9GVg62Fz5ZAs55mxq13GA0XLyvY8XkyDjg==", - "dev": true, "requires": { - "@webassemblyjs/ast": "1.4.3", - "@webassemblyjs/validation": "1.4.3", - "@webassemblyjs/wasm-parser": "1.4.3", - "@webassemblyjs/wast-parser": "1.4.3", - "long": "3.2.0" + "minimalistic-assert": "^1.0.0" } }, "webdriver-js-extender": { @@ -11360,8 +12705,8 @@ "integrity": "sha512-lcUKrjbBfCK6MNsh7xaY2UAUmZwe+/ib03AjVOpFobX4O7+83BUveSrLfU0Qsyb1DaKJdQRbuU+kM9aZ6QUhiQ==", "dev": true, "requires": { - "@types/selenium-webdriver": "3.0.12", - "selenium-webdriver": "3.6.0" + "@types/selenium-webdriver": "^3.0.0", + "selenium-webdriver": "^3.0.1" } }, "webidl-conversions": { @@ -11370,159 +12715,186 @@ "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=" }, "webpack": { - "version": "4.9.2", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.9.2.tgz", - "integrity": "sha512-jlWrCrJDU3sdWFprel6jHH8esN2C++Q8ehedRo74u7MWLTUJn9SD7RSgsCTEZCSRpVpMascDylAqPoldauOMfA==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.4.3", - "@webassemblyjs/wasm-edit": "1.4.3", - "@webassemblyjs/wasm-parser": "1.4.3", - "acorn": "5.7.3", - "acorn-dynamic-import": "3.0.0", - "ajv": "6.4.0", - "ajv-keywords": "3.2.0", - "chrome-trace-event": "0.1.3", - "enhanced-resolve": "4.1.0", - "eslint-scope": "3.7.3", - "json-parse-better-errors": "1.0.2", - "loader-runner": "2.3.1", - "loader-utils": "1.1.0", - "memory-fs": "0.4.1", - "micromatch": "3.1.10", - "mkdirp": "0.5.1", - "neo-async": "2.6.0", - "node-libs-browser": "2.1.0", - "schema-utils": "0.4.7", - "tapable": "1.1.0", - "uglifyjs-webpack-plugin": "1.3.0", - "watchpack": "1.6.0", - "webpack-sources": "1.3.0" + "version": "4.29.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.29.0.tgz", + "integrity": "sha512-pxdGG0keDBtamE1mNvT5zyBdx+7wkh6mh7uzMOo/uRQ/fhsdj5FXkh/j5mapzs060forql1oXqXN9HJGju+y7w==", + "requires": { + "@webassemblyjs/ast": "1.7.11", + "@webassemblyjs/helper-module-context": "1.7.11", + "@webassemblyjs/wasm-edit": "1.7.11", + "@webassemblyjs/wasm-parser": "1.7.11", + "acorn": "^6.0.5", + "acorn-dynamic-import": "^4.0.0", + "ajv": "^6.1.0", + "ajv-keywords": "^3.1.0", + "chrome-trace-event": "^1.0.0", + "enhanced-resolve": "^4.1.0", + "eslint-scope": "^4.0.0", + "json-parse-better-errors": "^1.0.2", + "loader-runner": "^2.3.0", + "loader-utils": "^1.1.0", + "memory-fs": "~0.4.1", + "micromatch": "^3.1.8", + "mkdirp": "~0.5.0", + "neo-async": "^2.5.0", + "node-libs-browser": "^2.0.0", + "schema-utils": "^0.4.4", + "tapable": "^1.1.0", + "terser-webpack-plugin": "^1.1.0", + "watchpack": "^1.5.0", + "webpack-sources": "^1.3.0" + }, + "dependencies": { + "acorn": { + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz", + "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==" + }, + "schema-utils": { + "version": "0.4.7", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz", + "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==", + "requires": { + "ajv": "^6.1.0", + "ajv-keywords": "^3.1.0" + } + } } }, "webpack-bundle-analyzer": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.0.4.tgz", - "integrity": "sha512-ggDUgtKuQki4vmc93Ej65GlYxeCUR/0THa7gA+iqAGC2FFAxO+r+RM9sAUa8HWdw4gJ3/NZHX/QUcVgRjdIsDg==", - "dev": true, - "requires": { - "acorn": "5.7.3", - "bfj": "6.1.1", - "chalk": "2.4.1", - "commander": "2.19.0", - "ejs": "2.6.1", - "express": "4.16.4", - "filesize": "3.6.1", - "gzip-size": "5.0.0", - "lodash": "4.17.11", - "mkdirp": "0.5.1", - "opener": "1.5.1", - "ws": "6.1.4" - }, - "dependencies": { - "commander": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz", - "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==", + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz", + "integrity": "sha512-Ob8amZfCm3rMB1ScjQVlbYYUEJyEjdEtQ92jqiFUYt5VkEeO2v5UMbv49P/gnmCZm3A6yaFQzCBvpZqN4MUsdA==", + "dev": true, + "requires": { + "acorn": "^7.1.1", + "acorn-walk": "^7.1.1", + "bfj": "^6.1.1", + "chalk": "^2.4.1", + "commander": "^2.18.0", + "ejs": "^2.6.1", + "express": "^4.16.3", + "filesize": "^3.6.1", + "gzip-size": "^5.0.0", + "lodash": "^4.17.19", + "mkdirp": "^0.5.1", + "opener": "^1.5.1", + "ws": "^6.0.0" + }, + "dependencies": { + "acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", "dev": true + } + } + }, + "webpack-core": { + "version": "0.6.9", + "resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz", + "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=", + "requires": { + "source-list-map": "~0.1.7", + "source-map": "~0.4.1" + }, + "dependencies": { + "source-list-map": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz", + "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=" }, - "ws": { - "version": "6.1.4", - "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.4.tgz", - "integrity": "sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==", - "dev": true, + "source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "requires": { - "async-limiter": "1.0.0" + "amdefine": ">=0.0.4" } } } }, "webpack-dev-middleware": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz", - "integrity": "sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==", - "dev": true, + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.5.1.tgz", + "integrity": "sha512-4dwCh/AyMOYAybggUr8fiCkRnjVDp+Cqlr9c+aaNB3GJYgRGYQWJ1YX/WAKUNA9dPNHZ6QSN2lYDKqjKSI8Vqw==", "requires": { - "memory-fs": "0.4.1", - "mime": "2.3.1", - "range-parser": "1.2.0", - "webpack-log": "2.0.0" + "memory-fs": "~0.4.1", + "mime": "^2.3.1", + "range-parser": "^1.0.3", + "webpack-log": "^2.0.0" }, "dependencies": { "mime": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz", - "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==", - "dev": true + "version": "2.4.6", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz", + "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==" } } }, "webpack-dev-server": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.10.tgz", - "integrity": "sha512-RqOAVjfqZJtQcB0LmrzJ5y4Jp78lv9CK0MZ1YJDTaTmedMZ9PU9FLMQNrMCfVu8hHzaVLVOJKBlGEHMN10z+ww==", - "dev": true, + "version": "3.1.14", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz", + "integrity": "sha512-mGXDgz5SlTxcF3hUpfC8hrQ11yhAttuUQWf1Wmb+6zo3x6rb7b9mIfuQvAPLdfDRCGRGvakBWHdHOa0I9p/EVQ==", "requires": { "ansi-html": "0.0.7", - "bonjour": "3.5.0", - "chokidar": "2.0.4", - "compression": "1.7.3", - "connect-history-api-fallback": "1.5.0", - "debug": "3.2.6", - "del": "3.0.0", - "express": "4.16.4", - "html-entities": "1.2.1", - "http-proxy-middleware": "0.18.0", - "import-local": "2.0.0", - "internal-ip": "3.0.1", - "ip": "1.1.5", - "killable": "1.0.1", - "loglevel": "1.6.1", - "opn": "5.4.0", - "portfinder": "1.0.19", - "schema-utils": "1.0.0", - "selfsigned": "1.10.4", - "serve-index": "1.9.1", + "bonjour": "^3.5.0", + "chokidar": "^2.0.0", + "compression": "^1.5.2", + "connect-history-api-fallback": "^1.3.0", + "debug": "^3.1.0", + "del": "^3.0.0", + "express": "^4.16.2", + "html-entities": "^1.2.0", + "http-proxy-middleware": "~0.18.0", + "import-local": "^2.0.0", + "internal-ip": "^3.0.1", + "ip": "^1.1.5", + "killable": "^1.0.0", + "loglevel": "^1.4.1", + "opn": "^5.1.0", + "portfinder": "^1.0.9", + "schema-utils": "^1.0.0", + "selfsigned": "^1.9.1", + "semver": "^5.6.0", + "serve-index": "^1.7.2", "sockjs": "0.3.19", "sockjs-client": "1.3.0", - "spdy": "3.4.7", - "strip-ansi": "3.0.1", - "supports-color": "5.5.0", + "spdy": "^4.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^5.1.0", + "url": "^0.11.0", "webpack-dev-middleware": "3.4.0", - "webpack-log": "2.0.0", + "webpack-log": "^2.0.0", "yargs": "12.0.2" }, "dependencies": { "ansi-regex": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" }, "camelcase": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=" }, "cliui": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", - "dev": true, "requires": { - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "wrap-ansi": "2.1.0" + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" }, "dependencies": { "strip-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -11531,166 +12903,116 @@ "version": "3.2.6", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, "requires": { - "ms": "2.1.1" + "ms": "^2.1.1" } }, "decamelize": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz", "integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==", - "dev": true, "requires": { "xregexp": "4.0.0" } }, - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "requires": { - "locate-path": "3.0.0" - } - }, "invert-kv": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", - "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true + "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==" }, "lcid": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", - "dev": true, - "requires": { - "invert-kv": "2.0.0" - } - }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "requires": { - "p-locate": "3.0.0", - "path-exists": "3.0.0" - } - }, - "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "dev": true - }, - "os-locale": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.0.1.tgz", - "integrity": "sha512-7g5e7dmXPtzcP4bgsZ8ixDVqA7oWYuEz4lOSujeWyliPai4gfVDiFIcwBg3aGCPnmSGfzOKTK3ccPn0CKv3DBw==", - "dev": true, "requires": { - "execa": "0.10.0", - "lcid": "2.0.0", - "mem": "4.0.0" + "invert-kv": "^2.0.0" } }, - "p-limit": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.0.0.tgz", - "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==", - "dev": true, + "mem": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz", + "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==", "requires": { - "p-try": "2.0.0" + "map-age-cleaner": "^0.1.1", + "mimic-fn": "^2.0.0", + "p-is-promise": "^2.0.0" } }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "requires": { - "p-limit": "2.0.0" - } + "mime": { + "version": "2.4.6", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz", + "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==" }, - "p-try": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz", - "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==", - "dev": true + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" }, - "schema-utils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", - "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", - "dev": true, + "os-locale": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", + "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", "requires": { - "ajv": "6.4.0", - "ajv-errors": "1.0.0", - "ajv-keywords": "3.2.0" + "execa": "^1.0.0", + "lcid": "^2.0.0", + "mem": "^4.0.0" } }, "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" }, "dependencies": { "strip-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true + "webpack-dev-middleware": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz", + "integrity": "sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==", + "requires": { + "memory-fs": "~0.4.1", + "mime": "^2.3.1", + "range-parser": "^1.0.3", + "webpack-log": "^2.0.0" + } }, "yargs": { "version": "12.0.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz", "integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==", - "dev": true, "requires": { - "cliui": "4.1.0", - "decamelize": "2.0.0", - "find-up": "3.0.0", - "get-caller-file": "1.0.3", - "os-locale": "3.0.1", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "4.0.0", - "yargs-parser": "10.1.0" + "cliui": "^4.0.0", + "decamelize": "^2.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^1.0.1", + "os-locale": "^3.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1 || ^4.0.0", + "yargs-parser": "^10.1.0" } }, "yargs-parser": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz", "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==", - "dev": true, "requires": { - "camelcase": "4.1.0" + "camelcase": "^4.1.0" } } } @@ -11699,151 +13021,127 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz", "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==", - "dev": true, "requires": { - "ansi-colors": "3.2.1", - "uuid": "3.3.2" + "ansi-colors": "^3.0.0", + "uuid": "^3.3.2" } }, "webpack-merge": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.4.tgz", - "integrity": "sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ==", - "dev": true, + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.1.tgz", + "integrity": "sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==", "requires": { - "lodash": "4.17.11" + "lodash": "^4.17.5" } }, "webpack-sources": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.3.0.tgz", "integrity": "sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==", - "dev": true, "requires": { - "source-list-map": "2.0.1", - "source-map": "0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } + "source-list-map": "^2.0.0", + "source-map": "~0.6.1" } }, "webpack-subresource-integrity": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.2.0.tgz", - "integrity": "sha512-bdMR4DRbINUFt+QhNfBFHURnCzT8mtHjXiclQWX/aXBpu2pM4nOb2qViyt84ZSFrVKEXkAbmz7mSoZQH/08xFg==", - "dev": true, + "version": "1.1.0-rc.6", + "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz", + "integrity": "sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==", "requires": { - "webpack-sources": "1.3.0" + "webpack-core": "^0.6.8" } }, "websocket-driver": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz", - "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=", - "dev": true, + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", + "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", "requires": { - "http-parser-js": "0.5.0", - "websocket-extensions": "0.1.3" + "http-parser-js": ">=0.5.1", + "safe-buffer": ">=5.1.0", + "websocket-extensions": ">=0.1.1" } }, "websocket-extensions": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz", - "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==", - "dev": true + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", + "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==" }, "whatwg-url": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-2.0.1.tgz", "integrity": "sha1-U5ayBD8CDub3BNnEXqhRnnJN5lk=", "requires": { - "tr46": "0.0.3", - "webidl-conversions": "3.0.1" + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" } }, "when": { "version": "3.6.4", "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz", - "integrity": "sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=", - "dev": true + "integrity": "sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=" }, "which": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } }, "which-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", - "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", - "dev": true, - "optional": true + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" }, "wide-align": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", - "dev": true, + "optional": true, "requires": { - "string-width": "1.0.2" + "string-width": "^1.0.2 || 2" } }, + "word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==" + }, "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=" + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "dev": true }, "worker-farm": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz", - "integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==", - "dev": true, - "requires": { - "errno": "0.1.7" - } - }, - "worker-loader": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/worker-loader/-/worker-loader-2.0.0.tgz", - "integrity": "sha512-tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz", + "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==", "requires": { - "loader-utils": "1.1.0", - "schema-utils": "0.4.7" + "errno": "~0.1.7" } }, "wrap-ansi": { "version": "2.1.0", - "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", - "dev": true, "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" } }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "ws": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz", - "integrity": "sha1-iiRPoFJAHgjJiGz0SoUYnh/UBn8=", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz", + "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", "dev": true, "requires": { - "options": "0.0.6", - "ultron": "1.0.2" + "async-limiter": "~1.0.0" } }, "wtf-8": { @@ -11858,33 +13156,25 @@ "integrity": "sha1-TYuPHszTQZqjYgYb7O9RXh5VljU=" }, "xml2js": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", - "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==", + "version": "0.4.23", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz", + "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==", "dev": true, "requires": { - "sax": "1.2.4", - "xmlbuilder": "9.0.7" - }, - "dependencies": { - "sax": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", - "dev": true - } + "sax": ">=0.6.0", + "xmlbuilder": "~11.0.0" } }, "xmlbuilder": { - "version": "9.0.7", - "resolved": "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", - "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=", + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz", + "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==", "dev": true }, "xmldom": { - "version": "0.1.27", - "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz", - "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk=" + "version": "0.1.31", + "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz", + "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==" }, "xmlhttprequest-ssl": { "version": "1.5.3", @@ -11895,89 +13185,166 @@ "xregexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz", - "integrity": "sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==", - "dev": true + "integrity": "sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==" }, "xtend": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", - "dev": true - }, - "xxhashjs": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/xxhashjs/-/xxhashjs-0.2.2.tgz", - "integrity": "sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==", - "dev": true, - "requires": { - "cuint": "0.2.2" - } + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" }, "y18n": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", - "dev": true + "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" }, "yallist": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", - "dev": true + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" }, "yargs": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz", - "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", - "dev": true, + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.1.tgz", + "integrity": "sha512-huO4Fr1f9PmiJJdll5kwoS2e4GqzGSsMT3PPMpOwoVkOK8ckqAewMTZyA6LXVQWflleb/Z8oPBEvNsMft0XE+g==", "optional": true, "requires": { - "camelcase": "3.0.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.3", - "os-locale": "1.4.0", - "read-pkg-up": "1.0.1", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "1.0.2", - "which-module": "1.0.0", - "y18n": "3.2.1", - "yargs-parser": "5.0.0" + "camelcase": "^3.0.0", + "cliui": "^3.2.0", + "decamelize": "^1.1.1", + "get-caller-file": "^1.0.1", + "os-locale": "^1.4.0", + "read-pkg-up": "^1.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^1.0.2", + "which-module": "^1.0.0", + "y18n": "^3.2.1", + "yargs-parser": "5.0.0-security.0" }, "dependencies": { "camelcase": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", - "dev": true, + "optional": true + }, + "find-up": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "optional": true, + "requires": { + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" + } + }, + "load-json-file": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "optional": true, + "requires": { + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" + } + }, + "os-locale": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", + "optional": true, + "requires": { + "lcid": "^1.0.0" + } + }, + "path-exists": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "optional": true, + "requires": { + "pinkie-promise": "^2.0.0" + } + }, + "path-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "optional": true, + "requires": { + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" + } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "optional": true + }, + "read-pkg": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "optional": true, + "requires": { + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" + } + }, + "read-pkg-up": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "optional": true, + "requires": { + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" + } + }, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "optional": true, + "requires": { + "is-utf8": "^0.2.0" + } + }, + "which-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", + "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", "optional": true }, "y18n": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", - "dev": true, "optional": true } } }, "yargs-parser": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz", - "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", - "dev": true, + "version": "5.0.0-security.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0-security.0.tgz", + "integrity": "sha512-T69y4Ps64LNesYxeYGYPvfoMTt/7y1XtfpIslUeK4um+9Hu7hlGoRtaDLvdXb7+/tfq4opVa2HRY5xGip022rQ==", "optional": true, "requires": { - "camelcase": "3.0.0" + "camelcase": "^3.0.0", + "object.assign": "^4.1.0" }, "dependencies": { "camelcase": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", - "dev": true, "optional": true } } @@ -11995,9 +13362,9 @@ "dev": true }, "zone.js": { - "version": "0.8.26", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.26.tgz", - "integrity": "sha512-W9Nj+UmBJG251wkCacIkETgra4QgBo/vgoEkb4a2uoLzpQG7qF9nzwoLXWU5xj3Fg2mxGvEDh47mg24vXccYjA==" + "version": "0.8.29", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.29.tgz", + "integrity": "sha512-mla2acNCMkWXBD+c+yeUrBUrzOxYMNFdQ6FGfigGGtEVBPJx07BQeJekjt9DmH1FtZek4E9rE1eRR9qQpxACOQ==" } } -} \ No newline at end of file +} diff --git a/pre-registration-ui/package.json b/pre-registration-ui/package.json index 1da582a28dd..2bdfbad6d2b 100644 --- a/pre-registration-ui/package.json +++ b/pre-registration-ui/package.json @@ -1,6 +1,6 @@ { "name": "pre-registration", - "version": "1.1.2", + "version": "1.1.4", "scripts": { "ng": "ng", "start": "ng serve", @@ -13,6 +13,7 @@ }, "private": true, "dependencies": { + "@angular-devkit/build-angular": "^0.13.0", "@angular/animations": "7.2.0", "@angular/cdk": "^7.2.1", "@angular/common": "7.2.0", @@ -31,6 +32,8 @@ "core-js": "^2.5.4", "hammerjs": "^2.0.8", "html2pdf.js": "^0.9.1", + "json-rules-engine": "^6.0.0", + "jsonpath-plus": "^4.0.0", "material-icons": "^0.2.3", "moment": "^2.23.0", "ng-recaptcha": "^5.0.0", @@ -41,10 +44,10 @@ "osm": "^1.0.0", "rxjs": "^6.0.0", "smoothscroll-polyfill": "^0.4.4", + "vm": "^0.1.0", "zone.js": "~0.8.26" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.7.0", "@angular/cli": "7.2.1", "@angular/compiler-cli": "7.2.0", "@angular/language-service": "7.2.0", @@ -63,6 +66,6 @@ "ts-node": "~5.0.1", "tslint": "~5.9.1", "typescript": "3.2.2", - "webpack-bundle-analyzer": "^3.0.4" + "webpack-bundle-analyzer": "^3.9.0" } -} \ No newline at end of file +} diff --git a/pre-registration-ui/src/app/app.constants.ts b/pre-registration-ui/src/app/app.constants.ts index 3d85432ec37..db3698678ba 100644 --- a/pre-registration-ui/src/app/app.constants.ts +++ b/pre-registration-ui/src/app/app.constants.ts @@ -32,16 +32,17 @@ export const APPEND_URL = { location_metadata: 'locations/locationhierarchy/', location_immediate_children: 'locations/immediatechildren/', applicants: 'applications', - location: 'v1/masterdata/', - gender: 'v1/masterdata/gendertypes', - resident: 'v1/masterdata/individualtypes', + location: '/masterdata/', + gender: '/masterdata/gendertypes', + resident: '/masterdata/individualtypes', transliteration: 'transliteration/transliterate', //applicantType: 'v1/applicanttype/', - applicantType: 'v1/masterdata/', + applicantType: '/masterdata/', validDocument: 'applicanttype/', getApplicantType: 'getApplicantType', post_document: 'documents/', document: 'documents/preregistration/', + updateDocRefId: 'documents/document/', document_copy: 'document/documents/copy', nearby_registration_centers: 'getcoordinatespecificregistrationcenters/', registration_centers_by_name: 'registrationcenters/', @@ -51,7 +52,7 @@ export const APPEND_URL = { qr_code: 'qrCode/generate', notification: 'notification/', send_notification: 'notify', - master_data: 'v1/masterdata/', + master_data: '/masterdata/', auth: 'login/', cancelAppointment: 'appointment/', captcha:'captcha/validatecaptcha' @@ -69,7 +70,8 @@ export const PARAMS_KEYS = { getAvailabilityData: 'registration_center_id', catCode: 'catCode', sourcePrId: 'sourcePrId', - POA: 'POA' + POA: 'POA', + docRefId: 'docRefId' }; export const ERROR_CODES = { @@ -116,7 +118,8 @@ export const CONFIG_KEYS = { preregistration_document_alllowe_file_name_lenght: 'preregistration.documentupload.allowed.file.nameLength', google_recaptcha_site_key: 'google.recaptcha.site.key', mosip_adult_age:'mosip.adult.age', - mosip_idschema_version:'mosip.idschema.version' + mosip_idschema_version:'mosip.idschema.version', + preregistration_preview_fields:'preregistration.preview.fields' }; export const DASHBOARD_RESPONSE_KEYS = { @@ -180,7 +183,6 @@ export const notificationDtoKeys = { file: 'attachment' }; -export const previewFields = ['region', 'province', 'city', 'zone', 'gender', 'residenceStatus']; export const DOCUMENT_UPLOAD_REQUEST_DOCUMENT_KEY = 'file'; export const DOCUMENT_UPLOAD_REQUEST_DTO_KEY = 'Document request'; diff --git a/pre-registration-ui/src/app/auth/login/login.component.ts b/pre-registration-ui/src/app/auth/login/login.component.ts index 149332f6b46..810c585dfa0 100644 --- a/pre-registration-ui/src/app/auth/login/login.component.ts +++ b/pre-registration-ui/src/app/auth/login/login.component.ts @@ -192,9 +192,11 @@ export class LoginComponent implements OnInit { this.languages.push( appConstants.languageMapping[this.primaryLangFromConfig].langName ); - this.languages.push( - appConstants.languageMapping[this.secondaryLangFromConfig].langName - ); + if(this.primaryLang !== this.secondaryLang){ + this.languages.push( + appConstants.languageMapping[this.secondaryLangFromConfig].langName + ); + } } this.translate.addLangs([ this.primaryLangFromConfig, @@ -379,7 +381,7 @@ export class LoginComponent implements OnInit { } this.dataService - .sendOtp(this.inputContactDetails) + .sendOtp(this.inputContactDetails,this.primaryLang) .subscribe((response) => {}); // dynamic update of button text for Resend and Verify diff --git a/pre-registration-ui/src/app/core/services/data-storage.service.ts b/pre-registration-ui/src/app/core/services/data-storage.service.ts index 13a255231cb..b8656ea95de 100644 --- a/pre-registration-ui/src/app/core/services/data-storage.service.ts +++ b/pre-registration-ui/src/app/core/services/data-storage.service.ts @@ -66,7 +66,7 @@ export class DataStorageService { * @memberof DataStorageService */ getGenderDetails() { - const url = this.BASE_URL + appConstants.APPEND_URL.gender; + const url = this.BASE_URL + this.PRE_REG_URL + '/proxy' + appConstants.APPEND_URL.gender; return this.httpClient.get(url); } @@ -78,7 +78,7 @@ export class DataStorageService { * @memberof DataStorageService */ getResidentDetails() { - const url = this.BASE_URL + appConstants.APPEND_URL.resident; + const url = this.BASE_URL + this.PRE_REG_URL + '/proxy' + appConstants.APPEND_URL.resident; return this.httpClient.get(url); } @@ -164,6 +164,7 @@ export class DataStorageService { getNearbyRegistrationCenters(coords: any) { return this.httpClient.get( this.BASE_URL + + this.PRE_REG_URL + '/proxy' + appConstants.APPEND_URL.master_data + appConstants.APPEND_URL.nearby_registration_centers + localStorage.getItem("langCode") + @@ -181,6 +182,7 @@ export class DataStorageService { getRegistrationCentersByName(locType: string, text: string) { return this.httpClient.get( this.BASE_URL + + this.PRE_REG_URL + '/proxy' + appConstants.APPEND_URL.master_data + appConstants.APPEND_URL.registration_centers_by_name + localStorage.getItem("langCode") + @@ -193,7 +195,7 @@ export class DataStorageService { getLocationTypeData() { return this.httpClient.get( - this.BASE_URL + + this.BASE_URL + this.PRE_REG_URL + '/proxy' + appConstants.APPEND_URL.master_data + "locations/" + localStorage.getItem("langCode") @@ -202,7 +204,7 @@ export class DataStorageService { getLocationsHierarchyByLangCode(langCode: string, locCode: string) { return this.httpClient.get( - this.BASE_URL + + this.BASE_URL + this.PRE_REG_URL + '/proxy' + appConstants.APPEND_URL.master_data + "locations/" + locCode + @@ -251,8 +253,8 @@ export class DataStorageService { */ getLocationImmediateHierearchy(lang: string, location: string) { const url = - this.BASE_URL + - appConstants.APPEND_URL.location + + this.BASE_URL + this.PRE_REG_URL + '/proxy' + + appConstants.APPEND_URL.master_data + appConstants.APPEND_URL.location_immediate_children + location + appConstants.APPENDER + @@ -331,13 +333,25 @@ export class DataStorageService { ); } + getLocationOnLocationCodeAndLangCode(locationCode, langCode) { + const url = + this.BASE_URL + this.PRE_REG_URL + '/proxy' + + appConstants.APPEND_URL.master_data + + "locations/" + + locationCode + + "/" + + langCode; + return this.httpClient.get(url); + } + recommendedCenters( langCode: string, locationHierarchyCode: number, data: string[] ) { + console.log(data); let url = - this.BASE_URL + + this.BASE_URL + this.PRE_REG_URL + '/proxy' + appConstants.APPEND_URL.master_data + "registrationcenters/" + langCode + @@ -358,7 +372,7 @@ export class DataStorageService { getRegistrationCenterByIdAndLangCode(id: string, langCode: string) { const url = - this.BASE_URL + + this.BASE_URL + this.PRE_REG_URL + '/proxy' + appConstants.APPEND_URL.master_data + "registrationcenters/" + id + @@ -369,7 +383,7 @@ export class DataStorageService { getGuidelineTemplate(templateType: string) { const url = - this.BASE_URL + + this.BASE_URL + this.PRE_REG_URL + '/proxy' + appConstants.APPEND_URL.master_data + "templates/" + localStorage.getItem("langCode") + @@ -380,7 +394,7 @@ export class DataStorageService { getApplicantType(docuemntCategoryDto) { return this.httpClient.post( - this.BASE_URL + + this.BASE_URL + this.PRE_REG_URL + '/proxy' + appConstants.APPEND_URL.applicantType + appConstants.APPEND_URL.getApplicantType, docuemntCategoryDto @@ -389,7 +403,7 @@ export class DataStorageService { getDocumentCategories(applicantCode) { const APPLICANT_VALID_DOCUMENTS_URL = - this.BASE_URL + + this.BASE_URL + this.PRE_REG_URL + '/proxy' + appConstants.APPEND_URL.location + appConstants.APPEND_URL.validDocument + applicantCode + @@ -412,8 +426,9 @@ export class DataStorageService { return this.httpClient.get(url); } - sendOtp(userId: string) { + sendOtp(userId: string,langCode: string) { const req = { + langCode: langCode, userId: userId, }; @@ -423,7 +438,7 @@ export class DataStorageService { this.BASE_URL + this.PRE_REG_URL + appConstants.APPEND_URL.auth + - appConstants.APPEND_URL.send_otp; + appConstants.APPEND_URL.send_otp + "/" + "langcode"; return this.httpClient.post(url, obj); } @@ -453,7 +468,7 @@ export class DataStorageService { */ getWorkingDays(registartionCenterId: string, langCode: string) { const url = - this.BASE_URL + + this.BASE_URL + this.PRE_REG_URL + '/proxy' + appConstants.APPEND_URL.master_data + "workingdays/" + registartionCenterId + @@ -486,14 +501,14 @@ export class DataStorageService { } getIdentityJson() { - const url =this.BASE_URL + this.PRE_REG_URL+ 'applications/config'; - // const url = "assets/identity-spec.json"; + const url =this.BASE_URL + this.PRE_REG_URL+ 'applications/config'; + //const url = "assets/identity-spec.json"; return this.httpClient.get(url); } getRegistrationCentersById(regCenterId, langCode: string) { return this.httpClient.get( - this.BASE_URL + + this.BASE_URL + this.PRE_REG_URL + '/proxy' + appConstants.APPEND_URL.master_data + appConstants.APPEND_URL.registration_centers_by_name + regCenterId + @@ -514,8 +529,19 @@ export class DataStorageService { getDynamicFieldsandValues(langCode) { // const url =this.BASE_URL + this.PRE_REG_URL+ 'applications/config'; - const url = this.BASE_URL + appConstants.APPEND_URL.master_data + `dynamicfields?langCode=${langCode}`; + const url = + this.BASE_URL + this.PRE_REG_URL + '/proxy' + + appConstants.APPEND_URL.master_data + + `dynamicfields?langCode=${langCode}`; console.log(url); return this.httpClient.get(url); } + + updateDocRefId(fileDocumentId, preId, docRefId) { + const url = `${this.BASE_URL}${this.PRE_REG_URL}` + + `${appConstants.APPEND_URL.updateDocRefId}${fileDocumentId}` + + `?${appConstants.PARAMS_KEYS.preRegistrationId}=${preId}`+ + `&${appConstants.PARAMS_KEYS.docRefId}=${docRefId}`; + return this.httpClient.put(url, {}); + } } diff --git a/pre-registration-ui/src/app/feature/booking/center-selection/center-selection.component.ts b/pre-registration-ui/src/app/feature/booking/center-selection/center-selection.component.ts index 51cef5a9122..427053130c9 100644 --- a/pre-registration-ui/src/app/feature/booking/center-selection/center-selection.component.ts +++ b/pre-registration-ui/src/app/feature/booking/center-selection/center-selection.component.ts @@ -14,13 +14,15 @@ import * as appConstants from "./../../../app.constants"; import { BookingDeactivateGuardService } from "src/app/shared/can-deactivate-guard/booking-guard/booking-deactivate-guard.service"; import LanguageFactory from "src/assets/i18n"; import { Subscription } from "rxjs"; +import { resolve } from "url"; @Component({ selector: "app-center-selection", templateUrl: "./center-selection.component.html", styleUrls: ["./center-selection.component.css"], }) -export class CenterSelectionComponent extends BookingDeactivateGuardService +export class CenterSelectionComponent + extends BookingDeactivateGuardService implements OnInit, OnDestroy { REGISTRATION_CENTRES: RegistrationCentre[] = []; searchClick: boolean = true; @@ -47,7 +49,8 @@ export class CenterSelectionComponent extends BookingDeactivateGuardService primaryLang = localStorage.getItem("langCode"); workingDays: string; preRegId = []; - + locationNames = []; + locationCodes = []; constructor( public dialog: MatDialog, private service: BookingService, @@ -64,9 +67,7 @@ export class CenterSelectionComponent extends BookingDeactivateGuardService async ngOnInit() { if (this.router.url.includes("multiappointment")) { - this.preRegId = [ - ...JSON.parse(localStorage.getItem("multiappointment")), - ]; + this.preRegId = [...JSON.parse(localStorage.getItem("multiappointment"))]; } else { this.activatedRoute.params.subscribe((param) => { this.preRegId = [param["appId"]]; @@ -75,13 +76,8 @@ export class CenterSelectionComponent extends BookingDeactivateGuardService await this.getUserInfo(this.preRegId); this.REGISTRATION_CENTRES = []; this.selectedCentre = null; - const subs = this.dataService - .getLocationTypeData() - .subscribe((response) => { - this.locationTypes = response[appConstants.RESPONSE]["locations"]; - }); - this.subscriptions.push(subs); - console.log(this.users); + await this.getLocationLevels(); + console.log(this.locationTypes); this.getRecommendedCenters(); this.getErrorLabels(); } @@ -111,6 +107,14 @@ export class CenterSelectionComponent extends BookingDeactivateGuardService }); }); } + getLocationLevels() { + return new Promise((resolve) => { + this.dataService.getLocationTypeData().subscribe((response) => { + this.locationTypes = response[appConstants.RESPONSE]["locations"]; + resolve(true); + }); + }); + } getErrorLabels() { let factory = new LanguageFactory(this.primaryLang); @@ -118,12 +122,52 @@ export class CenterSelectionComponent extends BookingDeactivateGuardService this.errorlabels = response["error"]; } - getRecommendedCenters() { + async getRecommendedCenters() { console.log(this.users.length); - let pincodes = []; + const locationHierarchy = JSON.parse( + localStorage.getItem("locationHierarchy") + ); + const locationHierarchyLevel = this.configService.getConfigByKey( + appConstants.CONFIG_KEYS.preregistration_recommended_centers_locCode + ); + let minusValue = this.locationTypes.length - locationHierarchy.length; + console.log(minusValue); + const locationType = locationHierarchy[Number(locationHierarchyLevel) - minusValue]; + console.log(locationHierarchy); + console.log(locationHierarchyLevel + ">>>>" + locationType); this.users.forEach((user) => { - pincodes.push(user.request.demographicDetails.identity.postalCode); + if ( + typeof user.request.demographicDetails.identity[locationType] === + "object" + ) { + this.locationCodes.push( + user.request.demographicDetails.identity[locationType][0].value + ); + } else if ( + typeof user.request.demographicDetails.identity[locationType] === + "string" + ) { + this.locationCodes.push( + user.request.demographicDetails.identity[locationType] + ); + } + }); + await this.getLocationNamesByCodes(); + this.getRecommendedCentersApiCall(); + } + + getLocationNamesByCodes() { + return new Promise((resolve) => { + this.locationCodes.forEach(async (pins,index) => { + await this.getLocationNames(pins); + if(index===this.locationCodes.length-1){ + resolve(true); + } + }); }); + } + + getRecommendedCentersApiCall() { this.REGISTRATION_CENTRES = []; const subs = this.dataService .recommendedCenters( @@ -131,7 +175,7 @@ export class CenterSelectionComponent extends BookingDeactivateGuardService this.configService.getConfigByKey( appConstants.CONFIG_KEYS.preregistration_recommended_centers_locCode ), - pincodes + this.locationNames ) .subscribe((response) => { if (response[appConstants.RESPONSE]) { @@ -147,6 +191,26 @@ export class CenterSelectionComponent extends BookingDeactivateGuardService this.subscriptions.push(subs); } + + getLocationNames(locationCode) { + return new Promise((resolve) => { + this.dataService + .getLocationOnLocationCodeAndLangCode(locationCode, this.primaryLang) + .subscribe((response) => { + console.log(response[appConstants.RESPONSE]); + if (response[appConstants.RESPONSE]) { + console.log( + response[appConstants.RESPONSE]["locations"][0]["name"] + ); + this.locationNames.push( + response[appConstants.RESPONSE]["locations"][0]["name"] + ); + resolve(true); + } + }); + }); + } + setSearchClick(flag: boolean) { this.searchClick = flag; } @@ -249,9 +313,15 @@ export class CenterSelectionComponent extends BookingDeactivateGuardService changeTimeFormat(time: string): string | Number { let inputTime = time.split(":"); let formattedTime: any; - if (Number(inputTime[0]) < 12) { + if (Number(inputTime[0]) < 12 && Number(inputTime[0]) > 0) { formattedTime = inputTime[0]; formattedTime += ":" + inputTime[1] + " am"; + } else if (Number(inputTime[0]) === 0) { + formattedTime = Number(inputTime[0]) + 12; + formattedTime += ":" + inputTime[1] + " am"; + } else if (Number(inputTime[0]) === 12) { + formattedTime = inputTime[0]; + formattedTime += ":" + inputTime[1] + " pm"; } else { formattedTime = Number(inputTime[0]) - 12; formattedTime += ":" + inputTime[1] + " pm"; @@ -358,10 +428,11 @@ export class CenterSelectionComponent extends BookingDeactivateGuardService ) { this.routeDashboard(); } else { - localStorage.setItem("modifyUser","true"); - this.router.navigate([`${this.primaryLang}/pre-registration/demographic/${this.preRegId[0]}`]); + localStorage.setItem("modifyUser", "true"); + this.router.navigate([ + `${this.primaryLang}/pre-registration/demographic/${this.preRegId[0]}`, + ]); } - } }); } diff --git a/pre-registration-ui/src/app/feature/dashboard/dashboard/dashboard.component.ts b/pre-registration-ui/src/app/feature/dashboard/dashboard/dashboard.component.ts index 88aa3877c21..d32dab605d4 100644 --- a/pre-registration-ui/src/app/feature/dashboard/dashboard/dashboard.component.ts +++ b/pre-registration-ui/src/app/feature/dashboard/dashboard/dashboard.component.ts @@ -1,27 +1,27 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; - -import { Router } from '@angular/router'; -import { MatDialog, MatCheckboxChange } from '@angular/material'; - -import { TranslateService } from '@ngx-translate/core'; -import { DataStorageService } from 'src/app/core/services/data-storage.service'; -import { RegistrationService } from 'src/app/core/services/registration.service'; -import { BookingService } from '../../booking/booking.service'; -import { AutoLogoutService } from 'src/app/core/services/auto-logout.service'; - -import { DialougComponent } from 'src/app/shared/dialoug/dialoug.component'; - -import { FileModel } from 'src/app/shared/models/demographic-model/file.model'; -import { Applicant } from 'src/app/shared/models/dashboard-model/dashboard.modal'; -import * as appConstants from '../../../app.constants'; -import Utils from 'src/app/app.util'; -import { ConfigService } from 'src/app/core/services/config.service'; -import { RequestModel } from 'src/app/shared/models/request-model/RequestModel'; -import { FilesModel } from 'src/app/shared/models/demographic-model/files.model'; -import { LogService } from 'src/app/shared/logger/log.service'; -import LanguageFactory from 'src/assets/i18n'; -import { Subscription } from 'rxjs'; -import { NotificationDtoModel } from 'src/app/shared/models/notification-model/notification-dto.model'; +import { Component, OnInit, OnDestroy } from "@angular/core"; + +import { Router } from "@angular/router"; +import { MatDialog, MatCheckboxChange } from "@angular/material"; + +import { TranslateService } from "@ngx-translate/core"; +import { DataStorageService } from "src/app/core/services/data-storage.service"; +import { RegistrationService } from "src/app/core/services/registration.service"; +import { BookingService } from "../../booking/booking.service"; +import { AutoLogoutService } from "src/app/core/services/auto-logout.service"; + +import { DialougComponent } from "src/app/shared/dialoug/dialoug.component"; + +import { FileModel } from "src/app/shared/models/demographic-model/file.model"; +import { Applicant } from "src/app/shared/models/dashboard-model/dashboard.modal"; +import * as appConstants from "../../../app.constants"; +import Utils from "src/app/app.util"; +import { ConfigService } from "src/app/core/services/config.service"; +import { RequestModel } from "src/app/shared/models/request-model/RequestModel"; +import { FilesModel } from "src/app/shared/models/demographic-model/files.model"; +import { LogService } from "src/app/shared/logger/log.service"; +import LanguageFactory from "src/assets/i18n"; +import { Subscription } from "rxjs"; +import { NotificationDtoModel } from "src/app/shared/models/notification-model/notification-dto.model"; /** * @description This is the dashbaord component which displays all the users linked to the login id @@ -34,20 +34,20 @@ import { NotificationDtoModel } from 'src/app/shared/models/notification-model/n * @implements {OnDestroy} */ @Component({ - selector: 'app-registration', - templateUrl: './dashboard.component.html', - styleUrls: ['./dashboard.component.css'] + selector: "app-registration", + templateUrl: "./dashboard.component.html", + styleUrls: ["./dashboard.component.css"], }) export class DashBoardComponent implements OnInit, OnDestroy { userFile: FileModel[] = []; file: FileModel = new FileModel(); userFiles: FilesModel = new FilesModel(this.userFile); - loginId = ''; + loginId = ""; message = {}; - primaryLangCode = localStorage.getItem('langCode'); - secondaryLangCode = localStorage.getItem('secondaryLangCode'); - textDir = localStorage.getItem('dir'); + primaryLangCode = localStorage.getItem("langCode"); + secondaryLangCode = localStorage.getItem("secondaryLangCode"); + textDir = localStorage.getItem("dir"); secondaryLanguagelabels: any; errorLanguagelabels: any; disableModifyDataButton = false; @@ -59,10 +59,12 @@ export class DashBoardComponent implements OnInit, OnDestroy { allApplicants: any[]; users: Applicant[] = []; selectedUsers = []; - titleOnError = ''; + titleOnError = ""; subscriptions: Subscription[] = []; - name = ''; + name = ""; + identityData: any; + locationHeirarchies: any[]; /** * @description Creates an instance of DashBoardComponent. @@ -88,7 +90,7 @@ export class DashBoardComponent implements OnInit, OnDestroy { private loggerService: LogService // private errorService: ErrorService ) { this.translate.use(this.primaryLangCode); - localStorage.setItem('modifyDocument', 'false'); + localStorage.setItem("modifyDocument", "false"); localStorage.removeItem("addingUserFromPreview"); localStorage.removeItem("muiltyAppointment"); localStorage.removeItem("modifyMultipleAppointment"); @@ -100,11 +102,13 @@ export class DashBoardComponent implements OnInit, OnDestroy { * @memberof DashBoardComponent */ ngOnInit() { - this.loginId = localStorage.getItem('loginId'); + this.loginId = localStorage.getItem("loginId"); this.initUsers(); - const subs = this.autoLogout.currentMessageAutoLogout.subscribe(message => (this.message = message)); + const subs = this.autoLogout.currentMessageAutoLogout.subscribe( + (message) => (this.message = message) + ); this.subscriptions.push(subs); - if (!this.message['timerFired']) { + if (!this.message["timerFired"]) { this.autoLogout.getValues(this.primaryLangCode); this.autoLogout.setValues(); this.autoLogout.keepWatching(); @@ -114,11 +118,33 @@ export class DashBoardComponent implements OnInit, OnDestroy { } let factory = new LanguageFactory(this.primaryLangCode); let response = factory.getCurrentlanguage(); - this.secondaryLanguagelabels = response['dashboard'].discard; - this.regService.setSameAs(''); + this.secondaryLanguagelabels = response["dashboard"].discard; + this.regService.setSameAs(""); this.name = this.configService.getConfigByKey( appConstants.CONFIG_KEYS.preregistartion_identity_name ); + this.getIdentityJsonFormat(); + } + + getIdentityJsonFormat() { + this.dataStorageService.getIdentityJson().subscribe((response) => { + console.log(response); + // this.identityData = response["identity"]; + // this.locationHeirarchy = [...response["locationHierarchy"]]; + this.identityData = response["response"]["idSchema"]["identity"]; + let locationHeirarchiesFromJson = [ + ...response["response"]["idSchema"]["locationHierarchy"], + ]; + if (Array.isArray(locationHeirarchiesFromJson[0])) { + this.locationHeirarchies = locationHeirarchiesFromJson; + } else { + let hierarchiesArray = []; + hierarchiesArray.push(locationHeirarchiesFromJson); + this.locationHeirarchies = hierarchiesArray; + } + console.log(this.locationHeirarchies); + localStorage.setItem("locationHierarchy",JSON.stringify(this.locationHeirarchies[0])); + }); } /** @@ -138,29 +164,41 @@ export class DashBoardComponent implements OnInit, OnDestroy { getUsers() { const sub = this.dataStorageService.getUsers(this.loginId).subscribe( (applicants: any) => { - this.loggerService.info('applicants in dashboard', applicants); + this.loggerService.info("applicants in dashboard", applicants); if ( applicants[appConstants.NESTED_ERROR] && applicants[appConstants.NESTED_ERROR][0][appConstants.ERROR_CODE] === appConstants.ERROR_CODES.noApplicantEnrolled ) { - localStorage.setItem('newApplicant', 'true'); + localStorage.setItem("newApplicant", "true"); this.onNewApplication(); return; } - if (applicants[appConstants.RESPONSE] && applicants[appConstants.RESPONSE] !== null) { - localStorage.setItem('newApplicant', 'false'); + if ( + applicants[appConstants.RESPONSE] && + applicants[appConstants.RESPONSE] !== null + ) { + localStorage.setItem("newApplicant", "false"); this.allApplicants = - applicants[appConstants.RESPONSE][appConstants.DASHBOARD_RESPONSE_KEYS.applicant.basicDetails]; + applicants[appConstants.RESPONSE][ + appConstants.DASHBOARD_RESPONSE_KEYS.applicant.basicDetails + ]; for ( let index = 0; index < - applicants[appConstants.RESPONSE][appConstants.DASHBOARD_RESPONSE_KEYS.applicant.basicDetails].length; + applicants[appConstants.RESPONSE][ + appConstants.DASHBOARD_RESPONSE_KEYS.applicant.basicDetails + ].length; index++ ) { - localStorage.setItem('noOfApplicant',applicants[appConstants.RESPONSE][appConstants.DASHBOARD_RESPONSE_KEYS.applicant.basicDetails].length); + localStorage.setItem( + "noOfApplicant", + applicants[appConstants.RESPONSE][ + appConstants.DASHBOARD_RESPONSE_KEYS.applicant.basicDetails + ].length + ); const applicant = this.createApplicant(applicants, index); this.users.push(applicant); } @@ -168,8 +206,8 @@ export class DashBoardComponent implements OnInit, OnDestroy { this.onError(); } }, - error => { - this.loggerService.error('dashboard', error); + (error) => { + this.loggerService.error("dashboard", error); this.onError(); this.isFetched = true; }, @@ -189,11 +227,24 @@ export class DashBoardComponent implements OnInit, OnDestroy { * @memberof DashBoardComponent */ private createAppointmentDateTime(applicant: any) { - const bookingRegistrationDTO = applicant[appConstants.DASHBOARD_RESPONSE_KEYS.bookingRegistrationDTO.dto]; - const date = bookingRegistrationDTO[appConstants.DASHBOARD_RESPONSE_KEYS.bookingRegistrationDTO.regDate]; - const fromTime = bookingRegistrationDTO[appConstants.DASHBOARD_RESPONSE_KEYS.bookingRegistrationDTO.time_slot_from]; - const toTime = bookingRegistrationDTO[appConstants.DASHBOARD_RESPONSE_KEYS.bookingRegistrationDTO.time_slot_to]; - let appointmentDateTime = date + ' ( ' + fromTime + ' - ' + toTime + ' )'; + const bookingRegistrationDTO = + applicant[ + appConstants.DASHBOARD_RESPONSE_KEYS.bookingRegistrationDTO.dto + ]; + const date = + bookingRegistrationDTO[ + appConstants.DASHBOARD_RESPONSE_KEYS.bookingRegistrationDTO.regDate + ]; + const fromTime = + bookingRegistrationDTO[ + appConstants.DASHBOARD_RESPONSE_KEYS.bookingRegistrationDTO + .time_slot_from + ]; + const toTime = + bookingRegistrationDTO[ + appConstants.DASHBOARD_RESPONSE_KEYS.bookingRegistrationDTO.time_slot_to + ]; + let appointmentDateTime = date + " ( " + fromTime + " - " + toTime + " )"; return appointmentDateTime; } @@ -206,10 +257,15 @@ export class DashBoardComponent implements OnInit, OnDestroy { * @memberof DashBoardComponent */ private createAppointmentDate(applicant: any) { - const bookingRegistrationDTO = applicant[appConstants.DASHBOARD_RESPONSE_KEYS.bookingRegistrationDTO.dto]; + const bookingRegistrationDTO = + applicant[ + appConstants.DASHBOARD_RESPONSE_KEYS.bookingRegistrationDTO.dto + ]; const date = Utils.getBookingDateTime( - bookingRegistrationDTO[appConstants.DASHBOARD_RESPONSE_KEYS.bookingRegistrationDTO.regDate], - '', + bookingRegistrationDTO[ + appConstants.DASHBOARD_RESPONSE_KEYS.bookingRegistrationDTO.regDate + ], + "", this.primaryLangCode ); let appointmentDate = date; @@ -225,10 +281,20 @@ export class DashBoardComponent implements OnInit, OnDestroy { * @memberof DashBoardComponent */ private createAppointmentTime(applicant: any) { - const bookingRegistrationDTO = applicant[appConstants.DASHBOARD_RESPONSE_KEYS.bookingRegistrationDTO.dto]; - const fromTime = bookingRegistrationDTO[appConstants.DASHBOARD_RESPONSE_KEYS.bookingRegistrationDTO.time_slot_from]; - const toTime = bookingRegistrationDTO[appConstants.DASHBOARD_RESPONSE_KEYS.bookingRegistrationDTO.time_slot_to]; - let appointmentTime = ' ( ' + fromTime + ' - ' + toTime + ' ) '; + const bookingRegistrationDTO = + applicant[ + appConstants.DASHBOARD_RESPONSE_KEYS.bookingRegistrationDTO.dto + ]; + const fromTime = + bookingRegistrationDTO[ + appConstants.DASHBOARD_RESPONSE_KEYS.bookingRegistrationDTO + .time_slot_from + ]; + const toTime = + bookingRegistrationDTO[ + appConstants.DASHBOARD_RESPONSE_KEYS.bookingRegistrationDTO.time_slot_to + ]; + let appointmentTime = " ( " + fromTime + " - " + toTime + " ) "; return appointmentTime; } @@ -242,13 +308,18 @@ export class DashBoardComponent implements OnInit, OnDestroy { */ createApplicant(applicants: any, index: number) { const applicantResponse = - applicants[appConstants.RESPONSE][appConstants.DASHBOARD_RESPONSE_KEYS.applicant.basicDetails][index]; - const demographicMetadata = applicantResponse[appConstants.DASHBOARD_RESPONSE_KEYS.applicant.demographicMetadata]; + applicants[appConstants.RESPONSE][ + appConstants.DASHBOARD_RESPONSE_KEYS.applicant.basicDetails + ][index]; + const demographicMetadata = + applicantResponse[ + appConstants.DASHBOARD_RESPONSE_KEYS.applicant.demographicMetadata + ]; let primaryIndex = 0; let secondaryIndex = 1; let lang = - applicantResponse['demographicMetadata'][this.name][0]['language']; + applicantResponse["demographicMetadata"][this.name][0]["language"]; if (lang !== this.primaryLangCode) { primaryIndex = 1; secondaryIndex = 0; @@ -258,27 +329,43 @@ export class DashBoardComponent implements OnInit, OnDestroy { secondaryIndex = 0; } const applicant: Applicant = { - applicationID: applicantResponse[appConstants.DASHBOARD_RESPONSE_KEYS.applicant.preId], + applicationID: + applicantResponse[appConstants.DASHBOARD_RESPONSE_KEYS.applicant.preId], name: - applicantResponse['demographicMetadata'][this.name][primaryIndex][ - 'value' + applicantResponse["demographicMetadata"][this.name][primaryIndex][ + "value" ], - appointmentDateTime: applicantResponse[appConstants.DASHBOARD_RESPONSE_KEYS.bookingRegistrationDTO.dto] + appointmentDateTime: applicantResponse[ + appConstants.DASHBOARD_RESPONSE_KEYS.bookingRegistrationDTO.dto + ] ? this.createAppointmentDateTime(applicantResponse) - : '-', - appointmentDate: applicantResponse[appConstants.DASHBOARD_RESPONSE_KEYS.bookingRegistrationDTO.dto] + : "-", + appointmentDate: applicantResponse[ + appConstants.DASHBOARD_RESPONSE_KEYS.bookingRegistrationDTO.dto + ] ? this.createAppointmentDate(applicantResponse) - : '-', - appointmentTime: applicantResponse[appConstants.DASHBOARD_RESPONSE_KEYS.bookingRegistrationDTO.dto] + : "-", + appointmentTime: applicantResponse[ + appConstants.DASHBOARD_RESPONSE_KEYS.bookingRegistrationDTO.dto + ] ? this.createAppointmentTime(applicantResponse) - : '-', - status: applicantResponse[appConstants.DASHBOARD_RESPONSE_KEYS.applicant.statusCode], - regDto: applicantResponse[appConstants.DASHBOARD_RESPONSE_KEYS.bookingRegistrationDTO.dto], + : "-", + status: + applicantResponse[ + appConstants.DASHBOARD_RESPONSE_KEYS.applicant.statusCode + ], + regDto: + applicantResponse[ + appConstants.DASHBOARD_RESPONSE_KEYS.bookingRegistrationDTO.dto + ], nameInSecondaryLanguage: - applicantResponse['demographicMetadata'][this.name][ - secondaryIndex - ]['value'], - postalCode: applicantResponse['demographicMetadata'][appConstants.DASHBOARD_RESPONSE_KEYS.applicant.postalCode] + applicantResponse["demographicMetadata"][this.name][secondaryIndex][ + "value" + ], + postalCode: + applicantResponse["demographicMetadata"][ + appConstants.DASHBOARD_RESPONSE_KEYS.applicant.postalCode + ], }; return applicant; @@ -290,13 +377,15 @@ export class DashBoardComponent implements OnInit, OnDestroy { * @memberof DashBoardComponent */ onNewApplication() { - localStorage.setItem('modifyUser','false'); - localStorage.setItem('newApplicant','true'); + localStorage.setItem("modifyUser", "false"); + localStorage.setItem("newApplicant", "true"); if (this.loginId) { - this.router.navigateByUrl(`${this.primaryLangCode}/pre-registration/demographic/new`); + this.router.navigateByUrl( + `${this.primaryLangCode}/pre-registration/demographic/new` + ); this.isNewApplication = true; } else { - this.router.navigate(['/']); + this.router.navigate(["/"]); } } @@ -304,28 +393,28 @@ export class DashBoardComponent implements OnInit, OnDestroy { const dialogRef = this.dialog.open(DialougComponent, { width: width, data: data, - restoreFocus: false + restoreFocus: false, }); return dialogRef; } radioButtonsStatus(status: string) { let data = {}; - if (status.toLowerCase() === 'booked') { + if (status.toLowerCase() === "booked") { data = { - case: 'DISCARD', + case: "DISCARD", disabled: { radioButton1: false, - radioButton2: false - } + radioButton2: false, + }, }; } else { data = { - case: 'DISCARD', + case: "DISCARD", disabled: { radioButton1: false, - radioButton2: true - } + radioButton2: true, + }, }; } return data; @@ -335,22 +424,22 @@ export class DashBoardComponent implements OnInit, OnDestroy { let body = {}; if (Number(selectedOption) === 1) { body = { - case: 'CONFIRMATION', + case: "CONFIRMATION", title: this.secondaryLanguagelabels.title_confirm, message: this.secondaryLanguagelabels.deletePreregistration.msg_confirm, yesButtonText: this.secondaryLanguagelabels.button_confirm, - noButtonText: this.secondaryLanguagelabels.button_cancel + noButtonText: this.secondaryLanguagelabels.button_cancel, }; } else { body = { - case: 'CONFIRMATION', + case: "CONFIRMATION", title: this.secondaryLanguagelabels.title_confirm, message: this.secondaryLanguagelabels.cancelAppointment.msg_confirm, yesButtonText: this.secondaryLanguagelabels.button_confirm, - noButtonText: this.secondaryLanguagelabels.button_cancel + noButtonText: this.secondaryLanguagelabels.button_cancel, }; } - const dialogRef = this.openDialog(body, '250px'); + const dialogRef = this.openDialog(body, "250px"); return dialogRef; } @@ -366,64 +455,73 @@ export class DashBoardComponent implements OnInit, OnDestroy { } deletePreregistration(element: any) { - const subs = this.dataStorageService.deleteRegistration(element.applicationID).subscribe( - response => { - if (!response['errors']) { - this.removeApplicant(element.applicationID); - let index = this.users.indexOf(element); - this.users.splice(index, 1); - index = this.selectedUsers.indexOf(element); - this.selectedUsers.splice(index, 1); - if (this.users.length == 0) { - localStorage.setItem('noOfApplicant','0'); - this.onNewApplication(); - localStorage.setItem('newApplicant', 'true'); + const subs = this.dataStorageService + .deleteRegistration(element.applicationID) + .subscribe( + (response) => { + if (!response["errors"]) { + this.removeApplicant(element.applicationID); + let index = this.users.indexOf(element); + this.users.splice(index, 1); + index = this.selectedUsers.indexOf(element); + this.selectedUsers.splice(index, 1); + if (this.users.length == 0) { + localStorage.setItem("noOfApplicant", "0"); + this.onNewApplication(); + localStorage.setItem("newApplicant", "true"); + } else { + this.displayMessage( + this.secondaryLanguagelabels.title_success, + this.secondaryLanguagelabels.deletePreregistration.msg_deleted + ); + } } else { this.displayMessage( - this.secondaryLanguagelabels.title_success, - this.secondaryLanguagelabels.deletePreregistration.msg_deleted + this.secondaryLanguagelabels.title_error, + this.secondaryLanguagelabels.deletePreregistration + .msg_could_not_deleted ); } - } else { + }, + () => { this.displayMessage( this.secondaryLanguagelabels.title_error, - this.secondaryLanguagelabels.deletePreregistration.msg_could_not_deleted + this.secondaryLanguagelabels.deletePreregistration + .msg_could_not_deleted ); } - }, - () => { - this.displayMessage( - this.secondaryLanguagelabels.title_error, - this.secondaryLanguagelabels.deletePreregistration.msg_could_not_deleted - ); - } - ); + ); this.subscriptions.push(subs); } cancelAppointment(element: any) { const preRegId = element.applicationID; - const appointmentDate = element.appointmentDate - const appointmentDateTime = element.appointmentTime + const appointmentDate = element.appointmentDate; + const appointmentDateTime = element.appointmentTime; element.regDto.pre_registration_id = element.applicationID; const subs = this.dataStorageService - .cancelAppointment(new RequestModel(appConstants.IDS.booking, element.regDto), element.applicationID) + .cancelAppointment( + new RequestModel(appConstants.IDS.booking, element.regDto), + element.applicationID + ) .subscribe( - response => { - if (!response['errors']) { + (response) => { + if (!response["errors"]) { this.displayMessage( this.secondaryLanguagelabels.title_success, this.secondaryLanguagelabels.cancelAppointment.msg_deleted ); - // this.sendNotification(preRegId,appointmentDate,appointmentDateTime); + // this.sendNotification(preRegId,appointmentDate,appointmentDateTime); const index = this.users.indexOf(element); - this.users[index].status = appConstants.APPLICATION_STATUS_CODES.pending; - this.users[index].appointmentDate = '-'; - this.users[index].appointmentTime = ''; + this.users[index].status = + appConstants.APPLICATION_STATUS_CODES.pending; + this.users[index].appointmentDate = "-"; + this.users[index].appointmentTime = ""; } else { this.displayMessage( this.secondaryLanguagelabels.title_error, - this.secondaryLanguagelabels.cancelAppointment.msg_could_not_deleted + this.secondaryLanguagelabels.cancelAppointment + .msg_could_not_deleted ); } }, @@ -440,18 +538,18 @@ export class DashBoardComponent implements OnInit, OnDestroy { onDelete(element) { let data = this.radioButtonsStatus(element.status); let dialogRef = this.openDialog(data, `460px`); - const subs = dialogRef.afterClosed().subscribe(selectedOption => { + const subs = dialogRef.afterClosed().subscribe((selectedOption) => { if (selectedOption && Number(selectedOption) === 1) { dialogRef = this.confirmationDialog(selectedOption); - dialogRef.afterClosed().subscribe(confirm => { - if (confirm !== 'Cancel') { + dialogRef.afterClosed().subscribe((confirm) => { + if (confirm !== "Cancel") { this.deletePreregistration(element); } }); } else if (selectedOption && Number(selectedOption) === 2) { dialogRef = this.confirmationDialog(selectedOption); - dialogRef.afterClosed().subscribe(confirm => { - if (confirm !== 'Cancel') { + dialogRef.afterClosed().subscribe((confirm) => { + if (confirm !== "Cancel") { this.cancelAppointment(element); } }); @@ -462,11 +560,11 @@ export class DashBoardComponent implements OnInit, OnDestroy { displayMessage(title: string, message: string) { const messageObj = { - case: 'MESSAGE', + case: "MESSAGE", title: title, - message: message + message: message, }; - this.openDialog(messageObj, '250px'); + this.openDialog(messageObj, "250px"); } /** @@ -477,7 +575,7 @@ export class DashBoardComponent implements OnInit, OnDestroy { */ onModifyInformation(user: Applicant) { const preId = user.applicationID; - localStorage.setItem('modifyUser','true'); + localStorage.setItem("modifyUser", "true"); this.disableModifyDataButton = true; this.onModification(preId); // const subs = this.dataStorageService.getUserDocuments(preId).subscribe( @@ -512,7 +610,12 @@ export class DashBoardComponent implements OnInit, OnDestroy { private onModification(preId: string) { this.disableModifyDataButton = true; this.fetchedDetails = true; - this.router.navigate([this.primaryLangCode,'pre-registration', 'demographic',preId]); + this.router.navigate([ + this.primaryLangCode, + "pre-registration", + "demographic", + preId, + ]); } /** @@ -541,22 +644,29 @@ export class DashBoardComponent implements OnInit, OnDestroy { * @memberof DashBoardComponent */ onModifyMultipleAppointment() { - let url = ''; - localStorage.setItem("modifyMultipleAppointment","true"); - if(this.selectedUsers.length === 1){ - url = Utils.getURL(this.router.url, `pre-registration/booking/${this.selectedUsers[0].applicationID}/pick-center`,1); + let url = ""; + localStorage.setItem("modifyMultipleAppointment", "true"); + if (this.selectedUsers.length === 1) { + url = Utils.getURL( + this.router.url, + `pre-registration/booking/${this.selectedUsers[0].applicationID}/pick-center`, + 1 + ); this.router.navigateByUrl(url); } else { let selectedPrids = []; - this.selectedUsers.forEach(id =>{ - selectedPrids.push(id.applicationID); + this.selectedUsers.forEach((id) => { + selectedPrids.push(id.applicationID); }); console.log(selectedPrids); - localStorage.setItem("multiappointment",JSON.stringify(selectedPrids)); - url = Utils.getURL(this.router.url, `pre-registration/booking/multiappointment/pick-center`,1); + localStorage.setItem("multiappointment", JSON.stringify(selectedPrids)); + url = Utils.getURL( + this.router.url, + `pre-registration/booking/multiappointment/pick-center`, + 1 + ); this.router.navigateByUrl(url); } - } /** @@ -567,41 +677,51 @@ export class DashBoardComponent implements OnInit, OnDestroy { */ onAcknowledgementView(user: Applicant) { console.log(user); - let url = ''; - url = Utils.getURL(this.router.url, `pre-registration/summary/${user.applicationID}/acknowledgement`,1); + let url = ""; + url = Utils.getURL( + this.router.url, + `pre-registration/summary/${user.applicationID}/acknowledgement`, + 1 + ); this.router.navigateByUrl(url); } setUserFiles(response) { - if (!response['errors']) { + if (!response["errors"]) { this.userFile = response[appConstants.RESPONSE][appConstants.METADATA]; } else { - let fileModel: FileModel = new FileModel('', '', '', '', '', '', ''); + let fileModel: FileModel = new FileModel("", "", "", "", "", "", ""); this.userFile.push(fileModel); } - this.userFiles['documentsMetaData'] = this.userFile; + this.userFiles["documentsMetaData"] = this.userFile; } getColor(value: string) { - if (value === appConstants.APPLICATION_STATUS_CODES.pending) return 'orange'; - if (value === appConstants.APPLICATION_STATUS_CODES.booked) return 'green'; - if (value === appConstants.APPLICATION_STATUS_CODES.expired) return 'red'; + if (value === appConstants.APPLICATION_STATUS_CODES.pending) + return "orange"; + if (value === appConstants.APPLICATION_STATUS_CODES.booked) return "green"; + if (value === appConstants.APPLICATION_STATUS_CODES.expired) return "red"; } getMargin(name: string) { - if (name.length > 25) return '0px'; - else return '27px'; + if (name.length > 25) return "0px"; + else return "27px"; } isBookingAllowed(user: Applicant) { - if (user.status == 'Expired') return false; + if (user.status == "Expired") return false; const dateform = new Date(user.appointmentDateTime); - if (dateform.toDateString() !== 'Invalid Date') { + if (dateform.toDateString() !== "Invalid Date") { let date1: string = user.appointmentDateTime; let date2: string = new Date(Date.now()).toString(); let diffInMs: number = Date.parse(date1) - Date.parse(date2); let diffInHours: number = diffInMs / 1000 / 60 / 60; - if (diffInHours < this.configService.getConfigByKey(appConstants.CONFIG_KEYS.preregistration_timespan_rebook)) + if ( + diffInHours < + this.configService.getConfigByKey( + appConstants.CONFIG_KEYS.preregistration_timespan_rebook + ) + ) return true; else return false; } @@ -618,7 +738,7 @@ export class DashBoardComponent implements OnInit, OnDestroy { private getErrorLabels() { let factory = new LanguageFactory(this.primaryLangCode); let response = factory.getCurrentlanguage(); - this.errorLanguagelabels = response['error']; + this.errorLanguagelabels = response["error"]; } /** @@ -629,38 +749,40 @@ export class DashBoardComponent implements OnInit, OnDestroy { */ private async onError(error?: any) { await this.getErrorLabels(); - let message = this.errorLanguagelabels.error;; + let message = this.errorLanguagelabels.error; this.titleOnError = this.errorLanguagelabels.errorLabel; if ( error && error[appConstants.ERROR] && - error[appConstants.ERROR][appConstants.NESTED_ERROR][0].errorCode === appConstants.ERROR_CODES.tokenExpired + error[appConstants.ERROR][appConstants.NESTED_ERROR][0].errorCode === + appConstants.ERROR_CODES.tokenExpired ) { message = this.errorLanguagelabels.tokenExpiredLogout; - this.titleOnError = ''; + this.titleOnError = ""; } if (this.errorLanguagelabels) { const body = { - case: 'ERROR', + case: "ERROR", title: this.titleOnError, message: message, - yesButtonText: this.errorLanguagelabels.button_ok + yesButtonText: this.errorLanguagelabels.button_ok, }; this.dialog.open(DialougComponent, { - width: '250px', - data: body + width: "250px", + data: body, }); } } - async sendNotification(prid,appDate,appDateTime) { + async sendNotification(prid, appDate, appDateTime) { let userDetails; - this.dataStorageService.getUser(prid).subscribe(response => { - if(response[appConstants.RESPONSE]){ - userDetails = response[appConstants.RESPONSE].demographicDetails.identity; + this.dataStorageService.getUser(prid).subscribe((response) => { + if (response[appConstants.RESPONSE]) { + userDetails = + response[appConstants.RESPONSE].demographicDetails.identity; console.log(userDetails); const notificationDto = new NotificationDtoModel( - userDetails['fullName'][0].value, + userDetails["fullName"][0].value, prid, appDate, appDateTime, @@ -670,18 +792,29 @@ export class DashBoardComponent implements OnInit, OnDestroy { true ); console.log(notificationDto); - const model = new RequestModel(appConstants.IDS.notification, notificationDto); - let notificationRequest = new FormData(); - notificationRequest.append(appConstants.notificationDtoKeys.notificationDto, JSON.stringify(model).trim()); - notificationRequest.append(appConstants.notificationDtoKeys.langCode, localStorage.getItem('langCode')); - const subs = this.dataStorageService.sendNotification(notificationRequest).subscribe(response => { - console.log(response); - }); + const model = new RequestModel( + appConstants.IDS.notification, + notificationDto + ); + let notificationRequest = new FormData(); + notificationRequest.append( + appConstants.notificationDtoKeys.notificationDto, + JSON.stringify(model).trim() + ); + notificationRequest.append( + appConstants.notificationDtoKeys.langCode, + localStorage.getItem("langCode") + ); + const subs = this.dataStorageService + .sendNotification(notificationRequest) + .subscribe((response) => { + console.log(response); + }); } }); - } + } ngOnDestroy(): void { - this.subscriptions.forEach(subscription => subscription.unsubscribe()); + this.subscriptions.forEach((subscription) => subscription.unsubscribe()); } -} \ No newline at end of file +} diff --git a/pre-registration-ui/src/app/feature/demographic/demographic/demographic.component.css b/pre-registration-ui/src/app/feature/demographic/demographic/demographic.component.css index fe0f271d337..0478fdde9f9 100644 --- a/pre-registration-ui/src/app/feature/demographic/demographic/demographic.component.css +++ b/pre-registration-ui/src/app/feature/demographic/demographic/demographic.component.css @@ -327,6 +327,11 @@ mat-icon { border-bottom: 2px solid #22a8c9; } +.required-annotation{ + color: red; + margin-left: 3px; +} + @media (max-width: 798px) { .user__container { width: 100%; diff --git a/pre-registration-ui/src/app/feature/demographic/demographic/demographic.component.html b/pre-registration-ui/src/app/feature/demographic/demographic/demographic.component.html index 9870cda1fc2..c49b66e1bfa 100644 --- a/pre-registration-ui/src/app/feature/demographic/demographic/demographic.component.html +++ b/pre-registration-ui/src/app/feature/demographic/demographic/demographic.component.html @@ -17,12 +17,19 @@

    {{ "demographic.language" | translate }}

    - + - {{ field.labelName[primaryLang] }} + {{ field.labelName[primaryLang] }} + * + {{ "demographic.language" | translate }} /> - + - {{ field.labelName[primaryLang] }} + {{ field.labelName[primaryLang] + }}* {{ dropdown.valueName }} - +
    - {{ field.labelName[primaryLang] }} + {{ field.labelName[primaryLang] }} + * +
    @@ -98,6 +116,7 @@

    {{ "demographic.language" | translate }}

    placeholder="{{ 'demographic.date_dd' | translate }}" #dd [value]="date" + (change)="showHideFormFields()" (focusout)="onDOBChange()" />     @@ -108,6 +127,7 @@

    {{ "demographic.language" | translate }}

    [value]="month" #mm (focusout)="onDOBChange()" + (change)="showHideFormFields()" /> @@ -117,6 +137,7 @@

    {{ "demographic.language" | translate }}

    [value]="year" #yyyy (focusout)="onDOBChange()" + (change)="showHideFormFields()" />
    @@ -131,6 +152,7 @@

    {{ "demographic.language" | translate }}

    placeholder="{{ 'demographic.label_age' | translate }}" [value]="currentAge" #age + (change)="showHideFormFields()" (focusout)="onAgeChange()" /> @@ -186,9 +208,14 @@

    {{ "demographic.language" | translate }}

    {{ secondaryLanguagelabels.language }}

    - + - {{ field.labelName[secondaryLang] }} + {{ field.labelName[secondaryLang] }} + * {{ secondaryLanguagelabels.language }} /> - + - {{ field.labelName[secondaryLang] }} + {{ field.labelName[secondaryLang] }} + * {{ secondaryLanguagelabels.language }} - +
    - {{ field.labelName[secondaryLang] }} + {{ field.labelName[secondaryLang] + }}* +
    diff --git a/pre-registration-ui/src/app/feature/demographic/demographic/demographic.component.ts b/pre-registration-ui/src/app/feature/demographic/demographic/demographic.component.ts index 5ae7988e457..dac1e3968ef 100644 --- a/pre-registration-ui/src/app/feature/demographic/demographic/demographic.component.ts +++ b/pre-registration-ui/src/app/feature/demographic/demographic/demographic.component.ts @@ -38,7 +38,9 @@ import LanguageFactory from "src/assets/i18n"; import { FormDeactivateGuardService } from "src/app/shared/can-deactivate-guard/form-guard/form-deactivate-guard.service"; import { Subscription } from "rxjs"; import { ValueConverter } from "@angular/compiler/src/render3/view/template"; - +import { Engine, Rule } from 'json-rules-engine'; +import moment from 'moment'; +import identityStubJson from "../../../../assets/identity-spec.json"; /** * @description This component takes care of the demographic page. * @author Shashank Agrawal @@ -65,7 +67,7 @@ export class DemographicComponent keyboardSecondaryLang = appConstants.virtual_keyboard_languages[this.secondaryLang]; - files: FilesModel; + files: FilesModel; agePattern: string; MOBILE_PATTERN: string; MOBILE_LENGTH: string; @@ -93,7 +95,7 @@ export class DemographicComponent hierarchyAvailable = true; isConsentMessage = false; isReadOnly = false; - + step: number = 0; id: number; oldAge: number; @@ -162,11 +164,12 @@ export class DemographicComponent identityData = []; uiFields = []; + jsonRulesEngine = new Engine(); primaryuserForm = false; primarydropDownFields = {}; secondaryDropDownLables = {}; secondaryuserForm = false; - locationHeirarchy = []; + locationHeirarchies = []; validationMessage: any; dynamicFields = []; dynamicFieldAndValues = []; @@ -221,8 +224,9 @@ export class DemographicComponent if (!this.dataModification) { if (this.isConsentMessage) this.consentDeclaration(); } + this.showHideFormFields(); } - + /** * @description This will return the json object of label of demographic in the primary language. @@ -341,14 +345,23 @@ export class DemographicComponent async getIdentityJsonFormat() { return new Promise((resolve, reject) => { this.dataStorageService.getIdentityJson().subscribe((response) => { + //response = identityStubJson; console.log(response); // this.identityData = response["identity"]; // this.locationHeirarchy = [...response["locationHierarchy"]]; this.identityData = response["response"]["idSchema"]["identity"]; - this.locationHeirarchy = [ + let locationHeirarchiesFromJson = [ ...response["response"]["idSchema"]["locationHierarchy"], ]; - console.log(this.locationHeirarchy); + if (Array.isArray(locationHeirarchiesFromJson[0])) { + this.locationHeirarchies = locationHeirarchiesFromJson; + } else { + let hierarchiesArray = []; + hierarchiesArray.push(locationHeirarchiesFromJson); + this.locationHeirarchies = hierarchiesArray; + } + localStorage.setItem("locationHierarchy",JSON.stringify(this.locationHeirarchies[0])); + this.identityData.forEach((obj) => { if ( obj.inputRequired === true && @@ -360,7 +373,7 @@ export class DemographicComponent }); this.dynamicFields = this.uiFields.filter( (fields) => - fields.controlType === "dropdown" && fields.fieldType === "dynamic" + ((fields.controlType === "dropdown" || fields.controlType === "button" ) && fields.fieldType === "dynamic") ); console.log(this.dynamicFields); this.setDropDownArrays(); @@ -385,49 +398,51 @@ export class DemographicComponent if (this.primaryLang !== this.secondaryLang) { this.transUserForm.addControl(control.id, new FormControl("")); } - if (control.required) { - this.userForm.controls[`${control.id}`].setValidators( - Validators.required - ); + this.addValidators(control); + if (this.uiFields.length === index + 1) { + this.primaryuserForm = true; if (this.primaryLang !== this.secondaryLang) { - this.transUserForm.controls[`${control.id}`].setValidators( - Validators.required - ); + this.secondaryuserForm = true; } } - if (control.validators !== null && control.validators.length > 0) { - this.userForm.controls[`${control.id}`].setValidators([ + }); + } + + addValidators = (control: any) => { + if (control.required) { + this.userForm.controls[`${control.id}`].setValidators( + Validators.required + ); + if (this.primaryLang !== this.secondaryLang) { + this.transUserForm.controls[`${control.id}`].setValidators( + Validators.required + ); + } + } + if (control.validators !== null && control.validators.length > 0) { + this.userForm.controls[`${control.id}`].setValidators([ + Validators.pattern(control.validators[0].validator), + ]); + if (this.primaryLang !== this.secondaryLang) { + this.transUserForm.controls[`${control.id}`].setValidators([ Validators.pattern(control.validators[0].validator), ]); - if (this.primaryLang !== this.secondaryLang) { - this.transUserForm.controls[`${control.id}`].setValidators([ - Validators.pattern(control.validators[0].validator), - ]); - } } - if ( - control.required && - control.validators !== null && - control.validators.length > 0 - ) { - this.userForm.controls[`${control.id}`].setValidators([ + } + if (control.required && + control.validators !== null && + control.validators.length > 0) { + this.userForm.controls[`${control.id}`].setValidators([ + Validators.required, + Validators.pattern(control.validators[0].validator), + ]); + if (this.primaryLang !== this.secondaryLang) { + this.transUserForm.controls[`${control.id}`].setValidators([ Validators.required, Validators.pattern(control.validators[0].validator), ]); - if (this.primaryLang !== this.secondaryLang) { - this.transUserForm.controls[`${control.id}`].setValidators([ - Validators.required, - Validators.pattern(control.validators[0].validator), - ]); - } - } - if (this.uiFields.length === index + 1) { - this.primaryuserForm = true; - if (this.primaryLang !== this.secondaryLang) { - this.secondaryuserForm = true; - } } - }); + } } /** @@ -442,7 +457,7 @@ export class DemographicComponent */ getIntialDropDownArrays() { this.uiFields.forEach((control) => { - if (control.controlType === "dropdown") { + if (control.controlType === "dropdown" || control.controlType === "button") { this.primarydropDownFields[control.id] = []; if (this.primaryLang !== this.secondaryLang) { this.secondaryDropDownLables[control.id] = []; @@ -451,6 +466,32 @@ export class DemographicComponent }); } + isThisFieldInLocationHeirarchies = (fieldId) => { + let items = this.getLocationHierarchy(fieldId); + return items.length > 0 ? true: false; + } + + getIndexInLocationHeirarchy = (fieldId) => { + let items = this.getLocationHierarchy(fieldId); + return items.indexOf(fieldId); + } + + getLocationNameFromIndex = (fieldId, fieldIndex) => { + let items = this.getLocationHierarchy(fieldId); + return items[fieldIndex]; + } + + getLocationHierarchy = (fieldId) => { + let items = []; + this.locationHeirarchies.forEach(locationHeirarchy => { + let filteredItems = locationHeirarchy.filter(item => item == fieldId); + if (filteredItems.length > 0) { + items = locationHeirarchy; + } + }); + return items; + } + /** * @@ -460,12 +501,12 @@ export class DemographicComponent * ex: { id : 'region',controlType: 'dropdown' ...} */ dropdownApiCall(controlObject: any) { - if (this.locationHeirarchy.includes(controlObject.id)) { - if (this.locationHeirarchy.indexOf(controlObject.id) !== 0) { + if (this.isThisFieldInLocationHeirarchies(controlObject.id)) { + if (this.getIndexInLocationHeirarchy(controlObject.id) !== 0) { this.primarydropDownFields[controlObject.id] = []; - const location = this.locationHeirarchy.indexOf(controlObject.id); - const parentLocation = this.locationHeirarchy[location - 1]; - let locationCode = this.userForm.get(`${parentLocation}`).value; + const locationIndex = this.getIndexInLocationHeirarchy(controlObject.id); + const parentLocationName = this.getLocationNameFromIndex(controlObject.id, locationIndex - 1); + let locationCode = this.userForm.get(`${parentLocationName}`).value; this.loadLocationData(locationCode, controlObject.id); } } @@ -511,6 +552,140 @@ export class DemographicComponent } } + /** + * This function will reset the value of the hidden field in the form. + * @param uiField + */ + resetHiddenField = (uiField) => { + this.userForm.controls[uiField.id].reset(); + this.userForm.controls[uiField.id].setValue(""); + if (this.primaryLang !== this.secondaryLang){ + if (this.transUserForm && this.transUserForm.controls[`${uiField.id}`]) { + this.transUserForm.controls[`${uiField.id}`].reset(); + this.transUserForm.controls[`${uiField.id}`].setValue(""); + } + } + } + + /** + * This function looks for "visibleCondition" attribute for each field in UI Specs. + * Using "json-rules-engine", these conditions are evaluated + * and fields are shown/hidden in the UI form. + */ + showHideFormFields() { + console.log("showHideFormFields"); + //if (!this.dataModification || (this.dataModification && this.userForm.valid) ) { + //populate form data in json for json-rules-engine to evalatute the conditions + const identityFormData = this.createIdentityJSONDynamic(); + //for each uiField in UI specs, check of any "visibleCondition" is given + //if yes, then evaluate it with json-rules-engine + this.uiFields.forEach(uiField => { + //if no "visibleCondition" is given, then show the field + if (!uiField.visibleCondition || uiField.visibleCondition == "") { + uiField.isVisible = true; + } + else { + const resetHiddenFieldFunc = this.resetHiddenField; + let visibilityRule = new Rule({ + conditions: uiField.visibleCondition, + onSuccess() { + //in "visibleCondition" is statisfied then show the field + uiField.isVisible = true; + }, + onFailure() { + //in "visibleCondition" is not statisfied then hide the field + uiField.isVisible = false; + resetHiddenFieldFunc(uiField); + }, + event: { + type: "message", + params: { + data: "" + } + } + }); + this.jsonRulesEngine.addRule(visibilityRule); + //evaluate the visibleCondition + this.jsonRulesEngine + .run(identityFormData) + .then(results => { + results.events.map(event => console.log('jsonRulesEngine for visibleConditions run successfully', event.params.data)); + this.jsonRulesEngine.removeRule(visibilityRule); + }) + .catch((error) => { + console.log('err is', error); + this.jsonRulesEngine.removeRule(visibilityRule); + }); + } + }, this.resetHiddenField + ); + this.processConditionalRequiredValidations(identityFormData); + //} + } + + /** + * This function will reset the value of the hidden field in the form. + * @param uiField + */ + removeValidators = (uiField) => { + this.userForm.controls[`${uiField.id}`].clearValidators(); + this.userForm.controls[`${uiField.id}`].updateValueAndValidity(); + if (this.primaryLang !== this.secondaryLang) { + this.transUserForm.controls[`${uiField.id}`].clearValidators(); + this.transUserForm.controls[`${uiField.id}`].updateValueAndValidity(); + } + } + + /** + * This function looks for "requiredCondition" attribute for each field in UI Specs. + * Using "json-rules-engine", these conditions are evaluated + * and fields are conditionally validated as required or not in the UI form. + */ + processConditionalRequiredValidations(identityFormData) { + console.log("processing requiredCondition"); + //for each uiField in UI specs, check of any "requiredCondition" is given + //if yes, then evaluate it with json-rules-engine + this.uiFields.forEach(uiField => { + //if no "requiredCondition" is given, then nothing is to be done + if (uiField.requiredCondition && uiField.requiredCondition != "") { + const addValidatorsFunc = this.addValidators; + const removeValidatorFunc = this.removeValidators; + let requiredRule = new Rule({ + conditions: uiField.requiredCondition, + onSuccess() { + //in "requiredCondition" is statisfied then validate the field as required + uiField.required = true; + addValidatorsFunc(uiField); + }, + onFailure() { + //in "requiredCondition" is not statisfied then validate the field as not required + uiField.required = false; + removeValidatorFunc(uiField); + }, + event: { + type: "message", + params: { + data: "" + } + } + }); + this.jsonRulesEngine.addRule(requiredRule); + //evaluate the visibleCondition + this.jsonRulesEngine + .run(identityFormData) + .then(results => { + results.events.map(event => console.log('jsonRulesEngine for requiredConditions run successfully', event.params.data)); + this.jsonRulesEngine.removeRule(requiredRule); + }) + .catch((error) => { + console.log('err is', error); + this.jsonRulesEngine.removeRule(requiredRule); + }); + } + }, this); + } + + /** * @description This sets the top location hierachy, * if update set the regions also. @@ -520,10 +695,13 @@ export class DemographicComponent */ private async setLocations() { await this.getLocationMetadataHirearchy(); - this.loadLocationData( - this.uppermostLocationHierarchy, - this.locationHeirarchy[0] - ); + this.locationHeirarchies.forEach(locationHeirarchy => { + this.loadLocationData( + this.uppermostLocationHierarchy, + locationHeirarchy[0] + ); + }, this); + } /** * @description This is to reset the input values @@ -532,8 +710,8 @@ export class DemographicComponent * @param fieldName location dropdown control Name */ resetLocationFields(fieldName: string) { - if (this.locationHeirarchy.includes(fieldName)) { - const locationFields = [...this.locationHeirarchy]; + if (this.isThisFieldInLocationHeirarchies(fieldName)) { + const locationFields = this.getLocationHierarchy(fieldName); const index = locationFields.indexOf(fieldName); for (let i = index + 1; i < locationFields.length; i++) { this.userForm.controls[locationFields[i]].setValue(""); @@ -569,8 +747,9 @@ export class DemographicComponent valueName: element.name, languageCode: this.primaryLang, }; - - this.primarydropDownFields[`${fieldName}`].push(codeValueModal); + if (this.primarydropDownFields[`${fieldName}`]) { + this.primarydropDownFields[`${fieldName}`].push(codeValueModal); + } }); } }, @@ -592,9 +771,11 @@ export class DemographicComponent valueName: element.name, languageCode: this.secondaryLang, }; - this.secondaryDropDownLables[`${fieldName}`].push( - codeValueModal - ); + if (this.secondaryDropDownLables[`${fieldName}`]) { + this.secondaryDropDownLables[`${fieldName}`].push( + codeValueModal + ); + } }); } }, @@ -640,20 +821,20 @@ export class DemographicComponent this.dataStorageService .getDynamicFieldsandValues(lang) .subscribe((response) => { - console.log(response); + //console.log(response); let dynamicField = response[appConstants.RESPONSE]["data"]; this.dynamicFields.forEach((field) => { - console.log(field); + //console.log(field); dynamicField.forEach((res) => { - console.log(res); + //console.log(res); if (field.id === res.name && res.langCode === this.primaryLang) { - console.log(res["fieldVal"]); + //console.log(res["fieldVal"]); this.filterOnLangCode( this.primaryLang, res.name, res["fieldVal"] ); - console.log(this.primarydropDownFields); + //console.log(this.primarydropDownFields); } if (this.primaryLang !== this.secondaryLang) { if ( @@ -721,20 +902,21 @@ export class DemographicComponent if (this.user.request === undefined) { await this.getUserInfo(this.preRegId); } - /*if ( + if ( this.user.request.demographicDetails.identity.fullName[0].language !== this.primaryLang ) { index = 1; secondaryIndex = 0; - }*/ + } if (this.primaryLang === this.secondaryLang) { index = 0; secondaryIndex = 0; } this.uiFields.forEach((control) => { + if (this.user.request.demographicDetails.identity[control.id]) { if ( - control.controlType !== "dropdown" && + (control.controlType !== "dropdown" && control.controlType !== "button") && !appConstants.TRANSLITERATE_FIELDS.includes(control.id) ) { if (control.id === "dateOfBirth") { @@ -767,10 +949,10 @@ export class DemographicComponent ].value ); } - } else if (control.controlType === "dropdown") { - if (this.locationHeirarchy.includes(control.id)) { + } else if (control.controlType === "dropdown" || control.controlType === "button") { + if (this.isThisFieldInLocationHeirarchies(control.id)) { this.dropdownApiCall(control); - if (control.id === "postalCode") { + if (control.type === "string") { this.userForm.controls[`${control.id}`].setValue( this.user.request.demographicDetails.identity[`${control.id}`] ); @@ -779,7 +961,7 @@ export class DemographicComponent this.user.request.demographicDetails.identity[`${control.id}`] ); } - } else { + } else if(control.type === 'simpleType') { this.userForm.controls[`${control.id}`].setValue( this.user.request.demographicDetails.identity[control.id][index] .value @@ -806,6 +988,7 @@ export class DemographicComponent } } } + } }); } } @@ -960,27 +1143,27 @@ export class DemographicComponent this.date = this.dd.nativeElement.value; this.month = this.mm.nativeElement.value; this.year = this.yyyy.nativeElement.value; - this.DOB_PATTERN = this.config[appConstants.CONFIG_KEYS.mosip_regex_DOB]; - const newDate = this.year + "/" + this.month + "/" + this.date; - const dobRegex = new RegExp(this.DOB_PATTERN); - if (dobRegex.test(newDate)) { - this.currentAge = this.calculateAge(newDate).toString(); - this.age.nativeElement.value = this.currentAge; - this.userForm.controls["dateOfBirth"].setValue(newDate); - if (this.primaryLang !== this.secondaryLang) { - this.transUserForm.controls["dateOfBirth"].setValue(newDate); - } - console.log(this.userForm); - if (this.dataModification) { - console.log(newDate); - this.hasDobChanged(); + if (this.date !== "" && this.month !== "" && this.year !== "") { + const newDate = this.year + "/" + this.month + "/" + this.date; + console.log(newDate); + if (moment(newDate,'YYYY/MM/DD',true).isValid()) { + this.currentAge = this.calculateAge(newDate).toString(); + this.age.nativeElement.value = this.currentAge; + this.userForm.controls["dateOfBirth"].setValue(newDate); + if (this.primaryLang !== this.secondaryLang) { + this.transUserForm.controls["dateOfBirth"].setValue(newDate); + } + if (this.dataModification) { + this.hasDobChanged(); + } + } else { + this.userForm.controls["dateOfBirth"].markAsTouched(); + this.userForm.controls["dateOfBirth"].setErrors({ + incorrect: true, + }); + this.currentAge = ""; + this.age.nativeElement.value = ""; } - } else { - this.userForm.controls["dateOfBirth"].markAsTouched(); - this.userForm.controls["dateOfBirth"].setErrors({ - incorrect: true, - }); - this.age.nativeElement.value = ""; } } @@ -1025,9 +1208,9 @@ export class DemographicComponent private filterOnLangCode(langCode: string, field: string, entityArray: any) { return new Promise((resolve, reject) => { if (entityArray) { - console.log(entityArray); + //console.log(entityArray); entityArray.filter((element: any) => { - console.log(element); + //console.log(element); if (element.langCode === langCode) { let codeValue: CodeValueModal; if (element.genderName) { @@ -1210,9 +1393,9 @@ export class DemographicComponent if (this.userForm.valid) { const identity = this.createIdentityJSONDynamic(); const request = this.createRequestJSON(identity); - console.log(request); + //console.log(request); const responseJSON = this.createResponseJSON(identity); - console.log(responseJSON); + //console.log(responseJSON); this.dataUploadComplete = false; if (this.dataModification) { this.subscriptions.push( @@ -1345,11 +1528,7 @@ export class DemographicComponent ); } } else if (typeof identity[element] === "string") { - if (element === appConstants.IDSchemaVersionLabel) { - attr = this.config[appConstants.CONFIG_KEYS.mosip_idschema_version]; - } else { attr = this.userForm.controls[`${element}`].value; - } } identity[element] = attr; } @@ -1378,8 +1557,8 @@ export class DemographicComponent * @memberof DemographicComponent */ private createIdentityJSONDynamic() { - const identityObj = { IDSchemaVersion: "" }; - const stringField = ["dateOfBirth", "postalCode", "email", "phone"]; + const identityObj = {}; + const newIdentityObj = {}; this.identityData.forEach((field) => { if ( field.inputRequired === true && @@ -1387,22 +1566,55 @@ export class DemographicComponent ) { if (!field.inputRequired) { identityObj[field.id] = ""; + newIdentityObj[field.id] = ""; } else { - if (stringField.includes(field.id)) { - identityObj[field.id] = ""; - } else { + if (field.type === 'simpleType') { identityObj[field.id] = []; + } else if (field.type === 'string'){ + identityObj[field.id] = ""; } } + } else { + if (field.id == appConstants.IDSchemaVersionLabel) { + if (field.type === 'string') { + identityObj[field.id] = this.config[appConstants.CONFIG_KEYS.mosip_idschema_version]; + } else if (field.type === 'number') { + identityObj[field.id] = Number(this.config[appConstants.CONFIG_KEYS.mosip_idschema_version]); + } + } } }); let keyArr: any[] = Object.keys(identityObj); for (let index = 0; index < keyArr.length; index++) { const element = keyArr[index]; - this.createAttributeArray(element, identityObj); + if (element != appConstants.IDSchemaVersionLabel) { + this.createAttributeArray(element, identityObj); + } + } + //const identityRequest = { identity: identityObj }; + //now remove the blank fields from the identityObj + console.log(identityObj); + for (let index = 0; index < keyArr.length; index++) { + const element = keyArr[index]; + if (element == appConstants.IDSchemaVersionLabel) { + newIdentityObj[element] = identityObj[element]; + } else if (typeof identityObj[element] === "object") { + let elementValue = identityObj[element]; + if (elementValue && elementValue.length > 0) { + if (elementValue[0].value !== "" && elementValue[0].value !== null && elementValue[0].value !== undefined ) { + newIdentityObj[element] = elementValue; + } + } + } else if (typeof identityObj[element] === "string") { + let elementValue = identityObj[element]; + if (elementValue !== "" && elementValue !== null && elementValue !== undefined) { + newIdentityObj[element] = elementValue; + } + } } - const identityRequest = { identity: identityObj }; + console.log(newIdentityObj); + const identityRequest = { identity: newIdentityObj }; return identityRequest; } diff --git a/pre-registration-ui/src/app/feature/file-upload/file-upload/file-upload.component.css b/pre-registration-ui/src/app/feature/file-upload/file-upload/file-upload.component.css index a0ef6e76f06..0deafb6703d 100644 --- a/pre-registration-ui/src/app/feature/file-upload/file-upload/file-upload.component.css +++ b/pre-registration-ui/src/app/feature/file-upload/file-upload/file-upload.component.css @@ -231,7 +231,10 @@ mat-select:focus { .file-upload__or { width: 33%; } - +.file-upload__docrefid { + width: 33%; + padding-left: 10px; +} .file-upload__or { padding-left: 1rem; } diff --git a/pre-registration-ui/src/app/feature/file-upload/file-upload/file-upload.component.html b/pre-registration-ui/src/app/feature/file-upload/file-upload/file-upload.component.html index 9ce96563630..9f971372347 100644 --- a/pre-registration-ui/src/app/feature/file-upload/file-upload/file-upload.component.html +++ b/pre-registration-ui/src/app/feature/file-upload/file-upload/file-upload.component.html @@ -29,6 +29,20 @@ + + Document Reference Id + + - + {{ 'documents.OR' | translate }} @@ -72,7 +86,7 @@ help_outline - +
    @@ -83,8 +97,8 @@
    -
    -
    +
    +

    {{ fileName }}

    diff --git a/pre-registration-ui/src/app/feature/file-upload/file-upload/file-upload.component.ts b/pre-registration-ui/src/app/feature/file-upload/file-upload/file-upload.component.ts index d9e67076eed..e2712f92ba6 100644 --- a/pre-registration-ui/src/app/feature/file-upload/file-upload/file-upload.component.ts +++ b/pre-registration-ui/src/app/feature/file-upload/file-upload/file-upload.component.ts @@ -75,6 +75,7 @@ export class FileUploadComponent implements OnInit, OnDestroy { docCatCode: "", docTypCode: "", langCode: "", + docRefId: "", }; files: FilesModel; documentCategoryDto: DocumentCategoryDTO = { @@ -89,24 +90,24 @@ export class FileUploadComponent implements OnInit, OnDestroy { applicants: any[] = []; allowedFiles: string[]; firstFile: Boolean = true; - noneApplicant = { - demographicMetadata: { - fullName: [ - { - language: "", - value: "None", - }, - ], - }, - preRegistrationId: "", - }; + // noneApplicant = { + // demographicMetadata: { + // name: [ + // { + // language: "", + // value: "None", + // }, + // ], + // }, + // preRegistrationId: "", + // }; subscriptions: Subscription[] = []; identityData = []; uiFields = []; preRegId: number; isDocUploadRequired = []; name:""; - + constructor( private registration: RegistrationService, private dataStorageService: DataStorageService, @@ -218,7 +219,7 @@ export class FileUploadComponent implements OnInit, OnDestroy { if (!response["errors"]) { this.userFile = response[appConstants.RESPONSE][appConstants.METADATA]; } else { - let fileModel: FileModel = new FileModel("", "", "", "", "", "", ""); + let fileModel: FileModel = new FileModel("", "", "", "", "", "", "", ""); if(this.userFile.length === 0){ this.userFile.push(fileModel); } @@ -244,6 +245,9 @@ export class FileUploadComponent implements OnInit, OnDestroy { if (ele.code === fileMetadata[index].docCatCode) { indice = index; indexLOD = i; + ele.selectedDocRefId = fileMetadata[index].docRefId + ? fileMetadata[index].docRefId + : ""; arr.push(ele); } }); @@ -252,6 +256,9 @@ export class FileUploadComponent implements OnInit, OnDestroy { (ele) => ele.code === fileMetadata[indice].docTypCode ); this.LOD[indexLOD].selectedDocName = temp[0].code; + this.LOD[indexLOD].selectedDocRefId = arr[0].selectedDocRefId + ? arr[0].selectedDocRefId + : ""; } } } else return; @@ -263,9 +270,20 @@ export class FileUploadComponent implements OnInit, OnDestroy { * @memberof FileUploadComponent */ private setNoneApplicant() { + const noneApplicant = { + demographicMetadata: { + [this.name]: [ + { + language: "", + value: "None", + }, + ], + }, + preRegistrationId: "", + }; let i: number = 0; const temp = JSON.parse( - JSON.stringify(this.allApplicants.push(this.noneApplicant)) + JSON.stringify(this.allApplicants.push(noneApplicant)) ); let noneCount: Boolean = this.isNoneAvailable(); @@ -274,7 +292,7 @@ export class FileUploadComponent implements OnInit, OnDestroy { if (this.users) { if (applicant.preRegistrationId == this.preRegId) { this.allApplicants.splice(i, 1); - this.allApplicants.push(this.noneApplicant); + this.allApplicants.push(noneApplicant); console.log(JSON.stringify(this.allApplicants)); this.removeExtraNone(); } @@ -383,7 +401,7 @@ export class FileUploadComponent implements OnInit, OnDestroy { for (let name of applicant) { if ( name["demographicMetadata"][name][j].language != this.primaryLang - ) { + ) { allApplicants[i].demographicMetadata.firstName.splice(j, 1); } j++; @@ -752,7 +770,7 @@ export class FileUploadComponent implements OnInit, OnDestroy { * @param {*} event * @memberof FileUploadComponent */ - handleFileInput(event: any, docName: string, docCode: string) { + handleFileInput(event: any, docName: string, docCode: string, docRefId: string) { const extensionRegex = new RegExp( "(?:" + this.allowedFilesHtml.replace(/,/g, "|") + ")" ); @@ -784,7 +802,7 @@ export class FileUploadComponent implements OnInit, OnDestroy { this.fileByteArray = data; }); if (!this.documentType && !this.documentCategory) { - this.setJsonString(docName, docCode); + this.setJsonString(docName, docCode, docRefId); } this.sendFile(event); } else { @@ -814,6 +832,46 @@ export class FileUploadComponent implements OnInit, OnDestroy { } } + /** + *@description method gets called when a value in "docRefId" textbox is changed. + * + * @param {*} event + * @memberof FileUploadComponent + */ + handleDocRefInput(event: any, docCode: string) { + console.log(`starting in handleDocRefInput`); + const docRefId = event.target.value; + console.log(`docRefId: ${docRefId}`); + for (let file of this.users[0].files.documentsMetaData) { + if (file.docCatCode == docCode) { + let documentId = file.documentId; + console.log(`documentId: ${documentId}`); + console.log(`preRegId: ${this.preRegId}`); + this.disableNavigation = true; + const subs = this.dataStorageService + .updateDocRefId(documentId, this.preRegId, docRefId) + .subscribe( + (response) => { + this.disableNavigation = false; + if (response[appConstants.RESPONSE]) { + //docRedId saved + } else { + this.displayMessage( + this.fileUploadLanguagelabels.uploadDocuments.error, + this.errorlabels.error + ); + } + }, + (error) => { + this.disableNavigation = false; + this.displayMessage("Error", this.errorlabels.error, error); + } + ); + this.subscriptions.push(subs); + } + } + } + /** *@description method to get base 64 of a file * @@ -839,6 +897,7 @@ export class FileUploadComponent implements OnInit, OnDestroy { */ selectChange(event, index: number) { this.enableBrowseButtonList[index] = true; + this.LOD[index].selectedDocRefId = ""; let found = false; let i = -1; this.documentCategory = event.source.placeholder; @@ -869,7 +928,7 @@ export class FileUploadComponent implements OnInit, OnDestroy { }; this.documentIndex = index; - this.setJsonString(this.documentType, this.documentCategory); + this.setJsonString(this.documentType, this.documentCategory, ""); } /** @@ -908,10 +967,11 @@ export class FileUploadComponent implements OnInit, OnDestroy { * @param {*} event * @memberof FileUploadComponent */ - setJsonString(docName: string, docCode: string) { + setJsonString(docName: string, docCode: string, docRefId: string) { this.documentUploadRequestBody.docCatCode = docCode; this.documentUploadRequestBody.langCode = this.primaryLang; this.documentUploadRequestBody.docTypCode = docName; + this.documentUploadRequestBody.docRefId = docRefId; this.documentRequest = new RequestModel( appConstants.IDS.documentUpload, this.documentUploadRequestBody, @@ -983,10 +1043,11 @@ export class FileUploadComponent implements OnInit, OnDestroy { this.userFile[0].docTypCode = fileResponse.response.docTypCode; this.userFile[0].multipartFile = this.fileByteArray; this.userFile[0].prereg_id = this.users[0].preRegId; + this.userFile[0].docRefId = fileResponse.response.docRefId; if (this.fileDocCatCode == fileResponse.response.docCatCode) { this.removeFilePreview(); } - + for (let file of this.users[0].files.documentsMetaData) { if ( file.docCatCode == this.userFile[0].docCatCode || @@ -1036,6 +1097,7 @@ export class FileUploadComponent implements OnInit, OnDestroy { if (ele.code === "POA") index = i; }); this.LOD[index].selectedDocName = ""; + this.LOD[index].selectedDocRefId = ""; } this.disableNavigation = false; }, @@ -1071,6 +1133,7 @@ export class FileUploadComponent implements OnInit, OnDestroy { ); this.documentName = docList[0].code; this.LOD[index].selectedDocName = this.documentName; + this.LOD[index].selectedDocRefId = response["response"]["docRefId"]; } else { this.sameAs = this.registration.getSameAs(); this.sameAsselected = false; @@ -1142,8 +1205,8 @@ export class FileUploadComponent implements OnInit, OnDestroy { let uploadDocumentsCatCode = []; let requiredDocuments = []; this.isDocUploadRequired = []; -// this.getUserFiles(); -// console.log(this.userFile); + // this.getUserFiles(); + // console.log(this.userFile); this.LOD.forEach((document) => { displayedDocCatCode.push(document.code); }); @@ -1153,13 +1216,13 @@ export class FileUploadComponent implements OnInit, OnDestroy { requiredDocuments.push(field.id); } }); -// this.userFile.filter(file=>{ -// if(file.docCatCode !== undefined){ -// if(file.docCatCode !== "" || file.docCatCode.length !== 0){ -// uploadDocumentsCatCode.push(file.docCatCode); -// } -// } -// }); + // this.userFile.filter(file=>{ + // if(file.docCatCode !== undefined){ + // if(file.docCatCode !== "" || file.docCatCode.length !== 0){ + // uploadDocumentsCatCode.push(file.docCatCode); + // } + // } + // }); console.log(uploadDocumentsCatCode); console.log(requiredDocuments); displayedDocCatCode.forEach((docCat) => { @@ -1180,9 +1243,9 @@ export class FileUploadComponent implements OnInit, OnDestroy { } this.displayMessage("Required", message + docList); } else {*/ - localStorage.setItem("modifyDocument", "false"); - let url = Utils.getURL(this.router.url, "summary"); - this.router.navigateByUrl(url + `/${this.preRegId}/preview`); + localStorage.setItem("modifyDocument", "false"); + let url = Utils.getURL(this.router.url, "summary"); + this.router.navigateByUrl(url + `/${this.preRegId}/preview`); /*}*/ } @@ -1253,6 +1316,10 @@ export class FileUploadComponent implements OnInit, OnDestroy { this.LOD[index].selectedDocName = event.value; } + changeDocRefId(event, index: number) { + this.LOD[index].selectedDocRefId = event.target.value; + } + ngOnDestroy(): void { this.subscriptions.forEach((subscription) => subscription.unsubscribe()); } @@ -1262,6 +1329,7 @@ export interface DocumentUploadRequestDTO { docCatCode: string; docTypCode: string; langCode: string; + docRefId: string; } export interface DocumentCategoryDTO { @@ -1277,6 +1345,7 @@ export interface DocumentCategory { name: string; documentTypes?: DocumentCategory[]; selectedDocName?: string; + selectedDocRefId: string; } export interface Applicants { @@ -1295,6 +1364,7 @@ export interface ProofOfAddress { docCatCode: string; docTypCode: string; docFileFormat?: string; + docRefId: string; } export interface DemographicMetaData { diff --git a/pre-registration-ui/src/app/feature/summary/acknowledgement/acknowledgement.component.html b/pre-registration-ui/src/app/feature/summary/acknowledgement/acknowledgement.component.html index 1ea4b99e3ba..ebd16c7c2f3 100644 --- a/pre-registration-ui/src/app/feature/summary/acknowledgement/acknowledgement.component.html +++ b/pre-registration-ui/src/app/feature/summary/acknowledgement/acknowledgement.component.html @@ -53,8 +53,7 @@
    - - +
    diff --git a/pre-registration-ui/src/app/feature/summary/acknowledgement/acknowledgement.component.ts b/pre-registration-ui/src/app/feature/summary/acknowledgement/acknowledgement.component.ts index 8391ad7f7b8..f721920629e 100644 --- a/pre-registration-ui/src/app/feature/summary/acknowledgement/acknowledgement.component.ts +++ b/pre-registration-ui/src/app/feature/summary/acknowledgement/acknowledgement.component.ts @@ -49,6 +49,7 @@ export class AcknowledgementComponent implements OnInit, OnDestroy { regCenterId; primaryLangCode; name = ""; + applicantContactDetails = []; constructor( private bookingService: BookingService, private dialog: MatDialog, @@ -126,6 +127,8 @@ export class AcknowledgementComponent implements OnInit, OnDestroy { nameList.postalCode = user["request"].demographicDetails.identity.postalCode; nameList.registrationCenter = ""; + this.applicantContactDetails[1] = user["request"].demographicDetails.identity.phone; + this.applicantContactDetails[0] = user["request"].demographicDetails.identity.email; await this.getAppointmentDetails(nameList.preRegId).then( (appointmentDetails) => { nameList.regDto = appointmentDetails; @@ -286,7 +289,7 @@ export class AcknowledgementComponent implements OnInit, OnDestroy { automaticNotification() { setTimeout(() => { - this.sendNotification([], false); + this.sendNotification(this.applicantContactDetails, false); }, 500); } diff --git a/pre-registration-ui/src/app/feature/summary/preview/preview.component.html b/pre-registration-ui/src/app/feature/summary/preview/preview.component.html index 2d987b9fccd..2ead449b39a 100644 --- a/pre-registration-ui/src/app/feature/summary/preview/preview.component.html +++ b/pre-registration-ui/src/app/feature/summary/preview/preview.component.html @@ -8,7 +8,7 @@
    @@ -99,21 +99,82 @@

    {{ secondaryLanguagelabels.subheading_information }}

    --> - +
    --> +
    {{ 'preview.title_document' | translate }} {{ 'preview.action_modify' | translate }} {{ 'preview.action_modify' | translate }}
    @@ -229,13 +290,13 @@

    {{ secondaryLanguagelabels.subheading_contact }}

    - + \ No newline at end of file diff --git a/pre-registration-ui/src/app/feature/summary/preview/preview.component.ts b/pre-registration-ui/src/app/feature/summary/preview/preview.component.ts index 164d3e1b51f..b56457f2fef 100644 --- a/pre-registration-ui/src/app/feature/summary/preview/preview.component.ts +++ b/pre-registration-ui/src/app/feature/summary/preview/preview.component.ts @@ -61,22 +61,29 @@ export class PreviewComponent implements OnInit { this.activatedRoute.params.subscribe((param) => { this.preRegId = param["appId"]; }); - this.locationData(); await this.getIdentityJsonFormat(); await this.getResidentDetails(); await this.getGenderDetails(); await this.getUserInfo(); +// await this.convertLocationCodeToLocationName(); await this.getUserFiles(); await this.getDocumentCategories(); this.previewData = this.user.request.demographicDetails.identity; this.calculateAge(); - this.previewData.primaryAddress = this.combineAddress(0); + //this.previewData.primaryAddress = this.combineAddress(0); //this.previewData.secondaryAddress = this.combineAddress(1); this.formatDob(this.previewData.dateOfBirth); - this.setFieldValues(); this.getSecondaryLanguageLabels(); this.files = this.user.files ? this.user.files : []; this.documentsMapping(); + //remove blank fields + let updatedUIFields = []; + this.uiFields.forEach((control) => { + if (this.previewData[control.id]) { + updatedUIFields.push(control); + } + }); + this.uiFields = updatedUIFields; } async getIdentityJsonFormat() { @@ -134,7 +141,10 @@ export class PreviewComponent implements OnInit { let dynamicField = response[appConstants.RESPONSE]["data"]; this.dynamicFields.forEach((field) => { dynamicField.forEach((res) => { - if (field.id === res.name && res.langCode === this.primaryLanguage) { + if ( + field.id === res.name && + res.langCode === this.primaryLanguage + ) { this.filterOnLangCode( this.primaryLanguage, res.name, @@ -242,6 +252,30 @@ export class PreviewComponent implements OnInit { }); } +// convertLocationCodeToLocationName() { +// this.locationHeirarchy.forEach((location) => { +// this.getLocations( +// this.user.request.demographicDetails.identity[location][0].value, +// this.primaryLanguage +// ).then( +// (val) => +// (this.user.request.demographicDetails.identity[ +// location +// ][0].value = val) +// ); +// if (this.primaryLanguage != this.secondaryLanguage) { +// this.getLocations( +// this.user.request.demographicDetails.identity[location][1].value, +// this.secondaryLanguage +// ).then((val) => (val) => +// (this.user.request.demographicDetails.identity[ +// location +// ][0].value = val) +// ); +// } +// }); +// } + formatDob(dob: string) { dob = dob.replace(/\//g, "-"); this.dateOfBirthPrimary = Utils.getBookingDateTime( @@ -256,32 +290,6 @@ export class PreviewComponent implements OnInit { ); } - setFieldValues() { - let fields = appConstants.previewFields; - fields.forEach((field) => { - this.previewData[field].forEach((element) => { - if(!(field === appConstants.controlTypeResidenceStatus || field === appConstants.controlTypeGender)){ - element.name = this.locCodeToName(element.value, element.language); - } - else if(field === appConstants.controlTypeResidenceStatus){ - this.residenceStatus.forEach(status => { - if(status.code === element.value && element.language === status.langCode){ - element.name = status.name; - } - }); - } - else if(field === appConstants.controlTypeGender){ - this.genders.filter(gender => { - if(gender.code === element.value && element.language === gender.langCode){ - element.name = gender.genderName; - } - }); - } - }); - }); - - } - documentsMapping() { this.documentMapObject = []; if (this.files && this.documentTypes.length !== 0) { @@ -347,7 +355,7 @@ export class PreviewComponent implements OnInit { modifyDemographic() { const url = Utils.getURL(this.router.url, "demographic", 3); localStorage.setItem("modifyUserFromPreview", "true"); - localStorage.setItem('modifyUser','true'); + localStorage.setItem("modifyUser", "true"); this.router.navigateByUrl(url + `/${this.preRegId}`); } @@ -356,34 +364,14 @@ export class PreviewComponent implements OnInit { this.navigateBack(); } - private locCodeToName(locationCode: string, language: string): string { - let locationName = ""; - if (language === localStorage.getItem("langCode")) { - this.primaryLocations.forEach((loc) => { - if (loc.code === locationCode) { - locationName = loc.name; - } - }); - } else { - this.secondaryLocations.forEach((loc) => { - if (loc.code === locationCode) { - locationName = loc.name; - } - }); - } - return locationName; - } - - private getLocations(langCode) { + getLocations(locationCode, langCode) { return new Promise((resolve) => { - const countryCode = this.configService.getConfigByKey( - appConstants.CONFIG_KEYS.mosip_country_code - ); this.dataStorageService - .getLocationsHierarchyByLangCode(langCode, countryCode) + .getLocationsHierarchyByLangCode(langCode, locationCode) .subscribe((response) => { if (response[appConstants.RESPONSE]) { - const locations = response[appConstants.RESPONSE].locations; + const locations = + response[appConstants.RESPONSE]["locations"][0]["name"]; resolve(locations); } }); @@ -424,14 +412,14 @@ export class PreviewComponent implements OnInit { }); }); } - async locationData() { - await this.getLocations(localStorage.getItem("langCode")).then( - (value) => (this.primaryLocations = value) - ); - this.getLocations(localStorage.getItem("secondaryLangCode")).then( - (value) => (this.secondaryLocations = value) - ); - } + // async locationData() { + // await this.getLocations(localStorage.getItem("langCode")).then( + // (value) => (this.primaryLocations = value) + // ); + // this.getLocations(localStorage.getItem("secondaryLangCode")).then( + // (value) => (this.secondaryLocations = value) + // ); + // } enableContinue(): boolean { let flag = true; @@ -453,9 +441,11 @@ export class PreviewComponent implements OnInit { navigateDashboard() { localStorage.setItem("newApplicant", "true"); localStorage.setItem("modifyUserFromPreview", "false"); - localStorage.setItem('modifyUser','false'); - localStorage.setItem('addingUserFromPreview','true'); - this.router.navigate([`${this.primaryLanguage}/pre-registration/demographic/new`]); + localStorage.setItem("modifyUser", "false"); + localStorage.setItem("addingUserFromPreview", "true"); + this.router.navigate([ + `${this.primaryLanguage}/pre-registration/demographic/new`, + ]); } navigateBack() { diff --git a/pre-registration-ui/src/app/shared/models/demographic-model/file.model.ts b/pre-registration-ui/src/app/shared/models/demographic-model/file.model.ts index ad2857abcf2..3212bfb99be 100644 --- a/pre-registration-ui/src/app/shared/models/demographic-model/file.model.ts +++ b/pre-registration-ui/src/app/shared/models/demographic-model/file.model.ts @@ -6,6 +6,7 @@ export class FileModel { public docName?: string, public docTypCode?: string, public multipartFile?: any, - public prereg_id?: string + public prereg_id?: string, + public docRefId?: string ) {} } diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/pom.xml b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/pom.xml deleted file mode 100644 index 904098bee51..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/pom.xml +++ /dev/null @@ -1,183 +0,0 @@ - - - 4.0.0 - - io.mosip.registrationprocessor - pre-processor - 1.0.6 - - - packet-generator - packet-generator - http://maven.apache.org - - true - UTF-8 - 11 - 11 - 3.8.0 - - - - - org.springframework.cloud - spring-cloud-starter-config - ${spring-cloud-config.version} - - - - junit - junit - test - - - org.springframework.boot - spring-boot-starter - - - io.springfox - springfox-swagger-ui - ${swagger.version} - - - io.springfox - springfox-swagger2 - ${swagger.version} - - - org.postgresql - postgresql - - - - org.projectlombok - lombok - 1.18.8 - provided - - - - io.mosip.kernel - kernel-core - ${kernel.core.version} - - - io.mosip.kernel - kernel-keygenerator-bouncycastle - ${kernel.core.version} - - - ma.glasnost.orika - orika-core - 1.4.6 - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - 2.7.3 - - - org.springframework.boot - spring-boot-starter-web - - - io.mosip.kernel - kernel-dataaccess-hibernate - ${kernel.dataaccess.hibernate.version} - - - - io.mosip.kernel - kernel-crypto-jce - ${kernel.core.version} - - - - io.mosip.kernel - kernel-idobjectvalidator - ${kernel.core.version} - - - - io.mosip.registrationprocessor - registration-processor-rest-client - ${registration.processor.rest.client.version} - - - commons-fileupload - commons-fileupload - 1.2 - - - - io.mosip.kernel - kernel-idgenerator-rid - ${kernel.idgenerator.rid.version} - - - - io.mosip.kernel - kernel-idvalidator-uin - ${kernel.core.version} - - - - io.mosip.kernel - kernel-idvalidator-vid - ${project.version} - - - - io.mosip.registrationprocessor - registration-processor-registration-status-service-impl - ${registration.status.service.version} - - - io.mosip.registrationprocessor - registration-processor-info-storage-service - ${packet.info.storage.service.version} - - - io.mosip.registrationprocessor - registration-processor-packet-manager - ${packet.manager.version} - - - io.mosip.registrationprocessor - registration-processor-core - ${registration.processor.core.version} - - - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring.boot.version} - - true - - - - - build-info - repackage - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven.compiler.version} - - ${maven.compiler.source} - ${maven.compiler.target} - - - - - diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/PacketGeneratorApplication.java b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/PacketGeneratorApplication.java deleted file mode 100644 index bc2d609da3b..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/PacketGeneratorApplication.java +++ /dev/null @@ -1,28 +0,0 @@ -package io.mosip.packetgenerator; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.ComponentScan.Filter; -import org.springframework.context.annotation.FilterType; - -import io.mosip.registration.processor.packet.storage.config.PacketStorageBeanConfig; -import io.mosip.registration.processor.rest.client.config.RestConfigBean; -import io.mosip.registration.processor.status.config.RegistrationStatusBeanConfig; -/** - * - * @author Girish Yarru - * - */ -@SpringBootApplication -@ComponentScan(basePackages = { - "io.mosip.registration.processor.request.handler.*,io.mosip.packetgenerator.*,io.mosip.registration.processor.packet*,io.mosip.registration.processor.rest.client.*,io.mosip.registration.processor.core.*", - "io.mosip.kernel.auth.*", - "io.mosip.registration.processor.request.handler.service.impl" }, excludeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, value = { - RestConfigBean.class, PacketStorageBeanConfig.class, RegistrationStatusBeanConfig.class })) -public class PacketGeneratorApplication { - public static void main(String[] args) { - SpringApplication.run(PacketGeneratorApplication.class, args); - - } -} diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/builder/AuditRequestBuilder.java b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/builder/AuditRequestBuilder.java deleted file mode 100644 index f08ff032031..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/builder/AuditRequestBuilder.java +++ /dev/null @@ -1,247 +0,0 @@ -package io.mosip.packetgenerator.builder; - -import java.time.LocalDateTime; - -import org.springframework.stereotype.Service; - -import io.mosip.packetgenerator.dto.AuditDTO; -import io.mosip.registration.processor.rest.client.audit.dto.AuditRequestDto; - -@Service -public class AuditRequestBuilder { - - /** The {@link AuditRequestDto} instance. */ - private AuditDTO auditRequest = null; - - /** - * Instantiate a new {@link AuditRequestDto}. - */ - public AuditRequestBuilder() { - auditRequest = new AuditDTO(); - } - - /** - * Add actionTimeStamp to this {@link AuditRequestBuilder}. - * - * @param actionTimeStamp - * actionTimeStamp - * @return {@link AuditRequestBuilder} - */ - public AuditRequestBuilder setActionTimeStamp(LocalDateTime actionTimeStamp) { - auditRequest.setActionTimeStamp(actionTimeStamp); - return this; - } - - /** - * Add applicationId to this {@link AuditRequestBuilder}. - * - * @param applicationId - * applicationId - * @return {@link AuditRequestBuilder} - */ - public AuditRequestBuilder setApplicationId(String applicationId) { - auditRequest.setApplicationId(applicationId); - return this; - } - - /** - * Add applicationName to this {@link AuditRequestBuilder}. - * - * @param applicationName - * applicationName - * @return {@link AuditRequestBuilder} - */ - public AuditRequestBuilder setApplicationName(String applicationName) { - auditRequest.setApplicationName(applicationName); - return this; - } - - /** - * Add createdBy to this {@link AuditRequestBuilder}. - * - * @param createdBy - * createdBy - * @return {@link AuditRequestBuilder} - */ - public AuditRequestBuilder setCreatedBy(String createdBy) { - auditRequest.setCreatedBy(createdBy); - return this; - } - - /** - * Add description to this {@link AuditRequestBuilder}. - * - * @param description - * description - * @return {@link AuditRequestBuilder} - */ - public AuditRequestBuilder setDescription(String description) { - auditRequest.setDescription(description); - return this; - } - - /** - * Add eventId to this {@link AuditRequestBuilder}. - * - * @param eventId - * eventId - * @return {@link AuditRequestBuilder} - */ - public AuditRequestBuilder setEventId(String eventId) { - auditRequest.setEventId(eventId); - return this; - } - - /** - * Add eventName to this {@link AuditRequestBuilder}. - * - * @param eventName - * eventName - * @return {@link AuditRequestBuilder} - */ - public AuditRequestBuilder setEventName(String eventName) { - auditRequest.setEventName(eventName); - return this; - } - - /** - * Add eventType to this {@link AuditRequestBuilder}. - * - * @param eventType - * eventType - * @return {@link AuditRequestBuilder} - */ - public AuditRequestBuilder setEventType(String eventType) { - auditRequest.setEventType(eventType); - return this; - } - - /** - * Add hostIp to this {@link AuditRequestBuilder}. - * - * @param hostIp - * hostIp - * @return {@link AuditRequestBuilder} - */ - public AuditRequestBuilder setHostIp(String hostIp) { - auditRequest.setHostIp(hostIp); - return this; - } - - /** - * Add hostName to this {@link AuditRequestBuilder}. - * - * @param hostName - * hostName - * @return {@link AuditRequestBuilder} - */ - public AuditRequestBuilder setHostName(String hostName) { - auditRequest.setHostName(hostName); - return this; - } - - /** - * Add id to this {@link AuditRequestBuilder}. - * - * @param id - * id - * @return {@link AuditRequestBuilder} - */ - public AuditRequestBuilder setId(String id) { - auditRequest.setId(id); - return this; - } - - /** - * Add idType to this {@link AuditRequestBuilder}. - * - * @param idType - * idType - * @return {@link AuditRequestBuilder} - */ - public AuditRequestBuilder setIdType(String idType) { - auditRequest.setIdType(idType); - return this; - } - - /** - * Add moduleId to this {@link AuditRequestBuilder}. - * - * @param moduleId - * moduleId - * @return {@link AuditRequestBuilder} - */ - public AuditRequestBuilder setModuleId(String moduleId) { - auditRequest.setModuleId(moduleId); - return this; - } - - /** - * Add moduleName to this {@link AuditRequestBuilder}. - * - * @param moduleName - * moduleName - * @return {@link AuditRequestBuilder} - */ - public AuditRequestBuilder setModuleName(String moduleName) { - auditRequest.setModuleName(moduleName); - return this; - } - - /** - * Add sessionUserId to this {@link AuditRequestBuilder}. - * - * @param sessionUserId - * sessionUserId - * @return {@link AuditRequestBuilder} - */ - public AuditRequestBuilder setSessionUserId(String sessionUserId) { - auditRequest.setSessionUserId(sessionUserId); - return this; - } - - /** - * Add sessionUserName to this {@link AuditRequestBuilder}. - * - * @param sessionUserName - * sessionUserName - * @return {@link AuditRequestBuilder} - */ - public AuditRequestBuilder setSessionUserName(String sessionUserName) { - auditRequest.setSessionUserName(sessionUserName); - return this; - } - - /** - * Sets the created at. - * - * @param createdAt - * the created at - * @return the audit request builder - */ - public AuditRequestBuilder setCreatedAt(LocalDateTime createdAt) { - auditRequest.setCreatedAt(createdAt); - return this; - } - - /** - * Sets the uuid. - * - * @param uuid - * the uuid - * @return the audit request builder - */ - public AuditRequestBuilder setUuid(String uuid) { - auditRequest.setUuid(uuid); - return this; - } - - /** - * Builds {@link AuditRequestDto} from {@link AuditRequestBuilder}. - * - * @return The {@link AuditRequestDto} - */ - public AuditDTO build() { - return auditRequest; - } -} diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/config/PacketGeneratorSwaggerConfig.java b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/config/PacketGeneratorSwaggerConfig.java deleted file mode 100644 index 2cfe45b0e85..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/config/PacketGeneratorSwaggerConfig.java +++ /dev/null @@ -1,27 +0,0 @@ -package io.mosip.packetgenerator.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2; -/** - * - * @author Girish Yarru - * - */ -@Configuration -@EnableSwagger2 -public class PacketGeneratorSwaggerConfig { - @Bean - public Docket swaggerConfigurations() { - return new Docket(DocumentationType.SWAGGER_2).groupName("Packet Generator and Uploader").select() - .apis(RequestHandlerSelectors.basePackage("io.mosip.packetgenerator.controller")) - .paths(PathSelectors.ant("/*")).build(); - - } - -} diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/constant/DocumentType.java b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/constant/DocumentType.java deleted file mode 100644 index 40b0791d3ac..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/constant/DocumentType.java +++ /dev/null @@ -1,22 +0,0 @@ -package io.mosip.packetgenerator.constant; -/** - * - * @author Girish Yarru - * - */ -public enum DocumentType { - DEMOGRAPHIC("Demographic"), - BIOMETRIC("Biometric"), - NONE("None"); - - public final String docType; - - private DocumentType(String docType) { - this.docType = docType; - } - - @Override - public String toString() { - return docType; - } -} diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/constant/ErrorMessages.java b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/constant/ErrorMessages.java deleted file mode 100644 index 48bbbbcf577..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/constant/ErrorMessages.java +++ /dev/null @@ -1,33 +0,0 @@ -package io.mosip.packetgenerator.constant; -/** - * - * @author Girish Yarru - * - */ -public enum ErrorMessages { - API_RESOUCE_ACCESS_FAILED("PKTGNR - 001", "Api Access Exception "), - ID_VALIDATION_FAILED("PKTGNR - 002","Id Object validation failed "), - WRITE_FILE_TO_ZIPFAILED("PKTGNR - 003","Exception occured while creating packet "), - ENCRYPTION_EXCEPTION("PKTGNR - 003","Exception occured while encrypting the packet "), - INVALID_REQUEST("PKTGNR - 004","InvalidRequest - "), - SYNC_FAILED("PKTGNR - 005","Sync Failed"), - FAILED_TO_UPLOAD("PKTGNR - 006","Failed to upload file"), - SYSTEM_EXCEPTION_OCCURED("PKTGNR - 005","System exception occured "), - RUNTIME_EXCEPTION("PKTGNR - 005","System exception occured "); - public String errorCode; - public String errorMessage; - - private ErrorMessages(String errorCode, String errorMessage) { - this.errorCode = errorCode; - this.errorMessage = errorMessage; - } - - public String getErrorCode() { - return errorCode; - } - - public String getErrorMessage() { - return errorMessage; - } - -} diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/constant/GenderType.java b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/constant/GenderType.java deleted file mode 100644 index 6369d12c8ad..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/constant/GenderType.java +++ /dev/null @@ -1,6 +0,0 @@ -package io.mosip.packetgenerator.constant; - -public enum GenderType { - MALE, FEMALE; - //OTHER -} diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/constant/PacketGeneratorConstants.java b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/constant/PacketGeneratorConstants.java deleted file mode 100644 index a644c4fa3a1..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/constant/PacketGeneratorConstants.java +++ /dev/null @@ -1,40 +0,0 @@ -package io.mosip.packetgenerator.constant; - -public class PacketGeneratorConstants { - public static final String IDENTITY = "identity"; - public static final String VALUE = "value"; - public static final String LANGUAGE = "language"; - public static final String ID = "ID"; - public static final String CENTER_ID = "centerId"; - public static final String MACHINE_ID = "machineId"; - public static final String PACKET_META_INFO = "packet_meta_info"; - public static final String META_DATA = "metaData"; - public static final String LABEL = "label"; - public static final String REGISTRATION_ID = "registrationId"; - public static final String AUDIT = "audit"; - public static final String HASHSEQUENCE1 = "hashSequence1"; - public static final String HASHSEQUENCE2 = "hashSequence2"; - public static final String PACKET_DATA_HASH = "packet_data_hash"; - public static final String PACKET_OSI_DATA_HASH = "packet_osi_hash"; - public static final String REG_SYNC_SERVICE_ID = "mosip.registration.processor.registration.sync.id"; - public static final String REG_SYNC_APPLICATION_VERSION = "mosip.registration.processor.application.version"; - public static final String DATETIME_PATTERN = "mosip.registration.processor.datetime.pattern"; - public static final String SYNCSTATUSCOMMENT = "UIN Reactivation and Deactivation By External Resources"; - public static final String EXTENSION_OF_FILE = ".zip"; - public static final String PACKET_RECEIVED = "PACKET_RECEIVED"; - public static final String AUDIT_APPLICATION_ID = "registration.processor.audit.applicationId"; - public static final String AUDIT_APPLICATION_NAME = "registration.processor.audit.applicationName"; - public static final String SUCCESS = "SUCCESS"; - public static final String FAILURE = "FAILURE"; - public static final String GENDER = "gender"; - public static final String MALE = "Male"; - public static final String FEMALE = "Female"; - public static final String OTHERS = "Others"; - - - - private PacketGeneratorConstants() { - // do nothing - } - -} diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/controller/PacketGeneratorController.java b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/controller/PacketGeneratorController.java deleted file mode 100644 index 84178945ffa..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/controller/PacketGeneratorController.java +++ /dev/null @@ -1,60 +0,0 @@ -package io.mosip.packetgenerator.controller; - -import java.io.InputStream; - -import javax.validation.Valid; - -import org.fusesource.hawtbuf.ByteArrayInputStream; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.io.InputStreamResource; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; - -import io.mosip.packetgenerator.dto.Response; -import io.mosip.packetgenerator.dto.Request; -import io.mosip.packetgenerator.dto.PacketDetails; -import io.mosip.packetgenerator.exception.RegBaseCheckedException; -import io.mosip.packetgenerator.service.PacketeneratorService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; -/** - * - * @author Girish Yarru - * - */ -@RestController -@Api(tags = "Packet Generator and Uploader") -public class PacketGeneratorController { - @Autowired - private PacketeneratorService service; - - @PostMapping(path = "/createAndUpload", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) - @ApiOperation(value = "create and upload packet to Registration Processor", response = Request.class) - @ApiResponses(value = { @ApiResponse(code = 200, message = "Packet has been created and uploaded successfully") }) - - public ResponseEntity createAndUploadPacket(@RequestBody @Valid Request request) - throws RegBaseCheckedException { - Response response = service.createAndUploadPacket(request); - return ResponseEntity.ok().body(response); - } - - @PostMapping(path = "/createAndSync") - @ApiOperation(value = "click of 'Download File' to download created packet", response = Object.class) - @ApiResponses(value = { @ApiResponse(code = 200, message = "Packet encrypted successfully") }) - public ResponseEntity createAndSyncPacket(@RequestBody @Valid Request request) - throws RegBaseCheckedException { - PacketDetails packetDetails = service.createAndSyncPacket(request); - String regId = packetDetails.getRegistartionId(); - InputStream encryptPacketStream = new ByteArrayInputStream(packetDetails.getPacketBytes()); - InputStreamResource resource = new InputStreamResource(encryptPacketStream); - return ResponseEntity.ok().contentType(MediaType.parseMediaType("application/zip")) - .header("Content-Disposition", "attachment; filename=\"" + regId + ".zip\"").body((Object) resource); - - } -} diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/customvalidation/DOB.java b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/customvalidation/DOB.java deleted file mode 100644 index 467112c6152..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/customvalidation/DOB.java +++ /dev/null @@ -1,28 +0,0 @@ -package io.mosip.packetgenerator.customvalidation; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import javax.validation.Constraint; -import javax.validation.Payload; -/** - * - * @author Girish Yarru - * - */ -@Documented -@Constraint(validatedBy = { DOBValidator.class }) -@Target(value = { ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER }) -@Retention(RetentionPolicy.RUNTIME) -public @interface DOB { - String message() default "Date format should be [yyyy/MM/dd] and dob should be less than 4 years of current date"; - - Class[] groups() default {}; - - Class[] payload() default {}; - - String pattern(); -} diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/customvalidation/DOBValidator.java b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/customvalidation/DOBValidator.java deleted file mode 100644 index 5bc9b084471..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/customvalidation/DOBValidator.java +++ /dev/null @@ -1,42 +0,0 @@ -package io.mosip.packetgenerator.customvalidation; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; - -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -/** - * - * @author Girish Yarru - * - */ -public class DOBValidator implements ConstraintValidator { - - private String pattern; - - @Override - public void initialize(DOB constraintAnnotation) { - this.pattern = constraintAnnotation.pattern(); - } - - @Override - public boolean isValid(String value, ConstraintValidatorContext context) { - try { - Date date = new SimpleDateFormat(pattern).parse(value); - Calendar cal = Calendar.getInstance(); - Date today = cal.getTime(); - cal.add(Calendar.YEAR, -4); // date - Date before4Years = cal.getTime(); - if (date.compareTo(new Date()) >= 0 || date.compareTo(before4Years) >= 0) { - return false; - } - return true; - } catch (ParseException e) { - e.printStackTrace(); - } - return false; - } - -} diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/customvalidation/Gender.java b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/customvalidation/Gender.java deleted file mode 100644 index 070e9849b18..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/customvalidation/Gender.java +++ /dev/null @@ -1,31 +0,0 @@ -package io.mosip.packetgenerator.customvalidation; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import javax.validation.Constraint; -import javax.validation.Payload; -/** - * - * @author Girish Yarru - * - */ -@Documented -@Constraint(validatedBy = { GenderValidator.class }) -@Target(value = { ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER }) -@Retention(RetentionPolicy.RUNTIME) -public @interface Gender { - public abstract String message() default "Invalid value. Please enter any of these values [Male,Female]"; - - public abstract Class[] groups() default {}; - - public abstract Class[] payload() default {}; - - public abstract Class> enumClass(); - - public abstract boolean ignoreCase() default false; - -} diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/customvalidation/GenderValidator.java b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/customvalidation/GenderValidator.java deleted file mode 100644 index f190966abb5..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/customvalidation/GenderValidator.java +++ /dev/null @@ -1,42 +0,0 @@ -package io.mosip.packetgenerator.customvalidation; - -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; - /** - * - * @author Girish Yarru - * - */ -public class GenderValidator implements ConstraintValidator -{ - private Gender annotation; - - @Override - public void initialize(Gender annotation) - { - this.annotation = annotation; - } - - @Override - public boolean isValid(String valueForValidation, ConstraintValidatorContext constraintValidatorContext) - { - boolean result = false; - - Object[] enumValues = this.annotation.enumClass().getEnumConstants(); - - if(enumValues != null) - { - for(Object enumValue:enumValues) - { - if(valueForValidation.equals(enumValue.toString()) - || (this.annotation.ignoreCase() && valueForValidation.equalsIgnoreCase(enumValue.toString()))) - { - result = true; - break; - } - } - } - - return result; - } -} \ No newline at end of file diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/AuditDTO.java b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/AuditDTO.java deleted file mode 100644 index 6965a1486a4..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/AuditDTO.java +++ /dev/null @@ -1,43 +0,0 @@ -package io.mosip.packetgenerator.dto; - -import java.io.Serializable; -import java.time.LocalDateTime; - -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * This class is to capture the time duration for each event - * - * @author Sowmya - * - * - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class AuditDTO extends BaseDTO implements Serializable { - - /** - * - */ - private static final long serialVersionUID = 6615819066351989845L; - protected String eventId; - protected String eventName; - protected String eventType; - protected LocalDateTime actionTimeStamp; - protected String hostName; - protected String hostIp; - protected String applicationId; - protected String applicationName; - protected String sessionUserId; - protected String sessionUserName; - protected String id; - protected String idType; - protected String createdBy; - protected String moduleName; - protected String moduleId; - protected String description; - protected String uuid; - protected LocalDateTime createdAt; - -} diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/BaseDTO.java b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/BaseDTO.java deleted file mode 100644 index ae299f640d1..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/BaseDTO.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.mosip.packetgenerator.dto; - -import java.io.Serializable; - -import lombok.Data; - -@Data -public class BaseDTO implements Serializable { - -} diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/DocumentDetails.java b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/DocumentDetails.java deleted file mode 100644 index f536f349db7..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/DocumentDetails.java +++ /dev/null @@ -1,13 +0,0 @@ -package io.mosip.packetgenerator.dto; - -import io.mosip.packetgenerator.constant.DocumentType; -import lombok.Data; - -@Data -public class DocumentDetails { - private DocumentType docType; - private String docExtension; - private byte[] docValue; - private String docName; - -} diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/PacketDetails.java b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/PacketDetails.java deleted file mode 100644 index 382d6510308..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/PacketDetails.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.mosip.packetgenerator.dto; - -import lombok.Data; - -@Data -public class PacketDetails { - private String registartionId; - private byte[] packetBytes; - -} diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/PacketReceiverResponseDTO.java b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/PacketReceiverResponseDTO.java deleted file mode 100644 index 7664b097864..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/PacketReceiverResponseDTO.java +++ /dev/null @@ -1,28 +0,0 @@ -package io.mosip.packetgenerator.dto; - -import java.io.Serializable; -import java.util.List; - -import io.mosip.registration.processor.core.common.rest.dto.BaseRestResponseDTO; -import io.mosip.registration.processor.core.common.rest.dto.ErrorDTO; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * Instantiates a new packet receiver response DTO. - * - * @author Rishabh Keshari - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class PacketReceiverResponseDTO extends BaseRestResponseDTO implements Serializable { - - private static final long serialVersionUID = -6943589722277098292L; - - /** The response. */ - private PacketReceiverSubResponseDTO response; - - /** The errors. */ - private List errors; - -} diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/PacketReceiverSubResponseDTO.java b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/PacketReceiverSubResponseDTO.java deleted file mode 100644 index d4b4d33ec13..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/PacketReceiverSubResponseDTO.java +++ /dev/null @@ -1,22 +0,0 @@ -package io.mosip.packetgenerator.dto; - -import java.io.Serializable; - -import lombok.Data; - -/** - * Instantiates a new response DTO. - * @author Rishabh Keshari - */ -@Data -public class PacketReceiverSubResponseDTO implements Serializable{ - - /** - * - */ - private static final long serialVersionUID = 3501660956959221378L; - - /** The status. */ - private String status; - -} diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/PacketRequestDto.java b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/PacketRequestDto.java deleted file mode 100644 index de19d65a8c2..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/PacketRequestDto.java +++ /dev/null @@ -1,58 +0,0 @@ -package io.mosip.packetgenerator.dto; - -import javax.validation.constraints.Email; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; - -import com.fasterxml.jackson.annotation.JsonFormat; - -import io.mosip.packetgenerator.constant.GenderType; -import io.mosip.packetgenerator.customvalidation.DOB; -import io.mosip.packetgenerator.customvalidation.Gender; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class PacketRequestDto { - @ApiModelProperty(value = "the first name", position = 1) - @NotNull(message = "firstName should not be null ") - @NotBlank(message = "firstName should not be empty") - private String firstName; - @ApiModelProperty(value = "the last name", position = 2) - @NotNull(message = "lastName should not be null ") - @NotBlank(message = "lastName should not be empty") - private String lastName; - @ApiModelProperty(value = "the gender", position = 3, example = "Male|Female") - @NotNull(message = "gender should not be null ") - @Gender(enumClass = GenderType.class, ignoreCase = true) - private String gender; - @ApiModelProperty(value = "the date of birth", position = 4, example = "yyyy/MM/dd") - @NotNull(message = "dateOfBirth should not be null ") - @NotBlank(message = "dateOfBirth should not be empty") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy/MM/dd") - @DOB(pattern = "yyyy/MM/dd") - private String dateOfBirth; - @ApiModelProperty(value = "the age", position = 5, example = "5") - @NotNull(message = "age should not be null ") - @Min(5) - private int age; - @ApiModelProperty(value = "the phone number", position = 6) - @Pattern(regexp = "(^$|[0-9]{10})") - @NotNull(message = "phone should not be null ") - @NotBlank(message = "phone should not be empty") - private String phone; - @ApiModelProperty(value = "the email", position = 7) - @Email - private String email; - @ApiModelProperty(value = "the addressline1", position = 8) - @NotNull(message = "addressLine1 should not be null ") - @NotBlank(message = "addressLine1 should not be empty") - private String addressLine1; - @ApiModelProperty(value = "the addressline1", position = 9) - private String addressLine2; - @ApiModelProperty(value = "the addressline1", position = 10) - private String addressLine3; - -} diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/PacketResponseDto.java b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/PacketResponseDto.java deleted file mode 100644 index fbccc34a6cb..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/PacketResponseDto.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.mosip.packetgenerator.dto; - -import lombok.Data; - -@Data -public class PacketResponseDto { - private String registartionId; - private String status; - -} diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/PublicKeyResponseDto.java b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/PublicKeyResponseDto.java deleted file mode 100644 index 0202f9afe7d..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/PublicKeyResponseDto.java +++ /dev/null @@ -1,47 +0,0 @@ -package io.mosip.packetgenerator.dto; - -import java.io.Serializable; - -import lombok.Data; - -/* (non-Javadoc) - * @see java.lang.Object#toString() - * @author Rishabh Keshari - */ -@Data -public class PublicKeyResponseDto implements Serializable { - - /** - * - */ - private static final long serialVersionUID = -5038613164048257390L; - - /** The public key. */ - private String publicKey; - - /** The issued at. */ - private String issuedAt; - - /** The expiry at. */ - private String expiryAt; - - /** - * Instantiates a new public key response dto. - * - * @param publicKey - * the public key - * @param issuedAt - * the issued at - * @param expiryAt - * the expiry at - */ - public PublicKeyResponseDto(String publicKey, String issuedAt, String expiryAt) { - this.publicKey = publicKey; - this.issuedAt = issuedAt; - this.expiryAt = expiryAt; - } - public PublicKeyResponseDto() { - - } - -} diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/Request.java b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/Request.java deleted file mode 100644 index a0166b5d77a..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/Request.java +++ /dev/null @@ -1,28 +0,0 @@ -package io.mosip.packetgenerator.dto; - -import java.io.Serializable; -import java.time.LocalDateTime; -import java.time.ZoneId; - -import javax.validation.Valid; - -import com.fasterxml.jackson.annotation.JsonFormat; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class Request implements Serializable { - - private static final long serialVersionUID = 4373201325809902206L; - @ApiModelProperty(notes = "id", example = "io.mosip.packetgenerator.uploader", required = true) - private String id = "io.mosip.packetgenerator.uploader"; - @ApiModelProperty(notes = "id", example = "v1", required = true) - private String version = "v1"; - @ApiModelProperty(notes = "Timestamp as metadata", example = "2020-02-11T14:07:03.134Z", required = true) - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") - private String requesttime = String.valueOf(LocalDateTime.now(ZoneId.of("UTC"))); - @Valid - private PacketRequestDto request; - -} \ No newline at end of file diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/Response.java b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/Response.java deleted file mode 100644 index 90578381835..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/dto/Response.java +++ /dev/null @@ -1,22 +0,0 @@ -package io.mosip.packetgenerator.dto; - -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.util.ArrayList; -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonFormat; - -import io.mosip.registration.processor.core.common.rest.dto.ErrorDTO; -import lombok.Data; - -@Data -public class Response { - private String id = "io.mosip.packetgenerator.uploader"; - private String version = "v1"; - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") - private LocalDateTime responsetime = LocalDateTime.now(ZoneId.of("UTC")); - private Object metadata; - private List errors = new ArrayList<>(); - private PacketResponseDto response; -} diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/exception/PacketGeneratorExceptionHandler.java b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/exception/PacketGeneratorExceptionHandler.java deleted file mode 100644 index 5fee12f3231..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/exception/PacketGeneratorExceptionHandler.java +++ /dev/null @@ -1,103 +0,0 @@ -package io.mosip.packetgenerator.exception; - -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.FieldError; -import org.springframework.web.bind.MethodArgumentNotValidException; -import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.RestControllerAdvice; - -import io.mosip.kernel.core.exception.BaseCheckedException; -import io.mosip.kernel.core.exception.BaseUncheckedException; -import io.mosip.packetgenerator.constant.ErrorMessages; -import io.mosip.packetgenerator.controller.PacketGeneratorController; -import io.mosip.packetgenerator.dto.Response; -import io.mosip.registration.processor.core.common.rest.dto.ErrorDTO; -/** - * - * @author Girish Yarru - * - */ -@RestControllerAdvice(assignableTypes = PacketGeneratorController.class) -public class PacketGeneratorExceptionHandler { - @ExceptionHandler(MethodArgumentNotValidException.class) - public ResponseEntity methodArgumentNotValidException(final HttpServletRequest httpServletRequest, - final MethodArgumentNotValidException e) { - List fieldErrors = e.getBindingResult().getFieldErrors(); - Response response = buildResponse(fieldErrors); - return ResponseEntity.status(HttpStatus.OK).body(response); - } - - @ExceptionHandler(RegBaseCheckedException.class) - public ResponseEntity controlDataServiceException(HttpServletRequest httpServletRequest, - final RegBaseCheckedException e) { - Response response = buildResponse(e); - return ResponseEntity.status(HttpStatus.OK).body(response); - } - - @ExceptionHandler(RuntimeException.class) - public ResponseEntity test(HttpServletRequest httpServletRequest, final RuntimeException e) { - Response response = buildResponse(e); - return ResponseEntity.status(HttpStatus.OK).body(response); - } - - private Response buildResponse(Exception ex) { - Response response = new Response(); - - if (ex instanceof BaseCheckedException) { - - List errorCodes = ((BaseCheckedException) ex).getCodes(); - List errorTexts = ((BaseCheckedException) ex).getErrorTexts(); - - List errors = errorTexts.parallelStream() - .map(errMsg -> new ErrorDTO(errorCodes.get(errorTexts.indexOf(errMsg)), errMsg)).distinct() - .collect(Collectors.toList()); - - response.setErrors(errors); - } else if (ex instanceof BaseUncheckedException) { - List errorCodes = ((BaseUncheckedException) ex).getCodes(); - List errorTexts = ((BaseUncheckedException) ex).getErrorTexts(); - - List errors = errorTexts.parallelStream() - .map(errMsg -> new ErrorDTO(errorCodes.get(errorTexts.indexOf(errMsg)), errMsg)).distinct() - .collect(Collectors.toList()); - - response.setErrors(errors); - } else { - List errors = new ArrayList<>(); - ErrorDTO dto = new ErrorDTO(); - dto.setErrorCode(ErrorMessages.RUNTIME_EXCEPTION.getErrorCode()); - dto.setMessage(ErrorMessages.RUNTIME_EXCEPTION.getErrorMessage() + ex.getMessage()); - errors.add(dto); - response.setErrors(errors); - } - - response.setResponsetime(LocalDateTime.now()); - response.setVersion("version"); - response.setResponse(null); - return response; - } - - private Response buildResponse(List objErrors) { - Response response = new Response(); - List details = new ArrayList<>(); - ErrorDTO errorDto; - for (FieldError error : objErrors) { - errorDto = new ErrorDTO(); - errorDto.setErrorCode(ErrorMessages.INVALID_REQUEST.getErrorCode()); - errorDto.setMessage(ErrorMessages.INVALID_REQUEST.getErrorMessage() + error.getField() + " - " - + error.getDefaultMessage()); - details.add(errorDto); - } - response.setErrors(details); - return response; - - } -} diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/exception/RegBaseCheckedException.java b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/exception/RegBaseCheckedException.java deleted file mode 100644 index efc1737f5e7..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/exception/RegBaseCheckedException.java +++ /dev/null @@ -1,60 +0,0 @@ -package io.mosip.packetgenerator.exception; - -import io.mosip.kernel.core.exception.BaseCheckedException; -import io.mosip.registration.processor.core.exception.util.PlatformErrorMessages; -import io.mosip.registration.processor.core.status.util.StatusUtil; - -/** - * The class to handle all the checked exception in REG - * - * @author Sowmya - * @since 1.0.0 - * - */ -public class RegBaseCheckedException extends BaseCheckedException { - - /** - * Serializable Version Id - */ - private static final long serialVersionUID = 7381314129809012005L; - - /** - * Instance of {@link Logger} - */ - - /** - * Constructs a new checked exception - */ - public RegBaseCheckedException() { - super(); - } - - public RegBaseCheckedException(PlatformErrorMessages exceptionConstant, Throwable rootCause) { - super(exceptionConstant.getCode(), exceptionConstant.getMessage(), rootCause); - } - - public RegBaseCheckedException(StatusUtil exceptionConstant, Throwable rootCause) { - super(exceptionConstant.getCode(), exceptionConstant.getMessage(), rootCause); - } - - public RegBaseCheckedException(String errorCode, String errorMessage) { - super(errorCode, errorMessage); - } - - public RegBaseCheckedException(PlatformErrorMessages exceptionConstant, String message, Throwable rootCause) { - super(exceptionConstant.getCode(), message, rootCause); - } - - public RegBaseCheckedException(String errorCode, String errorMessage, Throwable rootCause) { - super(errorCode, errorMessage, rootCause); - } - - public RegBaseCheckedException(String errorCode, String errorMessage, Throwable rootCause, String id) { - super(errorCode, errorMessage, rootCause); - } - - public RegBaseCheckedException(PlatformErrorMessages exceptionConstant) { - this(exceptionConstant.getCode(), exceptionConstant.getMessage()); - } - -} diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/exception/RegBaseUnCheckedException.java b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/exception/RegBaseUnCheckedException.java deleted file mode 100644 index c1721783f0f..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/exception/RegBaseUnCheckedException.java +++ /dev/null @@ -1,47 +0,0 @@ -package io.mosip.packetgenerator.exception; - -import io.mosip.kernel.core.exception.BaseUncheckedException; - -/** - * @author Sowmya The Class RegBaseUnCheckedException. - */ -public class RegBaseUnCheckedException extends BaseUncheckedException { - - /** The Constant serialVersionUID. */ - private static final long serialVersionUID = 3422834488678859452L; - - /** - * Constructs a new unchecked exception. - */ - public RegBaseUnCheckedException() { - super(); - } - - /** - * Constructor. - * - * @param errorCode - * the Error Code Corresponds to Particular Exception - * @param errorMessage - * the Message providing the specific context of the error - */ - public RegBaseUnCheckedException(String errorCode, String errorMessage) { - super(errorCode, errorMessage); - - } - - /** - * Constructor. - * - * @param errorCode - * the Error Code Corresponds to Particular Exception - * @param errorMessage - * the Message providing the specific context of the error - * @param throwable - * the Cause of exception - */ - public RegBaseUnCheckedException(String errorCode, String errorMessage, Throwable throwable) { - super(errorCode, errorMessage, throwable); - - } -} diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/service/PacketeneratorService.java b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/service/PacketeneratorService.java deleted file mode 100644 index 55474af4994..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/service/PacketeneratorService.java +++ /dev/null @@ -1,686 +0,0 @@ -package io.mosip.packetgenerator.service; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import io.mosip.kernel.core.idobjectvalidator.constant.IdObjectValidatorSupportedOperations; -import io.mosip.kernel.core.idobjectvalidator.exception.IdObjectIOException; -import io.mosip.kernel.core.idobjectvalidator.exception.IdObjectValidationFailedException; -import io.mosip.kernel.core.idobjectvalidator.spi.IdObjectValidator; -import io.mosip.kernel.core.util.DateUtils; -import io.mosip.kernel.core.util.HMACUtils; -import io.mosip.kernel.core.util.JsonUtils; -import io.mosip.kernel.core.util.exception.JsonProcessingException; -import io.mosip.packetgenerator.builder.AuditRequestBuilder; -import io.mosip.packetgenerator.constant.DocumentType; -import io.mosip.packetgenerator.constant.ErrorMessages; -import io.mosip.packetgenerator.constant.PacketGeneratorConstants; -import io.mosip.packetgenerator.dto.*; -import io.mosip.packetgenerator.exception.RegBaseCheckedException; -import io.mosip.packetgenerator.exception.RegBaseUnCheckedException; -import io.mosip.packetgenerator.util.EncryptorUtil; -import io.mosip.registration.processor.core.code.ApiName; -import io.mosip.registration.processor.core.common.rest.dto.ErrorDTO; -import io.mosip.registration.processor.core.exception.ApisResourceAccessException; -import io.mosip.registration.processor.core.exception.util.PlatformErrorMessages; -import io.mosip.registration.processor.core.http.ResponseWrapper; -import io.mosip.registration.processor.core.spi.restclient.RegistrationProcessorRestClientService; -import io.mosip.registration.processor.core.util.JsonUtil; -import io.mosip.registration.processor.core.util.ServerUtil; -import io.mosip.registration.processor.status.code.SupervisorStatus; -import io.mosip.registration.processor.status.dto.RegistrationSyncRequestDTO; -import io.mosip.registration.processor.status.dto.SyncRegistrationDto; -import io.mosip.registration.processor.status.dto.SyncResponseDto; -import io.mosip.registration.processor.status.sync.response.dto.RegSyncResponseDTO; -import org.apache.commons.io.FilenameUtils; -import org.apache.commons.io.IOUtils; -import org.json.simple.JSONArray; -import org.json.simple.JSONObject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.core.env.Environment; -import org.springframework.core.io.ByteArrayResource; -import org.springframework.core.io.ClassPathResource; -import org.springframework.core.io.Resource; -import org.springframework.core.io.ResourceLoader; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; -import org.springframework.stereotype.Service; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.web.client.HttpClientErrorException; -import org.springframework.web.client.HttpServerErrorException; - -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.math.BigInteger; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.security.NoSuchAlgorithmException; -import java.security.spec.InvalidKeySpecException; -import java.time.LocalDateTime; -import java.time.ZoneOffset; -import java.time.format.DateTimeFormatter; -import java.util.*; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; - -import static io.mosip.kernel.core.util.JsonUtils.javaObjectToJsonString; -import static java.io.File.separator; - -/** - * @author Girish Yarru - */ -@Service -public class PacketeneratorService { - - private static final Logger logger = LoggerFactory.getLogger(PacketeneratorService.class.getName()); - private Gson gson = new GsonBuilder().serializeNulls().create(); - - @Autowired - private ResourceLoader resourceLoader; - - @Value("${mosip.kernel.registrationcenterid.length}") - private int centerIdLength; - - @Value("${registration.processor.rid.machineidsubstring}") - private int machineIdLength; - - @Autowired - private RegistrationProcessorRestClientService restClientService; - @Autowired - private IdObjectValidator idObjectSchemaValidator; - @Autowired - private Environment environment; - @Autowired - private EncryptorUtil encryptUtil; - - private static final String NEW = "NEW"; - - public Response createAndUploadPacket(Request request) throws RegBaseCheckedException { - Response response = new Response(); - PacketDetails packetDetails = createPacketBytes(request); - String regId = packetDetails.getRegistartionId(); - byte[] packetBytes = packetDetails.getPacketBytes(); - String creationTime = getPacketCreationTime(regId); - byte[] encryptedBytes = encryptPacket(packetBytes, regId, creationTime); - logger.info("sending request to sync and upload"); - PacketResponseDto packetResponseDto = syncAndUploadPacket(encryptedBytes, regId, creationTime); - logger.info("response status : " + packetResponseDto.getStatus()); - response.setErrors(null); - response.setResponse(packetResponseDto); - return response; - } - - public PacketDetails createAndSyncPacket(Request request) throws RegBaseCheckedException { - PacketDetails packetDetails = createPacketBytes(request); - String registartionId = packetDetails.getRegistartionId(); - String creationTime = getPacketCreationTime(registartionId); - byte[] packetBytes = packetDetails.getPacketBytes(); - byte[] encryptedBytes = encryptPacket(packetBytes, registartionId, creationTime); - RegSyncResponseDTO regSyncResponseDTO = packetSync(registartionId, NEW, encryptedBytes, creationTime); - if (regSyncResponseDTO == null) - throw new RegBaseCheckedException(ErrorMessages.API_RESOUCE_ACCESS_FAILED.getErrorCode(), - ErrorMessages.API_RESOUCE_ACCESS_FAILED.getErrorMessage()); - if (regSyncResponseDTO.getErrors() != null - || regSyncResponseDTO.getErrors() != null && !regSyncResponseDTO.getErrors().isEmpty()) - throw new RegBaseCheckedException(ErrorMessages.SYNC_FAILED.getErrorCode(), - ErrorMessages.SYNC_FAILED.getErrorMessage() + String.valueOf(regSyncResponseDTO.getErrors())); - packetDetails.setPacketBytes(encryptedBytes); - return packetDetails; - - } - - @SuppressWarnings("unchecked") - private PacketDetails createPacketBytes(Request identityRequestDto) throws RegBaseCheckedException { - PacketDetails packetDetails = new PacketDetails(); - Map docsInfo = new HashMap<>(); - JSONObject packetMetaInfoJson = null; - String regId = null; - try { - getAllDocsFromResourceAsMap(docsInfo); - } catch (IOException e) { - e.printStackTrace(); - } - try { - Map identityRequestMap = getIdentityRequestDtoMap(identityRequestDto); - byte[] idBytes = docsInfo.get(PacketGeneratorConstants.ID).getDocValue(); - String idJsonString = new String(idBytes); - JSONObject idJsonObject = JsonUtil.objectMapperReadValue(idJsonString, JSONObject.class); - JSONObject identityJson = JsonUtil.getJSONObject(idJsonObject, PacketGeneratorConstants.IDENTITY); - Set keys = identityRequestMap.keySet(); - keys.parallelStream().forEach(key -> { - Object object = identityJson.get(key); - if (object instanceof ArrayList) { - JSONArray array = JsonUtil.getJSONArray(identityJson, key); - for (Object jsonObj : array) { - if (jsonObj instanceof LinkedHashMap) { - if (PacketGeneratorConstants.GENDER.equalsIgnoreCase(key) && "ara".equals( - ((LinkedHashMap) jsonObj).get(PacketGeneratorConstants.LANGUAGE))) { - if (PacketGeneratorConstants.MALE - .equalsIgnoreCase(identityRequestDto.getRequest().getGender())) { - ((LinkedHashMap) jsonObj).put(PacketGeneratorConstants.VALUE, - "الذكر"); - } else if (PacketGeneratorConstants.FEMALE - .equalsIgnoreCase(identityRequestDto.getRequest().getGender())) { - ((LinkedHashMap) jsonObj).put(PacketGeneratorConstants.VALUE, - "أنثى"); - } else { - ((LinkedHashMap) jsonObj).put(PacketGeneratorConstants.VALUE, - "الآخرين"); - } - } else if (PacketGeneratorConstants.GENDER.equalsIgnoreCase(key) && "eng".equals( - ((LinkedHashMap) jsonObj).get(PacketGeneratorConstants.LANGUAGE))) { - - if (PacketGeneratorConstants.MALE - .equalsIgnoreCase(identityRequestDto.getRequest().getGender())) { - ((LinkedHashMap) jsonObj).put(PacketGeneratorConstants.VALUE, - "Male"); - } else if (PacketGeneratorConstants.FEMALE - .equalsIgnoreCase(identityRequestDto.getRequest().getGender())) { - ((LinkedHashMap) jsonObj).put(PacketGeneratorConstants.VALUE, - "Female"); - } else { - ((LinkedHashMap) jsonObj).put(PacketGeneratorConstants.VALUE, - "Others"); - } - - } else { - - ((LinkedHashMap) jsonObj).put(PacketGeneratorConstants.VALUE, - identityRequestMap.get(key)); - } - - } - } - } else if (object instanceof LinkedHashMap) { - ((LinkedHashMap) object).put(PacketGeneratorConstants.VALUE, - identityRequestMap.get(key)); - } else { - LinkedHashMap tempMap = (LinkedHashMap) idJsonObject - .get(PacketGeneratorConstants.IDENTITY); - tempMap.put(key, identityRequestMap.get(key)); - } - }); - - // set changed ID json - DocumentDetails docDetail = docsInfo.get(PacketGeneratorConstants.ID); - docDetail.setDocValue(idJsonObject.toJSONString().getBytes()); - docsInfo.put(PacketGeneratorConstants.ID, docDetail); - idObjectSchemaValidator.validateIdObject(idJsonObject.toJSONString(), - IdObjectValidatorSupportedOperations.NEW_REGISTRATION); - // dynamically get centerId and machineId - String packetMetaInfo = new String(docsInfo.get(PacketGeneratorConstants.PACKET_META_INFO).getDocValue()); - packetMetaInfoJson = (JSONObject) JsonUtil.objectMapperReadValue(packetMetaInfo, JSONObject.class); - String centerId = null; - String machineId = null; - JSONArray metaData = JsonUtil.getJSONArray( - JsonUtil.getJSONObject(packetMetaInfoJson, PacketGeneratorConstants.IDENTITY), - PacketGeneratorConstants.META_DATA); - for (Object obj : metaData) { - if (PacketGeneratorConstants.MACHINE_ID - .equals(((LinkedHashMap) obj).get(PacketGeneratorConstants.LABEL))) { - machineId = ((LinkedHashMap) obj).get(PacketGeneratorConstants.VALUE); - } - if (PacketGeneratorConstants.CENTER_ID - .equals(((LinkedHashMap) obj).get(PacketGeneratorConstants.LABEL))) { - centerId = ((LinkedHashMap) obj).get(PacketGeneratorConstants.VALUE); - } - if (centerId != null && machineId != null) - break; - } - regId = generateRegistrationId(centerId, machineId); - // set registartionId in packet meta info - for (Object obj : metaData) { - if (PacketGeneratorConstants.REGISTRATION_ID - .equals(((LinkedHashMap) obj).get(PacketGeneratorConstants.LABEL))) { - ((LinkedHashMap) obj).put(PacketGeneratorConstants.VALUE, regId); - break; - } - } - - DocumentDetails packetMetaInfodocDetail = docsInfo.get(PacketGeneratorConstants.PACKET_META_INFO); - packetMetaInfodocDetail.setDocValue(packetMetaInfoJson.toJSONString().getBytes()); - docsInfo.put(PacketGeneratorConstants.PACKET_META_INFO, packetMetaInfodocDetail); - - // auditRequestBuilder - AuditRequestBuilder auditRequestBuilder = new AuditRequestBuilder(); - // Getting Host IP Address and Name - String hostIP = null; - String hostName = null; - try { - hostIP = InetAddress.getLocalHost().getHostAddress(); - hostName = InetAddress.getLocalHost().getHostName(); - } catch (UnknownHostException unknownHostException) { - logger.error(unknownHostException.getStackTrace().toString()); - - hostIP = ServerUtil.getServerUtilInstance().getServerIp(); - hostName = ServerUtil.getServerUtilInstance().getServerName(); - } - auditRequestBuilder.setActionTimeStamp(LocalDateTime.now(ZoneOffset.UTC)) - .setCreatedAt(LocalDateTime.now(ZoneOffset.UTC)).setUuid("") - .setApplicationId(environment.getProperty(PacketGeneratorConstants.AUDIT_APPLICATION_ID)) - .setApplicationName(environment.getProperty(PacketGeneratorConstants.AUDIT_APPLICATION_NAME)) - .setCreatedBy("Packet_Generator").setDescription("Packet created successfully") - .setEventId("RPR_405").setEventName("packet uploaded").setEventType("USER").setHostIp(hostIP) - .setHostName(hostName).setId(regId).setIdType("REGISTRATION_ID").setModuleId("REG - MOD - 119") - .setModuleName("PACKET_GENERATOR_UTILITY").setSessionUserId("mosip") - .setSessionUserName("openSourceUser"); - AuditDTO auditDto = auditRequestBuilder.build(); - - // change audit - DocumentDetails audit = docsInfo.get(PacketGeneratorConstants.AUDIT); - audit.setDocValue(JsonUtil.objectMapperObjectToJson(auditDto).getBytes()); - docsInfo.put(PacketGeneratorConstants.AUDIT, audit); - - List hashsequence1Files = new ArrayList<>(); - List hashsequence2Files = new ArrayList<>(); - JSONArray hashsequence1Array = JsonUtil.getJSONArray( - JsonUtil.getJSONObject(packetMetaInfoJson, PacketGeneratorConstants.IDENTITY), - PacketGeneratorConstants.HASHSEQUENCE1); - JSONArray hashsequence2Array = JsonUtil.getJSONArray( - JsonUtil.getJSONObject(packetMetaInfoJson, PacketGeneratorConstants.IDENTITY), - PacketGeneratorConstants.HASHSEQUENCE2); - - // generating hash sequence - for (Object obj : hashsequence1Array) { - hashsequence1Files.addAll( - (List) ((LinkedHashMap) obj).get(PacketGeneratorConstants.VALUE)); - } - for (Object obj : hashsequence2Array) { - hashsequence2Files.addAll( - (List) ((LinkedHashMap) obj).get(PacketGeneratorConstants.VALUE)); - } - - // generate packet data hash - - byte[] packetDataHashBytes = generateHashSequence(hashsequence1Files, docsInfo); - DocumentDetails packetDataHash = docsInfo.get(PacketGeneratorConstants.PACKET_DATA_HASH); - packetDataHash.setDocValue(packetDataHashBytes); - docsInfo.put(PacketGeneratorConstants.PACKET_DATA_HASH, packetDataHash); - - byte[] osiDataHashBytes = generateHashSequence(hashsequence2Files, docsInfo); - DocumentDetails packetOsiDataHash = docsInfo.get(PacketGeneratorConstants.PACKET_OSI_DATA_HASH); - packetOsiDataHash.setDocValue(osiDataHashBytes); - docsInfo.put(PacketGeneratorConstants.PACKET_OSI_DATA_HASH, packetOsiDataHash); - } catch (IOException e) { - logger.error(e.getStackTrace().toString()); - throw new RegBaseCheckedException(ErrorMessages.SYSTEM_EXCEPTION_OCCURED.getErrorCode(), - ErrorMessages.SYSTEM_EXCEPTION_OCCURED.getErrorMessage() + e.getMessage(), e); - } catch (IdObjectValidationFailedException | IdObjectIOException e) { - logger.error(e.getStackTrace().toString()); - throw new RegBaseCheckedException(ErrorMessages.ID_VALIDATION_FAILED.getErrorCode(), - ErrorMessages.ID_VALIDATION_FAILED.getErrorMessage() + e.getMessage(), e); - } - byte[] packetBytes = null; - - // creating zip file - try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); - ZipOutputStream zipOutputStream = new ZipOutputStream(byteArrayOutputStream)) { - Set allFiles = docsInfo.keySet(); - allFiles.forEach(file -> { - try { - DocumentDetails documentDetail = docsInfo.get(file); - if (documentDetail.getDocType().equals(DocumentType.BIOMETRIC)) { - writeFileToZip("Biometric".concat(separator) + documentDetail.getDocName(), - docsInfo.get(file).getDocValue(), zipOutputStream); - } else if (documentDetail.getDocType().equals(DocumentType.DEMOGRAPHIC)) { - writeFileToZip("Demographic".concat(separator) + documentDetail.getDocName(), - docsInfo.get(file).getDocValue(), zipOutputStream); - - } else { - writeFileToZip(documentDetail.getDocName(), docsInfo.get(file).getDocValue(), zipOutputStream); - } - - } catch (RegBaseCheckedException ex) { - logger.error(ex.getStackTrace().toString()); - throw new RegBaseUnCheckedException(ErrorMessages.WRITE_FILE_TO_ZIPFAILED.getErrorCode(), - ErrorMessages.WRITE_FILE_TO_ZIPFAILED.getErrorMessage(), ex); - } - - }); - - zipOutputStream.flush(); - byteArrayOutputStream.flush(); - zipOutputStream.close(); - byteArrayOutputStream.close(); - packetBytes = byteArrayOutputStream.toByteArray(); - } catch (IOException e) { - logger.error(e.getStackTrace().toString()); - throw new RegBaseCheckedException(ErrorMessages.SYSTEM_EXCEPTION_OCCURED.getErrorCode(), - ErrorMessages.SYSTEM_EXCEPTION_OCCURED.getErrorMessage() + e.getMessage(), e); - } - packetDetails.setPacketBytes(packetBytes); - packetDetails.setRegistartionId(regId); - logger.info("packetDetails created..........."); - return packetDetails; - } - - private static void writeFileToZip(String fileName, byte[] file, ZipOutputStream zipOutputStream) - throws RegBaseCheckedException { - try { - final ZipEntry zipEntry = new ZipEntry(fileName); - zipOutputStream.putNextEntry(zipEntry); - zipOutputStream.write(file); - zipOutputStream.flush(); - } catch (IOException ioException) { - logger.error(ioException.getStackTrace().toString()); - throw new RegBaseCheckedException(PlatformErrorMessages.RPR_SYS_IO_EXCEPTION, ioException); - } - } - - private String getPacketCreationTime(String regId) { - String packetCreatedDateTime = regId.substring(regId.length() - 14); - String formattedDate = packetCreatedDateTime.substring(0, 8) + "T" - + packetCreatedDateTime.substring(packetCreatedDateTime.length() - 6); - LocalDateTime ldt = LocalDateTime.parse(formattedDate, DateTimeFormatter.ofPattern("yyyyMMdd'T'HHmmss")); - return ldt.toString() + ".000Z"; - } - - private PacketResponseDto syncAndUploadPacket(byte[] encryptedbyte, String registartionId, String creationTime) - throws RegBaseCheckedException { - PacketResponseDto response = new PacketResponseDto(); - try { - ByteArrayResource contentsAsResource = new ByteArrayResource(encryptedbyte) { - @Override - public String getFilename() { - return registartionId + PacketGeneratorConstants.EXTENSION_OF_FILE; - } - }; - - RegSyncResponseDTO regSyncResponseDTO = packetSync(registartionId, NEW, encryptedbyte, creationTime); - String syncStatus = null; - if (regSyncResponseDTO != null) { - List synList = regSyncResponseDTO.getResponse(); - if (synList != null) { - SyncResponseDto syncResponseDto = synList.get(0); - syncStatus = syncResponseDto.getStatus(); - } - } - if (PacketGeneratorConstants.SUCCESS.equalsIgnoreCase(syncStatus)) { - PacketReceiverResponseDTO packetReceiverResponseDTO; - LinkedMultiValueMap map = new LinkedMultiValueMap<>(); - map.add("file", contentsAsResource); - HttpHeaders headers = new HttpHeaders(); - headers.setContentType(MediaType.MULTIPART_FORM_DATA); - HttpEntity> requestEntity = new HttpEntity<>(map, headers); - - String result = (String) restClientService.postApi(ApiName.PACKETRECEIVER, "", "", requestEntity, - String.class); - if (result == null) - throw new RegBaseCheckedException(ErrorMessages.FAILED_TO_UPLOAD.getErrorCode(), - ErrorMessages.FAILED_TO_UPLOAD.getErrorMessage() + " Null response from packetRecever API"); - packetReceiverResponseDTO = gson.fromJson(result, PacketReceiverResponseDTO.class); - if (packetReceiverResponseDTO.getErrors() != null && !packetReceiverResponseDTO.getErrors().isEmpty()) { - throw new RegBaseCheckedException(ErrorMessages.FAILED_TO_UPLOAD.getErrorCode(), - ErrorMessages.FAILED_TO_UPLOAD.getErrorMessage() + packetReceiverResponseDTO.getErrors()); - } - response.setRegistartionId(registartionId); - response.setStatus("packet has been created and uploaded"); - return response; - } else { - throw new RegBaseCheckedException(ErrorMessages.SYNC_FAILED.getErrorCode(), - ErrorMessages.SYNC_FAILED.getErrorMessage()); - } - } catch (ApisResourceAccessException e) { - logger.error(e.getStackTrace().toString()); - if (e.getCause() instanceof HttpClientErrorException) { - e.printStackTrace(); - HttpClientErrorException httpClientException = (HttpClientErrorException) e.getCause(); - throw new RegBaseCheckedException(ErrorMessages.API_RESOUCE_ACCESS_FAILED.getErrorCode(), - ErrorMessages.API_RESOUCE_ACCESS_FAILED.getErrorMessage() - + httpClientException.getResponseBodyAsString()); - } else if (e.getCause() instanceof HttpServerErrorException) { - HttpServerErrorException httpServerException = (HttpServerErrorException) e.getCause(); - throw new RegBaseCheckedException(ErrorMessages.API_RESOUCE_ACCESS_FAILED.getErrorCode(), - ErrorMessages.API_RESOUCE_ACCESS_FAILED.getErrorMessage() - + httpServerException.getResponseBodyAsString()); - } else { - - throw new RegBaseCheckedException(ErrorMessages.API_RESOUCE_ACCESS_FAILED.getErrorCode(), - ErrorMessages.API_RESOUCE_ACCESS_FAILED.getErrorMessage() + e.getMessage(), e); - } - } - } - - private RegSyncResponseDTO packetSync(String regId, String regType, byte[] enryptedUinZipFile, String creationTime) - throws RegBaseCheckedException { - RegSyncResponseDTO regSyncResponseDTO = null; - try { - RegistrationSyncRequestDTO registrationSyncRequestDTO = new RegistrationSyncRequestDTO(); - List syncDtoList = new ArrayList<>(); - SyncRegistrationDto syncDto = new SyncRegistrationDto(); - - // Calculate HashSequense for the enryptedUinZipFile file - HMACUtils.update(enryptedUinZipFile); - String hashSequence = HMACUtils.digestAsPlainText(HMACUtils.updatedHash()); - - // Prepare RegistrationSyncRequestDTO - registrationSyncRequestDTO.setId(environment.getProperty(PacketGeneratorConstants.REG_SYNC_SERVICE_ID)); - registrationSyncRequestDTO - .setVersion(environment.getProperty(PacketGeneratorConstants.REG_SYNC_APPLICATION_VERSION)); - registrationSyncRequestDTO.setRequesttime(DateUtils - .getUTCCurrentDateTimeString(environment.getProperty(PacketGeneratorConstants.DATETIME_PATTERN))); - - syncDto.setLangCode("eng"); - syncDto.setRegistrationId(regId); - syncDto.setSyncType(regType); - syncDto.setPacketHashValue(hashSequence); - syncDto.setPacketSize(BigInteger.valueOf(enryptedUinZipFile.length)); - syncDto.setSupervisorStatus(SupervisorStatus.APPROVED.toString()); - syncDto.setSupervisorComment(PacketGeneratorConstants.SYNCSTATUSCOMMENT); - - syncDtoList.add(syncDto); - registrationSyncRequestDTO.setRequest(syncDtoList); - - String requestObject = encryptUtil.encrypt( - JsonUtils.javaObjectToJsonString(registrationSyncRequestDTO).getBytes(), regId, creationTime); - - String centerId = regId.substring(0, centerIdLength); - String machineId = regId.substring(centerIdLength, machineIdLength); - String refId = centerId + "_" + machineId; - - LinkedMultiValueMap headers = new LinkedMultiValueMap<>(); - headers.add("Content-Type", MediaType.APPLICATION_JSON_VALUE); - headers.add("Center-Machine-RefId", refId); - headers.add("timestamp", creationTime); - - HttpEntity requestEntity = new HttpEntity<>(javaObjectToJsonString(requestObject), headers); - String response = (String) restClientService.postApi(ApiName.SYNCSERVICE, "", "", requestEntity, - String.class, MediaType.APPLICATION_JSON); - regSyncResponseDTO = new Gson().fromJson(response, RegSyncResponseDTO.class); - - } catch (ApisResourceAccessException e) { - e.printStackTrace(); - if (e.getCause() instanceof HttpClientErrorException) { - HttpClientErrorException httpClientException = (HttpClientErrorException) e.getCause(); - throw new RegBaseCheckedException(ErrorMessages.API_RESOUCE_ACCESS_FAILED.getErrorCode(), - ErrorMessages.API_RESOUCE_ACCESS_FAILED.getErrorMessage() - + httpClientException.getResponseBodyAsString()); - } else if (e.getCause() instanceof HttpServerErrorException) { - HttpServerErrorException httpServerException = (HttpServerErrorException) e.getCause(); - throw new RegBaseCheckedException(ErrorMessages.API_RESOUCE_ACCESS_FAILED.getErrorCode(), - ErrorMessages.API_RESOUCE_ACCESS_FAILED.getErrorMessage() - + httpServerException.getResponseBodyAsString()); - } else { - - throw new RegBaseCheckedException(ErrorMessages.API_RESOUCE_ACCESS_FAILED.getErrorCode(), - ErrorMessages.API_RESOUCE_ACCESS_FAILED.getErrorMessage() + e.getMessage(), e); - } - - } catch (InvalidKeySpecException | NoSuchAlgorithmException | IOException e) { - logger.error(e.getStackTrace().toString()); - throw new RegBaseCheckedException(ErrorMessages.ENCRYPTION_EXCEPTION.getErrorCode(), - ErrorMessages.ENCRYPTION_EXCEPTION.getErrorMessage() + e.getMessage(), e); - } catch (JsonProcessingException e) { - logger.error(e.getStackTrace().toString()); - throw new RegBaseCheckedException(ErrorMessages.SYSTEM_EXCEPTION_OCCURED.getErrorCode(), - ErrorMessages.SYSTEM_EXCEPTION_OCCURED.getErrorMessage() + e.getMessage(), e); - } - return regSyncResponseDTO; - } - - private byte[] encryptPacket(byte[] dataToEncrypt, String regId, String creationTime) - throws RegBaseCheckedException { - try { - return encryptUtil.encrypt(dataToEncrypt, regId, creationTime).getBytes(); - } catch (ApisResourceAccessException e) { - e.printStackTrace(); - if (e.getCause() instanceof HttpClientErrorException) { - HttpClientErrorException httpClientException = (HttpClientErrorException) e.getCause(); - throw new RegBaseCheckedException(ErrorMessages.API_RESOUCE_ACCESS_FAILED.getErrorCode(), - ErrorMessages.API_RESOUCE_ACCESS_FAILED.getErrorMessage() - + httpClientException.getResponseBodyAsString()); - } else if (e.getCause() instanceof HttpServerErrorException) { - HttpServerErrorException httpServerException = (HttpServerErrorException) e.getCause(); - throw new RegBaseCheckedException(ErrorMessages.API_RESOUCE_ACCESS_FAILED.getErrorCode(), - ErrorMessages.API_RESOUCE_ACCESS_FAILED.getErrorMessage() - + httpServerException.getResponseBodyAsString()); - } else { - - throw new RegBaseCheckedException(ErrorMessages.API_RESOUCE_ACCESS_FAILED.getErrorCode(), - ErrorMessages.API_RESOUCE_ACCESS_FAILED.getErrorMessage() + e.getMessage(), e); - } - - } catch (InvalidKeySpecException | NoSuchAlgorithmException | IOException e) { - logger.error(e.getStackTrace().toString()); - throw new RegBaseCheckedException(ErrorMessages.ENCRYPTION_EXCEPTION.getErrorCode(), - ErrorMessages.ENCRYPTION_EXCEPTION.getErrorMessage() + e.getMessage(), e); - } - } - - public byte[] generateHashSequence(List hashSequenceFiles, Map docsInfo) - throws IOException { - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - - for (String packetHashFile : hashSequenceFiles) { - byte[] fileByte = docsInfo.get(packetHashFile).getDocValue(); - outputStream.write(fileByte); - } - byte[] dataByte = HMACUtils.generateHash(outputStream.toByteArray()); - return HMACUtils.digestAsPlainText(dataByte).getBytes(); - } - - private Map getAllDocsFromResourceAsMap(Map docsInfo) - throws RegBaseCheckedException, IOException { - listfiles(docsInfo); - return docsInfo; - } - - private void listfiles(Map docsInfo) throws RegBaseCheckedException, IOException { - List packetfileList = new ArrayList<>(); - - packetfileList.add("NEW/packet_data_hash.txt"); - packetfileList.add("NEW/audit.json"); - packetfileList.add("NEW/packet_meta_info.json"); - packetfileList.add("NEW/packet_osi_hash.txt"); - packetfileList.add("NEW/Biometric/applicant_bio_CBEFF.xml"); - packetfileList.add("NEW/Demographic/ID.json"); - packetfileList.add("NEW/Demographic/POA_CNIE_card.jpg"); - packetfileList.add("NEW/Demographic/POI_CNIE_card.jpg"); - packetfileList.add("NEW/Demographic/POR_Passport.jpg"); - packetfileList.add("NEW/Demographic/POE_Certification_of_Exception.jpg"); - - for (String filename : packetfileList) { - Resource resource = new ClassPathResource(filename); - InputStream input = resource.getInputStream(); - addDoc(input, filename, docsInfo); - } - } - - private void addDoc(InputStream inputStream, String fname, Map docsInfo) throws RegBaseCheckedException { - File file = new File(fname); - DocumentDetails docDetails = new DocumentDetails(); - try { - docDetails.setDocExtension(FilenameUtils.getExtension(file.getName())); - docDetails.setDocName(file.getName()); - if (fname.contains(DocumentType.DEMOGRAPHIC.toString())) { - docDetails.setDocType(DocumentType.DEMOGRAPHIC); - } else if (fname.contains(DocumentType.BIOMETRIC.toString())) { - docDetails.setDocType(DocumentType.BIOMETRIC); - } else { - docDetails.setDocType(DocumentType.NONE); - } - - byte[] bFile = IOUtils.toByteArray(inputStream); - - docDetails.setDocValue(bFile); - docsInfo.put(FilenameUtils.removeExtension(file.getName()), docDetails); - } catch (IOException e) { - logger.error(e.getStackTrace().toString()); - e.printStackTrace(); - throw new RegBaseCheckedException(ErrorMessages.SYSTEM_EXCEPTION_OCCURED.getErrorCode(), - ErrorMessages.SYSTEM_EXCEPTION_OCCURED.getErrorMessage() + e.getMessage(), e); - } - - } - - private Map getIdentityRequestDtoMap(Request baseReq) { - Map map = new HashMap<>(); - PacketRequestDto dto = baseReq.getRequest(); - map.put("fullName", dto.getFirstName() + " " + dto.getLastName()); - map.put("gender", dto.getGender()); - map.put("dateOfBirth", dto.getDateOfBirth()); - map.put("age", dto.getAge()); - map.put("phone", dto.getPhone()); - map.put("email", dto.getEmail()); - map.put("addressLine1", dto.getAddressLine1()); - map.put("addressLine2", dto.getAddressLine2()); - map.put("addressLine3", dto.getAddressLine3()); - return map; - } - - private String generateRegistrationId(String centerId, String machineId) throws RegBaseCheckedException { - List pathsegments = new ArrayList<>(); - pathsegments.add(centerId); - pathsegments.add(machineId); - String rid = null; - ResponseWrapper responseWrapper; - JSONObject ridJson; - ObjectMapper mapper = new ObjectMapper(); - try { - - responseWrapper = (ResponseWrapper) restClientService.getApi(ApiName.RIDGENERATION, pathsegments, "", "", - ResponseWrapper.class); - if (responseWrapper.getErrors() == null) { - ridJson = mapper.readValue(mapper.writeValueAsString(responseWrapper.getResponse()), JSONObject.class); - - rid = (String) ridJson.get("rid"); - - } else { - List error = responseWrapper.getErrors(); - - throw new RegBaseCheckedException(PlatformErrorMessages.RPR_PGS_REG_BASE_EXCEPTION, - error.get(0).getMessage(), new Throwable()); - } - - } catch (ApisResourceAccessException e) { - e.printStackTrace(); - if (e.getCause() instanceof HttpClientErrorException) { - HttpClientErrorException httpClientException = (HttpClientErrorException) e.getCause(); - throw new RegBaseCheckedException(ErrorMessages.API_RESOUCE_ACCESS_FAILED.getErrorCode(), - ErrorMessages.API_RESOUCE_ACCESS_FAILED.getErrorMessage() - + httpClientException.getResponseBodyAsString()); - } else if (e.getCause() instanceof HttpServerErrorException) { - HttpServerErrorException httpServerException = (HttpServerErrorException) e.getCause(); - throw new RegBaseCheckedException(ErrorMessages.API_RESOUCE_ACCESS_FAILED.getErrorCode(), - ErrorMessages.API_RESOUCE_ACCESS_FAILED.getErrorMessage() - + httpServerException.getResponseBodyAsString()); - } else { - - throw new RegBaseCheckedException(ErrorMessages.API_RESOUCE_ACCESS_FAILED.getErrorCode(), - ErrorMessages.API_RESOUCE_ACCESS_FAILED.getErrorMessage() + e.getMessage(), e); - } - - } catch (IOException e) { - logger.error(e.getStackTrace().toString()); - throw new RegBaseCheckedException(ErrorMessages.SYSTEM_EXCEPTION_OCCURED.getErrorCode(), - ErrorMessages.SYSTEM_EXCEPTION_OCCURED.getErrorMessage() + e.getMessage(), e); - } - return rid; - } -} diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/util/EncryptorUtil.java b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/util/EncryptorUtil.java deleted file mode 100644 index 6b1ec224e65..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/java/io/mosip/packetgenerator/util/EncryptorUtil.java +++ /dev/null @@ -1,205 +0,0 @@ -package io.mosip.packetgenerator.util; - -import java.io.IOException; -import java.io.InputStream; -import java.security.KeyFactory; -import java.security.NoSuchAlgorithmException; -import java.security.PrivateKey; -import java.security.PublicKey; -import java.security.Security; -import java.security.spec.InvalidKeySpecException; -import java.security.spec.X509EncodedKeySpec; -import java.util.ArrayList; -import java.util.List; - -import javax.crypto.SecretKey; - -import org.apache.commons.io.IOUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; - -import com.fasterxml.jackson.core.JsonParseException; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonMappingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -import io.mosip.kernel.core.crypto.spi.CryptoCoreSpec; -import io.mosip.kernel.core.logger.spi.Logger; -import io.mosip.kernel.core.security.exception.MosipInvalidDataException; -import io.mosip.kernel.core.security.exception.MosipInvalidKeyException; -import io.mosip.kernel.core.util.CryptoUtil; -import io.mosip.kernel.keygenerator.bouncycastle.KeyGenerator; -import io.mosip.packetgenerator.dto.PublicKeyResponseDto; -import io.mosip.packetgenerator.exception.RegBaseCheckedException; -import io.mosip.registration.processor.core.code.ApiName; -import io.mosip.registration.processor.core.constant.LoggerFileConstant; -import io.mosip.registration.processor.core.exception.ApisResourceAccessException; -import io.mosip.registration.processor.core.exception.util.PlatformErrorMessages; -import io.mosip.registration.processor.core.http.ResponseWrapper; -import io.mosip.registration.processor.core.logger.RegProcessorLogger; -//import io.mosip.registration.processor.core.spi.filesystem.manager.FileManager; -import io.mosip.registration.processor.core.spi.restclient.RegistrationProcessorRestClientService; -import io.mosip.registration.processor.core.util.JsonUtil; -//import io.mosip.registration.processor.packet.manager.dto.DirectoryPathDto; - -@Component -public class EncryptorUtil { - - /** The key generator. */ - @Autowired - private KeyGenerator keyGenerator; - - /** The encryptor. */ - @Autowired - private CryptoCoreSpec encryptor; - - /** The Constant RSA. */ - public static final String RSA = "RSA"; - - /** The Constant AES_KEY_CIPHER_SPLITTER. */ - public static final String AES_KEY_CIPHER_SPLITTER = "#KEY_SPLITTER#"; - - /** The Constant APPLICATION_ID. */ - public static final String APPLICATION_ID = "REGISTRATION"; - - private static Logger regProcLogger = RegProcessorLogger.getLogger(EncryptorUtil.class); - - /** The registration processor rest client service. */ - @Autowired - RegistrationProcessorRestClientService registrationProcessorRestClientService; - - /** The center id length. */ - @Value("${mosip.kernel.registrationcenterid.length}") - private int centerIdLength; - - /** The center id length. */ - @Value("${mosip.kernel.machineid.length}") - private int machineIdLength; - - @Value("${registration.processor.rid.machineidsubstring}") - private int machineIdSubStringLength; - -// @Autowired -// protected FileManager filemanager; - - /** - * Encrypt uin update packet. - * - * @param decryptedFile the decrypted file - * @param regId the reg id - * @param creationTime the creation time - * @return the string - * @throws IOException Signals that an I/O exception has - * occurred. - * @throws ApisResourceAccessException the apis resource access exception - * @throws InvalidKeySpecException the invalid key spec exception - * @throws NoSuchAlgorithmException the no such algorithm exception - * @throws RegBaseCheckedException the reg base checked exception - */ - public byte[] encryptUinUpdatePacket(InputStream decryptedFile, String regId, String creationTime) - throws IOException, ApisResourceAccessException, InvalidKeySpecException, NoSuchAlgorithmException, - RegBaseCheckedException { - regProcLogger.debug(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.REGISTRATIONID.toString(), - regId, "EncryptorUtil ::encryptUinUpdatePacket()::entry"); - byte[] dataToEncrypt = IOUtils.toByteArray(decryptedFile); - byte[] encryptPacketByteArray = encrypt(dataToEncrypt, regId, creationTime).getBytes(); - regProcLogger.debug(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.REGISTRATIONID.toString(), - regId, "EncryptorUtil ::encryptUinUpdatePacket()::exit"); - return encryptPacketByteArray; - } - - /** - * Encrypt. - * - * @param streamToEncrypt the stream to encrypt - * @param regId the reg id - * @param creationTime the creation time - * @return the input stream - * @throws ApisResourceAccessException the apis resource access exception - * @throws InvalidKeySpecException the invalid key spec exception - * @throws NoSuchAlgorithmException the no such algorithm exception - * @throws IOException Signals that an I/O exception has - * occurred. - * @throws RegBaseCheckedException the reg base checked exception - */ - public String encrypt(byte[] dataToEncrypt, String regId, String creationTime) throws ApisResourceAccessException, - InvalidKeySpecException, java.security.NoSuchAlgorithmException, IOException, RegBaseCheckedException { - - try { - regProcLogger.debug(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.REGISTRATIONID.toString(), - regId, "EncryptorUtil ::encrypt()::entry"); - String centerId = regId.substring(0, centerIdLength); - String machineId = regId.substring(centerIdLength, machineIdSubStringLength); - String refId = centerId + "_" + machineId; - - // byte[] dataToEncrypt = IOUtils.toByteArray(streamToEncrypt); - - // Enable AES 256 bit encryption - Security.setProperty("crypto.policy", "unlimited"); - // Generate AES Session Key - final SecretKey symmetricKey = keyGenerator.getSymmetricKey(); - // Encrypt the Data using AES - final byte[] encryptedData = encryptor.symmetricEncrypt(symmetricKey, dataToEncrypt, null); - // Encrypt the AES Session Key using RSA - final byte[] rsaEncryptedKey = encryptRSA(symmetricKey.getEncoded(), refId, creationTime); - regProcLogger.debug(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.REGISTRATIONID.toString(), - regId, "EncryptorUtil ::encrypt()::exit"); - return CryptoUtil - .encodeBase64(CryptoUtil.combineByteArray(encryptedData, rsaEncryptedKey, AES_KEY_CIPHER_SPLITTER)); - - } catch (MosipInvalidDataException mosipInvalidDataException) { - throw new RegBaseCheckedException(PlatformErrorMessages.RPR_PGS_ENCRYPTOR_INVLAID_DATA_EXCEPTION, - mosipInvalidDataException); - - } catch (MosipInvalidKeyException mosipInvalidKeyException) { - throw new RegBaseCheckedException(PlatformErrorMessages.RPR_PGS_ENCRYPTOR_INVLAID_KEY_EXCEPTION, - mosipInvalidKeyException); - - } catch (RuntimeException runtimeException) { - throw new RegBaseCheckedException(PlatformErrorMessages.RPR_SYS_SERVER_ERROR, runtimeException); - } - } - - /** - * Encrypt RSA. - * - * @param sessionKey the session key - * @param centerId the center id - * @param creationTime the creation time - * @return the byte[] - * @throws ApisResourceAccessException the apis resource access exception - * @throws InvalidKeySpecException the invalid key spec exception - * @throws NoSuchAlgorithmException the no such algorithm exception - * @throws IOException - * @throws JsonProcessingException - * @throws JsonMappingException - * @throws JsonParseException - */ - private byte[] encryptRSA(final byte[] sessionKey, String refId, String creationTime) - throws ApisResourceAccessException, InvalidKeySpecException, java.security.NoSuchAlgorithmException, - IOException { - - // encrypt AES Session Key using RSA public key - List pathsegments = new ArrayList<>(); - pathsegments.add(APPLICATION_ID); - ResponseWrapper responseWrapper; - PublicKeyResponseDto publicKeyResponsedto = null; - ObjectMapper mapper = new ObjectMapper(); - - responseWrapper = (ResponseWrapper) registrationProcessorRestClientService.getApi(ApiName.ENCRYPTIONSERVICE, - pathsegments, "timeStamp,referenceId", creationTime + ',' + refId, ResponseWrapper.class); - publicKeyResponsedto = mapper.readValue(mapper.writeValueAsString(responseWrapper.getResponse()), - PublicKeyResponseDto.class); - regProcLogger.debug(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.USERID.toString(), "", - "EncryptorUtil::encryptRSA()::Encryption service call ended with response data : " - + JsonUtil.objectMapperObjectToJson(publicKeyResponsedto)); - - PublicKey publicKey = KeyFactory.getInstance(RSA) - .generatePublic(new X509EncodedKeySpec(CryptoUtil.decodeBase64(publicKeyResponsedto.getPublicKey()))); - - return encryptor.asymmetricEncrypt(publicKey, sessionKey); - - } - -} diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/Biometric/applicant_bio_CBEFF.xml b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/Biometric/applicant_bio_CBEFF.xml deleted file mode 100644 index ef3768d7173..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/Biometric/applicant_bio_CBEFF.xml +++ /dev/null @@ -1,248 +0,0 @@ - - - - 1 - 1 - - - 1 - 1 - - - false - - - Unique - - false - - - 181ea33a-e93f-4ed8-8413-f76e440c07a8 - 257 - 7 - 2019-07-15T06:04:06.383Z - Finger - Left IndexFinger - Intermediate - Enroll - 90 - - Rk1SACAyMAAAAAEaAAABPAFiAMUAxQEAAAAoKoCKAMcjUIB3ANAuZEB9AOkiZICKAIEOZIDNAIvjZIBsARIVZECMAST8ZEBGAQ8jIUA7ARCUIUBBAGkcXUDlAFfuZICvAVx3FEC+ACr2ZIBfACATXYCYAK6tUICaAJz/V0C/APhXZICuAH6LZEB9ARcMZEDKAHfsZIDrAHxsZIEOANlZZICBAFKcZIDPAUH6ZEDYATx7ZEA4AToIV0AxAUjfQ0DzACnuZICDAK4hXYC3AKLeXYBkAOUvZEDXAPBUZIC2ARl1ZEBeAQ4dZECDATXzZEBNAR0SXUBbATb8XUEiAM3XQ0D1ATdpZIDjADp0ZICkABsGZIDFABaDZAAA - - - Unique - - false - - - 553a737e-bfe9-4978-887c-1d3e1cc38f98 - 257 - 7 - 2019-07-15T06:04:06.385Z - Finger - Left LittleFinger - Intermediate - Enroll - 90 - - Rk1SACAyMAAAAAD8AAABPAFiAMUAxQEAAAAoJUB5ANY3ZICRALXPZICNARUmZICSAJ7tZICyAJ5pZIC5AJbZZEC7ATsYKIBlAH4ZZIAhAQ8kXUCuAGjpZEBeAV8EUIAsAU4VNYCtAE7tZICoAOGzZECeALnNZEB4AR6cZICnAR4pZIDJAK1ZXUA+AL+zZIBGASscZECxAUUASYCGAVcAUIBdAVYSUEDhAVL0DYBYAFiiXUCVAMC4ZEB2AQ0nZEBMAOYyZIDUAOK9ZEDhANDKUEBjATkcXUCVAUsNUEDlAKHRZEDMAUp/B0DPAHBqZEBLAGMgV4B+AE0CZAAA - - - Unique - - false - - - f2de5386-039c-4772-8d1f-197fb043fb48 - 257 - 7 - 2019-07-15T06:04:06.386Z - Finger - Left MiddleFinger - Intermediate - Enroll - 90 - - Rk1SACAyMAAAAAD8AAABPAFiAMUAxQEAAAAoJYCKALVpV4B8AHv1ZEC/AI1PZEBhAGsWZEDPAPJQZEBEAPslZICpASeHXYBOARoXZIC3ADl8Q0CKATwHZICWABb8ZEB4AVD+SUA+AVIFQ4BsAKn3Q4BdAJUXZEA+AJgoZIC+APVYZEDOAGPSZEDJAEdoXYB5AScPZEB5ADQGZEAQAMMnZEDeADvQQ4BGACAbXYBYABObXUCzANNKZIB4AOiSQ0CqAPxjZICIAQWSZECcAReFXUCoADz1ZIDEAR5pXUDaAEtLXYDmARBbSUDrADtASYC2ABZ7L0AdAS4YZAAA - - - Unique - - false - - - b5c1f404-b115-4d38-abdb-a91903ba7679 - 257 - 7 - 2019-07-15T06:04:06.386Z - Finger - Left RingFinger - Intermediate - Enroll - 90 - - Rk1SACAyMAAAAAFcAAABPAFiAMUAxQEAAAAoNYCJAMS4Q4B7ALUBQ4BnAMK2ZICmAKrLZIBvAPAwXUBUAOa2ZIBbAPg5XYDOAOzCZEDSAJnOXYBfARghZICWAF31ZEBbAFIfZIDuARrEXUBCAE0eZEBsADygZICDAVkNG4DXAU+4L4AcAUEtB0B/AMmzPEB4AN4zXYCQAO+tXYC4ALVTXYBiAKQnZIBoAPguXYCUAQ6kZEB4AQ8oZEA8AOe0ZIBGAQszZIBPASEhZID3AIPVZIDkASq6ZEDKAEhpZEDtAFzdZEC1AVUlSUD0AFJgZEB0AAwHZICBAL/GQ4CoANBHZICJAJ7sZIB9APWmXUCGAIj7ZIDJAKzHXYBeAI+sZICLAHX9ZIDlANDKZEC1AGl0ZIDHAGNoZEA2ASQqUEB/AD8QZICHADeXZECfAVYQPEAxAT4cQ0A+AVIOQwAA - - - Unique - - false - - - 4257301a-3e31-471f-972e-13255fa387df - 257 - 7 - 2019-07-15T06:04:06.386Z - Finger - Right IndexFinger - Intermediate - Enroll - 90 - - Rk1SACAyMAAAAAGeAAABPAFiAMUAxQEAAAAoQECzAOBRXYClALbIQ0DMAP1fZICGAKyzXUDpAOlZZEDMARdsZEBfANioUEB/AJSfZEDJAInrUEDsAR10ZEDUAS93ZEENAPRWUEC3AUH3ZEEEASByNUDqAUTnXUBSAS7wUIDSAFp1ZID2AU5sNUBKAUf7UECGAD4EZECvACN6ZEDIABFyZEC4AMrVV4CuALXVNUB9ALzBXUDGAJ51UECmAR1nZEBsAP1yXUDqAQZkZECvAStyZID2AQNiZEBTAO4BPECHATR0ZIBtASp3XYBWARXxSUEGAR7WL0EeAKrQV0BXATduXYB/AVp9PEBYAU17UEEIAVRkNUDzAEVsZEDAABvyZECRAN5JZECbALTAQ0DDAJ52Q0BuAMnBSUBsAPJgUEDxALNTZEBgAL6qZEDSAI9rUEBzARxvXUBOANsoQ0EBAJ/RZIBGAMmgUEEUAN9PSUCaAGOLZIDKAVF1UEC5AVd6SUDoAVN9NUBHAHmXUIBSAFWNV4ClADCDZID4ACprZAAA - - - Unique - - false - - - a7957dd4-e7a8-4920-8ccc-1755d53c679b - 257 - 7 - 2019-07-15T06:04:06.386Z - Finger - Right LittleFinger - Intermediate - Enroll - 90 - - Rk1SACAyMAAAAAEsAAABPAFiAMUAxQEAAAAoLUCGAKHKSUCaAI7XV0BnAQVUZEA1AKi6ZIDJAMxOZEAwAPfPIUAmAImxZICSAFx7ZECQAFTvZEBRAFWiZECRAEx9ZIByAUl0IYB4ADL9XYB4ADD9XYDUAUMDXYCHAJrZQ0CGAQLWV0B8AQdRV0A2AOLKQ4AoAN22Q0B7AGWXXUBEARlWNYBCASDZNUBrAEwDXUClATJoQ0CKAT1pQ0CtAT1sV0BUAVKCG0DZATx7XUDMAUuDUEBKAL/FZEB8AH/4PIA0AMO/ZEC8AOVTZIBmAHCpXUCTAR5UV0BjAShdNUCKAS9iSUDGARpkPEBsAEsAXYC6ATdwV4C1AEFyZIA/ADsYXYBPAC+aXUBDABsUXQAA - - - Unique - - false - - - 1d0ee3af-be26-4792-811a-df04ed89bba2 - 257 - 7 - 2019-07-15T06:04:06.386Z - Finger - Right MiddleFinger - Intermediate - Enroll - 90 - - Rk1SACAyMAAAAAF0AAABPAFiAMUAxQEAAAAoOYDPAOf/IUDdANcrB0DYALRNFEDRAK7NQ4DwANi6B4B1ANvNZID6AOpLL4COASJtXYBtALWyZED/AP59NYCkAISrZEB1AJarXYBTAMOqXYB1AIMjXYBQAQEjL4BdAI0kXUD+ATzfG4DsAUvwFED2AVJuIYCbAMjHZECYAPxPZIC/AK3RUEDlALlKFECFAQJTUIDGAJ7WUED2AO52L4B+ARdxUIEDAPBVL0CMAI+vZEDqAJXIZEC3AH2iXUCaATt6XUEHAJrLZIByAIKlXYC8AVD3Q4DIAVJ3KEB2AVOBQ0CBAFCdZIC0ALrRZEDdAMVQFEC3AQ5lZICmARdlZEB8AMO+ZIBxAPPRUEBsAOOwZIBnAPigUEDbAI5sZED5AKXBZEEFALvEZEBcAQUMUEDEAUH7UEDYAHNzZEDZAUN7V0C0AGOVZECrAVb7L0DpAVN/FEDfAEBxZAAA - - - Unique - - false - - - 0e84ffd2-276d-4ea6-aab7-db5007efd770 - 257 - 7 - 2019-07-15T06:04:06.386Z - Finger - Right RingFinger - Intermediate - Enroll - 90 - - Rk1SACAyMAAAAAHmAAABPAFiAMUAxQEAAAAoTECnAN5MUECTAOTcXYCrAMrOV0COAPDbXUDAAMO8XUDLAMfAZECmAKSDXUDSALrOZEBgAOfGZEDpAMXRUIBzAJetZIBQAL+3ZEDAASuBZEBiASBSZEDjARogXUBVARvfL0C1AHPhZEBoATRkZICNAUlrNUBNAIKsV4DMAVGASUD7ATyBPID4AU17PEEJAVRbG0BnADQUZECUACH5XUCWANTaXUCoAOZYPEC1AOA+SUCdALfRV0CzAP9bKEC6AK5eZECxAQhkNUBmAMTCZIDaAPmnV0BZALu8ZIDfAKXXZECtAITgZIBUAQdHNUC5AH9wZEBXAJavXYDHATqCZEBhAIMcXUDmATEGXUBHAI0sV4B4AU1uPICQAFUdV0BUAVOAB4CiAD6EV0BGAEweZICeACF/UEClAMhOV0CvANBQV4CuAOxNPIDBAOuqPIB9ALnFZICXAKe7V0DXANjEZEDDAREjNYBfALMtZEDnAPxEV0DpAPxFKEBQAPzLXYDtAQc1DUDJAS8OZEDJATEPZEA9AP29V0DwASCTFEBRASnmDYDSAUMDZED8ASpsB0BxAVV3SUDuAVXnSYBFAFWiZECbADD5XUCBACSVXQAA - - - Unique - - false - - - 27da5c03-5686-4e95-86ca-74ebfc3a835d - 257 - 7 - 2019-07-15T06:04:06.386Z - Finger - Left Thumb - Intermediate - Enroll - 90 - - Rk1SACAyMAAAAAEgAAABPAFiAMUAxQEAAAAoK0CeANjvXUCvAO5yXUDKAOFrZIC/AKtxZEC/ARHjXYCvAH/0ZECfAHaCZEDUASRjXUDFAG95ZEEZAOZiXYCWAVd2L0EHASldUIBQAVd+SUANASH1Q4BJADIQUECcAMrwXUC+AL9wZIBtANECZECDAQnzV4BUAPcKUIBIAOutUIBUAJINZEDxAQ7dZECAAF0EZEA2ASdqZIAlARhFXUAfASFmUEDTAETyZEC6ADH9ZECrAN5vXUCdAKPzZEDGALXmZIBqAQSEUIBaAQQEV0DiAQ/cXUBdAIWPZECoAGr5ZEAhAOOqZIEDAIHkZED1ATrZXUEEATpbXUEBAUxZQ0DvADbxXQAA - - - Unique - - false - - - 172151dd-fbba-4631-9533-a5f3e16335e6 - 257 - 7 - 2019-07-15T06:04:06.386Z - Finger - Right Thumb - Intermediate - Enroll - 90 - - Rk1SACAyMAAAAAEmAAABPAFiAMUAxQEAAAAoLIC9AOwBXYBkAPaqZIB5ARshZEBSAPApZEBMAPurZEDhAQ2FUICKAUQNZIDkATKIUEA4AR0qZEEEAMDXXYAgANomZIAeAQcaSUAWAR6gUEEQAVGgG0B+ACuKXUCkALkEZICzARsTXYDWAOqBV4CaATSQXYCFATURZEBgASgmZID1AMxiXUC9AIL/XYC7AVMIUEDKAIN/XUEGAMDWXUAtAKSiZEEGAI/nZIBkAFMPZEAmAB4cV0DHAN2LZICfASEWXYC0ASsCXYDGALKEZECjATv/ZEBLALilZEDBAUWAZICSAVf9NYEGAQW3V4BdAU0YNUA2ATMkZEDrAU6NNYDDAF16ZEBmADELZAAA - - - Unique - - false - - - 842d60e0-bbf2-423f-b3e0-573fbfe3dc93 - 257 - 9 - 2019-07-15T06:04:06.386Z - Iris - Left - Intermediate - Enroll - 91 - - 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 - - - Unique - - false - - - d828ca04-db83-4b98-a29d-4865b18f9199 - 257 - 9 - 2019-07-15T06:04:06.386Z - Iris - Right - Intermediate - Enroll - 50 - - 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 - - - Unique - - false - - - 785a0d4e-ef92-4373-9fb8-59ee3e6d0065 - 257 - 8 - 2019-07-15T06:04:06.386Z - Face - - Intermediate - Enroll - 0 - - _9j_4AAQSkZJRgABAQAAAQABAAD_2wCEAAkGBxMTEhUTExMWFRUXFxUaGBgYFRgXFxcYGhgXGhoaGBcYHSggGBolGxcYITEhJSkrLi4uFx8zODMtNygtLisBCgoKDg0OGhAQGy0dHyUtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLf_AABEIAP4AxgMBEQACEQEDEQH_xAAbAAABBQEBAAAAAAAAAAAAAAAAAgMEBQYHAf_EADoQAAEDAgMFBgUCBQUBAQAAAAEAAhEDBAUhMQYSQVFhEyJxgZGxBzKhwfDh8RRSYnLRFRYjQpKiQ__EABsBAQACAwEBAAAAAAAAAAAAAAABAgMEBgUH_8QANREAAgECBQEFBwMEAwEAAAAAAAECAxEEBRIhMUETUXGB0RQiMmGRscEGI6EV4fDxJDRTQv_aAAwDAQACEQMRAD8AlrtDiQQAgBACAEAIAQAgBACA8Qi56gBACAEFwQkEAIAQAgBACAEAIAQAgBACAEAIAQAgBANXFw1g3nuDRzJhVlOMVeTsEnJ2SuZnFds2MkUm7x5nIeQ1P0XlV81hHamrnr0MonLeo9Py6lA3bW4BJ3mungWCB4QZhaP9Ur3vt9Df_pNC1t_qH-_Liflp_wDk-8qf6tX7l9H6lf6PQ73_AB6Hh28ueAZqOGvTXRT_AFat3Ij-j0e9_wAeg5_viu7Tcb03fuTmjzWu-LImOT0Fzd_54FlZ7diYrU46tP1grYpZv_6R-hrVcmtvTl5P1NXYYhTrN3qbg4ceY8QvWpV6dVXg7nkVqFSk7TViUspiBCQQAgBACAEAIAQAgBACAEAIAQDdas1g3nODRzJgKspKKu3YJOTstzM4ttg1pLaDd8j_ALH5Z6c15eIzWEHpprU-_oethspqTWqo9K7upkcXxerVINV08ho0eAGq8aviald3m_Loe5h8LSoK0F59Src86_ngsBsDRJ3cz5QP3Qg8Y2ckJA0RBg5j08kuLCWgjTMj880IJBrAxIHXNCSVb1C07zHlhHIkeqtGUou8XZlZwjNWkro2uBbWSAy4hp03x8p_u5eK9zC5mn7tbb5-p4GLyqUfeo7ru9DVseCAQQQdCDII8V66aaujxmmnZilJAISCAEAIAQAgBACAEAIAQDdxWaxpc4w1oJJ6BVlJRTk9kgouTUYq7ZzPHMeqXDomKc5N5DPvE88z6rl8VjZ133R6I6zCYCGHV-ZdWUtOtE9fT9Vpm8eNqxlnnx_whAi4ByE6fmqkCajjlOU65ZID2o2IGagkG0gNTwy4qCR0NAEAcPDRSCK5nBCBLXkZHRSV3JdG44DP38EJNJs3tG6hDHS-lPm3nu9OnovQwePlQ92W8fsebjsujXWuO0vv4-p0OhWa9oc0hwOhHFdHGSkrx3RzMouL0tWY4rEAgBACAEAIAQAgBACA8Qgw22OPtf8A8NMmGnvng48hzz8l4OZYxS_ah5-h0GV4Jx_en5epjqlYARxOpXjntkV4koRYVp5cs0FiRReNXa9RP7JckWWAyeOfUITYYNMDvHTohAuoHDTvD26KbizCCdG6z6ZRCi4sxLWFoG9xHE_nJLix4aQIy1UEiOxI8foVJFh2nVIjjOnLwKkg2GxeO7juxeYY4y0k_K4wI8D7r1csxag-yk9nx4nj5rg9a7WC3XPh3m9XQHOghIIAQAgBACAEAIAQFJtNjQoM3RBqOBgchpJWljcWqENuXx6m7gMG8RPfaK59Dl17V5GefPzK5bk63hbERvCfFSQOU6ZkQFVsskWlrhFR2Q85OeXKVVyRkVNsn_6O7Ij9_FR2iL9kxl-Hv0jMdPup1Ijs2T8OwBzjDmETlJ-yq5olU31L0bFFjd5mcwWk5j3VHUMipIX_ALPe8SW7rhyiNc1XtUW7G5ncT2fqMJaW5agq8aiMcqLRAGCP_wCsyraynZEG4wuo0HL8-ylTRR02Rm5Dd5-o0V0ylrD9AQdVJFjpuy-MCvTgn_kYBvDmODvPj1XUYHFKtTs_iXPqclj8I6FW6-F8ehdreNEEJBACAEAIAQAgPHOjVCDk-0WKdtVe_rDfAZSPdcnjK_bVXLp0OwwOH7CkovnllNcD18Fqo22jQbP7LmqQXaZLXqVrG1SoX5OiYXsXRaBIBOvRazqtm7GlFdDQ2mzlED5R_nxVdTZbSuhN_wBEpcWjpkgFswClwY0eSsirY_RwkNe3daIHksiZilwWFzZtieYGXBRMiDuR-xA4fRYzNa5Fq2bHGS0HlKi5axDfg9OSd0JdiyKDGcAaWkAa_mvorRm0VnBM5htBgrmOJAyE-vFbUJ3NKpSaKHfjLM_krMazLTAcTNGsypOQ-bq0_MPY-S2MNXdGqp9OvgauLoKvScOvTxOs0qgcA4aESF1yd1dHG2tsLUkggBACAEAIAQGf20xQUbdzQ6HvG63wJ7x9J-i0MwrqlRaT3ey_P8G9luHdWum-Fu_x_Jy4STOXQLmDrEXuzWCdtWEmQIJ8eSw1p6YmxQhqkdUw6z3OA0Xnt3PSSLu1chYsqJGQVkQyYwK6MbFgqSo41wCstirVxRMhGQlZjCqZBpwBVWWGnKCxCuQqskyeP4eHg5ayrQlZlJRujlGO4d2VYjSc_wBlv05XR5taGmRXtpxlOXBZDAdK2Dvt-33DrTMeR01810uWVddGz5Ry2Z0ezrtrh7mlXonnAhIIAQAgBACEHOPiRczVY3g1uhHE8RwIgBc_m071Ix7josmhanKXezJsyjn_AJ_JXks9lG42FMOgcT5-a1K5vYY6YwLTN0etxmhYsaHJWRUsaJyWRGOR6PdSQOgqStjzfngpuLDdRVLIacqlkR60qrLog1yVVkkC4pyM0IZzr4i2IJY4ZHOVt4dmlilwzBl4njGo6FbZos0nw-ru_iQA7IsMjnGk9dV6WVSar2-R5WbxToXtvdHTV0hzIISCAEAIAQAhBzL4kNi5HVgP1IyXO5qv3k_kdJk7_Ya-ZlGP-kLy2esmb7YTmtKuejhzpVq7Japtkym3NSSWFAKyKsmU3ZK6KMcBEeCsiopyEIC5SBDlUlDZCguRqoVGXRDrNVWSRK6FTAbfHuArZw_JqYng5lUjULdNBl_sE6LxnUP9lv5a_wDkLzPNzRf8Z-KOrLpzlgQkEAIAQAgBAc0-JdQG4YOIpifMlc_mz_divkdFk6_ak_n-DHheUesjpmyFuW029dV59V3Z6tFWRvrPMLBYz3LOnThW0kaiUwkK1he482qrIixJpOHFWRRkgNnP8CtYx3EgfslibjFWoFRl0RH1pVS6Q3UcqssmNPpFRYjUV9zkoFzB7Z0i6m6Fmo8mCsrxOXk8ecrfPNZcbFPIvKUGJJB8IOS3cvbWIjb_ADY87MkvZpXOvLqTlUCEggBACAEAIQct-IkG7PRjVzmaP9_yR02Up9h5spsLsDUqMbzj0Xk1JWR7FKGqSOsW1uKbWgcF573PUSsiPim1bKPdY8Fw-YjQdJ5rNTpN8mGpWS4Kx3xKdIaGT1Gqy9iYfaCVa_ER5-Zg4EDe3ZHmnYErEmiw7bClUOZDD4yD5jLVY5UpRM8K0ZGgt8Ua75SPVYzLa5a0b3u6_wCVZPYq4bjDr391GonSVd3ijRqYAzJlRuyeCFU2moNMOeBlxVuzZjdRLqRjttagwag8YlW7JmN1oiKu3tuRAdnwPAqezZHao8s8dZcAgETqIOo9_JY502jJComQr-2FRrgeSonZl5K6OPYhQLHvYdQV6MXdXPKmrNovvh7bb90D_I0u-3nqvTyuGqtfuR5GbTcaFu9_3OpLpDmgQkEAIAQAgBAc0-JFAC5YRHep_UE6-gXP5srVU-9HRZO70pLuYbDWk1S_kIPQleDiHtY6LDR3uavaO7LKZDfmOQ81r01ubVVu2xlqGANI3qhJJ4TlK2NdjXVG5Mp7HOcPmDB_Ue96NzVXXsXWFuRsQ2BrNG82oHDrvN-rgrRr96KSwi6MoKuFV6LtCD4q_axa3MfYTi9jUbN4nULgxxI-x6LFKxs0pNOzOuYJUL2CVgRsPYRjHdaTpARkJnItosWquO60k94n65T0nOFsRSXJq1JNuyM26jXcZzz1k-6yqpFGB0pstMO2eun_AP5yOe6foQquuiyw0iUdmHAhr3bpzgEEKO2Lezs8ZhFajJY4ndMjXLwPL_KalIrocTZbP3hrUw466OHJwWrNWZtU5XRhtvLDs7jeAyeJ81tUJXiaeIjaVx_4cUyLl8adkZ_9Nhe5lF-1l4fk5_ObKlFfP8HSF0JzqBCQQAgBACAEIOffEq3irSqc2ls8JBn2K8LOIvVGXkdBks1pnHwZM-Hlr3XO5lc1iHudThVtcu8at96oMsgscXZGeSuyHW7gyIbGpOoHTqpW5LdkRam17aTXdkwvAIlw014uOpV40G-THLEqPBKb8QyaTT2bCXHd3BUd2gH87gW7sHh3uByWTsbIxe1XfA7VqNe8U6jDQe7QOA3HzyIylY5wceTYhOM-BNXA-zqAxBBWNSMjgnudF2bpd0KsHuTU4H8eo91ymXJWHBz2zwDtXkwMk1Nk6Ut2RmmlTqFrGOrPbqGN3g2PoFkjFyKSnGG7FUviAxtN5NJw3DEGo1rnEyO42M4jPlIWTsGYPalfgbdtlRrAB7XNBy77cp8VjdGSMqxEWjy2ob0gHebnunjHI-Chuw2kibgFn2VVzeDs_NVm7orFWZU_Em3EMPUj6LNh-qMOJWyZX_DWlFSueTWD1Jn2XR5PH3pvwOWzuXuwXj-DfL3TwQQkEAIAQAgPHOAEkwBqToAqVaipwc3wlf6F6VJ1akaa5bS-pkfiC9j6FMscCN6eY0I181x9TMK2JbU7W6LuO4jlVDBxUqd9XDd3v5cIn7AUf-HPi77BedXfvHoUFaBq61iDJWFMzo5ztJhVR7u8SROQaI9VnpzS4MdWnfks8Hwyh2DqNQgBzY5GeYnjKyqrZ7mKWHdrxEYNsPSp1RUq3LXU294NAgujgTKntIkKhI1WLtZc5SC0CB3SdeRyHosM6jfBtU6agLtLZxpsa8l26Ik6kDSVrX3Mpp8GbDQrxKzJGK6FTIpDgzFeiQx7Gu3d8RI1A4x5KidmX5G8OdTtoaQ0MIiSzdkf3CRx4rZhUaMNSkp-Jjtodh2VKxqULimGPJdDplpOsRkVm7SLNZ0J9xLxHCaDbUUGkPIEk8S7iYGih1V0EcO-ZFZsvYVqZyMsJzB1H6LDOSZnp02vA6DTsRk6M4WEuzHfE1sUmO5P-y2MPyzWxPwjHw6oDsXkTJfmecDIR65r2cHmVPDe5KL3e7_seJjMpq4tdpCS2Wy7_M1S6dNNXRydmtmCkAgBACAEAmpT3gW_zAj1WDE6exnq4s_sbGE1e0U9POpfcwOPYa-lSqNz3QWmDoM1wlF7n0bFxsjUbCEdg1UrfEVo_AbWkZWIy3GLnCQ7OEsWuVb9nzORS7Lpj1vgbREiSPop3JuTDbgDw_MlDkRY8p5KCS4w0QFZFZbj1-yWwpZWJSOiM1Rl0OfwwLd0iQVaMujIa6oqa2BCcgody6kKt8FzGWnRFcrJotKWFAZgQpsYrj9RwAQhnP8A4kumjH9Qn0Kz0PiNeuvdM9s8-sKYpU3FsnNw1InLNK1m7GbCq0Ls31MQAJnIZrvqMNFOMe5JHzWtU7SpKfe2_qKWQxggBACAEB6x0EHkVhxFN1KM4LqmjPhaqpV4VHwmmM7X2m_SqbrQd5oP5zK4CPuysz6XV9-OxQbG1N2iB1KmryYaXwmysrlYrGU0NtVBCkmwVIRlkiNUYqu7LJEW5ZDTKraxZkO3kkHgVJVmitGaLIlcxydiTcUoUuNisZXM7iTCHSFjaMiZMsmy0KEi1x_sYU7ogkW7RyVkykkKuSAMlJSxn76qqgwm3z5ptaNXOH0Cz0TDX3SRcYNhTGUQ-M91o5ZwP1WxgaTrYuC7nfyW5jzGsqGAn0ureb2Ji7o-co9QkEAIAQAgBCCdbUd-k6fDyXE5pRVPFTS67_U-h5NWdTBU2-m302Mz2QplzRwcR0WhI3EWVi9UZkRoLR55qC6ZYMHmpJuO0xKlENlVtDVAYfIKr5JXBFF2zdEEZJYgtsNxRpGRGStFlZRuT7vFA4cFeUrmKFPQU77tjnahY2ZB3CqolwByBUIt0LKoRwVmQhNMoGQ69zI5dCouQ0UWI1MiURUz99h4uH02ng4HXhqrxdkyulSkrl1XEHd_l_wF1WR4dRodrbeV_on6nIfqHEyniOx6Rt9Wr_YQvbPABACAEAIAQAgHrKod_syYY4HPk4REeP2XL59RSqQqLqrPy_2df-mq7dOdJ9HdefP2KPE6BZVe3rI8CvCOgfxDuG1d4eCqy8TRWlWcpzyVCyLFtRWLEhlRSRYrMZtu1Y5vGMvFUT3LdDl2MOuWzT77SDqMwfNZ425MNRtCcOv7yhG93uM8f1VpRT4McKsls9y0djteoO6073iQFVRRklUtwVlM3DKu_VquPJrZA9FaVrbIpTcr3bOibMF3Z7zpl2cLXb3NnoaDtVNytj0VdQlyGQLx3soZDKLEqsNUoqRcKZvPLuDASVbpYiLs7kwvkk88132Eo9jRjT7l_v8Ak-b4yu8RXnVfV_6_iwLYNcEAIAQAgBACA9pxMHKdPFeFn0W6MZLhPc6H9Nziq84vlrby5KrG6ZbVEmZHsf1XKrg7CfI3YOgoyYlzb1e8IVC6Lem9QB6nU91JNxZcFNiNRQ4n3nQBxzWSKMU3cgXVrDJDQVkTMLGLO2l2hndn9vVCOpLo0AH7zoI8FV7l4uzNLRLQANFj0mfWKDtVRospXR4SgIlcmM0KsoMWdJAVkUZLwCmCKjjpp6a-6tezI03TBq-ip3V2fL7JOyPVJIIAQAgBACAEAlzZEKlSnGpFwmrpl6VWdKanB2a3K3FbZ5G8XSG8xnHj-i5rGZMqNOVSnK6XR-p1mDz516kKVSFm3ynt9P7jNm6V4DOiiWFN8HVVZcsWV4VSR2ncTx_RZEjHKR5Wr6ifBXRVsabA7ziGjMmfsobJjByZIp43buG4Q4N_mge3JRqM_s45cYlb0zJJqEgfKBA8ypuU7DyIguKVYgsMHi05H9UTMc6dhVO4jUxw0UmO44akRnr6KskZIskUqkrEZBi4KFbmfv6kPlXXBVkixY8NgmAc4HXmV02DyVJxqVXfh29Tlsdn70ypUY25Wr0X2JIXRHLpWPUJBACAEAIAQAgBAJqMBBB0OSrKKlFxfDJjNwkpR5Rn7Fxa5zDqCR6L5_XoulUcH0dj6ThqyrU41I9VcshU0nqsNjYuTmiWyM-Si25a5AqXvZTM5j8-6zJGBspam1Q3oax7yMoa3KfLJW0CL3Edne3Dgd1oB-VhdEcuChJI2lGVh6pguINbPZsLRnk7P6hTZFt-LihhV-RvGkxgj_s_3EJZEbvqQLjD7xkOlhP9JITZlJQkhRxy5BG_ScGj5nDMeKaUa0r34NRZ4h2gEHKNBmVRolMs7eoWtEmcvZYmjJcYqVyczySwRR1jv1Q3gTn4alb2BodtWjDp18DQzLEdhh5T62svF8F2u7PngISCAEAIAQAgBACAEAIQzP46Nyqx_B2R8Rx9PZcxnlC041F12-n-fwdb-nsRqpypPpuvB_3-44yrLV4B0vQk2F3ujMZeKNbhcCxaNqGHcfzNHKw0ir_Bwwf8UDoFCkXSsVv8TVp_9d4jkc_qrrcuq2lbo9_3gIh7XjyP2V7MLEQPHbWOeIY17vI_dLDt4dCVYsqVc3ZfUrHJ2I7VvoXTcKp7hDswVRSZSSvyVD7cU-63LgDy_RX1X3KJWJNa4yAnOPVQSxqpW7s6qGQR8FZvF9Q_2j7_AG9F0-R4eylVfgvz_nyOS_UGJ1SjRXTd_ZFuugOcBACAEAIAQAgBACAEAICl2qpzSB5O-xXi55H9mL-f4Z7v6fl-_KPfH7NepVYXeZQSuUaOzjwWLenH88lBJZ27S2IVWWRZE72maoZLEK6w4uOnoikTZMTQwlpHeH_zKupkOmiS3B2g91v0j3UOTGlEujabvBVuGhNeoW6BStyjdiluzn1WRGNkWpVGnJSPkQL-7IG6NSpiismXeCsii0ePuV2WU_8AVj5_dnCZz_3J-X2ROXpHmAgBACAEAIAQAgBACAEIK7HWzSPiPePuvKzmN8K33Nfc9fIpWxiXemYqpLTIXII7pFlZ3_GfFGiTR4fdN1mQqNDUjSWbW7o4ysbRkTJtEAx1RItcly1useHFZUijkwqvZwQjU0RqlcAZgT9PVUsTcqr6q2BmIOkokUbM5XvWgSXA66cuqyaSikU9a85H88FNixHoMLjJRshxNRhlZu7uzmJkfVdXk-JpOhGlf3t9vM47O8FXVaVfT7jtv4Lr3E5eyeACEggBACAEAIAQAgBAQsRvOzaSufxubtScKH19PU7PKv0zGUFWxl_lH19PqZN-KuqVACciYXh1qk6m822dL2FGlT00oqK-SE3VJayMFitcwg5Kbg9bi7qXn-ZrIlcwzdi6s9pnHdziPw_ngodNEKqzRWu0G83eB0drxicvzqsbhZmWNS6JFbHQ4QTwOfXgPb0U6RqHRjbdJ0HvlHuo0saipxDHo1dEwWj1kK8YXMcqljN3-0RDddDlPAjr6_RZFTMTqbFTa3D6jp4HPMevgcgkmkiaabLahTnKFhbNtbItKNLgqNhIh076LhzQdCPYLNFbJm1QkvhZsbd282V0OV5k5NUar36P8M5T9QZCqaeJwy2_-o93zX5XmOLoDjQQkEAIAQAgBACEHkZSvBzjHOP7EHu-fQ7H9L5Qqsva6q2Xwrvff5dPmZLaq8yIHgueijtsRLoZ23bulpPMe6l8Gs4-6aGrTlayNZorrigrFStuaAcIIV07GOUboqbim5mkkLNFp8mtOLittzy2xd7DIOXEHiruBiVWzJox54zByEdPP3VdBZ1BdbHSMgYzz6ZmUUCXUSINXEaj8s-itZLko5OXBKs8MLoNQk9FilUtwZoUr_EaChQDQAOCwXNuMUkWNvRVblrE-jTVWy6RirmrF6_-77BbcfgRSm7VTomD1cgFjZ7VlKNmWFVsHouxyzF-0Uve-JbP1PlefZb7DiXpXuS3X5Xl9rCV6J4oISCAEAIAQHh5DitbF4lYek5vy8Tdy7BSxmIjRXXl9y6hdDdauHnNzk5S3bPr1ClCjTVOCskrIwO0bh2gHP7K6NatvMjdhvgRmOYGXqVDkkY5zijQW4kArWZriLigpTKtFVc26uUK2rR4KUyrRDfZNPBXU2jE6aY27DxwVlUZV0keswpvNHVZCoRLC3tGt0Co5NmVQS4J9NkQqGRFla25Oqq2ZErlrSt8lRsvpHyyAVUskYbELIiqKw0L8_MwtyMvdsa-6qJ_M2uBvyCoz3KbvEv3tkLcy7Fez103w9n_AJ8jx8-y_wBswsope8t4-NuPNbEddsfKT1CQQAgBAeIQ2LpNzlcvneI11FSXC58T6B-k8D2dGWIkt5bLwXqxjEjlC8RHYmV_0oVrgl2bWtGXCZP6JOdkeXXu6haXliGsOXBYVLcxtbEPDNEYSJ1WilxYra9FWKNFdWtVZMo0RX2pU3K2Em2KECmW6AlMt0JsSra3VWy8YlxaUOixtmVIn0qaqWI2JvDWlFyT0Kdlpv0DzAJ-6zXtIxadizwVuiyM9ektjRsCqWkNvpjnC9vDZzUpxUZrUl9TkMd-lqVeUqlGWiTd7cq_3G3UyOo6Zr28PmNCttF2fc9jk8ZkuMwm84XXet16oSt48o8QHrGk6D_C0cTmNChs3d9yPWwOSYvF7xjpj3y2Xl3jgaB1P0XP4rNa1baPur5ep22X_pvC4Va6i7SXe-PJetxymNV5TOgpqyIWJNRGRiMAtgTUPUeyxVTQrq07kjG6HcPgsSMJnMObmrsJFwKUhVBBr20KyZDRXVqWaumUaGqbM1NytiSy0Hj7JcaRX8BAkqLjSINDPL0UXLKO5LtqCq2ZEi2t7byVSR5zQAoBR406RHNXjyS-B62pRSPh7q3MhBXaQ_hVKFlZ6cVZF0FAPKzZClFL2kMg8slJZxuKyOonwy9VvUMyxFFWjK6-e54mMyHBYmWqUdL71tcG0QNcyrYnM69ba-ldyMWAyDCYXe2uXfL8LgH1MuS8-578YIbB4qBU4sSKDYCEIYvqctKIu-BGzzwKjhzE-n7rHURqYqOyZPxun3FhNSJkqLId5qzLFzb8FUMcqUJ_PopIK64swVNxYr61tBV0yjQu3uw35myliUh6pW3zlkPzgFBNh2haTr-eCrcksbagAqssTAzJCCNcOgISiiuBvPCvEMsxSkQBoM1kgupsYaG-pj1lTzV2bhZtaoKNii3JSUluQqggwhli7q54hax6HShCVhWqEjYCGKXJNptyQHrqchCblbaUQyoXcR7HVQ1dFakdcdJdX4lvksDPMRlKlJDISrRyqTYs6QyS5RjVahqclIIVa3DgpIZXVbcSJAU3CJtC1aBoobJSJdOmqkkqlTQkXWUBFReVZ-qsi3BEtWSZV0U5Zb2o0A5kfQrKj0YxUI2Rj9o9sH0ajqNBgDm5Oe_PP-lo9z6LMqe12aWIxkoy7OCM7U2vviZ_iHDwa0D2V9K7jSnXrc6vsSLXbi9ac6gf0cwe4hQ4ovDE1PE3eA4z_FUu03NxwO64AyJ5hYpKx6mHnqVyxAVTYP_Z - - diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/Demographic/ID.json b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/Demographic/ID.json deleted file mode 100644 index 1dbcdfd8b62..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/Demographic/ID.json +++ /dev/null @@ -1,101 +0,0 @@ -{ - "identity" : { - "fullName" : [ { - "language" : "eng", - "value" : "ajay bio with officer pwd auth" - }, { - "language" : "ara", - "value" : "ajay bio with officer pwd auth" - } ], - "dateOfBirth" : "1993/03/03", - "age" : 26, - "gender" : [ { - "language" : "eng", - "value" : "Male" - }, { - "language" : "ara", - "value" : "الذكر" - } ], - "residenceStatus" : [ { - "language" : "eng", - "value" : "Non-Foreigner" - }, { - "language" : "ara", - "value" : "غير أجنبي" - } ], - "addressLine1" : [ { - "language" : "eng", - "value" : "sr nagar" - }, { - "language" : "ara", - "value" : "sr nagar" - } ], - "addressLine2" : [ { - "language" : "eng", - "value" : "sr nagar" - }, { - "language" : "ara", - "value" : "sr nagar" - } ], - "addressLine3" : [ { - "language" : "eng", - "value" : "sr nagar" - }, { - "language" : "ara", - "value" : "sr nagar" - } ], - "region" : [ { - "language" : "eng", - "value" : "Rabat Sale Kenitra" - }, { - "language" : "ara", - "value" : "جهة الرباط سلا القنيطرة" - } ], - "province" : [ { - "language" : "eng", - "value" : "Kenitra" - }, { - "language" : "ara", - "value" : "القنيطرة" - } ], - "city" : [ { - "language" : "eng", - "value" : "Kenitra" - }, { - "language" : "ara", - "value" : "القنيطرة" - } ], - "postalCode" : "14022", - "phone" : "9535780230", - "email" : "sravan.kalla@mindtree.com", - "referenceIdentityNumber" : "234978247973497234", - "zone" : [ { - "language" : "eng", - "value" : "Ben Mansour" - }, { - "language" : "ara", - "value" : "بن منصور" - } ], - "proofOfAddress" : { - "value" : "POA_CNIE_card", - "type" : "CIN", - "format" : "jpg" - }, - "proofOfIdentity" : { - "value" : "POI_CNIE_card", - "type" : "CIN", - "format" : "jpg" - }, - "proofOfRelationship" : { - "value" : "POR_Passport", - "type" : "DOC001", - "format" : "jpg" - }, - "individualBiometrics" : { - "format" : "cbeff", - "version" : 1.0, - "value" : "applicant_bio_CBEFF" - }, - "IDSchemaVersion" : 1.0 - } -} \ No newline at end of file diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/Demographic/POA_CNIE_card.jpg b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/Demographic/POA_CNIE_card.jpg deleted file mode 100644 index f3142724081..00000000000 Binary files a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/Demographic/POA_CNIE_card.jpg and /dev/null differ diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/Demographic/POE_Certification_of_Exception.jpg b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/Demographic/POE_Certification_of_Exception.jpg deleted file mode 100644 index f3142724081..00000000000 Binary files a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/Demographic/POE_Certification_of_Exception.jpg and /dev/null differ diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/Demographic/POI_CNIE_card.jpg b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/Demographic/POI_CNIE_card.jpg deleted file mode 100644 index f3142724081..00000000000 Binary files a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/Demographic/POI_CNIE_card.jpg and /dev/null differ diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/Demographic/POR_Passport.jpg b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/Demographic/POR_Passport.jpg deleted file mode 100644 index f3142724081..00000000000 Binary files a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/Demographic/POR_Passport.jpg and /dev/null differ diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/audit.json b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/audit.json deleted file mode 100644 index 9a71a380590..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/audit.json +++ /dev/null @@ -1,1344 +0,0 @@ -[ { - "eventId" : "REG-EVT-110", - "eventName" : "PACKET_META_JSON_CREATED", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:16:57.864Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "10002100320001520200210080924", - "idType" : "REGISTRATION_ID", - "createdBy" : "110032 110032", - "moduleName" : "Packet Creator", - "moduleId" : "REG-MOD-119", - "description" : "Packet Meta-Data JSON created successfully" -}, { - "eventId" : "REG-EVT-109", - "eventName" : "PACKET_HMAC_FILE_CREATED", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:16:57.876Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "10002100320001520200210080924", - "idType" : "REGISTRATION_ID", - "createdBy" : "110032 110032", - "moduleName" : "Packet Creator", - "moduleId" : "REG-MOD-119", - "description" : "Packet HMAC File created successfully" -}, { - "eventId" : "REG-EVT-110", - "eventName" : "PACKET_META_JSON_CREATED", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:16:57.897Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "10002100320001520200210080924", - "idType" : "REGISTRATION_ID", - "createdBy" : "110032 110032", - "moduleName" : "Packet Creator", - "moduleId" : "REG-MOD-119", - "description" : "Packet Meta-Data JSON created successfully" -}, { - "eventId" : "REG-EVT-110", - "eventName" : "PACKET_META_JSON_CREATED", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:16:58.305Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "10002100320001520200210080924", - "idType" : "REGISTRATION_ID", - "createdBy" : "110032 110032", - "moduleName" : "Packet Creator", - "moduleId" : "REG-MOD-119", - "description" : "Packet Meta-Data JSON created successfully" -}, { - "eventId" : "REG-EVT-107", - "eventName" : "PACKET_INTERNAL_ZIP", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:16:58.331Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "10002100320001520200210080924", - "idType" : "REGISTRATION_ID", - "createdBy" : "110032 110032", - "moduleName" : "Packet Creator", - "moduleId" : "REG-MOD-119", - "description" : "Packet internally zipped successfully" -}, { - "eventId" : "REG-EVT-112", - "eventName" : "PACKET_AES_ENCRYPTED", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:16:59.111Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "REGISTRATION", - "idType" : "APPLICATION_ID", - "createdBy" : "110032 110032", - "moduleName" : "Packet AES Encryptor", - "moduleId" : "REG-MOD-121", - "description" : "Packet Encrypted Sucessfully" -}, { - "eventId" : "REG-EVT-099", - "eventName" : "PACKET_ENCRYPTED", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:16:59.161Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "10002100320001520200210080924", - "idType" : "REGISTRATION_ID", - "createdBy" : "110032 110032", - "moduleName" : "Packet Encryptor", - "moduleId" : "REG-MOD-120", - "description" : "Packet Encrypted Sucessfully" -}, { - "eventId" : "REG-EVT-137", - "eventName" : "NOTIFICATION_SERVICE", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:16:59.514Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Notification", - "moduleId" : "REG-MOD-137", - "description" : "Notification request status" -}, { - "eventId" : "REG-EVT-137", - "eventName" : "NOTIFICATION_SERVICE", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:16:59.862Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Notification", - "moduleId" : "REG-MOD-137", - "description" : "Notification request status" -}, { - "eventId" : "REG-EVT-137", - "eventName" : "NOTIFICATION_SERVICE", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:17:00.573Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Notification", - "moduleId" : "REG-MOD-137", - "description" : "Notification request status" -}, { - "eventId" : "REG-EVT-125", - "eventName" : "PACKET_RETRIVE", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:17:05.756Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Packet Retrive for Approval", - "moduleId" : "REG-MOD-131", - "description" : "Packets which are in created state for approval are retrived" -}, { - "eventId" : "REG-EVT-125", - "eventName" : "PACKET_RETRIVE", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:17:05.766Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Packet Retrive for Approval", - "moduleId" : "REG-MOD-131", - "description" : "Packets which are in created state for approval are retrived" -}, { - "eventId" : "REG-EVT-021", - "eventName" : "NAV_HOME", - "eventType" : "SYSTEM", - "actionTimeStamp" : "2020-02-10T08:17:05.833Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Navigation", - "moduleId" : "REG-MOD-102", - "description" : "Navigation link: Home" -}, { - "eventId" : "REG-EVT-125", - "eventName" : "PACKET_RETRIVE", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:17:09.951Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Packet Retrive for Approval", - "moduleId" : "REG-MOD-131", - "description" : "Packets which are in created state for approval are retrived" -}, { - "eventId" : "REG-EVT-125", - "eventName" : "PACKET_RETRIVE", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:17:09.962Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Packet Retrive for Approval", - "moduleId" : "REG-MOD-131", - "description" : "Packets which are in created state for approval are retrived" -}, { - "eventId" : "REG-EVT-021", - "eventName" : "NAV_HOME", - "eventType" : "SYSTEM", - "actionTimeStamp" : "2020-02-10T08:17:10.008Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Navigation", - "moduleId" : "REG-MOD-102", - "description" : "Navigation link: Home" -}, { - "eventId" : "REG-EVT-012", - "eventName" : "NAV_APPROVE_REG", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:17:11.377Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Navigation", - "moduleId" : "REG-MOD-102", - "description" : "Navigation link: Approve Registration" -}, { - "eventId" : "REG-EVT-125", - "eventName" : "PACKET_RETRIVE", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:17:11.476Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Packet Retrive for Approval", - "moduleId" : "REG-MOD-131", - "description" : "Packets which are in created state for approval are retrived" -}, { - "eventId" : "REG-EVT-125", - "eventName" : "PACKET_RETRIVE", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:17:11.486Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Packet Retrive for Approval", - "moduleId" : "REG-MOD-131", - "description" : "Packets which are in created state for approval are retrived" -}, { - "eventId" : "REG-EVT-114", - "eventName" : "LOGIN_MODES_FETCH", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:17:14.259Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "REGISTRATION", - "idType" : "APPLICATION_ID", - "createdBy" : "110032 110032", - "moduleName" : "Login Modes", - "moduleId" : "REG-MOD-123", - "description" : "Fetching Login Modes" -}, { - "eventId" : "REG-EVT-114", - "eventName" : "LOGIN_MODES_FETCH", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:17:14.271Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "REGISTRATION", - "idType" : "APPLICATION_ID", - "createdBy" : "110032 110032", - "moduleName" : "Login Modes", - "moduleId" : "REG-MOD-123", - "description" : "Fetching Login Modes" -}, { - "eventId" : "REG-EVT-114", - "eventName" : "LOGIN_MODES_FETCH", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:17:14.291Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "REGISTRATION", - "idType" : "APPLICATION_ID", - "createdBy" : "110032 110032", - "moduleName" : "Login Modes", - "moduleId" : "REG-MOD-123", - "description" : "Fetching Login Modes" -}, { - "eventId" : "REG-EVT-067", - "eventName" : "REG_SUPERVISOR_AUTH_PASSWORD", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:17:22.224Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Registration: OS Authentication", - "moduleId" : "REG-MOD-107", - "description" : "Supervisor authentication with password: Click of Submit" -}, { - "eventId" : "REG-EVT-117", - "eventName" : "FETCH_USER_DETAILS", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:17:22.230Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "REGISTRATION", - "idType" : "APPLICATION_ID", - "createdBy" : "110032 110032", - "moduleName" : "User Detail", - "moduleId" : "REG-MOD-126", - "description" : "Fetching User Details" -}, { - "eventId" : "REG-EVT-117", - "eventName" : "FETCH_USER_DETAILS", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:17:22.244Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "REGISTRATION", - "idType" : "APPLICATION_ID", - "createdBy" : "110032 110032", - "moduleName" : "User Detail", - "moduleId" : "REG-MOD-126", - "description" : "Fetching User Details" -}, { - "eventId" : "REG-EVT-073", - "eventName" : "REG_SUPERVISOR_AUTH_FACE", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:18:02.689Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Registration: OS Authentication", - "moduleId" : "REG-MOD-107", - "description" : "Supervisor authentication with face: Capture and submit" -}, { - "eventId" : "REG-EVT-117", - "eventName" : "FETCH_USER_DETAILS", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:18:02.696Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "REGISTRATION", - "idType" : "APPLICATION_ID", - "createdBy" : "110032 110032", - "moduleName" : "User Detail", - "moduleId" : "REG-MOD-126", - "description" : "Fetching User Details" -}, { - "eventId" : "REG-EVT-073", - "eventName" : "REG_SUPERVISOR_AUTH_FACE", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:18:17.808Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Registration: OS Authentication", - "moduleId" : "REG-MOD-107", - "description" : "Supervisor authentication with face: Capture and submit" -}, { - "eventId" : "REG-EVT-117", - "eventName" : "FETCH_USER_DETAILS", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:18:17.814Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "REGISTRATION", - "idType" : "APPLICATION_ID", - "createdBy" : "110032 110032", - "moduleName" : "User Detail", - "moduleId" : "REG-MOD-126", - "description" : "Fetching User Details" -}, { - "eventId" : "REG-EVT-073", - "eventName" : "REG_SUPERVISOR_AUTH_FACE", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:18:34.584Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Registration: OS Authentication", - "moduleId" : "REG-MOD-107", - "description" : "Supervisor authentication with face: Capture and submit" -}, { - "eventId" : "REG-EVT-117", - "eventName" : "FETCH_USER_DETAILS", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:18:34.591Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "REGISTRATION", - "idType" : "APPLICATION_ID", - "createdBy" : "110032 110032", - "moduleName" : "User Detail", - "moduleId" : "REG-MOD-126", - "description" : "Fetching User Details" -}, { - "eventId" : "REG-EVT-117", - "eventName" : "FETCH_USER_DETAILS", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:18:36.457Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "REGISTRATION", - "idType" : "APPLICATION_ID", - "createdBy" : "110032 110032", - "moduleName" : "User Detail", - "moduleId" : "REG-MOD-126", - "description" : "Fetching User Details" -}, { - "eventId" : "REG-EVT-126", - "eventName" : "PACKET_UPDATE", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:18:36.469Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Update Packet", - "moduleId" : "REG-MOD-132", - "description" : "Packets which are in created state are updated" -}, { - "eventId" : "REG-EVT-125", - "eventName" : "PACKET_RETRIVE", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:18:38.349Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Packet Retrive for Approval", - "moduleId" : "REG-MOD-131", - "description" : "Packets which are in created state for approval are retrived" -}, { - "eventId" : "REG-EVT-125", - "eventName" : "PACKET_RETRIVE", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:18:38.361Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Packet Retrive for Approval", - "moduleId" : "REG-MOD-131", - "description" : "Packets which are in created state for approval are retrived" -}, { - "eventId" : "REG-EVT-093", - "eventName" : "SYNC_PRE_REGISTRATION_PACKET", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:18:41.788Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Server to Client Sync", - "moduleId" : "REG-MOD-114", - "description" : "Sync pre-registration data" -}, { - "eventId" : "REG-EVT-014", - "eventName" : "NAV_UPLOAD_PACKETS", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:18:41.801Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Navigation", - "moduleId" : "REG-MOD-102", - "description" : "Navigation link: Upload Packets" -}, { - "eventId" : "REG-EVT-079", - "eventName" : "UPLOAD_PACKET", - "eventType" : "SYSTEM", - "actionTimeStamp" : "2020-02-10T08:18:44.602Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Upload Packets", - "moduleId" : "REG-MOD-110", - "description" : "Upload packets" -}, { - "eventId" : "REG-EVT-112", - "eventName" : "PACKET_AES_ENCRYPTED", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:18:45.281Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "REGISTRATION", - "idType" : "APPLICATION_ID", - "createdBy" : "110032 110032", - "moduleName" : "Packet AES Encryptor", - "moduleId" : "REG-MOD-121", - "description" : "Packet Encrypted Sucessfully" -}, { - "eventId" : "REG-EVT-079", - "eventName" : "UPLOAD_PACKET", - "eventType" : "SYSTEM", - "actionTimeStamp" : "2020-02-10T08:18:46.644Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Upload Packets", - "moduleId" : "REG-MOD-110", - "description" : "Upload packets" -}, { - "eventId" : "REG-EVT-133", - "eventName" : "PACKET_UPLOAD", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:18:46.669Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "packetUpload", - "createdBy" : "110032 110032", - "moduleName" : "Packet upload", - "moduleId" : "REG-MOD-135", - "description" : "Upload the local packets to the server" -}, { - "eventId" : "REG-EVT-125", - "eventName" : "PACKET_RETRIVE", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:19:01.732Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Packet Retrive for Approval", - "moduleId" : "REG-MOD-131", - "description" : "Packets which are in created state for approval are retrived" -}, { - "eventId" : "REG-EVT-125", - "eventName" : "PACKET_RETRIVE", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:19:01.739Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Packet Retrive for Approval", - "moduleId" : "REG-MOD-131", - "description" : "Packets which are in created state for approval are retrived" -}, { - "eventId" : "REG-EVT-021", - "eventName" : "NAV_HOME", - "eventType" : "SYSTEM", - "actionTimeStamp" : "2020-02-10T08:19:01.788Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Navigation", - "moduleId" : "REG-MOD-102", - "description" : "Navigation link: Home" -}, { - "eventId" : "REG-EVT-125", - "eventName" : "PACKET_RETRIVE", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:19:02.544Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Packet Retrive for Approval", - "moduleId" : "REG-MOD-131", - "description" : "Packets which are in created state for approval are retrived" -}, { - "eventId" : "REG-EVT-125", - "eventName" : "PACKET_RETRIVE", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:19:02.550Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Packet Retrive for Approval", - "moduleId" : "REG-MOD-131", - "description" : "Packets which are in created state for approval are retrived" -}, { - "eventId" : "REG-EVT-021", - "eventName" : "NAV_HOME", - "eventType" : "SYSTEM", - "actionTimeStamp" : "2020-02-10T08:19:02.598Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Navigation", - "moduleId" : "REG-MOD-102", - "description" : "Navigation link: Home" -}, { - "eventId" : "REG-EVT-016", - "eventName" : "NAV_SYNC_DATA", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:19:02.837Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Navigation", - "moduleId" : "REG-MOD-102", - "description" : "Navigation link: Sync Data" -}, { - "eventId" : "REG-EVT-010", - "eventName" : "NAV_NEW_REG", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:20:11.702Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Navigation", - "moduleId" : "REG-MOD-102", - "description" : "Click of navigation link: New Registration" -}, { - "eventId" : "REG-EVT-128", - "eventName" : "PENDING_PKT_COUNT_VALIDATION", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:20:12.357Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "REGISTRATION", - "idType" : "APPLICATION_ID", - "createdBy" : "110032 110032", - "moduleName" : "Sync service", - "moduleId" : "REG-MOD-133", - "description" : "Validating the Pending packets count" -}, { - "eventId" : "REG-EVT-129", - "eventName" : "PENDING_PKT_DURATION_VALIDATION", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:20:12.364Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "REGISTRATION", - "idType" : "APPLICATION_ID", - "createdBy" : "110032 110032", - "moduleName" : "Sync service", - "moduleId" : "REG-MOD-133", - "description" : "Validating the Pending packets Duration" -}, { - "eventId" : "REG-EVT-122", - "eventName" : "SYNC_JOB_INFO_FETCH", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:20:12.422Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Sync service", - "moduleId" : "REG-MOD-133", - "description" : "SyncJobInfo containing the sync control list and yet to export packet count fetched successfully" -}, { - "eventId" : "REG-EVT-127", - "eventName" : "SYNC_GEO_VALIDATE", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:20:12.431Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "REGISTRATION", - "idType" : "APPLICATION_ID", - "createdBy" : "110032 110032", - "moduleName" : "Sync service", - "moduleId" : "REG-MOD-133", - "description" : "Validating the geo information ended successfully" -}, { - "eventId" : "REG-EVT-123", - "eventName" : "SYNC_INFO_VALIDATION", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:20:12.451Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "REGISTRATION", - "idType" : "APPLICATION_ID", - "createdBy" : "110032 110032", - "moduleName" : "Sync service", - "moduleId" : "REG-MOD-133", - "description" : "Validating the sync status ended successfully" -}, { - "eventId" : "REG-EVT-139", - "eventName" : "SAVE_DETAIL_TO_DTO", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:21:08.856Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "UserID", - "createdBy" : "110032 110032", - "moduleName" : "Registration initialization", - "moduleId" : "REG-MOD-140", - "description" : "Saving the details to DTO" -}, { - "eventId" : "REG-EVT-025", - "eventName" : "REG_DEMO_NEXT", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:21:08.960Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Registration: DemographicsDetails", - "moduleId" : "REG-MOD-103", - "description" : "Click of Next after capturing demographic details" -}, { - "eventId" : "REG-EVT-026", - "eventName" : "REG_DOC_POA_SCAN", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:21:15.103Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Registration: Documents", - "moduleId" : "REG-MOD-104", - "description" : "PoA: Click of Scan" -}, { - "eventId" : "REG-EVT-029", - "eventName" : "REG_DOC_POI_SCAN", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:21:17.199Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Registration: Documents", - "moduleId" : "REG-MOD-104", - "description" : "PoI: Click of Scan" -}, { - "eventId" : "REG-EVT-032", - "eventName" : "REG_DOC_POR_SCAN", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:21:19.079Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Registration: Documents", - "moduleId" : "REG-MOD-104", - "description" : "PoR: Click of Scan" -}, { - "eventId" : "REG-EVT-147", - "eventName" : "REG_DOC_POB_SCAN", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:21:20.672Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Registration: Documents", - "moduleId" : "REG-MOD-104", - "description" : "PoB: Click of Scan" -}, { - "eventId" : "REG-EVT-038", - "eventName" : "REG_DOC_NEXT", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:22:16.816Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Registration: Documents", - "moduleId" : "REG-MOD-104", - "description" : "Click of Next after uploading documents" -}, { - "eventId" : "REG-EVT-043", - "eventName" : "REG_BIO_LEFT_SLAP_SCAN", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:22:22.079Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Registration: Biometrics", - "moduleId" : "REG-MOD-105", - "description" : "Fingerprints: Scan of left slap" -}, { - "eventId" : "REG-EVT-044", - "eventName" : "REG_BIO_RIGHT_SLAP_SCAN", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:22:41.775Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Registration: Biometrics", - "moduleId" : "REG-MOD-105", - "description" : "Fingerprints: Scan of right slap" -}, { - "eventId" : "REG-EVT-045", - "eventName" : "REG_BIO_THUMBS_SCAN", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:22:52.407Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Registration: Biometrics", - "moduleId" : "REG-MOD-105", - "description" : "Fingerprints: Scan of thumbs" -}, { - "eventId" : "REG-EVT-046", - "eventName" : "REG_BIO_FINGERPRINT_NEXT", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:23:34.823Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Registration: Biometrics", - "moduleId" : "REG-MOD-105", - "description" : "Click of Next after capturing fingerprints" -}, { - "eventId" : "REG-EVT-048", - "eventName" : "REG_BIO_IRIS_SCAN", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:23:38.126Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Registration: Biometrics", - "moduleId" : "REG-MOD-105", - "description" : "Iris: Scan of left iris" -}, { - "eventId" : "REG-EVT-049", - "eventName" : "REG_BIO_IRIS_NEXT", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:24:01.679Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Registration: Biometrics", - "moduleId" : "REG-MOD-105", - "description" : "Click of Next after capturing irises" -}, { - "eventId" : "REG-EVT-051", - "eventName" : "REG_BIO_FACE_CAPTURE", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:24:03.647Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Registration: Biometrics", - "moduleId" : "REG-MOD-105", - "description" : "Photo: Face capture" -}, { - "eventId" : "REG-EVT-052", - "eventName" : "REG_BIO_FACE_CAPTURE_NEXT", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:26:50.646Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Registration: Biometrics", - "moduleId" : "REG-MOD-105", - "description" : "Click of Next after capturing face photo" -}, { - "eventId" : "REG-EVT-139", - "eventName" : "SAVE_DETAIL_TO_DTO", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:26:51.021Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "UserID", - "createdBy" : "110032 110032", - "moduleName" : "Registration initialization", - "moduleId" : "REG-MOD-140", - "description" : "Saving the details to DTO" -}, { - "eventId" : "REG-EVT-057", - "eventName" : "REG_PREVIEW_SUBMIT", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:26:58.751Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Registration: Preview", - "moduleId" : "REG-MOD-106", - "description" : "Submit" -}, { - "eventId" : "REG-EVT-114", - "eventName" : "LOGIN_MODES_FETCH", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:26:58.760Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "REGISTRATION", - "idType" : "APPLICATION_ID", - "createdBy" : "110032 110032", - "moduleName" : "Login Modes", - "moduleId" : "REG-MOD-123", - "description" : "Fetching Login Modes" -}, { - "eventId" : "REG-EVT-114", - "eventName" : "LOGIN_MODES_FETCH", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:26:58.800Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "REGISTRATION", - "idType" : "APPLICATION_ID", - "createdBy" : "110032 110032", - "moduleName" : "Login Modes", - "moduleId" : "REG-MOD-123", - "description" : "Fetching Login Modes" -}, { - "eventId" : "REG-EVT-114", - "eventName" : "LOGIN_MODES_FETCH", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:26:58.806Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "REGISTRATION", - "idType" : "APPLICATION_ID", - "createdBy" : "110032 110032", - "moduleName" : "Login Modes", - "moduleId" : "REG-MOD-123", - "description" : "Fetching Login Modes" -}, { - "eventId" : "REG-EVT-058", - "eventName" : "REG_OPERATOR_AUTH_PASSWORD", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:27:12.022Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "110032", - "idType" : "USER_ID", - "createdBy" : "110032 110032", - "moduleName" : "Registration: OS Authentication", - "moduleId" : "REG-MOD-107", - "description" : "Operator authentication with password: Click of Submit" -}, { - "eventId" : "REG-EVT-117", - "eventName" : "FETCH_USER_DETAILS", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:27:12.027Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "REGISTRATION", - "idType" : "APPLICATION_ID", - "createdBy" : "110032 110032", - "moduleName" : "User Detail", - "moduleId" : "REG-MOD-126", - "description" : "Fetching User Details" -}, { - "eventId" : "REG-EVT-117", - "eventName" : "FETCH_USER_DETAILS", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:27:12.199Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "REGISTRATION", - "idType" : "APPLICATION_ID", - "createdBy" : "110032 110032", - "moduleName" : "User Detail", - "moduleId" : "REG-MOD-126", - "description" : "Fetching User Details" -}, { - "eventId" : "REG-EVT-109", - "eventName" : "PACKET_HMAC_FILE_CREATED", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:27:12.300Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "10002100320001620200210082011", - "idType" : "REGISTRATION_ID", - "createdBy" : "110032 110032", - "moduleName" : "Packet Creator", - "moduleId" : "REG-MOD-119", - "description" : "Packet HMAC File created successfully" -}, { - "eventId" : "REG-EVT-108", - "eventName" : "PACKET_DEMO_JSON_CREATED", - "eventType" : "USER", - "actionTimeStamp" : "2020-02-10T08:27:12.332Z", - "hostName" : "A2MD24702", - "hostIp" : "192.168.225.43", - "applicationId" : "REG", - "applicationName" : "REGISTRATION", - "sessionUserId" : "110032", - "sessionUserName" : "110032 110032", - "id" : "10002100320001620200210082011", - "idType" : "REGISTRATION_ID", - "createdBy" : "110032 110032", - "moduleName" : "Packet Creator", - "moduleId" : "REG-MOD-119", - "description" : "Packet Demographic JSON created successfully" -} ] \ No newline at end of file diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/packet_data_hash.txt b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/packet_data_hash.txt deleted file mode 100644 index f1014c517e4..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/packet_data_hash.txt +++ /dev/null @@ -1 +0,0 @@ -4A9C6B47A04F2CD15FD8E8007953F0EB8A3BDFFBF137FC4F0095D2C8EE170B95 \ No newline at end of file diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/packet_meta_info.json b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/packet_meta_info.json deleted file mode 100644 index 1daa3c11353..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/packet_meta_info.json +++ /dev/null @@ -1,215 +0,0 @@ -{ - "identity" : { - "biometric" : { - "applicant" : { - "leftEye" : { - "numRetry" : 1, - "forceCaptured" : false, - "BIRIndex" : "c1d3ccc7-620c-4018-ba2b-bd474bc61643" - }, - "rightEye" : { - "numRetry" : 1, - "forceCaptured" : false, - "BIRIndex" : "6847c608-3014-4a31-810e-17a568537aad" - }, - "leftThumb" : { - "numRetry" : 1, - "forceCaptured" : false, - "BIRIndex" : "8eecefae-fbed-49f0-bcb3-b13a8d3ca239" - }, - "rightThumb" : { - "numRetry" : 1, - "forceCaptured" : false, - "BIRIndex" : "fba4f56e-297d-461b-ba81-8bfb886eced9" - }, - "leftIndex" : { - "numRetry" : 1, - "forceCaptured" : false, - "BIRIndex" : "43c84de5-8fa8-4ce7-b9ff-a4b1cd263dd1" - }, - "leftMiddle" : { - "numRetry" : 1, - "forceCaptured" : false, - "BIRIndex" : "1fc29feb-3733-45b1-8dfa-4bd89168c9e6" - }, - "leftRing" : { - "numRetry" : 1, - "forceCaptured" : false, - "BIRIndex" : "7d8edc69-f237-4c2e-a4f7-668fbafeceb8" - }, - "leftLittle" : { - "numRetry" : 1, - "forceCaptured" : false, - "BIRIndex" : "d3140f0d-43fc-4b30-ae44-d4663fdd05b0" - }, - "rightIndex" : { - "numRetry" : 1, - "forceCaptured" : false, - "BIRIndex" : "fb772301-c1bd-441e-893c-b09c3baaaf50" - }, - "rightMiddle" : { - "numRetry" : 1, - "forceCaptured" : false, - "BIRIndex" : "d8d0f1d4-b2b0-462d-9189-c48f881095c8" - }, - "rightRing" : { - "numRetry" : 1, - "forceCaptured" : false, - "BIRIndex" : "16bcec8c-82e2-4d51-a835-0bacbb09bf9a" - }, - "rightLittle" : { - "numRetry" : 1, - "forceCaptured" : false, - "BIRIndex" : "f2dc3b6d-28eb-49c2-a084-3bf756afcad6" - } - } - }, - "exceptionBiometrics" : [ ], - "applicantPhotograph" : { - "numRetry" : 0, - "BIRIndex" : "cd0197fc-6477-47d5-b5cb-ec1a6ade5938" - }, - "exceptionPhotograph" : null, - "documents" : [ ], - "metaData" : [ { - "label" : "Registration Client Version Number", - "value" : "1.0.6" - }, { - "label" : "geoLocLatitude", - "value" : "0.0" - }, { - "label" : "geoLoclongitude", - "value" : "0.0" - }, { - "label" : "registrationType", - "value" : "New" - }, { - "label" : "preRegistrationId", - "value" : null - }, { - "label" : "registrationId", - "value" : "10002100320001620200210082011" - }, { - "label" : "machineId", - "value" : "10032" - }, { - "label" : "dongleId", - "value" : "FB5962911665" - }, { - "label" : "macId", - "value" : "98-EE-CB-1E-16-77" - }, { - "label" : "centerId", - "value" : "10002" - }, { - "label" : "previousRID", - "value" : null - }, { - "label" : "introducerType", - "value" : null - }, { - "label" : "consentOfApplicant", - "value" : "Yes" - }, { - "label" : "creationDate", - "value" : "2020-02-10T13:57:12.693Z" - }, { - "label" : "authenticationBiometricFileName", - "value" : null - } ], - "osiData" : [ { - "label" : "officerId", - "value" : "110032" - }, { - "label" : "officerBiometricFileName", - "value" : null - }, { - "label" : "supervisorId", - "value" : null - }, { - "label" : "supervisorBiometricFileName", - "value" : null - }, { - "label" : "supervisorPassword", - "value" : "false" - }, { - "label" : "officerPassword", - "value" : "true" - }, { - "label" : "supervisorPIN", - "value" : null - }, { - "label" : "officerPIN", - "value" : null - }, { - "label" : "supervisorOTPAuthentication", - "value" : "false" - }, { - "label" : "officerOTPAuthentication", - "value" : "false" - } ], - "hashSequence1" : [ { - "label" : "applicantBiometricSequence", - "value" : [ "applicant_bio_CBEFF" ] - }, { - "label" : "introducerBiometricSequence", - "value" : [ ] - }, { - "label" : "applicantDemographicSequence", - "value" : [ "ID", "POR_Passport", "POA_CNIE_card", "POE_Certification_of_Exception", "POI_CNIE_card" ] - } ], - "hashSequence2" : [ { - "label" : "otherFiles", - "value" : [ "audit" ] - } ], - "capturedRegisteredDevices" : [ { - "deviceCode" : "7b4531b2-0abc-4c78-bd11-1be7b6349f15", - "deviceServiceVersion" : "SB.WIN.001", - "digitalId" : { - "serialNo" : "7b4531b2-0abc-4c78-bd11-1be7b6349f15", - "make" : "Greenbit", - "model" : "DactyScan84c", - "type" : "Fingerprint", - "dpId" : "SYNCBYTE.TCI322", - "dp" : "SYNCBYTE", - "subType" : "Slab", - "dateTime" : "2020-02-10T13:57:12.693" - } - }, { - "deviceCode" : "3ec6e5ba-d96e-46c8-b147-7a3fd3f089ee", - "deviceServiceVersion" : "SB.WIN.001", - "digitalId" : { - "serialNo" : "3ec6e5ba-d96e-46c8-b147-7a3fd3f089ee", - "make" : "EYECOOL", - "model" : "TCI322", - "type" : "Iris", - "dpId" : "SYNCBYTE.TCI322", - "dp" : "SYNCBYTE", - "subType" : "Double", - "dateTime" : "2020-02-10T13:57:12.693" - } - }, { - "deviceCode" : "738c0b0b-df9b-40b6-a1a5-3465a0cf7a5c", - "deviceServiceVersion" : "SB.WIN.001", - "digitalId" : { - "serialNo" : "738c0b0b-df9b-40b6-a1a5-3465a0cf7a5c", - "make" : "Logitech", - "model" : "6bdd1fc6-810f-11d0-bec7-08002be2092f", - "type" : "Face", - "dpId" : "SYNCBYTE.TCI322", - "dp" : "SYNCBYTE", - "subType" : "Full face", - "dateTime" : "2020-02-10T13:57:12.693" - } - } ], - "capturedNonRegisteredDevices" : null, - "checkSum" : [ { - "label" : "mosip-client.jar", - "value" : "A039D7F426D86F8D5445541AC30F26C8E2ED8BDF9419F10824C097998E9A34A8" - }, { - "label" : "mosip-services.jar", - "value" : "E98B48C6DDA8F4AD197333FAB19F58D158BF797B8DABB98BCBA09B85557A1F73" - } ], - "printingName" : null - } -} \ No newline at end of file diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/packet_osi_hash.txt b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/packet_osi_hash.txt deleted file mode 100644 index 9fd91a1eb9e..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/NEW/packet_osi_hash.txt +++ /dev/null @@ -1 +0,0 @@ -83FD3ADC99E8B10C0D5392F5C236755525D745E602CBC2DAA31211DD9F687442 \ No newline at end of file diff --git a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/bootstrap.properties b/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/bootstrap.properties deleted file mode 100644 index d37b3977422..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/packet-generator/src/main/resources/bootstrap.properties +++ /dev/null @@ -1,20 +0,0 @@ -spring.cloud.config.uri=http://104.211.212.28:51000 -spring.cloud.config.label=master -spring.application.name=registration-processor,application -spring.profiles.active=qa -spring.cloud.config.name=registration-processor -mosip.kernel.jsonvalidator.property-source=APPLICATION_CONTEXT -mosip.kernel.jsonvalidator.schema-name=mosip-identity-json-schema.json -management.endpoints.web.exposure.include=refresh -registration.processor.zone=secure -server.port=8082 -server.servlet.path=/v1/utility/packetgenerator -#disabling health check so that client doesnt try to load properties from sprint config server every -# 5 minutes (should not be done in production) -health.config.enabled=false -mosip.kernel.jsonvalidator.file-storage-uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/ -registration.processor.identityjson=RegistrationProcessorIdentity.json -registration.processor.demographic.identity=identity -packet.info.storage.service=registration-processor-packet-info-storage-service -config.server.file.storage.uri=${spring.cloud.config.uri}/${packet.info.storage.service}/${spring.profiles.active}/${spring.cloud.config.label}/ -eventbus.port=5713 \ No newline at end of file diff --git a/registration-processor-utilities/packet-generator-uploader-utility/pom.xml b/registration-processor-utilities/packet-generator-uploader-utility/pom.xml deleted file mode 100644 index 9d5d2517057..00000000000 --- a/registration-processor-utilities/packet-generator-uploader-utility/pom.xml +++ /dev/null @@ -1,264 +0,0 @@ - - - 4.0.0 - - io.mosip - packet-generator-uploader-utility - 1.0.6 - pom - - packet-generator-uploader-utility - http://maven.apache.org - - - true - UTF-8 - 11 - 11 - 3.8.0 - 3.0.2 - 3.1.0 - 2.9 - 0.8.1 - 3.5.0.1254 - - - 5.0.6.RELEASE - 5.0.4.RELEASE - 2.0.2.RELEASE - 2.0.9.RELEASE - 2.0.0.RELEASE - - 4.0.1.RELEASE - 2.0.0.RELEASE - - - 3.0.0 - 2.0.1.Final - 2.9.5 - 6.0.12.Final - 2.1.1 - 1.7.25 - 63.1 - - - - 2.9.2 - - - 2.5.0 - 5.1.46 - 1.4.195 - 42.2.2 - - - 1.18.8 - - - 2.3.0 - - - 1.60 - - - 3.6.1 - 3.7 - 2.6 - 1.10 - 1.9.2 - 2.2 - 2.6 - 1.7 - 2.0 - - - 4.12 - 1.2.3 - 1.7.19 - 1.10.19 - 1.7.4 - 1.7.4 - 3.1.0 - 1.1.1 - 1.9 - - 1.11.368 - 0.2.4 - - - 3.5.3 - 2.23.0 - 1.0.0 - - 1.1.1 - - - 2.8.1 - - - 0.1.55 - - - ${version} - ${version} - ${version} - ${version} - ${version} - ${version} - ${version} - ${version} - ${version} - ${version} - ${version} - ${version} - - - ${version} - ${version} - ${version} - ${version} - ${version} - ${version} - ${version} - ${version} - - **/dto/**, - **/exception/*Exception.java, - **/config/*Config.java, - **/handler/*ExceptionHandler.java, - **/**/*Application.java, - **/utilities/*.java, - **/validator/*Validator.java, - **/utils/*.java, - **/util/*.java, - **/code/*.java, - **/entity/*.java, - **/config/*.java, - - **/core/code/*.java, - **/packet/storage/entity/*.java, - **/manager/exception/systemexception/*.java, - **/registration/processor/rest/client/*.java, - **/registration/processor/rest/client/audit/builder/*.java, - - **/registration/processor/packet/receiver/*.java, - **/registration/processor/packet/receiver/exception/systemexception/*.java, - **/registration/processor/failoverstage/*.java, - **/registration/processor/stages/*.java, - **/registration/processor/retry/verticle/*.java, - **/registration/processor/retry/verticle/stages/*.java, - **/registration/processor/packet/decrypter/job/stage/*.java, - **/registration/processor/packet/decryptor/job/exception/constant/*.java, - - **/registration/processor/virus/scanner/job/exceptions/*.java, - - - **/registration/processor/stages/app/*.java, - **/registration/processor/camel/bridge/processor/*.java, - **/registration/processor/core/constant/*.java, - **/registration/processor/core/packet/dto/demographicinfo/*.java, - **/registration/processor/core/packet/dto/demographicinfo/identify/*.java, - **/registration/processor/core/packet/dto/regcentermachine/*.java, - - **/registration/processor/quality/check/client/*.java, - **/registration/processor/quality/check/code/*.java, - **/registration/processor/quality/check/entity/*.java, - **/registration/processor/quality/check/exception/*.java, - **/registration/processor/quality/check/*.java, - **/registration/processor/message/sender/*.java, - **/registration/processor/message/sender/utility/*.java, - **/registration/processor/core/logger/*.java, - **/registration/processor/core/notification/template/mapping/*.java, - **/registration/processor/bio/dedupe/service/*.java, - **/registration/processor/bio/dedupe/exception/*.java, - - **/registration/processor/packet/storage/storage/*.java, - **/registration/processor/packet/storage/exception/*.java, - **/registration/processor/status/repositary/*.java, - **/registration/processor/status/entity/*.java, - **/registration/processor/virus/scanner/job/*.java, - - - **/registration/processor/packet/uploader/*.java, - **/registration/processor/biodedupe/*.java, - - - **/registration/processor/abis/config/*.java, - **/registration/processor/abis/controller/*.java, - **/registration/processor/abis/exception/*.java, - **/registration/processor/abis/messagequeue/*.java, - **/registration/processor/abis/service/*.java, - **/registration/processor/abis/service/impl/*.java, - - - **/registration/processor/abis/handler/*.java, - **/registration/processor/abis/handler/config/*.java, - - **/registration/processor/packet/service/**/*.java, - **/registration/processor/packet/upload/**/*.java, - - **/registration/processor/status/code/*.java, - **/registration/processor/rest/client/config/RestConfigBean.java, - **/registration/processor/bio/dedupe/api/BioDedupeApiApp.java, - **/registration/processor/manual/verification/response/builder/*.java, - **/registration/processor/manual/verification/config/*.java, - **/registration/processor/stages/config/OSIConfigBean.java, - **/registration/processor/stages/demo/dedupe/StatusMessage.java, - **/registration/processor/stages/demo/dedupe/DemodedupeStage.java, - **/registration/processor/stages/demo/dedupe/BiometricValidation.java, - **/registration/processor/core/exception/ExceptionJSONInfo.java, - **/registration/processor/core/config/CoreConfigBean.java, - **/registration/processor/core/kernel/beans/KernelConfig.java, - **/registration/processor/core/abstractverticle/MosipVerticleAPIManager.java, - **/registration/processor/core/http/*.java, - **/registration/processor/core/queue/factory/*.java, - **/registration/processor/core/queue/impl/*.java, - **/registration/processor/message/sender/config/MsgNotificationBeanCofig.java, - **/registration/processor/print/exception/QueueConnectionNotFound.java, - **/registration/processor/stages/demodedupe/StatusMessage.java, - **/registration/processor/print/service/utility/UINCardConstant.java, - **/registration/processor/stages/demodedupe/BiometricValidation.java, - **/registration/processor/camel/bridge/MosipBridgeFactory.java, - **/registration/processor/manual/verification/stage/ManualVerificationStage.java, - **/registration/processor/packet/receiver/builder/PacketReceiverResponseBuilder.java, - **/registration/processor/packet/receiver/stage/PacketReceiverStage.java, - **/registration/processor/camel/bridge/**/*.java, - **/registration/processor/stages/connector/stage/**/*.java, - **/registration/processor/stages/demodedupe/DemoDedupeStage.java, - - **/registration/processor/packet/storage/mapper/PacketInfoMapper.java, - **/registration/processor/packet/storage/dao/PacketInfoDao.java, - **/registration/processor/packet/uploader/constants/*.java, - **/registration/processor/packet/manager/constant/*.java, - **/registration/processor/print/exception/PrintGlobalExceptionHandler.java, - **/registration/processor/packet/receiver/constants/*.java, - **/registration/processor/print/service/exception/*.java, - **/registration/processor/print/exception/*.java, - **/registration/processor/packet/uploader/constants/*.java, - **/registration/processor/packet/uploader/decryptor/*.java, - **/registration/processor/core/abstractverticle/MosipRouter.java, - **/registration/processor/packet/uploader/decryptor/*.java, - - **/registration/processor/print/service/impl/PrintPostServiceImpl.java, - - **/registration/processor/message/sender/constants/*.java, - **/registration/processor/core/abstractverticle/BaseHealthCheckModel.java, - **/registration/processor/core/**/TokenValidator.java, - **/registration/processor/core/abstractverticle/StageHealthCheckHandler.java, - **/registration/processor/core/abstractverticle/MessageDTO.java, - **/registration/processor/request/handler/**/*.java - - **/dto/**,**/entity/**,**/config/**,**/handler/**,**/utilities/**, - **/validator/**, **/utils/**,**/util/**,**/code/** - - - - - - - - packet-generator - - \ No newline at end of file