diff --git a/.github/workflows/check-dependencies.yml b/.github/workflows/check-dependencies.yml index 8996fcf42..19160c048 100644 --- a/.github/workflows/check-dependencies.yml +++ b/.github/workflows/check-dependencies.yml @@ -33,8 +33,10 @@ jobs: - name: Setup .NET Core SDK uses: actions/setup-dotnet@v2.1.0 with: - dotnet-version: 7.0.x - include-prerelease: true + dotnet-version: 7.0.* + # Restore workload + - name: Restore workload + run: dotnet workload restore # Run update depencies script - name: Update dependencies run: ./update-dependencies.ps1 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis-cs.yml similarity index 73% rename from .github/workflows/codeql-analysis.yml rename to .github/workflows/codeql-analysis-cs.yml index 1a0b2ee13..06cf02bf4 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis-cs.yml @@ -32,7 +32,7 @@ jobs: strategy: fail-fast: false matrix: - language: [ 'csharp', 'javascript' ] + language: [ 'csharp' ] # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] # Learn more: # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed @@ -43,8 +43,7 @@ jobs: - name: Install .NET sdk uses: actions/setup-dotnet@v1 with: - dotnet-version: '7.0.x' - include-prerelease: true + dotnet-version: 7.0.* - name: Setup wasm tools run: dotnet workload install wasm-tools env: @@ -61,23 +60,12 @@ jobs: # Prefix the list here with "+" to use these queries and those in the config file. # queries: ./path/to/local/query, your-org/your-repo/queries@main - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v1 - env: - GITHIB_FEED_TOKEN: ${{ secrets.GITHIB_FEED_TOKEN }} - - # ℹ️ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl - - # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language - - #- run: | - # make bootstrap - # make release - + # Restore nuget package + - run: dotnet restore + name: Restore + # Build + - run: dotnet build -c Release + name: Build + - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v1 diff --git a/.github/workflows/codeql-analysis-js.yml b/.github/workflows/codeql-analysis-js.yml new file mode 100644 index 000000000..468693e2e --- /dev/null +++ b/.github/workflows/codeql-analysis-js.yml @@ -0,0 +1,72 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: [ master, preview/*, release/* ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ master ] + schedule: + - cron: '23 3 * * 2' + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ 'javascript' ] + # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] + # Learn more: + # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + - name: Install .NET sdk + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '7.0.200' + include-prerelease: true + - name: Setup wasm tools + run: dotnet workload restore + env: + GITHIB_FEED_TOKEN: ${{ secrets.GITHIB_FEED_TOKEN }} + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + env: + GITHIB_FEED_TOKEN: ${{ secrets.GITHIB_FEED_TOKEN }} + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + # queries: ./path/to/local/query, your-org/your-repo/queries@main + + # Restore nuget package + - run: dotnet restore + name: Restore + # Build + - run: dotnet build -c Release + name: Builde + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index c5bd09778..a4d0c7895 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -26,7 +26,7 @@ jobs: - name: Login to DockerHub uses: docker/login-action@v1 with: - username: aguacongas + username: theidserverowner password: ${{ secrets.DOCKER_HUB_PAT }} - name: 'Checkout' uses: actions/checkout@v3 @@ -47,37 +47,6 @@ jobs: push: true file: src/Aguacongas.TheIdServer.Duende/Dockerfile tags: aguacongas/theidserver.duende:${{ steps.previoustag.outputs.tag }} - is4: - runs-on: ubuntu-latest - steps: - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: aguacongas - password: ${{ secrets.DOCKER_HUB_PAT }} - - name: 'Checkout' - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: 'Get Previous tag' - id: previoustag - uses: "WyriHaximus/github-action-get-previous-tag@v1" - with: - fallback: 1.0.0 - - name: Build and push TheIdServer - id: docker_build_theidserver - uses: docker/build-push-action@v2 - env: - GITHIB_FEED_TOKEN: ${{ secrets.GITHIB_FEED_TOKEN }} - with: - build-args: GITHIB_FEED_TOKEN=${{ secrets.GITHIB_FEED_TOKEN }} FILE_VERSION=${{ steps.previoustag.outputs.tag }}.0 SOURCE_VERSION=${{ github.sha }} - push: true - file: src/Aguacongas.TheIdServer.IS4/Dockerfile - tags: aguacongas/theidserver:${{ steps.previoustag.outputs.tag }} app: runs-on: ubuntu-latest steps: @@ -88,7 +57,7 @@ jobs: - name: Login to DockerHub uses: docker/login-action@v1 with: - username: aguacongas + username: theidserverowner password: ${{ secrets.DOCKER_HUB_PAT }} - name: 'Checkout' uses: actions/checkout@v3 diff --git a/.gitignore b/.gitignore index b4392b7fd..b28b09c33 100644 --- a/.gitignore +++ b/.gitignore @@ -375,3 +375,7 @@ override.tf.json # example: *tfplan* /sample/Aguacongas.TheIdServer.MtlsSample/client.pks /sample/Aguacongas.TheIdServer.MtlsSample/.dccache +/src/Aguacongas.TheIdServer.Duende/TheIdServer.db +/src/Aguacongas.TheIdServer.Duende/TheIdServer.db-shm +/src/Aguacongas.TheIdServer.Duende/TheIdServer.db-wal +/global.json diff --git a/.sonarlint/TheIdServer.slconfig b/.sonarlint/TheIdServer.slconfig index 1bc0eec08..6328c13ad 100644 --- a/.sonarlint/TheIdServer.slconfig +++ b/.sonarlint/TheIdServer.slconfig @@ -7,9 +7,21 @@ "ProjectKey": "aguacongas_TheIdServer", "ProjectName": "TheIdServer", "Profiles": { + "Secrets": { + "ProfileKey": "AYXoTKWz9Ao2yLWbM0n6", + "ProfileTimestamp": "2023-01-25T09:40:14Z" + }, "CSharp": { "ProfileKey": "AW8e9NVJZPoDbtkGSYCm", - "ProfileTimestamp": "2021-05-05T07:40:16Z" + "ProfileTimestamp": "2023-02-22T15:28:25Z" + }, + "Js": { + "ProfileKey": "AW8POwb8PHYyZX2yhorZ", + "ProfileTimestamp": "2023-01-25T09:26:55Z" + }, + "Ts": { + "ProfileKey": "AW8POwb8PHYyZX2yhore", + "ProfileTimestamp": "2023-01-25T09:47:40Z" } } } \ No newline at end of file diff --git a/.sonarlint/aguacongas_theidserver/CSharp/SonarLint.xml b/.sonarlint/aguacongas_theidserver/CSharp/SonarLint.xml index 21acd70e2..90bc98dff 100644 --- a/.sonarlint/aguacongas_theidserver/CSharp/SonarLint.xml +++ b/.sonarlint/aguacongas_theidserver/CSharp/SonarLint.xml @@ -1,5 +1,5 @@ - + sonar.cs.analyzeGeneratedCode diff --git a/.sonarlint/aguacongas_theidservercsharp.ruleset b/.sonarlint/aguacongas_theidservercsharp.ruleset index d7cda63e3..dcdb5c053 100644 --- a/.sonarlint/aguacongas_theidservercsharp.ruleset +++ b/.sonarlint/aguacongas_theidservercsharp.ruleset @@ -1,5 +1,5 @@ - + @@ -28,10 +28,10 @@ + - @@ -72,7 +72,6 @@ - @@ -89,21 +88,23 @@ - + + + @@ -112,7 +113,6 @@ - @@ -155,7 +155,6 @@ - @@ -174,7 +173,9 @@ + + @@ -199,11 +200,13 @@ + + @@ -243,7 +246,6 @@ - @@ -253,6 +255,7 @@ + @@ -325,7 +328,6 @@ - @@ -335,7 +337,7 @@ - + @@ -346,10 +348,9 @@ - - + @@ -358,6 +359,7 @@ + @@ -365,6 +367,13 @@ + + + + + + + diff --git a/CHANGELOG.md b/CHANGELOG.md index 9377c3dab..28b778c2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,225 @@ +## [7.2.2](https://github.com/Aguafrommars/TheIdServer/compare/7.2.1...7.2.2) (2023-03-20) + + +### Bug Fixes + +* dark theme dropdown ([ad43cd9](https://github.com/Aguafrommars/TheIdServer/commit/ad43cd9d43bc7441beb67f22ca2cd5725ca4760e)) +* update packages ([beff18c](https://github.com/Aguafrommars/TheIdServer/commit/beff18cfdb5fc71ea9f029d26a998d6ca34a0488)) + +## [7.2.1](https://github.com/Aguafrommars/TheIdServer/compare/7.2.0...7.2.1) (2023-03-15) + + +### Bug Fixes + +* db migrations ([fe53806](https://github.com/Aguafrommars/TheIdServer/commit/fe53806f84ed58a00dc59725981e76345fbbee0d)) +* impossible to change language on sm device ([c452ccd](https://github.com/Aguafrommars/TheIdServer/commit/c452ccd044fa0706ed280916211ea6b47372c8e4)) +* toggle theme button invisible on sm device ([c09df27](https://github.com/Aguafrommars/TheIdServer/commit/c09df27151521cc28a54720c93b9708fe9204708)) +* update packages ([b65cfe3](https://github.com/Aguafrommars/TheIdServer/commit/b65cfe368c47420dfe2010fd0083a14353142017)) +* update packages ([cde3de2](https://github.com/Aguafrommars/TheIdServer/commit/cde3de2e7fc4f875da7f1c2e33e38dba0a93e8fe)) + +# [7.2.0](https://github.com/Aguafrommars/TheIdServer/compare/7.1.2...7.2.0) (2023-03-10) + + +### Bug Fixes + +* update packages ([f64c16a](https://github.com/Aguafrommars/TheIdServer/commit/f64c16ae5bfc20c0d411c8050eaad2a8893837c0)) +* update packages ([693dfd0](https://github.com/Aguafrommars/TheIdServer/commit/693dfd07042cef364775fd0a7465d6ec16a94c61)) +* update packages ([440bb3f](https://github.com/Aguafrommars/TheIdServer/commit/440bb3f1b5f623b4b2f956ea1f432ae812232dc6)) +* update packages ([4157d5a](https://github.com/Aguafrommars/TheIdServer/commit/4157d5ad3a92856201d32092b28c355e3d1519dd)) +* update packages ([373af77](https://github.com/Aguafrommars/TheIdServer/commit/373af77762ee0b60042272f79559274061e7e39c)) +* update packages ([0ac50a6](https://github.com/Aguafrommars/TheIdServer/commit/0ac50a60c783ac62eebaf5f65bb54f81d14058e1)) +* update packages ([f9c18e6](https://github.com/Aguafrommars/TheIdServer/commit/f9c18e6ff052244e49982581fa17b00b844933c5)) +* update packages ([61aa0b0](https://github.com/Aguafrommars/TheIdServer/commit/61aa0b0baf1fe3c8405c35d851c097b623cef8ac)) +* update packages ([ef8ec20](https://github.com/Aguafrommars/TheIdServer/commit/ef8ec20f2da0d77960f9a53a453a4fb38332fb80)) +* update packages ([73698b3](https://github.com/Aguafrommars/TheIdServer/commit/73698b3af916965a0d99188490212081226c9a81)) +* update packages ([c0389be](https://github.com/Aguafrommars/TheIdServer/commit/c0389beaddb08b410e838df9b4da7f6bbd0e87cc)) +* update packages ([33b4bb6](https://github.com/Aguafrommars/TheIdServer/commit/33b4bb64ac7778c06ca1a5cf26cb8db123f2bb63)) +* update packages ([860be51](https://github.com/Aguafrommars/TheIdServer/commit/860be51fe25df10cc7ce18629b8e6643a9075c3e)) +* update packages ([d886da2](https://github.com/Aguafrommars/TheIdServer/commit/d886da28d8d041f83c6fa8684cc2f568404e5c82)) +* update packages ([8150d95](https://github.com/Aguafrommars/TheIdServer/commit/8150d9566c7dc6bc9ec7a6b20d87f66172c7c6a8)) + + +### Features + +* admin app dark theme ([25da138](https://github.com/Aguafrommars/TheIdServer/commit/25da138e25e1109f4f4b4173f72d9abeb6989ee9)) +* admin app dark theme ([3df021c](https://github.com/Aguafrommars/TheIdServer/commit/3df021c5cd9e2078216c69bc1fc195441050b6c3)) + +## [7.1.2](https://github.com/Aguafrommars/TheIdServer/compare/7.1.1...7.1.2) (2023-02-03) + + +### Bug Fixes + +* identity options serialization ([1b5a686](https://github.com/Aguafrommars/TheIdServer/commit/1b5a686c936801da688d604c3d9b5f16a7b18527)) +* update packages ([38dee4e](https://github.com/Aguafrommars/TheIdServer/commit/38dee4e258baa08ba49234e015ada747c66e0a2f)) +* update packages ([5e5b988](https://github.com/Aguafrommars/TheIdServer/commit/5e5b9882d5407bf66986404af653e146a692c4ca)) +* update packages ([7ff02de](https://github.com/Aguafrommars/TheIdServer/commit/7ff02deff531efeff58f6044fb790531daa27503)) + +## [7.1.1](https://github.com/Aguafrommars/TheIdServer/compare/7.1.0...7.1.1) (2023-01-26) + + +### Bug Fixes + +* update packages ([92531e8](https://github.com/Aguafrommars/TheIdServer/commit/92531e837039c73f41cfa284719bc2a6f6c240a4)) +* update packages ([a57ed6a](https://github.com/Aguafrommars/TheIdServer/commit/a57ed6af7e7204c03a8be185ccc209c8c9e3bdfd)) +* update packages ([149e38e](https://github.com/Aguafrommars/TheIdServer/commit/149e38e2062b15e4a0af7ac0f8a7174e8fa35680)) + +# [7.1.0](https://github.com/Aguafrommars/TheIdServer/compare/7.0.3...7.1.0) (2023-01-21) + + +### Bug Fixes + +* error unprotecting key with kid ([8eef54d](https://github.com/Aguafrommars/TheIdServer/commit/8eef54df01fae6fb55e2ee0e260214977b95f121)) +* update packages ([a0d3ebf](https://github.com/Aguafrommars/TheIdServer/commit/a0d3ebfd3a55dce5e55f283243546578a9a4364d)) +* update packages ([7bd4945](https://github.com/Aguafrommars/TheIdServer/commit/7bd49459e3dc62c8805fac522b158ce6f847c7d1)) + + +### Features + +* scope used by ([24e43a2](https://github.com/Aguafrommars/TheIdServer/commit/24e43a2929e57e872f3941bce283b351de283124)) + +## [7.0.3](https://github.com/Aguafrommars/TheIdServer/compare/7.0.2...7.0.3) (2023-01-18) + + +### Bug Fixes + +* request header too long on external callback ([ac4518a](https://github.com/Aguafrommars/TheIdServer/commit/ac4518af8acae101d58e01386557a868646cc4a0)) +* update packages ([400becf](https://github.com/Aguafrommars/TheIdServer/commit/400becf0506cc945a76eb62306bc2ad793932c27)) +* update packages ([344ba82](https://github.com/Aguafrommars/TheIdServer/commit/344ba82ffce22575c146f2b75371608193c52b69)) +* update packages ([71ad2d6](https://github.com/Aguafrommars/TheIdServer/commit/71ad2d6ee837f1342d603097aa01370daeae1713)) +* update packages ([32be023](https://github.com/Aguafrommars/TheIdServer/commit/32be0236a9d4d7cc09a2dc0860ba61dacfa7a512)) +* update packages ([506f4b8](https://github.com/Aguafrommars/TheIdServer/commit/506f4b88d9a18e4ae29fb7805c3991950a24a619)) +* update packages ([96533d7](https://github.com/Aguafrommars/TheIdServer/commit/96533d7e89b8117c184422bb23a76be7e3e8bda2)) +* update packages ([b2cecbf](https://github.com/Aguafrommars/TheIdServer/commit/b2cecbffc503f961d51d61d281f120d41c81f4b2)) +* update packages ([4cc361f](https://github.com/Aguafrommars/TheIdServer/commit/4cc361f79a58aaacd2558f92180c886c86c6b125)) +* update packages ([df14d78](https://github.com/Aguafrommars/TheIdServer/commit/df14d782f063014bbf9f050e84e9ea6e0e712555)) +* update packages ([a7b8244](https://github.com/Aguafrommars/TheIdServer/commit/a7b8244b7a1412a467a8d91464a19cd8d704a2d7)) +* update packages ([2180085](https://github.com/Aguafrommars/TheIdServer/commit/2180085d3592bf00e0e59e96f38a88754eb7a585)) + +## [7.0.2](https://github.com/Aguafrommars/TheIdServer/compare/7.0.1...7.0.2) (2022-12-15) + + +### Bug Fixes + +* cve-2022-41089 ([4984b6e](https://github.com/Aguafrommars/TheIdServer/commit/4984b6e8bd405c064dff40e5f1d7f8cd6c2cdcad)), closes [#44973](https://github.com/Aguafrommars/TheIdServer/issues/44973) +* update packages ([9b8f211](https://github.com/Aguafrommars/TheIdServer/commit/9b8f2115151180e43876936b05e2c1aa46aa469e)) +* update packages ([fca1e6b](https://github.com/Aguafrommars/TheIdServer/commit/fca1e6b588730d28ac0e8ec5d060d31282bd8429)) + +## [7.0.1](https://github.com/Aguafrommars/TheIdServer/compare/7.0.0...7.0.1) (2022-11-23) + + +### Bug Fixes + +* uri scheme validation ([53b400c](https://github.com/Aguafrommars/TheIdServer/commit/53b400cd1f11e36baa9abd4b8a5ae1cabf6b7a80)) + +# [7.0.0](https://github.com/Aguafrommars/TheIdServer/compare/6.3.0...7.0.0) (2022-11-21) + + +### Bug Fixes + +* automatic redirect after logout ([a5a716d](https://github.com/Aguafrommars/TheIdServer/commit/a5a716d667363e9a9aaf1b3957c9ad6de6484af9)) +* ciba filter ([19b3dfd](https://github.com/Aguafrommars/TheIdServer/commit/19b3dfd8cd84955277c38485845d597fd3afcdad)) +* duplicate column name 'CoordinateLifetimeWithUserSession' ([0499f5a](https://github.com/Aguafrommars/TheIdServer/commit/0499f5a9206c8394e15a52933004740161615be6)) +* duplicate column name 'CoordinateLifetimeWithUserSession' ([4ab25a2](https://github.com/Aguafrommars/TheIdServer/commit/4ab25a22d97aab6c7368bb2c6685c605aec09bb2)) +* duplicate column name 'RequireRequestObject' ([2352d15](https://github.com/Aguafrommars/TheIdServer/commit/2352d159da2676d526d992234e9039336a2fff18)) +* foreign key constraint incompatible ([1814e61](https://github.com/Aguafrommars/TheIdServer/commit/1814e613c73dbc3b25ecc44a5f3ff9dd0d3a0924)) +* mysql incompatible constraint ([0bf6159](https://github.com/Aguafrommars/TheIdServer/commit/0bf6159a5493cdf1cdb272e50a15a3c4bda5862f)) +* packages dependencies issues ([8b80cf7](https://github.com/Aguafrommars/TheIdServer/commit/8b80cf736c3b268933ae0598fa08564027a45976)) +* src/Aguacongas.TheIdServer.BlazorApp/Dockerfile to reduce vulnerabilities ([df7480c](https://github.com/Aguafrommars/TheIdServer/commit/df7480cb63ff35e0d92c0a90cd336ff7051e4c3b)) +* src/Aguacongas.TheIdServer.BlazorApp/Dockerfile to reduce vulnerabilities ([b7f85fc](https://github.com/Aguafrommars/TheIdServer/commit/b7f85fc1562daf7a71252cf4214c9c375fc03750)) +* update packages ([8fab6db](https://github.com/Aguafrommars/TheIdServer/commit/8fab6db287dc7005bc199c5ad3ff5e128f93531d)) +* update packages ([a987336](https://github.com/Aguafrommars/TheIdServer/commit/a98733697ed9902a179c8c7a61c348045942f710)) +* update packages ([31d0e8c](https://github.com/Aguafrommars/TheIdServer/commit/31d0e8ca45d292ee88896bea027faf6f883e3d80)) +* update packages ([2fb57a4](https://github.com/Aguafrommars/TheIdServer/commit/2fb57a4a5ea19f02dee126024e4a8ebc6d0cd9ae)) +* update packages ([4846747](https://github.com/Aguafrommars/TheIdServer/commit/4846747fdb4b45583b55098d2ecaed16c8362c93)) +* update packages ([853f29b](https://github.com/Aguafrommars/TheIdServer/commit/853f29bb58e6b6419a5dd1cbeb7cadcaa5bc3231)) +* update packages ([4d99656](https://github.com/Aguafrommars/TheIdServer/commit/4d9965624fa4773aafe0a3375a100cd78cf08f9f)) +* update packages ([05cbbc4](https://github.com/Aguafrommars/TheIdServer/commit/05cbbc4905a1d142771c1713907e7cbe6cf25a56)) +* update packages ([bcfa2fd](https://github.com/Aguafrommars/TheIdServer/commit/bcfa2fdcf1521ed30ddca3e3a9e0c7eedacc154d)) +* update packages ([64d1483](https://github.com/Aguafrommars/TheIdServer/commit/64d148357b8bd04f132781735938167afc7d4447)) +* update packages ([4fb4b2c](https://github.com/Aguafrommars/TheIdServer/commit/4fb4b2cf02f941df7e68d1c737d290fa49d391e2)) +* update packages ([0bb70e8](https://github.com/Aguafrommars/TheIdServer/commit/0bb70e8d395ff20a9bb966fae28be7d2f0a39f16)) +* update packages ([fae7cd1](https://github.com/Aguafrommars/TheIdServer/commit/fae7cd1ccbc14a8b9c3c4d47d3e375d8215263b9)) +* update packages ([daf1712](https://github.com/Aguafrommars/TheIdServer/commit/daf17128fe29c9163f1f9b878d026f0750be16fd)) +* update packages ([7c8b6a0](https://github.com/Aguafrommars/TheIdServer/commit/7c8b6a085ee325fe21f442bc986dc0c871c369d2)) +* update packages ([cc6c760](https://github.com/Aguafrommars/TheIdServer/commit/cc6c760211eb482f41e48181f5e27dfb60aa6e57)) +* update packages ([0b0887c](https://github.com/Aguafrommars/TheIdServer/commit/0b0887cbd5af0888be850649e8b8b3d7e4ede5bd)) +* update packages ([f28c5a7](https://github.com/Aguafrommars/TheIdServer/commit/f28c5a71e06b59e7d99e08c0f301ca605920d8a5)) +* update packages ([c4a427c](https://github.com/Aguafrommars/TheIdServer/commit/c4a427cfcacd6418b5bac8293f12a15380871320)) +* update packages ([4057d45](https://github.com/Aguafrommars/TheIdServer/commit/4057d45ead1231e5c79cb694a983a3771b97fc9a)) +* update packages ([1950f5b](https://github.com/Aguafrommars/TheIdServer/commit/1950f5b8debf03f379c31b56276b4454294c98eb)) +* update packages ([86f8a79](https://github.com/Aguafrommars/TheIdServer/commit/86f8a793f50996b74af68e437eb0aaa2def28165)) +* update packages ([6861d6b](https://github.com/Aguafrommars/TheIdServer/commit/6861d6b3de7079945ec6cbf9a4b30d0ca5aedcfb)) +* update packages ([b9135cc](https://github.com/Aguafrommars/TheIdServer/commit/b9135ccdf439ef4fcfeeb00b29e34eadeeb5b03b)) +* update packages ([dea016d](https://github.com/Aguafrommars/TheIdServer/commit/dea016ddd9d07375cbe64d80c65d0f0d00bba9b0)) +* update packages ([02d5e4a](https://github.com/Aguafrommars/TheIdServer/commit/02d5e4a459e744f089b08dc84891bf61c0648c14)) +* update packages ([40fe52d](https://github.com/Aguafrommars/TheIdServer/commit/40fe52d8b0f4f19419c0bf5ddcd6176ae743f928)) +* update packages ([5ad19be](https://github.com/Aguafrommars/TheIdServer/commit/5ad19be73f52d766003f11b69b714521719b5726)) +* update packages ([4d00826](https://github.com/Aguafrommars/TheIdServer/commit/4d0082612f24ac66dd7a72f44e42510baadad3b0)) +* update packages ([3bb28d5](https://github.com/Aguafrommars/TheIdServer/commit/3bb28d55d69028610c80e3ec15c209b3320e7fe0)) +* update packages ([9b94dd2](https://github.com/Aguafrommars/TheIdServer/commit/9b94dd23a8888961d73e2e151f17f34bafb03c05)) +* update packages ([19a9bda](https://github.com/Aguafrommars/TheIdServer/commit/19a9bda37a603d95a8d2de81648fb989bca91855)) +* update packages ([eb117fa](https://github.com/Aguafrommars/TheIdServer/commit/eb117fa818dbe5f74d96e30f5d1942c985afb045)) +* update packages ([0798f79](https://github.com/Aguafrommars/TheIdServer/commit/0798f797b727b06837c8dfe502a67e654951bfa6)) +* update packages ([6b71a69](https://github.com/Aguafrommars/TheIdServer/commit/6b71a695018b28d8f4d0c4e209e2d8c47a17f638)) +* update packages ([4304bfc](https://github.com/Aguafrommars/TheIdServer/commit/4304bfce52838b5b337db2f7bc3bb3ced1c94bbf)) +* update packages ([37d10d6](https://github.com/Aguafrommars/TheIdServer/commit/37d10d6310a21085a6e2b96443050dfd784018da)) +* update packages ([b009c37](https://github.com/Aguafrommars/TheIdServer/commit/b009c37a8a55eb9d737e40d6325f18bea81c81b5)) +* update packages ([ef7c48d](https://github.com/Aguafrommars/TheIdServer/commit/ef7c48de9e043862b6e198913f507a710f1bf6c3)) +* update packages ([178bcfe](https://github.com/Aguafrommars/TheIdServer/commit/178bcfe81094d1acf42f8c0dfbb55b9eb769a5ae)) +* update packages ([f4f93dc](https://github.com/Aguafrommars/TheIdServer/commit/f4f93dce4b07df626273c31282b6b73a872935b4)) +* update packages ([bb8c589](https://github.com/Aguafrommars/TheIdServer/commit/bb8c589002ee2da7903defd8f5ee8276619f682f)) +* update packages ([a9adea9](https://github.com/Aguafrommars/TheIdServer/commit/a9adea9020dd7dad0a81e933e53d40707a0e96f6)) +* update packages ([85cee88](https://github.com/Aguafrommars/TheIdServer/commit/85cee88635df5d34defc10319952f4f3c99de7d0)) +* update packages ([4f9876e](https://github.com/Aguafrommars/TheIdServer/commit/4f9876e9503e3615dc894b9aaf0053c1d67d85f3)) +* update packages ([c5edc39](https://github.com/Aguafrommars/TheIdServer/commit/c5edc391cd8e3976fba79887f315e5c8c2fd5198)) +* update packages ([2a2a7a4](https://github.com/Aguafrommars/TheIdServer/commit/2a2a7a4fc00625c01b36e9fcb8773e9493dd331b)) +* update packages ([4953390](https://github.com/Aguafrommars/TheIdServer/commit/4953390cde716686719fc319d3082dd9cd7a3950)) +* update packages ([45bc8db](https://github.com/Aguafrommars/TheIdServer/commit/45bc8dba953a3a392aeaf4ef7d73e7c1c8d80c89)) +* update packages ([009962a](https://github.com/Aguafrommars/TheIdServer/commit/009962a2174708bdb5cc713edb2c19fdab9c9123)) +* update packages ([b6eb0d3](https://github.com/Aguafrommars/TheIdServer/commit/b6eb0d3a21b58274cf87af0d9ade1ffec2a1237a)) +* update packages ([16a7308](https://github.com/Aguafrommars/TheIdServer/commit/16a73084ee09675393c0838cf8affab2c1ff5cd7)) +* update packages ([4f370f6](https://github.com/Aguafrommars/TheIdServer/commit/4f370f65dc7665c22fe1993c823dea3087f1c6bb)) +* update packages ([117c806](https://github.com/Aguafrommars/TheIdServer/commit/117c806ffe593be6f1b40bdd63b48b74a0bbf7c6)) +* update packages ([594d443](https://github.com/Aguafrommars/TheIdServer/commit/594d443e2af5d14fee332a0aa48a7b5668b8f98b)) +* update packages ([9412cec](https://github.com/Aguafrommars/TheIdServer/commit/9412cec287693430b2500f6a10b002a47a7b220e)) +* update packages ([bd21452](https://github.com/Aguafrommars/TheIdServer/commit/bd21452abcaed51b3baadbaee4076607214dd60c)) +* update packages ([cead51e](https://github.com/Aguafrommars/TheIdServer/commit/cead51e25d48357c616fa0e3f8aaaf8c2933ba72)) +* update packages ([836dcfc](https://github.com/Aguafrommars/TheIdServer/commit/836dcfc57020aab5353fb9c9136dde16b1384c69)) +* ut8 char set ([7a17adb](https://github.com/Aguafrommars/TheIdServer/commit/7a17adbc0777277d86e3cf7e03b7adeb5705e579)) + + +### Build System + +* prepare preview 7.0.0 ([8c81013](https://github.com/Aguafrommars/TheIdServer/commit/8c81013fb4f426863a49d1d8c0965722564222f2)) + + +* Merge pull request #900 from Aguafrommars/feature/end-of-is4 ([cb7911b](https://github.com/Aguafrommars/TheIdServer/commit/cb7911b18690df24987692979df920d497b342c5)), closes [#900](https://github.com/Aguafrommars/TheIdServer/issues/900) + + +### Features + +* clone entities ([e20214b](https://github.com/Aguafrommars/TheIdServer/commit/e20214b935ffff6f401d432cff6544a66514ceac)), closes [#888](https://github.com/Aguafrommars/TheIdServer/issues/888) +* clone entities ([#889](https://github.com/Aguafrommars/TheIdServer/issues/889)) ([06dda00](https://github.com/Aguafrommars/TheIdServer/commit/06dda00c5335ee68f237561cd19e7782448a5860)), closes [#888](https://github.com/Aguafrommars/TheIdServer/issues/888) +* **blazor:** confgure html element identifier ([c6ebaa9](https://github.com/Aguafrommars/TheIdServer/commit/c6ebaa98519078a39fbc9355c829d5c40ae5a358)) +* **blazor:** configure ciba + server side session options ([635f058](https://github.com/Aguafrommars/TheIdServer/commit/635f058cf1731b644540ea37ab47ab65c99d5a43)) +* dinamic windows provider ([2aab545](https://github.com/Aguafrommars/TheIdServer/commit/2aab545669f77d26689bea283bc769a5c89a5a3d)) +* display loading when prerender the app ([300cd3c](https://github.com/Aguafrommars/TheIdServer/commit/300cd3c941af59f7c21039aba6800ed20b390bdd)) +* dynamic windows provider ([#809](https://github.com/Aguafrommars/TheIdServer/issues/809)) ([5bf7d9d](https://github.com/Aguafrommars/TheIdServer/commit/5bf7d9dfdb04d3154a2756a2177d411fea3b0311)) +* filter external provider claims mappings ([8c3008b](https://github.com/Aguafrommars/TheIdServer/commit/8c3008b2287b10adbce26e27c33ebc25a5c31b0c)) +* login page register and pwd links ([d8c61df](https://github.com/Aguafrommars/TheIdServer/commit/d8c61dff1d8c86a45f899ec71fab7b38cf366939)), closes [#790](https://github.com/Aguafrommars/TheIdServer/issues/790) [#792](https://github.com/Aguafrommars/TheIdServer/issues/792) +* map about to git ahsh ([e84b876](https://github.com/Aguafrommars/TheIdServer/commit/e84b8763accb89a2fbefbbae854a1dec588fb4d9)) +* prevent navigation on entity changed ([0d49125](https://github.com/Aguafrommars/TheIdServer/commit/0d49125225b7220e8d595ce3738e91593c5f726d)) + + +### Reverts + +* Revert "refactor(blazorapp): use Pascal json file" ([e7f8312](https://github.com/Aguafrommars/TheIdServer/commit/e7f83127ac4d3228c3adad8e4b64ec2de75c3ac8)) + + +### BREAKING CHANGES + +* Aguacongas.IdentityServer.Store and Aguacongas.IdentityServer.Admin.Http.Store target net7.0 instead of netstandard2.0 +* use 7.0.0 framework # [6.3.0](https://github.com/Aguafrommars/TheIdServer/compare/6.2.1...6.3.0) (2022-07-01) diff --git a/README.md b/README.md index ca237a0dd..250754d0e 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,21 @@ # TheIdServer -[OpenID/Connect](https://openid.net/connect/), [OAuth2](https://oauth.net/2/) and [WS-Federation](https://docs.oasis-open.org/wsfed/federation/v1.2/os/ws-federation-1.2-spec-os.html) server based on [IdentityServer4](https://identityserver4.readthedocs.io/en/latest/) or [Duende IdentityServer](https://duendesoftware.com/products/identityserver). +[OpenID/Connect](https://openid.net/connect/), [OAuth2](https://oauth.net/2/) and [WS-Federation](https://docs.oasis-open.org/wsfed/federation/v1.2/os/ws-federation-1.2-spec-os.html) server based on [Duende IdentityServer](https://duendesoftware.com/products/identityserver) and [ITfoxtec Identity SAML 2.0](https://www.itfoxtec.com/IdentitySaml2). + +> [OpenID/Connect](https://openid.net/connect/), [OAuth2](https://oauth.net/2/), [WS-Federation](https://docs.oasis-open.org/wsfed/federation/v1.2/os/ws-federation-1.2-spec-os.html) and [Saml 2.0](http://docs.oasis-open.org/security/saml/v2.0/sstc-saml-approved-errata-2.0.html) are protocols that enable secure authentication and authorization of users and applications on the web. They allow users to sign in with their existing credentials from an identity provider (such as Google, Facebook, Microsoft, Twitter ans so-on) and grant access to their data and resources on different platforms and services. These protocols also enable developers to create applications that can interact with various APIs and resources without exposing the user’s credentials or compromising their privacy. Some examples of applications that use these protocols are web browsers, mobile apps, web APIs, and single-page applications. + +> [Duende IdentityServer](https://duendesoftware.com/products/identityserver) is a framework that implements OpenID Connect and OAuth 2.0 protocols for ASP.NET Core applications. It allows you to create your own identity and access management solution that can integrate with various identity providers and APIs. + +> [ITfoxtec Identity SAML 2.0](https://www.itfoxtec.com/IdentitySaml2) is a framework that implements SAML-P for both Identity Provider (IdP) and Relying Party (RP). + +> TheIdServer implements all Duende IdentityServer features, a SAML 2.0 Identity Provider and comes with an admin UI. [![Quality gate](https://sonarcloud.io/api/project_badges/quality_gate?project=aguacongas_TheIdServer)](https://sonarcloud.io/dashboard?id=aguacongas_TheIdServer) [![Build status](https://ci.appveyor.com/api/projects/status/hutfs4sy38fy9ca7?svg=true)](https://ci.appveyor.com/project/aguacongas/theidserver) [![Docker](https://github.com/Aguafrommars/TheIdServer/actions/workflows/docker.yml/badge.svg)](https://github.com/Aguafrommars/TheIdServer/actions/workflows/docker.yml) [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/aguafrommars)](https://artifacthub.io/packages/search?repo=aguafrommars) -### Try it now at [https://theidserver.herokuapp.com/](https://theidserver.herokuapp.com/) for the IdentityServer4 version -### Or [https://theidserver-duende.herokuapp.com/](https://theidserver-duende.herokuapp.com/) for the Duende IdentityServer version +### Try it now at [https://theidserver-duende.herokuapp.com/](https://theidserver-duende.herokuapp.com/) **login**: alice **pwd**: Pass123$ @@ -47,7 +54,7 @@ Choose your favorite: ### Server -* [OpenID/Connect](https://openid.net/connect/), [OAuth2](https://oauth.net/2/) and [WS-Federation](https://docs.oasis-open.org/wsfed/federation/v1.2/os/ws-federation-1.2-spec-os.html) server +* [OpenID/Connect](https://openid.net/connect/), [OAuth2](https://oauth.net/2/), [WS-Federation](https://docs.oasis-open.org/wsfed/federation/v1.2/os/ws-federation-1.2-spec-os.html) and [Saml2P](http://docs.oasis-open.org/security/saml/v2.0/sstc-saml-approved-errata-2.0.html) server * [Large choice of database](https://github.com/Aguafrommars/TheIdServer/blob/master/src/Aguacongas.TheIdServer.Duende/README.md#using-entity-framework-core) * [Dynamic external provider configuration](https://github.com/Aguafrommars/TheIdServer/tree/master/src/Aguacongas.TheIdServer.Duende/README.md#configure-the-provider-hub) * [Public / Private installation](https://github.com/Aguafrommars/TheIdServer/tree/master/src/Aguacongas.TheIdServer.Duende/README.md#using-the-api) @@ -55,20 +62,19 @@ Choose your favorite: * [Claims providers](https://github.com/Aguafrommars/TheIdServer/tree/master/doc/CLAIMS_PROVIDER.md) * [External claims mapping](https://github.com/Aguafrommars/TheIdServer/tree/master/doc/EXTERNAL_CLAIMS_MAPPING.md) * [Localizable](https://github.com/Aguafrommars/TheIdServer/tree/master/doc/LOCALIZATION.md) -* [OpenID Connect Dynamic Client Registration](https://openid.net/specs/openid-connect-regiAguacongas.TheIdServer.Duendestration-1_0.html) -* [Auto remove expired tokens](https://github.com/Aguafrommars/TheIdServer/tree/master/src/Aguacongas.TheIdServer/README.md#configure-token-cleaner) +* [OpenID Connect Dynamic Client Registration](https://openid.net/specs/openid-connect-registration-1_0.html) +* [Auto remove expired tokens](https://github.com/Aguafrommars/TheIdServer/tree/master/src/Aguacongas.TheIdServer.Duende/README.md#configure-token-cleaner) * [Keys rotation](https://github.com/Aguafrommars/TheIdServer/tree/master/doc/KEYS_ROTATION.md) * [Create Personal Access Token](https://github.com/Aguafrommars/TheIdServer/tree/master/doc/PAT.md) -* [Duende CIBA integration](https://github.com/Aguafrommars/TheIdServer/tree/master/doc/CIBA.md)(Duende version only) +* [Duende CIBA integration](https://github.com/Aguafrommars/TheIdServer/tree/master/doc/CIBA.md) * [Token exchange](https://datatracker.ietf.org/doc/html/rfc8693)([RFC 8693](https://datatracker.ietf.org/doc/html/rfc8693)) -* [Health checks](https://github.com/Aguafrommars/TheIdServer/tree/master/src/Aguacongas.TheIdServer/README.md#health-checks) -* [OpenTelemety](https://github.com/Aguafrommars/TheIdServer/tree/master/doc/Aguacongas.TheIdServer/OPEN_TELEMETRY.md) -* [Server side session](https://github.com/Aguafrommars/TheIdServer/tree/master/doc/SERVER_SIDE_SESSIONS.md)(Duende version only) +* [Health checks](https://github.com/Aguafrommars/TheIdServer/tree/master/src/Aguacongas.TheIdServer.Duende/README.md#health-checks) +* [OpenTelemety](https://github.com/Aguafrommars/TheIdServer/tree/master/doc/OPEN_TELEMETRY.md) +* [Server side session](https://github.com/Aguafrommars/TheIdServer/tree/master/doc/SERVER_SIDE_SESSIONS.md) ## Setup -* Read the [IS4 server README](https://github.com/Aguafrommars/TheIdServer/tree/master/src/Aguacongas.TheIdServer.IS4/README.md) to configure IdentityServer4 version. -* Read the [Duende server README](https://github.com/Aguafrommars/TheIdServer/tree/master/src/Aguacongas.TheIdServer.Duende/README.md) to configure Duende IdentityServer version. +* Read the [Duende server README](https://github.com/Aguafrommars/TheIdServer/tree/master/src/Aguacongas.TheIdServer.Duende/README.md) to configure the Duende IdentityServer. **You'll need to [acquire a license](https://duendesoftware.com/products/identityserver#pricing) for a commercial use of this version.** * Read the [application README](https://github.com/Aguafrommars/TheIdServer/tree/master/src/Aguacongas.TheIdServer.BlazorApp/README.md) for application configuration. @@ -78,7 +84,6 @@ You can build the solution with Visual Studio or use the `dotnet build` command. To build docker images launch at solution root: ```bash -docker build -t aguacongas/theidserver:dev -f "./src/Aguacongas.TheIdServer.IS4/Dockerfile" . docker build -t aguacongas/theidserver.duende:dev -f "./src/Aguacongas.TheIdServer.Duende/Dockerfile" . docker build -t aguacongas/theidserverapp:dev -f "./src/Aguacongas.TheIdServer.BlazorApp/Dockerfile" . ``` @@ -99,3 +104,7 @@ Choose your favorite: * [github sponsor](https://github.com/sponsors/aguacongas/sponsorships?sponsor=aguacongas&tier_id=151490) * [issuehunts](https://issuehunt.io/r/Aguafrommars/TheIdServer/issues/170) * [liberapay](https://liberapay.com/aguacongas) + +## IdentityServer4 end of support + +The old IS4 version has been remove from the solution as [IS4 reach is end of support](https://github.com/IdentityServer/IdentityServer4#important-update). diff --git a/THIRD-PARTY-NOTICES b/THIRD-PARTY-NOTICES index d59a9cea3..d83055aff 100644 --- a/THIRD-PARTY-NOTICES +++ b/THIRD-PARTY-NOTICES @@ -131,5 +131,35 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - +License notice for ITfoxtec/ITfoxtec.Identity.Saml2 +--------------------------------------------------- + +BSD 3-Clause License + +Copyright (c) 2019, ITfoxtec +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/TheIdServer.sln b/TheIdServer.sln index eeed40e74..4397ae170 100644 --- a/TheIdServer.sln +++ b/TheIdServer.sln @@ -171,108 +171,26 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.TheIdServer.WsFe EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Duende", "Duende", "{C6E07186-85C0-4243-BE03-66BEA518B81C}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IS4", "IS4", "{281BCCF6-2EA9-480B-8527-31C0AE8732B8}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{0570B25A-576D-4EE2-BD3E-149ECA956DF1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.Shared", "src\IdentityServer\Shared\Aguacongas.IdentityServer.Shared\Aguacongas.IdentityServer.Shared.csproj", "{1FE07D46-7548-463A-993E-8B1B5AF90533}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.IS4", "src\IdentityServer\IS4\Aguacongas.IdentityServer.IS4\Aguacongas.IdentityServer.IS4.csproj", "{D083F8F5-AF10-4D07-8743-C9DB2516F2BA}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.Duende", "src\IdentityServer\Duende\Aguacongas.IdentityServer.Duende\Aguacongas.IdentityServer.Duende.csproj", "{D600300A-285D-4CB1-AC59-FFA435091C99}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.Admin.Shared", "src\IdentityServer\Shared\Aguacongas.IdentityServer.Admin.Shared\Aguacongas.IdentityServer.Admin.Shared.csproj", "{913A6E8C-8E43-4EAE-B793-271CF5A91FB9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.Admin.IS4", "src\IdentityServer\IS4\Aguacongas.IdentityServer.Admin.IS4\Aguacongas.IdentityServer.Admin.IS4.csproj", "{EE0F3688-0F89-47A2-B2A3-66A941B0197F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.KeysRotation.Shared", "src\IdentityServer\Shared\Aguacongas.IdentityServer.KeysRotation.Shared\Aguacongas.IdentityServer.KeysRotation.Shared.csproj", "{35FE5B0D-F0D8-4DAF-9AC0-D206E2781D1F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.KeysRotation.IS4", "src\IdentityServer\IS4\Aguacongas.IdentityServer.KeysRotation.IS4\Aguacongas.IdentityServer.KeysRotation.IS4.csproj", "{B5898F12-9EBD-4272-9D83-927601EE0941}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.KeysRotation.Duende", "src\IdentityServer\Duende\Aguacongas.IdentityServer.KeysRotation.Duende\Aguacongas.IdentityServer.KeysRotation.Duende.csproj", "{7E9CA585-F6BA-4268-BA27-357FDE181553}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.Admin.Duende", "src\IdentityServer\Duende\Aguacongas.IdentityServer.Admin.Duende\Aguacongas.IdentityServer.Admin.Duende.csproj", "{7604E039-945D-4682-8277-79F26B02DE0E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.MongoDb.Store.Shared", "src\IdentityServer\Shared\Aguacongas.IdentityServer.MongoDb.Store.Shared\Aguacongas.IdentityServer.MongoDb.Store.Shared.csproj", "{1663AD74-C7CE-4C15-AE06-959BFF54FBB3}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.MongoDb.Store.IS4", "src\IdentityServer\IS4\Aguacongas.IdentityServer.MongoDb.Store.IS4\Aguacongas.IdentityServer.MongoDb.Store.IS4.csproj", "{73B34C90-ADAB-4167-869D-E1BFF057C45B}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.MongoDb.Store.Duende", "src\IdentityServer\Duende\Aguacongas.IdentityServer.MongoDb.Store.Duende\Aguacongas.IdentityServer.MongoDb.Store.Duende.csproj", "{48EA4477-C775-4F1C-BEBE-96CE8ADAC4A3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.RavenDb.Store.Shared", "src\IdentityServer\Shared\Aguacongas.IdentityServer.RavenDb.Store.Shared\Aguacongas.IdentityServer.RavenDb.Store.Shared.csproj", "{EEC89F96-85E7-47A5-8245-8927F86EA0E0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.RavenDb.Store.IS4", "src\IdentityServer\IS4\Aguacongas.IdentityServer.RavenDb.Store.IS4\Aguacongas.IdentityServer.RavenDb.Store.IS4.csproj", "{23F487DA-93A6-4D8B-A634-CCE7419E6165}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.RavenDb.Store.Duende", "src\IdentityServer\Duende\Aguacongas.IdentityServer.RavenDb.Store.Duende\Aguacongas.IdentityServer.RavenDb.Store.Duende.csproj", "{E6E3E332-5E21-4F9F-8163-3E88320439C9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.EntityFramework.Store.Shared", "src\IdentityServer\Shared\Aguacongas.IdentityServer.EntityFramework.Store.Shared\Aguacongas.IdentityServer.EntityFramework.Store.Shared.csproj", "{3B3EAA4B-4517-4826-86D1-2EBF717BAADD}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.EntityFramework.Store.IS4", "src\IdentityServer\IS4\Aguacongas.IdentityServer.EntityFramework.Store.IS4\Aguacongas.IdentityServer.EntityFramework.Store.IS4.csproj", "{4BF69395-D0BD-43AC-8B25-2A78C485D60A}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.EntityFramework.Store.Duende", "src\IdentityServer\Duende\Aguacongas.IdentityServer.EntityFramework.Store.Duende\Aguacongas.IdentityServer.EntityFramework.Store.Duende.csproj", "{1B388FE8-44AD-4117-A646-8DABF32EB6F1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.WsFederation.Shared", "src\IdentityServer\Shared\Aguacongas.IdentityServer.WsFederation.Shared\Aguacongas.IdentityServer.WsFederation.Shared.csproj", "{6B62A0F5-8098-4CB0-9F46-1E895E85254B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.WsFederation.IS4", "src\IdentityServer\IS4\Aguacongas.IdentityServer.WsFederation.IS4\Aguacongas.IdentityServer.WsFederation.IS4.csproj", "{925AC605-6847-461D-8311-9A306F718A47}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.WsFederation.Duende", "src\IdentityServer\Duende\Aguacongas.IdentityServer.WsFederation.Duende\Aguacongas.IdentityServer.WsFederation.Duende.csproj", "{9741622E-2995-4ECC-9469-162191277D39}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.TheIdServer", "src\Aguacongas.TheIdServer\Aguacongas.TheIdServer.csproj", "{CA8876CD-3AE5-4621-B797-9B5816D9CD48}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.TheIdServer.Shared", "src\Aguacongas.TheIdServer.Shared\Aguacongas.TheIdServer.Shared.csproj", "{74F9657E-8FB8-4D58-A5B3-15E1BAD7563E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.TheIdServer.IS4", "src\Aguacongas.TheIdServer.IS4\Aguacongas.TheIdServer.IS4.csproj", "{389F0881-25F1-4EC8-AA20-B6E2FE6C6449}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.TheIdServer.Duende", "src\Aguacongas.TheIdServer.Duende\Aguacongas.TheIdServer.Duende.csproj", "{E0AC0DEB-82E3-4C00-B9EE-42932A94E8FB}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{175EFB99-30E9-45E9-9ED6-F48D88F67C19}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IS4", "IS4", "{12227AAB-94C7-4CE3-907D-2EBBF2660FEE}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Duende", "Duende", "{51A14B0A-FEBA-4941-A114-A7AAB132CDBA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.Admin.Test.Shared", "test\Shared\Aguacongas.IdentityServer.Admin.Test.Shared\Aguacongas.IdentityServer.Admin.Test.Shared.csproj", "{E202F809-08D3-4EBC-AD85-A475CBABBFF3}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.EntityFramework.Store.Test.Shared", "test\Shared\Aguacongas.IdentityServer.EntityFramework.Store.Test.Shared\Aguacongas.IdentityServer.EntityFramework.Store.Test.Shared.csproj", "{F1705E2F-207E-41E7-8218-9C0A4A0DFA2C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.Http.Store.Test.Shared", "test\Shared\Aguacongas.IdentityServer.Http.Store.Test.Shared\Aguacongas.IdentityServer.Http.Store.Test.Shared.csproj", "{9012AE43-B700-4E06-A883-F7475EC1DDB8}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.KeysRotation.Test.Shared", "test\Shared\Aguacongas.IdentityServer.KeysRotation.Test.Shared\Aguacongas.IdentityServer.KeysRotation.Test.Shared.csproj", "{308ECEC8-D688-46EC-80D5-2C4CFDD42754}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.MongoDb.Store.Test.Shared", "test\Shared\Aguacongas.IdentityServer.MongoDb.Store.Test.Shared\Aguacongas.IdentityServer.MongoDb.Store.Test.Shared.csproj", "{72F41E60-3260-40F0-9485-CEAC5FB6EE5F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.RavenDb.Store.Test.Shared", "test\Shared\Aguacongas.IdentityServer.RavenDb.Store.Test.Shared\Aguacongas.IdentityServer.RavenDb.Store.Test.Shared.csproj", "{FEA93C51-FE7D-4AD2-BA69-93079CDC177E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.TheIdServer.Authentication.IntegrationTest.Shared", "test\Shared\Aguacongas.TheIdServer.Authentication.Integration.Test.Shared\Aguacongas.TheIdServer.Authentication.IntegrationTest.Shared.csproj", "{C5239184-EFC8-40EA-8E85-221CA7EB5D11}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.TheIdServer.Identity.IntegrationTest.Shared", "test\Shared\Aguacongas.TheIdServer.Identity.IntegrationTest.Shared\Aguacongas.TheIdServer.Identity.IntegrationTest.Shared.csproj", "{7EE67579-AB69-40EE-8F47-631D447E5B14}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.TheIdServer.Identity.Test.Shared", "test\Shared\Aguacongas.TheIdServer.Identity.Test.Shared\Aguacongas.TheIdServer.Identity.Test.Shared.csproj", "{DE298EF3-5A38-4BED-AD72-BFE024F0F2DE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.TheIdServer.IntegrationTest.Shared", "test\Shared\Aguacongas.TheIdServer.IntegrationTest.Shared\Aguacongas.TheIdServer.IntegrationTest.Shared.csproj", "{874CEC6B-3F91-417D-9B5F-D3C9A299E1D1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.TheIdServer.Test.Shared", "test\Shared\Aguacongas.TheIdServer.Test.Shared\Aguacongas.TheIdServer.Test.Shared.csproj", "{21FD10C3-3660-4729-9A70-E82699BB41B4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.EntityFramework.Store.IS4.Test", "test\IS4\Aguacongas.IdentityServer.EntityFramework.Store.IS4.Test\Aguacongas.IdentityServer.EntityFramework.Store.IS4.Test.csproj", "{9D21E6D9-A8D8-4D47-B445-DB352CF99936}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.Http.Store.IS4.Test", "test\IS4\Aguacongas.IdentityServer.Http.Store.IS4.Test\Aguacongas.IdentityServer.Http.Store.IS4.Test.csproj", "{64575302-7B16-4D72-843F-A21974019E9C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.KeysRotation.IS4.Test", "test\IS4\Aguacongas.IdentityServer.KeysRotation.IS4.Test\Aguacongas.IdentityServer.KeysRotation.IS4.Test.csproj", "{1A5F6B6A-7A69-4DD8-B876-533289BB77AD}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.MongoDb.Store.IS4.Test", "test\IS4\Aguacongas.IdentityServer.MongoDb.Store.IS4.Test\Aguacongas.IdentityServer.MongoDb.Store.IS4.Test.csproj", "{D40F44AE-6E5F-4539-8F2F-B6195E990999}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.RavenDb.Store.IS4.Test", "test\IS4\Aguacongas.IdentityServer.RavenDb.Store.IS4.Test\Aguacongas.IdentityServer.RavenDb.Store.IS4.Test.csproj", "{245A35B5-5F00-4DD6-B234-ACEAD8ABC1B3}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.TheIdServer.Authentication.Integration.IS4.Test", "test\IS4\Aguacongas.TheIdServer.Authentication.Integration.IS4.Test\Aguacongas.TheIdServer.Authentication.Integration.IS4.Test.csproj", "{9F47A8BC-AE06-4C67-84DA-839A56DF90E3}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.TheIdServer.Identity.Integration.IS4.Test", "test\IS4\Aguacongas.TheIdServer.Identity.Integration.IS4.Test\Aguacongas.TheIdServer.Identity.Integration.IS4.Test.csproj", "{510BCD40-F459-46C6-BDA9-55218E8F8331}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.TheIdServer.Identity.IS4.Test", "test\IS4\Aguacongas.TheIdServer.Identity.IS4.Test\Aguacongas.TheIdServer.Identity.IS4.Test.csproj", "{015BCB1C-12AC-4EB0-9F5C-A71967930E80}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.TheIdServer.IS4.Test", "test\IS4\Aguacongas.TheIdServer.IS4.Test\Aguacongas.TheIdServer.IS4.Test.csproj", "{84E4DB36-5174-4F98-B5D0-362ADECEF70D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.Admin.IS4.Test", "test\IS4\Aguacongas.IdentityServer.Admin.IS4.Test\Aguacongas.IdentityServer.Admin.IS4.Test.csproj", "{9D75BFC4-C846-4018-9F35-9AB3DCF85BEA}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.Admin.Duende.Test", "test\Duende\Aguacongas.IdentityServer.Admin.Duende.Test\Aguacongas.IdentityServer.Admin.Duende.Test.csproj", "{3DB1F008-627B-4BED-8FA2-501B60D727BA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.EntityFramework.Store.Duende.Test", "test\Duende\Aguacongas.IdentityServer.EntityFramework.Store.Duende.Test\Aguacongas.IdentityServer.EntityFramework.Store.Duende.Test.csproj", "{52074749-B16F-456A-B13B-58100EECCA32}" @@ -293,24 +211,22 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.TheIdServer.Iden EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.TheIdServer.Identity.Integration.Duende.Test", "test\Duende\Aguacongas.TheIdServer.Identity.Integration.Duende.Test\Aguacongas.TheIdServer.Identity.Integration.Duende.Test.csproj", "{234C1401-2A11-473D-AE3A-7242A4A8F5D5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.TheIdServer.Integration.IS4.Test", "test\IS4\Aguacongas.TheIdServer.Integration.IS4.Test\Aguacongas.TheIdServer.Integration.IS4.Test.csproj", "{680C8124-EED7-4F15-B17B-7D6F910B95DC}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.TheIdServer.Integration.Duende.Test", "test\Duende\Aguacongas.TheIdServer.Integration.Duende.Test\Aguacongas.TheIdServer.Integration.Duende.Test.csproj", "{1FE59FB5-B6D7-4458-B1A8-6BB93A123637}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.TheIdServer.BlazorApp.Pages.Settings", "src\BlazorApp\Aguacongas.TheIdServer.BlazorApp.Pages.Settings\Aguacongas.TheIdServer.BlazorApp.Pages.Settings.csproj", "{B201ABE6-567B-41E9-B5D4-3472CEB0C497}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.TheIdServer.CibaSample", "sample\Aguacongas.TheIdServer.CibaSample\Aguacongas.TheIdServer.CibaSample.csproj", "{492835F1-7E60-4EEC-A22C-6B71C216DCF9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.Test.Shared", "test\Shared\Aguacongas.IdentityServer.Test.Shared\Aguacongas.IdentityServer.Test.Shared.csproj", "{A349BB89-5465-43FE-842A-CF15AAEBA942}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.IS4.Test", "test\IS4\Aguacongas.IdentityServer.IS4.Test\Aguacongas.IdentityServer.IS4.Test.csproj", "{D323D938-8DE0-4571-BDB8-590582CB731A}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.Duende.Test", "test\Duende\Aguacongas.IdentityServer.Duende.Test\Aguacongas.IdentityServer.Duende.Test.csproj", "{76B12AC6-03A6-4619-A4B3-5BA8A02FDD6F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.TheIdServer.Test", "test\Aguacongas.TheIdServer.Test\Aguacongas.TheIdServer.Test.csproj", "{0900433A-77B6-4DDC-8BF4-CEDB438313E5}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.TheIdServer.MtlsSample", "sample\Aguacongas.TheIdServer.MtlsSample\Aguacongas.TheIdServer.MtlsSample.csproj", "{9404EA66-AC32-49DD-A17C-1A48E04B7973}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.Saml2p.Duende", "src\IdentityServer\Duende\Aguacongas.IdentityServer.Saml2p.Duende\Aguacongas.IdentityServer.Saml2p.Duende.csproj", "{B44A1F03-8E0E-4A0C-845B-37A9B87B2637}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.IdentityServer.Saml2P.Duende.Test", "test\Duende\Aguacongas.IdentityServer.Saml2P.Duende.Test\Aguacongas.IdentityServer.Saml2P.Duende.Test.csproj", "{23ABCB0D-8C39-46D7-9CD1-508A3358AC00}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -1029,30 +945,6 @@ Global {5E930A54-0AA1-4053-AFBD-319914929634}.Release|x64.Build.0 = Release|Any CPU {5E930A54-0AA1-4053-AFBD-319914929634}.Release|x86.ActiveCfg = Release|Any CPU {5E930A54-0AA1-4053-AFBD-319914929634}.Release|x86.Build.0 = Release|Any CPU - {1FE07D46-7548-463A-993E-8B1B5AF90533}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1FE07D46-7548-463A-993E-8B1B5AF90533}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1FE07D46-7548-463A-993E-8B1B5AF90533}.Debug|x64.ActiveCfg = Debug|Any CPU - {1FE07D46-7548-463A-993E-8B1B5AF90533}.Debug|x64.Build.0 = Debug|Any CPU - {1FE07D46-7548-463A-993E-8B1B5AF90533}.Debug|x86.ActiveCfg = Debug|Any CPU - {1FE07D46-7548-463A-993E-8B1B5AF90533}.Debug|x86.Build.0 = Debug|Any CPU - {1FE07D46-7548-463A-993E-8B1B5AF90533}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1FE07D46-7548-463A-993E-8B1B5AF90533}.Release|Any CPU.Build.0 = Release|Any CPU - {1FE07D46-7548-463A-993E-8B1B5AF90533}.Release|x64.ActiveCfg = Release|Any CPU - {1FE07D46-7548-463A-993E-8B1B5AF90533}.Release|x64.Build.0 = Release|Any CPU - {1FE07D46-7548-463A-993E-8B1B5AF90533}.Release|x86.ActiveCfg = Release|Any CPU - {1FE07D46-7548-463A-993E-8B1B5AF90533}.Release|x86.Build.0 = Release|Any CPU - {D083F8F5-AF10-4D07-8743-C9DB2516F2BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D083F8F5-AF10-4D07-8743-C9DB2516F2BA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D083F8F5-AF10-4D07-8743-C9DB2516F2BA}.Debug|x64.ActiveCfg = Debug|Any CPU - {D083F8F5-AF10-4D07-8743-C9DB2516F2BA}.Debug|x64.Build.0 = Debug|Any CPU - {D083F8F5-AF10-4D07-8743-C9DB2516F2BA}.Debug|x86.ActiveCfg = Debug|Any CPU - {D083F8F5-AF10-4D07-8743-C9DB2516F2BA}.Debug|x86.Build.0 = Debug|Any CPU - {D083F8F5-AF10-4D07-8743-C9DB2516F2BA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D083F8F5-AF10-4D07-8743-C9DB2516F2BA}.Release|Any CPU.Build.0 = Release|Any CPU - {D083F8F5-AF10-4D07-8743-C9DB2516F2BA}.Release|x64.ActiveCfg = Release|Any CPU - {D083F8F5-AF10-4D07-8743-C9DB2516F2BA}.Release|x64.Build.0 = Release|Any CPU - {D083F8F5-AF10-4D07-8743-C9DB2516F2BA}.Release|x86.ActiveCfg = Release|Any CPU - {D083F8F5-AF10-4D07-8743-C9DB2516F2BA}.Release|x86.Build.0 = Release|Any CPU {D600300A-285D-4CB1-AC59-FFA435091C99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D600300A-285D-4CB1-AC59-FFA435091C99}.Debug|Any CPU.Build.0 = Debug|Any CPU {D600300A-285D-4CB1-AC59-FFA435091C99}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -1065,54 +957,6 @@ Global {D600300A-285D-4CB1-AC59-FFA435091C99}.Release|x64.Build.0 = Release|Any CPU {D600300A-285D-4CB1-AC59-FFA435091C99}.Release|x86.ActiveCfg = Release|Any CPU {D600300A-285D-4CB1-AC59-FFA435091C99}.Release|x86.Build.0 = Release|Any CPU - {913A6E8C-8E43-4EAE-B793-271CF5A91FB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {913A6E8C-8E43-4EAE-B793-271CF5A91FB9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {913A6E8C-8E43-4EAE-B793-271CF5A91FB9}.Debug|x64.ActiveCfg = Debug|Any CPU - {913A6E8C-8E43-4EAE-B793-271CF5A91FB9}.Debug|x64.Build.0 = Debug|Any CPU - {913A6E8C-8E43-4EAE-B793-271CF5A91FB9}.Debug|x86.ActiveCfg = Debug|Any CPU - {913A6E8C-8E43-4EAE-B793-271CF5A91FB9}.Debug|x86.Build.0 = Debug|Any CPU - {913A6E8C-8E43-4EAE-B793-271CF5A91FB9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {913A6E8C-8E43-4EAE-B793-271CF5A91FB9}.Release|Any CPU.Build.0 = Release|Any CPU - {913A6E8C-8E43-4EAE-B793-271CF5A91FB9}.Release|x64.ActiveCfg = Release|Any CPU - {913A6E8C-8E43-4EAE-B793-271CF5A91FB9}.Release|x64.Build.0 = Release|Any CPU - {913A6E8C-8E43-4EAE-B793-271CF5A91FB9}.Release|x86.ActiveCfg = Release|Any CPU - {913A6E8C-8E43-4EAE-B793-271CF5A91FB9}.Release|x86.Build.0 = Release|Any CPU - {EE0F3688-0F89-47A2-B2A3-66A941B0197F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE0F3688-0F89-47A2-B2A3-66A941B0197F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE0F3688-0F89-47A2-B2A3-66A941B0197F}.Debug|x64.ActiveCfg = Debug|Any CPU - {EE0F3688-0F89-47A2-B2A3-66A941B0197F}.Debug|x64.Build.0 = Debug|Any CPU - {EE0F3688-0F89-47A2-B2A3-66A941B0197F}.Debug|x86.ActiveCfg = Debug|Any CPU - {EE0F3688-0F89-47A2-B2A3-66A941B0197F}.Debug|x86.Build.0 = Debug|Any CPU - {EE0F3688-0F89-47A2-B2A3-66A941B0197F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE0F3688-0F89-47A2-B2A3-66A941B0197F}.Release|Any CPU.Build.0 = Release|Any CPU - {EE0F3688-0F89-47A2-B2A3-66A941B0197F}.Release|x64.ActiveCfg = Release|Any CPU - {EE0F3688-0F89-47A2-B2A3-66A941B0197F}.Release|x64.Build.0 = Release|Any CPU - {EE0F3688-0F89-47A2-B2A3-66A941B0197F}.Release|x86.ActiveCfg = Release|Any CPU - {EE0F3688-0F89-47A2-B2A3-66A941B0197F}.Release|x86.Build.0 = Release|Any CPU - {35FE5B0D-F0D8-4DAF-9AC0-D206E2781D1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35FE5B0D-F0D8-4DAF-9AC0-D206E2781D1F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35FE5B0D-F0D8-4DAF-9AC0-D206E2781D1F}.Debug|x64.ActiveCfg = Debug|Any CPU - {35FE5B0D-F0D8-4DAF-9AC0-D206E2781D1F}.Debug|x64.Build.0 = Debug|Any CPU - {35FE5B0D-F0D8-4DAF-9AC0-D206E2781D1F}.Debug|x86.ActiveCfg = Debug|Any CPU - {35FE5B0D-F0D8-4DAF-9AC0-D206E2781D1F}.Debug|x86.Build.0 = Debug|Any CPU - {35FE5B0D-F0D8-4DAF-9AC0-D206E2781D1F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35FE5B0D-F0D8-4DAF-9AC0-D206E2781D1F}.Release|Any CPU.Build.0 = Release|Any CPU - {35FE5B0D-F0D8-4DAF-9AC0-D206E2781D1F}.Release|x64.ActiveCfg = Release|Any CPU - {35FE5B0D-F0D8-4DAF-9AC0-D206E2781D1F}.Release|x64.Build.0 = Release|Any CPU - {35FE5B0D-F0D8-4DAF-9AC0-D206E2781D1F}.Release|x86.ActiveCfg = Release|Any CPU - {35FE5B0D-F0D8-4DAF-9AC0-D206E2781D1F}.Release|x86.Build.0 = Release|Any CPU - {B5898F12-9EBD-4272-9D83-927601EE0941}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B5898F12-9EBD-4272-9D83-927601EE0941}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B5898F12-9EBD-4272-9D83-927601EE0941}.Debug|x64.ActiveCfg = Debug|Any CPU - {B5898F12-9EBD-4272-9D83-927601EE0941}.Debug|x64.Build.0 = Debug|Any CPU - {B5898F12-9EBD-4272-9D83-927601EE0941}.Debug|x86.ActiveCfg = Debug|Any CPU - {B5898F12-9EBD-4272-9D83-927601EE0941}.Debug|x86.Build.0 = Debug|Any CPU - {B5898F12-9EBD-4272-9D83-927601EE0941}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B5898F12-9EBD-4272-9D83-927601EE0941}.Release|Any CPU.Build.0 = Release|Any CPU - {B5898F12-9EBD-4272-9D83-927601EE0941}.Release|x64.ActiveCfg = Release|Any CPU - {B5898F12-9EBD-4272-9D83-927601EE0941}.Release|x64.Build.0 = Release|Any CPU - {B5898F12-9EBD-4272-9D83-927601EE0941}.Release|x86.ActiveCfg = Release|Any CPU - {B5898F12-9EBD-4272-9D83-927601EE0941}.Release|x86.Build.0 = Release|Any CPU {7E9CA585-F6BA-4268-BA27-357FDE181553}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7E9CA585-F6BA-4268-BA27-357FDE181553}.Debug|Any CPU.Build.0 = Debug|Any CPU {7E9CA585-F6BA-4268-BA27-357FDE181553}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -1137,30 +981,6 @@ Global {7604E039-945D-4682-8277-79F26B02DE0E}.Release|x64.Build.0 = Release|Any CPU {7604E039-945D-4682-8277-79F26B02DE0E}.Release|x86.ActiveCfg = Release|Any CPU {7604E039-945D-4682-8277-79F26B02DE0E}.Release|x86.Build.0 = Release|Any CPU - {1663AD74-C7CE-4C15-AE06-959BFF54FBB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1663AD74-C7CE-4C15-AE06-959BFF54FBB3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1663AD74-C7CE-4C15-AE06-959BFF54FBB3}.Debug|x64.ActiveCfg = Debug|Any CPU - {1663AD74-C7CE-4C15-AE06-959BFF54FBB3}.Debug|x64.Build.0 = Debug|Any CPU - {1663AD74-C7CE-4C15-AE06-959BFF54FBB3}.Debug|x86.ActiveCfg = Debug|Any CPU - {1663AD74-C7CE-4C15-AE06-959BFF54FBB3}.Debug|x86.Build.0 = Debug|Any CPU - {1663AD74-C7CE-4C15-AE06-959BFF54FBB3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1663AD74-C7CE-4C15-AE06-959BFF54FBB3}.Release|Any CPU.Build.0 = Release|Any CPU - {1663AD74-C7CE-4C15-AE06-959BFF54FBB3}.Release|x64.ActiveCfg = Release|Any CPU - {1663AD74-C7CE-4C15-AE06-959BFF54FBB3}.Release|x64.Build.0 = Release|Any CPU - {1663AD74-C7CE-4C15-AE06-959BFF54FBB3}.Release|x86.ActiveCfg = Release|Any CPU - {1663AD74-C7CE-4C15-AE06-959BFF54FBB3}.Release|x86.Build.0 = Release|Any CPU - {73B34C90-ADAB-4167-869D-E1BFF057C45B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73B34C90-ADAB-4167-869D-E1BFF057C45B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73B34C90-ADAB-4167-869D-E1BFF057C45B}.Debug|x64.ActiveCfg = Debug|Any CPU - {73B34C90-ADAB-4167-869D-E1BFF057C45B}.Debug|x64.Build.0 = Debug|Any CPU - {73B34C90-ADAB-4167-869D-E1BFF057C45B}.Debug|x86.ActiveCfg = Debug|Any CPU - {73B34C90-ADAB-4167-869D-E1BFF057C45B}.Debug|x86.Build.0 = Debug|Any CPU - {73B34C90-ADAB-4167-869D-E1BFF057C45B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73B34C90-ADAB-4167-869D-E1BFF057C45B}.Release|Any CPU.Build.0 = Release|Any CPU - {73B34C90-ADAB-4167-869D-E1BFF057C45B}.Release|x64.ActiveCfg = Release|Any CPU - {73B34C90-ADAB-4167-869D-E1BFF057C45B}.Release|x64.Build.0 = Release|Any CPU - {73B34C90-ADAB-4167-869D-E1BFF057C45B}.Release|x86.ActiveCfg = Release|Any CPU - {73B34C90-ADAB-4167-869D-E1BFF057C45B}.Release|x86.Build.0 = Release|Any CPU {48EA4477-C775-4F1C-BEBE-96CE8ADAC4A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {48EA4477-C775-4F1C-BEBE-96CE8ADAC4A3}.Debug|Any CPU.Build.0 = Debug|Any CPU {48EA4477-C775-4F1C-BEBE-96CE8ADAC4A3}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -1173,30 +993,6 @@ Global {48EA4477-C775-4F1C-BEBE-96CE8ADAC4A3}.Release|x64.Build.0 = Release|Any CPU {48EA4477-C775-4F1C-BEBE-96CE8ADAC4A3}.Release|x86.ActiveCfg = Release|Any CPU {48EA4477-C775-4F1C-BEBE-96CE8ADAC4A3}.Release|x86.Build.0 = Release|Any CPU - {EEC89F96-85E7-47A5-8245-8927F86EA0E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EEC89F96-85E7-47A5-8245-8927F86EA0E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EEC89F96-85E7-47A5-8245-8927F86EA0E0}.Debug|x64.ActiveCfg = Debug|Any CPU - {EEC89F96-85E7-47A5-8245-8927F86EA0E0}.Debug|x64.Build.0 = Debug|Any CPU - {EEC89F96-85E7-47A5-8245-8927F86EA0E0}.Debug|x86.ActiveCfg = Debug|Any CPU - {EEC89F96-85E7-47A5-8245-8927F86EA0E0}.Debug|x86.Build.0 = Debug|Any CPU - {EEC89F96-85E7-47A5-8245-8927F86EA0E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EEC89F96-85E7-47A5-8245-8927F86EA0E0}.Release|Any CPU.Build.0 = Release|Any CPU - {EEC89F96-85E7-47A5-8245-8927F86EA0E0}.Release|x64.ActiveCfg = Release|Any CPU - {EEC89F96-85E7-47A5-8245-8927F86EA0E0}.Release|x64.Build.0 = Release|Any CPU - {EEC89F96-85E7-47A5-8245-8927F86EA0E0}.Release|x86.ActiveCfg = Release|Any CPU - {EEC89F96-85E7-47A5-8245-8927F86EA0E0}.Release|x86.Build.0 = Release|Any CPU - {23F487DA-93A6-4D8B-A634-CCE7419E6165}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {23F487DA-93A6-4D8B-A634-CCE7419E6165}.Debug|Any CPU.Build.0 = Debug|Any CPU - {23F487DA-93A6-4D8B-A634-CCE7419E6165}.Debug|x64.ActiveCfg = Debug|Any CPU - {23F487DA-93A6-4D8B-A634-CCE7419E6165}.Debug|x64.Build.0 = Debug|Any CPU - {23F487DA-93A6-4D8B-A634-CCE7419E6165}.Debug|x86.ActiveCfg = Debug|Any CPU - {23F487DA-93A6-4D8B-A634-CCE7419E6165}.Debug|x86.Build.0 = Debug|Any CPU - {23F487DA-93A6-4D8B-A634-CCE7419E6165}.Release|Any CPU.ActiveCfg = Release|Any CPU - {23F487DA-93A6-4D8B-A634-CCE7419E6165}.Release|Any CPU.Build.0 = Release|Any CPU - {23F487DA-93A6-4D8B-A634-CCE7419E6165}.Release|x64.ActiveCfg = Release|Any CPU - {23F487DA-93A6-4D8B-A634-CCE7419E6165}.Release|x64.Build.0 = Release|Any CPU - {23F487DA-93A6-4D8B-A634-CCE7419E6165}.Release|x86.ActiveCfg = Release|Any CPU - {23F487DA-93A6-4D8B-A634-CCE7419E6165}.Release|x86.Build.0 = Release|Any CPU {E6E3E332-5E21-4F9F-8163-3E88320439C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E6E3E332-5E21-4F9F-8163-3E88320439C9}.Debug|Any CPU.Build.0 = Debug|Any CPU {E6E3E332-5E21-4F9F-8163-3E88320439C9}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -1209,30 +1005,6 @@ Global {E6E3E332-5E21-4F9F-8163-3E88320439C9}.Release|x64.Build.0 = Release|Any CPU {E6E3E332-5E21-4F9F-8163-3E88320439C9}.Release|x86.ActiveCfg = Release|Any CPU {E6E3E332-5E21-4F9F-8163-3E88320439C9}.Release|x86.Build.0 = Release|Any CPU - {3B3EAA4B-4517-4826-86D1-2EBF717BAADD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B3EAA4B-4517-4826-86D1-2EBF717BAADD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B3EAA4B-4517-4826-86D1-2EBF717BAADD}.Debug|x64.ActiveCfg = Debug|Any CPU - {3B3EAA4B-4517-4826-86D1-2EBF717BAADD}.Debug|x64.Build.0 = Debug|Any CPU - {3B3EAA4B-4517-4826-86D1-2EBF717BAADD}.Debug|x86.ActiveCfg = Debug|Any CPU - {3B3EAA4B-4517-4826-86D1-2EBF717BAADD}.Debug|x86.Build.0 = Debug|Any CPU - {3B3EAA4B-4517-4826-86D1-2EBF717BAADD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B3EAA4B-4517-4826-86D1-2EBF717BAADD}.Release|Any CPU.Build.0 = Release|Any CPU - {3B3EAA4B-4517-4826-86D1-2EBF717BAADD}.Release|x64.ActiveCfg = Release|Any CPU - {3B3EAA4B-4517-4826-86D1-2EBF717BAADD}.Release|x64.Build.0 = Release|Any CPU - {3B3EAA4B-4517-4826-86D1-2EBF717BAADD}.Release|x86.ActiveCfg = Release|Any CPU - {3B3EAA4B-4517-4826-86D1-2EBF717BAADD}.Release|x86.Build.0 = Release|Any CPU - {4BF69395-D0BD-43AC-8B25-2A78C485D60A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4BF69395-D0BD-43AC-8B25-2A78C485D60A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4BF69395-D0BD-43AC-8B25-2A78C485D60A}.Debug|x64.ActiveCfg = Debug|Any CPU - {4BF69395-D0BD-43AC-8B25-2A78C485D60A}.Debug|x64.Build.0 = Debug|Any CPU - {4BF69395-D0BD-43AC-8B25-2A78C485D60A}.Debug|x86.ActiveCfg = Debug|Any CPU - {4BF69395-D0BD-43AC-8B25-2A78C485D60A}.Debug|x86.Build.0 = Debug|Any CPU - {4BF69395-D0BD-43AC-8B25-2A78C485D60A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4BF69395-D0BD-43AC-8B25-2A78C485D60A}.Release|Any CPU.Build.0 = Release|Any CPU - {4BF69395-D0BD-43AC-8B25-2A78C485D60A}.Release|x64.ActiveCfg = Release|Any CPU - {4BF69395-D0BD-43AC-8B25-2A78C485D60A}.Release|x64.Build.0 = Release|Any CPU - {4BF69395-D0BD-43AC-8B25-2A78C485D60A}.Release|x86.ActiveCfg = Release|Any CPU - {4BF69395-D0BD-43AC-8B25-2A78C485D60A}.Release|x86.Build.0 = Release|Any CPU {1B388FE8-44AD-4117-A646-8DABF32EB6F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1B388FE8-44AD-4117-A646-8DABF32EB6F1}.Debug|Any CPU.Build.0 = Debug|Any CPU {1B388FE8-44AD-4117-A646-8DABF32EB6F1}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -1245,30 +1017,6 @@ Global {1B388FE8-44AD-4117-A646-8DABF32EB6F1}.Release|x64.Build.0 = Release|Any CPU {1B388FE8-44AD-4117-A646-8DABF32EB6F1}.Release|x86.ActiveCfg = Release|Any CPU {1B388FE8-44AD-4117-A646-8DABF32EB6F1}.Release|x86.Build.0 = Release|Any CPU - {6B62A0F5-8098-4CB0-9F46-1E895E85254B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B62A0F5-8098-4CB0-9F46-1E895E85254B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B62A0F5-8098-4CB0-9F46-1E895E85254B}.Debug|x64.ActiveCfg = Debug|Any CPU - {6B62A0F5-8098-4CB0-9F46-1E895E85254B}.Debug|x64.Build.0 = Debug|Any CPU - {6B62A0F5-8098-4CB0-9F46-1E895E85254B}.Debug|x86.ActiveCfg = Debug|Any CPU - {6B62A0F5-8098-4CB0-9F46-1E895E85254B}.Debug|x86.Build.0 = Debug|Any CPU - {6B62A0F5-8098-4CB0-9F46-1E895E85254B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B62A0F5-8098-4CB0-9F46-1E895E85254B}.Release|Any CPU.Build.0 = Release|Any CPU - {6B62A0F5-8098-4CB0-9F46-1E895E85254B}.Release|x64.ActiveCfg = Release|Any CPU - {6B62A0F5-8098-4CB0-9F46-1E895E85254B}.Release|x64.Build.0 = Release|Any CPU - {6B62A0F5-8098-4CB0-9F46-1E895E85254B}.Release|x86.ActiveCfg = Release|Any CPU - {6B62A0F5-8098-4CB0-9F46-1E895E85254B}.Release|x86.Build.0 = Release|Any CPU - {925AC605-6847-461D-8311-9A306F718A47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {925AC605-6847-461D-8311-9A306F718A47}.Debug|Any CPU.Build.0 = Debug|Any CPU - {925AC605-6847-461D-8311-9A306F718A47}.Debug|x64.ActiveCfg = Debug|Any CPU - {925AC605-6847-461D-8311-9A306F718A47}.Debug|x64.Build.0 = Debug|Any CPU - {925AC605-6847-461D-8311-9A306F718A47}.Debug|x86.ActiveCfg = Debug|Any CPU - {925AC605-6847-461D-8311-9A306F718A47}.Debug|x86.Build.0 = Debug|Any CPU - {925AC605-6847-461D-8311-9A306F718A47}.Release|Any CPU.ActiveCfg = Release|Any CPU - {925AC605-6847-461D-8311-9A306F718A47}.Release|Any CPU.Build.0 = Release|Any CPU - {925AC605-6847-461D-8311-9A306F718A47}.Release|x64.ActiveCfg = Release|Any CPU - {925AC605-6847-461D-8311-9A306F718A47}.Release|x64.Build.0 = Release|Any CPU - {925AC605-6847-461D-8311-9A306F718A47}.Release|x86.ActiveCfg = Release|Any CPU - {925AC605-6847-461D-8311-9A306F718A47}.Release|x86.Build.0 = Release|Any CPU {9741622E-2995-4ECC-9469-162191277D39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9741622E-2995-4ECC-9469-162191277D39}.Debug|Any CPU.Build.0 = Debug|Any CPU {9741622E-2995-4ECC-9469-162191277D39}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -1293,30 +1041,6 @@ Global {CA8876CD-3AE5-4621-B797-9B5816D9CD48}.Release|x64.Build.0 = Release|Any CPU {CA8876CD-3AE5-4621-B797-9B5816D9CD48}.Release|x86.ActiveCfg = Release|Any CPU {CA8876CD-3AE5-4621-B797-9B5816D9CD48}.Release|x86.Build.0 = Release|Any CPU - {74F9657E-8FB8-4D58-A5B3-15E1BAD7563E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {74F9657E-8FB8-4D58-A5B3-15E1BAD7563E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {74F9657E-8FB8-4D58-A5B3-15E1BAD7563E}.Debug|x64.ActiveCfg = Debug|Any CPU - {74F9657E-8FB8-4D58-A5B3-15E1BAD7563E}.Debug|x64.Build.0 = Debug|Any CPU - {74F9657E-8FB8-4D58-A5B3-15E1BAD7563E}.Debug|x86.ActiveCfg = Debug|Any CPU - {74F9657E-8FB8-4D58-A5B3-15E1BAD7563E}.Debug|x86.Build.0 = Debug|Any CPU - {74F9657E-8FB8-4D58-A5B3-15E1BAD7563E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {74F9657E-8FB8-4D58-A5B3-15E1BAD7563E}.Release|Any CPU.Build.0 = Release|Any CPU - {74F9657E-8FB8-4D58-A5B3-15E1BAD7563E}.Release|x64.ActiveCfg = Release|Any CPU - {74F9657E-8FB8-4D58-A5B3-15E1BAD7563E}.Release|x64.Build.0 = Release|Any CPU - {74F9657E-8FB8-4D58-A5B3-15E1BAD7563E}.Release|x86.ActiveCfg = Release|Any CPU - {74F9657E-8FB8-4D58-A5B3-15E1BAD7563E}.Release|x86.Build.0 = Release|Any CPU - {389F0881-25F1-4EC8-AA20-B6E2FE6C6449}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {389F0881-25F1-4EC8-AA20-B6E2FE6C6449}.Debug|Any CPU.Build.0 = Debug|Any CPU - {389F0881-25F1-4EC8-AA20-B6E2FE6C6449}.Debug|x64.ActiveCfg = Debug|Any CPU - {389F0881-25F1-4EC8-AA20-B6E2FE6C6449}.Debug|x64.Build.0 = Debug|Any CPU - {389F0881-25F1-4EC8-AA20-B6E2FE6C6449}.Debug|x86.ActiveCfg = Debug|Any CPU - {389F0881-25F1-4EC8-AA20-B6E2FE6C6449}.Debug|x86.Build.0 = Debug|Any CPU - {389F0881-25F1-4EC8-AA20-B6E2FE6C6449}.Release|Any CPU.ActiveCfg = Release|Any CPU - {389F0881-25F1-4EC8-AA20-B6E2FE6C6449}.Release|Any CPU.Build.0 = Release|Any CPU - {389F0881-25F1-4EC8-AA20-B6E2FE6C6449}.Release|x64.ActiveCfg = Release|Any CPU - {389F0881-25F1-4EC8-AA20-B6E2FE6C6449}.Release|x64.Build.0 = Release|Any CPU - {389F0881-25F1-4EC8-AA20-B6E2FE6C6449}.Release|x86.ActiveCfg = Release|Any CPU - {389F0881-25F1-4EC8-AA20-B6E2FE6C6449}.Release|x86.Build.0 = Release|Any CPU {E0AC0DEB-82E3-4C00-B9EE-42932A94E8FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E0AC0DEB-82E3-4C00-B9EE-42932A94E8FB}.Debug|Any CPU.Build.0 = Debug|Any CPU {E0AC0DEB-82E3-4C00-B9EE-42932A94E8FB}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -1329,258 +1053,6 @@ Global {E0AC0DEB-82E3-4C00-B9EE-42932A94E8FB}.Release|x64.Build.0 = Release|Any CPU {E0AC0DEB-82E3-4C00-B9EE-42932A94E8FB}.Release|x86.ActiveCfg = Release|Any CPU {E0AC0DEB-82E3-4C00-B9EE-42932A94E8FB}.Release|x86.Build.0 = Release|Any CPU - {E202F809-08D3-4EBC-AD85-A475CBABBFF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E202F809-08D3-4EBC-AD85-A475CBABBFF3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E202F809-08D3-4EBC-AD85-A475CBABBFF3}.Debug|x64.ActiveCfg = Debug|Any CPU - {E202F809-08D3-4EBC-AD85-A475CBABBFF3}.Debug|x64.Build.0 = Debug|Any CPU - {E202F809-08D3-4EBC-AD85-A475CBABBFF3}.Debug|x86.ActiveCfg = Debug|Any CPU - {E202F809-08D3-4EBC-AD85-A475CBABBFF3}.Debug|x86.Build.0 = Debug|Any CPU - {E202F809-08D3-4EBC-AD85-A475CBABBFF3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E202F809-08D3-4EBC-AD85-A475CBABBFF3}.Release|Any CPU.Build.0 = Release|Any CPU - {E202F809-08D3-4EBC-AD85-A475CBABBFF3}.Release|x64.ActiveCfg = Release|Any CPU - {E202F809-08D3-4EBC-AD85-A475CBABBFF3}.Release|x64.Build.0 = Release|Any CPU - {E202F809-08D3-4EBC-AD85-A475CBABBFF3}.Release|x86.ActiveCfg = Release|Any CPU - {E202F809-08D3-4EBC-AD85-A475CBABBFF3}.Release|x86.Build.0 = Release|Any CPU - {F1705E2F-207E-41E7-8218-9C0A4A0DFA2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F1705E2F-207E-41E7-8218-9C0A4A0DFA2C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F1705E2F-207E-41E7-8218-9C0A4A0DFA2C}.Debug|x64.ActiveCfg = Debug|Any CPU - {F1705E2F-207E-41E7-8218-9C0A4A0DFA2C}.Debug|x64.Build.0 = Debug|Any CPU - {F1705E2F-207E-41E7-8218-9C0A4A0DFA2C}.Debug|x86.ActiveCfg = Debug|Any CPU - {F1705E2F-207E-41E7-8218-9C0A4A0DFA2C}.Debug|x86.Build.0 = Debug|Any CPU - {F1705E2F-207E-41E7-8218-9C0A4A0DFA2C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F1705E2F-207E-41E7-8218-9C0A4A0DFA2C}.Release|Any CPU.Build.0 = Release|Any CPU - {F1705E2F-207E-41E7-8218-9C0A4A0DFA2C}.Release|x64.ActiveCfg = Release|Any CPU - {F1705E2F-207E-41E7-8218-9C0A4A0DFA2C}.Release|x64.Build.0 = Release|Any CPU - {F1705E2F-207E-41E7-8218-9C0A4A0DFA2C}.Release|x86.ActiveCfg = Release|Any CPU - {F1705E2F-207E-41E7-8218-9C0A4A0DFA2C}.Release|x86.Build.0 = Release|Any CPU - {9012AE43-B700-4E06-A883-F7475EC1DDB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9012AE43-B700-4E06-A883-F7475EC1DDB8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9012AE43-B700-4E06-A883-F7475EC1DDB8}.Debug|x64.ActiveCfg = Debug|Any CPU - {9012AE43-B700-4E06-A883-F7475EC1DDB8}.Debug|x64.Build.0 = Debug|Any CPU - {9012AE43-B700-4E06-A883-F7475EC1DDB8}.Debug|x86.ActiveCfg = Debug|Any CPU - {9012AE43-B700-4E06-A883-F7475EC1DDB8}.Debug|x86.Build.0 = Debug|Any CPU - {9012AE43-B700-4E06-A883-F7475EC1DDB8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9012AE43-B700-4E06-A883-F7475EC1DDB8}.Release|Any CPU.Build.0 = Release|Any CPU - {9012AE43-B700-4E06-A883-F7475EC1DDB8}.Release|x64.ActiveCfg = Release|Any CPU - {9012AE43-B700-4E06-A883-F7475EC1DDB8}.Release|x64.Build.0 = Release|Any CPU - {9012AE43-B700-4E06-A883-F7475EC1DDB8}.Release|x86.ActiveCfg = Release|Any CPU - {9012AE43-B700-4E06-A883-F7475EC1DDB8}.Release|x86.Build.0 = Release|Any CPU - {308ECEC8-D688-46EC-80D5-2C4CFDD42754}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {308ECEC8-D688-46EC-80D5-2C4CFDD42754}.Debug|Any CPU.Build.0 = Debug|Any CPU - {308ECEC8-D688-46EC-80D5-2C4CFDD42754}.Debug|x64.ActiveCfg = Debug|Any CPU - {308ECEC8-D688-46EC-80D5-2C4CFDD42754}.Debug|x64.Build.0 = Debug|Any CPU - {308ECEC8-D688-46EC-80D5-2C4CFDD42754}.Debug|x86.ActiveCfg = Debug|Any CPU - {308ECEC8-D688-46EC-80D5-2C4CFDD42754}.Debug|x86.Build.0 = Debug|Any CPU - {308ECEC8-D688-46EC-80D5-2C4CFDD42754}.Release|Any CPU.ActiveCfg = Release|Any CPU - {308ECEC8-D688-46EC-80D5-2C4CFDD42754}.Release|Any CPU.Build.0 = Release|Any CPU - {308ECEC8-D688-46EC-80D5-2C4CFDD42754}.Release|x64.ActiveCfg = Release|Any CPU - {308ECEC8-D688-46EC-80D5-2C4CFDD42754}.Release|x64.Build.0 = Release|Any CPU - {308ECEC8-D688-46EC-80D5-2C4CFDD42754}.Release|x86.ActiveCfg = Release|Any CPU - {308ECEC8-D688-46EC-80D5-2C4CFDD42754}.Release|x86.Build.0 = Release|Any CPU - {72F41E60-3260-40F0-9485-CEAC5FB6EE5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72F41E60-3260-40F0-9485-CEAC5FB6EE5F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72F41E60-3260-40F0-9485-CEAC5FB6EE5F}.Debug|x64.ActiveCfg = Debug|Any CPU - {72F41E60-3260-40F0-9485-CEAC5FB6EE5F}.Debug|x64.Build.0 = Debug|Any CPU - {72F41E60-3260-40F0-9485-CEAC5FB6EE5F}.Debug|x86.ActiveCfg = Debug|Any CPU - {72F41E60-3260-40F0-9485-CEAC5FB6EE5F}.Debug|x86.Build.0 = Debug|Any CPU - {72F41E60-3260-40F0-9485-CEAC5FB6EE5F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72F41E60-3260-40F0-9485-CEAC5FB6EE5F}.Release|Any CPU.Build.0 = Release|Any CPU - {72F41E60-3260-40F0-9485-CEAC5FB6EE5F}.Release|x64.ActiveCfg = Release|Any CPU - {72F41E60-3260-40F0-9485-CEAC5FB6EE5F}.Release|x64.Build.0 = Release|Any CPU - {72F41E60-3260-40F0-9485-CEAC5FB6EE5F}.Release|x86.ActiveCfg = Release|Any CPU - {72F41E60-3260-40F0-9485-CEAC5FB6EE5F}.Release|x86.Build.0 = Release|Any CPU - {FEA93C51-FE7D-4AD2-BA69-93079CDC177E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FEA93C51-FE7D-4AD2-BA69-93079CDC177E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FEA93C51-FE7D-4AD2-BA69-93079CDC177E}.Debug|x64.ActiveCfg = Debug|Any CPU - {FEA93C51-FE7D-4AD2-BA69-93079CDC177E}.Debug|x64.Build.0 = Debug|Any CPU - {FEA93C51-FE7D-4AD2-BA69-93079CDC177E}.Debug|x86.ActiveCfg = Debug|Any CPU - {FEA93C51-FE7D-4AD2-BA69-93079CDC177E}.Debug|x86.Build.0 = Debug|Any CPU - {FEA93C51-FE7D-4AD2-BA69-93079CDC177E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FEA93C51-FE7D-4AD2-BA69-93079CDC177E}.Release|Any CPU.Build.0 = Release|Any CPU - {FEA93C51-FE7D-4AD2-BA69-93079CDC177E}.Release|x64.ActiveCfg = Release|Any CPU - {FEA93C51-FE7D-4AD2-BA69-93079CDC177E}.Release|x64.Build.0 = Release|Any CPU - {FEA93C51-FE7D-4AD2-BA69-93079CDC177E}.Release|x86.ActiveCfg = Release|Any CPU - {FEA93C51-FE7D-4AD2-BA69-93079CDC177E}.Release|x86.Build.0 = Release|Any CPU - {C5239184-EFC8-40EA-8E85-221CA7EB5D11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C5239184-EFC8-40EA-8E85-221CA7EB5D11}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C5239184-EFC8-40EA-8E85-221CA7EB5D11}.Debug|x64.ActiveCfg = Debug|Any CPU - {C5239184-EFC8-40EA-8E85-221CA7EB5D11}.Debug|x64.Build.0 = Debug|Any CPU - {C5239184-EFC8-40EA-8E85-221CA7EB5D11}.Debug|x86.ActiveCfg = Debug|Any CPU - {C5239184-EFC8-40EA-8E85-221CA7EB5D11}.Debug|x86.Build.0 = Debug|Any CPU - {C5239184-EFC8-40EA-8E85-221CA7EB5D11}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C5239184-EFC8-40EA-8E85-221CA7EB5D11}.Release|Any CPU.Build.0 = Release|Any CPU - {C5239184-EFC8-40EA-8E85-221CA7EB5D11}.Release|x64.ActiveCfg = Release|Any CPU - {C5239184-EFC8-40EA-8E85-221CA7EB5D11}.Release|x64.Build.0 = Release|Any CPU - {C5239184-EFC8-40EA-8E85-221CA7EB5D11}.Release|x86.ActiveCfg = Release|Any CPU - {C5239184-EFC8-40EA-8E85-221CA7EB5D11}.Release|x86.Build.0 = Release|Any CPU - {7EE67579-AB69-40EE-8F47-631D447E5B14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7EE67579-AB69-40EE-8F47-631D447E5B14}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7EE67579-AB69-40EE-8F47-631D447E5B14}.Debug|x64.ActiveCfg = Debug|Any CPU - {7EE67579-AB69-40EE-8F47-631D447E5B14}.Debug|x64.Build.0 = Debug|Any CPU - {7EE67579-AB69-40EE-8F47-631D447E5B14}.Debug|x86.ActiveCfg = Debug|Any CPU - {7EE67579-AB69-40EE-8F47-631D447E5B14}.Debug|x86.Build.0 = Debug|Any CPU - {7EE67579-AB69-40EE-8F47-631D447E5B14}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7EE67579-AB69-40EE-8F47-631D447E5B14}.Release|Any CPU.Build.0 = Release|Any CPU - {7EE67579-AB69-40EE-8F47-631D447E5B14}.Release|x64.ActiveCfg = Release|Any CPU - {7EE67579-AB69-40EE-8F47-631D447E5B14}.Release|x64.Build.0 = Release|Any CPU - {7EE67579-AB69-40EE-8F47-631D447E5B14}.Release|x86.ActiveCfg = Release|Any CPU - {7EE67579-AB69-40EE-8F47-631D447E5B14}.Release|x86.Build.0 = Release|Any CPU - {DE298EF3-5A38-4BED-AD72-BFE024F0F2DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DE298EF3-5A38-4BED-AD72-BFE024F0F2DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DE298EF3-5A38-4BED-AD72-BFE024F0F2DE}.Debug|x64.ActiveCfg = Debug|Any CPU - {DE298EF3-5A38-4BED-AD72-BFE024F0F2DE}.Debug|x64.Build.0 = Debug|Any CPU - {DE298EF3-5A38-4BED-AD72-BFE024F0F2DE}.Debug|x86.ActiveCfg = Debug|Any CPU - {DE298EF3-5A38-4BED-AD72-BFE024F0F2DE}.Debug|x86.Build.0 = Debug|Any CPU - {DE298EF3-5A38-4BED-AD72-BFE024F0F2DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DE298EF3-5A38-4BED-AD72-BFE024F0F2DE}.Release|Any CPU.Build.0 = Release|Any CPU - {DE298EF3-5A38-4BED-AD72-BFE024F0F2DE}.Release|x64.ActiveCfg = Release|Any CPU - {DE298EF3-5A38-4BED-AD72-BFE024F0F2DE}.Release|x64.Build.0 = Release|Any CPU - {DE298EF3-5A38-4BED-AD72-BFE024F0F2DE}.Release|x86.ActiveCfg = Release|Any CPU - {DE298EF3-5A38-4BED-AD72-BFE024F0F2DE}.Release|x86.Build.0 = Release|Any CPU - {874CEC6B-3F91-417D-9B5F-D3C9A299E1D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {874CEC6B-3F91-417D-9B5F-D3C9A299E1D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {874CEC6B-3F91-417D-9B5F-D3C9A299E1D1}.Debug|x64.ActiveCfg = Debug|Any CPU - {874CEC6B-3F91-417D-9B5F-D3C9A299E1D1}.Debug|x64.Build.0 = Debug|Any CPU - {874CEC6B-3F91-417D-9B5F-D3C9A299E1D1}.Debug|x86.ActiveCfg = Debug|Any CPU - {874CEC6B-3F91-417D-9B5F-D3C9A299E1D1}.Debug|x86.Build.0 = Debug|Any CPU - {874CEC6B-3F91-417D-9B5F-D3C9A299E1D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {874CEC6B-3F91-417D-9B5F-D3C9A299E1D1}.Release|Any CPU.Build.0 = Release|Any CPU - {874CEC6B-3F91-417D-9B5F-D3C9A299E1D1}.Release|x64.ActiveCfg = Release|Any CPU - {874CEC6B-3F91-417D-9B5F-D3C9A299E1D1}.Release|x64.Build.0 = Release|Any CPU - {874CEC6B-3F91-417D-9B5F-D3C9A299E1D1}.Release|x86.ActiveCfg = Release|Any CPU - {874CEC6B-3F91-417D-9B5F-D3C9A299E1D1}.Release|x86.Build.0 = Release|Any CPU - {21FD10C3-3660-4729-9A70-E82699BB41B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {21FD10C3-3660-4729-9A70-E82699BB41B4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21FD10C3-3660-4729-9A70-E82699BB41B4}.Debug|x64.ActiveCfg = Debug|Any CPU - {21FD10C3-3660-4729-9A70-E82699BB41B4}.Debug|x64.Build.0 = Debug|Any CPU - {21FD10C3-3660-4729-9A70-E82699BB41B4}.Debug|x86.ActiveCfg = Debug|Any CPU - {21FD10C3-3660-4729-9A70-E82699BB41B4}.Debug|x86.Build.0 = Debug|Any CPU - {21FD10C3-3660-4729-9A70-E82699BB41B4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21FD10C3-3660-4729-9A70-E82699BB41B4}.Release|Any CPU.Build.0 = Release|Any CPU - {21FD10C3-3660-4729-9A70-E82699BB41B4}.Release|x64.ActiveCfg = Release|Any CPU - {21FD10C3-3660-4729-9A70-E82699BB41B4}.Release|x64.Build.0 = Release|Any CPU - {21FD10C3-3660-4729-9A70-E82699BB41B4}.Release|x86.ActiveCfg = Release|Any CPU - {21FD10C3-3660-4729-9A70-E82699BB41B4}.Release|x86.Build.0 = Release|Any CPU - {9D21E6D9-A8D8-4D47-B445-DB352CF99936}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D21E6D9-A8D8-4D47-B445-DB352CF99936}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D21E6D9-A8D8-4D47-B445-DB352CF99936}.Debug|x64.ActiveCfg = Debug|Any CPU - {9D21E6D9-A8D8-4D47-B445-DB352CF99936}.Debug|x64.Build.0 = Debug|Any CPU - {9D21E6D9-A8D8-4D47-B445-DB352CF99936}.Debug|x86.ActiveCfg = Debug|Any CPU - {9D21E6D9-A8D8-4D47-B445-DB352CF99936}.Debug|x86.Build.0 = Debug|Any CPU - {9D21E6D9-A8D8-4D47-B445-DB352CF99936}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D21E6D9-A8D8-4D47-B445-DB352CF99936}.Release|Any CPU.Build.0 = Release|Any CPU - {9D21E6D9-A8D8-4D47-B445-DB352CF99936}.Release|x64.ActiveCfg = Release|Any CPU - {9D21E6D9-A8D8-4D47-B445-DB352CF99936}.Release|x64.Build.0 = Release|Any CPU - {9D21E6D9-A8D8-4D47-B445-DB352CF99936}.Release|x86.ActiveCfg = Release|Any CPU - {9D21E6D9-A8D8-4D47-B445-DB352CF99936}.Release|x86.Build.0 = Release|Any CPU - {64575302-7B16-4D72-843F-A21974019E9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {64575302-7B16-4D72-843F-A21974019E9C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {64575302-7B16-4D72-843F-A21974019E9C}.Debug|x64.ActiveCfg = Debug|Any CPU - {64575302-7B16-4D72-843F-A21974019E9C}.Debug|x64.Build.0 = Debug|Any CPU - {64575302-7B16-4D72-843F-A21974019E9C}.Debug|x86.ActiveCfg = Debug|Any CPU - {64575302-7B16-4D72-843F-A21974019E9C}.Debug|x86.Build.0 = Debug|Any CPU - {64575302-7B16-4D72-843F-A21974019E9C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {64575302-7B16-4D72-843F-A21974019E9C}.Release|Any CPU.Build.0 = Release|Any CPU - {64575302-7B16-4D72-843F-A21974019E9C}.Release|x64.ActiveCfg = Release|Any CPU - {64575302-7B16-4D72-843F-A21974019E9C}.Release|x64.Build.0 = Release|Any CPU - {64575302-7B16-4D72-843F-A21974019E9C}.Release|x86.ActiveCfg = Release|Any CPU - {64575302-7B16-4D72-843F-A21974019E9C}.Release|x86.Build.0 = Release|Any CPU - {1A5F6B6A-7A69-4DD8-B876-533289BB77AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1A5F6B6A-7A69-4DD8-B876-533289BB77AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1A5F6B6A-7A69-4DD8-B876-533289BB77AD}.Debug|x64.ActiveCfg = Debug|Any CPU - {1A5F6B6A-7A69-4DD8-B876-533289BB77AD}.Debug|x64.Build.0 = Debug|Any CPU - {1A5F6B6A-7A69-4DD8-B876-533289BB77AD}.Debug|x86.ActiveCfg = Debug|Any CPU - {1A5F6B6A-7A69-4DD8-B876-533289BB77AD}.Debug|x86.Build.0 = Debug|Any CPU - {1A5F6B6A-7A69-4DD8-B876-533289BB77AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1A5F6B6A-7A69-4DD8-B876-533289BB77AD}.Release|Any CPU.Build.0 = Release|Any CPU - {1A5F6B6A-7A69-4DD8-B876-533289BB77AD}.Release|x64.ActiveCfg = Release|Any CPU - {1A5F6B6A-7A69-4DD8-B876-533289BB77AD}.Release|x64.Build.0 = Release|Any CPU - {1A5F6B6A-7A69-4DD8-B876-533289BB77AD}.Release|x86.ActiveCfg = Release|Any CPU - {1A5F6B6A-7A69-4DD8-B876-533289BB77AD}.Release|x86.Build.0 = Release|Any CPU - {D40F44AE-6E5F-4539-8F2F-B6195E990999}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D40F44AE-6E5F-4539-8F2F-B6195E990999}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D40F44AE-6E5F-4539-8F2F-B6195E990999}.Debug|x64.ActiveCfg = Debug|Any CPU - {D40F44AE-6E5F-4539-8F2F-B6195E990999}.Debug|x64.Build.0 = Debug|Any CPU - {D40F44AE-6E5F-4539-8F2F-B6195E990999}.Debug|x86.ActiveCfg = Debug|Any CPU - {D40F44AE-6E5F-4539-8F2F-B6195E990999}.Debug|x86.Build.0 = Debug|Any CPU - {D40F44AE-6E5F-4539-8F2F-B6195E990999}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D40F44AE-6E5F-4539-8F2F-B6195E990999}.Release|Any CPU.Build.0 = Release|Any CPU - {D40F44AE-6E5F-4539-8F2F-B6195E990999}.Release|x64.ActiveCfg = Release|Any CPU - {D40F44AE-6E5F-4539-8F2F-B6195E990999}.Release|x64.Build.0 = Release|Any CPU - {D40F44AE-6E5F-4539-8F2F-B6195E990999}.Release|x86.ActiveCfg = Release|Any CPU - {D40F44AE-6E5F-4539-8F2F-B6195E990999}.Release|x86.Build.0 = Release|Any CPU - {245A35B5-5F00-4DD6-B234-ACEAD8ABC1B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {245A35B5-5F00-4DD6-B234-ACEAD8ABC1B3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {245A35B5-5F00-4DD6-B234-ACEAD8ABC1B3}.Debug|x64.ActiveCfg = Debug|Any CPU - {245A35B5-5F00-4DD6-B234-ACEAD8ABC1B3}.Debug|x64.Build.0 = Debug|Any CPU - {245A35B5-5F00-4DD6-B234-ACEAD8ABC1B3}.Debug|x86.ActiveCfg = Debug|Any CPU - {245A35B5-5F00-4DD6-B234-ACEAD8ABC1B3}.Debug|x86.Build.0 = Debug|Any CPU - {245A35B5-5F00-4DD6-B234-ACEAD8ABC1B3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {245A35B5-5F00-4DD6-B234-ACEAD8ABC1B3}.Release|Any CPU.Build.0 = Release|Any CPU - {245A35B5-5F00-4DD6-B234-ACEAD8ABC1B3}.Release|x64.ActiveCfg = Release|Any CPU - {245A35B5-5F00-4DD6-B234-ACEAD8ABC1B3}.Release|x64.Build.0 = Release|Any CPU - {245A35B5-5F00-4DD6-B234-ACEAD8ABC1B3}.Release|x86.ActiveCfg = Release|Any CPU - {245A35B5-5F00-4DD6-B234-ACEAD8ABC1B3}.Release|x86.Build.0 = Release|Any CPU - {9F47A8BC-AE06-4C67-84DA-839A56DF90E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9F47A8BC-AE06-4C67-84DA-839A56DF90E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9F47A8BC-AE06-4C67-84DA-839A56DF90E3}.Debug|x64.ActiveCfg = Debug|Any CPU - {9F47A8BC-AE06-4C67-84DA-839A56DF90E3}.Debug|x64.Build.0 = Debug|Any CPU - {9F47A8BC-AE06-4C67-84DA-839A56DF90E3}.Debug|x86.ActiveCfg = Debug|Any CPU - {9F47A8BC-AE06-4C67-84DA-839A56DF90E3}.Debug|x86.Build.0 = Debug|Any CPU - {9F47A8BC-AE06-4C67-84DA-839A56DF90E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9F47A8BC-AE06-4C67-84DA-839A56DF90E3}.Release|Any CPU.Build.0 = Release|Any CPU - {9F47A8BC-AE06-4C67-84DA-839A56DF90E3}.Release|x64.ActiveCfg = Release|Any CPU - {9F47A8BC-AE06-4C67-84DA-839A56DF90E3}.Release|x64.Build.0 = Release|Any CPU - {9F47A8BC-AE06-4C67-84DA-839A56DF90E3}.Release|x86.ActiveCfg = Release|Any CPU - {9F47A8BC-AE06-4C67-84DA-839A56DF90E3}.Release|x86.Build.0 = Release|Any CPU - {510BCD40-F459-46C6-BDA9-55218E8F8331}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {510BCD40-F459-46C6-BDA9-55218E8F8331}.Debug|Any CPU.Build.0 = Debug|Any CPU - {510BCD40-F459-46C6-BDA9-55218E8F8331}.Debug|x64.ActiveCfg = Debug|Any CPU - {510BCD40-F459-46C6-BDA9-55218E8F8331}.Debug|x64.Build.0 = Debug|Any CPU - {510BCD40-F459-46C6-BDA9-55218E8F8331}.Debug|x86.ActiveCfg = Debug|Any CPU - {510BCD40-F459-46C6-BDA9-55218E8F8331}.Debug|x86.Build.0 = Debug|Any CPU - {510BCD40-F459-46C6-BDA9-55218E8F8331}.Release|Any CPU.ActiveCfg = Release|Any CPU - {510BCD40-F459-46C6-BDA9-55218E8F8331}.Release|Any CPU.Build.0 = Release|Any CPU - {510BCD40-F459-46C6-BDA9-55218E8F8331}.Release|x64.ActiveCfg = Release|Any CPU - {510BCD40-F459-46C6-BDA9-55218E8F8331}.Release|x64.Build.0 = Release|Any CPU - {510BCD40-F459-46C6-BDA9-55218E8F8331}.Release|x86.ActiveCfg = Release|Any CPU - {510BCD40-F459-46C6-BDA9-55218E8F8331}.Release|x86.Build.0 = Release|Any CPU - {015BCB1C-12AC-4EB0-9F5C-A71967930E80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {015BCB1C-12AC-4EB0-9F5C-A71967930E80}.Debug|Any CPU.Build.0 = Debug|Any CPU - {015BCB1C-12AC-4EB0-9F5C-A71967930E80}.Debug|x64.ActiveCfg = Debug|Any CPU - {015BCB1C-12AC-4EB0-9F5C-A71967930E80}.Debug|x64.Build.0 = Debug|Any CPU - {015BCB1C-12AC-4EB0-9F5C-A71967930E80}.Debug|x86.ActiveCfg = Debug|Any CPU - {015BCB1C-12AC-4EB0-9F5C-A71967930E80}.Debug|x86.Build.0 = Debug|Any CPU - {015BCB1C-12AC-4EB0-9F5C-A71967930E80}.Release|Any CPU.ActiveCfg = Release|Any CPU - {015BCB1C-12AC-4EB0-9F5C-A71967930E80}.Release|Any CPU.Build.0 = Release|Any CPU - {015BCB1C-12AC-4EB0-9F5C-A71967930E80}.Release|x64.ActiveCfg = Release|Any CPU - {015BCB1C-12AC-4EB0-9F5C-A71967930E80}.Release|x64.Build.0 = Release|Any CPU - {015BCB1C-12AC-4EB0-9F5C-A71967930E80}.Release|x86.ActiveCfg = Release|Any CPU - {015BCB1C-12AC-4EB0-9F5C-A71967930E80}.Release|x86.Build.0 = Release|Any CPU - {84E4DB36-5174-4F98-B5D0-362ADECEF70D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {84E4DB36-5174-4F98-B5D0-362ADECEF70D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {84E4DB36-5174-4F98-B5D0-362ADECEF70D}.Debug|x64.ActiveCfg = Debug|Any CPU - {84E4DB36-5174-4F98-B5D0-362ADECEF70D}.Debug|x64.Build.0 = Debug|Any CPU - {84E4DB36-5174-4F98-B5D0-362ADECEF70D}.Debug|x86.ActiveCfg = Debug|Any CPU - {84E4DB36-5174-4F98-B5D0-362ADECEF70D}.Debug|x86.Build.0 = Debug|Any CPU - {84E4DB36-5174-4F98-B5D0-362ADECEF70D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {84E4DB36-5174-4F98-B5D0-362ADECEF70D}.Release|Any CPU.Build.0 = Release|Any CPU - {84E4DB36-5174-4F98-B5D0-362ADECEF70D}.Release|x64.ActiveCfg = Release|Any CPU - {84E4DB36-5174-4F98-B5D0-362ADECEF70D}.Release|x64.Build.0 = Release|Any CPU - {84E4DB36-5174-4F98-B5D0-362ADECEF70D}.Release|x86.ActiveCfg = Release|Any CPU - {84E4DB36-5174-4F98-B5D0-362ADECEF70D}.Release|x86.Build.0 = Release|Any CPU - {9D75BFC4-C846-4018-9F35-9AB3DCF85BEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D75BFC4-C846-4018-9F35-9AB3DCF85BEA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D75BFC4-C846-4018-9F35-9AB3DCF85BEA}.Debug|x64.ActiveCfg = Debug|Any CPU - {9D75BFC4-C846-4018-9F35-9AB3DCF85BEA}.Debug|x64.Build.0 = Debug|Any CPU - {9D75BFC4-C846-4018-9F35-9AB3DCF85BEA}.Debug|x86.ActiveCfg = Debug|Any CPU - {9D75BFC4-C846-4018-9F35-9AB3DCF85BEA}.Debug|x86.Build.0 = Debug|Any CPU - {9D75BFC4-C846-4018-9F35-9AB3DCF85BEA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D75BFC4-C846-4018-9F35-9AB3DCF85BEA}.Release|Any CPU.Build.0 = Release|Any CPU - {9D75BFC4-C846-4018-9F35-9AB3DCF85BEA}.Release|x64.ActiveCfg = Release|Any CPU - {9D75BFC4-C846-4018-9F35-9AB3DCF85BEA}.Release|x64.Build.0 = Release|Any CPU - {9D75BFC4-C846-4018-9F35-9AB3DCF85BEA}.Release|x86.ActiveCfg = Release|Any CPU - {9D75BFC4-C846-4018-9F35-9AB3DCF85BEA}.Release|x86.Build.0 = Release|Any CPU {3DB1F008-627B-4BED-8FA2-501B60D727BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3DB1F008-627B-4BED-8FA2-501B60D727BA}.Debug|Any CPU.Build.0 = Debug|Any CPU {3DB1F008-627B-4BED-8FA2-501B60D727BA}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -1701,18 +1173,6 @@ Global {234C1401-2A11-473D-AE3A-7242A4A8F5D5}.Release|x64.Build.0 = Release|Any CPU {234C1401-2A11-473D-AE3A-7242A4A8F5D5}.Release|x86.ActiveCfg = Release|Any CPU {234C1401-2A11-473D-AE3A-7242A4A8F5D5}.Release|x86.Build.0 = Release|Any CPU - {680C8124-EED7-4F15-B17B-7D6F910B95DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {680C8124-EED7-4F15-B17B-7D6F910B95DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {680C8124-EED7-4F15-B17B-7D6F910B95DC}.Debug|x64.ActiveCfg = Debug|Any CPU - {680C8124-EED7-4F15-B17B-7D6F910B95DC}.Debug|x64.Build.0 = Debug|Any CPU - {680C8124-EED7-4F15-B17B-7D6F910B95DC}.Debug|x86.ActiveCfg = Debug|Any CPU - {680C8124-EED7-4F15-B17B-7D6F910B95DC}.Debug|x86.Build.0 = Debug|Any CPU - {680C8124-EED7-4F15-B17B-7D6F910B95DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {680C8124-EED7-4F15-B17B-7D6F910B95DC}.Release|Any CPU.Build.0 = Release|Any CPU - {680C8124-EED7-4F15-B17B-7D6F910B95DC}.Release|x64.ActiveCfg = Release|Any CPU - {680C8124-EED7-4F15-B17B-7D6F910B95DC}.Release|x64.Build.0 = Release|Any CPU - {680C8124-EED7-4F15-B17B-7D6F910B95DC}.Release|x86.ActiveCfg = Release|Any CPU - {680C8124-EED7-4F15-B17B-7D6F910B95DC}.Release|x86.Build.0 = Release|Any CPU {1FE59FB5-B6D7-4458-B1A8-6BB93A123637}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1FE59FB5-B6D7-4458-B1A8-6BB93A123637}.Debug|Any CPU.Build.0 = Debug|Any CPU {1FE59FB5-B6D7-4458-B1A8-6BB93A123637}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -1749,30 +1209,6 @@ Global {492835F1-7E60-4EEC-A22C-6B71C216DCF9}.Release|x64.Build.0 = Release|Any CPU {492835F1-7E60-4EEC-A22C-6B71C216DCF9}.Release|x86.ActiveCfg = Release|Any CPU {492835F1-7E60-4EEC-A22C-6B71C216DCF9}.Release|x86.Build.0 = Release|Any CPU - {A349BB89-5465-43FE-842A-CF15AAEBA942}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A349BB89-5465-43FE-842A-CF15AAEBA942}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A349BB89-5465-43FE-842A-CF15AAEBA942}.Debug|x64.ActiveCfg = Debug|Any CPU - {A349BB89-5465-43FE-842A-CF15AAEBA942}.Debug|x64.Build.0 = Debug|Any CPU - {A349BB89-5465-43FE-842A-CF15AAEBA942}.Debug|x86.ActiveCfg = Debug|Any CPU - {A349BB89-5465-43FE-842A-CF15AAEBA942}.Debug|x86.Build.0 = Debug|Any CPU - {A349BB89-5465-43FE-842A-CF15AAEBA942}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A349BB89-5465-43FE-842A-CF15AAEBA942}.Release|Any CPU.Build.0 = Release|Any CPU - {A349BB89-5465-43FE-842A-CF15AAEBA942}.Release|x64.ActiveCfg = Release|Any CPU - {A349BB89-5465-43FE-842A-CF15AAEBA942}.Release|x64.Build.0 = Release|Any CPU - {A349BB89-5465-43FE-842A-CF15AAEBA942}.Release|x86.ActiveCfg = Release|Any CPU - {A349BB89-5465-43FE-842A-CF15AAEBA942}.Release|x86.Build.0 = Release|Any CPU - {D323D938-8DE0-4571-BDB8-590582CB731A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D323D938-8DE0-4571-BDB8-590582CB731A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D323D938-8DE0-4571-BDB8-590582CB731A}.Debug|x64.ActiveCfg = Debug|Any CPU - {D323D938-8DE0-4571-BDB8-590582CB731A}.Debug|x64.Build.0 = Debug|Any CPU - {D323D938-8DE0-4571-BDB8-590582CB731A}.Debug|x86.ActiveCfg = Debug|Any CPU - {D323D938-8DE0-4571-BDB8-590582CB731A}.Debug|x86.Build.0 = Debug|Any CPU - {D323D938-8DE0-4571-BDB8-590582CB731A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D323D938-8DE0-4571-BDB8-590582CB731A}.Release|Any CPU.Build.0 = Release|Any CPU - {D323D938-8DE0-4571-BDB8-590582CB731A}.Release|x64.ActiveCfg = Release|Any CPU - {D323D938-8DE0-4571-BDB8-590582CB731A}.Release|x64.Build.0 = Release|Any CPU - {D323D938-8DE0-4571-BDB8-590582CB731A}.Release|x86.ActiveCfg = Release|Any CPU - {D323D938-8DE0-4571-BDB8-590582CB731A}.Release|x86.Build.0 = Release|Any CPU {76B12AC6-03A6-4619-A4B3-5BA8A02FDD6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {76B12AC6-03A6-4619-A4B3-5BA8A02FDD6F}.Debug|Any CPU.Build.0 = Debug|Any CPU {76B12AC6-03A6-4619-A4B3-5BA8A02FDD6F}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -1809,6 +1245,30 @@ Global {9404EA66-AC32-49DD-A17C-1A48E04B7973}.Release|x64.Build.0 = Release|Any CPU {9404EA66-AC32-49DD-A17C-1A48E04B7973}.Release|x86.ActiveCfg = Release|Any CPU {9404EA66-AC32-49DD-A17C-1A48E04B7973}.Release|x86.Build.0 = Release|Any CPU + {B44A1F03-8E0E-4A0C-845B-37A9B87B2637}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B44A1F03-8E0E-4A0C-845B-37A9B87B2637}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B44A1F03-8E0E-4A0C-845B-37A9B87B2637}.Debug|x64.ActiveCfg = Debug|Any CPU + {B44A1F03-8E0E-4A0C-845B-37A9B87B2637}.Debug|x64.Build.0 = Debug|Any CPU + {B44A1F03-8E0E-4A0C-845B-37A9B87B2637}.Debug|x86.ActiveCfg = Debug|Any CPU + {B44A1F03-8E0E-4A0C-845B-37A9B87B2637}.Debug|x86.Build.0 = Debug|Any CPU + {B44A1F03-8E0E-4A0C-845B-37A9B87B2637}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B44A1F03-8E0E-4A0C-845B-37A9B87B2637}.Release|Any CPU.Build.0 = Release|Any CPU + {B44A1F03-8E0E-4A0C-845B-37A9B87B2637}.Release|x64.ActiveCfg = Release|Any CPU + {B44A1F03-8E0E-4A0C-845B-37A9B87B2637}.Release|x64.Build.0 = Release|Any CPU + {B44A1F03-8E0E-4A0C-845B-37A9B87B2637}.Release|x86.ActiveCfg = Release|Any CPU + {B44A1F03-8E0E-4A0C-845B-37A9B87B2637}.Release|x86.Build.0 = Release|Any CPU + {23ABCB0D-8C39-46D7-9CD1-508A3358AC00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {23ABCB0D-8C39-46D7-9CD1-508A3358AC00}.Debug|Any CPU.Build.0 = Debug|Any CPU + {23ABCB0D-8C39-46D7-9CD1-508A3358AC00}.Debug|x64.ActiveCfg = Debug|Any CPU + {23ABCB0D-8C39-46D7-9CD1-508A3358AC00}.Debug|x64.Build.0 = Debug|Any CPU + {23ABCB0D-8C39-46D7-9CD1-508A3358AC00}.Debug|x86.ActiveCfg = Debug|Any CPU + {23ABCB0D-8C39-46D7-9CD1-508A3358AC00}.Debug|x86.Build.0 = Debug|Any CPU + {23ABCB0D-8C39-46D7-9CD1-508A3358AC00}.Release|Any CPU.ActiveCfg = Release|Any CPU + {23ABCB0D-8C39-46D7-9CD1-508A3358AC00}.Release|Any CPU.Build.0 = Release|Any CPU + {23ABCB0D-8C39-46D7-9CD1-508A3358AC00}.Release|x64.ActiveCfg = Release|Any CPU + {23ABCB0D-8C39-46D7-9CD1-508A3358AC00}.Release|x64.Build.0 = Release|Any CPU + {23ABCB0D-8C39-46D7-9CD1-508A3358AC00}.Release|x86.ActiveCfg = Release|Any CPU + {23ABCB0D-8C39-46D7-9CD1-508A3358AC00}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1879,57 +1339,16 @@ Global {5DD4CFFB-D038-4E12-AA1E-B190699C273D} = {8A3B91E5-02A3-42F0-B2E7-E419B5086FFA} {5E930A54-0AA1-4053-AFBD-319914929634} = {98BBB159-779B-497B-927B-723592E84860} {C6E07186-85C0-4243-BE03-66BEA518B81C} = {DF368D6C-D11F-49F9-BF41-090AE1D10C6D} - {281BCCF6-2EA9-480B-8527-31C0AE8732B8} = {DF368D6C-D11F-49F9-BF41-090AE1D10C6D} - {0570B25A-576D-4EE2-BD3E-149ECA956DF1} = {DF368D6C-D11F-49F9-BF41-090AE1D10C6D} - {1FE07D46-7548-463A-993E-8B1B5AF90533} = {0570B25A-576D-4EE2-BD3E-149ECA956DF1} - {D083F8F5-AF10-4D07-8743-C9DB2516F2BA} = {281BCCF6-2EA9-480B-8527-31C0AE8732B8} {D600300A-285D-4CB1-AC59-FFA435091C99} = {C6E07186-85C0-4243-BE03-66BEA518B81C} - {913A6E8C-8E43-4EAE-B793-271CF5A91FB9} = {0570B25A-576D-4EE2-BD3E-149ECA956DF1} - {EE0F3688-0F89-47A2-B2A3-66A941B0197F} = {281BCCF6-2EA9-480B-8527-31C0AE8732B8} - {35FE5B0D-F0D8-4DAF-9AC0-D206E2781D1F} = {0570B25A-576D-4EE2-BD3E-149ECA956DF1} - {B5898F12-9EBD-4272-9D83-927601EE0941} = {281BCCF6-2EA9-480B-8527-31C0AE8732B8} {7E9CA585-F6BA-4268-BA27-357FDE181553} = {C6E07186-85C0-4243-BE03-66BEA518B81C} {7604E039-945D-4682-8277-79F26B02DE0E} = {C6E07186-85C0-4243-BE03-66BEA518B81C} - {1663AD74-C7CE-4C15-AE06-959BFF54FBB3} = {0570B25A-576D-4EE2-BD3E-149ECA956DF1} - {73B34C90-ADAB-4167-869D-E1BFF057C45B} = {281BCCF6-2EA9-480B-8527-31C0AE8732B8} {48EA4477-C775-4F1C-BEBE-96CE8ADAC4A3} = {C6E07186-85C0-4243-BE03-66BEA518B81C} - {EEC89F96-85E7-47A5-8245-8927F86EA0E0} = {0570B25A-576D-4EE2-BD3E-149ECA956DF1} - {23F487DA-93A6-4D8B-A634-CCE7419E6165} = {281BCCF6-2EA9-480B-8527-31C0AE8732B8} {E6E3E332-5E21-4F9F-8163-3E88320439C9} = {C6E07186-85C0-4243-BE03-66BEA518B81C} - {3B3EAA4B-4517-4826-86D1-2EBF717BAADD} = {0570B25A-576D-4EE2-BD3E-149ECA956DF1} - {4BF69395-D0BD-43AC-8B25-2A78C485D60A} = {281BCCF6-2EA9-480B-8527-31C0AE8732B8} {1B388FE8-44AD-4117-A646-8DABF32EB6F1} = {C6E07186-85C0-4243-BE03-66BEA518B81C} - {6B62A0F5-8098-4CB0-9F46-1E895E85254B} = {0570B25A-576D-4EE2-BD3E-149ECA956DF1} - {925AC605-6847-461D-8311-9A306F718A47} = {281BCCF6-2EA9-480B-8527-31C0AE8732B8} {9741622E-2995-4ECC-9469-162191277D39} = {C6E07186-85C0-4243-BE03-66BEA518B81C} {CA8876CD-3AE5-4621-B797-9B5816D9CD48} = {DF545B54-78FB-42D0-A842-A1490A579B37} - {74F9657E-8FB8-4D58-A5B3-15E1BAD7563E} = {DF545B54-78FB-42D0-A842-A1490A579B37} - {389F0881-25F1-4EC8-AA20-B6E2FE6C6449} = {DF545B54-78FB-42D0-A842-A1490A579B37} {E0AC0DEB-82E3-4C00-B9EE-42932A94E8FB} = {DF545B54-78FB-42D0-A842-A1490A579B37} - {175EFB99-30E9-45E9-9ED6-F48D88F67C19} = {DE50F426-4409-4573-8502-93364ED12E0C} - {12227AAB-94C7-4CE3-907D-2EBBF2660FEE} = {DE50F426-4409-4573-8502-93364ED12E0C} {51A14B0A-FEBA-4941-A114-A7AAB132CDBA} = {DE50F426-4409-4573-8502-93364ED12E0C} - {E202F809-08D3-4EBC-AD85-A475CBABBFF3} = {175EFB99-30E9-45E9-9ED6-F48D88F67C19} - {F1705E2F-207E-41E7-8218-9C0A4A0DFA2C} = {175EFB99-30E9-45E9-9ED6-F48D88F67C19} - {9012AE43-B700-4E06-A883-F7475EC1DDB8} = {175EFB99-30E9-45E9-9ED6-F48D88F67C19} - {308ECEC8-D688-46EC-80D5-2C4CFDD42754} = {175EFB99-30E9-45E9-9ED6-F48D88F67C19} - {72F41E60-3260-40F0-9485-CEAC5FB6EE5F} = {175EFB99-30E9-45E9-9ED6-F48D88F67C19} - {FEA93C51-FE7D-4AD2-BA69-93079CDC177E} = {175EFB99-30E9-45E9-9ED6-F48D88F67C19} - {C5239184-EFC8-40EA-8E85-221CA7EB5D11} = {175EFB99-30E9-45E9-9ED6-F48D88F67C19} - {7EE67579-AB69-40EE-8F47-631D447E5B14} = {175EFB99-30E9-45E9-9ED6-F48D88F67C19} - {DE298EF3-5A38-4BED-AD72-BFE024F0F2DE} = {175EFB99-30E9-45E9-9ED6-F48D88F67C19} - {874CEC6B-3F91-417D-9B5F-D3C9A299E1D1} = {175EFB99-30E9-45E9-9ED6-F48D88F67C19} - {21FD10C3-3660-4729-9A70-E82699BB41B4} = {175EFB99-30E9-45E9-9ED6-F48D88F67C19} - {9D21E6D9-A8D8-4D47-B445-DB352CF99936} = {12227AAB-94C7-4CE3-907D-2EBBF2660FEE} - {64575302-7B16-4D72-843F-A21974019E9C} = {12227AAB-94C7-4CE3-907D-2EBBF2660FEE} - {1A5F6B6A-7A69-4DD8-B876-533289BB77AD} = {12227AAB-94C7-4CE3-907D-2EBBF2660FEE} - {D40F44AE-6E5F-4539-8F2F-B6195E990999} = {12227AAB-94C7-4CE3-907D-2EBBF2660FEE} - {245A35B5-5F00-4DD6-B234-ACEAD8ABC1B3} = {12227AAB-94C7-4CE3-907D-2EBBF2660FEE} - {9F47A8BC-AE06-4C67-84DA-839A56DF90E3} = {12227AAB-94C7-4CE3-907D-2EBBF2660FEE} - {510BCD40-F459-46C6-BDA9-55218E8F8331} = {12227AAB-94C7-4CE3-907D-2EBBF2660FEE} - {015BCB1C-12AC-4EB0-9F5C-A71967930E80} = {12227AAB-94C7-4CE3-907D-2EBBF2660FEE} - {84E4DB36-5174-4F98-B5D0-362ADECEF70D} = {12227AAB-94C7-4CE3-907D-2EBBF2660FEE} - {9D75BFC4-C846-4018-9F35-9AB3DCF85BEA} = {12227AAB-94C7-4CE3-907D-2EBBF2660FEE} {3DB1F008-627B-4BED-8FA2-501B60D727BA} = {51A14B0A-FEBA-4941-A114-A7AAB132CDBA} {52074749-B16F-456A-B13B-58100EECCA32} = {51A14B0A-FEBA-4941-A114-A7AAB132CDBA} {64348D0D-500D-4686-8E0A-F6AB852F89E6} = {51A14B0A-FEBA-4941-A114-A7AAB132CDBA} @@ -1940,15 +1359,14 @@ Global {89FE83D6-D88A-4A62-B422-67BEA4BAFDBA} = {51A14B0A-FEBA-4941-A114-A7AAB132CDBA} {4AC7F21B-0EF1-4F9A-A0FB-7ED877954CDF} = {51A14B0A-FEBA-4941-A114-A7AAB132CDBA} {234C1401-2A11-473D-AE3A-7242A4A8F5D5} = {51A14B0A-FEBA-4941-A114-A7AAB132CDBA} - {680C8124-EED7-4F15-B17B-7D6F910B95DC} = {12227AAB-94C7-4CE3-907D-2EBBF2660FEE} {1FE59FB5-B6D7-4458-B1A8-6BB93A123637} = {51A14B0A-FEBA-4941-A114-A7AAB132CDBA} {B201ABE6-567B-41E9-B5D4-3472CEB0C497} = {8A3B91E5-02A3-42F0-B2E7-E419B5086FFA} {492835F1-7E60-4EEC-A22C-6B71C216DCF9} = {98BBB159-779B-497B-927B-723592E84860} - {A349BB89-5465-43FE-842A-CF15AAEBA942} = {175EFB99-30E9-45E9-9ED6-F48D88F67C19} - {D323D938-8DE0-4571-BDB8-590582CB731A} = {12227AAB-94C7-4CE3-907D-2EBBF2660FEE} {76B12AC6-03A6-4619-A4B3-5BA8A02FDD6F} = {51A14B0A-FEBA-4941-A114-A7AAB132CDBA} {0900433A-77B6-4DDC-8BF4-CEDB438313E5} = {DE50F426-4409-4573-8502-93364ED12E0C} {9404EA66-AC32-49DD-A17C-1A48E04B7973} = {98BBB159-779B-497B-927B-723592E84860} + {B44A1F03-8E0E-4A0C-845B-37A9B87B2637} = {C6E07186-85C0-4243-BE03-66BEA518B81C} + {23ABCB0D-8C39-46D7-9CD1-508A3358AC00} = {51A14B0A-FEBA-4941-A114-A7AAB132CDBA} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5283BE0B-F6F2-4458-B12F-64C78CFF8CBA} diff --git a/appveyor.yml b/appveyor.yml index c892ff751..7b77c7bef 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,20 +13,21 @@ services: - mongodb environment: GITHUB_TOKEN: - secure: aV5flJ5BOs49dlM4XRpu7t1qa+ajMD5L4hhwlBOv+zff/NlSkdnrmk5nYNsIJCdE - donetsdk: 7.0.100 + secure: /o9VAhx5ewGmdLR9qcgFJMzBaCuzOmGlsXAHu7khUJLdQzsv4gJzLUfYDghcRPHd + donetsdk: 7.0.202 JAVA_HOME: C:\Program Files\Java\jdk14 PATH: $(JAVA_HOME)\bin;$(PATH) init: - cmd: git config --global core.autocrlf true install: - ps: Install-Product node '' - - ps: .\dotnet-install.ps1 -Version 6.0.9 -Runtime dotnet -Architecture x64 -InstallDir "C:\Program Files\dotnet" - - ps: .\dotnet-install.ps1 -Version 6.0.9 -Runtime aspnetcore -Architecture x64 -InstallDir "C:\Program Files\dotnet" + - ps: .\dotnet-install.ps1 -Version 6.0.11 -Runtime dotnet -Architecture x64 -InstallDir "C:\Program Files\dotnet" + - ps: .\dotnet-install.ps1 -Version 6.0.11 -Runtime aspnetcore -Architecture x64 -InstallDir "C:\Program Files\dotnet" - ps: .\dotnet-install.ps1 -Version $env:donetsdk -InstallDir "C:\Program Files\dotnet" - ps: dotnet tool install --global GitVersion.Tool - ps: dotnet gitversion /l console /output buildserver - ps: dotnet tool install --global dotnet-sonarscanner + - ps: dotnet workload restore - cmd: nuget install ReportGenerator -ExcludeVersion - cmd: nuget install redis-64 -excludeversion - cmd: redis-64\tools\redis-server.exe --service-install @@ -47,7 +48,7 @@ artifacts: deploy: - provider: NuGet api_key: - secure: bvkKhXIKsDM1ThfcWTbuusND0sOBiDoJGOoD2fYijGoj4C9xx22QKfR7Y9q+j7eX + secure: L5Ol2yiygLW8nUF6j5/rwx4feonMPly+S69GjoX1ilEUklPMixlX5RW2l8FJScNK on: branch: - /^preview\/\d+.\d+.\d+$/ diff --git a/build.ps1 b/build.ps1 index c355d2de7..4f8196668 100644 --- a/build.ps1 +++ b/build.ps1 @@ -21,9 +21,9 @@ elseif ($env:APPVEYOR_REPO_BRANCH) { Write-Host "dotnet sonarscanner begin /k:aguacongas_TheIdServer -o:aguacongas -d:sonar.host.url=https://sonarcloud.io -d:sonar.login=****** -d:sonar.coverageReportPaths=coverage\SonarQube.xml $prArgs -v:$env:Version" dotnet sonarscanner begin /k:aguacongas_TheIdServer -o:aguacongas -d:sonar.host.url=https://sonarcloud.io -d:sonar.login=$env:sonarqube -d:sonar.coverageReportPaths=coverage\SonarQube.xml $prArgs -v:$env:Version -Write-Host "dotnet test -c Release --settings coverletArgs.runsettings --filter FullyQualifiedName!~MongoDb" +Write-Host "dotnet test -c Release --settings coverletArgs.runsettings" -dotnet test -c Release --blame --blame-hang-timeout 5m --collect:"XPlat Code Coverage" --settings coverletArgs.runsettings --filter "FullyQualifiedName!~MongoDb" -v q +dotnet test -c Release --blame --blame-hang-timeout 5m --collect:"XPlat Code Coverage" --settings coverletArgs.runsettings -v q if ($LASTEXITCODE -ne 0) { $result = $LASTEXITCODE diff --git a/clean.ps1 b/clean.ps1 index 4fddd6ef2..620ad2f8f 100644 --- a/clean.ps1 +++ b/clean.ps1 @@ -1,3 +1,9 @@ +Get-ChildItem -rec ` +| Where-Object { $_.Name.StartsWith("Aguacongas - Backup") } ` +| ForEach-Object { + Remove-Item $_.FullName +} + Get-ChildItem -rec ` | Where-Object { $_.Name -eq "obj" } ` | ForEach-Object { diff --git a/doc/SAML2P.md b/doc/SAML2P.md new file mode 100644 index 000000000..39638f37e --- /dev/null +++ b/doc/SAML2P.md @@ -0,0 +1,15 @@ +# Configure a SAML 2.0 client + +![SAML2P](assets/SAML2p.jpeg) + +The client id is the issuer. + +## Encryption certificate, signature algorithm, name id format + +Associate your client with relying party to configure an encryption certificate, a signature algorithm and/or the name id format. + +## ACS Artifact + +Add the property *UseAcsArtifact* with value *true* to use ACS artifact. + +![UseAcsArtifact](assets/UseAcsArtifact.jpeg) \ No newline at end of file diff --git a/doc/assets/SAML2p.jpeg b/doc/assets/SAML2p.jpeg new file mode 100644 index 000000000..02a6e6a19 Binary files /dev/null and b/doc/assets/SAML2p.jpeg differ diff --git a/doc/assets/UseAcsArtifact.jpeg b/doc/assets/UseAcsArtifact.jpeg new file mode 100644 index 000000000..c18126caf Binary files /dev/null and b/doc/assets/UseAcsArtifact.jpeg differ diff --git a/doc/assets/home.png b/doc/assets/home.png index 375471e54..82ad630c0 100644 Binary files a/doc/assets/home.png and b/doc/assets/home.png differ diff --git a/doc/saml2-xsd/saml-schema-dce-2.0.xsd b/doc/saml2-xsd/saml-schema-dce-2.0.xsd new file mode 100644 index 000000000..e89be866a --- /dev/null +++ b/doc/saml2-xsd/saml-schema-dce-2.0.xsd @@ -0,0 +1,29 @@ + + + + + Document identifier: saml-schema-dce-2.0 + Location: http://docs.oasis-open.org/security/saml/v2.0/ + Revision history: + V2.0 (March, 2005): + Custom schema for DCE attribute profile, first published in SAML 2.0. + + + + + + + + + + + + + + diff --git a/doc/saml2-xsd/saml-schema-ecp-2.0.xsd b/doc/saml2-xsd/saml-schema-ecp-2.0.xsd new file mode 100644 index 000000000..e3f24b9a5 --- /dev/null +++ b/doc/saml2-xsd/saml-schema-ecp-2.0.xsd @@ -0,0 +1,57 @@ + + + + + + + + Document identifier: saml-schema-ecp-2.0 + Location: http://docs.oasis-open.org/security/saml/v2.0/ + Revision history: + V2.0 (March, 2005): + Custom schema for ECP profile, first published in SAML 2.0. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/saml2-xsd/saml-schema-metadata-2.0.xsd b/doc/saml2-xsd/saml-schema-metadata-2.0.xsd new file mode 100644 index 000000000..923b598bf --- /dev/null +++ b/doc/saml2-xsd/saml-schema-metadata-2.0.xsd @@ -0,0 +1,337 @@ + + + + + + + + + Document identifier: saml-schema-metadata-2.0 + Location: http://docs.oasis-open.org/security/saml/v2.0/ + Revision history: + V2.0 (March, 2005): + Schema for SAML metadata, first published in SAML 2.0. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/saml2-xsd/saml-schema-x500-2.0.xsd b/doc/saml2-xsd/saml-schema-x500-2.0.xsd new file mode 100644 index 000000000..f67f1b04a --- /dev/null +++ b/doc/saml2-xsd/saml-schema-x500-2.0.xsd @@ -0,0 +1,20 @@ + + + + + Document identifier: saml-schema-x500-2.0 + Location: http://docs.oasis-open.org/security/saml/v2.0/ + Revision history: + V2.0 (March, 2005): + Custom schema for X.500 attribute profile, first published in SAML 2.0. + + + + + diff --git a/doc/saml2-xsd/saml-schema-xacml-2.0.xsd b/doc/saml2-xsd/saml-schema-xacml-2.0.xsd new file mode 100644 index 000000000..836f9db04 --- /dev/null +++ b/doc/saml2-xsd/saml-schema-xacml-2.0.xsd @@ -0,0 +1,19 @@ + + + + + Document identifier: saml-schema-xacml-2.0 + Location: http://docs.oasis-open.org/security/saml/v2.0/ + Revision history: + V2.0 (March, 2005): + Custom schema for XACML attribute profile, first published in SAML 2.0. + + + + diff --git a/global.json b/global.json deleted file mode 100644 index 08585a2b3..000000000 --- a/global.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "sdk": { - "version": "7.0.100" - } -} \ No newline at end of file diff --git a/publish.ps1 b/publish.ps1 index e03c44cd6..41c284e0e 100644 --- a/publish.ps1 +++ b/publish.ps1 @@ -1,13 +1,14 @@ +Write-Host $env:APPVEYOR $env:APPVEYOR_PULL_REQUEST_NUMBER + +if ($env:APPVEYOR -and $env:APPVEYOR_PULL_REQUEST_NUMBER) { + exit 0 +} + $fileversion = "$env:SemVer.0" $path = (Get-Location).Path dotnet pack -c Release -o $path\artifacts\build -p:Version=$env:Version -p:FileVersion=$fileversion -p:SourceRevisionId=$env:APPVEYOR_REPO_COMMIT -dotnet publish src\Aguacongas.TheIdServer.IS4\Aguacongas.TheIdServer.IS4.csproj -c Release -o $path\artifacts\Aguacongas.TheIdServer.IS4 -p:Version=$env:Version -p:FileVersion=$fileversion -p:SourceRevisionId=$env:APPVEYOR_REPO_COMMIT -if ($LASTEXITCODE -ne 0) { - throw "publis failed src/Aguacongas.TheIdServer/Aguacongas.TheIdServer.IS4.csproj" -} - dotnet publish src\Aguacongas.TheIdServer.Duende\Aguacongas.TheIdServer.Duende.csproj -c Release -o $path\artifacts\Aguacongas.TheIdServer.Duende -p:Version=$env:Version -p:FileVersion=$fileversion -p:SourceRevisionId=$env:APPVEYOR_REPO_COMMIT if ($LASTEXITCODE -ne 0) { throw "publis failed src/Aguacongas.TheIdServer/Aguacongas.TheIdServer.Duende.csproj" @@ -18,6 +19,5 @@ if ($LASTEXITCODE -ne 0) { throw "publish failed src/Aguacongas.TheIdServer.BlazorApp/Aguacongas.TheIdServer.BlazorApp.csproj" } -7z a $path\artifacts\build\Aguacongas.TheIdServer.IS4.$env:version.zip $path\artifacts\Aguacongas.TheIdServer.IS4 7z a $path\artifacts\build\Aguacongas.TheIdServer.Duende.$env:version.zip $path\artifacts\Aguacongas.TheIdServer.Duende 7z a $path\artifacts\build\Aguacongas.TheIdServer.BlazorApp$env:version.zip $path\artifacts\Aguacongas.TheIdServer.BlazorApp diff --git a/sample/Aguacongas.TheIdServer.ApiSample/Aguacongas.TheIdServer.ApiSample.csproj b/sample/Aguacongas.TheIdServer.ApiSample/Aguacongas.TheIdServer.ApiSample.csproj index 628261499..9afc2e1e7 100644 --- a/sample/Aguacongas.TheIdServer.ApiSample/Aguacongas.TheIdServer.ApiSample.csproj +++ b/sample/Aguacongas.TheIdServer.ApiSample/Aguacongas.TheIdServer.ApiSample.csproj @@ -17,11 +17,9 @@ - + - - - + diff --git a/sample/Aguacongas.TheIdServer.ApiSample/Controllers/WeatherForecastController.cs b/sample/Aguacongas.TheIdServer.ApiSample/Controllers/WeatherForecastController.cs index 102040e4b..7b48abb89 100644 --- a/sample/Aguacongas.TheIdServer.ApiSample/Controllers/WeatherForecastController.cs +++ b/sample/Aguacongas.TheIdServer.ApiSample/Controllers/WeatherForecastController.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; diff --git a/sample/Aguacongas.TheIdServer.ApiSample/Extensions/ApplicationBuilderExtensions.cs b/sample/Aguacongas.TheIdServer.ApiSample/Extensions/ApplicationBuilderExtensions.cs index 2b9fc2c15..1474fe8fa 100644 --- a/sample/Aguacongas.TheIdServer.ApiSample/Extensions/ApplicationBuilderExtensions.cs +++ b/sample/Aguacongas.TheIdServer.ApiSample/Extensions/ApplicationBuilderExtensions.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; diff --git a/sample/Aguacongas.TheIdServer.ApiSample/Extensions/WebApplicationBuilderExtensions.cs b/sample/Aguacongas.TheIdServer.ApiSample/Extensions/WebApplicationBuilderExtensions.cs index 20c6a76fc..6ef94d8b7 100644 --- a/sample/Aguacongas.TheIdServer.ApiSample/Extensions/WebApplicationBuilderExtensions.cs +++ b/sample/Aguacongas.TheIdServer.ApiSample/Extensions/WebApplicationBuilderExtensions.cs @@ -1,9 +1,8 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre -using IdentityServer4.AccessTokenValidation; using Microsoft.Extensions.DependencyInjection; -using System; +using Microsoft.AspNetCore.Authentication.JwtBearer; namespace Microsoft.AspNetCore.Builder { @@ -16,16 +15,12 @@ public static WebApplicationBuilder AddApiSample(this WebApplicationBuilder webA .AddAuthorization() .AddControllers(); - services.AddAuthentication(IdentityServerAuthenticationDefaults.AuthenticationScheme) - .AddIdentityServerAuthentication(options => + services + .AddAuthentication(JwtBearerDefaults.AuthenticationScheme) + .AddJwtBearer(JwtBearerDefaults.AuthenticationScheme, options => { options.Authority = "https://localhost:5443"; - options.RequireHttpsMetadata = false; - options.SupportedTokens = SupportedTokens.Both; - options.ApiName = "api1"; - options.EnableCaching = true; - options.CacheDuration = TimeSpan.FromMinutes(10); - options.LegacyAudienceValidation = true; + options.Audience = "api1"; }); return webApplicationBuilder; diff --git a/sample/Aguacongas.TheIdServer.ApiSample/Program.cs b/sample/Aguacongas.TheIdServer.ApiSample/Program.cs index 40459c5d1..71643c412 100644 --- a/sample/Aguacongas.TheIdServer.ApiSample/Program.cs +++ b/sample/Aguacongas.TheIdServer.ApiSample/Program.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Microsoft.AspNetCore.Builder; using Serilog; diff --git a/sample/Aguacongas.TheIdServer.CibaSample/Aguacongas.TheIdServer.CibaSample.csproj b/sample/Aguacongas.TheIdServer.CibaSample/Aguacongas.TheIdServer.CibaSample.csproj index 34f10f1fd..26e1577da 100644 --- a/sample/Aguacongas.TheIdServer.CibaSample/Aguacongas.TheIdServer.CibaSample.csproj +++ b/sample/Aguacongas.TheIdServer.CibaSample/Aguacongas.TheIdServer.CibaSample.csproj @@ -6,8 +6,13 @@ enable enable false + ..\..\.sonarlint\aguacongas_theidservercsharp.ruleset + + + + diff --git a/sample/Aguacongas.TheIdServer.ClientCredentialSample/Program.cs b/sample/Aguacongas.TheIdServer.ClientCredentialSample/Program.cs index 0a5cf8ed7..416b37069 100644 --- a/sample/Aguacongas.TheIdServer.ClientCredentialSample/Program.cs +++ b/sample/Aguacongas.TheIdServer.ClientCredentialSample/Program.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using IdentityModel.Client; using System; using System.Net.Http; diff --git a/sample/Aguacongas.TheIdServer.CustomClaimsProvider/Aguacongas.TheIdServer.CustomClaimsProviders.csproj b/sample/Aguacongas.TheIdServer.CustomClaimsProvider/Aguacongas.TheIdServer.CustomClaimsProviders.csproj index 8ae74909f..a1b266e9a 100644 --- a/sample/Aguacongas.TheIdServer.CustomClaimsProvider/Aguacongas.TheIdServer.CustomClaimsProviders.csproj +++ b/sample/Aguacongas.TheIdServer.CustomClaimsProvider/Aguacongas.TheIdServer.CustomClaimsProviders.csproj @@ -3,6 +3,7 @@ net7.0 false + True ..\..\.sonarlint\aguacongas_theidservercsharp.ruleset @@ -11,12 +12,12 @@ - + - - - + + + diff --git a/sample/Aguacongas.TheIdServer.CustomClaimsProvider/ClaimsProvidersSetup.cs b/sample/Aguacongas.TheIdServer.CustomClaimsProvider/ClaimsProvidersSetup.cs index f4f85c399..fe43a7f95 100644 --- a/sample/Aguacongas.TheIdServer.CustomClaimsProvider/ClaimsProvidersSetup.cs +++ b/sample/Aguacongas.TheIdServer.CustomClaimsProvider/ClaimsProvidersSetup.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.IdentityServer.Abstractions; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; diff --git a/sample/Aguacongas.TheIdServer.CustomClaimsProvider/MapClaimsProvider.cs b/sample/Aguacongas.TheIdServer.CustomClaimsProvider/MapClaimsProvider.cs index 569c0936c..6ce16536e 100644 --- a/sample/Aguacongas.TheIdServer.CustomClaimsProvider/MapClaimsProvider.cs +++ b/sample/Aguacongas.TheIdServer.CustomClaimsProvider/MapClaimsProvider.cs @@ -1,7 +1,7 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.IdentityServer.Abstractions; -using IdentityServer4.Models; +using Duende.IdentityServer.Models; using System.Collections.Generic; using System.IdentityModel.Tokens.Jwt; using System.Linq; diff --git a/sample/Aguacongas.TheIdServer.CustomClaimsProvider/WebServiceClaimsProvider.cs b/sample/Aguacongas.TheIdServer.CustomClaimsProvider/WebServiceClaimsProvider.cs index bb8767262..3dcc9b2f0 100644 --- a/sample/Aguacongas.TheIdServer.CustomClaimsProvider/WebServiceClaimsProvider.cs +++ b/sample/Aguacongas.TheIdServer.CustomClaimsProvider/WebServiceClaimsProvider.cs @@ -1,7 +1,7 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.IdentityServer.Abstractions; -using IdentityServer4.Models; +using Duende.IdentityServer.Models; using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; diff --git a/sample/Aguacongas.TheIdServer.DeviceFlowSample/Aguacongas.TheIdServer.DeviceFlowSample.csproj b/sample/Aguacongas.TheIdServer.DeviceFlowSample/Aguacongas.TheIdServer.DeviceFlowSample.csproj index 12d7b2377..3871eaae6 100644 --- a/sample/Aguacongas.TheIdServer.DeviceFlowSample/Aguacongas.TheIdServer.DeviceFlowSample.csproj +++ b/sample/Aguacongas.TheIdServer.DeviceFlowSample/Aguacongas.TheIdServer.DeviceFlowSample.csproj @@ -20,7 +20,7 @@ - + diff --git a/sample/Aguacongas.TheIdServer.DeviceFlowSample/Program.cs b/sample/Aguacongas.TheIdServer.DeviceFlowSample/Program.cs index a76607ab4..09e4a723e 100644 --- a/sample/Aguacongas.TheIdServer.DeviceFlowSample/Program.cs +++ b/sample/Aguacongas.TheIdServer.DeviceFlowSample/Program.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using IdentityModel; using IdentityModel.Client; using Newtonsoft.Json.Linq; diff --git a/sample/Aguacongas.TheIdServer.MtlsSample/Aguacongas.TheIdServer.MtlsSample.csproj b/sample/Aguacongas.TheIdServer.MtlsSample/Aguacongas.TheIdServer.MtlsSample.csproj index 2c6ff39d8..13f08d14d 100644 --- a/sample/Aguacongas.TheIdServer.MtlsSample/Aguacongas.TheIdServer.MtlsSample.csproj +++ b/sample/Aguacongas.TheIdServer.MtlsSample/Aguacongas.TheIdServer.MtlsSample.csproj @@ -6,8 +6,13 @@ enable enable false + ..\..\.sonarlint\aguacongas_theidservercsharp.ruleset + + + + diff --git a/sample/Aguacongas.TheIdServer.MvcClient/Aguacongas.TheIdServer.MvcClient.csproj b/sample/Aguacongas.TheIdServer.MvcClient/Aguacongas.TheIdServer.MvcClient.csproj index 0987d1971..2fb00d610 100644 --- a/sample/Aguacongas.TheIdServer.MvcClient/Aguacongas.TheIdServer.MvcClient.csproj +++ b/sample/Aguacongas.TheIdServer.MvcClient/Aguacongas.TheIdServer.MvcClient.csproj @@ -19,11 +19,9 @@ - + - - - + diff --git a/sample/Aguacongas.TheIdServer.MvcClient/Controllers/HomeController.cs b/sample/Aguacongas.TheIdServer.MvcClient/Controllers/HomeController.cs index dd4c04c5b..833e4e47c 100644 --- a/sample/Aguacongas.TheIdServer.MvcClient/Controllers/HomeController.cs +++ b/sample/Aguacongas.TheIdServer.MvcClient/Controllers/HomeController.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.TheIdServer.MvcClient.Models; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; diff --git a/sample/Aguacongas.TheIdServer.MvcClient/Extensions/ApplicationBuilderExtensions.cs b/sample/Aguacongas.TheIdServer.MvcClient/Extensions/ApplicationBuilderExtensions.cs index 06e09dae9..480231460 100644 --- a/sample/Aguacongas.TheIdServer.MvcClient/Extensions/ApplicationBuilderExtensions.cs +++ b/sample/Aguacongas.TheIdServer.MvcClient/Extensions/ApplicationBuilderExtensions.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; diff --git a/sample/Aguacongas.TheIdServer.MvcClient/Extensions/WebApplicationBuilderExtensions.cs b/sample/Aguacongas.TheIdServer.MvcClient/Extensions/WebApplicationBuilderExtensions.cs index 4b7cf4933..53e86ed97 100644 --- a/sample/Aguacongas.TheIdServer.MvcClient/Extensions/WebApplicationBuilderExtensions.cs +++ b/sample/Aguacongas.TheIdServer.MvcClient/Extensions/WebApplicationBuilderExtensions.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using IdentityModel.Client; using Microsoft.AspNetCore.Authentication; diff --git a/sample/Aguacongas.TheIdServer.MvcClient/Models/ErrorViewModel.cs b/sample/Aguacongas.TheIdServer.MvcClient/Models/ErrorViewModel.cs index 64617eab5..62bf444e9 100644 --- a/sample/Aguacongas.TheIdServer.MvcClient/Models/ErrorViewModel.cs +++ b/sample/Aguacongas.TheIdServer.MvcClient/Models/ErrorViewModel.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre namespace Aguacongas.TheIdServer.MvcClient.Models { public class ErrorViewModel diff --git a/sample/Aguacongas.TheIdServer.MvcClient/Program.cs b/sample/Aguacongas.TheIdServer.MvcClient/Program.cs index c9b79a6a3..d94fd3f45 100644 --- a/sample/Aguacongas.TheIdServer.MvcClient/Program.cs +++ b/sample/Aguacongas.TheIdServer.MvcClient/Program.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Microsoft.AspNetCore.Builder; using Serilog; diff --git a/sample/Aguacongas.TheIdServer.MvcClient/Views/Home/Index.cshtml b/sample/Aguacongas.TheIdServer.MvcClient/Views/Home/Index.cshtml index ec54aa211..015ed6fec 100644 --- a/sample/Aguacongas.TheIdServer.MvcClient/Views/Home/Index.cshtml +++ b/sample/Aguacongas.TheIdServer.MvcClient/Views/Home/Index.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @{ ViewData["Title"] = "Home Page"; diff --git a/sample/Aguacongas.TheIdServer.MvcClient/Views/Home/Privacy.cshtml b/sample/Aguacongas.TheIdServer.MvcClient/Views/Home/Privacy.cshtml index eb5b592c2..b08adc9fa 100644 --- a/sample/Aguacongas.TheIdServer.MvcClient/Views/Home/Privacy.cshtml +++ b/sample/Aguacongas.TheIdServer.MvcClient/Views/Home/Privacy.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @{ ViewData["Title"] = "Privacy Policy"; diff --git a/sample/Aguacongas.TheIdServer.MvcClient/Views/Shared/Error.cshtml b/sample/Aguacongas.TheIdServer.MvcClient/Views/Shared/Error.cshtml index 660d0e2a2..00b83428c 100644 --- a/sample/Aguacongas.TheIdServer.MvcClient/Views/Shared/Error.cshtml +++ b/sample/Aguacongas.TheIdServer.MvcClient/Views/Shared/Error.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @model ErrorViewModel @{ diff --git a/sample/Aguacongas.TheIdServer.MvcClient/Views/Shared/_Layout.cshtml b/sample/Aguacongas.TheIdServer.MvcClient/Views/Shared/_Layout.cshtml index feb510988..0ae5f66ae 100644 --- a/sample/Aguacongas.TheIdServer.MvcClient/Views/Shared/_Layout.cshtml +++ b/sample/Aguacongas.TheIdServer.MvcClient/Views/Shared/_Layout.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ diff --git a/sample/Aguacongas.TheIdServer.MvcClient/Views/Shared/_ValidationScriptsPartial.cshtml b/sample/Aguacongas.TheIdServer.MvcClient/Views/Shared/_ValidationScriptsPartial.cshtml index 99a7bfcca..16b1198ea 100644 --- a/sample/Aguacongas.TheIdServer.MvcClient/Views/Shared/_ValidationScriptsPartial.cshtml +++ b/sample/Aguacongas.TheIdServer.MvcClient/Views/Shared/_ValidationScriptsPartial.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ diff --git a/sample/Aguacongas.TheIdServer.MvcClient/Views/_ViewImports.cshtml b/sample/Aguacongas.TheIdServer.MvcClient/Views/_ViewImports.cshtml index f44898bba..4bb009f2e 100644 --- a/sample/Aguacongas.TheIdServer.MvcClient/Views/_ViewImports.cshtml +++ b/sample/Aguacongas.TheIdServer.MvcClient/Views/_ViewImports.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @using Aguacongas.TheIdServer.MvcClient @using Aguacongas.TheIdServer.MvcClient.Models diff --git a/sample/Aguacongas.TheIdServer.MvcClient/Views/_ViewStart.cshtml b/sample/Aguacongas.TheIdServer.MvcClient/Views/_ViewStart.cshtml index 61a75348d..beaf31b1d 100644 --- a/sample/Aguacongas.TheIdServer.MvcClient/Views/_ViewStart.cshtml +++ b/sample/Aguacongas.TheIdServer.MvcClient/Views/_ViewStart.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @{ Layout = "_Layout"; diff --git a/sample/Aguacongas.TheIdServer.Sample.Shared/WeatherForecast.cs b/sample/Aguacongas.TheIdServer.Sample.Shared/WeatherForecast.cs index e04089372..f713ed7cf 100644 --- a/sample/Aguacongas.TheIdServer.Sample.Shared/WeatherForecast.cs +++ b/sample/Aguacongas.TheIdServer.Sample.Shared/WeatherForecast.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using System; namespace Aguacongas.TheIdServer.ApiSample diff --git a/sample/Aguacongas.TheIdServer.WsFederationSample/Aguacongas.TheIdServer.WsFederationSample.csproj b/sample/Aguacongas.TheIdServer.WsFederationSample/Aguacongas.TheIdServer.WsFederationSample.csproj index 315e5f88a..4012afab6 100644 --- a/sample/Aguacongas.TheIdServer.WsFederationSample/Aguacongas.TheIdServer.WsFederationSample.csproj +++ b/sample/Aguacongas.TheIdServer.WsFederationSample/Aguacongas.TheIdServer.WsFederationSample.csproj @@ -11,11 +11,9 @@ - + - - - + diff --git a/sample/Aguacongas.TheIdServer.WsFederationSample/Controllers/AccountController.cs b/sample/Aguacongas.TheIdServer.WsFederationSample/Controllers/AccountController.cs index d3496a3c5..c16f343db 100644 --- a/sample/Aguacongas.TheIdServer.WsFederationSample/Controllers/AccountController.cs +++ b/sample/Aguacongas.TheIdServer.WsFederationSample/Controllers/AccountController.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Authentication.WsFederation; diff --git a/sample/Aguacongas.TheIdServer.WsFederationSample/Controllers/HomeController.cs b/sample/Aguacongas.TheIdServer.WsFederationSample/Controllers/HomeController.cs index 2ede49c81..57613a049 100644 --- a/sample/Aguacongas.TheIdServer.WsFederationSample/Controllers/HomeController.cs +++ b/sample/Aguacongas.TheIdServer.WsFederationSample/Controllers/HomeController.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Authorization; diff --git a/sample/Aguacongas.TheIdServer.WsFederationSample/Extensions/ApplicationBuilderExtensions.cs b/sample/Aguacongas.TheIdServer.WsFederationSample/Extensions/ApplicationBuilderExtensions.cs index 0bccc55a4..b65afca22 100644 --- a/sample/Aguacongas.TheIdServer.WsFederationSample/Extensions/ApplicationBuilderExtensions.cs +++ b/sample/Aguacongas.TheIdServer.WsFederationSample/Extensions/ApplicationBuilderExtensions.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre namespace Microsoft.AspNetCore.Builder { diff --git a/sample/Aguacongas.TheIdServer.WsFederationSample/Extensions/WebApplicationBuilderExtensions.cs b/sample/Aguacongas.TheIdServer.WsFederationSample/Extensions/WebApplicationBuilderExtensions.cs index 5dd085e88..438b063ae 100644 --- a/sample/Aguacongas.TheIdServer.WsFederationSample/Extensions/WebApplicationBuilderExtensions.cs +++ b/sample/Aguacongas.TheIdServer.WsFederationSample/Extensions/WebApplicationBuilderExtensions.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Authentication.WsFederation; diff --git a/sample/Aguacongas.TheIdServer.WsFederationSample/Program.cs b/sample/Aguacongas.TheIdServer.WsFederationSample/Program.cs index 71dac2b2f..42d5c3133 100644 --- a/sample/Aguacongas.TheIdServer.WsFederationSample/Program.cs +++ b/sample/Aguacongas.TheIdServer.WsFederationSample/Program.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Microsoft.AspNetCore.Builder; using Serilog; diff --git a/sample/Aguacongas.TheIdServer.WsFederationSample/Views/Home/Index.cshtml b/sample/Aguacongas.TheIdServer.WsFederationSample/Views/Home/Index.cshtml index 0e041a1ef..1e59f7f4b 100644 --- a/sample/Aguacongas.TheIdServer.WsFederationSample/Views/Home/Index.cshtml +++ b/sample/Aguacongas.TheIdServer.WsFederationSample/Views/Home/Index.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @{ ViewData["Title"] = "Home Page"; diff --git a/sample/Aguacongas.TheIdServer.WsFederationSample/Views/Home/Secure.cshtml b/sample/Aguacongas.TheIdServer.WsFederationSample/Views/Home/Secure.cshtml index 85d72f0de..6457ad6f1 100644 --- a/sample/Aguacongas.TheIdServer.WsFederationSample/Views/Home/Secure.cshtml +++ b/sample/Aguacongas.TheIdServer.WsFederationSample/Views/Home/Secure.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @using Microsoft.AspNetCore.Authentication diff --git a/sample/Aguacongas.TheIdServer.WsFederationSample/Views/Shared/_Layout.cshtml b/sample/Aguacongas.TheIdServer.WsFederationSample/Views/Shared/_Layout.cshtml index d8c2aaf0b..f66f0a322 100644 --- a/sample/Aguacongas.TheIdServer.WsFederationSample/Views/Shared/_Layout.cshtml +++ b/sample/Aguacongas.TheIdServer.WsFederationSample/Views/Shared/_Layout.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ diff --git a/sample/Aguacongas.TheIdServer.WsFederationSample/Views/Shared/_ValidationScriptsPartial.cshtml b/sample/Aguacongas.TheIdServer.WsFederationSample/Views/Shared/_ValidationScriptsPartial.cshtml index b47e469d3..d0a5f500e 100644 --- a/sample/Aguacongas.TheIdServer.WsFederationSample/Views/Shared/_ValidationScriptsPartial.cshtml +++ b/sample/Aguacongas.TheIdServer.WsFederationSample/Views/Shared/_ValidationScriptsPartial.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ diff --git a/sample/Aguacongas.TheIdServer.WsFederationSample/Views/_ViewImports.cshtml b/sample/Aguacongas.TheIdServer.WsFederationSample/Views/_ViewImports.cshtml index aaadff140..d19ba3b62 100644 --- a/sample/Aguacongas.TheIdServer.WsFederationSample/Views/_ViewImports.cshtml +++ b/sample/Aguacongas.TheIdServer.WsFederationSample/Views/_ViewImports.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @using Aguacongas.TheIdServer.WsFederationSample @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/sample/Aguacongas.TheIdServer.WsFederationSample/Views/_ViewStart.cshtml b/sample/Aguacongas.TheIdServer.WsFederationSample/Views/_ViewStart.cshtml index 61a75348d..beaf31b1d 100644 --- a/sample/Aguacongas.TheIdServer.WsFederationSample/Views/_ViewStart.cshtml +++ b/sample/Aguacongas.TheIdServer.WsFederationSample/Views/_ViewStart.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @{ Layout = "_Layout"; diff --git a/sample/Aguacongas.TheIdentityServer.SpaSample/Aguacongas.TheIdentityServer.SpaSample.csproj b/sample/Aguacongas.TheIdentityServer.SpaSample/Aguacongas.TheIdentityServer.SpaSample.csproj index 9a57d3a8e..bfa63cda0 100644 --- a/sample/Aguacongas.TheIdentityServer.SpaSample/Aguacongas.TheIdentityServer.SpaSample.csproj +++ b/sample/Aguacongas.TheIdentityServer.SpaSample/Aguacongas.TheIdentityServer.SpaSample.csproj @@ -18,10 +18,10 @@ - - - - + + + + diff --git a/sample/Aguacongas.TheIdentityServer.SpaSample/ClaimsPrincipalFactory.cs b/sample/Aguacongas.TheIdentityServer.SpaSample/ClaimsPrincipalFactory.cs index cacd36104..41ef53d42 100644 --- a/sample/Aguacongas.TheIdentityServer.SpaSample/ClaimsPrincipalFactory.cs +++ b/sample/Aguacongas.TheIdentityServer.SpaSample/ClaimsPrincipalFactory.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Microsoft.AspNetCore.Components.WebAssembly.Authentication; using Microsoft.AspNetCore.Components.WebAssembly.Authentication.Internal; using Microsoft.Extensions.Logging; diff --git a/sample/Aguacongas.TheIdentityServer.SpaSample/Program.cs b/sample/Aguacongas.TheIdentityServer.SpaSample/Program.cs index df51c7762..aa0391b8e 100644 --- a/sample/Aguacongas.TheIdentityServer.SpaSample/Program.cs +++ b/sample/Aguacongas.TheIdentityServer.SpaSample/Program.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Microsoft.AspNetCore.Components.WebAssembly.Hosting; using Microsoft.AspNetCore.Components.WebAssembly.Authentication; using Microsoft.Extensions.Configuration; diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Api/Aguacongas.TheIdServer.Api.csproj b/sample/MultiTiers/Aguacongas.TheIdServer.Api/Aguacongas.TheIdServer.Api.csproj index b308e04b8..f10b51c46 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Api/Aguacongas.TheIdServer.Api.csproj +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Api/Aguacongas.TheIdServer.Api.csproj @@ -5,7 +5,8 @@ false 3d7ce8dc-f8b3-4d0a-967c-7d1aeead003e Linux - + True + Aguacongas.TheIdServer.Api.ruleset @@ -38,28 +39,24 @@ 1701;1702;NU1603 - - - - - - - - + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - - + + + - - - - - + + diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Api/Extensions/ApplicationBuilderExtensions.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Api/Extensions/ApplicationBuilderExtensions.cs index b15ddf2ca..172a32a39 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Api/Extensions/ApplicationBuilderExtensions.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Api/Extensions/ApplicationBuilderExtensions.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.TheIdServer.Admin.Hubs; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Api/Extensions/WebApplicationBuilderExtensions.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Api/Extensions/WebApplicationBuilderExtensions.cs index 69cf5bd4f..740407a7e 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Api/Extensions/WebApplicationBuilderExtensions.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Api/Extensions/WebApplicationBuilderExtensions.cs @@ -1,10 +1,11 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.IdentityServer.Admin.Services; using Aguacongas.IdentityServer.Store; using Aguacongas.TheIdServer.Authentication; using Aguacongas.TheIdServer.Data; using Aguacongas.TheIdServer.Models; +using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.ResponseCompression; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; @@ -55,38 +56,23 @@ public static WebApplicationBuilder AddTheIdServerApi(this WebApplicationBuilder .AddIdentityServerAdmin(); services.AddAuthorization(options => - { - options.AddPolicy(SharedConstants.WRITERPOLICY, policy => - { - policy.RequireAssertion(context => - context.User.IsInRole(SharedConstants.WRITERPOLICY)); - }); - options.AddPolicy(SharedConstants.READERPOLICY, policy => { - policy.RequireAssertion(context => - context.User.IsInRole(SharedConstants.READERPOLICY)); - }); - }) - .AddAuthentication("Bearer") - .AddIdentityServerAuthentication("Bearer", options => - { - options.Authority = "https://localhost:7443"; - options.RequireHttpsMetadata = false; - options.SupportedTokens = IdentityServer4.AccessTokenValidation.SupportedTokens.Both; - options.ApiName = "theidserveradminapi"; - options.ApiSecret = "5b556f7c-b3bc-4b5b-85ab-45eed0cb962d"; - options.EnableCaching = true; - options.CacheDuration = TimeSpan.FromMinutes(10); - options.LegacyAudienceValidation = true; + options.AddPolicy(SharedConstants.WRITERPOLICY, policy => + { + policy.RequireAssertion(context => + context.User.IsInRole(SharedConstants.WRITERPOLICY)); + }); + options.AddPolicy(SharedConstants.READERPOLICY, policy => + { + policy.RequireAssertion(context => + context.User.IsInRole(SharedConstants.READERPOLICY)); + }); }) - .AddDynamic() - .AddGoogle() - .AddFacebook() - .AddOpenIdConnect() - .AddTwitter() - .AddMicrosoftAccount() - .AddOAuth("OAuth", options => + .AddAuthentication(JwtBearerDefaults.AuthenticationScheme) + .AddJwtBearer(JwtBearerDefaults.AuthenticationScheme, options => { + options.Authority = "https://localhost:7443"; + options.Audience = "theidserveradminapi"; }); diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Api/Program.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Api/Program.cs index 35a99b0cc..a77b94044 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Api/Program.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Api/Program.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Microsoft.AspNetCore.Builder; using Serilog; diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Aguacongas.TheIdServer.Private.csproj b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Aguacongas.TheIdServer.Private.csproj index 71e8d4717..ea05b74b8 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Aguacongas.TheIdServer.Private.csproj +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Aguacongas.TheIdServer.Private.csproj @@ -26,39 +26,36 @@ 1701;1702;NU1603 - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - - + + + - - - - - + + \ No newline at end of file diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/IdentityHostingStartup.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/IdentityHostingStartup.cs index 429ea67e5..ae712572c 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/IdentityHostingStartup.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/IdentityHostingStartup.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Identity.UI.Services; using Microsoft.Extensions.DependencyInjection; diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/ConfirmEmail.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/ConfirmEmail.cshtml index 8dabd039a..d10d960aa 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/ConfirmEmail.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/ConfirmEmail.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @page @model ConfirmEmailModel diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs index ce5e0d649..263890128 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.TheIdServer.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Identity; diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/Register.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/Register.cshtml index 49717511a..31cc632a5 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/Register.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/Register.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @page @model RegisterModel diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/Register.cshtml.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/Register.cshtml.cs index 5d936d839..5d3f01301 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/Register.cshtml.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/Register.cshtml.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.TheIdServer.Models; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml index ec784e41d..ea94da5c6 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @page @model RegisterConfirmationModel diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml.cs index 3f21c1b31..1e78a2bb8 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/_StatusMessage.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/_StatusMessage.cshtml index e753b0f6a..a703f3e07 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/_StatusMessage.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/_StatusMessage.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @model string diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/_ViewImports.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/_ViewImports.cshtml index efcea9222..fb5244579 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/_ViewImports.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/Account/_ViewImports.cshtml @@ -1,5 +1,5 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @using Aguacongas.TheIdServer.Areas.Identity.Pages.Account \ No newline at end of file diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml index bfd9c944b..d1b4d0bd8 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/_ViewImports.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/_ViewImports.cshtml index 3b35880a1..960b41a85 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/_ViewImports.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/_ViewImports.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @using Microsoft.AspNetCore.Identity @using Aguacongas.TheIdServer.Areas.Identity diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/_ViewStart.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/_ViewStart.cshtml index 2165833f2..cfbc7b3f4 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/_ViewStart.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Pages/_ViewStart.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @{ diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Services/AuthMessageSenderOptions.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Services/AuthMessageSenderOptions.cs index 70901c17f..a8ac2e605 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Services/AuthMessageSenderOptions.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Services/AuthMessageSenderOptions.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre namespace Aguacongas.TheIdServer.Areas.Identity { public class AuthMessageSenderOptions diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Services/EmailSender.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Services/EmailSender.cs index 05549eba6..79bb62803 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Services/EmailSender.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Areas/Identity/Services/EmailSender.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Microsoft.AspNetCore.Identity.UI.Services; using Microsoft.Extensions.Options; using SendGrid; diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Config.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Config.cs index 95519f7f2..8e14fc7d8 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Config.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Config.cs @@ -1,9 +1,8 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre -using IdentityServer4.Models; +// Copyright (c) 2023 @Olivier Lefebvre +using Duende.IdentityServer.Models; using System.Collections.Generic; -using System.Security.Claims; -using static IdentityServer4.IdentityServerConstants; +using static Duende.IdentityServer.IdentityServerConstants; namespace Aguacongas.TheIdServer { diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Extensions/ApplicationBuilderExtensions.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Extensions/ApplicationBuilderExtensions.cs index eb8e363ac..3a537fb22 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Extensions/ApplicationBuilderExtensions.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Extensions/ApplicationBuilderExtensions.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.TheIdServer.Authentication; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Extensions/AuthorizationOptionsExtensions.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Extensions/AuthorizationOptionsExtensions.cs index 9c252de59..2b7402bb5 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Extensions/AuthorizationOptionsExtensions.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Extensions/AuthorizationOptionsExtensions.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.IdentityServer.Store; namespace Microsoft.AspNetCore.Authorization diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Extensions/SameSiteCookiesServiceCollectionExtensions.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Extensions/SameSiteCookiesServiceCollectionExtensions.cs index 4f62c9605..5a25702bf 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Extensions/SameSiteCookiesServiceCollectionExtensions.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Extensions/SameSiteCookiesServiceCollectionExtensions.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Extensions/WebApplicationBuilderExtensions.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Extensions/WebApplicationBuilderExtensions.cs index e6e043f1e..890d19af3 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Extensions/WebApplicationBuilderExtensions.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Extensions/WebApplicationBuilderExtensions.cs @@ -1,32 +1,26 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.IdentityServer; using Aguacongas.IdentityServer.Abstractions; using Aguacongas.IdentityServer.Admin.Options; using Aguacongas.IdentityServer.Admin.Services; -using Aguacongas.IdentityServer.EntityFramework.Store; using Aguacongas.TheIdServer.Authentication; using Aguacongas.TheIdServer.Data; using Aguacongas.TheIdServer.Models; using IdentityModel.AspNetCore.OAuth2Introspection; -using IdentityServer4.AccessTokenValidation; using IdentityServerHost.Quickstart.UI; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Identity; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; using Microsoft.IdentityModel.Tokens; using Newtonsoft.Json; -using Serilog; using System; using System.Net.Http; -using System.Reflection; +using System.Threading.Tasks; namespace Microsoft.AspNetCore.Builder { @@ -76,8 +70,10 @@ public static WebApplicationBuilder AddTheIdServerPrivate(this WebApplicationBui services.AddAuthorization(options => options.AddIdentityServerPolicies()) - .AddAuthentication() - .AddIdentityServerAuthentication(JwtBearerDefaults.AuthenticationScheme, ConfigureIdentityServerAuthenticationOptions(configuration)); + .AddAuthentication(JwtBearerDefaults.AuthenticationScheme) + .AddJwtBearer(JwtBearerDefaults.AuthenticationScheme, ConfigureIdentityServerJwtBearerOptions(configuration)) + // reference tokens + .AddOAuth2Introspection("introspection", options => ConfigureIdentityServerOAuth2IntrospectionOptions(options, configuration)); services.Configure(configuration) .AddLocalization() @@ -99,14 +95,14 @@ public static WebApplicationBuilder AddTheIdServerPrivate(this WebApplicationBui return webApplicationBuilder; } - private static Action ConfigureIdentityServerAuthenticationOptions(IConfiguration configuration) + private static Action ConfigureIdentityServerJwtBearerOptions(IConfiguration configuration) { return options => { configuration.GetSection("ApiAuthentication").Bind(options); if (configuration.GetValue("DisableStrictSsl")) { - options.JwtBackChannelHandler = new HttpClientHandler + options.BackchannelHttpHandler = new HttpClientHandler { #pragma warning disable S4830 // Server certificates should be verified during SSL/TLS connections ServerCertificateCustomValidationCallback = (message, cert, chain, policy) => true @@ -114,27 +110,84 @@ private static Action ConfigureIdentityServ }; } - static string tokenRetriever(HttpRequest request) + options.Audience = configuration["ApiAuthentication:ApiName"]; + options.Events = new JwtBearerEvents { - var path = request.Path; - var accessToken = TokenRetrieval.FromQueryString()(request); - if (path.StartsWithSegments("/providerhub") && !string.IsNullOrEmpty(accessToken)) + OnMessageReceived = context => { - return accessToken; + var request = context.HttpContext.Request; + var path = request.Path; + var accessToken = TokenRetrieval.FromQueryString()(request); + if (path.StartsWithSegments("/providerhub") && !string.IsNullOrEmpty(accessToken)) + { + context.Token = accessToken; + return Task.CompletedTask; + } + var oneTimeToken = TokenRetrieval.FromQueryString("otk")(request); + if (!string.IsNullOrEmpty(oneTimeToken)) + { + context.Token = request.HttpContext + .RequestServices + .GetRequiredService() + .ConsumeOneTimeToken(oneTimeToken); + return Task.CompletedTask; + } + context.Token = TokenRetrieval.FromAuthorizationHeader()(request); + return Task.CompletedTask; } - var oneTimeToken = TokenRetrieval.FromQueryString("otk")(request); - if (!string.IsNullOrEmpty(oneTimeToken)) + }; + + options.ForwardDefaultSelector = context => + { + var request = context.Request; + var token = TokenRetrieval.FromAuthorizationHeader()(request) ?? TokenRetrieval.FromQueryString()(request); + if (string.IsNullOrEmpty(token)) { - return request.HttpContext - .RequestServices - .GetRequiredService() - .GetOneTimeToken(oneTimeToken); + var otk = TokenRetrieval.FromQueryString("otk")(request); + if (otk == null) + { + return null; + } + token = request.HttpContext + .RequestServices + .GetRequiredService() + .GetOneTimeToken(otk); + } + + if (token?.Contains('.') == false) + { + return "introspection"; } - return TokenRetrieval.FromAuthorizationHeader()(request); - } - options.TokenRetriever = tokenRetriever; + return null; + }; }; } + + private static void ConfigureIdentityServerOAuth2IntrospectionOptions(OAuth2IntrospectionOptions options, IConfiguration configuration) + { + configuration.Bind("ApiAuthentication", options); + options.ClientId = configuration.GetValue("ApiAuthentication:ApiName"); + options.ClientSecret = configuration.GetValue("ApiAuthentication:ApiSecret"); + static string tokenRetriever(HttpRequest request) + { + var path = request.Path; + var accessToken = TokenRetrieval.FromQueryString()(request); + if (path.StartsWithSegments("/providerhub") && !string.IsNullOrEmpty(accessToken)) + { + return accessToken; + } + var oneTimeToken = TokenRetrieval.FromQueryString("otk")(request); + if (!string.IsNullOrEmpty(oneTimeToken)) + { + return request.HttpContext + .RequestServices + .GetRequiredService() + .ConsumeOneTimeToken(oneTimeToken); + } + return TokenRetrieval.FromAuthorizationHeader()(request); + } + options.TokenRetriever = tokenRetriever; + } } } diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Program.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Program.cs index 56992a476..713b25db3 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Program.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Program.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.TheIdServer; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/AccountController.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/AccountController.cs index ae7bcb0c0..4347e89ff 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/AccountController.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/AccountController.cs @@ -1,11 +1,11 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using IdentityModel; -using IdentityServer4.Events; -using IdentityServer4.Extensions; -using IdentityServer4.Models; -using IdentityServer4.Services; -using IdentityServer4.Stores; +using Duende.IdentityServer.Events; +using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Models; +using Duende.IdentityServer.Services; +using Duende.IdentityServer.Stores; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; @@ -15,6 +15,7 @@ using System.Linq; using System.Threading.Tasks; using Aguacongas.TheIdServer.Models; +using Microsoft.Extensions.DependencyInjection; namespace IdentityServerHost.Quickstart.UI { @@ -215,7 +216,7 @@ private async Task BuildLoginViewModelAsync(string returnUrl) var context = await _interaction.GetAuthorizationContextAsync(returnUrl); if (context?.IdP != null && await _schemeProvider.GetSchemeAsync(context.IdP) != null) { - var local = context.IdP == IdentityServer4.IdentityServerConstants.LocalIdentityProvider; + var local = context.IdP == Duende.IdentityServer.IdentityServerConstants.LocalIdentityProvider; // this is meant to short circuit the UI and only trigger the one external IdP var vm = new LoginViewModel @@ -317,9 +318,12 @@ private async Task BuildLoggedOutViewModelAsync(string logou if (User?.Identity.IsAuthenticated == true) { var idp = User.FindFirst(JwtClaimTypes.IdentityProvider)?.Value; - if (idp != null && idp != IdentityServer4.IdentityServerConstants.LocalIdentityProvider) + if (idp != null && idp != Duende.IdentityServer.IdentityServerConstants.LocalIdentityProvider) { - var providerSupportsSignout = await HttpContext.GetSchemeSupportsSignOutAsync(idp); + var provider = HttpContext.RequestServices.GetRequiredService(); + var handler = await provider.GetHandlerAsync(HttpContext, idp); + var providerSupportsSignout = handler is IAuthenticationSignOutHandler; + if (providerSupportsSignout) { if (vm.LogoutId == null) diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/AccountOptions.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/AccountOptions.cs index a69849fdd..fc66264b4 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/AccountOptions.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/AccountOptions.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using System; namespace IdentityServerHost.Quickstart.UI diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/ExternalController.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/ExternalController.cs index ea0b49913..878f8cc9a 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/ExternalController.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/ExternalController.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using System; using System.Collections.Generic; using System.Linq; @@ -7,10 +7,10 @@ using System.Threading.Tasks; using Aguacongas.TheIdServer.Models; using IdentityModel; -using IdentityServer4; -using IdentityServer4.Events; -using IdentityServer4.Services; -using IdentityServer4.Stores; +using Duende.IdentityServer; +using Duende.IdentityServer.Events; +using Duende.IdentityServer.Services; +using Duende.IdentityServer.Stores; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/ExternalProvider.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/ExternalProvider.cs index b17e05598..6b1286dd0 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/ExternalProvider.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/ExternalProvider.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre namespace IdentityServerHost.Quickstart.UI { public class ExternalProvider diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/InvalidReturnUrlException.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/InvalidReturnUrlException.cs index 7354c8bff..d4aa6f918 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/InvalidReturnUrlException.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/InvalidReturnUrlException.cs @@ -1,9 +1,9 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using System; using System.Runtime.Serialization; -namespace IdentityServer4.Quickstart.UI +namespace Duende.IdentityServer.Quickstart.UI { /// /// Trowed when user click on malicious link diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/LoggedOutViewModel.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/LoggedOutViewModel.cs index 367061aa2..689c978d9 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/LoggedOutViewModel.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/LoggedOutViewModel.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre namespace IdentityServerHost.Quickstart.UI { public class LoggedOutViewModel diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/LoginInputModel.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/LoginInputModel.cs index ef4ec3045..ae6b1c6ca 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/LoginInputModel.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/LoginInputModel.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using System.ComponentModel.DataAnnotations; namespace IdentityServerHost.Quickstart.UI diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/LoginViewModel.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/LoginViewModel.cs index 080c60844..ea0901e60 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/LoginViewModel.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/LoginViewModel.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using System; using System.Collections.Generic; using System.Linq; diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/LogoutInputModel.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/LogoutInputModel.cs index 59bea1514..836588886 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/LogoutInputModel.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/LogoutInputModel.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre namespace IdentityServerHost.Quickstart.UI { public class LogoutInputModel diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/LogoutViewModel.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/LogoutViewModel.cs index 7ba7f98b5..8738e4d7c 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/LogoutViewModel.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/LogoutViewModel.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre namespace IdentityServerHost.Quickstart.UI { public class LogoutViewModel : LogoutInputModel diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/RedirectViewModel.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/RedirectViewModel.cs index 4876249d4..2d7c1c628 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/RedirectViewModel.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Account/RedirectViewModel.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre namespace IdentityServerHost.Quickstart.UI { public class RedirectViewModel diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Consent/ConsentController.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Consent/ConsentController.cs index 35d60790f..ba9c8a4d7 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Consent/ConsentController.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Consent/ConsentController.cs @@ -1,15 +1,15 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre -using IdentityServer4.Events; -using IdentityServer4.Models; -using IdentityServer4.Services; -using IdentityServer4.Extensions; +// Copyright (c) 2023 @Olivier Lefebvre +using Duende.IdentityServer.Events; +using Duende.IdentityServer.Models; +using Duende.IdentityServer.Services; +using Duende.IdentityServer.Extensions; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using System.Linq; using System.Threading.Tasks; -using IdentityServer4.Validation; +using Duende.IdentityServer.Validation; using System.Collections.Generic; using System; @@ -118,7 +118,7 @@ private async Task ProcessConsent(ConsentInputModel model) var scopes = model.ScopesConsented; if (ConsentOptions.EnableOfflineAccess == false) { - scopes = scopes.Where(x => x != IdentityServer4.IdentityServerConstants.StandardScopes.OfflineAccess); + scopes = scopes.Where(x => x != Duende.IdentityServer.IdentityServerConstants.StandardScopes.OfflineAccess); } grantedConsent = new ConsentResponse @@ -206,7 +206,7 @@ private ConsentViewModel CreateConsentViewModel( } if (ConsentOptions.EnableOfflineAccess && request.ValidatedResources.Resources.OfflineAccess) { - apiScopes.Add(GetOfflineAccessScope(vm.ScopesConsented.Contains(IdentityServer4.IdentityServerConstants.StandardScopes.OfflineAccess) || model == null)); + apiScopes.Add(GetOfflineAccessScope(vm.ScopesConsented.Contains(Duende.IdentityServer.IdentityServerConstants.StandardScopes.OfflineAccess) || model == null)); } vm.ApiScopes = apiScopes; @@ -249,7 +249,7 @@ private ScopeViewModel GetOfflineAccessScope(bool check) { return new ScopeViewModel { - Value = IdentityServer4.IdentityServerConstants.StandardScopes.OfflineAccess, + Value = Duende.IdentityServer.IdentityServerConstants.StandardScopes.OfflineAccess, DisplayName = ConsentOptions.OfflineAccessDisplayName, Description = ConsentOptions.OfflineAccessDescription, Emphasize = true, diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Consent/ConsentInputModel.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Consent/ConsentInputModel.cs index b4e331909..5b083c224 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Consent/ConsentInputModel.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Consent/ConsentInputModel.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using System.Collections.Generic; namespace IdentityServerHost.Quickstart.UI diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Consent/ConsentOptions.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Consent/ConsentOptions.cs index 7e597488c..e0e245a01 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Consent/ConsentOptions.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Consent/ConsentOptions.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre namespace IdentityServerHost.Quickstart.UI { public class ConsentOptions diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Consent/ConsentViewModel.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Consent/ConsentViewModel.cs index 2949075bf..ac114d4ac 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Consent/ConsentViewModel.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Consent/ConsentViewModel.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using System.Collections.Generic; namespace IdentityServerHost.Quickstart.UI diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Consent/ProcessConsentResult.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Consent/ProcessConsentResult.cs index b8802a3a9..17c456bd4 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Consent/ProcessConsentResult.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Consent/ProcessConsentResult.cs @@ -1,6 +1,6 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre -using IdentityServer4.Models; +// Copyright (c) 2023 @Olivier Lefebvre +using Duende.IdentityServer.Models; namespace IdentityServerHost.Quickstart.UI { diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Consent/ScopeViewModel.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Consent/ScopeViewModel.cs index f2639eb22..1502dccda 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Consent/ScopeViewModel.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Consent/ScopeViewModel.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre namespace IdentityServerHost.Quickstart.UI { public class ScopeViewModel diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Device/DeviceAuthorizationInputModel.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Device/DeviceAuthorizationInputModel.cs index bd1937d6b..8f27b9fef 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Device/DeviceAuthorizationInputModel.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Device/DeviceAuthorizationInputModel.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre namespace IdentityServerHost.Quickstart.UI { public class DeviceAuthorizationInputModel : ConsentInputModel diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Device/DeviceAuthorizationViewModel.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Device/DeviceAuthorizationViewModel.cs index f6887fa83..704605747 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Device/DeviceAuthorizationViewModel.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Device/DeviceAuthorizationViewModel.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre namespace IdentityServerHost.Quickstart.UI { public class DeviceAuthorizationViewModel : ConsentViewModel diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Device/DeviceController.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Device/DeviceController.cs index 8e99e2503..48aa2f927 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Device/DeviceController.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Device/DeviceController.cs @@ -1,15 +1,15 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using IdentityServer4.Configuration; -using IdentityServer4.Events; -using IdentityServer4.Extensions; -using IdentityServer4.Models; -using IdentityServer4.Services; -using IdentityServer4.Validation; +using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Events; +using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Models; +using Duende.IdentityServer.Services; +using Duende.IdentityServer.Validation; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; @@ -100,7 +100,7 @@ private async Task ProcessConsent(DeviceAuthorizationInput var scopes = model.ScopesConsented; if (ConsentOptions.EnableOfflineAccess == false) { - scopes = scopes.Where(x => x != IdentityServer4.IdentityServerConstants.StandardScopes.OfflineAccess); + scopes = scopes.Where(x => x != Duende.IdentityServer.IdentityServerConstants.StandardScopes.OfflineAccess); } grantedConsent = new ConsentResponse @@ -182,7 +182,7 @@ private DeviceAuthorizationViewModel CreateConsentViewModel(string userCode, Dev } if (ConsentOptions.EnableOfflineAccess && request.ValidatedResources.Resources.OfflineAccess) { - apiScopes.Add(GetOfflineAccessScope(vm.ScopesConsented.Contains(IdentityServer4.IdentityServerConstants.StandardScopes.OfflineAccess) || model == null)); + apiScopes.Add(GetOfflineAccessScope(vm.ScopesConsented.Contains(Duende.IdentityServer.IdentityServerConstants.StandardScopes.OfflineAccess) || model == null)); } vm.ApiScopes = apiScopes; @@ -219,7 +219,7 @@ private ScopeViewModel GetOfflineAccessScope(bool check) { return new ScopeViewModel { - Value = IdentityServer4.IdentityServerConstants.StandardScopes.OfflineAccess, + Value = Duende.IdentityServer.IdentityServerConstants.StandardScopes.OfflineAccess, DisplayName = ConsentOptions.OfflineAccessDisplayName, Description = ConsentOptions.OfflineAccessDescription, Emphasize = true, diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Diagnostics/DiagnosticsController.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Diagnostics/DiagnosticsController.cs index 375356cbe..a5c6fce56 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Diagnostics/DiagnosticsController.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Diagnostics/DiagnosticsController.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication; diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Diagnostics/DiagnosticsViewModel.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Diagnostics/DiagnosticsViewModel.cs index b474592ba..3f473d6dd 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Diagnostics/DiagnosticsViewModel.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Diagnostics/DiagnosticsViewModel.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using IdentityModel; using Microsoft.AspNetCore.Authentication; using Newtonsoft.Json; @@ -14,14 +14,15 @@ public DiagnosticsViewModel(AuthenticateResult result) { AuthenticateResult = result; - if (result.Properties.Items.ContainsKey("client_list")) + if(!result.Properties.Items.TryGetValue("client_list", out string encoded)) { - var encoded = result.Properties.Items["client_list"]; - var bytes = Base64Url.Decode(encoded); - var value = Encoding.UTF8.GetString(bytes); - - Clients = JsonConvert.DeserializeObject(value); + return; } + + var bytes = Base64Url.Decode(encoded); + var value = Encoding.UTF8.GetString(bytes); + + Clients = JsonConvert.DeserializeObject(value); } public AuthenticateResult AuthenticateResult { get; } diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Extensions.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Extensions.cs index 31e2b1a2f..583aad87d 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Extensions.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Extensions.cs @@ -1,7 +1,7 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using System; -using IdentityServer4.Models; +using Duende.IdentityServer.Models; using Microsoft.AspNetCore.Mvc; namespace IdentityServerHost.Quickstart.UI diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Grants/GrantsController.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Grants/GrantsController.cs index ee30d2e53..b30f3df47 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Grants/GrantsController.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Grants/GrantsController.cs @@ -1,14 +1,14 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre -using IdentityServer4.Services; -using IdentityServer4.Stores; +// Copyright (c) 2023 @Olivier Lefebvre +using Duende.IdentityServer.Services; +using Duende.IdentityServer.Stores; +using Duende.IdentityServer.Events; +using Duende.IdentityServer.Extensions; using Microsoft.AspNetCore.Mvc; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; -using IdentityServer4.Events; -using IdentityServer4.Extensions; namespace IdentityServerHost.Quickstart.UI { diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Grants/GrantsViewModel.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Grants/GrantsViewModel.cs index e036852d9..e5465e8bf 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Grants/GrantsViewModel.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Grants/GrantsViewModel.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using System; using System.Collections.Generic; diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Home/ErrorViewModel.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Home/ErrorViewModel.cs index e61e5222d..6fe9b3c4c 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Home/ErrorViewModel.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Home/ErrorViewModel.cs @@ -1,6 +1,6 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre -using IdentityServer4.Models; +// Copyright (c) 2023 @Olivier Lefebvre +using Duende.IdentityServer.Models; namespace IdentityServerHost.Quickstart.UI { diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Home/HomeController.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Home/HomeController.cs index 8db30be63..820c4958f 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Home/HomeController.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/Home/HomeController.cs @@ -1,6 +1,6 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre -using IdentityServer4.Services; +// Copyright (c) 2023 @Olivier Lefebvre +using Duende.IdentityServer.Services; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/SecurityHeadersAttribute.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/SecurityHeadersAttribute.cs index fbccb7df0..105fba76b 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/SecurityHeadersAttribute.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/SecurityHeadersAttribute.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/TestUsers.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/TestUsers.cs index 27f62b2c9..c9af9b51e 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/TestUsers.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Quickstart/TestUsers.cs @@ -1,7 +1,7 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using IdentityModel; -using IdentityServer4.Test; +using Duende.IdentityServer.Test; using System.Collections.Generic; using System.Security.Claims; @@ -20,7 +20,7 @@ public class TestUsers new Claim(JwtClaimTypes.Email, "AliceSmith@email.com"), new Claim(JwtClaimTypes.EmailVerified, "true", ClaimValueTypes.Boolean), new Claim(JwtClaimTypes.WebSite, "http://alice.com"), - new Claim(JwtClaimTypes.Address, @"{ 'street_address': 'One Hacker Way', 'locality': 'Heidelberg', 'postal_code': 69118, 'country': 'Germany' }", IdentityServer4.IdentityServerConstants.ClaimValueTypes.Json) + new Claim(JwtClaimTypes.Address, @"{ 'street_address': 'One Hacker Way', 'locality': 'Heidelberg', 'postal_code': 69118, 'country': 'Germany' }", Duende.IdentityServer.IdentityServerConstants.ClaimValueTypes.Json) } }, new TestUser{SubjectId = "88421113", Username = "bob", Password = "bob", @@ -32,7 +32,7 @@ public class TestUsers new Claim(JwtClaimTypes.Email, "BobSmith@email.com"), new Claim(JwtClaimTypes.EmailVerified, "true", ClaimValueTypes.Boolean), new Claim(JwtClaimTypes.WebSite, "http://bob.com"), - new Claim(JwtClaimTypes.Address, @"{ 'street_address': 'One Hacker Way', 'locality': 'Heidelberg', 'postal_code': 69118, 'country': 'Germany' }", IdentityServer4.IdentityServerConstants.ClaimValueTypes.Json), + new Claim(JwtClaimTypes.Address, @"{ 'street_address': 'One Hacker Way', 'locality': 'Heidelberg', 'postal_code': 69118, 'country': 'Germany' }", Duende.IdentityServer.IdentityServerConstants.ClaimValueTypes.Json), new Claim("location", "somewhere") } } diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/SeedData.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Private/SeedData.cs index a541a7dcb..321d68150 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/SeedData.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/SeedData.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.IdentityServer.EntityFramework.Store; using Aguacongas.IdentityServer.Store; using Aguacongas.TheIdServer.Data; @@ -77,7 +77,7 @@ private static void SeedApis(IServiceProvider provider) } } - private static void SeedApiProperties(IAdminStore apiPropertyStore, IdentityServer4.Models.ApiResource resource) + private static void SeedApiProperties(IAdminStore apiPropertyStore, Duende.IdentityServer.Models.ApiResource resource) { foreach (var property in resource.Properties) { @@ -91,7 +91,7 @@ private static void SeedApiProperties(IAdminStore apiPropert } } - private static void SeedApiApiScopes(IAdminStore apiApiScopeStore, IdentityServer4.Models.ApiResource resource) + private static void SeedApiApiScopes(IAdminStore apiApiScopeStore, Duende.IdentityServer.Models.ApiResource resource) { foreach (var apiScope in resource.Scopes) { @@ -104,7 +104,7 @@ private static void SeedApiApiScopes(IAdminStore apiApiScope } } - private static void SeedApiSecrets(IAdminStore apiSecretStore, IdentityServer4.Models.ApiResource resource) + private static void SeedApiSecrets(IAdminStore apiSecretStore, Duende.IdentityServer.Models.ApiResource resource) { foreach (var secret in resource.ApiSecrets) { @@ -120,7 +120,7 @@ private static void SeedApiSecrets(IAdminStore apiSecretStore, } } - private static void SeedApiClaims(IAdminStore apiClaimStore, IdentityServer4.Models.ApiResource resource) + private static void SeedApiClaims(IAdminStore apiClaimStore, Duende.IdentityServer.Models.ApiResource resource) { foreach (var claim in resource.UserClaims) { @@ -163,7 +163,7 @@ private static void SeedApiScopes(IServiceProvider provider) } } - private static void SeedApiScopeProperties(IAdminStore apiScopePropertyStore, IdentityServer4.Models.ApiScope resource) + private static void SeedApiScopeProperties(IAdminStore apiScopePropertyStore, Duende.IdentityServer.Models.ApiScope resource) { foreach (var property in resource.Properties) { @@ -177,7 +177,7 @@ private static void SeedApiScopeProperties(IAdminStore } } - private static void SeedApiScopeClaims(IAdminStore apiScopeClaimStore, IdentityServer4.Models.ApiScope resource) + private static void SeedApiScopeClaims(IAdminStore apiScopeClaimStore, Duende.IdentityServer.Models.ApiScope resource) { foreach (var claim in resource.UserClaims) { @@ -219,7 +219,7 @@ private static void SeedIdentities(IServiceProvider provider) } } - private static void SeedIdentityProperties(IAdminStore identityPropertyStore, IdentityServer4.Models.IdentityResource resource) + private static void SeedIdentityProperties(IAdminStore identityPropertyStore, Duende.IdentityServer.Models.IdentityResource resource) { foreach (var property in resource.Properties) { @@ -233,7 +233,7 @@ private static void SeedIdentityProperties(IAdminStore } } - private static void SeedIdentityClaims(IAdminStore identityClaimStore, IdentityServer4.Models.IdentityResource resource) + private static void SeedIdentityClaims(IAdminStore identityClaimStore, Duende.IdentityServer.Models.IdentityResource resource) { foreach (var claim in resource.UserClaims) { @@ -316,7 +316,7 @@ private static void SeedClients(IServiceProvider provider) } } - private static void SeedClientUris(IAdminStore clientUriStore, IdentityServer4.Models.Client client) + private static void SeedClientUris(IAdminStore clientUriStore, Duende.IdentityServer.Models.Client client) { var uris = client.RedirectUris.Select(o => new Entity.ClientUri { @@ -374,7 +374,7 @@ private static void SeedClientUris(IAdminStore clientUriStore, } } - private static void SeedClientProperties(IAdminStore clientPropertyStore, IdentityServer4.Models.Client client) + private static void SeedClientProperties(IAdminStore clientPropertyStore, Duende.IdentityServer.Models.Client client) { foreach (var property in client.Properties) { @@ -388,7 +388,7 @@ private static void SeedClientProperties(IAdminStore clie } } - private static void SeedClientRestrictions(IAdminStore clientIdpRestrictionStore, IdentityServer4.Models.Client client) + private static void SeedClientRestrictions(IAdminStore clientIdpRestrictionStore, Duende.IdentityServer.Models.Client client) { foreach (var restriction in client.IdentityProviderRestrictions) { @@ -401,7 +401,7 @@ private static void SeedClientRestrictions(IAdminStore clientSecretStore, IdentityServer4.Models.Client client) + private static void SeedClientSecrets(IAdminStore clientSecretStore, Duende.IdentityServer.Models.Client client) { foreach (var secret in client.ClientSecrets) { @@ -417,7 +417,7 @@ private static void SeedClientSecrets(IAdminStore clientSec } } - private static void SeedClientClaims(IAdminStore clientClaimStore, IdentityServer4.Models.Client client) + private static void SeedClientClaims(IAdminStore clientClaimStore, Duende.IdentityServer.Models.Client client) { foreach (var claim in client.Claims) { @@ -431,7 +431,7 @@ private static void SeedClientClaims(IAdminStore clientClaim } } - private static void SeedClientScopes(IAdminStore clientScopeStore, IdentityServer4.Models.Client client) + private static void SeedClientScopes(IAdminStore clientScopeStore, Duende.IdentityServer.Models.Client client) { foreach (var clientScope in client.AllowedScopes) { @@ -444,7 +444,7 @@ private static void SeedClientScopes(IAdminStore clientScope } } - private static void SeedClientGrantType(IAdminStore clientGrantTypeStore, IdentityServer4.Models.Client client) + private static void SeedClientGrantType(IAdminStore clientGrantTypeStore, Duende.IdentityServer.Models.Client client) { foreach (var grantType in client.AllowedGrantTypes) { @@ -497,7 +497,7 @@ public static void SeedUsers(IServiceScope scope) new Claim(JwtClaimTypes.Email, "AliceSmith@email.com"), new Claim(JwtClaimTypes.EmailVerified, "true", ClaimValueTypes.Boolean), new Claim(JwtClaimTypes.WebSite, "http://alice.com"), - new Claim(JwtClaimTypes.Address, @"{ 'street_address': 'One Hacker Way', 'locality': 'Heidelberg', 'postal_code': 69118, 'country': 'Germany' }", IdentityServer4.IdentityServerConstants.ClaimValueTypes.Json) + new Claim(JwtClaimTypes.Address, @"{ 'street_address': 'One Hacker Way', 'locality': 'Heidelberg', 'postal_code': 69118, 'country': 'Germany' }", Duende.IdentityServer.IdentityServerConstants.ClaimValueTypes.Json) })).GetAwaiter().GetResult(); ExcuteAndCheckResult(() => userMgr.AddToRolesAsync(alice, roles)) @@ -527,7 +527,7 @@ public static void SeedUsers(IServiceScope scope) new Claim(JwtClaimTypes.Email, "BobSmith@email.com"), new Claim(JwtClaimTypes.EmailVerified, "true", ClaimValueTypes.Boolean), new Claim(JwtClaimTypes.WebSite, "http://bob.com"), - new Claim(JwtClaimTypes.Address, @"{ 'street_address': 'One Hacker Way', 'locality': 'Heidelberg', 'postal_code': 69118, 'country': 'Germany' }", IdentityServer4.IdentityServerConstants.ClaimValueTypes.Json), + new Claim(JwtClaimTypes.Address, @"{ 'street_address': 'One Hacker Way', 'locality': 'Heidelberg', 'postal_code': 69118, 'country': 'Germany' }", Duende.IdentityServer.IdentityServerConstants.ClaimValueTypes.Json), new Claim("location", "somewhere") })).GetAwaiter().GetResult(); ExcuteAndCheckResult(() => userMgr.AddToRoleAsync(bob, "Is4-Reader")) diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Home/Index.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Home/Index.cshtml index 36b2bfc3a..71488fb50 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Home/Index.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Home/Index.cshtml @@ -1,13 +1,13 @@ @using System.Diagnostics @{ - var version = FileVersionInfo.GetVersionInfo(typeof(IdentityServer4.Hosting.IdentityServerMiddleware).Assembly.Location).ProductVersion.Split('+').First(); + var version = FileVersionInfo.GetVersionInfo(typeof(Duende.IdentityServer.Hosting.IdentityServerMiddleware).Assembly.Location).ProductVersion.Split('+').First(); }

- Welcome to IdentityServer4 + Welcome to Duende.IdentityServer (version @version)

@@ -25,8 +25,8 @@
  • Here are links to the - source code repository, - and ready to use samples. + source code repository, + and ready to use samples.
    • diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Shared/Error.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Shared/Error.cshtml index aa0ca98fd..0e40e8679 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Shared/Error.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Shared/Error.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @model ErrorViewModel diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Shared/Redirect.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Shared/Redirect.cshtml index cec777b10..7c7dffd86 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Shared/Redirect.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Shared/Redirect.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @model RedirectViewModel diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Shared/_Layout.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Shared/_Layout.cshtml index 81cb96fdc..46408e3e7 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Shared/_Layout.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Shared/_Layout.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @@ -9,7 +9,7 @@ Copyright (c) 2022 @Olivier Lefebvre - IdentityServer4 + Duende.IdentityServer diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Shared/_LoginPartial.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Shared/_LoginPartial.cshtml index 5790c1649..eea6c2d8a 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Shared/_LoginPartial.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Shared/_LoginPartial.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @using Microsoft.AspNetCore.Identity @using Aguacongas.TheIdServer.Models diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Shared/_Nav.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Shared/_Nav.cshtml index 874a97c31..bce6185b9 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Shared/_Nav.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Shared/_Nav.cshtml @@ -1,8 +1,8 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ -@using IdentityServer4.Extensions +@using Duende.IdentityServer.Extensions @{ string name = null; @@ -17,7 +17,7 @@ Copyright (c) 2022 @Olivier Lefebvre - IdentityServer4 + Duende.IdentityServer @if (!string.IsNullOrWhiteSpace(name)) diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Shared/_ScopeListItem.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Shared/_ScopeListItem.cshtml index 56bf578df..c6213a16e 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Shared/_ScopeListItem.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Shared/_ScopeListItem.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @model ScopeViewModel diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Shared/_ValidationSummary.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Shared/_ValidationSummary.cshtml index 47718e214..b8727370b 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Shared/_ValidationSummary.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/Shared/_ValidationSummary.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @if (ViewContext.ModelState.IsValid == false) { diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/_ViewImports.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/_ViewImports.cshtml index cfb90e211..8af44b7ce 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/_ViewImports.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/_ViewImports.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @using IdentityServerHost.Quickstart.UI @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/_ViewStart.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/_ViewStart.cshtml index 9b590867b..ef40b5682 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/_ViewStart.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/Views/_ViewStart.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @{ Layout = "_Layout"; diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/updateUI.ps1 b/sample/MultiTiers/Aguacongas.TheIdServer.Private/updateUI.ps1 index 51f8f002e..6d738d558 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/updateUI.ps1 +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/updateUI.ps1 @@ -1,4 +1,4 @@ -iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/IdentityServer/IdentityServer4.Quickstart.UI.AspNetIdentity/master/getmaster.ps1')) +iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/IdentityServer/Duende.IdentityServer.Quickstart.UI.AspNetIdentity/master/getmaster.ps1')) # SIG # Begin signature block # MIIfnQYJKoZIhvcNAQcCoIIfjjCCH4oCAQExDzANBglghkgBZQMEAgEFADB5Bgor # BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Private/wwwroot/js/signout-redirect.js b/sample/MultiTiers/Aguacongas.TheIdServer.Private/wwwroot/js/signout-redirect.js index 3d497358c..f55ca141a 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Private/wwwroot/js/signout-redirect.js +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Private/wwwroot/js/signout-redirect.js @@ -1,5 +1,5 @@ $(function () { - var a = document.querySelector("a.PostLogoutRedirectUri"); + const a = document.querySelector("a.PostLogoutRedirectUri"); if (a) { window.location = a.href; } diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Aguacongas.TheIdServer.Public.csproj b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Aguacongas.TheIdServer.Public.csproj index 44eb41613..c1852fdcf 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Aguacongas.TheIdServer.Public.csproj +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Aguacongas.TheIdServer.Public.csproj @@ -19,35 +19,32 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - + + - + - - - - - + + diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/IdentityHostingStartup.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/IdentityHostingStartup.cs index 429ea67e5..ae712572c 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/IdentityHostingStartup.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/IdentityHostingStartup.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Identity.UI.Services; using Microsoft.Extensions.DependencyInjection; diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/ConfirmEmail.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/ConfirmEmail.cshtml index 8dabd039a..d10d960aa 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/ConfirmEmail.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/ConfirmEmail.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @page @model ConfirmEmailModel diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs index ce5e0d649..263890128 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.TheIdServer.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Identity; diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/Register.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/Register.cshtml index 78e3776b0..2b7d2cf6c 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/Register.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/Register.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @page @model RegisterModel diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/Register.cshtml.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/Register.cshtml.cs index 5d936d839..5d3f01301 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/Register.cshtml.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/Register.cshtml.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.TheIdServer.Models; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml index ec784e41d..ea94da5c6 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @page @model RegisterConfirmationModel diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml.cs index 3f21c1b31..1e78a2bb8 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/_StatusMessage.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/_StatusMessage.cshtml index e753b0f6a..a703f3e07 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/_StatusMessage.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/_StatusMessage.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @model string diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/_ViewImports.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/_ViewImports.cshtml index efcea9222..fb5244579 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/_ViewImports.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/Account/_ViewImports.cshtml @@ -1,5 +1,5 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @using Aguacongas.TheIdServer.Areas.Identity.Pages.Account \ No newline at end of file diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml index bfd9c944b..d1b4d0bd8 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/_ViewImports.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/_ViewImports.cshtml index 3b35880a1..960b41a85 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/_ViewImports.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/_ViewImports.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @using Microsoft.AspNetCore.Identity @using Aguacongas.TheIdServer.Areas.Identity diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/_ViewStart.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/_ViewStart.cshtml index 2165833f2..cfbc7b3f4 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/_ViewStart.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Pages/_ViewStart.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @{ diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Services/AuthMessageSenderOptions.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Services/AuthMessageSenderOptions.cs index 70901c17f..a8ac2e605 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Services/AuthMessageSenderOptions.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Services/AuthMessageSenderOptions.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre namespace Aguacongas.TheIdServer.Areas.Identity { public class AuthMessageSenderOptions diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Services/EmailSender.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Services/EmailSender.cs index 05549eba6..79bb62803 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Services/EmailSender.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Areas/Identity/Services/EmailSender.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Microsoft.AspNetCore.Identity.UI.Services; using Microsoft.Extensions.Options; using SendGrid; diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Extensions/ApplicationBuilderExtensions.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Extensions/ApplicationBuilderExtensions.cs index 5453e6ef4..ca0f8cbb4 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Extensions/ApplicationBuilderExtensions.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Extensions/ApplicationBuilderExtensions.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.TheIdServer.Authentication; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Extensions/WebApplicationBuilderExtensions.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Extensions/WebApplicationBuilderExtensions.cs index 9fe668df4..b576ab32b 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Extensions/WebApplicationBuilderExtensions.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Extensions/WebApplicationBuilderExtensions.cs @@ -1,18 +1,16 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.IdentityServer; using Aguacongas.IdentityServer.Abstractions; using Aguacongas.IdentityServer.Admin.Options; using Aguacongas.IdentityServer.Admin.Services; using Aguacongas.TheIdServer.Authentication; using Aguacongas.TheIdServer.Models; +using Duende.IdentityServer.Services; using IdentityModel.AspNetCore.OAuth2Introspection; -using IdentityServer4.AccessTokenValidation; -using IdentityServer4.Services; using IdentityServerHost.Quickstart.UI; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -23,6 +21,7 @@ using System; using System.Collections.Generic; using System.Net.Http; +using System.Threading.Tasks; namespace Microsoft.AspNetCore.Builder { @@ -87,7 +86,7 @@ void configureOptions(IdentityServerOptions options) services.AddAuthorization(options => options.AddIdentityServerPolicies()) .AddAuthentication() - .AddIdentityServerAuthentication(JwtBearerDefaults.AuthenticationScheme, ConfigureIdentityServerAuthenticationOptions(configuration)); + .AddJwtBearer(JwtBearerDefaults.AuthenticationScheme, ConfigureIdentityServerAuthenticationOptions(configuration)); var mvcBuilder = services.Configure(configuration) .AddLocalization() @@ -110,40 +109,45 @@ void configureOptions(IdentityServerOptions options) return webApplicationBuilder; } - private static Action ConfigureIdentityServerAuthenticationOptions(IConfiguration configuration) + private static Action ConfigureIdentityServerAuthenticationOptions(IConfiguration configuration) => options => { configuration.GetSection("ApiAuthentication").Bind(options); if (configuration.GetValue("DisableStrictSsl")) { - options.JwtBackChannelHandler = new HttpClientHandler + options.BackchannelHttpHandler = new HttpClientHandler { #pragma warning disable S4830 // Server certificates should be verified during SSL/TLS connections ServerCertificateCustomValidationCallback = (message, cert, chain, policy) => true #pragma warning restore S4830 // Server certificates should be verified during SSL/TLS connections }; } - - static string tokenRetriever(HttpRequest request) + options.Audience = configuration["ApiAuthentication:ApiName"]; + options.Events = new JwtBearerEvents { - var path = request.Path; - var accessToken = TokenRetrieval.FromQueryString()(request); - if (path.StartsWithSegments("/providerhub") && !string.IsNullOrEmpty(accessToken)) - { - return accessToken; - } - var oneTimeToken = TokenRetrieval.FromQueryString("otk")(request); - if (!string.IsNullOrEmpty(oneTimeToken)) + OnMessageReceived = context => { - return request.HttpContext - .RequestServices - .GetRequiredService() - .GetOneTimeToken(oneTimeToken); + var request = context.HttpContext.Request; + var path = request.Path; + var accessToken = TokenRetrieval.FromQueryString()(request); + if (path.StartsWithSegments("/providerhub") && !string.IsNullOrEmpty(accessToken)) + { + context.Token = accessToken; + return Task.CompletedTask; + } + var oneTimeToken = TokenRetrieval.FromQueryString("otk")(request); + if (!string.IsNullOrEmpty(oneTimeToken)) + { + context.Token = request.HttpContext + .RequestServices + .GetRequiredService() + .ConsumeOneTimeToken(oneTimeToken); + return Task.CompletedTask; + } + context.Token = TokenRetrieval.FromAuthorizationHeader()(request); + return Task.CompletedTask; } - return TokenRetrieval.FromAuthorizationHeader()(request); - } - - options.TokenRetriever = tokenRetriever; + }; }; } } diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Program.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Program.cs index 4f625aa58..68f7e6e0f 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Program.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Program.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Microsoft.AspNetCore.Builder; using Serilog; diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Account/AccountController.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Account/AccountController.cs index cd30246a6..1ee69b41e 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Account/AccountController.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Account/AccountController.cs @@ -3,11 +3,11 @@ using IdentityModel; -using IdentityServer4.Events; -using IdentityServer4.Extensions; -using IdentityServer4.Models; -using IdentityServer4.Services; -using IdentityServer4.Stores; +using Duende.IdentityServer.Events; +using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Models; +using Duende.IdentityServer.Services; +using Duende.IdentityServer.Stores; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; @@ -217,7 +217,7 @@ private async Task BuildLoginViewModelAsync(string returnUrl) var context = await _interaction.GetAuthorizationContextAsync(returnUrl); if (context?.IdP != null && await _schemeProvider.GetSchemeAsync(context.IdP) != null) { - var local = context.IdP == IdentityServer4.IdentityServerConstants.LocalIdentityProvider; + var local = context.IdP == Duende.IdentityServer.IdentityServerConstants.LocalIdentityProvider; // this is meant to short circuit the UI and only trigger the one external IdP var vm = new LoginViewModel @@ -319,7 +319,7 @@ private async Task BuildLoggedOutViewModelAsync(string logou if (User?.Identity.IsAuthenticated == true) { var idp = User.FindFirst(JwtClaimTypes.IdentityProvider)?.Value; - if (idp != null && idp != IdentityServer4.IdentityServerConstants.LocalIdentityProvider) + if (idp != null && idp != Duende.IdentityServer.IdentityServerConstants.LocalIdentityProvider) { var providerSupportsSignout = await HttpContext.GetSchemeSupportsSignOutAsync(idp); if (providerSupportsSignout) diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Account/ExternalController.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Account/ExternalController.cs index 2f454ae73..eef1bc1a7 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Account/ExternalController.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Account/ExternalController.cs @@ -5,10 +5,10 @@ using System.Threading.Tasks; using Aguacongas.TheIdServer.Models; using IdentityModel; -using IdentityServer4; -using IdentityServer4.Events; -using IdentityServer4.Services; -using IdentityServer4.Stores; +using Duende.IdentityServer; +using Duende.IdentityServer.Events; +using Duende.IdentityServer.Services; +using Duende.IdentityServer.Stores; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Account/InvalidReturnUrlException.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Account/InvalidReturnUrlException.cs index 7354c8bff..d4aa6f918 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Account/InvalidReturnUrlException.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Account/InvalidReturnUrlException.cs @@ -1,9 +1,9 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using System; using System.Runtime.Serialization; -namespace IdentityServer4.Quickstart.UI +namespace Duende.IdentityServer.Quickstart.UI { /// /// Trowed when user click on malicious link diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Consent/ConsentController.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Consent/ConsentController.cs index 6c3aa44c7..7f5621f11 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Consent/ConsentController.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Consent/ConsentController.cs @@ -2,16 +2,16 @@ // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information. -using IdentityServer4.Events; -using IdentityServer4.Models; -using IdentityServer4.Services; -using IdentityServer4.Extensions; +using Duende.IdentityServer.Events; +using Duende.IdentityServer.Models; +using Duende.IdentityServer.Services; +using Duende.IdentityServer.Extensions; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using System.Linq; using System.Threading.Tasks; -using IdentityServer4.Validation; +using Duende.IdentityServer.Validation; using System.Collections.Generic; using System; @@ -120,7 +120,7 @@ private async Task ProcessConsent(ConsentInputModel model) var scopes = model.ScopesConsented; if (ConsentOptions.EnableOfflineAccess == false) { - scopes = scopes.Where(x => x != IdentityServer4.IdentityServerConstants.StandardScopes.OfflineAccess); + scopes = scopes.Where(x => x != Duende.IdentityServer.IdentityServerConstants.StandardScopes.OfflineAccess); } grantedConsent = new ConsentResponse @@ -208,7 +208,7 @@ private ConsentViewModel CreateConsentViewModel( } if (ConsentOptions.EnableOfflineAccess && request.ValidatedResources.Resources.OfflineAccess) { - apiScopes.Add(GetOfflineAccessScope(vm.ScopesConsented.Contains(IdentityServer4.IdentityServerConstants.StandardScopes.OfflineAccess) || model == null)); + apiScopes.Add(GetOfflineAccessScope(vm.ScopesConsented.Contains(Duende.IdentityServer.IdentityServerConstants.StandardScopes.OfflineAccess) || model == null)); } vm.ApiScopes = apiScopes; @@ -251,7 +251,7 @@ private ScopeViewModel GetOfflineAccessScope(bool check) { return new ScopeViewModel { - Value = IdentityServer4.IdentityServerConstants.StandardScopes.OfflineAccess, + Value = Duende.IdentityServer.IdentityServerConstants.StandardScopes.OfflineAccess, DisplayName = ConsentOptions.OfflineAccessDisplayName, Description = ConsentOptions.OfflineAccessDescription, Emphasize = true, diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Consent/ProcessConsentResult.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Consent/ProcessConsentResult.cs index 1d331df04..e18d8f54e 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Consent/ProcessConsentResult.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Consent/ProcessConsentResult.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information. -using IdentityServer4.Models; +using Duende.IdentityServer.Models; namespace IdentityServerHost.Quickstart.UI { diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Device/DeviceController.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Device/DeviceController.cs index d7d07aeb9..f27b45afc 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Device/DeviceController.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Device/DeviceController.cs @@ -6,12 +6,12 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using IdentityServer4.Configuration; -using IdentityServer4.Events; -using IdentityServer4.Extensions; -using IdentityServer4.Models; -using IdentityServer4.Services; -using IdentityServer4.Validation; +using Duende.IdentityServer.Configuration; +using Duende.IdentityServer.Events; +using Duende.IdentityServer.Extensions; +using Duende.IdentityServer.Models; +using Duende.IdentityServer.Services; +using Duende.IdentityServer.Validation; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; @@ -102,7 +102,7 @@ private async Task ProcessConsent(DeviceAuthorizationInput var scopes = model.ScopesConsented; if (ConsentOptions.EnableOfflineAccess == false) { - scopes = scopes.Where(x => x != IdentityServer4.IdentityServerConstants.StandardScopes.OfflineAccess); + scopes = scopes.Where(x => x != Duende.IdentityServer.IdentityServerConstants.StandardScopes.OfflineAccess); } grantedConsent = new ConsentResponse @@ -184,7 +184,7 @@ private DeviceAuthorizationViewModel CreateConsentViewModel(string userCode, Dev } if (ConsentOptions.EnableOfflineAccess && request.ValidatedResources.Resources.OfflineAccess) { - apiScopes.Add(GetOfflineAccessScope(vm.ScopesConsented.Contains(IdentityServer4.IdentityServerConstants.StandardScopes.OfflineAccess) || model == null)); + apiScopes.Add(GetOfflineAccessScope(vm.ScopesConsented.Contains(Duende.IdentityServer.IdentityServerConstants.StandardScopes.OfflineAccess) || model == null)); } vm.ApiScopes = apiScopes; @@ -221,7 +221,7 @@ private ScopeViewModel GetOfflineAccessScope(bool check) { return new ScopeViewModel { - Value = IdentityServer4.IdentityServerConstants.StandardScopes.OfflineAccess, + Value = Duende.IdentityServer.IdentityServerConstants.StandardScopes.OfflineAccess, DisplayName = ConsentOptions.OfflineAccessDisplayName, Description = ConsentOptions.OfflineAccessDescription, Emphasize = true, diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Diagnostics/DiagnosticsViewModel.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Diagnostics/DiagnosticsViewModel.cs index f43c7685b..be2682fa1 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Diagnostics/DiagnosticsViewModel.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Diagnostics/DiagnosticsViewModel.cs @@ -16,14 +16,15 @@ public DiagnosticsViewModel(AuthenticateResult result) { AuthenticateResult = result; - if (result.Properties.Items.ContainsKey("client_list")) + if (!result.Properties.Items.TryGetValue("client_list", out string encoded)) { - var encoded = result.Properties.Items["client_list"]; - var bytes = Base64Url.Decode(encoded); - var value = Encoding.UTF8.GetString(bytes); - - Clients = JsonConvert.DeserializeObject(value); + return; } + + var bytes = Base64Url.Decode(encoded); + var value = Encoding.UTF8.GetString(bytes); + + Clients = JsonConvert.DeserializeObject(value); } public AuthenticateResult AuthenticateResult { get; } diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Extensions.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Extensions.cs index 6c720b707..d441f5288 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Extensions.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Extensions.cs @@ -1,5 +1,5 @@ using System; -using IdentityServer4.Models; +using Duende.IdentityServer.Models; using Microsoft.AspNetCore.Mvc; namespace IdentityServerHost.Quickstart.UI diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Grants/GrantsController.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Grants/GrantsController.cs index 128ce5921..0e5d7c395 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Grants/GrantsController.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Grants/GrantsController.cs @@ -2,15 +2,15 @@ // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information. -using IdentityServer4.Services; -using IdentityServer4.Stores; +using Duende.IdentityServer.Services; +using Duende.IdentityServer.Stores; using Microsoft.AspNetCore.Mvc; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; -using IdentityServer4.Events; -using IdentityServer4.Extensions; +using Duende.IdentityServer.Events; +using Duende.IdentityServer.Extensions; namespace IdentityServerHost.Quickstart.UI { diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Home/ErrorViewModel.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Home/ErrorViewModel.cs index 7d2cbe3a3..26529a5ee 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Home/ErrorViewModel.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Home/ErrorViewModel.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information. -using IdentityServer4.Models; +using Duende.IdentityServer.Models; namespace IdentityServerHost.Quickstart.UI { diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Home/HomeController.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Home/HomeController.cs index 9cf067895..937ac19c2 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Home/HomeController.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/Home/HomeController.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information. -using IdentityServer4.Services; +using Duende.IdentityServer.Services; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/TestUsers.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/TestUsers.cs index 4f9fc7f45..cf23a2360 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/TestUsers.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Quickstart/TestUsers.cs @@ -3,7 +3,7 @@ using IdentityModel; -using IdentityServer4.Test; +using Duende.IdentityServer.Test; using System.Collections.Generic; using System.Security.Claims; @@ -22,7 +22,7 @@ public class TestUsers new Claim(JwtClaimTypes.Email, "AliceSmith@email.com"), new Claim(JwtClaimTypes.EmailVerified, "true", ClaimValueTypes.Boolean), new Claim(JwtClaimTypes.WebSite, "http://alice.com"), - new Claim(JwtClaimTypes.Address, @"{ 'street_address': 'One Hacker Way', 'locality': 'Heidelberg', 'postal_code': 69118, 'country': 'Germany' }", IdentityServer4.IdentityServerConstants.ClaimValueTypes.Json) + new Claim(JwtClaimTypes.Address, @"{ 'street_address': 'One Hacker Way', 'locality': 'Heidelberg', 'postal_code': 69118, 'country': 'Germany' }", Duende.IdentityServer.IdentityServerConstants.ClaimValueTypes.Json) } }, new TestUser{SubjectId = "88421113", Username = "bob", Password = "bob", @@ -34,7 +34,7 @@ public class TestUsers new Claim(JwtClaimTypes.Email, "BobSmith@email.com"), new Claim(JwtClaimTypes.EmailVerified, "true", ClaimValueTypes.Boolean), new Claim(JwtClaimTypes.WebSite, "http://bob.com"), - new Claim(JwtClaimTypes.Address, @"{ 'street_address': 'One Hacker Way', 'locality': 'Heidelberg', 'postal_code': 69118, 'country': 'Germany' }", IdentityServer4.IdentityServerConstants.ClaimValueTypes.Json), + new Claim(JwtClaimTypes.Address, @"{ 'street_address': 'One Hacker Way', 'locality': 'Heidelberg', 'postal_code': 69118, 'country': 'Germany' }", Duende.IdentityServer.IdentityServerConstants.ClaimValueTypes.Json), new Claim("location", "somewhere") } } diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/SameSiteCookiesServiceCollectionExtensions.cs b/sample/MultiTiers/Aguacongas.TheIdServer.Public/SameSiteCookiesServiceCollectionExtensions.cs index 7314baf01..beb80bf30 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/SameSiteCookiesServiceCollectionExtensions.cs +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/SameSiteCookiesServiceCollectionExtensions.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Home/Index.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Home/Index.cshtml index 36b2bfc3a..71488fb50 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Home/Index.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Home/Index.cshtml @@ -1,13 +1,13 @@ @using System.Diagnostics @{ - var version = FileVersionInfo.GetVersionInfo(typeof(IdentityServer4.Hosting.IdentityServerMiddleware).Assembly.Location).ProductVersion.Split('+').First(); + var version = FileVersionInfo.GetVersionInfo(typeof(Duende.IdentityServer.Hosting.IdentityServerMiddleware).Assembly.Location).ProductVersion.Split('+').First(); }

    - Welcome to IdentityServer4 + Welcome to Duende.IdentityServer (version @version)

    @@ -25,8 +25,8 @@
  • Here are links to the - source code repository, - and ready to use samples. + source code repository, + and ready to use samples.
    • diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Shared/Error.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Shared/Error.cshtml index aa0ca98fd..0e40e8679 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Shared/Error.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Shared/Error.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @model ErrorViewModel diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Shared/Redirect.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Shared/Redirect.cshtml index cec777b10..7c7dffd86 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Shared/Redirect.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Shared/Redirect.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @model RedirectViewModel diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Shared/_Layout.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Shared/_Layout.cshtml index 81cb96fdc..46408e3e7 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Shared/_Layout.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Shared/_Layout.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @@ -9,7 +9,7 @@ Copyright (c) 2022 @Olivier Lefebvre - IdentityServer4 + Duende.IdentityServer diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Shared/_LoginPartial.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Shared/_LoginPartial.cshtml index 5790c1649..eea6c2d8a 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Shared/_LoginPartial.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Shared/_LoginPartial.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @using Microsoft.AspNetCore.Identity @using Aguacongas.TheIdServer.Models diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Shared/_Nav.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Shared/_Nav.cshtml index 874a97c31..bce6185b9 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Shared/_Nav.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Shared/_Nav.cshtml @@ -1,8 +1,8 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ -@using IdentityServer4.Extensions +@using Duende.IdentityServer.Extensions @{ string name = null; @@ -17,7 +17,7 @@ Copyright (c) 2022 @Olivier Lefebvre - IdentityServer4 + Duende.IdentityServer @if (!string.IsNullOrWhiteSpace(name)) diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Shared/_ScopeListItem.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Shared/_ScopeListItem.cshtml index 56bf578df..c6213a16e 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Shared/_ScopeListItem.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Shared/_ScopeListItem.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @model ScopeViewModel diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Shared/_ValidationSummary.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Shared/_ValidationSummary.cshtml index 47718e214..b8727370b 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Shared/_ValidationSummary.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/Shared/_ValidationSummary.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @if (ViewContext.ModelState.IsValid == false) { diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/_ViewImports.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/_ViewImports.cshtml index cfb90e211..8af44b7ce 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/_ViewImports.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/_ViewImports.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @using IdentityServerHost.Quickstart.UI @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/_ViewStart.cshtml b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/_ViewStart.cshtml index 9b590867b..ef40b5682 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/_ViewStart.cshtml +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/Views/_ViewStart.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @{ Layout = "_Layout"; diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/updateUI.ps1 b/sample/MultiTiers/Aguacongas.TheIdServer.Public/updateUI.ps1 index 51f8f002e..6d738d558 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/updateUI.ps1 +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/updateUI.ps1 @@ -1,4 +1,4 @@ -iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/IdentityServer/IdentityServer4.Quickstart.UI.AspNetIdentity/master/getmaster.ps1')) +iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/IdentityServer/Duende.IdentityServer.Quickstart.UI.AspNetIdentity/master/getmaster.ps1')) # SIG # Begin signature block # MIIfnQYJKoZIhvcNAQcCoIIfjjCCH4oCAQExDzANBglghkgBZQMEAgEFADB5Bgor # BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG diff --git a/sample/MultiTiers/Aguacongas.TheIdServer.Public/wwwroot/js/signout-redirect.js b/sample/MultiTiers/Aguacongas.TheIdServer.Public/wwwroot/js/signout-redirect.js index 3d497358c..f55ca141a 100644 --- a/sample/MultiTiers/Aguacongas.TheIdServer.Public/wwwroot/js/signout-redirect.js +++ b/sample/MultiTiers/Aguacongas.TheIdServer.Public/wwwroot/js/signout-redirect.js @@ -1,5 +1,5 @@ $(function () { - var a = document.querySelector("a.PostLogoutRedirectUri"); + const a = document.querySelector("a.PostLogoutRedirectUri"); if (a) { window.location = a.href; } diff --git a/sample/terraform/main.tf b/sample/terraform/main.tf index 9c2763fb8..f02ec0761 100644 --- a/sample/terraform/main.tf +++ b/sample/terraform/main.tf @@ -41,7 +41,7 @@ locals { key = "agentpool" operator = "In" values = [ - "userpool" + "agentpool" ] }] }] @@ -68,6 +68,12 @@ locals { seq = { # set node affinity to userpool nodes affinity = local.affinity + ingress = { + annotations = { + "kubernetes.io/ingress.class" = "azure/application-gateway" + "cert-manager.io/cluster-issuer" = "letsencrypt" + } + } } mysql = { image = { @@ -102,12 +108,15 @@ locals { # ingress annotations ingress = { annotations = { - "kubernetes.io/ingress.class" = "nginx" + "kubernetes.io/ingress.class" = "azure/application-gateway" "cert-manager.io/cluster-issuer" = "letsencrypt" - "nginx.ingress.kubernetes.io/auth-tls-pass-certificate-to-upstream" = "true" - "nginx.ingress.kubernetes.io/backend-protocol" = "HTTPS" - "nginx.ingress.kubernetes.io/auth-tls-verify-client" = "off" } + tls = [{ + hosts = [ + "${format("www.%s", local.host)}" + ] + secretName = "theidserver-certs" + }] } appSettings = { file = { @@ -230,32 +239,63 @@ locals { wait = false } -# Install ingress-nginx -resource "helm_release" "nginx_ingress" { - name = "nginx-ingress" - repository = "https://kubernetes.github.io/ingress-nginx" - chart = "ingress-nginx" - version = "4.1.1" - namespace = "ingress-nginx" +# Install AAD Pod Identity +resource "helm_release" "aad_pod_identity" { + name = "aad-pod-identity" + repository = "https://raw.githubusercontent.com/Azure/aad-pod-identity/master/charts/" + chart = "aad-pod-identity" + namespace = "ingress-azure" create_namespace = true +} + +# Install ingress-azure +resource "helm_release" "azure_ingress" { + name = "ingress-azure" + repository = "https://appgwingress.blob.core.windows.net/ingress-azure-helm-package/" + chart = "ingress-azure" + namespace = "ingress-azure" + create_namespace = true + + set { + name = "appgw.name" + value = "applicationgateway5f3a" + } - # enable ssl passthrough to have end-to-end encryption set { - name = "controller.extraArgs.enable-ssl-passthrough" - value = true + name = "appgw.resourceGroup" + value = "K8S" } + set { + name = "appgw.subscriptionId" + value = "7cd7a404-3a0a-41bd-996b-cc3248e8c292" + } + + set { + name = "appgw.share" + value = false + } + + set { + name = "armAuth.type" + value = "servicePrincipal" + } + + set { + name = "armAuth.secretJSON" + value = "ew0KICAiY2xpZW50SWQiOiAiNWZiZTI4YWYtMWExNC00NjIxLWI0OTUtMWFkMzFhNWYwMzM2IiwNCiAgImNsaWVudFNlY3JldCI6ICJwd0VncDVhLWc5eEhMN0hEd0RpNzhxb340U3E4aEU5U2x+IiwNCiAgInN1YnNjcmlwdGlvbklkIjogIjdjZDdhNDA0LTNhMGEtNDFiZC05OTZiLWNjMzI0OGU4YzI5MiIsDQogICJ0ZW5hbnRJZCI6ICI5YjZiNDM4Zi03MjUyLTQ0MDEtODUyZi05NTJmODYwYTA4NTkiLA0KICAiYWN0aXZlRGlyZWN0b3J5RW5kcG9pbnRVcmwiOiAiaHR0cHM6Ly9sb2dpbi5taWNyb3NvZnRvbmxpbmUuY29tIiwNCiAgInJlc291cmNlTWFuYWdlckVuZHBvaW50VXJsIjogImh0dHBzOi8vbWFuYWdlbWVudC5henVyZS5jb20vIiwNCiAgImFjdGl2ZURpcmVjdG9yeUdyYXBoUmVzb3VyY2VJZCI6ICJodHRwczovL2dyYXBoLndpbmRvd3MubmV0LyIsDQogICJzcWxNYW5hZ2VtZW50RW5kcG9pbnRVcmwiOiAiaHR0cHM6Ly9tYW5hZ2VtZW50LmNvcmUud2luZG93cy5uZXQ6ODQ0My8iLA0KICAiZ2FsbGVyeUVuZHBvaW50VXJsIjogImh0dHBzOi8vZ2FsbGVyeS5henVyZS5jb20vIiwNCiAgIm1hbmFnZW1lbnRFbmRwb2ludFVybCI6ICJodHRwczovL21hbmFnZW1lbnQuY29yZS53aW5kb3dzLm5ldC8iDQp9DQo=" + } + wait = local.wait } - # Install cert_manager to manage TLS certificates with letsencrypt resource "helm_release" "cert_manager" { name = "cert-manager" repository = "https://charts.jetstack.io" chart = "cert-manager" - version = "1.7.2" - namespace = "ingress-nginx" + version = "1.8.0" + namespace = "cert-manager" create_namespace = true # uncomment it on 1st deploy @@ -268,18 +308,6 @@ resource "helm_release" "cert_manager" { wait = local.wait } -# Instal wave to restart nodes on config changes -resource "helm_release" "wave" { - name = "wave" - repository = "https://wave-k8s.github.io/wave/" - chart = "wave" - version = "2.0.0" - namespace = "wave" - create_namespace = true - - wait = local.wait -} - # creates ClusterIssuer resource "kubernetes_manifest" "cluster_issuer" { manifest = { @@ -298,7 +326,7 @@ resource "kubernetes_manifest" "cluster_issuer" { solvers = [{ http01 = { ingress = { - class = "nginx" + class = "azure/application-gateway" } } }] diff --git a/src/Aguacongas.TheIdServer.Authentication/Aguacongas.TheIdServer.Authentication.csproj b/src/Aguacongas.TheIdServer.Authentication/Aguacongas.TheIdServer.Authentication.csproj index 6da13d8fc..4958f4902 100644 --- a/src/Aguacongas.TheIdServer.Authentication/Aguacongas.TheIdServer.Authentication.csproj +++ b/src/Aguacongas.TheIdServer.Authentication/Aguacongas.TheIdServer.Authentication.csproj @@ -3,7 +3,7 @@ net7.0 Olivier Lefebvre - Copyright (c) 2022 @Olivier Lefebvre + Copyright (c) 2023 @Olivier Lefebvre Apache-2.0 https://github.com/Aguafrommars/TheIdServer/tree/master/src/Aguacongas.TheIdServer.Authentication https://github.com/Aguafrommars/TheIdServer diff --git a/src/Aguacongas.TheIdServer.Authentication/DynamicAuthenticationBuilderExtensions.cs b/src/Aguacongas.TheIdServer.Authentication/DynamicAuthenticationBuilderExtensions.cs index f5ebb4b3e..bb9a88000 100644 --- a/src/Aguacongas.TheIdServer.Authentication/DynamicAuthenticationBuilderExtensions.cs +++ b/src/Aguacongas.TheIdServer.Authentication/DynamicAuthenticationBuilderExtensions.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.AspNetCore.Authentication; using Aguacongas.TheIdServer.Authentication; diff --git a/src/Aguacongas.TheIdServer.Authentication/DynamicProviderStore.cs b/src/Aguacongas.TheIdServer.Authentication/DynamicProviderStore.cs index 3ad4aacae..5c60df441 100644 --- a/src/Aguacongas.TheIdServer.Authentication/DynamicProviderStore.cs +++ b/src/Aguacongas.TheIdServer.Authentication/DynamicProviderStore.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.AspNetCore.Authentication; using Aguacongas.IdentityServer.Store; using Aguacongas.IdentityServer.Store.Entity; diff --git a/src/Aguacongas.TheIdServer.Authentication/SchemeDefinition.cs b/src/Aguacongas.TheIdServer.Authentication/SchemeDefinition.cs index e15f9f206..d9ace71b3 100644 --- a/src/Aguacongas.TheIdServer.Authentication/SchemeDefinition.cs +++ b/src/Aguacongas.TheIdServer.Authentication/SchemeDefinition.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.AspNetCore.Authentication; namespace Aguacongas.TheIdServer.Authentication diff --git a/src/Aguacongas.TheIdServer.BlazorApp/Aguacongas.TheIdServer.BlazorApp.csproj b/src/Aguacongas.TheIdServer.BlazorApp/Aguacongas.TheIdServer.BlazorApp.csproj index b879e7562..53ca75ae3 100644 --- a/src/Aguacongas.TheIdServer.BlazorApp/Aguacongas.TheIdServer.BlazorApp.csproj +++ b/src/Aguacongas.TheIdServer.BlazorApp/Aguacongas.TheIdServer.BlazorApp.csproj @@ -1,9 +1,9 @@ - + net7.0 Olivier Lefebvre - Copyright (c) 2022 @Olivier Lefebvre + Copyright (c) 2023 @Olivier Lefebvre Apache-2.0 true https://github.com/Aguafrommars/TheIdServer/tree/master/src/Aguacongas.TheIdServer.BlazorApp @@ -16,7 +16,7 @@ enable enable - false + true @@ -36,8 +36,8 @@ - - + + diff --git a/src/Aguacongas.TheIdServer.BlazorApp/App.razor b/src/Aguacongas.TheIdServer.BlazorApp/App.razor index f179c46a7..23f3005dc 100644 --- a/src/Aguacongas.TheIdServer.BlazorApp/App.razor +++ b/src/Aguacongas.TheIdServer.BlazorApp/App.razor @@ -3,6 +3,8 @@ @using Microsoft.Extensions.Logging @inject LazyAssemblyLoader _assemblyLoader @inject ILogger _logger +@inject ThemeService _themeService + diff --git a/src/Aguacongas.TheIdServer.BlazorApp/App.razor.cs b/src/Aguacongas.TheIdServer.BlazorApp/App.razor.cs index 20fb43c94..aaea11976 100644 --- a/src/Aguacongas.TheIdServer.BlazorApp/App.razor.cs +++ b/src/Aguacongas.TheIdServer.BlazorApp/App.razor.cs @@ -1,5 +1,6 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre +using Aguacongas.TheIdServer.BlazorApp.Services; using Microsoft.AspNetCore.Components.Routing; using System.Reflection; @@ -30,7 +31,13 @@ public partial class App "Settings" }; - private Task OnNavigateAsync(NavigationContext args) + protected override async Task OnInitializedAsync() + { + await base.OnInitializedAsync().ConfigureAwait(false); + await _themeService.InitAsync().ConfigureAwait(false); + } + + private Task OnNavigateAsync(NavigationContext args) { var path = args.Path.Split("/")[0]; if (path == "protectresource") diff --git a/src/Aguacongas.TheIdServer.BlazorApp/GlobalSuppressions.cs b/src/Aguacongas.TheIdServer.BlazorApp/GlobalSuppressions.cs index d4120dba2..47d0d2633 100644 --- a/src/Aguacongas.TheIdServer.BlazorApp/GlobalSuppressions.cs +++ b/src/Aguacongas.TheIdServer.BlazorApp/GlobalSuppressions.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using System.Diagnostics.CodeAnalysis; [assembly: SuppressMessage("Globalization", "CA1303:Do not pass literals as localized parameters", Justification = "")] diff --git a/src/Aguacongas.TheIdServer.BlazorApp/Program.cs b/src/Aguacongas.TheIdServer.BlazorApp/Program.cs index 8a9726341..35a4d3f63 100644 --- a/src/Aguacongas.TheIdServer.BlazorApp/Program.cs +++ b/src/Aguacongas.TheIdServer.BlazorApp/Program.cs @@ -1,7 +1,8 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.TheIdServer.BlazorApp; using Aguacongas.TheIdServer.BlazorApp.Models; +using Microsoft.AspNetCore.Components.Web; using Microsoft.AspNetCore.Components.WebAssembly.Hosting; using Microsoft.JSInterop; using System.Globalization; @@ -12,7 +13,9 @@ var settings = configuration.Get(); if (settings?.Prerendered == false) { - builder.RootComponents.Add("app"); + var rootComponents = builder.RootComponents; + rootComponents.Add(settings.HostElementIdentifier); + rootComponents.Add("head::after"); } var host = builder.Build(); diff --git a/src/Aguacongas.TheIdServer.BlazorApp/README.md b/src/Aguacongas.TheIdServer.BlazorApp/README.md index 9b3e6c256..ab0f5abe5 100644 --- a/src/Aguacongas.TheIdServer.BlazorApp/README.md +++ b/src/Aguacongas.TheIdServer.BlazorApp/README.md @@ -67,7 +67,16 @@ The application obtains its configuration from appsettings.json and the environm "redirectUri": "https://localhost:5443/authentication/login-callback", "responseType": "code" }, - "welcomeContenUrl": "/welcome-fragment.html" + "settingsOptions": { + "typeName": "Aguacongas.TheIdServer.BlazorApp.Models.ServerConfig, Aguacongas.TheIdServer.BlazorApp.Infrastructure", + "apiUrl": "https://localhost:5443/api/api/configuration" + }, + "menuOptions": { + "showSettings": true + }, + "welcomeContenUrl": "https://localhost:5443/welcome-fragment.html", + "serverSideSessionEnabled": false, + "cibaEnabled": false } ``` @@ -149,12 +158,18 @@ This endpoint should return an HTML fragment.

    ``` -## Client and API secrets +## UI Options +### Hide settings menu + +To hide the settings menu, unset **menuOptions:showSettings**. + +### Hide CIBA grant type + +If CIBA is not enabled you can hide the CIBA grant type by unsetting cibaEnabled options. -The application doesn't generate secrets. Shared Secrets or x509 certificates require conversion before storing. +### Hide coordinate lifetime with user session checkbox -* Convert a SharedSecret to SHA256 value. -* Convert an X509 certificate to Base64 string. +If server side sessions are not enable you can hide the coordinate lifetime with user session checkbox in client tokens section by unsetting serverSideSessionEnabled options. ## Additional resources diff --git a/src/Aguacongas.TheIdServer.BlazorApp/Shared/MainLayout.razor b/src/Aguacongas.TheIdServer.BlazorApp/Shared/MainLayout.razor index 1d6130c48..b66a67684 100644 --- a/src/Aguacongas.TheIdServer.BlazorApp/Shared/MainLayout.razor +++ b/src/Aguacongas.TheIdServer.BlazorApp/Shared/MainLayout.razor @@ -3,18 +3,25 @@ @inherits LayoutComponentBase -
    +
    -
    -
    +
    +
    +
    -
    - @Body + @if (IsClientSide) + { + @Body + } + else + { + + }
    diff --git a/src/Aguacongas.TheIdServer.BlazorApp/Shared/MainLayout.razor.cs b/src/Aguacongas.TheIdServer.BlazorApp/Shared/MainLayout.razor.cs new file mode 100644 index 000000000..34bccefbc --- /dev/null +++ b/src/Aguacongas.TheIdServer.BlazorApp/Shared/MainLayout.razor.cs @@ -0,0 +1,9 @@ +using System.Runtime.InteropServices; + +namespace Aguacongas.TheIdServer.BlazorApp.Shared +{ + public partial class MainLayout + { + static bool IsClientSide => RuntimeInformation.IsOSPlatform(OSPlatform.Create("BROWSER")); + } +} diff --git a/src/Aguacongas.TheIdServer.BlazorApp/wwwroot/appsettings.Development.json b/src/Aguacongas.TheIdServer.BlazorApp/wwwroot/appsettings.Development.json index 8b36c14ce..3c822672a 100644 --- a/src/Aguacongas.TheIdServer.BlazorApp/wwwroot/appsettings.Development.json +++ b/src/Aguacongas.TheIdServer.BlazorApp/wwwroot/appsettings.Development.json @@ -16,5 +16,7 @@ "postLogoutRedirectUri": "https://localhost:5443/authentication/logout-callback", "redirectUri": "https://localhost:5443/authentication/login-callback" }, - "welcomeContenUrl": "https://localhost:5443/api/welcomefragment" + "welcomeContenUrl": "https://localhost:5443/api/welcomefragment", + "serverSideSessionEnabled": true, + "cibaEnabled": true } diff --git a/src/Aguacongas.TheIdServer.BlazorApp/wwwroot/appsettings.heroku-duende.json b/src/Aguacongas.TheIdServer.BlazorApp/wwwroot/appsettings.heroku-duende.json index 98af711a1..11c72fca8 100644 --- a/src/Aguacongas.TheIdServer.BlazorApp/wwwroot/appsettings.heroku-duende.json +++ b/src/Aguacongas.TheIdServer.BlazorApp/wwwroot/appsettings.heroku-duende.json @@ -22,5 +22,7 @@ "postLogoutRedirectUri": "https://theidserver-duende.herokuapp.com/authentication/logout-callback", "redirectUri": "https://theidserver-duende.herokuapp.com/authentication/login-callback" }, - "welcomeContenUrl": "https://theidserver-duende.herokuapp.com/api/welcomefragment" + "welcomeContenUrl": "https://theidserver-duende.herokuapp.com/api/welcomefragment", + "serverSideSessionEnabled": true, + "cibaEnabled": true } diff --git a/src/Aguacongas.TheIdServer.BlazorApp/wwwroot/appsettings.heroku.json b/src/Aguacongas.TheIdServer.BlazorApp/wwwroot/appsettings.heroku.json index 74f4f5a55..9b0b8afe1 100644 --- a/src/Aguacongas.TheIdServer.BlazorApp/wwwroot/appsettings.heroku.json +++ b/src/Aguacongas.TheIdServer.BlazorApp/wwwroot/appsettings.heroku.json @@ -22,5 +22,7 @@ "postLogoutRedirectUri": "https://theidserver.herokuapp.com/authentication/logout-callback", "redirectUri": "https://theidserver.herokuapp.com/authentication/login-callback" }, - "welcomeContenUrl": "https://theidserver.herokuapp.com/api/welcomefragment" + "welcomeContenUrl": "https://theidserver.herokuapp.com/api/welcomefragment", + "serverSideSessionEnabled": false, + "cibaEnabled": false } diff --git a/src/Aguacongas.TheIdServer.BlazorApp/wwwroot/appsettings.json b/src/Aguacongas.TheIdServer.BlazorApp/wwwroot/appsettings.json index 8e14a38fd..6287195a2 100644 --- a/src/Aguacongas.TheIdServer.BlazorApp/wwwroot/appsettings.json +++ b/src/Aguacongas.TheIdServer.BlazorApp/wwwroot/appsettings.json @@ -31,5 +31,7 @@ }, "menuOptions": { "showSettings": true - } + }, + "serverSideSessionEnabled": true, + "cibaEnabled": true } diff --git a/src/Aguacongas.TheIdServer.BlazorApp/wwwroot/css/app.css b/src/Aguacongas.TheIdServer.BlazorApp/wwwroot/css/app.css index 4e1b94abb..efa1a7d30 100644 --- a/src/Aguacongas.TheIdServer.BlazorApp/wwwroot/css/app.css +++ b/src/Aguacongas.TheIdServer.BlazorApp/wwwroot/css/app.css @@ -33,8 +33,6 @@ span.input-group-text.oi { } .main .top-row { - background-color: #e6e6e6; - border-bottom: 1px solid #d6d5d5; justify-content: flex-end; } @@ -42,11 +40,6 @@ span.input-group-text.oi { white-space: nowrap; } -.sidebar .top-row { - background-color: #e6e6e6; - border-bottom: 1px solid #d6d5d5; -} - .sidebar .navbar-brand { font-size: 1.1rem; } @@ -72,7 +65,6 @@ span.input-group-text.oi { } .nav-item a { - color: #373737; border-radius: 4px; height: 3rem; display: flex; @@ -82,17 +74,14 @@ span.input-group-text.oi { .nav-item a.active { background-color: rgba(0,0,0,0.25); - color: black; } .nav-item a:hover { background-color: rgba(0,0,0,0.1); - color: black; } .nav-text { font-size: 0.9rem; - color: #969595; } .content { @@ -213,6 +202,7 @@ span.input-group-text.oi { position: sticky; top: 0; overflow-y: auto; + overflow-x: hidden; } .sidebar .collapse { diff --git a/src/Aguacongas.TheIdServer.BlazorApp/wwwroot/index.html b/src/Aguacongas.TheIdServer.BlazorApp/wwwroot/index.html index 709f65b4b..f6bf7c88c 100644 --- a/src/Aguacongas.TheIdServer.BlazorApp/wwwroot/index.html +++ b/src/Aguacongas.TheIdServer.BlazorApp/wwwroot/index.html @@ -1,17 +1,17 @@  - + TheIdServer Admin - + - + - +
    diff --git a/src/Aguacongas.TheIdServer.Duende/Aguacongas.TheIdServer.Duende.csproj b/src/Aguacongas.TheIdServer.Duende/Aguacongas.TheIdServer.Duende.csproj index 9834f6fcf..361ebf183 100644 --- a/src/Aguacongas.TheIdServer.Duende/Aguacongas.TheIdServer.Duende.csproj +++ b/src/Aguacongas.TheIdServer.Duende/Aguacongas.TheIdServer.Duende.csproj @@ -7,15 +7,17 @@ ..\.. True + + ..\..\.sonarlint\aguacongas_theidservercsharp.ruleset - $(DefineConstants)TRACE;DUENDE + $(DefineConstants)TRACE 1701;1702;NU1603 - $(DefineConstants)TRACE;DUENDE + $(DefineConstants)TRACE 1701;1702;NU1603 @@ -24,89 +26,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - Always - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -117,10 +43,11 @@ + - + diff --git a/src/Aguacongas.TheIdServer.Shared/Areas/Identity/IdentityHostingStartup.cs b/src/Aguacongas.TheIdServer.Duende/Areas/Identity/IdentityHostingStartup.cs similarity index 100% rename from src/Aguacongas.TheIdServer.Shared/Areas/Identity/IdentityHostingStartup.cs rename to src/Aguacongas.TheIdServer.Duende/Areas/Identity/IdentityHostingStartup.cs diff --git a/src/Aguacongas.TheIdServer.Shared/Areas/Identity/Pages/Account/LoginWith2fa.cshtml b/src/Aguacongas.TheIdServer.Duende/Areas/Identity/Pages/Account/LoginWith2fa.cshtml similarity index 98% rename from src/Aguacongas.TheIdServer.Shared/Areas/Identity/Pages/Account/LoginWith2fa.cshtml rename to src/Aguacongas.TheIdServer.Duende/Areas/Identity/Pages/Account/LoginWith2fa.cshtml index 2406ae358..e331ec798 100644 --- a/src/Aguacongas.TheIdServer.Shared/Areas/Identity/Pages/Account/LoginWith2fa.cshtml +++ b/src/Aguacongas.TheIdServer.Duende/Areas/Identity/Pages/Account/LoginWith2fa.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @page @using Microsoft.AspNetCore.Mvc.Localization diff --git a/src/Aguacongas.TheIdServer.Shared/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs b/src/Aguacongas.TheIdServer.Duende/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs similarity index 96% rename from src/Aguacongas.TheIdServer.Shared/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs rename to src/Aguacongas.TheIdServer.Duende/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs index be20cf346..7e69b37e3 100644 --- a/src/Aguacongas.TheIdServer.Shared/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs +++ b/src/Aguacongas.TheIdServer.Duende/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs @@ -1,15 +1,8 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.TheIdServer.Models; -#if DUENDE using Duende.IdentityServer.Events; using Duende.IdentityServer.Services; -using Duende.IdentityServer.Stores; -#else -using IdentityServer4.Events; -using IdentityServer4.Services; -using IdentityServer4.Stores; -#endif using Aguacongas.TheIdServer.UI; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Identity; diff --git a/src/Aguacongas.TheIdServer.Duende/Areas/Identity/Pages/Account/Manage/Ciba.cshtml b/src/Aguacongas.TheIdServer.Duende/Areas/Identity/Pages/Account/Manage/Ciba.cshtml index 21375dccb..1379d9749 100644 --- a/src/Aguacongas.TheIdServer.Duende/Areas/Identity/Pages/Account/Manage/Ciba.cshtml +++ b/src/Aguacongas.TheIdServer.Duende/Areas/Identity/Pages/Account/Manage/Ciba.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @page @using Microsoft.AspNetCore.Mvc.Localization diff --git a/src/Aguacongas.TheIdServer.Shared/Areas/Identity/Pages/Account/Manage/Grants.cshtml b/src/Aguacongas.TheIdServer.Duende/Areas/Identity/Pages/Account/Manage/Grants.cshtml similarity index 98% rename from src/Aguacongas.TheIdServer.Shared/Areas/Identity/Pages/Account/Manage/Grants.cshtml rename to src/Aguacongas.TheIdServer.Duende/Areas/Identity/Pages/Account/Manage/Grants.cshtml index 2a5976883..8a8b30908 100644 --- a/src/Aguacongas.TheIdServer.Shared/Areas/Identity/Pages/Account/Manage/Grants.cshtml +++ b/src/Aguacongas.TheIdServer.Duende/Areas/Identity/Pages/Account/Manage/Grants.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @page @using Microsoft.AspNetCore.Mvc.Localization diff --git a/src/Aguacongas.TheIdServer.Shared/Areas/Identity/Pages/Account/Manage/Grants.cshtml.cs b/src/Aguacongas.TheIdServer.Duende/Areas/Identity/Pages/Account/Manage/Grants.cshtml.cs similarity index 94% rename from src/Aguacongas.TheIdServer.Shared/Areas/Identity/Pages/Account/Manage/Grants.cshtml.cs rename to src/Aguacongas.TheIdServer.Duende/Areas/Identity/Pages/Account/Manage/Grants.cshtml.cs index 6a3f6f068..448680b9a 100644 --- a/src/Aguacongas.TheIdServer.Shared/Areas/Identity/Pages/Account/Manage/Grants.cshtml.cs +++ b/src/Aguacongas.TheIdServer.Duende/Areas/Identity/Pages/Account/Manage/Grants.cshtml.cs @@ -1,20 +1,13 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -#if DUENDE using Duende.IdentityServer.Events; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Services; using Duende.IdentityServer.Stores; -#else -using IdentityServer4.Events; -using IdentityServer4.Extensions; -using IdentityServer4.Services; -using IdentityServer4.Stores; -#endif using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/src/Aguacongas.TheIdServer.Duende/Areas/Identity/Pages/Account/Manage/Sessions.cshtml b/src/Aguacongas.TheIdServer.Duende/Areas/Identity/Pages/Account/Manage/Sessions.cshtml index 44febf6a5..82a70e658 100644 --- a/src/Aguacongas.TheIdServer.Duende/Areas/Identity/Pages/Account/Manage/Sessions.cshtml +++ b/src/Aguacongas.TheIdServer.Duende/Areas/Identity/Pages/Account/Manage/Sessions.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @page @using Microsoft.AspNetCore.Mvc.Localization diff --git a/src/Aguacongas.TheIdServer.Shared/Areas/Identity/Pages/_ViewImports.cshtml b/src/Aguacongas.TheIdServer.Duende/Areas/Identity/Pages/_ViewImports.cshtml similarity index 92% rename from src/Aguacongas.TheIdServer.Shared/Areas/Identity/Pages/_ViewImports.cshtml rename to src/Aguacongas.TheIdServer.Duende/Areas/Identity/Pages/_ViewImports.cshtml index 16757bb8a..87137f798 100644 --- a/src/Aguacongas.TheIdServer.Shared/Areas/Identity/Pages/_ViewImports.cshtml +++ b/src/Aguacongas.TheIdServer.Duende/Areas/Identity/Pages/_ViewImports.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @using Aguacongas.TheIdServer.Areas.Identity @using Aguacongas.TheIdServer.Areas.Identity.Pages diff --git a/src/Aguacongas.TheIdServer.Shared/Areas/Identity/Pages/_ViewStart.cshtml b/src/Aguacongas.TheIdServer.Duende/Areas/Identity/Pages/_ViewStart.cshtml similarity index 71% rename from src/Aguacongas.TheIdServer.Shared/Areas/Identity/Pages/_ViewStart.cshtml rename to src/Aguacongas.TheIdServer.Duende/Areas/Identity/Pages/_ViewStart.cshtml index db253a6cd..f88a67357 100644 --- a/src/Aguacongas.TheIdServer.Shared/Areas/Identity/Pages/_ViewStart.cshtml +++ b/src/Aguacongas.TheIdServer.Duende/Areas/Identity/Pages/_ViewStart.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @{ Layout = "/Views/Shared/_Layout.cshtml"; diff --git a/src/Aguacongas.TheIdServer.Shared/Config.cs b/src/Aguacongas.TheIdServer.Duende/Config.cs similarity index 95% rename from src/Aguacongas.TheIdServer.Shared/Config.cs rename to src/Aguacongas.TheIdServer.Duende/Config.cs index 0e0fd2d95..58c70cdba 100644 --- a/src/Aguacongas.TheIdServer.Shared/Config.cs +++ b/src/Aguacongas.TheIdServer.Duende/Config.cs @@ -1,12 +1,7 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre -#if DUENDE +// Copyright (c) 2023 @Olivier Lefebvre using Duende.IdentityServer; using Duende.IdentityServer.Models; -#else -using IdentityServer4; -using IdentityServer4.Models; -#endif using Microsoft.Extensions.Configuration; using System; using System.Collections.Generic; diff --git a/src/Aguacongas.TheIdServer.Shared/Extensions/ApplicationBuilderExtensions.cs b/src/Aguacongas.TheIdServer.Duende/Extensions/ApplicationBuilderExtensions.cs similarity index 82% rename from src/Aguacongas.TheIdServer.Shared/Extensions/ApplicationBuilderExtensions.cs rename to src/Aguacongas.TheIdServer.Duende/Extensions/ApplicationBuilderExtensions.cs index 8c5ea6093..8e66219e3 100644 --- a/src/Aguacongas.TheIdServer.Shared/Extensions/ApplicationBuilderExtensions.cs +++ b/src/Aguacongas.TheIdServer.Duende/Extensions/ApplicationBuilderExtensions.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.IdentityServer.Abstractions; using Aguacongas.IdentityServer.Admin.Services; using Aguacongas.IdentityServer.EntityFramework.Store; @@ -11,12 +11,8 @@ using Aguacongas.TheIdServer.Data; using Aguacongas.TheIdServer.Models; using Aguacongas.TheIdServer.Options.OpenTelemetry; -#if DUENDE using Duende.IdentityServer.Hosting; using Duende.IdentityServer.Configuration; -#else -using IdentityServer4.Configuration; -#endif using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Components.WebAssembly.Authentication; using Microsoft.AspNetCore.Components.WebAssembly.Hosting; @@ -64,31 +60,7 @@ public static IApplicationBuilder UseTheIdServer(this IApplicationBuilder app, I if (!string.IsNullOrEmpty(certificateHeader)) { logger.LogDebug("Get client certificate from header {ClientCertificateHeader}", certificateHeader); - app.Use(async (context, next) => - { - var requestLoggerFactory = context.RequestServices.GetRequiredService(); - var requestLogger = requestLoggerFactory.CreateLogger("GetClientCertificateMiddleware"); - - var headers = context.Request.Headers; - using var scope = requestLogger.BeginScope(new Dictionary - { - ["Headers"] = headers - }); - - if (headers.TryGetValue(certificateHeader, out StringValues values)) - { - logger.LogInformation("Get certificate from header {ClientCertificateHeader}", certificateHeader); - try - { - context.Connection.ClientCertificate = X509Certificate2.CreateFromPem(Uri.UnescapeDataString(values.First())); - } - catch(CryptographicException e) - { - logger.LogWarning("Failed to get certificate fron header {ClientCertificateHeader}. Error: {Error}", certificateHeader, e.Message); - } - } - await next(); - }); + app.UseClientCerificate(certificateHeader); } app.UseForwardedHeaders(); @@ -136,30 +108,10 @@ public static IApplicationBuilder UseTheIdServer(this IApplicationBuilder app, I .UseStaticFiles() .UseIdentityServerAdminApi("/api", child => { - if (configuration.GetValue("EnableOpenApiDoc")) - { - child.UseOpenApi() - .UseSwaggerUi3(options => - { - var settings = configuration.GetSection("SwaggerUiSettings").Get(); - options.OAuth2Client = settings.OAuth2Client; - }); - } - var allowedOrigin = configuration.GetSection("CorsAllowedOrigin").Get>(); - if (allowedOrigin != null) - { - child.UseCors(configure => - { - configure.SetIsOriginAllowed(origin => allowedOrigin.Any(o => o == origin)) - .AllowAnyMethod() - .AllowAnyHeader() - .AllowCredentials(); - }); - } + ConfigureAdminApiHandler(configuration, child); }) .UseRouting(); -#if DUENDE app.UseMiddleware() .ConfigureCors(); @@ -167,9 +119,6 @@ public static IApplicationBuilder UseTheIdServer(this IApplicationBuilder app, I app.UseMiddleware() .UseMiddleware(); -#else - app.UseIdentityServer(); -#endif if (!isProxy) { @@ -209,6 +158,58 @@ public static IApplicationBuilder UseTheIdServer(this IApplicationBuilder app, I return app; } + private static void ConfigureAdminApiHandler(IConfiguration configuration, IApplicationBuilder child) + { + if (configuration.GetValue("EnableOpenApiDoc")) + { + child.UseOpenApi() + .UseSwaggerUi3(options => + { + var settings = configuration.GetSection("SwaggerUiSettings").Get(); + options.OAuth2Client = settings.OAuth2Client; + }); + } + var allowedOrigin = configuration.GetSection("CorsAllowedOrigin").Get>(); + if (allowedOrigin != null) + { + child.UseCors(configure => + { + configure.SetIsOriginAllowed(origin => allowedOrigin.Any(o => o == origin)) + .AllowAnyMethod() + .AllowAnyHeader() + .AllowCredentials(); + }); + } + } + + private static IApplicationBuilder UseClientCerificate(this IApplicationBuilder app, string certificateHeader) + { + return app.Use(async (context, next) => + { + var requestLoggerFactory = context.RequestServices.GetRequiredService(); + var requestLogger = requestLoggerFactory.CreateLogger("GetClientCertificateMiddleware"); + + var headers = context.Request.Headers; + using var scope = requestLogger.BeginScope(new Dictionary + { + ["Headers"] = headers + }); + + if (headers.TryGetValue(certificateHeader, out StringValues values)) + { + requestLogger.LogInformation("Get certificate from header {ClientCertificateHeader}", certificateHeader); + try + { + context.Connection.ClientCertificate = X509Certificate2.CreateFromPem(Uri.UnescapeDataString(values.First())); + } + catch (CryptographicException e) + { + requestLogger.LogWarning("Failed to get certificate fron header {ClientCertificateHeader}. Error: {Error}", certificateHeader, e.Message); + } + } + await next(); + }); + } private static IApplicationBuilder UsePrometheus(this IApplicationBuilder app, IConfiguration configuration) { var otlpOptions = configuration.GetSection(nameof(OpenTelemetryOptions)).Get(); diff --git a/src/Aguacongas.TheIdServer.Shared/Extensions/IdentityServerBuilderExtensions.cs b/src/Aguacongas.TheIdServer.Duende/Extensions/IdentityServerBuilderExtensions.cs similarity index 97% rename from src/Aguacongas.TheIdServer.Shared/Extensions/IdentityServerBuilderExtensions.cs rename to src/Aguacongas.TheIdServer.Duende/Extensions/IdentityServerBuilderExtensions.cs index 38dc6494e..d86ca68dd 100644 --- a/src/Aguacongas.TheIdServer.Shared/Extensions/IdentityServerBuilderExtensions.cs +++ b/src/Aguacongas.TheIdServer.Duende/Extensions/IdentityServerBuilderExtensions.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.IdentityServer.Admin.Configuration; using Aguacongas.IdentityServer.EntityFramework.Store; using Aguacongas.IdentityServer.KeysRotation; @@ -11,13 +11,8 @@ using System.Collections.Generic; using System.IO; using System.Security.Cryptography.X509Certificates; -#if DUENDE using Duende.IdentityServer.Configuration; using static Duende.IdentityServer.IdentityServerConstants; -#else -using IdentityServer4.Configuration; -using static IdentityServer4.IdentityServerConstants; -#endif namespace Microsoft.Extensions.DependencyInjection { diff --git a/src/Aguacongas.TheIdServer.Shared/Extensions/ServiceCollectionExtensions.cs b/src/Aguacongas.TheIdServer.Duende/Extensions/ServiceCollectionExtensions.cs similarity index 91% rename from src/Aguacongas.TheIdServer.Shared/Extensions/ServiceCollectionExtensions.cs rename to src/Aguacongas.TheIdServer.Duende/Extensions/ServiceCollectionExtensions.cs index aacb27aba..e406d9d17 100644 --- a/src/Aguacongas.TheIdServer.Shared/Extensions/ServiceCollectionExtensions.cs +++ b/src/Aguacongas.TheIdServer.Duende/Extensions/ServiceCollectionExtensions.cs @@ -13,12 +13,8 @@ using Aguacongas.TheIdServer.Services; using Aguacongas.TheIdServer.UI; using IdentityModel.AspNetCore.OAuth2Introspection; -#if DUENDE using Aguacongas.IdentityServer.Services; using Duende.IdentityServer.Services; -#else -using IdentityServer4.Services; -#endif using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Builder; @@ -49,6 +45,7 @@ using Microsoft.AspNetCore.Authentication.Certificate; using Microsoft.EntityFrameworkCore.Metadata.Internal; using Microsoft.AspNetCore.Components; +using Aguacongas.IdentityServer.Saml2p.Duende.Services.Configuration; namespace Microsoft.Extensions.DependencyInjection { @@ -67,7 +64,7 @@ public static IServiceCollection AddTheIdServer(this IServiceCollection services .AddIdentity( options => { - configurationManager.Bind(nameof(IdentityOptions), options); + configurationManager.Bind(nameof(AspNetCore.Identity.IdentityOptions), options); }) .AddTheIdServerStores() .AddDefaultTokenProviders(); @@ -91,7 +88,6 @@ public static IServiceCollection AddTheIdServer(this IServiceCollection services .Configure(configurationManager.GetSection(nameof(SiteOptions))) .ConfigureNonBreakingSameSiteCookies() .AddOidcStateDataFormatterCache() -#if DUENDE .Configure(configurationManager.GetSection(nameof(Duende.IdentityServer.Configuration.IdentityServerOptions))) .AddIdentityServerBuilder() .AddRequiredPlatformServices() @@ -104,11 +100,7 @@ public static IServiceCollection AddTheIdServer(this IServiceCollection services .AddResponseGenerators() .AddDefaultSecretParsers() .AddDefaultSecretValidators() - .AddInMemoryPersistedGrants() .AddCiba(configurationManager.GetSection(nameof(BackchannelAuthenticationUserNotificationServiceOptions))) -#else - .AddIdentityServer(configurationManager.GetSection(nameof(IdentityServer4.Configuration.IdentityServerOptions))) -#endif .AddAspNetIdentity() .AddDynamicClientRegistration() .AddJwtBearerClientAuthentication() @@ -116,12 +108,10 @@ public static IServiceCollection AddTheIdServer(this IServiceCollection services .ConfigureDiscovey(configurationManager.GetSection(nameof(IdentityServerOptions))) .ConfigureKey(configurationManager.GetSection("IdentityServer:Key")); -#if DUENDE if (configurationManager.GetValue("IdentityServerOptions:EnableServerSideSession")) { identityServerBuilder.AddServerSideSessions(); } -#endif identityServerBuilder.AddJwtRequestUriHttpClient(); @@ -165,7 +155,7 @@ public static IServiceCollection AddTheIdServer(this IServiceCollection services .AddAuthorization(options => options.AddIdentityServerPolicies(true)) .AddAuthentication() - .AddJwtBearer("Bearer", options => ConfigureIdentityServerJwtBearerOptions(options, configurationManager)) + .AddJwtBearer(JwtBearerDefaults.AuthenticationScheme, options => ConfigureIdentityServerJwtBearerOptions(options, configurationManager)) // reference tokens .AddOAuth2Introspection("introspection", options => ConfigureIdentityServerOAuth2IntrospectionOptions(options, configurationManager)); @@ -176,7 +166,7 @@ public static IServiceCollection AddTheIdServer(this IServiceCollection services authenticationBuilder.AddCertificate(mutulaTlsOptions.ClientCertificateAuthenticationScheme, options => configurationManager.Bind(nameof(CertificateAuthenticationOptions), options)); } - + var mvcBuilder = services.Configure(configurationManager) .AddLocalization() @@ -191,27 +181,29 @@ public static IServiceCollection AddTheIdServer(this IServiceCollection services settings.NullValueHandling = NullValueHandling.Ignore; settings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; }) - .AddIdentityServerWsFederation(configurationManager.GetSection(nameof(WsFederationOptions))); + .AddIdentityServerWsFederation(configurationManager.GetSection(nameof(WsFederationOptions))) + .AddIdentityServerSaml2P(configurationManager.GetSection(nameof(Saml2POptions))); - ConfigureDynamicProviderManager(mvcBuilder, isProxy, dbType, configurationManager); + ConfigureDynamicProviderManager(mvcBuilder, isProxy, dbType); ConfigureDynamicConfiguration(mvcBuilder, configurationManager); services.AddRemoteAuthentication(); services.Configure(configurationManager.GetSection(nameof(HostModelOptions))) - .AddScoped() - .AddScoped() - .AddScoped() - .AddScoped() - .AddTransient() - .AddTransient() - .AddTransient() - .AddTransient() - .AddTransient, KeyStore>() - .AddTransient, KeyStore>() - .AddTransient, KeyStore>() - .AddAdminApplication(new Settings()) - .AddDatabaseDeveloperPageExceptionFilter() - .AddRazorPages(options => options.Conventions.AuthorizeAreaFolder("Identity", "/Account")); + .AddScoped() + .AddScoped() + .AddScoped() + .AddScoped() + .AddScoped() + .AddTransient() + .AddTransient() + .AddTransient() + .AddTransient() + .AddTransient, KeyStore>() + .AddTransient, KeyStore>() + .AddTransient, KeyStore>() + .AddAdminApplication(new Settings()) + .AddDatabaseDeveloperPageExceptionFilter() + .AddRazorPages(options => options.Conventions.AuthorizeAreaFolder("Identity", "/Account")); ConfigureHealthChecks(services, dbType, isProxy, configurationManager); @@ -238,7 +230,7 @@ private static void ConfigureDynamicConfiguration(IMvcBuilder mvcBuilder, Config } } - private static void ConfigureDynamicProviderManager(IMvcBuilder mvcBuilder, bool isProxy, DbTypes dbType, IConfiguration configuration) + private static void ConfigureDynamicProviderManager(IMvcBuilder mvcBuilder, bool isProxy, DbTypes dbType) { var dynamicBuilder = mvcBuilder.AddIdentityServerAdmin(); if (isProxy) diff --git a/src/Aguacongas.TheIdServer.Duende/Localization-fr.json b/src/Aguacongas.TheIdServer.Duende/Localization-fr.json index 22f469f19..160ed42cb 100644 --- a/src/Aguacongas.TheIdServer.Duende/Localization-fr.json +++ b/src/Aguacongas.TheIdServer.Duende/Localization-fr.json @@ -1528,7 +1528,7 @@ "value": "La clé est requise." }, { - "key": "The key must be unique.", + "key": "The key '{0}' must be unique.", "value": "La clé doit être unique." }, { @@ -2011,10 +2011,6 @@ "key": "Below is the list of backchannel login requests awaiting your approbation.", "value": "Vous trouverez ci-dessous la liste des demandes de connexion backchannel en attente de votre approbation." }, - { - "key": "Below is the list of backchannel login requests awaiting your approbation.", - "value": "Vous trouverez ci-dessous la liste des demandes de connexion backchannel en attente de votre approbation." - }, { "key": "Sessions", "value": "Sessions" @@ -2023,10 +2019,6 @@ "key": "Renewed", "value": "Renouvelée" }, - { - "key": "Renewed", - "value": "Renouvelée" - }, { "key": "Created", "value": "Créé" @@ -2115,10 +2107,6 @@ "key": "ignore nested groups", "value": "ignorer les groupes imbriqués" }, - { - "key": "ignore nested groups", - "value": "ignorer les groupes imbriqués" - }, { "key": "claims cache absolute expiration", "value": "expiration absolue du cache des réclamations" @@ -2134,5 +2122,29 @@ { "key": "Are you sure you want to leave this page?", "value": "Voulez-vous vraiment quitter cette page ?" + }, + { + "key": "clone", + "value": "cloner" + }, + { + "key": "Clone of {0}", + "value": "Clone de {0}" + }, + { + "key": "Scope of", + "value": "Portée de" + }, + { + "key": "Allowed to", + "value": "Autorisé à" + }, + { + "key": "scope of", + "value": "portée de" + }, + { + "key": "allowed to", + "value": "autorisé à" } ] \ No newline at end of file diff --git a/src/Aguacongas.TheIdServer.Shared/Program.cs b/src/Aguacongas.TheIdServer.Duende/Program.cs similarity index 95% rename from src/Aguacongas.TheIdServer.Shared/Program.cs rename to src/Aguacongas.TheIdServer.Duende/Program.cs index eeea33bf9..045e61bd9 100644 --- a/src/Aguacongas.TheIdServer.Shared/Program.cs +++ b/src/Aguacongas.TheIdServer.Duende/Program.cs @@ -1,6 +1,7 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.TheIdServer; +using Aguacongas.TheIdServer.BlazorApp.Models; using Aguacongas.TheIdServer.Options.OpenTelemetry; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; diff --git a/src/Aguacongas.TheIdServer.Shared/Quickstart/Account/AccountController.cs b/src/Aguacongas.TheIdServer.Duende/Quickstart/Account/AccountController.cs similarity index 97% rename from src/Aguacongas.TheIdServer.Shared/Quickstart/Account/AccountController.cs rename to src/Aguacongas.TheIdServer.Duende/Quickstart/Account/AccountController.cs index 3f00c0cf3..0d036f23f 100644 --- a/src/Aguacongas.TheIdServer.Shared/Quickstart/Account/AccountController.cs +++ b/src/Aguacongas.TheIdServer.Duende/Quickstart/Account/AccountController.cs @@ -1,22 +1,13 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.TheIdServer.Models; using IdentityModel; -#if DUENDE using Duende.IdentityServer; using Duende.IdentityServer.Events; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Duende.IdentityServer.Stores; -#else -using IdentityServer4; -using IdentityServer4.Events; -using IdentityServer4.Extensions; -using IdentityServer4.Models; -using IdentityServer4.Services; -using IdentityServer4.Stores; -#endif using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Identity; @@ -363,13 +354,10 @@ private async Task BuildLoggedOutViewModelAsync(string logou var idp = User.FindFirst(JwtClaimTypes.IdentityProvider)?.Value; if (idp != null && idp != IdentityServerConstants.LocalIdentityProvider) { -#if DUENDE var provider = HttpContext.RequestServices.GetRequiredService(); var handler = await provider.GetHandlerAsync(HttpContext, idp); var providerSupportsSignout = handler is IAuthenticationSignOutHandler; -#else - var providerSupportsSignout = await HttpContext.GetSchemeSupportsSignOutAsync(idp).ConfigureAwait(false); -#endif + if (providerSupportsSignout) { if (vm.LogoutId == null) diff --git a/src/Aguacongas.TheIdServer.Shared/Quickstart/Account/AccountOptions.cs b/src/Aguacongas.TheIdServer.Duende/Quickstart/Account/AccountOptions.cs similarity index 96% rename from src/Aguacongas.TheIdServer.Shared/Quickstart/Account/AccountOptions.cs rename to src/Aguacongas.TheIdServer.Duende/Quickstart/Account/AccountOptions.cs index 598e91305..cf69b55f4 100644 --- a/src/Aguacongas.TheIdServer.Shared/Quickstart/Account/AccountOptions.cs +++ b/src/Aguacongas.TheIdServer.Duende/Quickstart/Account/AccountOptions.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Microsoft.AspNetCore.Authentication.Negotiate; using System; diff --git a/src/Aguacongas.TheIdServer.Shared/Quickstart/Account/ExternalController.cs b/src/Aguacongas.TheIdServer.Duende/Quickstart/Account/ExternalController.cs similarity index 98% rename from src/Aguacongas.TheIdServer.Shared/Quickstart/Account/ExternalController.cs rename to src/Aguacongas.TheIdServer.Duende/Quickstart/Account/ExternalController.cs index c0d4fc2a9..0dcc742c7 100644 --- a/src/Aguacongas.TheIdServer.Shared/Quickstart/Account/ExternalController.cs +++ b/src/Aguacongas.TheIdServer.Duende/Quickstart/Account/ExternalController.cs @@ -1,18 +1,11 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.TheIdServer.Models; using IdentityModel; -#if DUENDE using Duende.IdentityServer; using Duende.IdentityServer.Events; using Duende.IdentityServer.Services; using Duende.IdentityServer.Stores; -#else -using IdentityServer4; -using IdentityServer4.Events; -using IdentityServer4.Services; -using IdentityServer4.Stores; -#endif using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; @@ -133,7 +126,6 @@ public async Task Callback() // we must issue the cookie maually, and can't use the SignInManager because // it doesn't expose an API to issue additional claims from the login workflow var principal = await _signInManager.CreateUserPrincipalAsync(user); - additionalLocalClaims.AddRange(principal.Claims); var name = principal.FindFirst(JwtClaimTypes.Name)?.Value ?? user.Id; // issue authentication cookie for user diff --git a/src/Aguacongas.TheIdServer.Shared/Quickstart/Account/ExternalProvider.cs b/src/Aguacongas.TheIdServer.Duende/Quickstart/Account/ExternalProvider.cs similarity index 85% rename from src/Aguacongas.TheIdServer.Shared/Quickstart/Account/ExternalProvider.cs rename to src/Aguacongas.TheIdServer.Duende/Quickstart/Account/ExternalProvider.cs index aa00c89c2..bbb94f9b4 100644 --- a/src/Aguacongas.TheIdServer.Shared/Quickstart/Account/ExternalProvider.cs +++ b/src/Aguacongas.TheIdServer.Duende/Quickstart/Account/ExternalProvider.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre namespace Aguacongas.TheIdServer.UI { public class ExternalProvider diff --git a/src/Aguacongas.TheIdServer.Shared/Quickstart/Account/InvalidReturnUrlException.cs b/src/Aguacongas.TheIdServer.Duende/Quickstart/Account/InvalidReturnUrlException.cs similarity index 96% rename from src/Aguacongas.TheIdServer.Shared/Quickstart/Account/InvalidReturnUrlException.cs rename to src/Aguacongas.TheIdServer.Duende/Quickstart/Account/InvalidReturnUrlException.cs index 08d67dbe7..ac19934f1 100644 --- a/src/Aguacongas.TheIdServer.Shared/Quickstart/Account/InvalidReturnUrlException.cs +++ b/src/Aguacongas.TheIdServer.Duende/Quickstart/Account/InvalidReturnUrlException.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using System; using System.Runtime.Serialization; diff --git a/src/Aguacongas.TheIdServer.Shared/Quickstart/Account/LoggedOutViewModel.cs b/src/Aguacongas.TheIdServer.Duende/Quickstart/Account/LoggedOutViewModel.cs similarity index 93% rename from src/Aguacongas.TheIdServer.Shared/Quickstart/Account/LoggedOutViewModel.cs rename to src/Aguacongas.TheIdServer.Duende/Quickstart/Account/LoggedOutViewModel.cs index 5fc2458b2..5513cf399 100644 --- a/src/Aguacongas.TheIdServer.Shared/Quickstart/Account/LoggedOutViewModel.cs +++ b/src/Aguacongas.TheIdServer.Duende/Quickstart/Account/LoggedOutViewModel.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre namespace Aguacongas.TheIdServer.UI { public class LoggedOutViewModel diff --git a/src/Aguacongas.TheIdServer.Shared/Quickstart/Account/LoginInputModel.cs b/src/Aguacongas.TheIdServer.Duende/Quickstart/Account/LoginInputModel.cs similarity index 90% rename from src/Aguacongas.TheIdServer.Shared/Quickstart/Account/LoginInputModel.cs rename to src/Aguacongas.TheIdServer.Duende/Quickstart/Account/LoginInputModel.cs index b1fc2d355..7b9374be8 100644 --- a/src/Aguacongas.TheIdServer.Shared/Quickstart/Account/LoginInputModel.cs +++ b/src/Aguacongas.TheIdServer.Duende/Quickstart/Account/LoginInputModel.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using System.ComponentModel.DataAnnotations; namespace Aguacongas.TheIdServer.UI diff --git a/src/Aguacongas.TheIdServer.Shared/Quickstart/Account/LoginViewModel.cs b/src/Aguacongas.TheIdServer.Duende/Quickstart/Account/LoginViewModel.cs similarity index 96% rename from src/Aguacongas.TheIdServer.Shared/Quickstart/Account/LoginViewModel.cs rename to src/Aguacongas.TheIdServer.Duende/Quickstart/Account/LoginViewModel.cs index e611b8296..619547808 100644 --- a/src/Aguacongas.TheIdServer.Shared/Quickstart/Account/LoginViewModel.cs +++ b/src/Aguacongas.TheIdServer.Duende/Quickstart/Account/LoginViewModel.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using System; using System.Collections.Generic; using System.Linq; diff --git a/src/Aguacongas.TheIdServer.Shared/Quickstart/Account/LogoutInputModel.cs b/src/Aguacongas.TheIdServer.Duende/Quickstart/Account/LogoutInputModel.cs similarity index 81% rename from src/Aguacongas.TheIdServer.Shared/Quickstart/Account/LogoutInputModel.cs rename to src/Aguacongas.TheIdServer.Duende/Quickstart/Account/LogoutInputModel.cs index 32279165b..a01d51cef 100644 --- a/src/Aguacongas.TheIdServer.Shared/Quickstart/Account/LogoutInputModel.cs +++ b/src/Aguacongas.TheIdServer.Duende/Quickstart/Account/LogoutInputModel.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre namespace Aguacongas.TheIdServer.UI { public class LogoutInputModel diff --git a/src/Aguacongas.TheIdServer.Shared/Quickstart/Account/LogoutViewModel.cs b/src/Aguacongas.TheIdServer.Duende/Quickstart/Account/LogoutViewModel.cs similarity index 83% rename from src/Aguacongas.TheIdServer.Shared/Quickstart/Account/LogoutViewModel.cs rename to src/Aguacongas.TheIdServer.Duende/Quickstart/Account/LogoutViewModel.cs index 9db8cceb2..2c1032b49 100644 --- a/src/Aguacongas.TheIdServer.Shared/Quickstart/Account/LogoutViewModel.cs +++ b/src/Aguacongas.TheIdServer.Duende/Quickstart/Account/LogoutViewModel.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre namespace Aguacongas.TheIdServer.UI { public class LogoutViewModel : LogoutInputModel diff --git a/src/Aguacongas.TheIdServer.Shared/Quickstart/Account/RedirectViewModel.cs b/src/Aguacongas.TheIdServer.Duende/Quickstart/Account/RedirectViewModel.cs similarity index 81% rename from src/Aguacongas.TheIdServer.Shared/Quickstart/Account/RedirectViewModel.cs rename to src/Aguacongas.TheIdServer.Duende/Quickstart/Account/RedirectViewModel.cs index 59cf518b8..ded169e58 100644 --- a/src/Aguacongas.TheIdServer.Shared/Quickstart/Account/RedirectViewModel.cs +++ b/src/Aguacongas.TheIdServer.Duende/Quickstart/Account/RedirectViewModel.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre namespace Aguacongas.TheIdServer.UI { public class RedirectViewModel diff --git a/src/Aguacongas.TheIdServer.Shared/Quickstart/Consent/ConsentController.cs b/src/Aguacongas.TheIdServer.Duende/Quickstart/Consent/ConsentController.cs similarity index 97% rename from src/Aguacongas.TheIdServer.Shared/Quickstart/Consent/ConsentController.cs rename to src/Aguacongas.TheIdServer.Duende/Quickstart/Consent/ConsentController.cs index bbe416997..47561b7b2 100644 --- a/src/Aguacongas.TheIdServer.Shared/Quickstart/Consent/ConsentController.cs +++ b/src/Aguacongas.TheIdServer.Duende/Quickstart/Consent/ConsentController.cs @@ -1,20 +1,11 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre -#if DUENDE +// Copyright (c) 2023 @Olivier Lefebvre using Duende.IdentityServer; using Duende.IdentityServer.Events; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Validation; -#else -using IdentityServer4; -using IdentityServer4.Events; -using IdentityServer4.Models; -using IdentityServer4.Services; -using IdentityServer4.Extensions; -using IdentityServer4.Validation; -#endif using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; diff --git a/src/Aguacongas.TheIdServer.Shared/Quickstart/Consent/ConsentInputModel.cs b/src/Aguacongas.TheIdServer.Duende/Quickstart/Consent/ConsentInputModel.cs similarity index 91% rename from src/Aguacongas.TheIdServer.Shared/Quickstart/Consent/ConsentInputModel.cs rename to src/Aguacongas.TheIdServer.Duende/Quickstart/Consent/ConsentInputModel.cs index e07898c40..4b59bd7c7 100644 --- a/src/Aguacongas.TheIdServer.Shared/Quickstart/Consent/ConsentInputModel.cs +++ b/src/Aguacongas.TheIdServer.Duende/Quickstart/Consent/ConsentInputModel.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using System.Collections.Generic; namespace Aguacongas.TheIdServer.UI diff --git a/src/Aguacongas.TheIdServer.Shared/Quickstart/Consent/ConsentOptions.cs b/src/Aguacongas.TheIdServer.Duende/Quickstart/Consent/ConsentOptions.cs similarity index 94% rename from src/Aguacongas.TheIdServer.Shared/Quickstart/Consent/ConsentOptions.cs rename to src/Aguacongas.TheIdServer.Duende/Quickstart/Consent/ConsentOptions.cs index c62cb6f52..8e8357161 100644 --- a/src/Aguacongas.TheIdServer.Shared/Quickstart/Consent/ConsentOptions.cs +++ b/src/Aguacongas.TheIdServer.Duende/Quickstart/Consent/ConsentOptions.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre namespace Aguacongas.TheIdServer.UI { public static class ConsentOptions diff --git a/src/Aguacongas.TheIdServer.Shared/Quickstart/Consent/ConsentViewModel.cs b/src/Aguacongas.TheIdServer.Duende/Quickstart/Consent/ConsentViewModel.cs similarity index 93% rename from src/Aguacongas.TheIdServer.Shared/Quickstart/Consent/ConsentViewModel.cs rename to src/Aguacongas.TheIdServer.Duende/Quickstart/Consent/ConsentViewModel.cs index d71963f63..41c93cd37 100644 --- a/src/Aguacongas.TheIdServer.Shared/Quickstart/Consent/ConsentViewModel.cs +++ b/src/Aguacongas.TheIdServer.Duende/Quickstart/Consent/ConsentViewModel.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using System.Collections.Generic; namespace Aguacongas.TheIdServer.UI diff --git a/src/Aguacongas.TheIdServer.Shared/Quickstart/Consent/ProcessConsentResult.cs b/src/Aguacongas.TheIdServer.Duende/Quickstart/Consent/ProcessConsentResult.cs similarity index 85% rename from src/Aguacongas.TheIdServer.Shared/Quickstart/Consent/ProcessConsentResult.cs rename to src/Aguacongas.TheIdServer.Duende/Quickstart/Consent/ProcessConsentResult.cs index 31967c5ef..a838390a4 100644 --- a/src/Aguacongas.TheIdServer.Shared/Quickstart/Consent/ProcessConsentResult.cs +++ b/src/Aguacongas.TheIdServer.Duende/Quickstart/Consent/ProcessConsentResult.cs @@ -1,10 +1,6 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre -#if DUENDE +// Copyright (c) 2023 @Olivier Lefebvre using Duende.IdentityServer.Models; -#else -using IdentityServer4.Models; -#endif namespace Aguacongas.TheIdServer.UI { diff --git a/src/Aguacongas.TheIdServer.Shared/Quickstart/Consent/ScopeViewModel.cs b/src/Aguacongas.TheIdServer.Duende/Quickstart/Consent/ScopeViewModel.cs similarity index 90% rename from src/Aguacongas.TheIdServer.Shared/Quickstart/Consent/ScopeViewModel.cs rename to src/Aguacongas.TheIdServer.Duende/Quickstart/Consent/ScopeViewModel.cs index 0c15d6be6..b0959b3e7 100644 --- a/src/Aguacongas.TheIdServer.Shared/Quickstart/Consent/ScopeViewModel.cs +++ b/src/Aguacongas.TheIdServer.Duende/Quickstart/Consent/ScopeViewModel.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre namespace Aguacongas.TheIdServer.UI { public class ScopeViewModel diff --git a/src/Aguacongas.TheIdServer.Shared/Quickstart/Device/DeviceAuthorizationInputModel.cs b/src/Aguacongas.TheIdServer.Duende/Quickstart/Device/DeviceAuthorizationInputModel.cs similarity index 85% rename from src/Aguacongas.TheIdServer.Shared/Quickstart/Device/DeviceAuthorizationInputModel.cs rename to src/Aguacongas.TheIdServer.Duende/Quickstart/Device/DeviceAuthorizationInputModel.cs index 1ee4926a8..91a56b546 100644 --- a/src/Aguacongas.TheIdServer.Shared/Quickstart/Device/DeviceAuthorizationInputModel.cs +++ b/src/Aguacongas.TheIdServer.Duende/Quickstart/Device/DeviceAuthorizationInputModel.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.TheIdServer.UI; namespace Aguacongas.IdentityServer.UI.Device diff --git a/src/Aguacongas.TheIdServer.Shared/Quickstart/Device/DeviceAuthorizationViewModel.cs b/src/Aguacongas.TheIdServer.Duende/Quickstart/Device/DeviceAuthorizationViewModel.cs similarity index 87% rename from src/Aguacongas.TheIdServer.Shared/Quickstart/Device/DeviceAuthorizationViewModel.cs rename to src/Aguacongas.TheIdServer.Duende/Quickstart/Device/DeviceAuthorizationViewModel.cs index 69c4273b8..91bb36c30 100644 --- a/src/Aguacongas.TheIdServer.Shared/Quickstart/Device/DeviceAuthorizationViewModel.cs +++ b/src/Aguacongas.TheIdServer.Duende/Quickstart/Device/DeviceAuthorizationViewModel.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.TheIdServer.UI; namespace Aguacongas.IdentityServer.UI.Device diff --git a/src/Aguacongas.TheIdServer.Shared/Quickstart/Device/DeviceController.cs b/src/Aguacongas.TheIdServer.Duende/Quickstart/Device/DeviceController.cs similarity index 96% rename from src/Aguacongas.TheIdServer.Shared/Quickstart/Device/DeviceController.cs rename to src/Aguacongas.TheIdServer.Duende/Quickstart/Device/DeviceController.cs index cb641aaaf..e610082d2 100644 --- a/src/Aguacongas.TheIdServer.Shared/Quickstart/Device/DeviceController.cs +++ b/src/Aguacongas.TheIdServer.Duende/Quickstart/Device/DeviceController.cs @@ -1,31 +1,20 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Aguacongas.TheIdServer.UI; -#if DUENDE using Duende.IdentityServer; using Duende.IdentityServer.Events; using Duende.IdentityServer.Extensions; using Duende.IdentityServer.Models; using Duende.IdentityServer.Services; using Duende.IdentityServer.Validation; -using ISConfiguration = Duende.IdentityServer.Configuration; -#else -using IdentityServer4; -using IdentityServer4.Events; -using IdentityServer4.Extensions; -using IdentityServer4.Models; -using IdentityServer4.Services; -using IdentityServer4.Validation; -using ISConfiguration = IdentityServer4.Configuration; -#endif using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; +using ISConfiguration = Duende.IdentityServer.Configuration; namespace Aguacongas.IdentityServer.UI.Device { diff --git a/src/Aguacongas.TheIdServer.Shared/Quickstart/Diagnostics/DiagnosticsController.cs b/src/Aguacongas.TheIdServer.Duende/Quickstart/Diagnostics/DiagnosticsController.cs similarity index 95% rename from src/Aguacongas.TheIdServer.Shared/Quickstart/Diagnostics/DiagnosticsController.cs rename to src/Aguacongas.TheIdServer.Duende/Quickstart/Diagnostics/DiagnosticsController.cs index cbead4820..430317da3 100644 --- a/src/Aguacongas.TheIdServer.Shared/Quickstart/Diagnostics/DiagnosticsController.cs +++ b/src/Aguacongas.TheIdServer.Duende/Quickstart/Diagnostics/DiagnosticsController.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; diff --git a/src/Aguacongas.TheIdServer.Shared/Quickstart/Diagnostics/DiagnosticsViewModel.cs b/src/Aguacongas.TheIdServer.Duende/Quickstart/Diagnostics/DiagnosticsViewModel.cs similarity index 60% rename from src/Aguacongas.TheIdServer.Shared/Quickstart/Diagnostics/DiagnosticsViewModel.cs rename to src/Aguacongas.TheIdServer.Duende/Quickstart/Diagnostics/DiagnosticsViewModel.cs index 22e3b8ca8..94452eb61 100644 --- a/src/Aguacongas.TheIdServer.Shared/Quickstart/Diagnostics/DiagnosticsViewModel.cs +++ b/src/Aguacongas.TheIdServer.Duende/Quickstart/Diagnostics/DiagnosticsViewModel.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using IdentityModel; using Microsoft.AspNetCore.Authentication; using Newtonsoft.Json; @@ -14,14 +14,15 @@ public DiagnosticsViewModel(AuthenticateResult result) { AuthenticateResult = result; - if (result.Properties.Items.ContainsKey("client_list")) + if (!result.Properties.Items.TryGetValue("client_list", out string encoded)) { - var encoded = result.Properties.Items["client_list"]; - var bytes = Base64Url.Decode(encoded); - var value = Encoding.UTF8.GetString(bytes); - - Clients = JsonConvert.DeserializeObject(value); + return; } + + var bytes = Base64Url.Decode(encoded); + var value = Encoding.UTF8.GetString(bytes); + + Clients = JsonConvert.DeserializeObject(value); } public AuthenticateResult AuthenticateResult { get; } diff --git a/src/Aguacongas.TheIdServer.Shared/Quickstart/Extensions.cs b/src/Aguacongas.TheIdServer.Duende/Quickstart/Extensions.cs similarity index 91% rename from src/Aguacongas.TheIdServer.Shared/Quickstart/Extensions.cs rename to src/Aguacongas.TheIdServer.Duende/Quickstart/Extensions.cs index 760616c6d..b542d2b0e 100644 --- a/src/Aguacongas.TheIdServer.Shared/Quickstart/Extensions.cs +++ b/src/Aguacongas.TheIdServer.Duende/Quickstart/Extensions.cs @@ -1,10 +1,6 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre -#if DUENDE +// Copyright (c) 2023 @Olivier Lefebvre using Duende.IdentityServer.Models; -#else -using IdentityServer4.Models; -#endif using Microsoft.AspNetCore.Mvc; using System; diff --git a/src/Aguacongas.TheIdServer.Shared/Quickstart/Home/ErrorViewModel.cs b/src/Aguacongas.TheIdServer.Duende/Quickstart/Home/ErrorViewModel.cs similarity index 80% rename from src/Aguacongas.TheIdServer.Shared/Quickstart/Home/ErrorViewModel.cs rename to src/Aguacongas.TheIdServer.Duende/Quickstart/Home/ErrorViewModel.cs index 2826f8eb0..413ac6876 100644 --- a/src/Aguacongas.TheIdServer.Shared/Quickstart/Home/ErrorViewModel.cs +++ b/src/Aguacongas.TheIdServer.Duende/Quickstart/Home/ErrorViewModel.cs @@ -1,10 +1,6 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre -#if DUENDE +// Copyright (c) 2023 @Olivier Lefebvre using Duende.IdentityServer.Models; -#else -using IdentityServer4.Models; -#endif namespace Aguacongas.TheIdServer.UI { diff --git a/src/Aguacongas.TheIdServer.Shared/Quickstart/Home/HomeController.cs b/src/Aguacongas.TheIdServer.Duende/Quickstart/Home/HomeController.cs similarity index 93% rename from src/Aguacongas.TheIdServer.Shared/Quickstart/Home/HomeController.cs rename to src/Aguacongas.TheIdServer.Duende/Quickstart/Home/HomeController.cs index 2222fbee1..d2c2e5f16 100644 --- a/src/Aguacongas.TheIdServer.Shared/Quickstart/Home/HomeController.cs +++ b/src/Aguacongas.TheIdServer.Duende/Quickstart/Home/HomeController.cs @@ -1,10 +1,6 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre -#if DUENDE +// Copyright (c) 2023 @Olivier Lefebvre using Duende.IdentityServer.Services; -#else -using IdentityServer4.Services; -#endif using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/src/Aguacongas.TheIdServer.Shared/Quickstart/SecurityHeadersAttribute.cs b/src/Aguacongas.TheIdServer.Duende/Quickstart/SecurityHeadersAttribute.cs similarity index 84% rename from src/Aguacongas.TheIdServer.Shared/Quickstart/SecurityHeadersAttribute.cs rename to src/Aguacongas.TheIdServer.Duende/Quickstart/SecurityHeadersAttribute.cs index 674587c2b..6421ff544 100644 --- a/src/Aguacongas.TheIdServer.Shared/Quickstart/SecurityHeadersAttribute.cs +++ b/src/Aguacongas.TheIdServer.Duende/Quickstart/SecurityHeadersAttribute.cs @@ -1,5 +1,6 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre +using Aguacongas.TheIdServer.Models; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using System.Text; @@ -28,12 +29,15 @@ public override void OnResultExecuting(ResultExecutingContext context) // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy var builder = new StringBuilder("default-src 'self'"); builder.Append("; object-src 'none'; frame-ancestors 'self'; sandbox allow-forms allow-same-origin allow-scripts; base-uri 'self';upgrade-insecure-requests;"); - builder.Append("style-src 'self' https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css;"); + builder.Append("img-src 'self' data:; style-src 'self' "); + builder.Append(SiteOptions.BOOTSTRAPCSSURL); + builder.Append(';'); + var autorizeScriptsUrl = new[] { "'sha256-vwa3kDBkD7mP1Y0njpcyAH7GXn3/HkE72HGlVShVMUg='", - "https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js", - "https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.slim.min.js", + SiteOptions.BOOTSTRAPJSURL, + SiteOptions.JQUERYURL, }; builder.Append("script-src 'self'"); foreach(var url in autorizeScriptsUrl) @@ -44,8 +48,6 @@ public override void OnResultExecuting(ResultExecutingContext context) #if DEBUG builder.Append("; connect-src *"); #endif - // also an example if you need client images to be displayed from twitter - // builder.Append(";img-src 'self' https://pbs.twimg.com;"); var csp = builder.ToString(); // once for standards compliant browsers diff --git a/src/Aguacongas.TheIdServer.Duende/README.md b/src/Aguacongas.TheIdServer.Duende/README.md index 84242a03e..011dcf945 100644 --- a/src/Aguacongas.TheIdServer.Duende/README.md +++ b/src/Aguacongas.TheIdServer.Duende/README.md @@ -1,6 +1,6 @@ # TheIdServer Duende Web Server project -> This version of TheIdServer use [Duende IdentityServer](https://duendesoftware.com/products/identityserver), for a commercial use you need to [acquire a license](https://duendesoftware.com/products/identityserver#pricing). +> TheIdServer use [Duende IdentityServer](https://duendesoftware.com/products/identityserver), for a commercial use you need to [acquire a license](https://duendesoftware.com/products/identityserver#pricing). The server obtains configuration from *appsettings.json*, *appsettings.{Environment}.json*, command-line arguments, or environment variables. @@ -1005,4 +1005,4 @@ The endpoit return a json reponse depending on the store kind used and redis dep * [Hosting ASP.NET Core images with Docker over HTTPS](https://docs.microsoft.com/en-us/aspnet/core/security/docker-https) * [OpenID Connect Dynamic Client Registration](https://openid.net/specs/openid-connect-registration-1_0.html) * [Aguafrommars/DynamicConfiguration](https://github.com/Aguafrommars/DynamicConfiguration) -* [OpenTelemetry](https://opentelemetry.io/) \ No newline at end of file +* [OpenTelemetry](https://opentelemetry.io/) diff --git a/src/Aguacongas.TheIdServer.Shared/ScaffoldingReadMe.txt b/src/Aguacongas.TheIdServer.Duende/ScaffoldingReadMe.txt similarity index 100% rename from src/Aguacongas.TheIdServer.Shared/ScaffoldingReadMe.txt rename to src/Aguacongas.TheIdServer.Duende/ScaffoldingReadMe.txt diff --git a/src/Aguacongas.TheIdServer.Shared/SeedData.cs b/src/Aguacongas.TheIdServer.Duende/SeedData.cs similarity index 99% rename from src/Aguacongas.TheIdServer.Shared/SeedData.cs rename to src/Aguacongas.TheIdServer.Duende/SeedData.cs index e7ce6c4c4..309456a9d 100644 --- a/src/Aguacongas.TheIdServer.Shared/SeedData.cs +++ b/src/Aguacongas.TheIdServer.Duende/SeedData.cs @@ -1,5 +1,5 @@ // Project: Aguafrommars/TheIdServer -// Copyright (c) 2022 @Olivier Lefebvre +// Copyright (c) 2023 @Olivier Lefebvre using Aguacongas.IdentityServer.EntityFramework.Store; using Aguacongas.IdentityServer.Store; using Aguacongas.TheIdServer.Data; @@ -18,12 +18,9 @@ using System.Text.Json; using System.Threading.Tasks; using Entity = Aguacongas.IdentityServer.Store.Entity; -#if DUENDE using Duende.IdentityServer; using ISModels = Duende.IdentityServer.Models; -#else -using ISModels = IdentityServer4.Models; -#endif + namespace Aguacongas.TheIdServer { public static class SeedData @@ -208,9 +205,7 @@ private static void SeedApis(IConfiguration configuration, IServiceProvider prov Enabled = resource.Enabled, Id = resource.Name, -#if DUENDE RequireResourceIndicator = resource.RequireResourceIndicator -#endif }).GetAwaiter().GetResult(); } catch (ArgumentException) @@ -485,10 +480,7 @@ private static void SeedClients(IConfiguration configuration, IServiceProvider p var clientIdpRestrictionStore = provider.GetRequiredService>(); var clientUriStore = provider.GetRequiredService>(); var clientPropertyStore = provider.GetRequiredService>(); - -#if DUENDE var clientAllowedIdentityTokenSigningAlgorithmStore = provider.GetRequiredService>(); -#endif var loggerFactory = provider.GetRequiredService(); var logger = loggerFactory.CreateLogger("SeedClients"); @@ -555,15 +547,12 @@ private static void SeedClients(IConfiguration configuration, IServiceProvider p SeedClientRestrictions(clientIdpRestrictionStore, client); SeedClientProperties(clientPropertyStore, client); SeedClientUris(clientUriStore, client); -#if DUENDE SeedClientAllowedIdentityTokenSigningAlgorithms(clientAllowedIdentityTokenSigningAlgorithmStore, client); -#endif logger.LogInformation("Add client {ClientName}", client.ClientName); } } -#if DUENDE private static void SeedClientAllowedIdentityTokenSigningAlgorithms(IAdminStore clientAllowedIdentityTokenSigningAlgorithmStore, ISModels.Client client) { foreach (var algorythm in client.AllowedIdentityTokenSigningAlgorithms.Where(a => IdentityServerConstants.SupportedSigningAlgorithms.Contains(a))) @@ -583,7 +572,7 @@ private static void SeedClientAllowedIdentityTokenSigningAlgorithms(IAdminStore< } } } -#endif + private static void SeedClientUris(IAdminStore clientUriStore, ISModels.Client client) { var uris = client.RedirectUris.Select(o => new Entity.ClientUri diff --git a/src/Aguacongas.TheIdServer.Shared/Views/Account/AccessDenied.cshtml b/src/Aguacongas.TheIdServer.Duende/Views/Account/AccessDenied.cshtml similarity index 87% rename from src/Aguacongas.TheIdServer.Shared/Views/Account/AccessDenied.cshtml rename to src/Aguacongas.TheIdServer.Duende/Views/Account/AccessDenied.cshtml index 76d94d7ff..699d8fb26 100644 --- a/src/Aguacongas.TheIdServer.Shared/Views/Account/AccessDenied.cshtml +++ b/src/Aguacongas.TheIdServer.Duende/Views/Account/AccessDenied.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @inject IViewLocalizer Localizer diff --git a/src/Aguacongas.TheIdServer.Shared/Views/Account/LoggedOut.cshtml b/src/Aguacongas.TheIdServer.Duende/Views/Account/LoggedOut.cshtml similarity index 96% rename from src/Aguacongas.TheIdServer.Shared/Views/Account/LoggedOut.cshtml rename to src/Aguacongas.TheIdServer.Duende/Views/Account/LoggedOut.cshtml index 19c6b989e..754ae4361 100644 --- a/src/Aguacongas.TheIdServer.Shared/Views/Account/LoggedOut.cshtml +++ b/src/Aguacongas.TheIdServer.Duende/Views/Account/LoggedOut.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @inject IViewLocalizer Localizer diff --git a/src/Aguacongas.TheIdServer.Shared/Views/Account/Login.cshtml b/src/Aguacongas.TheIdServer.Duende/Views/Account/Login.cshtml similarity index 99% rename from src/Aguacongas.TheIdServer.Shared/Views/Account/Login.cshtml rename to src/Aguacongas.TheIdServer.Duende/Views/Account/Login.cshtml index ddb46b85e..c560dd0b2 100644 --- a/src/Aguacongas.TheIdServer.Shared/Views/Account/Login.cshtml +++ b/src/Aguacongas.TheIdServer.Duende/Views/Account/Login.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer - Copyright (c) 2022 @Olivier Lefebvre + Copyright (c) 2023 @Olivier Lefebvre *@ @inject IViewLocalizer Localizer diff --git a/src/Aguacongas.TheIdServer.Shared/Views/Account/Logout.cshtml b/src/Aguacongas.TheIdServer.Duende/Views/Account/Logout.cshtml similarity index 96% rename from src/Aguacongas.TheIdServer.Shared/Views/Account/Logout.cshtml rename to src/Aguacongas.TheIdServer.Duende/Views/Account/Logout.cshtml index 9079ff0d7..2184c7ffb 100644 --- a/src/Aguacongas.TheIdServer.Shared/Views/Account/Logout.cshtml +++ b/src/Aguacongas.TheIdServer.Duende/Views/Account/Logout.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @using Microsoft.Extensions.Options @using Aguacongas.TheIdServer.Models diff --git a/src/Aguacongas.TheIdServer.Duende/Views/Ciba/Consent.cshtml b/src/Aguacongas.TheIdServer.Duende/Views/Ciba/Consent.cshtml index 3612f977c..b11b481c6 100644 --- a/src/Aguacongas.TheIdServer.Duende/Views/Ciba/Consent.cshtml +++ b/src/Aguacongas.TheIdServer.Duende/Views/Ciba/Consent.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @inject Microsoft.AspNetCore.Mvc.Localization.IViewLocalizer Localizer diff --git a/src/Aguacongas.TheIdServer.Duende/Views/Ciba/_CibaScopeListItem.cshtml b/src/Aguacongas.TheIdServer.Duende/Views/Ciba/_CibaScopeListItem.cshtml index 7fb1ee8f4..dd81a5d5e 100644 --- a/src/Aguacongas.TheIdServer.Duende/Views/Ciba/_CibaScopeListItem.cshtml +++ b/src/Aguacongas.TheIdServer.Duende/Views/Ciba/_CibaScopeListItem.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @inject IViewLocalizer Localizer @model Aguacongas.TheIdServer.Duende.Quickstart.Ciba.ScopeViewModel diff --git a/src/Aguacongas.TheIdServer.Shared/Views/Consent/Index.cshtml b/src/Aguacongas.TheIdServer.Duende/Views/Consent/Index.cshtml similarity index 99% rename from src/Aguacongas.TheIdServer.Shared/Views/Consent/Index.cshtml rename to src/Aguacongas.TheIdServer.Duende/Views/Consent/Index.cshtml index 375ffe35c..9f91e829f 100644 --- a/src/Aguacongas.TheIdServer.Shared/Views/Consent/Index.cshtml +++ b/src/Aguacongas.TheIdServer.Duende/Views/Consent/Index.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @inject IViewLocalizer Localizer diff --git a/src/Aguacongas.TheIdServer.Shared/Views/Device/Success.cshtml b/src/Aguacongas.TheIdServer.Duende/Views/Device/Success.cshtml similarity index 86% rename from src/Aguacongas.TheIdServer.Shared/Views/Device/Success.cshtml rename to src/Aguacongas.TheIdServer.Duende/Views/Device/Success.cshtml index 2d35de0af..30944246b 100644 --- a/src/Aguacongas.TheIdServer.Shared/Views/Device/Success.cshtml +++ b/src/Aguacongas.TheIdServer.Duende/Views/Device/Success.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @inject IViewLocalizer Localizer diff --git a/src/Aguacongas.TheIdServer.Shared/Views/Device/UserCodeCapture.cshtml b/src/Aguacongas.TheIdServer.Duende/Views/Device/UserCodeCapture.cshtml similarity index 92% rename from src/Aguacongas.TheIdServer.Shared/Views/Device/UserCodeCapture.cshtml rename to src/Aguacongas.TheIdServer.Duende/Views/Device/UserCodeCapture.cshtml index bde0e9605..86eedd50f 100644 --- a/src/Aguacongas.TheIdServer.Shared/Views/Device/UserCodeCapture.cshtml +++ b/src/Aguacongas.TheIdServer.Duende/Views/Device/UserCodeCapture.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @inject IViewLocalizer Localizer diff --git a/src/Aguacongas.TheIdServer.Shared/Views/Device/UserCodeConfirmation.cshtml b/src/Aguacongas.TheIdServer.Duende/Views/Device/UserCodeConfirmation.cshtml similarity index 99% rename from src/Aguacongas.TheIdServer.Shared/Views/Device/UserCodeConfirmation.cshtml rename to src/Aguacongas.TheIdServer.Duende/Views/Device/UserCodeConfirmation.cshtml index 18e6ec27c..33321156b 100644 --- a/src/Aguacongas.TheIdServer.Shared/Views/Device/UserCodeConfirmation.cshtml +++ b/src/Aguacongas.TheIdServer.Duende/Views/Device/UserCodeConfirmation.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @inject IViewLocalizer Localizer diff --git a/src/Aguacongas.TheIdServer.Shared/Views/Diagnostics/Index.cshtml b/src/Aguacongas.TheIdServer.Duende/Views/Diagnostics/Index.cshtml similarity index 94% rename from src/Aguacongas.TheIdServer.Shared/Views/Diagnostics/Index.cshtml rename to src/Aguacongas.TheIdServer.Duende/Views/Diagnostics/Index.cshtml index 2baeed2fe..ab47074e5 100644 --- a/src/Aguacongas.TheIdServer.Shared/Views/Diagnostics/Index.cshtml +++ b/src/Aguacongas.TheIdServer.Duende/Views/Diagnostics/Index.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @model DiagnosticsViewModel diff --git a/src/Aguacongas.TheIdServer.Shared/Views/Shared/Error.cshtml b/src/Aguacongas.TheIdServer.Duende/Views/Shared/Error.cshtml similarity index 96% rename from src/Aguacongas.TheIdServer.Shared/Views/Shared/Error.cshtml rename to src/Aguacongas.TheIdServer.Duende/Views/Shared/Error.cshtml index c48090e68..6cc6d1f5f 100644 --- a/src/Aguacongas.TheIdServer.Shared/Views/Shared/Error.cshtml +++ b/src/Aguacongas.TheIdServer.Duende/Views/Shared/Error.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @inject IViewLocalizer Localizer diff --git a/src/Aguacongas.TheIdServer.Shared/Views/Shared/Redirect.cshtml b/src/Aguacongas.TheIdServer.Duende/Views/Shared/Redirect.cshtml similarity index 90% rename from src/Aguacongas.TheIdServer.Shared/Views/Shared/Redirect.cshtml rename to src/Aguacongas.TheIdServer.Duende/Views/Shared/Redirect.cshtml index 87f497f1a..7c855cf2e 100644 --- a/src/Aguacongas.TheIdServer.Shared/Views/Shared/Redirect.cshtml +++ b/src/Aguacongas.TheIdServer.Duende/Views/Shared/Redirect.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @inject IViewLocalizer Localizer diff --git a/src/Aguacongas.TheIdServer.Shared/Views/Shared/_Layout.cshtml b/src/Aguacongas.TheIdServer.Duende/Views/Shared/_Layout.cshtml similarity index 61% rename from src/Aguacongas.TheIdServer.Shared/Views/Shared/_Layout.cshtml rename to src/Aguacongas.TheIdServer.Duende/Views/Shared/_Layout.cshtml index 288ad500b..5a9deda92 100644 --- a/src/Aguacongas.TheIdServer.Shared/Views/Shared/_Layout.cshtml +++ b/src/Aguacongas.TheIdServer.Duende/Views/Shared/_Layout.cshtml @@ -1,9 +1,10 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @using Microsoft.Extensions.Options @using Aguacongas.TheIdServer.Models +@using System.Globalization; @inject IViewLocalizer Localizer @inject IOptions Options @{ @@ -14,7 +15,7 @@ Copyright (c) 2022 @Olivier Lefebvre } } - + @@ -22,22 +23,27 @@ Copyright (c) 2022 @Olivier Lefebvre @Options.Value.Name - - +
    -
    @RenderSection("scripts", required: false) + diff --git a/src/Aguacongas.TheIdServer.Shared/Views/Shared/_LoginPartial.cshtml b/src/Aguacongas.TheIdServer.Duende/Views/Shared/_LoginPartial.cshtml similarity index 96% rename from src/Aguacongas.TheIdServer.Shared/Views/Shared/_LoginPartial.cshtml rename to src/Aguacongas.TheIdServer.Duende/Views/Shared/_LoginPartial.cshtml index 6866bd367..91f181269 100644 --- a/src/Aguacongas.TheIdServer.Shared/Views/Shared/_LoginPartial.cshtml +++ b/src/Aguacongas.TheIdServer.Duende/Views/Shared/_LoginPartial.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @using Microsoft.AspNetCore.Identity @using Aguacongas.TheIdServer.Models diff --git a/src/Aguacongas.TheIdServer.Shared/Views/Shared/_ScopeListItem.cshtml b/src/Aguacongas.TheIdServer.Duende/Views/Shared/_ScopeListItem.cshtml similarity index 96% rename from src/Aguacongas.TheIdServer.Shared/Views/Shared/_ScopeListItem.cshtml rename to src/Aguacongas.TheIdServer.Duende/Views/Shared/_ScopeListItem.cshtml index 0d5f6cc1b..21d3495ae 100644 --- a/src/Aguacongas.TheIdServer.Shared/Views/Shared/_ScopeListItem.cshtml +++ b/src/Aguacongas.TheIdServer.Duende/Views/Shared/_ScopeListItem.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @inject IViewLocalizer Localizer diff --git a/src/Aguacongas.TheIdServer.Shared/Views/Shared/_ValidationSummary.cshtml b/src/Aguacongas.TheIdServer.Duende/Views/Shared/_ValidationSummary.cshtml similarity index 88% rename from src/Aguacongas.TheIdServer.Shared/Views/Shared/_ValidationSummary.cshtml rename to src/Aguacongas.TheIdServer.Duende/Views/Shared/_ValidationSummary.cshtml index fe8e8e37c..21fc11545 100644 --- a/src/Aguacongas.TheIdServer.Shared/Views/Shared/_ValidationSummary.cshtml +++ b/src/Aguacongas.TheIdServer.Duende/Views/Shared/_ValidationSummary.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @inject IViewLocalizer Localizer diff --git a/src/Aguacongas.TheIdServer.Duende/Views/Shared/_ViewImports.cshtml b/src/Aguacongas.TheIdServer.Duende/Views/Shared/_ViewImports.cshtml index ee68cdb37..1ed3f4940 100644 --- a/src/Aguacongas.TheIdServer.Duende/Views/Shared/_ViewImports.cshtml +++ b/src/Aguacongas.TheIdServer.Duende/Views/Shared/_ViewImports.cshtml @@ -1,5 +1,5 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @using Duende.IdentityServer.Extensions \ No newline at end of file diff --git a/src/Aguacongas.TheIdServer.Shared/Views/_ViewImports.cshtml b/src/Aguacongas.TheIdServer.Duende/Views/_ViewImports.cshtml similarity index 82% rename from src/Aguacongas.TheIdServer.Shared/Views/_ViewImports.cshtml rename to src/Aguacongas.TheIdServer.Duende/Views/_ViewImports.cshtml index 5316de43c..b4dc2d43e 100644 --- a/src/Aguacongas.TheIdServer.Shared/Views/_ViewImports.cshtml +++ b/src/Aguacongas.TheIdServer.Duende/Views/_ViewImports.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @using Aguacongas.TheIdServer.UI @using Microsoft.AspNetCore.Mvc.Localization diff --git a/src/Aguacongas.TheIdServer.Shared/Views/_ViewStart.cshtml b/src/Aguacongas.TheIdServer.Duende/Views/_ViewStart.cshtml similarity index 66% rename from src/Aguacongas.TheIdServer.Shared/Views/_ViewStart.cshtml rename to src/Aguacongas.TheIdServer.Duende/Views/_ViewStart.cshtml index 61a75348d..beaf31b1d 100644 --- a/src/Aguacongas.TheIdServer.Shared/Views/_ViewStart.cshtml +++ b/src/Aguacongas.TheIdServer.Duende/Views/_ViewStart.cshtml @@ -1,6 +1,6 @@ @* Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre +Copyright (c) 2023 @Olivier Lefebvre *@ @{ Layout = "_Layout"; diff --git a/src/Aguacongas.TheIdServer.Duende/appsettings.json b/src/Aguacongas.TheIdServer.Duende/appsettings.json index e7744e575..4e075b0d1 100644 --- a/src/Aguacongas.TheIdServer.Duende/appsettings.json +++ b/src/Aguacongas.TheIdServer.Duende/appsettings.json @@ -93,13 +93,14 @@ } }, "DataProtectionOptions": { - "StorageKind": "EntityFramework" + "StorageKind": "EntityFramework", + "ApplicationName": "TheIdServer" }, "DisableTokenCleanup": true, "TokenCleanupInterval": "00:05:00", "Proxy": false, "Migrate": true, - "DbType": "InMemory", + "DbType": "SqlServer", "Seed": true, "AuthenticatorIssuer": "TheIdServer", "EnableOpenApiDoc": true, @@ -527,5 +528,20 @@ "Description": "The wep page of the user" } ] + }, + "Saml2POptions": { + "X509CertificateValidationMode": "None", + "ContactPersons": [ + { + "ContactKind": "Technical", + "Company": "Aguafrommars", + "GivenName": "Olivier Lefebvre", + "SurName": "Aguacongas", + "EmailAddress": "aguacongas@gmail.com" + } + ], + "RevocationMode": "NoCheck", + "SignatureAlgorithm": "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256", + "ValidUntil": 365 } } \ No newline at end of file diff --git a/src/Aguacongas.TheIdServer.Shared/libman.json b/src/Aguacongas.TheIdServer.Duende/libman.json similarity index 100% rename from src/Aguacongas.TheIdServer.Shared/libman.json rename to src/Aguacongas.TheIdServer.Duende/libman.json diff --git a/src/Aguacongas.TheIdServer.Shared/tempkey.rsa b/src/Aguacongas.TheIdServer.Duende/tempkey.rsa similarity index 100% rename from src/Aguacongas.TheIdServer.Shared/tempkey.rsa rename to src/Aguacongas.TheIdServer.Duende/tempkey.rsa diff --git a/src/Aguacongas.TheIdServer.Duende/wwwroot/heroku-welcome-fragment.html b/src/Aguacongas.TheIdServer.Duende/wwwroot/heroku-welcome-fragment.html index b0c3681e0..b0eb0b9c4 100644 --- a/src/Aguacongas.TheIdServer.Duende/wwwroot/heroku-welcome-fragment.html +++ b/src/Aguacongas.TheIdServer.Duende/wwwroot/heroku-welcome-fragment.html @@ -2,7 +2,7 @@ This application manage your TheIdServer. An OpenID/Connect, OAuth2 and WS-Federation - server based on IdentityServer4. + server based on IdentityServer.

    Visit the github site for doc, source code and issue tracking. diff --git a/src/Aguacongas.TheIdServer.Duende/wwwroot/js/signout-redirect.js b/src/Aguacongas.TheIdServer.Duende/wwwroot/js/signout-redirect.js index 3d497358c..f55ca141a 100644 --- a/src/Aguacongas.TheIdServer.Duende/wwwroot/js/signout-redirect.js +++ b/src/Aguacongas.TheIdServer.Duende/wwwroot/js/signout-redirect.js @@ -1,5 +1,5 @@ $(function () { - var a = document.querySelector("a.PostLogoutRedirectUri"); + const a = document.querySelector("a.PostLogoutRedirectUri"); if (a) { window.location = a.href; } diff --git a/src/Aguacongas.TheIdServer.Duende/wwwroot/js/theme.js b/src/Aguacongas.TheIdServer.Duende/wwwroot/js/theme.js new file mode 100644 index 000000000..41096e085 --- /dev/null +++ b/src/Aguacongas.TheIdServer.Duende/wwwroot/js/theme.js @@ -0,0 +1,26 @@ +(() => { + 'use strict' + + const setTheme = theme => { + document.documentElement.setAttribute('data-bs-theme', theme) + localStorage.setItem('theme', theme) + const span = window.document.getElementById('theme-icon') + span.className = theme === 'dark' ? 'oi oi-sun' : 'oi oi-moon' + } + const getTheme = () => { + const storedTheme = localStorage.getItem('theme') + + if (storedTheme) { + return storedTheme + } + + return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light' + } + + const togleButton = window.document.getElementById('theme-toggle-button') + togleButton.addEventListener('click', ev => { + const theme = getTheme() === 'dark' ? 'light' : 'dark' + setTheme(theme) + }) + setTheme(getTheme()) +})() diff --git a/src/Aguacongas.TheIdServer.IS4/Aguacongas.TheIdServer.IS4.csproj b/src/Aguacongas.TheIdServer.IS4/Aguacongas.TheIdServer.IS4.csproj deleted file mode 100644 index 3e1de4bed..000000000 --- a/src/Aguacongas.TheIdServer.IS4/Aguacongas.TheIdServer.IS4.csproj +++ /dev/null @@ -1,125 +0,0 @@ - - - - net7.0 - 51a7f0be-96e4-42d5-ad09-37e9adabfff6 - Linux - ..\.. - - True - - - - 1701;1702;NU1603 - - - - 1701;1702;NU1603 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Always - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Aguacongas.TheIdServer.IS4/Dockerfile b/src/Aguacongas.TheIdServer.IS4/Dockerfile deleted file mode 100644 index ed4a18417..000000000 --- a/src/Aguacongas.TheIdServer.IS4/Dockerfile +++ /dev/null @@ -1,75 +0,0 @@ -#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. - -FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base -WORKDIR /app -EXPOSE 80 -EXPOSE 443 - -FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build -WORKDIR /src -COPY ["nuget.config", "."] -COPY ["src/Aguacongas.TheIdServer.IS4/Aguacongas.TheIdServer.IS4.csproj", "src/Aguacongas.TheIdServer.IS4/"] -COPY ["src/IdentityServer/IS4/Aguacongas.IdentityServer.Admin.IS4/Aguacongas.IdentityServer.Admin.IS4.csproj", "src/IdentityServer/IS4/Aguacongas.IdentityServer.Admin.IS4/"] -COPY ["src/IdentityServer/Aguacongas.IdentityServer.Admin/Aguacongas.IdentityServer.Admin.csproj", "src/IdentityServer/Aguacongas.IdentityServer.Admin/"] -COPY ["src/IdentityServer/Aguacongas.IdentityServer.KeysRotation/Aguacongas.IdentityServer.KeysRotation.csproj", "src/IdentityServer/Aguacongas.IdentityServer.KeysRotation/"] -COPY ["src/IdentityServer/Aguacongas.IdentityServer/Aguacongas.IdentityServer.csproj", "src/IdentityServer/Aguacongas.IdentityServer/"] -COPY ["src/Aguacongas.TheIdServer.Authentication/Aguacongas.TheIdServer.Authentication.csproj", "src/Aguacongas.TheIdServer.Authentication/"] -COPY ["src/IdentityServer/Aguacongas.IdentityServer.Store/Aguacongas.IdentityServer.Store.csproj", "src/IdentityServer/Aguacongas.IdentityServer.Store/"] -COPY ["src/Aguacongas.TheIdServer.Identity/Aguacongas.TheIdServer.Identity.csproj", "src/Aguacongas.TheIdServer.Identity/"] -COPY ["src/IdentityServer/IS4/Aguacongas.IdentityServer.KeysRotation.IS4/Aguacongas.IdentityServer.KeysRotation.IS4.csproj", "src/IdentityServer/IS4/Aguacongas.IdentityServer.KeysRotation.IS4/"] -COPY ["src/IdentityServer/IS4/Aguacongas.IdentityServer.IS4/Aguacongas.IdentityServer.IS4.csproj", "src/IdentityServer/IS4/Aguacongas.IdentityServer.IS4/"] -COPY ["src/IdentityServer/IS4/Aguacongas.IdentityServer.MongoDb.Store.IS4/Aguacongas.IdentityServer.MongoDb.Store.IS4.csproj", "src/IdentityServer/IS4/Aguacongas.IdentityServer.MongoDb.Store.IS4/"] -COPY ["src/IdentityServer/Aguacongas.IdentityServer.MongoDb.Store/Aguacongas.IdentityServer.MongoDb.Store.csproj", "src/IdentityServer/Aguacongas.IdentityServer.MongoDb.Store/"] -COPY ["src/IdentityServer/IS4/Aguacongas.IdentityServer.RavenDb.Store.IS4/Aguacongas.IdentityServer.RavenDb.Store.IS4.csproj", "src/IdentityServer/IS4/Aguacongas.IdentityServer.RavenDb.Store.IS4/"] -COPY ["src/IdentityServer/Aguacongas.IdentityServer.RavenDb.Store/Aguacongas.IdentityServer.RavenDb.Store.csproj", "src/IdentityServer/Aguacongas.IdentityServer.RavenDb.Store/"] -COPY ["src/Aguacongas.TheIdServer/Aguacongas.TheIdServer.csproj", "src/Aguacongas.TheIdServer/"] -COPY ["src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.Sqlite/Aguacongas.TheIdServer.Migrations.Sqlite.csproj", "src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.Sqlite/"] -COPY ["src/IdentityServer/Aguacongas.IdentityServer.EntityFramework.Store/Aguacongas.IdentityServer.EntityFramework.Store.csproj", "src/IdentityServer/Aguacongas.IdentityServer.EntityFramework.Store/"] -COPY ["src/IdentityServer/Aguacongas.IdentityServer.Http.Store/Aguacongas.IdentityServer.Http.Store.csproj", "src/IdentityServer/Aguacongas.IdentityServer.Http.Store/"] -COPY ["src/IdentityServer/Aguacongas.IdentityServer.Admin.Http.Store/Aguacongas.IdentityServer.Admin.Http.Store.csproj", "src/IdentityServer/Aguacongas.IdentityServer.Admin.Http.Store/"] -COPY ["src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.SqlServer/Aguacongas.TheIdServer.Migrations.SqlServer.csproj", "src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.SqlServer/"] -COPY ["src/IdentityServer/Aguacongas.IdentityServer.WsFederation/Aguacongas.IdentityServer.WsFederation.csproj", "src/IdentityServer/Aguacongas.IdentityServer.WsFederation/"] -COPY ["src/Aguacongas.TheIdServer.BlazorApp/Aguacongas.TheIdServer.BlazorApp.csproj", "src/Aguacongas.TheIdServer.BlazorApp/"] -COPY ["src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.ApiScope/Aguacongas.TheIdServer.BlazorApp.Pages.ApiScope.csproj", "src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.ApiScope/"] -COPY ["src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Components/Aguacongas.TheIdServer.BlazorApp.Components.csproj", "src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Components/"] -COPY ["src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Infrastructure/Aguacongas.TheIdServer.BlazorApp.Infrastructure.csproj", "src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Infrastructure/"] -COPY ["src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.RelyingParties/Aguacongas.TheIdServer.BlazorApp.Pages.RelyingParties.csproj", "src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.RelyingParties/"] -COPY ["src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Identity/Aguacongas.TheIdServer.BlazorApp.Pages.Identity.csproj", "src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Identity/"] -COPY ["src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Api/Aguacongas.TheIdServer.BlazorApp.Pages.Api.csproj", "src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Api/"] -COPY ["src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Role/Aguacongas.TheIdServer.BlazorApp.Pages.Role.csproj", "src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Role/"] -COPY ["src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Identities/Aguacongas.TheIdServer.BlazorApp.Pages.Identities.csproj", "src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Identities/"] -COPY ["src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Import/Aguacongas.TheIdServer.BlazorApp.Pages.Import.csproj", "src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Import/"] -COPY ["src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProvider/Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProvider.csproj", "src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProvider/"] -COPY ["src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.RelyingParty/Aguacongas.TheIdServer.BlazorApp.Pages.RelyingParty.csproj", "src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.RelyingParty/"] -COPY ["src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProviders/Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProviders.csproj", "src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProviders/"] -COPY ["src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages/Aguacongas.TheIdServer.BlazorApp.Pages.csproj", "src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages/"] -COPY ["src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.ApiScopes/Aguacongas.TheIdServer.BlazorApp.Pages.ApiScopes.csproj", "src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.ApiScopes/"] -COPY ["src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Culture/Aguacongas.TheIdServer.BlazorApp.Pages.Culture.csproj", "src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Culture/"] -COPY ["src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Clients/Aguacongas.TheIdServer.BlazorApp.Pages.Clients.csproj", "src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Clients/"] -COPY ["src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Cultures/Aguacongas.TheIdServer.BlazorApp.Pages.Cultures.csproj", "src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Cultures/"] -COPY ["src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Apis/Aguacongas.TheIdServer.BlazorApp.Pages.Apis.csproj", "src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Apis/"] -COPY ["src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Roles/Aguacongas.TheIdServer.BlazorApp.Pages.Roles.csproj", "src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Roles/"] -COPY ["src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Client/Aguacongas.TheIdServer.BlazorApp.Pages.Client.csproj", "src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Client/"] -COPY ["src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Keys/Aguacongas.TheIdServer.BlazorApp.Pages.Keys.csproj", "src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Keys/"] -COPY ["src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.User/Aguacongas.TheIdServer.BlazorApp.Pages.User.csproj", "src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.User/"] -COPY ["src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Users/Aguacongas.TheIdServer.BlazorApp.Pages.Users.csproj", "src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Users/"] -COPY ["src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.Oracle/Aguacongas.TheIdServer.Migrations.Oracle.csproj", "src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.Oracle/"] -COPY ["src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.MySql/Aguacongas.TheIdServer.Migrations.MySql.csproj", "src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.MySql/"] -COPY ["src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.PostgreSQL/Aguacongas.TheIdServer.Migrations.PostgreSQL.csproj", "src/IdentityServer/Migrations/Aguacongas.TheIdServer.Migrations.PostgreSQL/"] -COPY ["src/IdentityServer/IS4/Aguacongas.IdentityServer.EntityFramework.Store.IS4/Aguacongas.IdentityServer.EntityFramework.Store.IS4.csproj", "src/IdentityServer/IS4/Aguacongas.IdentityServer.EntityFramework.Store.IS4/"] -COPY ["src/IdentityServer/IS4/Aguacongas.IdentityServer.WsFederation.IS4/Aguacongas.IdentityServer.WsFederation.IS4.csproj", "src/IdentityServer/IS4/Aguacongas.IdentityServer.WsFederation.IS4/"] -RUN apt-get update -y -RUN apt-get install -y python3 -RUN dotnet workload install wasm-tools -RUN dotnet restore "src/Aguacongas.TheIdServer.IS4/Aguacongas.TheIdServer.IS4.csproj" -COPY . . -WORKDIR "/src/src/Aguacongas.TheIdServer.IS4" -RUN dotnet build "Aguacongas.TheIdServer.IS4.csproj" -c Release -o /app/build -p:FileVersion=$FILE_VERSION -p:SourceRevisionId=$SOURCE_VERSION - -FROM build AS publish -RUN dotnet publish "Aguacongas.TheIdServer.IS4.csproj" -c Release -o /app/publish -p:FileVersion=$FILE_VERSION -p:SourceRevisionId=$SOURCE_VERSION - -FROM base AS final -WORKDIR /app -COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "Aguacongas.TheIdServer.IS4.dll"] diff --git a/src/Aguacongas.TheIdServer.IS4/Localization-fr.json b/src/Aguacongas.TheIdServer.IS4/Localization-fr.json deleted file mode 100644 index a7ce94707..000000000 --- a/src/Aguacongas.TheIdServer.IS4/Localization-fr.json +++ /dev/null @@ -1,2002 +0,0 @@ -[ - { - "key": "(required)", - "value": "(obligatoire)" - }, - { - "key": "{0} is requesting your permission", - "value": "{0} demande votre autorisation" - }, - { - "key": "'{0}' cannot be added to a client with grant type '{1}'.", - "value": "'{0}' ne peut pas être ajouté à un client avec le type d'octroi '{1}'." - }, - { - "key": "{0} is not a valid uri.", - "value": "{0} n'est pas un uri valide." - }, - { - "key": "2fa has been disabled. You can reenable 2fa when you setup an authenticator app", - "value": "2fa a été désactivé. Vous pouvez réactiver 2fa lorsque vous configurez une application d'authentification" - }, - { - "key": "About", - "value": "A propos" - }, - { - "key": "Absolute", - "value": "Absolu" - }, - { - "key": "absolute refresh token lifetime", - "value": "durée de vie absolue du jeton d'actualisation" - }, - { - "key": "Access Denied", - "value": "Accès refusé" - }, - { - "key": "access failed count", - "value": "nombre d'échecs d'accès" - }, - { - "key": "access token lifetime", - "value": "durée de vie du jeton d'accès" - }, - { - "key": "access token type", - "value": "type de jeton d'accès" - }, - { - "key": "access type", - "value": "Type d'accès" - }, - { - "key": "activation", - "value": "activation" - }, - { - "key": "Add", - "value": "Ajouter" - }, - { - "key": "Add another service to log in.", - "value": "Ajoutez un autre service pour vous connecter." - }, - { - "key": "Add authenticator app", - "value": "Ajouter une application d'authentification" - }, - { - "key": "allow access tokens via browser", - "value": "autoriser les jetons d'accès via le navigateur" - }, - { - "key": "allow offline access", - "value": "autoriser l'accès hors ligne" - }, - { - "key": "allow plain text PKCE", - "value": "autoriser le PKCE en texte brut" - }, - { - "key": "allow unsolicited logins", - "value": "autoriser les connexions non sollicitées" - }, - { - "key": "always include user claims in id token", - "value": "toujours inclure les revendications des utilisateurs dans le jeton d'identification" - }, - { - "key": "always send claims", - "value": "toujours envoyer des réclamations" - }, - { - "key": "An url cannot exceed 2000 char.", - "value": "Une URL ne peut pas dépasser 2000 caractères." - }, - { - "key": "api", - "value": "api" - }, - { - "key": "API Grants", - "value": "Subventions API" - }, - { - "key": "api id", - "value": "identifiant API" - }, - { - "key": "Apis", - "value": "Apis" - }, - { - "key": "app id", - "value": "identifiant d'application" - }, - { - "key": "app secret", - "value": "secret de l'application" - }, - { - "key": "Application Access", - "value": "Accès aux applications" - }, - { - "key": "Associate your {0} account.", - "value": "Associez votre compte {0}." - }, - { - "key": "Authentication in progress", - "value": "Authentification en cours" - }, - { - "key": "Authenticator app", - "value": "Application d'authentification" - }, - { - "key": "Authenticator code", - "value": "Code d'authentification" - }, - { - "key": "authority", - "value": "autorité" - }, - { - "key": "Authority is required.", - "value": "L'autorité est requise." - }, - { - "key": "Authority must be a valid uir.", - "value": "L'autorité doit être un uir valide." - }, - { - "key": "authorization code lifetime", - "value": "durée de vie du code d'autorisation" - }, - { - "key": "authorization endpoint", - "value": "point de terminaison d'autorisation" - }, - { - "key": "Authorization endpoint is required.", - "value": "Le point de terminaison d'autorisation est requis." - }, - { - "key": "Authorization endpoint must be a valid uri.", - "value": "Le point de terminaison d'autorisation doit être une URI valide." - }, - { - "key": "back channel logout uri", - "value": "uri de déconnexion du canal arrière" - }, - { - "key": "back channel logout uri required", - "value": "URI de déconnexion du canal arrière requis" - }, - { - "key": "Below is the list of applications you have given access to and the names of the resources they have access to.", - "value": "Vous trouverez ci-dessous la liste des applications auxquelles vous avez donné accès et les noms des ressources auxquelles elles ont accès." - }, - { - "key": "Cancel", - "value": "Annuler" - }, - { - "key": "Change email", - "value": "Changer l'e-mail" - }, - { - "key": "Change password", - "value": "Changer le mot de passe" - }, - { - "key": "Change your account settings", - "value": "Modifier les paramètres de votre compte" - }, - { - "key": "Checking login state...", - "value": "Vérification de l'état de connexion..." - }, - { - "key": "claim type", - "value": "type de réclamation" - }, - { - "key": "Claims", - "value": "Réclamations" - }, - { - "key": "claims", - "value": "réclamations" - }, - { - "key": "claims mapping", - "value": "cartographie des revendications" - }, - { - "key": "Claims mapping", - "value": "Cartographie des revendications" - }, - { - "key": "claims prefix", - "value": "préfixe de revendications" - }, - { - "key": "claims transformations", - "value": "transformations de revendications" - }, - { - "key": "Claims transformations", - "value": "Transformations des reclamations" - }, - { - "key": "Click here to return to the {1} application.", - "value": "Cliquez ici pour revenir à l'application {1}." - }, - { - "key": "Client Application Access", - "value": "Accès aux applications clientes" - }, - { - "key": "client id", - "value": "identité du client" - }, - { - "key": "Client Id is required.", - "value": "L'ID client est requis." - }, - { - "key": "client name", - "value": "Nom du client" - }, - { - "key": "client secret", - "value": "secret client" - }, - { - "key": "Client Secret is required.", - "value": "Le secret client est requis." - }, - { - "key": "client uri", - "value": "uri client" - }, - { - "key": "Clients", - "value": "Clients" - }, - { - "key": "Close", - "value": "Fermer" - }, - { - "key": "Code", - "value": "Code" - }, - { - "key": "Completing login...", - "value": "Fin de la connexion..." - }, - { - "key": "Configure authenticator app", - "value": "Configurer l'application d'authentification" - }, - { - "key": "Confirm email", - "value": "Confirmez votre email" - }, - { - "key": "Confirm email change", - "value": "Confirmer le changement d'e-mail" - }, - { - "key": "Confirm new password", - "value": "Confirmer le nouveau mot de passe" - }, - { - "key": "Confirm password", - "value": "Confirmez le mot de passe" - }, - { - "key": "Confirm your email", - "value": "confirmez votre email" - }, - { - "key": "Confirmation link to change email sent. Please check your email.", - "value": "Lien de confirmation pour modifier l'e-mail envoyé. Merci de consulter vos emails." - }, - { - "key": "consent", - "value": "consentement" - }, - { - "key": "Consent", - "value": "Consentement" - }, - { - "key": "consent lifetime", - "value": "durée de vie du consentement" - }, - { - "key": "consents", - "value": "consentements" - }, - { - "key": "Consents", - "value": "Consentements" - }, - { - "key": "consumer key", - "value": "La clé du consommateur" - }, - { - "key": "Consumer Key is required.", - "value": "La clé du consommateur est requise." - }, - { - "key": "consumer secret", - "value": "secret du consommateur" - }, - { - "key": "Consumer Secret is required.", - "value": "Le secret du consommateur est requis." - }, - { - "key": "cors", - "value": "cors" - }, - { - "key": "Create a new account.", - "value": "Créer un nouveau compte." - }, - { - "key": "create at", - "value": "créer à" - }, - { - "key": "Created:", - "value": "Créé:" - }, - { - "key": "creation", - "value": "création" - }, - { - "key": "culture", - "value": "culture" - }, - { - "key": "Cultures", - "value": "Cultures" - }, - { - "key": "Current password", - "value": "Mot de passe actuel" - }, - { - "key": "data", - "value": "données" - }, - { - "key": "Data Protection", - "value": "Protection des données" - }, - { - "key": "decription", - "value": "description" - }, - { - "key": "Delete", - "value": "Supprimer" - }, - { - "key": "Delete data and close my account", - "value": "Supprimer des données et fermer mon compte" - }, - { - "key": "Delete Personal Data", - "value": "Supprimer les données personnelles" - }, - { - "key": "Deleted", - "value": "Supprimé" - }, - { - "key": "Deleting this data will permanently remove your account, and this cannot be recovered.", - "value": "La suppression de ces données supprimera définitivement votre compte et celui-ci ne pourra pas être récupéré." - }, - { - "key": "description", - "value": "description" - }, - { - "key": "device flow request lifetime", - "value": "durée de vie de la demande de flux de l'appareil" - }, - { - "key": "Disable 2FA", - "value": "Désactiver 2FA" - }, - { - "key": "disable telemetry", - "value": "désactiver la télémétrie" - }, - { - "key": "Disable two-factor authentication (2FA)", - "value": "Désactiver l'authentification à deux facteurs (2FA)" - }, - { - "key": "Disabling 2FA does not change the keys used in authenticator apps. If you wish to change the key used in an authenticator app you should reset your authenticator keys.", - "value": "La désactivation de 2FA ne modifie pas les clés utilisées dans les applications d'authentification. Si vous souhaitez modifier la clé utilisée dans une application d'authentification, vous devez réinitialiser vos clés d'authentification." - }, - { - "key": "display name", - "value": "nom d'affichage" - }, - { - "key": "Don't have access to your authenticator device? You can log in with a recovery code.", - "value": "Vous n'avez pas accès à votre appareil d'authentification ? Vous pouvez vous connecter avec un code de récupération." - }, - { - "key": "Download", - "value": "Télécharger" - }, - { - "key": "Download a two-factor authenticator app like Microsoft Authenticator for Windows Phone, Android and iOS or Google Authenticator for Android and iOS.", - "value": "Téléchargez une application d'authentification à deux facteurs telle que Microsoft Authenticator pour Windows Phone, Android et iOS ou Google Authenticator pour Android et iOS ." - }, - { - "key": "Download Your Data", - "value": "Téléchargez vos données" - }, - { - "key": "Editing the profile is not supported.", - "value": "La modification du profil n'est pas prise en charge." - }, - { - "key": "Email", - "value": "E-mail" - }, - { - "key": "email", - "value": "e-mail" - }, - { - "key": "email confirmed", - "value": "e-mail confirmé" - }, - { - "key": "emphasize", - "value": "souligner" - }, - { - "key": "enable local login", - "value": "activer la connexion locale" - }, - { - "key": "enabled", - "value": "activée" - }, - { - "key": "encryption certificate", - "value": "certificat de cryptage" - }, - { - "key": "Enter your email.", - "value": "Entrer votre Email." - }, - { - "key": "Entities created", - "value": "Entités créées" - }, - { - "key": "Entities updated", - "value": "Entités mises à jour" - }, - { - "key": "Error", - "value": "Erreur" - }, - { - "key": "Error changing email.", - "value": "Erreur lors de la modification de l'e-mail." - }, - { - "key": "Error changing user name.", - "value": "Erreur lors de la modification du nom d'utilisateur." - }, - { - "key": "Error confirming your email.", - "value": "Erreur de confirmation de votre e-mail." - }, - { - "key": "Error from external provider: {0}", - "value": "Erreur du fournisseur externe : {0}" - }, - { - "key": "Error loading external login information during confirmation.", - "value": "Erreur lors du chargement des informations de connexion externes lors de la confirmation." - }, - { - "key": "Error loading external login information.", - "value": "Erreur lors du chargement des informations de connexion externes." - }, - { - "key": "Error when trying to revoke the key.", - "value": "Erreur lors de la tentative de révoquer la clé." - }, - { - "key": "expiration", - "value": "expiration" - }, - { - "key": "expire at", - "value": "expire à" - }, - { - "key": "Expires:", - "value": "Expire :" - }, - { - "key": "export", - "value": "exportation" - }, - { - "key": "External Login", - "value": "Connexion externe" - }, - { - "key": "External login tokens", - "value": "Jetons de connexion externes" - }, - { - "key": "external logins", - "value": "connexions externes" - }, - { - "key": "External logins", - "value": "Connexions externes" - }, - { - "key": "external logins tokens", - "value": "jetons de connexion externes" - }, - { - "key": "External provider restrictions", - "value": "Restrictions des fournisseurs externes" - }, - { - "key": "field", - "value": "champ" - }, - { - "key": "fields", - "value": "champs" - }, - { - "key": "filter", - "value": "filtre" - }, - { - "key": "Forget this browser", - "value": "Oubliez ce navigateur" - }, - { - "key": "Forgot password confirmation", - "value": "Mot de passe oublié" - }, - { - "key": "Forgot your password?", - "value": "Mot de passe oublié?" - }, - { - "key": "from claim type", - "value": "du type de réclamation" - }, - { - "key": "front channel logout uri", - "value": "uri de déconnexion du canal avant" - }, - { - "key": "front channel logout uri required", - "value": "URI de déconnexion du canal avant requis" - }, - { - "key": "Generate Recovery Codes", - "value": "Générer des codes de récupération" - }, - { - "key": "Generate two-factor authentication (2FA) recovery codes", - "value": "Générer des codes de récupération d'authentification à deux facteurs (2FA)" - }, - { - "key": "Generating new recovery codes does not change the keys used in authenticator apps. If you wish to change the key used in an authenticator app you should reset your authenticator keys.", - "value": "La génération de nouveaux codes de récupération ne modifie pas les clés utilisées dans les applications d'authentification. Si vous souhaitez modifier la clé utilisée dans une application d'authentification, vous devez réinitialiser vos clés d'authentification." - }, - { - "key": "grant type", - "value": "type de subvention" - }, - { - "key": "grant types", - "value": "types de subventions" - }, - { - "key": "Grant types", - "value": "Types de subventions" - }, - { - "key": "Grants", - "value": "Subventions" - }, - { - "key": "Hello {0}!", - "value": "Bonjour {0} !" - }, - { - "key": "Hello, {0}!", - "value": "Bonjour, {0} !" - }, - { - "key": "Home", - "value": "Accueil" - }, - { - "key": "id", - "value": "identifiant" - }, - { - "key": "id token lifetime", - "value": "durée de vie du jeton d'identification" - }, - { - "key": "Identities", - "value": "Identités" - }, - { - "key": "identity", - "value": "identité" - }, - { - "key": "Identity Grants", - "value": "Octroi d'identité" - }, - { - "key": "idp restrictions", - "value": "restrictions IDP" - }, - { - "key": "If you lose your device and don't have the recovery codes you will lose access to your account.", - "value": "Si vous perdez votre appareil et n'avez pas les codes de récupération, vous perdrez l'accès à votre compte." - }, - { - "key": "If you reset your authenticator key your authenticator app will not work until you reconfigure it.", - "value": "Si vous réinitialisez votre clé d'authentification, votre application d'authentification ne fonctionnera pas tant que vous ne la reconfigurerez pas." - }, - { - "key": "Import", - "value": "Importer" - }, - { - "key": "include JWT id", - "value": "inclure l'identifiant JWT" - }, - { - "key": "Incorrect password.", - "value": "Mot de passe incorrect." - }, - { - "key": "Invalid authenticator code.", - "value": "Code d'authentification invalide." - }, - { - "key": "Invalid file", - "value": "Fichier non valide" - }, - { - "key": "Invalid login request", - "value": "Demande de connexion invalide" - }, - { - "key": "Invalid recovery code entered.", - "value": "Code de récupération entré non valide." - }, - { - "key": "issuer", - "value": "émetteur" - }, - { - "key": "key", - "value": "clé" - }, - { - "key": "Keys", - "value": "Clés" - }, - { - "key": "lifetime", - "value": "durée de vie" - }, - { - "key": "Loading...", - "value": "Chargement..." - }, - { - "key": "Local Login", - "value": "Connexion locale" - }, - { - "key": "localized description", - "value": "description localisée" - }, - { - "key": "localized display name", - "value": "nom d'affichage localisé" - }, - { - "key": "lockout enabled", - "value": "verrouillage activé" - }, - { - "key": "lockout end", - "value": "fin de verrouillage" - }, - { - "key": "Log in", - "value": "Connexion" - }, - { - "key": "Log in using your {0} account", - "value": "Connectez-vous en utilisant votre compte {0}" - }, - { - "key": "Log out", - "value": "Se déconnecter" - }, - { - "key": "Login", - "value": "Connexion" - }, - { - "key": "Login form", - "value": "Formulaire de connexion" - }, - { - "key": "logo uri", - "value": "logo uri" - }, - { - "key": "Logout", - "value": "Se déconnecter" - }, - { - "key": "Logout form", - "value": "Formulaire de déconnexion" - }, - { - "key": "Manage Email", - "value": "Gérer les e-mails" - }, - { - "key": "Manage your account", - "value": "Gérer votre compte" - }, - { - "key": "Manage your external logins", - "value": "Gérez vos logins externes" - }, - { - "key": "map default outbound JWT claim types", - "value": "mapper les types de revendication JWT sortants par défaut" - }, - { - "key": "metadata address", - "value": "adresse de métadonnées" - }, - { - "key": "Metadata address is required.", - "value": "L'adresse de métadonnées est requise." - }, - { - "key": "Metadata address must be a valid HTTPS url when 'required https metadata is true'.", - "value": "L'adresse de métadonnées doit être une URL HTTPS valide lorsque « les métadonnées https requises sont vraies »." - }, - { - "key": "Metadata address must be a valid uri.", - "value": "L'adresse de métadonnées doit être un uri valide." - }, - { - "key": "name", - "value": "Nom" - }, - { - "key": "name id format", - "value": "format d'identifiant de nom" - }, - { - "key": "New email", - "value": "Nouvel e-mail" - }, - { - "key": "New password", - "value": "Nouveau mot de passe" - }, - { - "key": "No changes", - "value": "Aucun changement" - }, - { - "key": "No, Do Not Allow", - "value": "Non, ne pas autoriser" - }, - { - "key": "Nothing here.", - "value": "Rien ici." - }, - { - "key": "Once complete, you may close this tab", - "value": "Une fois terminé, vous pouvez fermer cet onglet" - }, - { - "key": "Once you have scanned the QR code or input the key above, your two factor authentication app will provide youm with a unique code.Enter the code in the confirmation box below.", - "value": "Une fois que vous avez scanné le code QR ou entré la clé ci-dessus, votre application d'authentification à deux facteurs vous fournira un code unique.Entrez le code dans la confirmation encadré ci-dessous." - }, - { - "key": "One time only", - "value": "Une fois seulement" - }, - { - "key": "pairwise subject salt", - "value": "sel sujet par paire" - }, - { - "key": "Password", - "value": "Mot de passe" - }, - { - "key": "password", - "value": "mot de passe" - }, - { - "key": "Personal data", - "value": "Données personnelles" - }, - { - "key": "Personal Information", - "value": "Informations personnelles" - }, - { - "key": "phone number", - "value": "numéro de téléphone" - }, - { - "key": "Phone number", - "value": "Numéro de téléphone" - }, - { - "key": "phone number confirmed", - "value": "numéro de téléphone confirmé" - }, - { - "key": "Please check your email to confirm your account.", - "value": "Veuillez vérifier votre courrier électronique pour confirmer votre compte." - }, - { - "key": "Please check your email to reset your password.", - "value": "Veuillez vérifier votre courrier électronique pour réinitialiser votre mot de passe." - }, - { - "key": "Please confirm that the authorization request quotes the code: \"{0}\".", - "value": "Veuillez confirmer que la demande d'autorisation cite le code : \"{0}\"." - }, - { - "key": "Please confirm your account by clicking here.", - "value": "Veuillez confirmer votre compte en cliquant ici." - }, - { - "key": "Please enter the code displayed on your device", - "value": "Veuillez saisir le code affiché sur votre appareil" - }, - { - "key": "Please reset your password by clicking here.", - "value": "Veuillez réinitialiser votre mot de passe en cliquant ici." - }, - { - "key": "Policy", - "value": "Politique" - }, - { - "key": "policy uri", - "value": "uri de la politique" - }, - { - "key": "post logout", - "value": "après la déconnexion" - }, - { - "key": "prefix", - "value": "préfixe" - }, - { - "key": "Processing logout callback...", - "value": "Traitement du rappel de déconnexion..." - }, - { - "key": "Processing logout...", - "value": "Traitement de la déconnexion..." - }, - { - "key": "Profile", - "value": "Profil" - }, - { - "key": "prompt", - "value": "rapide" - }, - { - "key": "properties", - "value": "propriétés" - }, - { - "key": "Properties", - "value": "Propriétés" - }, - { - "key": "protocol type", - "value": "type de protocole" - }, - { - "key": "provider", - "value": "fournisseur" - }, - { - "key": "Providers", - "value": "Fournisseurs" - }, - { - "key": "Put these codes in a safe place.", - "value": "Mettez ces codes dans un endroit sûr." - }, - { - "key": "Re use", - "value": "Réutilisation" - }, - { - "key": "reason", - "value": "raison" - }, - { - "key": "Recovery Code", - "value": "Code de récupération" - }, - { - "key": "Recovery code verification", - "value": "Vérification du code de récupération" - }, - { - "key": "Recovery codes", - "value": "Codes de récupération" - }, - { - "key": "redirect", - "value": "redirection" - }, - { - "key": "redirect uri", - "value": "uri de redirection" - }, - { - "key": "Reference tokens", - "value": "Jetons de référence" - }, - { - "key": "reference tokens", - "value": "jetons de référence" - }, - { - "key": "refresh on issuer key not found", - "value": "actualisation sur la clé de l'émetteur introuvable" - }, - { - "key": "refresh token expiration", - "value": "expiration du jeton d'actualisation" - }, - { - "key": "refresh token usage", - "value": "rafraîchir l'utilisation du jeton" - }, - { - "key": "Refresh tokens", - "value": "Jetons d'actualisation" - }, - { - "key": "refresh tokens", - "value": "jetons d'actualisation" - }, - { - "key": "Register", - "value": "S'inscrire" - }, - { - "key": "Register confirmation", - "value": "Confirmation d'inscription" - }, - { - "key": "Registered Logins", - "value": "Connexions enregistrées" - }, - { - "key": "Registration is not supported.", - "value": "L'enregistrement n'est pas pris en charge." - }, - { - "key": "Relying parties", - "value": "Parties de confiance" - }, - { - "key": "relying party", - "value": "partie de confiance" - }, - { - "key": "Remember My Decision", - "value": "Souviens-toi de ma décision" - }, - { - "key": "Remember My Login", - "value": "Se souvenir de ma connexion" - }, - { - "key": "Remember this machine", - "value": "Souviens-toi de cette machine" - }, - { - "key": "remenber consent", - "value": "se souvenir du consentement" - }, - { - "key": "remote sign-out path ", - "value": "chemin de déconnexion à distance" - }, - { - "key": "remote sign-out path", - "value": "chemin de déconnexion à distance" - }, - { - "key": "Remove", - "value": "Supprimer" - }, - { - "key": "require consent", - "value": "exiger le consentement" - }, - { - "key": "require https metadata", - "value": "nécessite des métadonnées https" - }, - { - "key": "require PKCE", - "value": "nécessitent PKCE" - }, - { - "key": "require secret", - "value": "besoin de secret" - }, - { - "key": "required", - "value": "obligatoire" - }, - { - "key": "Reset authenticator app", - "value": "Réinitialiser l'application d'authentification" - }, - { - "key": "Reset authenticator key", - "value": "Réinitialiser la clé d'authentification" - }, - { - "key": "Reset Password", - "value": "réinitialiser le mot de passe" - }, - { - "key": "Reset recovery codes", - "value": "Réinitialiser les codes de récupération" - }, - { - "key": "resource", - "value": "Ressource" - }, - { - "key": "Resources", - "value": "Ressources" - }, - { - "key": "response mode", - "value": "mode de réponse" - }, - { - "key": "response type", - "value": "type de réponse" - }, - { - "key": "retrieve user details", - "value": "récupérer les détails de l'utilisateur" - }, - { - "key": "Retype the \"{0}\" if you are sure to delete it.", - "value": "Retapez le \"{0}\" si vous êtes sûr de le supprimer." - }, - { - "key": "Retype the \"{0}\" if you are sure to revoke it.", - "value": "Retapez le \"{0}\" si vous êtes sûr de le révoquer." - }, - { - "key": "Revoke", - "value": "Révoquer" - }, - { - "key": "Revoke Access", - "value": "Révoquer l'accès" - }, - { - "key": "Revoked", - "value": "Révoqué" - }, - { - "key": "role", - "value": "rôle" - }, - { - "key": "roles", - "value": "rôles" - }, - { - "key": "Save", - "value": "Sauvegarder" - }, - { - "key": "save tokens", - "value": "enregistrer des jetons" - }, - { - "key": "Saved", - "value": "Enregistré" - }, - { - "key": "Scan the QR Code or enter this key {0} into your two factor authenticator app. Spaces and casing do not matter.", - "value": "Scannez le code QR ou saisissez cette clé {0} dans votre application d'authentification à deux facteurs. Les espaces et le boîtier n'ont pas d'importance." - }, - { - "key": "scheme", - "value": "schème" - }, - { - "key": "scope", - "value": "portée" - }, - { - "key": "scopes", - "value": "portées" - }, - { - "key": "Scopes", - "value": "Portées" - }, - { - "key": "Scopes must be unique.", - "value": "Les étendues doivent être uniques." - }, - { - "key": "secrets", - "value": "secrets" - }, - { - "key": "Select a kind of provider...", - "value": "Sélectionnez un type de fournisseur..." - }, - { - "key": "send app secret proof", - "value": "envoyer une preuve secrète d'application" - }, - { - "key": "Send verification email", - "value": "Envoyer email de vérification" - }, - { - "key": "Set password", - "value": "Définir le mot de passe" - }, - { - "key": "Set your password", - "value": "Définir votre mot de passe" - }, - { - "key": "Setup authenticator app", - "value": "Configurer l'application d'authentification" - }, - { - "key": "show all options", - "value": "afficher toutes les options" - }, - { - "key": "show in discovery document", - "value": "afficher dans le document de découverte" - }, - { - "key": "signature algorithm", - "value": "algorithme de signature" - }, - { - "key": "signature digest", - "value": "condensé de signature" - }, - { - "key": "signed-out callback path", - "value": "chemin de rappel déconnecté" - }, - { - "key": "signed-out redirect uri", - "value": "uri de redirection déconnecté" - }, - { - "key": "Signing", - "value": "Signature" - }, - { - "key": "sign-out scheme ", - "value": "schéma de déconnexion" - }, - { - "key": "sign-out scheme", - "value": "schéma de déconnexion" - }, - { - "key": "sign-out wreply ", - "value": "déconnexion wreply" - }, - { - "key": "skip unrecognized requests", - "value": "ignorer les demandes non reconnues" - }, - { - "key": "Sliding", - "value": "Glissement" - }, - { - "key": "sliding refresh token lifetime", - "value": "durée de vie du jeton d'actualisation glissante" - }, - { - "key": "Sorry, there was an error", - "value": "Désolé, il y a eu une erreur" - }, - { - "key": "Sorry, there's nothing at this address.", - "value": "Désolé, il n'y a rien à cette adresse." - }, - { - "key": "sso lifetime", - "value": "durée de vie" - }, - { - "key": "store claims", - "value": "réclamations en magasin" - }, - { - "key": "Submit", - "value": "Soumettre" - }, - { - "key": "Success", - "value": "Succès" - }, - { - "key": "Supported cultures", - "value": "Cultures prises en charges" - }, - { - "key": "Terms of service", - "value": "Conditions d'utilisation" - }, - { - "key": "terms of service uri", - "value": "conditions d'utilisation uri" - }, - { - "key": "Thank you for confirming your email change.", - "value": "Merci d'avoir confirmé votre changement d'adresse e-mail." - }, - { - "key": "The {0} must be at least {2} and at max {1} characters long.", - "value": "Le {0} doit comporter au moins {2} et au maximum {1} caractères." - }, - { - "key": "The api property key cannot exceed 250 chars.", - "value": "La clé de propriété de l'API ne peut pas dépasser 250 caractères." - }, - { - "key": "The api property key is required.", - "value": "La clé de propriété de l'API est requise." - }, - { - "key": "The api property key must be unique.", - "value": "La clé de propriété de l'API doit être unique." - }, - { - "key": "The api property value cannot exceed 2000 chars.", - "value": "La valeur de la propriété api ne peut pas dépasser 2000 caractères." - }, - { - "key": "The api property value is required.", - "value": "La valeur de la propriété api est obligatoire." - }, - { - "key": "The back channel logout url cannot exceed 2000 char.", - "value": "L'URL de déconnexion du canal arrière ne peut pas dépasser 2000 caractères." - }, - { - "key": "The back channel logout url is required.", - "value": "L'URL de déconnexion du canal arrière est requise." - }, - { - "key": "The back logout url is not valid.", - "value": "L'URL de déconnexion arrière n'est pas valide." - }, - { - "key": "The claim prefix cannot exceed 250 char.", - "value": "Le préfixe de revendication ne peut pas dépasser 250 caractères." - }, - { - "key": "The claim type cannot exceed 2000 chars.", - "value": "Le type de revendication ne peut pas dépasser 2000 caractères." - }, - { - "key": "The claim type cannot exceed 250 chars.", - "value": "Le type de revendication ne peut pas dépasser 250 caractères." - }, - { - "key": "The claim type is required.", - "value": "Le type de réclamation est obligatoire." - }, - { - "key": "The claim type must be unique.", - "value": "Le type de revendication doit être unique." - }, - { - "key": "The claim value cannot exceed 2000 chars.", - "value": "La valeur de la réclamation ne peut pas dépasser 2000 caractères." - }, - { - "key": "The claim value is required.", - "value": "La valeur de la réclamation est requise." - }, - { - "key": "The client property key cannot exceed 250 chars.", - "value": "La clé de propriété du client ne peut pas dépasser 250 caractères." - }, - { - "key": "The client property key is required.", - "value": "La clé de propriété du client est requise." - }, - { - "key": "The client property key must be unique.", - "value": "La clé de propriété du client doit être unique." - }, - { - "key": "The client property value cannot exceed 2000 chars.", - "value": "La valeur de la propriété client ne peut pas dépasser 2000 caractères." - }, - { - "key": "The client property value is required.", - "value": "La valeur de la propriété client est obligatoire." - }, - { - "key": "The client should contain at least one grant type.", - "value": "Le client doit contenir au moins un type de subvention." - }, - { - "key": "The culture is required.", - "value": "La culture s'impose." - }, - { - "key": "The culture must be unique.", - "value": "La culture doit être unique." - }, - { - "key": "The current browser has been forgotten. When you login again from this browser you will be prompted for your 2fa code.", - "value": "Le navigateur actuel a été oublié. Lorsque vous vous reconnecterez à partir de ce navigateur, vous serez invité à saisir votre code 2fa." - }, - { - "key": "The description cannot exceed 200 chars.", - "value": "La description ne peut pas dépasser 200 caractères." - }, - { - "key": "The description cannot exceed 2000 chars.", - "value": "La description ne peut pas dépasser 2000 caractères." - }, - { - "key": "The description canoot exceed 1000 char.", - "value": "La description ne peut pas dépasser 1000 car." - }, - { - "key": "The digest algorithm is required", - "value": "L'algorithme de condensé est requis" - }, - { - "key": "The display name cannot exceed 200 chars.", - "value": "Le nom d'affichage ne peut pas dépasser 200 caractères." - }, - { - "key": "The display name is required.", - "value": "Le nom d'affichage est obligatoire." - }, - { - "key": "The external login was added.", - "value": "La connexion externe a été ajoutée." - }, - { - "key": "The external login was not added. External logins can only be associated with one account.", - "value": "La connexion externe n'a pas été ajoutée. Les logins externes ne peuvent être associés qu'à un seul compte." - }, - { - "key": "The external login was not removed.", - "value": "La connexion externe n'a pas été supprimée." - }, - { - "key": "The external login was removed.", - "value": "La connexion externe a été supprimée." - }, - { - "key": "The from claim tyoe is required.", - "value": "Le montant de la réclamation est requis." - }, - { - "key": "The from claim type is required.", - "value": "Le type de revendication de est requis." - }, - { - "key": "The from claim type must be unique.", - "value": "Le type de revendication de doit être unique." - }, - { - "key": "The front channel logout url cannot exceed 2000 char.", - "value": "L'URL de déconnexion du canal avant ne peut pas dépasser 2000 caractères." - }, - { - "key": "The front channel logout url is not valid.", - "value": "L'URL de déconnexion du canal frontal n'est pas valide." - }, - { - "key": "The front channel logout url is required.", - "value": "L'URL de déconnexion du canal avant est requise." - }, - { - "key": "The grant type cannot contains space.", - "value": "Le type de subvention ne peut pas contenir d'espace." - }, - { - "key": "The grant type must be unique.", - "value": "Le type de subvention doit être unique." - }, - { - "key": "The id is required.", - "value": "L'identifiant est requis." - }, - { - "key": "The id must be an URI when protocole is WS-Federation. (ex: urn:wsfed).", - "value": "L'id doit être un URI lorsque le protocole est WS-Federation. (ex : urne:wsfed)." - }, - { - "key": "The identity claim type cannot exceed 2000 chars.", - "value": "Le type de revendication d'identité ne peut pas dépasser 2 000 caractères." - }, - { - "key": "The identity claim type is required.", - "value": "Le type de revendication d'identité est requis." - }, - { - "key": "The identity claim type must be unique.", - "value": "Le type de revendication d'identité doit être unique." - }, - { - "key": "The identity property key cannot exceed 250 chars.", - "value": "La clé de propriété d'identité ne peut pas dépasser 250 caractères." - }, - { - "key": "The identity property key is required.", - "value": "La clé de propriété d'identité est requise." - }, - { - "key": "The identity property key must be unique.", - "value": "La clé de propriété d'identité doit être unique." - }, - { - "key": "The identity property value cannot exceed 2000 chars.", - "value": "La valeur de la propriété d'identité ne peut pas dépasser 2000 caractères." - }, - { - "key": "The identity property value is required.", - "value": "La valeur de la propriété d'identité est obligatoire." - }, - { - "key": "The identity should provide at least one claim.", - "value": "L'identité doit fournir au moins une revendication." - }, - { - "key": "The key is required.", - "value": "La clé est requise." - }, - { - "key": "The key must be unique.", - "value": "La clé doit être unique." - }, - { - "key": "The kind of provider is required.", - "value": "Le type de fournisseur est requis." - }, - { - "key": "The logo url cannot exceed 2000 char.", - "value": "L'URL du logo ne peut pas dépasser 2000 caractères." - }, - { - "key": "The logo url is not valid.", - "value": "L'url du logo n'est pas valide." - }, - { - "key": "The name cannot exceed 200 char.", - "value": "Le nom ne peut pas dépasser 200 caractères." - }, - { - "key": "The name cannot exceed 200 chars.", - "value": "Le nom ne peut pas dépasser 200 caractères." - }, - { - "key": "The name identifier is required", - "value": "L'identifiant du nom est obligatoire" - }, - { - "key": "The name is required", - "value": "Le nom est obligatoire" - }, - { - "key": "The name is required.", - "value": "Le nom est obligatoire." - }, - { - "key": "The new password and confirmation password do not match.", - "value": "Le nouveau mot de passe et le mot de passe de confirmation ne correspondent pas." - }, - { - "key": "The password and confirmation password do not match.", - "value": "Le mot de passe et le mot de passe de confirmation ne correspondent pas." - }, - { - "key": "The policy url cannot exceed 2000 char.", - "value": "L'URL de la politique ne peut pas dépasser 2 000 caractères." - }, - { - "key": "The policy url is not valid.", - "value": "L'URL de la politique n'est pas valide." - }, - { - "key": "The relying party is required.", - "value": "La partie utilisatrice est requise." - }, - { - "key": "The role must be unique", - "value": "Le rôle doit être unique" - }, - { - "key": "The role name is required", - "value": "Le nom du rôle est requis" - }, - { - "key": "The secret type is required.", - "value": "Le type de secret est requis." - }, - { - "key": "The secret value is required.", - "value": "La valeur secrète est obligatoire." - }, - { - "key": "The sheme is required.", - "value": "Le schéma est requis." - }, - { - "key": "The subject salt cannot exceed 250 char.", - "value": "Le sel en question ne peut pas dépasser 250 char." - }, - { - "key": "The terms of service url cannot exceed 2000 char.", - "value": "L'URL des conditions d'utilisation ne peut pas dépasser 2000 caractères." - }, - { - "key": "The terms of service url is not valid.", - "value": "L'URL des conditions d'utilisation n'est pas valide." - }, - { - "key": "The to claim tyoe is required.", - "value": "Le droit de réclamation est obligatoire." - }, - { - "key": "The to claim type is required.", - "value": "Le type de réclamation est requis." - }, - { - "key": "The to claim type must be an URI.", - "value": "Le type à réclamer doit être un URI." - }, - { - "key": "The token expression doesn't match a valid format. You can use the forms d.hh:mm:ss, hh.mm:ss, mm:ss, a number of days (365d), a number of hours (12h), a number of minutes (30m), a number of second", - "value": "L'expression du jeton ne correspond pas à un format valide. Vous pouvez utiliser les formes d.hh:mm:ss, hh.mm:ss, mm:ss, un nombre de jours (365j), un nombre d'heures (12h), un nombre de minutes (30m), un nombre de seconde" - }, - { - "key": "The token type is required", - "value": "Le type de jeton est requis" - }, - { - "key": "The type of protocol cannot exceed 200 char.", - "value": "Le type de protocole ne peut pas dépasser 200 caractères." - }, - { - "key": "The type of protocol is required", - "value": "Le type de protocole est requis" - }, - { - "key": "The type of user code cannot exceed 100 char.", - "value": "Le type de code utilisateur ne peut pas dépasser 100 caractères." - }, - { - "key": "The url cannot exceed 2000 char.", - "value": "L'URL ne peut pas dépasser 2000 caractères." - }, - { - "key": "The url is not valid.", - "value": "L'url n'est pas valide." - }, - { - "key": "There are no login schemes configured for this client.", - "value": "Aucun schéma de connexion n'est configuré pour ce client." - }, - { - "key": "There was an error trying to log you in: '{0}'", - "value": "Une erreur s'est produite lors de la tentative de connexion : '{0}'" - }, - { - "key": "There was an error trying to log you out: '{0}'", - "value": "Une erreur s'est produite lors de la tentative de déconnexion : '{0}'" - }, - { - "key": "This action only disables 2FA.", - "value": "Cette action ne désactive que 2FA." - }, - { - "key": "This process disables 2FA until you verify your authenticator app. If you do not complete your authenticator app configuration you may lose access to your account.", - "value": "Ce processus désactive 2FA jusqu'à ce que vous vérifiiez votre application d'authentification. Si vous ne terminez pas la configuration de votre application d'authentification, vous risquez de perdre l'accès à votre compte." - }, - { - "key": "to claim type", - "value": "type de réclamation" - }, - { - "key": "To use an authenticator app go through the following steps:", - "value": "Pour utiliser une application d'authentification, procédez comme suit :" - }, - { - "key": "Token endpoint is required.", - "value": "Le point de terminaison du jeton est requis." - }, - { - "key": "Token endpoint must be a valid uri.", - "value": "Le point de terminaison du jeton doit être un uri valide." - }, - { - "key": "token enpoint", - "value": "point de jeton" - }, - { - "key": "token type", - "value": "type de jeton" - }, - { - "key": "Tokens", - "value": "Jetons" - }, - { - "key": "tokens", - "value": "jetons" - }, - { - "key": "two factor enabled", - "value": "deux facteurs activés" - }, - { - "key": "Two-factor authentication", - "value": "Authentification à deux facteurs" - }, - { - "key": "Two-factor authentication (2FA)", - "value": "Authentification à deux facteurs (2FA)" - }, - { - "key": "type", - "value": "type" - }, - { - "key": "Unable to load user with ID '{0}'.", - "value": "Impossible de charger l'utilisateur avec l'ID '{0}'." - }, - { - "key": "Uncheck the permissions you do not wish to grant.", - "value": "Décochez les autorisations que vous ne souhaitez pas accorder." - }, - { - "key": "Unexpected error when trying to set phone number.", - "value": "Erreur inattendue lors de la tentative de définition du numéro de téléphone." - }, - { - "key": "update access token on refresh", - "value": "mettre à jour le jeton d'accès lors de l'actualisation" - }, - { - "key": "Update password", - "value": "Mettre à jour le mot de passe" - }, - { - "key": "uri", - "value": "uri" - }, - { - "key": "Uri must be unique.", - "value": "Uri doit être unique." - }, - { - "key": "urls", - "value": "URL" - }, - { - "key": "Use another service to register.", - "value": "Utilisez un autre service pour vous inscrire." - }, - { - "key": "use PKCE", - "value": "utiliser PKCE" - }, - { - "key": "use token lifetime", - "value": "utiliser la durée de vie du jeton" - }, - { - "key": "User", - "value": "Utilisateur" - }, - { - "key": "user", - "value": "utilisateur" - }, - { - "key": "User Code", - "value": "Code d'utilisateur" - }, - { - "key": "user enpoint", - "value": "point d'utilisateur" - }, - { - "key": "User information endpoint is required.", - "value": "Le point de terminaison des informations utilisateur est requis." - }, - { - "key": "User information endpoint must be a valid uri.", - "value": "Le point de terminaison des informations utilisateur doit être un uri valide." - }, - { - "key": "user name", - "value": "nom d'utilisateur" - }, - { - "key": "Username", - "value": "Nom d'utilisateur" - }, - { - "key": "Users", - "value": "Utilisateurs" - }, - { - "key": "value", - "value": "valeur" - }, - { - "key": "Verification Code", - "value": "Le code de vérification" - }, - { - "key": "Verification code is invalid.", - "value": "Le code de vérification n'est pas valide." - }, - { - "key": "Verification email sent. Please check your email.", - "value": "L'email de vérification a été envoyé. Merci de consulter vos emails." - }, - { - "key": "Verify", - "value": "Vérifier" - }, - { - "key": "Welcome", - "value": "Bienvenue" - }, - { - "key": "Would you like to logout of {0}?", - "value": "Souhaitez-vous vous déconnecter de {0} ?" - }, - { - "key": "wreply ", - "value": "wreply " - }, - { - "key": "wtrealm ", - "value": "wtrealm " - }, - { - "key": "Wtrealm is required.", - "value": "Wtrealm est requis." - }, - { - "key": "Yes", - "value": "Oui" - }, - { - "key": "Yes, Allow", - "value": "Oui, autoriser" - }, - { - "key": "You are logged out.", - "value": "Vous êtes déconnecté." - }, - { - "key": "You are not authorize to import data.", - "value": "Vous n'êtes pas autorisé à importer des données." - }, - { - "key": "You are now being returned to the application.", - "value": "Vous êtes maintenant renvoyé à l'application." - }, - { - "key": "You are now logged out", - "value": "Vous êtes maintenant déconnecté" - }, - { - "key": "You are revoking the key currently in use. Be sure what you're doing.", - "value": "Vous révoquez la clé actuellement utilisée. Soyez sûr de ce que vous faites." - }, - { - "key": "You can generate a new set of recovery codes.", - "value": "Vous pouvez générer un nouvel ensemble de codes de récupération." - }, - { - "key": "You do not have a local username/password for this site. Add a local account so you can log in without an external login.", - "value": "Vous n'avez pas de nom d'utilisateur/mot de passe local pour ce site. Ajoutez un compte local pour pouvoir vous connecter sans connexion externe." - }, - { - "key": "You do not have access to that resource.", - "value": "Vous n'avez pas accès à cette ressource." - }, - { - "key": "You have 1 recovery code left.", - "value": "Il vous reste 1 code de récupération." - }, - { - "key": "You have generated new recovery codes.", - "value": "Vous avez généré de nouveaux codes de récupération." - }, - { - "key": "You have no recovery codes left.", - "value": "Vous n'avez plus de codes de récupération." - }, - { - "key": "You have not given access to any applications", - "value": "Vous n'avez donné accès à aucune application" - }, - { - "key": "You have requested to log in with a recovery code. This login will not be remembered until you provide an authenticator app code at log in or disable 2FA and log in again.", - "value": "Vous avez demandé à vous connecter avec un code de récupération. Cette connexion ne sera pas mémorisée jusqu'à ce que vous fournissiez un code d'application d'authentification lors de la connexion ou que vous désactiviez 2FA et que vous vous reconnectiez." - }, - { - "key": "You have successfully authorized the device", - "value": "Vous avez autorisé l'appareil avec succès" - }, - { - "key": "You must generate a new set of recovery codes before you can log in with a recovery code.", - "value": "Vous devez générer un nouvel ensemble de codes de récupération avant de pouvoir vous connecter avec un code de récupération." - }, - { - "key": "You should generate a new set of recovery codes", - "value": "Vous devez générer un nouvel ensemble de codes de récupération." - }, - { - "key": "Your account contains personal data that you have given us. This page allows you to download or delete that data.", - "value": "Votre compte contient des données personnelles que vous nous avez fournies. Cette page vous permet de télécharger ou de supprimer ces données." - }, - { - "key": "Your authenticator app has been verified.", - "value": "Votre application d'authentification a été vérifiée." - }, - { - "key": "Your authenticator app key has been reset, you will need to configure your authenticator app using the new key.", - "value": "Votre clé d'application d'authentification a été réinitialisée, vous devrez configurer votre application d'authentification à l'aide de la nouvelle clé." - }, - { - "key": "Your email is unchanged.", - "value": "Votre email est inchangé." - }, - { - "key": "Your login is protected with an authenticator app. Enter your authenticator code below.", - "value": "Votre connexion est protégée par une application d'authentification. Entrez votre code d'authentification ci-dessous." - }, - { - "key": "Your password has been changed.", - "value": "Votre mot de passe a été changé." - }, - { - "key": "Your password has been set.", - "value": "Votre mot de passe a été défini." - }, - { - "key": "Your profile has been updated", - "value": "votre profil a été mis a jour" - }, - { - "key": "You've successfully authenticated with {0}. Please enter an email address for this site below and click the Register button to finish logging in.", - "value": "Vous vous êtes bien authentifié avec {0}. Veuillez entrer une adresse e-mail pour ce site ci-dessous et cliquez sur le bouton S'inscrire pour terminer la connexion." - }, - { - "key": "allowed identity token signing algorithms", - "value": "algorithmes de signature de jeton d'identité autorisés" - }, - { - "key": "Reset password", - "value": "Réinitialiser le mot de passe" - }, - { - "key": "Reset your password.", - "value": "Réinitialisez votre mot de passe." - }, - { - "key": "Reset", - "value": "Réinitialiser" - }, - { - "key": "Reset password confirmation", - "value": "Confirmation de la réinitialisation du mot de passe" - }, - { - "key": "Your password has been reset.", - "value": "Votre mot de passe a été réinitialisé." - }, - { - "key": "Please click here to log in", - "value": "Veuillez cliquer ici pour vous connecter" - }, - { - "key": "Resend email confirmation", - "value": "Renvoyer la confirmation par e-mail" - }, - { - "key": "Resend", - "value": "Renvoyer" - }, - { - "key": "Register as a new user", - "value": "S'inscrire en tant que nouvel utilisateur" - }, - { - "key": "Resend email confirmation", - "value": "Renvoyer la confirmation par e-mail" - }, - { - "key": "Are you sure you want to leave this page?", - "value": "Voulez-vous vraiment quitter cette page ?" - } -] \ No newline at end of file diff --git a/src/Aguacongas.TheIdServer.IS4/README.md b/src/Aguacongas.TheIdServer.IS4/README.md deleted file mode 100644 index 0ade04663..000000000 --- a/src/Aguacongas.TheIdServer.IS4/README.md +++ /dev/null @@ -1,946 +0,0 @@ -# TheIdServer IS4 Web Server project - -The server obtains configuration from *appsettings.json*, *appsettings.{Environment}.json*, command-line arguments, or environment variables. - -Read [Configuration in ASP.NET Core](https://docs.microsoft.com/en-us/aspnet/core/fundamentals/configuration/) for more information. - -## Installation - -### From Terraform - -The [Terraform](https://terraform.io) [Helm](https://helm.sh) module [theidserver](https://registry.terraform.io/modules/Aguafrommars/theidserver/helm/latest) make the deployement of TheIdServer easy. - -``` hcl -provider "helm" { - kubernetes { - config_path = var.kubeconfig_path - } -} - -module "theidserver" { - source = "Aguafrommars/theidserver/helm" - - host = "theidserver.com" - tls_issuer_name = "letsencrypt" - tls_issuer_kind = "ClusterIssuer" -} -``` - -### From Helm - -The [theidserver](https://hub.helm.sh/packages/helm/aguafrommars/theidserver) Helm chart is available in [hub.helm.sh](https://hub.helm.sh). - -#### Install - -``` bash -helm repo add aguafrommars https://aguafrommars.github.io/helm -helm install aguafrommars theidserver --set theidserver.mysql.db.password=my-P@ssword -``` - -#### Upgrade - -Follow upgrades intstructions in the [chart readme](https://github.com/Aguafrommars/helm/blob/main/charts/theidserver/README.md#upgrade). - -### From Docker - -A [server's Linux image](https://hub.docker.com/r/aguacongas/theidserver) is available on Docker Hub. - -[*sample/MultiTiers/Aguacongas.TheIdServer.Private/Dockerfile-private*](../../sample/MultiTiers/Aguacongas.TheIdServer.Private/Dockerfile-private) demonstrates how to create an image from the [server image](https://hub.docker.com/r/aguacongas/theidserver) to run a private Linux server container. - -[*sample/MultiTiers/Aguacongas.TheIdServer.Public/Dockerfile-public*](../../sample/MultiTiers/Aguacongas.TheIdServer.Public/Dockerfile-public) illustrates how to create an image from the [server image](https://hub.docker.com/r/aguacongas/theidserver) to run a public Linux server container. - -Read [Hosting ASP.NET Core images with Docker over HTTPS](https://docs.microsoft.com/en-us/aspnet/core/security/docker-https) to set up the HTTPS certificate. - -#### Kubernetes sample - -[/sample/Kubernetes/README.md](/sample/Kubernetes/README.md) contains a sample to set up a solution with Kubernetes. - -### From dotnet new template - -The template [TheIdServer.IS4.Template](https://github.com/Aguafrommars/Templates) can be use to setup a TheIdServer solution. - -#### Install - -```bash -dotnet new -i TheIdServer.IS4.Template -``` - -#### Use - -```bash -> dotnet new tisis4 -o TheIdServer -The template "TheIdServer.IS4" was created successfully. - -Processing post-creation actions... -Running 'dotnet restore' on TheIdServer\TheIdServer.sln... - Determining projects to restore... - Restored C:\Projects\Perso\Templates\artifacts\TheIdServer\test\WebAssembly.Net.Http\WebAssembly.Net.Http.csproj (in 114 ms). - Restored C:\Projects\Perso\Templates\artifacts\TheIdServer\src\TheIdServer.BlazorApp\TheIdServer.BlazorApp.csproj (in 916 ms). - Restored C:\Projects\Perso\Templates\artifacts\TheIdServer\test\Microsoft.AspNetCore.Components.Testing\Microsoft.AspNetCore.Components.Testing.csproj (in 1.08 sec). - Restored C:\Projects\Perso\Templates\artifacts\TheIdServer\src\TheIdServer\TheIdServer.csproj (in 2.03 sec). - Restored C:\Projects\Perso\Templates\artifacts\TheIdServer\test\TheIdServer.Test\TheIdServer.Test.csproj (in 2.04 sec). - Restored C:\Projects\Perso\Templates\artifacts\TheIdServer\test\TheIdServer.IntegrationTest\TheIdServer.IntegrationTest.csproj (in 2.04 sec). -Restore succeeded. -``` - -### From NuGet Packages - -If you need more customization, you can use published NuGet packages. -[sample/MultiTiers](sample/MultiTiers) contains a sample to build server and API from NuGet packages. - -### From Github Release - -Choose your release in the [list of releases](https://github.com/Aguafrommars/TheIdServer/releases) and download the server zip. -Unzip in the destination of your choice. Unzip in the destination of your choice. As with any ASP.NET Core web site, it can run in IIS or as a stand-alone server using your chosen platform. - -Read [Host and deploy ASP.NET Core](https://docs.microsoft.com/en-us/aspnet/core/host-and-deploy/) for more information. - -## Configure data protection - -[Data protection](../../doc/DATA_PROTECTION.md) provides details on data protection configuration. - -## Configure site - -The site name is defined by *SiteOptions:TheIdServer*. - -```json -"SiteOptions": { - "Name": "TheIdServer" -} -``` - -The site stylecheets are *wwwroot/lib/bootstrap/css/bootstrap.css* and *wwwroot/css/site.min.css*. -The site logo is *wwwroot/logo.png*. -And the favicon is *wwwroot/favicon.ico*. - -By replacing those files you can redefined the site style by yours. - -## Configure ASP.Net Core Identity options - -The section **IdentityOptions** is binded to the class [`Microsoft.AspNetCore.Identity.IdentityOptions`](https://docs.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.identity.identityoptions). -So you can set any ASP.Net Core Identity options you want from configuration - -```json -"IdentityOptions": { - "User": { - "AllowedUserNameCharacters": "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._@+ " - }, - "SignIn": { - "RequireConfirmedAccount": true - } -} -``` - -## Configure IdentityServer4 - -The section **IdentityServerOptions** is binded to the class [`IdentityServer4.Configuration.IdentityServerOptions`](http://docs.identityserver.io/en/latest/reference/options.html). -So you can set any IdentityServer4 options you want from configuration - -```json -"IdentityServerOptions": { - "Events": { - "RaiseErrorEvents": true, - "RaiseInformationEvents": true, - "RaiseFailureEvents": true, - "RaiseSuccessEvents": true - }, - "Endpoints": { - "EnableJwtRequestUri": true - } -} -``` - -### Mutual TLS client certificate options - -When Muutal TLS is enabled, you can configure the client certificate authentication options with `CertificateAuthenticationOptions` section. - -```json -"IdentityServerOptions": { - "MutualTls": { - "Enabled": true - } -}, -"CertificateAuthenticationOptions": { - "AllowedCertificateTypes": "All", - "ValidateCertificateUse": false, - "ValidateValidityPeriod": false, - "RevocationMode": "NoCheck" -} -``` - -### Retrieves client certificates fron HTTP request header - -When Mutual TLS is enabled the client certificate can be read in PEM format from request header. For exemple if you use a kubernetes NGINX ingress you can configure it to send the client certificate to the backend in the *ssl-client-cert* header. -See [Client Certificate Authentication](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/#client-certificate-authentication). - -To retrieve the client certificate from the request header confiure the `MutualTls` sub section like : - -```json -"IdentityServerOptions": { - "MutualTls": { - "Enabled": true, - "PEMHeader": "ssl-client-cert" - } -} -``` - -## Configure stores - -### Using Entity Framework Core - -The server supports *SqlServer*, *Sqlite*, *MySql*, *PostgreSQL*, *Oracle*, and *InMemory* databases. -Use **DbType** to the define the database engine. - -```json -"DbType": "SqlServer" -``` - -And **ConnectionStrings:DefaultConnection** to define the connection string. - -```json -"ConnectionStrings": { - "DefaultConnection": "Data Source=(LocalDb)\\MSSQLLocalDB;database=TheIdServer;trusted_connection=yes;" -} -``` - -> A [devart dotConnect for Oracle](https://www.devart.com/dotconnect/oracle/) license is a requirement for Oracle. - -### Using RavenDb - -Use **DbType** to the define the RavenDb database engine. - -```json -"DbType": "RavenDb" -``` - -And **RavenDbOptions** to define the RavenDb options. - -```json -"RavenDbOptions": { - "Urls": [ - "https://a.ravendb.local", - "https://b.ravendb.local", - "https://c.ravendb.local" - ], - "Database": "TheIdServer", - "CertificatePath": "cluster.admin.client.certificate.pfx", - "CertificatePassword": "p@$$w0rd" -} -``` - -> As no `DbContext` will be registered, you cannot store signing keys in EF but you can choose the `RavenDb` storage kind (see [Configure signin keys](#configure-signing-key)): -```json -"IdentityServer": { - "Key": { - "StorageKind": "RavenDb" - } -}, -"DataProtectionOptions": { - "StorageKind": "RavenDb" -} -``` - -> The server support RavenDb 4.1 and above. - -### Using MongoDb - -Use **DbType** to the define the RavenDb database engine. - -```json -"DbType": "MongoDb" -``` - -And **ConnectionStrings:DefaultConnection** to define the connection string. - -```json -"ConnectionStrings": { - "DefaultConnection": "mongodb+srv://theidserver:theidserverpwd@cluster0.fvkfz.mongodb.net/TheIdServer?retryWrites=true&w=majority" -} -``` - -> We cannot used another database than the default database defined in the connection string. -> As no `DbContext` will be registered, you cannot store signing keys in EF but you can choose the `MongoDb` storage kind (see [Configure signin keys](#configure-signing-key)): - -```json -"IdentityServer": { - "Key": { - "StorageKind": "MongoDb" - } -}, -"DataProtectionOptions": { - "StorageKind": "MongoDb" -} -``` - -### Using the API - -![public-private.svg](../../doc/assets/public-pribate.png) - -If you don't want to expose a database with your server, you can set up a second server on a private network accessing the database and use this private server API to access data. - -```json -"Proxy": true, -"PrivateServerAuthentication": { - "Authority": "https://theidserverprivate", - "ApiUrl": "https://theidserverprivate/api", - "ClientId": "public-server", - "ClientSecret": "84137599-13d6-469c-9376-9e372dd2c1bd", - "Scope": "theidserveradminapi", - "HttpClientName": "is4" -}, -"SignalR": { - "HubUrl": "https://theidserverprivate/providerhub" - "HubOptions": { - "EnableDetailedErrors": true - }, - "UseMessagePack": true -} -``` - -#### Proxy - -Start the server with proxy mode enabled. - -#### PrivateServerAuthentication - -Defines how to authenticate the public server on private server API. - -#### SignalR - -Defines the [SignalR client](https://docs.microsoft.com/en-us/aspnet/core/signalr/dotnet-client&tabs=visual-studio) configuration. -This client is used to update the external provider configuration of a running instance. When an external provider configuration changes, the API sends a SignalR notification to inform other running instances. - -For more information, read [Load balancing scenario](https://github.com/Aguafrommars/DymamicAuthProviders/wiki/Load-balancing-scenario). - -The SignalR hub accepts requests at */providerhub* and supports the [MessagePack](https://msgpack.org/index.html) protocol. - -For more information, read [Use MessagePack Hub Protocol in SignalR for ASP.NET Core](https://docs.microsoft.com/en-us/aspnet/core/signalr/messagepackhubprotocol). - -### Database migration and data seeding - -Starting the server with the **/seed** command-line argument creates the database with initial data. Alternatively, configure the server with the following to create a database with initial users, protected resources, identity resources, and clients. - -```json -"Migrate": true, -"Seed": true -``` - -#### Roles - -* **Is4-Writer** authorizes users in this role to write data. -* **Is4-Reader** permits users in this role to read data. - -#### Identity resources - -* **profile** default profile resource with **role** claim -* **openid** default OpenID resource -* **address** default address resource -* **email** default email resource -* **phone** default phone resource - -#### Users - -Users defined in `InitialData:Users` configuration section are loaded and stored to the DB. - -Default configuration: - -```json -"InitialData": { -... - "Users": [ - { - "UserName": "alice", - "Email": "alice@theidserver.com", - "EmailConfirmed": true, - "PhoneNumber": "+41766403736", - "PhoneNumberConfirmed": true, - "Password": "Pass123$", - "Roles": [ - "Is4-Writer", - "Is4-Reader" - ], - "Claims": [ - { - "ClaimType": "name", - "ClaimValue": "Alice Smith" - }, - { - "ClaimType": "given_name", - "ClaimValue": "Alice" - }, - { - "ClaimType": "family_name", - "ClaimValue": "Smith" - }, - { - "ClaimType": "middle_name", - "ClaimValue": "Alice Smith" - }, - { - "ClaimType": "nickname", - "ClaimValue": "alice" - }, - { - "ClaimType": "website", - "ClaimValue": "http://alice.com" - }, - { - "ClaimType": "address", - "ClaimValue": "{ \"street_address\": \"One Hacker Way\", \"locality\": \"Heidelberg\", \"postal_code\": \"69118\", \"country\": \"Germany\" }", - }, - { - "ClaimType": "birthdate", - "ClaimValue": "1970-01-01" - }, - { - "ClaimType": "zoneinfo", - "ClaimValue": "ch" - }, - { - "ClaimType": "gender", - "ClaimValue": "female" - }, - { - "ClaimType": "profile", - "ClaimValue": "http://alice.com/profile" - }, - { - "ClaimType": "locale", - "ClaimValue": "fr" - }, - { - "ClaimType": "picture", - "ClaimValue": "http://alice.com/picture" - } - ] - } - ] -} -``` - -> A user with *Is4-Writer* and *Is4-Reader* roles is required to use the admin app. - -#### Protected resources (API) - -Apis defined in `InitialData:Apis` configuration section are loaded and stored to the DB. - -Default configuration: - -```json -"InitialData": { -... - "Apis": [ - { - "Name": "theidserveradminapi", - "DisplayName": "TheIdServer admin API", - "UserClaims": [ - "name", - "role" - ], - "ApiSecrets": [ - { - "Type": "SharedSecret", - "Value": "5b556f7c-b3bc-4b5b-85ab-45eed0cb962d" - } - ], - "Scopes": [ - "theidserveradminapi" - ] - } - ], -} -``` - -> The api **theidserveradminapi** is required for the admin app. - -#### ApiScopes - -ApiScopes defined in `InitialData:ApiScopes` configuration section are loaded and stored to the DB. - -Default configuration: - -```json -"InitialData": { -... - "ApiScopes": [ - { - "Name": "theidserveradminapi", - "DisplayName": "TheIdServer admin API", - "UserClaims": [ - "name", - "role" - ] - } - ], -} -``` - -> The scope **theidserveradminapi** is required for the admin app. - -#### Clients - -Clients defined in `InitialData:Clients` configuration section are loaded and stored to the DB. - -Default configuration: - -```json -"InitialData": { -... - "Clients": [ - { - "ClientId": "theidserveradmin", - "ClientName": "TheIdServer admin SPA Client", - "ClientUri": "https://localhost:5443/", - "ClientClaimsPrefix": null, - "AllowedGrantTypes": [ "authorization_code" ], - "RequirePkce": true, - "RequireClientSecret": false, - "BackChannelLogoutSessionRequired": false, - "FrontChannelLogoutSessionRequired": false, - "RedirectUris": [ - "http://localhost:5001/authentication/login-callback", - "https://localhost:5443/authentication/login-callback" - ], - "PostLogoutRedirectUris": [ - "http://localhost:5001/authentication/logout-callback", - "https://localhost:5443/authentication/logout-callback" - ], - "AllowedCorsOrigins": [ - "http://localhost:5001", - "https://localhost:5443" - ], - "AllowedScopes": [ - "openid", - "profile", - "theidserveradminapi" - ], - "AccessTokenType": "Reference" - }, - { - "ClientId": "public-server", - "ClientName": "Public server Credentials Client", - "ClientClaimsPrefix": null, - "AllowedGrantTypes": [ "client_credentials" ], - "ClientSecrets": [ - { - "Type": "SharedSecret", - "Value": "84137599-13d6-469c-9376-9e372dd2c1bd" - } - ], - "Claims": [ - { - "Type": "role", - "Value": "Is4-Writer" - }, - { - "Type": "role", - "Value": "Is4-Reader" - } - ], - "BackChannelLogoutSessionRequired": false, - "FrontChannelLogoutSessionRequired": false, - "AllowedScopes": [ - "openid", - "profile", - "theidserveradminapi" - ], - "AccessTokenType": "Reference" - } - ], -} -``` - -> The client **theidserveradmin** is required by the admin app. -> The client **public-server** is required to call web apis and server side prerendering of the admin app. - -## Configure Signing Key - -### Keys rotatation (recommanded) - -TheIdServer can be configured with a keys rotation mechanism instead of a single key. -Read [Keys rotation](../../doc/KEYS_ROTATION.md) to know how to configure it. - -```json -"IdentityServer": { - "Key": { - "Type": "KeysRotation", - "StorageKind": "EntityFramework" - } -} -``` - -### From file - -```json -"IdentityServer": { - "Key": { - "Type": "File", - "FilePath": "{path to the .pfx}", - "Password": "{.pfx password}" - } -} -``` - -### From store - -Read [Example: Deploy to Azure Websites](https://docs.microsoft.com/en-us/aspnet/core/security/authentication/identity-api-authorization#example-deploy-to-azure-websites) - -## Configure the Email service - -By default, the server uses [SendGrid](https://sendgrid.com/) to send Emails by calling the API at */api/email* - -```json -"SendGridUser": "your user", -"SendGridKey": "your SendGrid key" -``` - -### Use your API - -If you prefer to use your Email sender, implement a Web API receiving a POST request with the json: - -```json -{ - "subject": "Email subject", - "message": "Email message", - "addresses": [ - "an-address@aguacongas.con" - ] -} -``` - -And update the *EmailApiAuthentication* configuration section: - -```json -"EmailApiAuthentication": { - "Authority": "https://localhost:5443", - "ApiUrl": "https://localhost:5443/api/email", - "ClientId": "public-server", - "ClientSecret": "84137599-13d6-469c-9376-9e372dd2c1bd", - "Scope": "theidserveradminapi", - "HttpClientName": "email" -} -``` - -> If you want to use the same authentication configuration and token for both *EmailApi* and *PrivateServer*, you can simplify it by sharing the same **HttpClientName**. - -```json -"EmailApiAuthentication": { - "ApiUrl": "https://localhost:5443/api/email", - "HttpClientName": "is4" -} -``` - -## Configure the 2fa authenticator issuer - -By default, the issuer for the 2fa authenticator is **Aguacongas.TheIdServer**. -To update this value, set **AuthenticatorIssuer** with your issuer. - -```json -"AuthenticatorIssuer": "TheIdServer" -``` - -## Configure the API - -### Authentication - -The *ApiAuthentication* section defines the authentication configuration for the API. - -```json -"ApiAuthentication": { - "Authority": "https://localhost", - "RequireHttpsMetadata": false, - "SupportedTokens": "Both", - "ApiName": "theidserveradminapi", - "ApiSecret": "5b556f7c-b3bc-4b5b-85ab-45eed0cb962d", - "EnableCaching": true, - "CacheDuration": "0:10:0", - "LegacyAudienceValidation": true -} -``` - -### Documentation endpoint - -To enable the API documentation, set **EnableOpenApiDoc** to `true`. - -```json -"EnableOpenApiDoc": true -``` - -Use the section *SwaggerUiSettings* to configure the swagger client authentication. - -```json -"SwaggerUiSettings": { - "OAuth2Client": { - "ClientId": "theidserver-swagger", - "AppName": "TheIdServer Swagger UI", - "UsePkceWithAuthorizationCodeGrant": true - }, - "WithCredentials": true -} -``` - -### CORS - -The section *CorsAllowedOrigin* defines allowed CORS origins. - -```json -"CorsAllowedOrigin": [ - "http://localhost:5001" -] -``` - -## Configure HTTPS - -To disable HTTPS, set **DisableHttps** to `false`. - -```json -"DisableHttps": true -``` - -If you use a self-signed certificate, you can disable strict-SSL by settings **DisableStrictSsl** to `true`. - -```json -"DisableStrictSsl": true -``` - -### Configure Forwarded Headers - -The section **ForwardedHeadersOptions** is bound to the class [`Microsoft.AspNetCore.Builder.ForwardedHeadersOptions`](https://docs.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.builder.forwardedheadersoptions). - -```json -"ForwardedHeadersOptions": { - "ForwardedHeaders": "All" -} -``` - -### Force HTTPS scheme - -Some reverses proxies don't' forward headers. You can force HTTP requests schemes to https by settings ForceHttpsScheme. - -```json -"ForceHttpsScheme": true -``` - - -## Configure the provider hub - -The [Aguacongas.AspNetCore.Authentication library](https://github.com/Aguafrommars/DymamicAuthProviders) dynamically configures external providers. -In a [load-balanced](https://github.com/Aguafrommars/DymamicAuthProviders/wiki/Load-balancing-scenario) configuration, the provider hub informs other running instances that an external provider configuration changes. -The **SignalR** section defines the configuration for both the SignalR hub and the client. - -```json -"SignalR": { - "HubUrl": "https://theidserverprivate/providerhub", - "HubOptions": { - "EnableDetailedErrors": true - }, - "UseMessagePack": true, - "RedisConnectionString": "redis:6379", - "RedisOptions": { - "Configuration": { - "ChannelPrefix": "TheIdServer" - } - } -} -``` - -If needed, the hub can use a [Redis backplane](https://docs.microsoft.com/en-us/aspnet/core/signalr/redis-backplane). **SignalR:RedisConnectionString** and **SignalR:RedisOptions** configures the backplane. -**SignalR:RedisOptions** is bound to an instance of [`Microsoft.AspNetCore.SignalR.StackExchangeRedis.RedisOptions`](https://docs.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.signalr.stackexchangeredis.redisoptions?view=aspnetcore-3.0) at startup. - -## Configure logs - -The **Serilog** section defines the [Serilog](https://serilog.net/) configuration. - -```json -"Serilog": { - "LevelSwitches": { - "$controlSwitch": "Information" - }, - "MinimumLevel": { - "ControlledBy": "$controlSwitch" - }, - "WriteTo": [ - { - "Name": "Seq", - "Args": { - "serverUrl": "http://localhost:5341", - "controlLevelSwitch": "$controlSwitch", - "apiKey": "DVYuookX2vOq078fuOyJ" - } - }, - { - "Name": "Console", - "Args": { - "outputTemplate": "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}", - "theme": "Serilog.Sinks.SystemConsole.Themes.AnsiConsoleTheme::Literate, Serilog.Sinks.Console" - } - }, - { - "Name": "Debug", - "Args": { - "outputTemplate": "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}" - } - } - ], - "Enrich": [ - "FromLogContext", - "WithMachineName", - "WithThreadId" - ] -} -``` -For more details, read [Serilog.Settings.Configuration](https://github.com/serilog/serilog-settings-configuration/blob/dev/README.md). - -## Configure claims providers - -[Claims provider](../../doc/CLAIMS_PROVIDER.md) provides details on claims proivder configuration. - -## Configure token cleaner - -The token cleaner task removes expired tokens periodically. To configure the interval, use **TokenCleanupInterval**. - -```json -"TokenCleanupInterval": "00:05:00" -``` - -To disable the task, use **DisableTokenCleanup**. - -```json -"DisableTokenCleanup": true -``` - -> The task is not enabled on proxy server. - -## Configure Dynamic client registration allowed contacts a host - -The server supports [OpenID Connect Dynamic Client Registration](https://openid.net/specs/openid-connect-registration-1_0.html). - -New client registration is allowed to users with the **Is4-Writer** role by sending the user access token or to contacts defined in *DynamicClientRegistrationOptions* section. - -```json -"DynamicClientRegistrationOptions": { - "AllowedContacts": [ - { - "Contact": "certification@oidf.org", - "AllowedHosts": [ - "www.certification.openid.net" - ] - } - ] -} -``` - -It this case, the client registration request must contain the *contacts* array. - -**request sample** - -```json -{ - "client_name": "oidc_cert_client gUPPBlHIEAqNOYR", - "grant_types": [ - "authorization_code" - ], - "response_types": [ - "code" - ], - "redirect_uris": [ - "https://www.certification.openid.net/test/a/theidserver/callback" - ], - "contacts": [ - "certification@oidf.org" - ] -} -``` - -## Configure Jwt request validator - -Tokens returned by request_uri parameter are validated using the rules defined in *TokenValidationParameters* section. By default, the following rules are defined. - -```json -"TokenValidationParameters": { - "ValidateIssuer": false, - "ValidateAudience": false, - "ValidateIssuerSigningKey": false, - "ValidateLifetime": false, - "RequireAudience": false, - "RequireExpirationTime": false, - "RequireSignedTokens": false -} -``` - -> To enable JWT request uri, set *EnableJwtRequestUri* to true in *IdentityServerOptions:Endpoints* -> ```json -> "IdentityServerOptions": { -> "Endpoints": { -> "EnableJwtRequestUri": true -> } -> }, -> ``` - -## Configure WS-Federation endpoint - -Read [Aguacongas.IdentityServer.WsFederation.ISA](../IdentityServer/IS4/Aguacongas.IdentityServer.WsFederation.IS4/README.md) - -## Use the client to override the default configuration - -The server and the blazor app integrate [Aguafrommars/DynamicConfiguration](https://github.com/Aguafrommars/DynamicConfiguration). Most of the configuration can be ovveriden using the blazor app. - -Use **DynamicConfigurationOptions** to define the dynamic configuration provider. - -```json -"DynamicConfigurationOptions": { - "ProviderType": "Aguacongas.DynamicConfiguration.Redis.RedisConfigurationProvider, Aguacongas.DynamicConfiguration.Redis" -} -``` -Use **RedisConfigurationOptions** section to configure the Redis db. - -```json -"RedisConfigurationOptions": { - "ConnectionString": "localhost", - "HashKey": "Aguacongas.TheIdServer.Duende", - "Channel": "Aguacongas.TheIdServer.Duende.Channel" -} -``` - -## Health check - -The server expose an health check enpoint you can use for docker on kubernetes at **/healthz**. - -The endpoit return a json reponse depending on the store kind used and redis dependencies : - -```json -{ - "status": "Healthy", - "results": { - "ConfigurationDbContext": { - "status": "Healthy" - }, - "OperationalDbContext": { - "status": "Healthy" - }, - "ApplicationDbContext": { - "status": "Healthy" - }, - "dynamicConfigurationRedis": { - "status": "Healthy" - } - } -} -``` - -## Configure OpenTelemetry - -[Configure OpenTelemetry doc](../../doc/OPEN_TELEMETRY.md) provides details on [OpenTelemetry](https://opentelemetry.io/) configuration. - - -## Additional resources - -* [Host and deploy ASP.NET Core](https://docs.microsoft.com/en-us/aspnet/core/host-and-deploy/) -* [DymamicAuthProviders](https://github.com/Aguafrommars/DymamicAuthProviders) -* [Set up a Redis backplane for ASP.NET Core SignalR scale-out](https://docs.microsoft.com/en-us/aspnet/core/signalr/redis-backplane) -* [Microsoft.AspNetCore.SignalR.StackExchangeRedis.RedisOptions](https://docs.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.signalr.stackexchangeredis.redisoptions?view=aspnetcore-3.0) -* [Serilog.Settings.Configuration](https://github.com/serilog/serilog-settings-configuration/blob/dev/README.md) -* [Hosting ASP.NET Core images with Docker over HTTPS](https://docs.microsoft.com/en-us/aspnet/core/security/docker-https) -* [OpenID Connect Dynamic Client Registration](https://openid.net/specs/openid-connect-registration-1_0.html) -* [Aguafrommars/DynamicConfiguration](https://github.com/Aguafrommars/DynamicConfiguration) -* [OpenTelemetry](https://opentelemetry.io/) \ No newline at end of file diff --git a/src/Aguacongas.TheIdServer.IS4/Views/Shared/_ViewImports.cshtml b/src/Aguacongas.TheIdServer.IS4/Views/Shared/_ViewImports.cshtml deleted file mode 100644 index 07d17bc6f..000000000 --- a/src/Aguacongas.TheIdServer.IS4/Views/Shared/_ViewImports.cshtml +++ /dev/null @@ -1,5 +0,0 @@ -@* -Project: Aguafrommars/TheIdServer -Copyright (c) 2022 @Olivier Lefebvre -*@ -@using IdentityServer4.Extensions \ No newline at end of file diff --git a/src/Aguacongas.TheIdServer.IS4/appsettings.Development.json b/src/Aguacongas.TheIdServer.IS4/appsettings.Development.json deleted file mode 100644 index 64907a99b..000000000 --- a/src/Aguacongas.TheIdServer.IS4/appsettings.Development.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "IdentityServer": { - "Key": { - "KeyRotationOptions": { - "NewKeyLifetime": "14.00:00:00", - "KeyPropagationWindow": "30.00:00:00" - } - } - }, - "Serilog": { - "WriteTo": [ - { - "Name": "Seq", - "Args": { - "serverUrl": "http://localhost:5341", - "controlLevelSwitch": "$controlSwitch", - "apiKey": "DVYuookX2vOq078fuOyJ" - } - }, - { - "Name": "Console", - "Args": { - "outputTemplate": "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}", - "theme": "Serilog.Sinks.SystemConsole.Themes.AnsiConsoleTheme::Literate, Serilog.Sinks.Console" - } - }, - { - "Name": "Debug", - "Args": { - "outputTemplate": "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}" - } - } - ] - } -} \ No newline at end of file diff --git a/src/Aguacongas.TheIdServer.IS4/appsettings.json b/src/Aguacongas.TheIdServer.IS4/appsettings.json deleted file mode 100644 index aaadbd388..000000000 --- a/src/Aguacongas.TheIdServer.IS4/appsettings.json +++ /dev/null @@ -1,429 +0,0 @@ -{ - "ConnectionStrings": { - "DefaultConnection": "Data Source=(LocalDb)\\MSSQLLocalDB;database=TheIdServer.IS4;trusted_connection=yes;" - }, - "RavenDbOptions": { - "Urls": [ - "https://a.ravendb.local", - "https://b.ravendb.local", - "https://c.ravendb.local" - ], - "Database": "TheIdServer", - "CertificatePath": "TheIdServer.pfx", - "CertificatePassword": "TheIdServer" - }, - "SiteOptions": { - "Name": "TheIdServer" - }, - "IdentityOptions": { - "User": { - "AllowedUserNameCharacters": "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._@+/\\ " - }, - "SignIn": { - "RequireConfirmedAccount": true - } - }, - "IdentityServerOptions": { - "Endpoints": { - "EnableJwtRequestUri": true - } - }, - "AccountOptions": { - "ShowLogoutPrompt": false, - "AutomaticRedirectAfterSignOut": true - }, - "IdentityServer": { - "Key": { - "Type": "KeysRotation", - "StorageKind": "EntityFramework", - "AdditionalSigningKeyType": { - "RS384": { - "SigningAlgorithm": "RS384" - }, - "RS512": { - "SigningAlgorithm": "RS512" - }, - "PS256": { - "SigningAlgorithm": "PS256" - }, - "PS384": { - "SigningAlgorithm": "PS384" - }, - "PS512": { - "SigningAlgorithm": "PS512" - }, - "ES256": { - "SigningAlgorithm": "ES256" - }, - "ES384": { - "SigningAlgorithm": "ES384" - }, - "ES512": { - "SigningAlgorithm": "ES512" - } - } - } - }, - "DataProtectionOptions": { - "StorageKind": "EntityFramework" - }, - "DisableTokenCleanup": true, - "TokenCleanupInterval": "00:05:00", - "Proxy": false, - "Migrate": true, - "DbType": "SqlServer", - "Seed": true, - "AuthenticatorIssuer": "TheIdServer", - "EnableOpenApiDoc": true, - "CorsAllowedOrigin": [ - "http://localhost:5001" - ], - "SwaggerUiSettings": { - "OAuth2Client": { - "ClientId": "theidserver-swagger", - "AppName": "TheIdServer Swagger UI", - "UsePkceWithAuthorizationCodeGrant": true - }, - "WithCredentials": true - }, - "ApiAuthentication": { - "Authority": "https://localhost:5443", - "RequireHttpsMetadata": false, - "ApiName": "theidserveradminapi", - "ApiSecret": "5b556f7c-b3bc-4b5b-85ab-45eed0cb962d", - "EnableCaching": true, - "CacheDuration": "0:10:0" - }, - "PrivateServerAuthentication": { - "Authority": "https://localhost:5443", - "ApiUrl": "https://localhost:5443/api", - "ClientId": "public-server", - "ClientSecret": "84137599-13d6-469c-9376-9e372dd2c1bd", - "Scope": "theidserveradminapi", - "HttpClientName": "is4" - }, - "EmailApiAuthentication": { - "Authority": "https://localhost:5443", - "ApiUrl": "https://localhost:5443/api/email", - "ClientId": "public-server", - "ClientSecret": "84137599-13d6-469c-9376-9e372dd2c1bd", - "Scope": "theidserveradminapi", - "HttpClientName": "email" - }, - "DynamicConfigurationOptions": { - "ProviderType": "Aguacongas.DynamicConfiguration.Redis.RedisConfigurationProvider, Aguacongas.DynamicConfiguration.Redis" - }, - "DynamicClientRegistrationOptions": { - "AllowedContacts": [ - { - "Contact": "certification@oidf.org", - "AllowedHosts": [ - "www.certification.openid.net" - ] - } - ] - }, - "RedisConfigurationOptions": { - "ConnectionString": "localhost", - "HashKey": "Aguacongas.TheIdServer.IS4", - "Channel": "Aguacongas.TheIdServer.IS4.Channel" - }, - "SignalR": { - "HubOptions": { - "EnableDetailedErrors": true - }, - "UseMessagePack": true, - "RedisOptions": { - "Configuration": { - "ChannelPrefix": "TheIdServer" - } - } - }, - "Serilog": { - "LevelSwitches": { - "$controlSwitch": "Information" - }, - "MinimumLevel": { - "ControlledBy": "$controlSwitch" - }, - "WriteTo": [ - { - "Name": "Seq", - "Args": { - "serverUrl": "http://localhost:5341", - "controlLevelSwitch": "$controlSwitch", - "apiKey": "DVYuookX2vOq078fuOyJ" - } - }, - { - "Name": "Debug", - "Args": { - "outputTemplate": "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}" - } - } - ], - "Enrich": [ - "FromLogContext", - "WithMachineName", - "WithThreadId" - ] - }, - "InitialData": { - "Clients": [ - { - "ClientId": "theidserveradmin", - "ClientName": "TheIdServer admin SPA Client", - "ClientUri": "https://localhost:5443/", - "ClientClaimsPrefix": null, - "AllowedGrantTypes": [ "authorization_code" ], - "RequirePkce": true, - "RequireClientSecret": false, - "BackChannelLogoutSessionRequired": false, - "FrontChannelLogoutSessionRequired": false, - "RedirectUris": [ - "http://localhost:5001/authentication/login-callback", - "https://localhost:5443/authentication/login-callback" - ], - "PostLogoutRedirectUris": [ - "http://localhost:5001/authentication/logout-callback", - "https://localhost:5443/authentication/logout-callback" - ], - "AllowedCorsOrigins": [ - "http://localhost:5001", - "https://localhost:5443" - ], - "AllowedScopes": [ - "openid", - "profile", - "theidserveradminapi" - ], - "AccessTokenType": "Reference" - }, - { - "ClientId": "public-server", - "ClientName": "Public server Credentials Client", - "ClientClaimsPrefix": null, - "AllowedGrantTypes": [ "client_credentials" ], - "ClientSecrets": [ - { - "Type": "SharedSecret", - "Value": "84137599-13d6-469c-9376-9e372dd2c1bd" - } - ], - "Claims": [ - { - "Type": "role", - "Value": "Is4-Writer" - }, - { - "Type": "role", - "Value": "Is4-Reader" - } - ], - "BackChannelLogoutSessionRequired": false, - "FrontChannelLogoutSessionRequired": false, - "AllowedScopes": [ - "openid", - "profile", - "theidserveradminapi" - ], - "AccessTokenType": "Reference" - }, - { - "ClientId": "theidserver-swagger", - "ClientName": "TheIdServer Swagger UI", - "ClientClaimsPrefix": null, - "AllowedGrantTypes": [ "implicit" ], - "AllowAccessTokensViaBrowser": true, - "RequireClientSecret": false, - "BackChannelLogoutSessionRequired": false, - "FrontChannelLogoutSessionRequired": false, - "AllowedScopes": [ - "theidserveradminapi", - "theidservertokenapi" - ], - "AllowedCorsOrigins": [ - "https://localhost:5443" - ], - "RedirectUris": [ - "https://localhost:5443/api/swagger/oauth2-redirect.html" - ] - } - ], - "RelyingParties": [ - { - "Id": "defaultSaml1", - "Description": "The default relying party for SAML 1.0 token.", - "DigestAlgorithm": "http://www.w3.org/2001/04/xmlenc#sha256", - "SamlNameIdentifierFormat": "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", - "SignatureAlgorithm": "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256", - "TokenType": "urn:oasis:names:tc:SAML:1.0:assertion", - "ClaimMappings": [ - { - "FromClaimType": "name", - "ToClaimType": "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" - }, - { - "FromClaimType": "sub", - "ToClaimType": "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" - }, - { - "FromClaimType": "email", - "ToClaimType": "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" - }, - { - "FromClaimType": "given_name", - "ToClaimType": "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" - }, - { - "FromClaimType": "family_name", - "ToClaimType": "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" - }, - { - "FromClaimType": "birthdate", - "ToClaimType": "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/dateofbirth" - }, - { - "FromClaimType": "website", - "ToClaimType": "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/webpage" - }, - { - "FromClaimType": "gender", - "ToClaimType": "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/gender" - }, - { - "FromClaimType": "role", - "ToClaimType": "http://schemas.microsoft.com/ws/2008/06/identity/claims/role" - } - ] - }, - { - "Id": "defaultSaml2", - "Description": "The default relying party for SAML 2.0 token.", - "DigestAlgorithm": "http://www.w3.org/2001/04/xmlenc#sha256", - "SamlNameIdentifierFormat": "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", - "SignatureAlgorithm": "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256", - "TokenType": "urn:oasis:names:tc:SAML:2.0:assertion" - } - ], - "ApiScopes": [ - { - "Name": "theidserveradminapi", - "DisplayName": "TheIdServer admin API", - "UserClaims": [ - "name", - "role" - ] - }, - { - "Name": "theidserveratokenapi", - "DisplayName": "TheIdServer admin API", - "UserClaims": [ - "name", - "role" - ] - } - ], - "Apis": [ - { - "Name": "theidserveradminapi", - "DisplayName": "TheIdServer admin API", - "UserClaims": [ - "name", - "role" - ], - "ApiSecrets": [ - { - "Type": "SharedSecret", - "Value": "5b556f7c-b3bc-4b5b-85ab-45eed0cb962d" - } - ], - "Scopes": [ - "theidserveradminapi", - "theidserveratokenapi" - ] - } - ], - "Users": [ - { - "UserName": "alice", - "Email": "alice@theidserver.com", - "EmailConfirmed": true, - "PhoneNumber": "+41766403736", - "PhoneNumberConfirmed": true, - "Password": "Pass123$", - "Roles": [ - "Is4-Writer", - "Is4-Reader" - ], - "Claims": [ - { - "ClaimType": "name", - "ClaimValue": "Alice Smith" - }, - { - "ClaimType": "given_name", - "ClaimValue": "Alice" - }, - { - "ClaimType": "family_name", - "ClaimValue": "Smith" - }, - { - "ClaimType": "middle_name", - "ClaimValue": "Alice Smith" - }, - { - "ClaimType": "nickname", - "ClaimValue": "alice" - }, - { - "ClaimType": "website", - "ClaimValue": "http://alice.com" - }, - { - "ClaimType": "address", - "ClaimValue": "{ \"street_address\": \"One Hacker Way\", \"locality\": \"Heidelberg\", \"postal_code\": \"69118\", \"country\": \"Germany\" }" - }, - { - "ClaimType": "birthdate", - "ClaimValue": "1970-01-01" - }, - { - "ClaimType": "zoneinfo", - "ClaimValue": "ch" - }, - { - "ClaimType": "gender", - "ClaimValue": "female" - }, - { - "ClaimType": "profile", - "ClaimValue": "http://alice.com/profile" - }, - { - "ClaimType": "locale", - "ClaimValue": "fr" - }, - { - "ClaimType": "picture", - "ClaimValue": "http://alice.com/picture" - } - ] - } - ] - }, - "OpenTelemetryOptions": { - "Trace": { - "Service": { - "Name": "TheIdServer.IS4", - "Version": "Next" - }, - "ConsoleEnabled": false, - "Honeycomb": { - "ServiceName": "TheIdServer.IS4", - "Dataset": "TheIdServer.IS4" - } - } - } -} \ No newline at end of file diff --git a/src/Aguacongas.TheIdServer.IS4/compilerconfig.json b/src/Aguacongas.TheIdServer.IS4/compilerconfig.json deleted file mode 100644 index 42a9e0ba5..000000000 --- a/src/Aguacongas.TheIdServer.IS4/compilerconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -[ - { - "outputFile": "wwwroot/css/site.css", - "inputFile": "wwwroot/css/site.less" - } -] \ No newline at end of file diff --git a/src/Aguacongas.TheIdServer.IS4/compilerconfig.json.defaults b/src/Aguacongas.TheIdServer.IS4/compilerconfig.json.defaults deleted file mode 100644 index 3b424156c..000000000 --- a/src/Aguacongas.TheIdServer.IS4/compilerconfig.json.defaults +++ /dev/null @@ -1,61 +0,0 @@ -{ - "compilers": { - "less": { - "autoPrefix": "", - "cssComb": "none", - "ieCompat": true, - "math": null, - "strictMath": false, - "strictUnits": false, - "relativeUrls": true, - "rootPath": "", - "sourceMapRoot": "", - "sourceMapBasePath": "", - "sourceMap": false - }, - "sass": { - "autoPrefix": "", - "loadPaths": [], - "style": 0, - "precision": 10, - "quiet": true, - "quietDeps": true, - "sourceMap": false - }, - "stylus": { - "sourceMap": false - }, - "babel": { - "sourceMap": false - }, - "coffeescript": { - "bare": false, - "runtimeMode": "node", - "sourceMap": false - }, - "handlebars": { - "root": "", - "noBOM": false, - "name": "", - "namespace": "", - "knownHelpersOnly": false, - "forcePartial": false, - "knownHelpers": [], - "commonjs": "", - "amd": false, - "sourceMap": false - } - }, - "minifiers": { - "css": { - "enabled": true, - "termSemicolons": true, - "gzip": false - }, - "javascript": { - "enabled": true, - "termSemicolons": true, - "gzip": false - } - } -} \ No newline at end of file diff --git a/src/Aguacongas.TheIdServer.IS4/wwwroot/css/site.css b/src/Aguacongas.TheIdServer.IS4/wwwroot/css/site.css deleted file mode 100644 index 4ec2db75c..000000000 --- a/src/Aguacongas.TheIdServer.IS4/wwwroot/css/site.css +++ /dev/null @@ -1,79 +0,0 @@ -.navbar-header { - position: relative; - top: -4px; -} -.navbar-brand > .icon-banner { - position: relative; - top: -2px; - display: inline; -} -.icon { - position: relative; - top: -10px; -} -.logged-out iframe { - display: none; - width: 0; - height: 0; -} -.page-consent .client-logo { - float: left; -} -.page-consent .client-logo img { - width: 80px; - height: 80px; -} -.page-consent .consent-buttons { - margin-top: 25px; -} -.page-consent .consent-form .consent-scopecheck { - display: inline-block; - margin-right: 5px; -} -.page-consent .consent-form .consent-description { - margin-left: 25px; -} -.page-consent .consent-form .consent-description label { - font-weight: normal; -} -.page-consent .consent-form .consent-remember { - padding-left: 16px; -} -.grants .page-header { - margin-bottom: 10px; -} -.grants .grant { - margin-top: 20px; - padding-bottom: 20px; - border-bottom: 1px solid lightgray; -} -.grants .grant img { - width: 100px; - height: 100px; -} -.grants .grant .clientname { - font-size: 140%; - font-weight: bold; -} -.grants .grant .granttype { - font-size: 120%; - font-weight: bold; -} -.grants .grant .created { - font-size: 120%; - font-weight: bold; -} -.grants .grant .expires { - font-size: 120%; - font-weight: bold; -} -.grants .grant li { - list-style-type: none; - display: inline; -} -.grants .grant li:after { - content: ', '; -} -.grants .grant li:last-child:after { - content: ''; -} \ No newline at end of file diff --git a/src/Aguacongas.TheIdServer.IS4/wwwroot/css/site.less b/src/Aguacongas.TheIdServer.IS4/wwwroot/css/site.less deleted file mode 100644 index dde0178a6..000000000 --- a/src/Aguacongas.TheIdServer.IS4/wwwroot/css/site.less +++ /dev/null @@ -1,109 +0,0 @@ -.navbar-header { - position: relative; - top: -4px; -} - -.navbar-brand > .icon-banner { - position: relative; - top: -2px; - display: inline; -} - -.icon { - position: relative; - top: -10px; -} - -.logged-out iframe { - display: none; - width: 0; - height: 0; -} - -.page-consent { - .client-logo { - float: left; - - img { - width: 80px; - height: 80px; - } - } - - .consent-buttons { - margin-top: 25px; - } - - .consent-form { - .consent-scopecheck { - display: inline-block; - margin-right: 5px; - } - - .consent-scopecheck[disabled] { - //visibility:hidden; - } - - .consent-description { - margin-left: 25px; - - label { - font-weight: normal; - } - } - - .consent-remember { - padding-left: 16px; - } - } -} - -.grants { - .page-header { - margin-bottom: 10px; - } - - .grant { - margin-top: 20px; - padding-bottom: 20px; - border-bottom: 1px solid lightgray; - - img { - width: 100px; - height: 100px; - } - - .clientname { - font-size: 140%; - font-weight: bold; - } - - .granttype { - font-size: 120%; - font-weight: bold; - } - - .created { - font-size: 120%; - font-weight: bold; - } - - .expires { - font-size: 120%; - font-weight: bold; - } - - li { - list-style-type: none; - display: inline; - - &:after { - content: ', '; - } - - &:last-child:after { - content: ''; - } - } - } -} diff --git a/src/Aguacongas.TheIdServer.IS4/wwwroot/css/site.min.css b/src/Aguacongas.TheIdServer.IS4/wwwroot/css/site.min.css deleted file mode 100644 index 1ac41e101..000000000 --- a/src/Aguacongas.TheIdServer.IS4/wwwroot/css/site.min.css +++ /dev/null @@ -1 +0,0 @@ -.navbar-header{position:relative;top:-4px;}.navbar-brand>.icon-banner{position:relative;top:-2px;display:inline;}.icon{position:relative;top:-10px;}.logged-out iframe{display:none;width:0;height:0;}.page-consent .client-logo{float:left;}.page-consent .client-logo img{width:80px;height:80px;}.page-consent .consent-buttons{margin-top:25px;}.page-consent .consent-form .consent-scopecheck{display:inline-block;margin-right:5px;}.page-consent .consent-form .consent-description{margin-left:25px;}.page-consent .consent-form .consent-description label{font-weight:normal;}.page-consent .consent-form .consent-remember{padding-left:16px;}.grants .page-header{margin-bottom:10px;}.grants .grant{margin-top:20px;padding-bottom:20px;border-bottom:1px solid #d3d3d3;}.grants .grant img{width:100px;height:100px;}.grants .grant .clientname{font-size:140%;font-weight:bold;}.grants .grant .granttype{font-size:120%;font-weight:bold;}.grants .grant .created{font-size:120%;font-weight:bold;}.grants .grant .expires{font-size:120%;font-weight:bold;}.grants .grant li{list-style-type:none;display:inline;}.grants .grant li:after{content:', ';}.grants .grant li:last-child:after{content:'';} \ No newline at end of file diff --git a/src/Aguacongas.TheIdServer.IS4/wwwroot/favicon.ico b/src/Aguacongas.TheIdServer.IS4/wwwroot/favicon.ico deleted file mode 100644 index 21b5d48c9..000000000 Binary files a/src/Aguacongas.TheIdServer.IS4/wwwroot/favicon.ico and /dev/null differ diff --git a/src/Aguacongas.TheIdServer.IS4/wwwroot/heroku-metadata.json b/src/Aguacongas.TheIdServer.IS4/wwwroot/heroku-metadata.json deleted file mode 100644 index cb9f375f0..000000000 --- a/src/Aguacongas.TheIdServer.IS4/wwwroot/heroku-metadata.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "issuer": "https://theidserver.herokuapp.com", - "jwks_uri": "https://theidserver.herokuapp.com/.well-known/openid-configuration/jwks", - "authorization_endpoint": "https://theidserver.herokuapp.com/connect/authorize", - "token_endpoint": "https://theidserver.herokuapp.com/connect/token", - "userinfo_endpoint": "https://theidserver.herokuapp.com/connect/userinfo", - "end_session_endpoint": "https://theidserver.herokuapp.com/connect/endsession", - "check_session_iframe": "https://theidserver.herokuapp.com/connect/checksession" -} \ No newline at end of file diff --git a/src/Aguacongas.TheIdServer.IS4/wwwroot/heroku-welcome-fragment.html b/src/Aguacongas.TheIdServer.IS4/wwwroot/heroku-welcome-fragment.html deleted file mode 100644 index 185332517..000000000 --- a/src/Aguacongas.TheIdServer.IS4/wwwroot/heroku-welcome-fragment.html +++ /dev/null @@ -1,19 +0,0 @@ -

    - This application manage your TheIdServer. - An OpenID/Connect, OAuth2 - and WS-Federation - server based on IdentityServer4. -

    -

    - Visit the github site for doc, source code and issue tracking. -

    -

    - This site is running under a free heroku dyno (so it can be slow when the dyno start). -

    -

    - You can sign-in with alice.
    - The passord is Pass123$ -

    -

    - This application use an OpenApi documented here. -

    diff --git a/src/Aguacongas.TheIdServer.IS4/wwwroot/icon.jpg b/src/Aguacongas.TheIdServer.IS4/wwwroot/icon.jpg deleted file mode 100644 index e6525028a..000000000 Binary files a/src/Aguacongas.TheIdServer.IS4/wwwroot/icon.jpg and /dev/null differ diff --git a/src/Aguacongas.TheIdServer.IS4/wwwroot/icon.png b/src/Aguacongas.TheIdServer.IS4/wwwroot/icon.png deleted file mode 100644 index cd386d517..000000000 Binary files a/src/Aguacongas.TheIdServer.IS4/wwwroot/icon.png and /dev/null differ diff --git a/src/Aguacongas.TheIdServer.IS4/wwwroot/icons8-app-symbol-96.png b/src/Aguacongas.TheIdServer.IS4/wwwroot/icons8-app-symbol-96.png deleted file mode 100644 index c0b0b3c07..000000000 Binary files a/src/Aguacongas.TheIdServer.IS4/wwwroot/icons8-app-symbol-96.png and /dev/null differ diff --git a/src/Aguacongas.TheIdServer.IS4/wwwroot/js/signin-redirect.js b/src/Aguacongas.TheIdServer.IS4/wwwroot/js/signin-redirect.js deleted file mode 100644 index 6ebc5691c..000000000 --- a/src/Aguacongas.TheIdServer.IS4/wwwroot/js/signin-redirect.js +++ /dev/null @@ -1 +0,0 @@ -window.location.href = document.querySelector("meta[http-equiv=refresh]").getAttribute("data-url"); diff --git a/src/Aguacongas.TheIdServer.IS4/wwwroot/js/signout-redirect.js b/src/Aguacongas.TheIdServer.IS4/wwwroot/js/signout-redirect.js deleted file mode 100644 index 3d497358c..000000000 --- a/src/Aguacongas.TheIdServer.IS4/wwwroot/js/signout-redirect.js +++ /dev/null @@ -1,6 +0,0 @@ -$(function () { - var a = document.querySelector("a.PostLogoutRedirectUri"); - if (a) { - window.location = a.href; - } -}); diff --git a/src/Aguacongas.TheIdServer.IS4/wwwroot/lib/jquery-validation-unobtrusive/bower.json b/src/Aguacongas.TheIdServer.IS4/wwwroot/lib/jquery-validation-unobtrusive/bower.json deleted file mode 100644 index ccf48121d..000000000 --- a/src/Aguacongas.TheIdServer.IS4/wwwroot/lib/jquery-validation-unobtrusive/bower.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "name": "jquery-validation-unobtrusive", - "version": "3.2.6", - "homepage": "https://github.com/aspnet/jquery-validation-unobtrusive", - "description": "Add-on to jQuery Validation to enable unobtrusive validation options in data-* attributes.", - "main": [ - "jquery.validate.unobtrusive.js" - ], - "ignore": [ - "**/.*", - "*.json", - "*.md", - "*.txt", - "gulpfile.js" - ], - "keywords": [ - "jquery", - "asp.net", - "mvc", - "validation", - "unobtrusive" - ], - "authors": [ - "Microsoft" - ], - "license": "http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm", - "repository": { - "type": "git", - "url": "git://github.com/aspnet/jquery-validation-unobtrusive.git" - }, - "dependencies": { - "jquery-validation": ">=1.8", - "jquery": ">=1.8" - }, - "_release": "3.2.6", - "_resolution": { - "type": "version", - "tag": "v3.2.6", - "commit": "13386cd1b5947d8a5d23a12b531ce3960be1eba7" - }, - "_source": "git://github.com/aspnet/jquery-validation-unobtrusive.git", - "_target": "3.2.6", - "_originalSource": "jquery-validation-unobtrusive" -} \ No newline at end of file diff --git a/src/Aguacongas.TheIdServer.IS4/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js b/src/Aguacongas.TheIdServer.IS4/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js deleted file mode 100644 index 1b0de1249..000000000 --- a/src/Aguacongas.TheIdServer.IS4/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js +++ /dev/null @@ -1,416 +0,0 @@ -/*! -** Unobtrusive validation support library for jQuery and jQuery Validate -** Copyright (C) Microsoft Corporation. All rights reserved. -*/ - -/*jslint white: true, browser: true, onevar: true, undef: true, nomen: true, eqeqeq: true, plusplus: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: false */ -/*global document: false, jQuery: false */ - -(function ($) { - var $jQval = $.validator, - adapters, - data_validation = "unobtrusiveValidation"; - - function setValidationValues(options, ruleName, value) { - options.rules[ruleName] = value; - if (options.message) { - options.messages[ruleName] = options.message; - } - } - - function splitAndTrim(value) { - return value.replace(/^\s+|\s+$/g, "").split(/\s*,\s*/g); - } - - function escapeAttributeValue(value) { - // As mentioned on http://api.jquery.com/category/selectors/ - return value.replace(/([!"#$%&'()*+,./:;<=>?@\[\\\]^`{|}~])/g, "\\$1"); - } - - function getModelPrefix(fieldName) { - return fieldName.substr(0, fieldName.lastIndexOf(".") + 1); - } - - function appendModelPrefix(value, prefix) { - if (value.indexOf("*.") === 0) { - value = value.replace("*.", prefix); - } - return value; - } - - function onError(error, inputElement) { // 'this' is the form element - var container = $(this).find("[data-valmsg-for='" + escapeAttributeValue(inputElement[0].name) + "']"), - replaceAttrValue = container.attr("data-valmsg-replace"), - replace = replaceAttrValue ? $.parseJSON(replaceAttrValue) !== false : null; - - container.removeClass("field-validation-valid").addClass("field-validation-error"); - error.data("unobtrusiveContainer", container); - - if (replace) { - container.empty(); - error.removeClass("input-validation-error").appendTo(container); - } - else { - error.hide(); - } - } - - function onErrors(event, validator) { // 'this' is the form element - var container = $(this).find("[data-valmsg-summary=true]"), - list = container.find("ul"); - - if (list && list.length && validator.errorList.length) { - list.empty(); - container.addClass("validation-summary-errors").removeClass("validation-summary-valid"); - - $.each(validator.errorList, function () { - $("
  • ").html(this.message).appendTo(list); - }); - } - } - - function onSuccess(error) { // 'this' is the form element - var container = error.data("unobtrusiveContainer"); - - if (container) { - var replaceAttrValue = container.attr("data-valmsg-replace"), - replace = replaceAttrValue ? $.parseJSON(replaceAttrValue) : null; - - container.addClass("field-validation-valid").removeClass("field-validation-error"); - error.removeData("unobtrusiveContainer"); - - if (replace) { - container.empty(); - } - } - } - - function onReset(event) { // 'this' is the form element - var $form = $(this), - key = '__jquery_unobtrusive_validation_form_reset'; - if ($form.data(key)) { - return; - } - // Set a flag that indicates we're currently resetting the form. - $form.data(key, true); - try { - $form.data("validator").resetForm(); - } finally { - $form.removeData(key); - } - - $form.find(".validation-summary-errors") - .addClass("validation-summary-valid") - .removeClass("validation-summary-errors"); - $form.find(".field-validation-error") - .addClass("field-validation-valid") - .removeClass("field-validation-error") - .removeData("unobtrusiveContainer") - .find(">*") // If we were using valmsg-replace, get the underlying error - .removeData("unobtrusiveContainer"); - } - - function validationInfo(form) { - var $form = $(form), - result = $form.data(data_validation), - onResetProxy = $.proxy(onReset, form), - defaultOptions = $jQval.unobtrusive.options || {}, - execInContext = function (name, args) { - var func = defaultOptions[name]; - func && $.isFunction(func) && func.apply(form, args); - } - - if (!result) { - result = { - options: { // options structure passed to jQuery Validate's validate() method - errorClass: defaultOptions.errorClass || "input-validation-error", - errorElement: defaultOptions.errorElement || "span", - errorPlacement: function () { - onError.apply(form, arguments); - execInContext("errorPlacement", arguments); - }, - invalidHandler: function () { - onErrors.apply(form, arguments); - execInContext("invalidHandler", arguments); - }, - messages: {}, - rules: {}, - success: function () { - onSuccess.apply(form, arguments); - execInContext("success", arguments); - } - }, - attachValidation: function () { - $form - .off("reset." + data_validation, onResetProxy) - .on("reset." + data_validation, onResetProxy) - .validate(this.options); - }, - validate: function () { // a validation function that is called by unobtrusive Ajax - $form.validate(); - return $form.valid(); - } - }; - $form.data(data_validation, result); - } - - return result; - } - - $jQval.unobtrusive = { - adapters: [], - - parseElement: function (element, skipAttach) { - /// - /// Parses a single HTML element for unobtrusive validation attributes. - /// - /// The HTML element to be parsed. - /// [Optional] true to skip attaching the - /// validation to the form. If parsing just this single element, you should specify true. - /// If parsing several elements, you should specify false, and manually attach the validation - /// to the form when you are finished. The default is false. - var $element = $(element), - form = $element.parents("form")[0], - valInfo, rules, messages; - - if (!form) { // Cannot do client-side validation without a form - return; - } - - valInfo = validationInfo(form); - valInfo.options.rules[element.name] = rules = {}; - valInfo.options.messages[element.name] = messages = {}; - - $.each(this.adapters, function () { - var prefix = "data-val-" + this.name, - message = $element.attr(prefix), - paramValues = {}; - - if (message !== undefined) { // Compare against undefined, because an empty message is legal (and falsy) - prefix += "-"; - - $.each(this.params, function () { - paramValues[this] = $element.attr(prefix + this); - }); - - this.adapt({ - element: element, - form: form, - message: message, - params: paramValues, - rules: rules, - messages: messages - }); - } - }); - - $.extend(rules, { "__dummy__": true }); - - if (!skipAttach) { - valInfo.attachValidation(); - } - }, - - parse: function (selector) { - /// - /// Parses all the HTML elements in the specified selector. It looks for input elements decorated - /// with the [data-val=true] attribute value and enables validation according to the data-val-* - /// attribute values. - /// - /// Any valid jQuery selector. - - // $forms includes all forms in selector's DOM hierarchy (parent, children and self) that have at least one - // element with data-val=true - var $selector = $(selector), - $forms = $selector.parents() - .addBack() - .filter("form") - .add($selector.find("form")) - .has("[data-val=true]"); - - $selector.find("[data-val=true]").each(function () { - $jQval.unobtrusive.parseElement(this, true); - }); - - $forms.each(function () { - var info = validationInfo(this); - if (info) { - info.attachValidation(); - } - }); - } - }; - - adapters = $jQval.unobtrusive.adapters; - - adapters.add = function (adapterName, params, fn) { - /// Adds a new adapter to convert unobtrusive HTML into a jQuery Validate validation. - /// The name of the adapter to be added. This matches the name used - /// in the data-val-nnnn HTML attribute (where nnnn is the adapter name). - /// [Optional] An array of parameter names (strings) that will - /// be extracted from the data-val-nnnn-mmmm HTML attributes (where nnnn is the adapter name, and - /// mmmm is the parameter name). - /// The function to call, which adapts the values from the HTML - /// attributes into jQuery Validate rules and/or messages. - /// - if (!fn) { // Called with no params, just a function - fn = params; - params = []; - } - this.push({ name: adapterName, params: params, adapt: fn }); - return this; - }; - - adapters.addBool = function (adapterName, ruleName) { - /// Adds a new adapter to convert unobtrusive HTML into a jQuery Validate validation, where - /// the jQuery Validate validation rule has no parameter values. - /// The name of the adapter to be added. This matches the name used - /// in the data-val-nnnn HTML attribute (where nnnn is the adapter name). - /// [Optional] The name of the jQuery Validate rule. If not provided, the value - /// of adapterName will be used instead. - /// - return this.add(adapterName, function (options) { - setValidationValues(options, ruleName || adapterName, true); - }); - }; - - adapters.addMinMax = function (adapterName, minRuleName, maxRuleName, minMaxRuleName, minAttribute, maxAttribute) { - /// Adds a new adapter to convert unobtrusive HTML into a jQuery Validate validation, where - /// the jQuery Validate validation has three potential rules (one for min-only, one for max-only, and - /// one for min-and-max). The HTML parameters are expected to be named -min and -max. - /// The name of the adapter to be added. This matches the name used - /// in the data-val-nnnn HTML attribute (where nnnn is the adapter name). - /// The name of the jQuery Validate rule to be used when you only - /// have a minimum value. - /// The name of the jQuery Validate rule to be used when you only - /// have a maximum value. - /// The name of the jQuery Validate rule to be used when you - /// have both a minimum and maximum value. - /// [Optional] The name of the HTML attribute that - /// contains the minimum value. The default is "min". - /// [Optional] The name of the HTML attribute that - /// contains the maximum value. The default is "max". - /// - return this.add(adapterName, [minAttribute || "min", maxAttribute || "max"], function (options) { - var min = options.params.min, - max = options.params.max; - - if (min && max) { - setValidationValues(options, minMaxRuleName, [min, max]); - } - else if (min) { - setValidationValues(options, minRuleName, min); - } - else if (max) { - setValidationValues(options, maxRuleName, max); - } - }); - }; - - adapters.addSingleVal = function (adapterName, attribute, ruleName) { - /// Adds a new adapter to convert unobtrusive HTML into a jQuery Validate validation, where - /// the jQuery Validate validation rule has a single value. - /// The name of the adapter to be added. This matches the name used - /// in the data-val-nnnn HTML attribute(where nnnn is the adapter name). - /// [Optional] The name of the HTML attribute that contains the value. - /// The default is "val". - /// [Optional] The name of the jQuery Validate rule. If not provided, the value - /// of adapterName will be used instead. - /// - return this.add(adapterName, [attribute || "val"], function (options) { - setValidationValues(options, ruleName || adapterName, options.params[attribute]); - }); - }; - - $jQval.addMethod("__dummy__", function (value, element, params) { - return true; - }); - - $jQval.addMethod("regex", function (value, element, params) { - var match; - if (this.optional(element)) { - return true; - } - - match = new RegExp(params).exec(value); - return (match && (match.index === 0) && (match[0].length === value.length)); - }); - - $jQval.addMethod("nonalphamin", function (value, element, nonalphamin) { - var match; - if (nonalphamin) { - match = value.match(/\W/g); - match = match && match.length >= nonalphamin; - } - return match; - }); - - if ($jQval.methods.extension) { - adapters.addSingleVal("accept", "mimtype"); - adapters.addSingleVal("extension", "extension"); - } else { - // for backward compatibility, when the 'extension' validation method does not exist, such as with versions - // of JQuery Validation plugin prior to 1.10, we should use the 'accept' method for - // validating the extension, and ignore mime-type validations as they are not supported. - adapters.addSingleVal("extension", "extension", "accept"); - } - - adapters.addSingleVal("regex", "pattern"); - adapters.addBool("creditcard").addBool("date").addBool("digits").addBool("email").addBool("number").addBool("url"); - adapters.addMinMax("length", "minlength", "maxlength", "rangelength").addMinMax("range", "min", "max", "range"); - adapters.addMinMax("minlength", "minlength").addMinMax("maxlength", "minlength", "maxlength"); - adapters.add("equalto", ["other"], function (options) { - var prefix = getModelPrefix(options.element.name), - other = options.params.other, - fullOtherName = appendModelPrefix(other, prefix), - element = $(options.form).find(":input").filter("[name='" + escapeAttributeValue(fullOtherName) + "']")[0]; - - setValidationValues(options, "equalTo", element); - }); - adapters.add("required", function (options) { - // jQuery Validate equates "required" with "mandatory" for checkbox elements - if (options.element.tagName.toUpperCase() !== "INPUT" || options.element.type.toUpperCase() !== "CHECKBOX") { - setValidationValues(options, "required", true); - } - }); - adapters.add("remote", ["url", "type", "additionalfields"], function (options) { - var value = { - url: options.params.url, - type: options.params.type || "GET", - data: {} - }, - prefix = getModelPrefix(options.element.name); - - $.each(splitAndTrim(options.params.additionalfields || options.element.name), function (i, fieldName) { - var paramName = appendModelPrefix(fieldName, prefix); - value.data[paramName] = function () { - var field = $(options.form).find(":input").filter("[name='" + escapeAttributeValue(paramName) + "']"); - // For checkboxes and radio buttons, only pick up values from checked fields. - if (field.is(":checkbox")) { - return field.filter(":checked").val() || field.filter(":hidden").val() || ''; - } - else if (field.is(":radio")) { - return field.filter(":checked").val() || ''; - } - return field.val(); - }; - }); - - setValidationValues(options, "remote", value); - }); - adapters.add("password", ["min", "nonalphamin", "regex"], function (options) { - if (options.params.min) { - setValidationValues(options, "minlength", options.params.min); - } - if (options.params.nonalphamin) { - setValidationValues(options, "nonalphamin", options.params.nonalphamin); - } - if (options.params.regex) { - setValidationValues(options, "regex", options.params.regex); - } - }); - - $(function () { - $jQval.unobtrusive.parse(document); - }); -}(jQuery)); \ No newline at end of file diff --git a/src/Aguacongas.TheIdServer.IS4/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js b/src/Aguacongas.TheIdServer.IS4/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js deleted file mode 100644 index be9a38a4c..000000000 --- a/src/Aguacongas.TheIdServer.IS4/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js +++ /dev/null @@ -1,5 +0,0 @@ -/* -** Unobtrusive validation support library for jQuery and jQuery Validate -** Copyright (C) Microsoft Corporation. All rights reserved. -*/ -!function(a){function e(a,e,n){a.rules[e]=n,a.message&&(a.messages[e]=a.message)}function n(a){return a.replace(/^\s+|\s+$/g,"").split(/\s*,\s*/g)}function t(a){return a.replace(/([!"#$%&'()*+,./:;<=>?@\[\\\]^`{|}~])/g,"\\$1")}function r(a){return a.substr(0,a.lastIndexOf(".")+1)}function i(a,e){return 0===a.indexOf("*.")&&(a=a.replace("*.",e)),a}function o(e,n){var r=a(this).find("[data-valmsg-for='"+t(n[0].name)+"']"),i=r.attr("data-valmsg-replace"),o=i?a.parseJSON(i)!==!1:null;r.removeClass("field-validation-valid").addClass("field-validation-error"),e.data("unobtrusiveContainer",r),o?(r.empty(),e.removeClass("input-validation-error").appendTo(r)):e.hide()}function d(e,n){var t=a(this).find("[data-valmsg-summary=true]"),r=t.find("ul");r&&r.length&&n.errorList.length&&(r.empty(),t.addClass("validation-summary-errors").removeClass("validation-summary-valid"),a.each(n.errorList,function(){a("
  • ").html(this.message).appendTo(r)}))}function s(e){var n=e.data("unobtrusiveContainer");if(n){var t=n.attr("data-valmsg-replace"),r=t?a.parseJSON(t):null;n.addClass("field-validation-valid").removeClass("field-validation-error"),e.removeData("unobtrusiveContainer"),r&&n.empty()}}function l(e){var n=a(this),t="__jquery_unobtrusive_validation_form_reset";if(!n.data(t)){n.data(t,!0);try{n.data("validator").resetForm()}finally{n.removeData(t)}n.find(".validation-summary-errors").addClass("validation-summary-valid").removeClass("validation-summary-errors"),n.find(".field-validation-error").addClass("field-validation-valid").removeClass("field-validation-error").removeData("unobtrusiveContainer").find(">*").removeData("unobtrusiveContainer")}}function m(e){var n=a(e),t=n.data(v),r=a.proxy(l,e),i=p.unobtrusive.options||{},m=function(n,t){var r=i[n];r&&a.isFunction(r)&&r.apply(e,t)};return t||(t={options:{errorClass:i.errorClass||"input-validation-error",errorElement:i.errorElement||"span",errorPlacement:function(){o.apply(e,arguments),m("errorPlacement",arguments)},invalidHandler:function(){d.apply(e,arguments),m("invalidHandler",arguments)},messages:{},rules:{},success:function(){s.apply(e,arguments),m("success",arguments)}},attachValidation:function(){n.off("reset."+v,r).on("reset."+v,r).validate(this.options)},validate:function(){return n.validate(),n.valid()}},n.data(v,t)),t}var u,p=a.validator,v="unobtrusiveValidation";p.unobtrusive={adapters:[],parseElement:function(e,n){var t,r,i,o=a(e),d=o.parents("form")[0];d&&(t=m(d),t.options.rules[e.name]=r={},t.options.messages[e.name]=i={},a.each(this.adapters,function(){var n="data-val-"+this.name,t=o.attr(n),s={};void 0!==t&&(n+="-",a.each(this.params,function(){s[this]=o.attr(n+this)}),this.adapt({element:e,form:d,message:t,params:s,rules:r,messages:i}))}),a.extend(r,{__dummy__:!0}),n||t.attachValidation())},parse:function(e){var n=a(e),t=n.parents().addBack().filter("form").add(n.find("form")).has("[data-val=true]");n.find("[data-val=true]").each(function(){p.unobtrusive.parseElement(this,!0)}),t.each(function(){var a=m(this);a&&a.attachValidation()})}},u=p.unobtrusive.adapters,u.add=function(a,e,n){return n||(n=e,e=[]),this.push({name:a,params:e,adapt:n}),this},u.addBool=function(a,n){return this.add(a,function(t){e(t,n||a,!0)})},u.addMinMax=function(a,n,t,r,i,o){return this.add(a,[i||"min",o||"max"],function(a){var i=a.params.min,o=a.params.max;i&&o?e(a,r,[i,o]):i?e(a,n,i):o&&e(a,t,o)})},u.addSingleVal=function(a,n,t){return this.add(a,[n||"val"],function(r){e(r,t||a,r.params[n])})},p.addMethod("__dummy__",function(a,e,n){return!0}),p.addMethod("regex",function(a,e,n){var t;return this.optional(e)?!0:(t=new RegExp(n).exec(a),t&&0===t.index&&t[0].length===a.length)}),p.addMethod("nonalphamin",function(a,e,n){var t;return n&&(t=a.match(/\W/g),t=t&&t.length>=n),t}),p.methods.extension?(u.addSingleVal("accept","mimtype"),u.addSingleVal("extension","extension")):u.addSingleVal("extension","extension","accept"),u.addSingleVal("regex","pattern"),u.addBool("creditcard").addBool("date").addBool("digits").addBool("email").addBool("number").addBool("url"),u.addMinMax("length","minlength","maxlength","rangelength").addMinMax("range","min","max","range"),u.addMinMax("minlength","minlength").addMinMax("maxlength","minlength","maxlength"),u.add("equalto",["other"],function(n){var o=r(n.element.name),d=n.params.other,s=i(d,o),l=a(n.form).find(":input").filter("[name='"+t(s)+"']")[0];e(n,"equalTo",l)}),u.add("required",function(a){("INPUT"!==a.element.tagName.toUpperCase()||"CHECKBOX"!==a.element.type.toUpperCase())&&e(a,"required",!0)}),u.add("remote",["url","type","additionalfields"],function(o){var d={url:o.params.url,type:o.params.type||"GET",data:{}},s=r(o.element.name);a.each(n(o.params.additionalfields||o.element.name),function(e,n){var r=i(n,s);d.data[r]=function(){var e=a(o.form).find(":input").filter("[name='"+t(r)+"']");return e.is(":checkbox")?e.filter(":checked").val()||e.filter(":hidden").val()||"":e.is(":radio")?e.filter(":checked").val()||"":e.val()}}),e(o,"remote",d)}),u.add("password",["min","nonalphamin","regex"],function(a){a.params.min&&e(a,"minlength",a.params.min),a.params.nonalphamin&&e(a,"nonalphamin",a.params.nonalphamin),a.params.regex&&e(a,"regex",a.params.regex)}),a(function(){p.unobtrusive.parse(document)})}(jQuery); \ No newline at end of file diff --git a/src/Aguacongas.TheIdServer.IS4/wwwroot/lib/jquery-validation/build/release.js b/src/Aguacongas.TheIdServer.IS4/wwwroot/lib/jquery-validation/build/release.js deleted file mode 100644 index 6491c0e02..000000000 --- a/src/Aguacongas.TheIdServer.IS4/wwwroot/lib/jquery-validation/build/release.js +++ /dev/null @@ -1,43 +0,0 @@ -/* Release checklist -- Run `git changelog` and edit to match previous output (this should make use of jquey-release instead) -- pull latest https://github.com/jquery/jquery-release -- run - node release.js --remote=jzaefferer/jquery-validation -- Wait a while, verify and confirm each step -- -*/ - -/*jshint node:true */ -module.exports = function( Release ) { - -function today() { - return new Date().toISOString().replace(/T.+/, ""); -} - -// also add version property to this -Release._jsonFiles.push( "validation.jquery.json" ); - -Release.define({ - issueTracker: "github", - changelogShell: function() { - return Release.newVersion + " / " + today() + "\n==================\n\n"; - }, - - generateArtifacts: function( done ) { - Release.exec( "grunt release", "Grunt command failed" ); - done([ - "dist/additional-methods.js", - "dist/additional-methods.min.js", - "dist/jquery.validate.js", - "dist/jquery.validate.min.js" - ]); - }, - - // disable CDN publishing - cdnPublish: false, - - // disable authors check - _checkAuthorsTxt: function() {} -}); - -}; diff --git a/src/Aguacongas.TheIdServer.IS4/wwwroot/lib/jquery/jquery.js b/src/Aguacongas.TheIdServer.IS4/wwwroot/lib/jquery/jquery.js deleted file mode 100644 index eed17778c..000000000 --- a/src/Aguacongas.TheIdServer.IS4/wwwroot/lib/jquery/jquery.js +++ /dev/null @@ -1,9210 +0,0 @@ -/*! - * jQuery JavaScript Library v2.1.4 - * http://jquery.com/ - * - * Includes Sizzle.js - * http://sizzlejs.com/ - * - * Copyright 2005, 2014 jQuery Foundation, Inc. and other contributors - * Released under the MIT license - * http://jquery.org/license - * - * Date: 2015-04-28T16:01Z - */ - -(function( global, factory ) { - - if ( typeof module === "object" && typeof module.exports === "object" ) { - // For CommonJS and CommonJS-like environments where a proper `window` - // is present, execute the factory and get jQuery. - // For environments that do not have a `window` with a `document` - // (such as Node.js), expose a factory as module.exports. - // This accentuates the need for the creation of a real `window`. - // e.g. var jQuery = require("jquery")(window); - // See ticket #14549 for more info. - module.exports = global.document ? - factory( global, true ) : - function( w ) { - if ( !w.document ) { - throw new Error( "jQuery requires a window with a document" ); - } - return factory( w ); - }; - } else { - factory( global ); - } - -// Pass this if window is not defined yet -}(typeof window !== "undefined" ? window : this, function( window, noGlobal ) { - -// Support: Firefox 18+ -// Can't be in strict mode, several libs including ASP.NET trace -// the stack via arguments.caller.callee and Firefox dies if -// you try to trace through "use strict" call chains. (#13335) -// - -var arr = []; - -var slice = arr.slice; - -var concat = arr.concat; - -var push = arr.push; - -var indexOf = arr.indexOf; - -var class2type = {}; - -var toString = class2type.toString; - -var hasOwn = class2type.hasOwnProperty; - -var support = {}; - - - -var - // Use the correct document accordingly with window argument (sandbox) - document = window.document, - - version = "2.1.4", - - // Define a local copy of jQuery - jQuery = function( selector, context ) { - // The jQuery object is actually just the init constructor 'enhanced' - // Need init if jQuery is called (just allow error to be thrown if not included) - return new jQuery.fn.init( selector, context ); - }, - - // Support: Android<4.1 - // Make sure we trim BOM and NBSP - rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, - - // Matches dashed string for camelizing - rmsPrefix = /^-ms-/, - rdashAlpha = /-([\da-z])/gi, - - // Used by jQuery.camelCase as callback to replace() - fcamelCase = function( all, letter ) { - return letter.toUpperCase(); - }; - -jQuery.fn = jQuery.prototype = { - // The current version of jQuery being used - jquery: version, - - constructor: jQuery, - - // Start with an empty selector - selector: "", - - // The default length of a jQuery object is 0 - length: 0, - - toArray: function() { - return slice.call( this ); - }, - - // Get the Nth element in the matched element set OR - // Get the whole matched element set as a clean array - get: function( num ) { - return num != null ? - - // Return just the one element from the set - ( num < 0 ? this[ num + this.length ] : this[ num ] ) : - - // Return all the elements in a clean array - slice.call( this ); - }, - - // Take an array of elements and push it onto the stack - // (returning the new matched element set) - pushStack: function( elems ) { - - // Build a new jQuery matched element set - var ret = jQuery.merge( this.constructor(), elems ); - - // Add the old object onto the stack (as a reference) - ret.prevObject = this; - ret.context = this.context; - - // Return the newly-formed element set - return ret; - }, - - // Execute a callback for every element in the matched set. - // (You can seed the arguments with an array of args, but this is - // only used internally.) - each: function( callback, args ) { - return jQuery.each( this, callback, args ); - }, - - map: function( callback ) { - return this.pushStack( jQuery.map(this, function( elem, i ) { - return callback.call( elem, i, elem ); - })); - }, - - slice: function() { - return this.pushStack( slice.apply( this, arguments ) ); - }, - - first: function() { - return this.eq( 0 ); - }, - - last: function() { - return this.eq( -1 ); - }, - - eq: function( i ) { - var len = this.length, - j = +i + ( i < 0 ? len : 0 ); - return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] ); - }, - - end: function() { - return this.prevObject || this.constructor(null); - }, - - // For internal use only. - // Behaves like an Array's method, not like a jQuery method. - push: push, - sort: arr.sort, - splice: arr.splice -}; - -jQuery.extend = jQuery.fn.extend = function() { - var options, name, src, copy, copyIsArray, clone, - target = arguments[0] || {}, - i = 1, - length = arguments.length, - deep = false; - - // Handle a deep copy situation - if ( typeof target === "boolean" ) { - deep = target; - - // Skip the boolean and the target - target = arguments[ i ] || {}; - i++; - } - - // Handle case when target is a string or something (possible in deep copy) - if ( typeof target !== "object" && !jQuery.isFunction(target) ) { - target = {}; - } - - // Extend jQuery itself if only one argument is passed - if ( i === length ) { - target = this; - i--; - } - - for ( ; i < length; i++ ) { - // Only deal with non-null/undefined values - if ( (options = arguments[ i ]) != null ) { - // Extend the base object - for ( name in options ) { - src = target[ name ]; - copy = options[ name ]; - - // Prevent never-ending loop - if ( target === copy ) { - continue; - } - - // Recurse if we're merging plain objects or arrays - if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) { - if ( copyIsArray ) { - copyIsArray = false; - clone = src && jQuery.isArray(src) ? src : []; - - } else { - clone = src && jQuery.isPlainObject(src) ? src : {}; - } - - // Never move original objects, clone them - target[ name ] = jQuery.extend( deep, clone, copy ); - - // Don't bring in undefined values - } else if ( copy !== undefined ) { - target[ name ] = copy; - } - } - } - } - - // Return the modified object - return target; -}; - -jQuery.extend({ - // Unique for each copy of jQuery on the page - expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ), - - // Assume jQuery is ready without the ready module - isReady: true, - - error: function( msg ) { - throw new Error( msg ); - }, - - noop: function() {}, - - isFunction: function( obj ) { - return jQuery.type(obj) === "function"; - }, - - isArray: Array.isArray, - - isWindow: function( obj ) { - return obj != null && obj === obj.window; - }, - - isNumeric: function( obj ) { - // parseFloat NaNs numeric-cast false positives (null|true|false|"") - // ...but misinterprets leading-number strings, particularly hex literals ("0x...") - // subtraction forces infinities to NaN - // adding 1 corrects loss of precision from parseFloat (#15100) - return !jQuery.isArray( obj ) && (obj - parseFloat( obj ) + 1) >= 0; - }, - - isPlainObject: function( obj ) { - // Not plain objects: - // - Any object or value whose internal [[Class]] property is not "[object Object]" - // - DOM nodes - // - window - if ( jQuery.type( obj ) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) { - return false; - } - - if ( obj.constructor && - !hasOwn.call( obj.constructor.prototype, "isPrototypeOf" ) ) { - return false; - } - - // If the function hasn't returned already, we're confident that - // |obj| is a plain object, created by {} or constructed with new Object - return true; - }, - - isEmptyObject: function( obj ) { - var name; - for ( name in obj ) { - return false; - } - return true; - }, - - type: function( obj ) { - if ( obj == null ) { - return obj + ""; - } - // Support: Android<4.0, iOS<6 (functionish RegExp) - return typeof obj === "object" || typeof obj === "function" ? - class2type[ toString.call(obj) ] || "object" : - typeof obj; - }, - - // Evaluates a script in a global context - globalEval: function( code ) { - var script, - indirect = eval; - - code = jQuery.trim( code ); - - if ( code ) { - // If the code includes a valid, prologue position - // strict mode pragma, execute code by injecting a - // script tag into the document. - if ( code.indexOf("use strict") === 1 ) { - script = document.createElement("script"); - script.text = code; - document.head.appendChild( script ).parentNode.removeChild( script ); - } else { - // Otherwise, avoid the DOM node creation, insertion - // and removal by using an indirect global eval - indirect( code ); - } - } - }, - - // Convert dashed to camelCase; used by the css and data modules - // Support: IE9-11+ - // Microsoft forgot to hump their vendor prefix (#9572) - camelCase: function( string ) { - return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase ); - }, - - nodeName: function( elem, name ) { - return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase(); - }, - - // args is for internal usage only - each: function( obj, callback, args ) { - var value, - i = 0, - length = obj.length, - isArray = isArraylike( obj ); - - if ( args ) { - if ( isArray ) { - for ( ; i < length; i++ ) { - value = callback.apply( obj[ i ], args ); - - if ( value === false ) { - break; - } - } - } else { - for ( i in obj ) { - value = callback.apply( obj[ i ], args ); - - if ( value === false ) { - break; - } - } - } - - // A special, fast, case for the most common use of each - } else { - if ( isArray ) { - for ( ; i < length; i++ ) { - value = callback.call( obj[ i ], i, obj[ i ] ); - - if ( value === false ) { - break; - } - } - } else { - for ( i in obj ) { - value = callback.call( obj[ i ], i, obj[ i ] ); - - if ( value === false ) { - break; - } - } - } - } - - return obj; - }, - - // Support: Android<4.1 - trim: function( text ) { - return text == null ? - "" : - ( text + "" ).replace( rtrim, "" ); - }, - - // results is for internal usage only - makeArray: function( arr, results ) { - var ret = results || []; - - if ( arr != null ) { - if ( isArraylike( Object(arr) ) ) { - jQuery.merge( ret, - typeof arr === "string" ? - [ arr ] : arr - ); - } else { - push.call( ret, arr ); - } - } - - return ret; - }, - - inArray: function( elem, arr, i ) { - return arr == null ? -1 : indexOf.call( arr, elem, i ); - }, - - merge: function( first, second ) { - var len = +second.length, - j = 0, - i = first.length; - - for ( ; j < len; j++ ) { - first[ i++ ] = second[ j ]; - } - - first.length = i; - - return first; - }, - - grep: function( elems, callback, invert ) { - var callbackInverse, - matches = [], - i = 0, - length = elems.length, - callbackExpect = !invert; - - // Go through the array, only saving the items - // that pass the validator function - for ( ; i < length; i++ ) { - callbackInverse = !callback( elems[ i ], i ); - if ( callbackInverse !== callbackExpect ) { - matches.push( elems[ i ] ); - } - } - - return matches; - }, - - // arg is for internal usage only - map: function( elems, callback, arg ) { - var value, - i = 0, - length = elems.length, - isArray = isArraylike( elems ), - ret = []; - - // Go through the array, translating each of the items to their new values - if ( isArray ) { - for ( ; i < length; i++ ) { - value = callback( elems[ i ], i, arg ); - - if ( value != null ) { - ret.push( value ); - } - } - - // Go through every key on the object, - } else { - for ( i in elems ) { - value = callback( elems[ i ], i, arg ); - - if ( value != null ) { - ret.push( value ); - } - } - } - - // Flatten any nested arrays - return concat.apply( [], ret ); - }, - - // A global GUID counter for objects - guid: 1, - - // Bind a function to a context, optionally partially applying any - // arguments. - proxy: function( fn, context ) { - var tmp, args, proxy; - - if ( typeof context === "string" ) { - tmp = fn[ context ]; - context = fn; - fn = tmp; - } - - // Quick check to determine if target is callable, in the spec - // this throws a TypeError, but we will just return undefined. - if ( !jQuery.isFunction( fn ) ) { - return undefined; - } - - // Simulated bind - args = slice.call( arguments, 2 ); - proxy = function() { - return fn.apply( context || this, args.concat( slice.call( arguments ) ) ); - }; - - // Set the guid of unique handler to the same of original handler, so it can be removed - proxy.guid = fn.guid = fn.guid || jQuery.guid++; - - return proxy; - }, - - now: Date.now, - - // jQuery.support is not used in Core but other projects attach their - // properties to it so it needs to exist. - support: support -}); - -// Populate the class2type map -jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) { - class2type[ "[object " + name + "]" ] = name.toLowerCase(); -}); - -function isArraylike( obj ) { - - // Support: iOS 8.2 (not reproducible in simulator) - // `in` check used to prevent JIT error (gh-2145) - // hasOwn isn't used here due to false negatives - // regarding Nodelist length in IE - var length = "length" in obj && obj.length, - type = jQuery.type( obj ); - - if ( type === "function" || jQuery.isWindow( obj ) ) { - return false; - } - - if ( obj.nodeType === 1 && length ) { - return true; - } - - return type === "array" || length === 0 || - typeof length === "number" && length > 0 && ( length - 1 ) in obj; -} -var Sizzle = -/*! - * Sizzle CSS Selector Engine v2.2.0-pre - * http://sizzlejs.com/ - * - * Copyright 2008, 2014 jQuery Foundation, Inc. and other contributors - * Released under the MIT license - * http://jquery.org/license - * - * Date: 2014-12-16 - */ -(function( window ) { - -var i, - support, - Expr, - getText, - isXML, - tokenize, - compile, - select, - outermostContext, - sortInput, - hasDuplicate, - - // Local document vars - setDocument, - document, - docElem, - documentIsHTML, - rbuggyQSA, - rbuggyMatches, - matches, - contains, - - // Instance-specific data - expando = "sizzle" + 1 * new Date(), - preferredDoc = window.document, - dirruns = 0, - done = 0, - classCache = createCache(), - tokenCache = createCache(), - compilerCache = createCache(), - sortOrder = function( a, b ) { - if ( a === b ) { - hasDuplicate = true; - } - return 0; - }, - - // General-purpose constants - MAX_NEGATIVE = 1 << 31, - - // Instance methods - hasOwn = ({}).hasOwnProperty, - arr = [], - pop = arr.pop, - push_native = arr.push, - push = arr.push, - slice = arr.slice, - // Use a stripped-down indexOf as it's faster than native - // http://jsperf.com/thor-indexof-vs-for/5 - indexOf = function( list, elem ) { - var i = 0, - len = list.length; - for ( ; i < len; i++ ) { - if ( list[i] === elem ) { - return i; - } - } - return -1; - }, - - booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped", - - // Regular expressions - - // Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace - whitespace = "[\\x20\\t\\r\\n\\f]", - // http://www.w3.org/TR/css3-syntax/#characters - characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+", - - // Loosely modeled on CSS identifier characters - // An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors - // Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier - identifier = characterEncoding.replace( "w", "w#" ), - - // Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors - attributes = "\\[" + whitespace + "*(" + characterEncoding + ")(?:" + whitespace + - // Operator (capture 2) - "*([*^$|!~]?=)" + whitespace + - // "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]" - "*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace + - "*\\]", - - pseudos = ":(" + characterEncoding + ")(?:\\((" + - // To reduce the number of selectors needing tokenize in the preFilter, prefer arguments: - // 1. quoted (capture 3; capture 4 or capture 5) - "('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" + - // 2. simple (capture 6) - "((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" + - // 3. anything else (capture 2) - ".*" + - ")\\)|)", - - // Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter - rwhitespace = new RegExp( whitespace + "+", "g" ), - rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ), - - rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ), - rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ), - - rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ), - - rpseudo = new RegExp( pseudos ), - ridentifier = new RegExp( "^" + identifier + "$" ), - - matchExpr = { - "ID": new RegExp( "^#(" + characterEncoding + ")" ), - "CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ), - "TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ), - "ATTR": new RegExp( "^" + attributes ), - "PSEUDO": new RegExp( "^" + pseudos ), - "CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace + - "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace + - "*(\\d+)|))" + whitespace + "*\\)|)", "i" ), - "bool": new RegExp( "^(?:" + booleans + ")$", "i" ), - // For use in libraries implementing .is() - // We use this for POS matching in `select` - "needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + - whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" ) - }, - - rinputs = /^(?:input|select|textarea|button)$/i, - rheader = /^h\d$/i, - - rnative = /^[^{]+\{\s*\[native \w/, - - // Easily-parseable/retrievable ID or TAG or CLASS selectors - rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/, - - rsibling = /[+~]/, - rescape = /'|\\/g, - - // CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters - runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ), - funescape = function( _, escaped, escapedWhitespace ) { - var high = "0x" + escaped - 0x10000; - // NaN means non-codepoint - // Support: Firefox<24 - // Workaround erroneous numeric interpretation of +"0x" - return high !== high || escapedWhitespace ? - escaped : - high < 0 ? - // BMP codepoint - String.fromCharCode( high + 0x10000 ) : - // Supplemental Plane codepoint (surrogate pair) - String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 ); - }, - - // Used for iframes - // See setDocument() - // Removing the function wrapper causes a "Permission Denied" - // error in IE - unloadHandler = function() { - setDocument(); - }; - -// Optimize for push.apply( _, NodeList ) -try { - push.apply( - (arr = slice.call( preferredDoc.childNodes )), - preferredDoc.childNodes - ); - // Support: Android<4.0 - // Detect silently failing push.apply - arr[ preferredDoc.childNodes.length ].nodeType; -} catch ( e ) { - push = { apply: arr.length ? - - // Leverage slice if possible - function( target, els ) { - push_native.apply( target, slice.call(els) ); - } : - - // Support: IE<9 - // Otherwise append directly - function( target, els ) { - var j = target.length, - i = 0; - // Can't trust NodeList.length - while ( (target[j++] = els[i++]) ) {} - target.length = j - 1; - } - }; -} - -function Sizzle( selector, context, results, seed ) { - var match, elem, m, nodeType, - // QSA vars - i, groups, old, nid, newContext, newSelector; - - if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) { - setDocument( context ); - } - - context = context || document; - results = results || []; - nodeType = context.nodeType; - - if ( typeof selector !== "string" || !selector || - nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) { - - return results; - } - - if ( !seed && documentIsHTML ) { - - // Try to shortcut find operations when possible (e.g., not under DocumentFragment) - if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) { - // Speed-up: Sizzle("#ID") - if ( (m = match[1]) ) { - if ( nodeType === 9 ) { - elem = context.getElementById( m ); - // Check parentNode to catch when Blackberry 4.6 returns - // nodes that are no longer in the document (jQuery #6963) - if ( elem && elem.parentNode ) { - // Handle the case where IE, Opera, and Webkit return items - // by name instead of ID - if ( elem.id === m ) { - results.push( elem ); - return results; - } - } else { - return results; - } - } else { - // Context is not a document - if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) && - contains( context, elem ) && elem.id === m ) { - results.push( elem ); - return results; - } - } - - // Speed-up: Sizzle("TAG") - } else if ( match[2] ) { - push.apply( results, context.getElementsByTagName( selector ) ); - return results; - - // Speed-up: Sizzle(".CLASS") - } else if ( (m = match[3]) && support.getElementsByClassName ) { - push.apply( results, context.getElementsByClassName( m ) ); - return results; - } - } - - // QSA path - if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) { - nid = old = expando; - newContext = context; - newSelector = nodeType !== 1 && selector; - - // qSA works strangely on Element-rooted queries - // We can work around this by specifying an extra ID on the root - // and working up from there (Thanks to Andrew Dupont for the technique) - // IE 8 doesn't work on object elements - if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) { - groups = tokenize( selector ); - - if ( (old = context.getAttribute("id")) ) { - nid = old.replace( rescape, "\\$&" ); - } else { - context.setAttribute( "id", nid ); - } - nid = "[id='" + nid + "'] "; - - i = groups.length; - while ( i-- ) { - groups[i] = nid + toSelector( groups[i] ); - } - newContext = rsibling.test( selector ) && testContext( context.parentNode ) || context; - newSelector = groups.join(","); - } - - if ( newSelector ) { - try { - push.apply( results, - newContext.querySelectorAll( newSelector ) - ); - return results; - } catch(qsaError) { - } finally { - if ( !old ) { - context.removeAttribute("id"); - } - } - } - } - } - - // All others - return select( selector.replace( rtrim, "$1" ), context, results, seed ); -} - -/** - * Create key-value caches of limited size - * @returns {Function(string, Object)} Returns the Object data after storing it on itself with - * property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength) - * deleting the oldest entry - */ -function createCache() { - var keys = []; - - function cache( key, value ) { - // Use (key + " ") to avoid collision with native prototype properties (see Issue #157) - if ( keys.push( key + " " ) > Expr.cacheLength ) { - // Only keep the most recent entries - delete cache[ keys.shift() ]; - } - return (cache[ key + " " ] = value); - } - return cache; -} - -/** - * Mark a function for special use by Sizzle - * @param {Function} fn The function to mark - */ -function markFunction( fn ) { - fn[ expando ] = true; - return fn; -} - -/** - * Support testing using an element - * @param {Function} fn Passed the created div and expects a boolean result - */ -function assert( fn ) { - var div = document.createElement("div"); - - try { - return !!fn( div ); - } catch (e) { - return false; - } finally { - // Remove from its parent by default - if ( div.parentNode ) { - div.parentNode.removeChild( div ); - } - // release memory in IE - div = null; - } -} - -/** - * Adds the same handler for all of the specified attrs - * @param {String} attrs Pipe-separated list of attributes - * @param {Function} handler The method that will be applied - */ -function addHandle( attrs, handler ) { - var arr = attrs.split("|"), - i = attrs.length; - - while ( i-- ) { - Expr.attrHandle[ arr[i] ] = handler; - } -} - -/** - * Checks document order of two siblings - * @param {Element} a - * @param {Element} b - * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b - */ -function siblingCheck( a, b ) { - var cur = b && a, - diff = cur && a.nodeType === 1 && b.nodeType === 1 && - ( ~b.sourceIndex || MAX_NEGATIVE ) - - ( ~a.sourceIndex || MAX_NEGATIVE ); - - // Use IE sourceIndex if available on both nodes - if ( diff ) { - return diff; - } - - // Check if b follows a - if ( cur ) { - while ( (cur = cur.nextSibling) ) { - if ( cur === b ) { - return -1; - } - } - } - - return a ? 1 : -1; -} - -/** - * Returns a function to use in pseudos for input types - * @param {String} type - */ -function createInputPseudo( type ) { - return function( elem ) { - var name = elem.nodeName.toLowerCase(); - return name === "input" && elem.type === type; - }; -} - -/** - * Returns a function to use in pseudos for buttons - * @param {String} type - */ -function createButtonPseudo( type ) { - return function( elem ) { - var name = elem.nodeName.toLowerCase(); - return (name === "input" || name === "button") && elem.type === type; - }; -} - -/** - * Returns a function to use in pseudos for positionals - * @param {Function} fn - */ -function createPositionalPseudo( fn ) { - return markFunction(function( argument ) { - argument = +argument; - return markFunction(function( seed, matches ) { - var j, - matchIndexes = fn( [], seed.length, argument ), - i = matchIndexes.length; - - // Match elements found at the specified indexes - while ( i-- ) { - if ( seed[ (j = matchIndexes[i]) ] ) { - seed[j] = !(matches[j] = seed[j]); - } - } - }); - }); -} - -/** - * Checks a node for validity as a Sizzle context - * @param {Element|Object=} context - * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value - */ -function testContext( context ) { - return context && typeof context.getElementsByTagName !== "undefined" && context; -} - -// Expose support vars for convenience -support = Sizzle.support = {}; - -/** - * Detects XML nodes - * @param {Element|Object} elem An element or a document - * @returns {Boolean} True iff elem is a non-HTML XML node - */ -isXML = Sizzle.isXML = function( elem ) { - // documentElement is verified for cases where it doesn't yet exist - // (such as loading iframes in IE - #4833) - var documentElement = elem && (elem.ownerDocument || elem).documentElement; - return documentElement ? documentElement.nodeName !== "HTML" : false; -}; - -/** - * Sets document-related variables once based on the current document - * @param {Element|Object} [doc] An element or document object to use to set the document - * @returns {Object} Returns the current document - */ -setDocument = Sizzle.setDocument = function( node ) { - var hasCompare, parent, - doc = node ? node.ownerDocument || node : preferredDoc; - - // If no document and documentElement is available, return - if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) { - return document; - } - - // Set our document - document = doc; - docElem = doc.documentElement; - parent = doc.defaultView; - - // Support: IE>8 - // If iframe document is assigned to "document" variable and if iframe has been reloaded, - // IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936 - // IE6-8 do not support the defaultView property so parent will be undefined - if ( parent && parent !== parent.top ) { - // IE11 does not have attachEvent, so all must suffer - if ( parent.addEventListener ) { - parent.addEventListener( "unload", unloadHandler, false ); - } else if ( parent.attachEvent ) { - parent.attachEvent( "onunload", unloadHandler ); - } - } - - /* Support tests - ---------------------------------------------------------------------- */ - documentIsHTML = !isXML( doc ); - - /* Attributes - ---------------------------------------------------------------------- */ - - // Support: IE<8 - // Verify that getAttribute really returns attributes and not properties - // (excepting IE8 booleans) - support.attributes = assert(function( div ) { - div.className = "i"; - return !div.getAttribute("className"); - }); - - /* getElement(s)By* - ---------------------------------------------------------------------- */ - - // Check if getElementsByTagName("*") returns only elements - support.getElementsByTagName = assert(function( div ) { - div.appendChild( doc.createComment("") ); - return !div.getElementsByTagName("*").length; - }); - - // Support: IE<9 - support.getElementsByClassName = rnative.test( doc.getElementsByClassName ); - - // Support: IE<10 - // Check if getElementById returns elements by name - // The broken getElementById methods don't pick up programatically-set names, - // so use a roundabout getElementsByName test - support.getById = assert(function( div ) { - docElem.appendChild( div ).id = expando; - return !doc.getElementsByName || !doc.getElementsByName( expando ).length; - }); - - // ID find and filter - if ( support.getById ) { - Expr.find["ID"] = function( id, context ) { - if ( typeof context.getElementById !== "undefined" && documentIsHTML ) { - var m = context.getElementById( id ); - // Check parentNode to catch when Blackberry 4.6 returns - // nodes that are no longer in the document #6963 - return m && m.parentNode ? [ m ] : []; - } - }; - Expr.filter["ID"] = function( id ) { - var attrId = id.replace( runescape, funescape ); - return function( elem ) { - return elem.getAttribute("id") === attrId; - }; - }; - } else { - // Support: IE6/7 - // getElementById is not reliable as a find shortcut - delete Expr.find["ID"]; - - Expr.filter["ID"] = function( id ) { - var attrId = id.replace( runescape, funescape ); - return function( elem ) { - var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id"); - return node && node.value === attrId; - }; - }; - } - - // Tag - Expr.find["TAG"] = support.getElementsByTagName ? - function( tag, context ) { - if ( typeof context.getElementsByTagName !== "undefined" ) { - return context.getElementsByTagName( tag ); - - // DocumentFragment nodes don't have gEBTN - } else if ( support.qsa ) { - return context.querySelectorAll( tag ); - } - } : - - function( tag, context ) { - var elem, - tmp = [], - i = 0, - // By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too - results = context.getElementsByTagName( tag ); - - // Filter out possible comments - if ( tag === "*" ) { - while ( (elem = results[i++]) ) { - if ( elem.nodeType === 1 ) { - tmp.push( elem ); - } - } - - return tmp; - } - return results; - }; - - // Class - Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) { - if ( documentIsHTML ) { - return context.getElementsByClassName( className ); - } - }; - - /* QSA/matchesSelector - ---------------------------------------------------------------------- */ - - // QSA and matchesSelector support - - // matchesSelector(:active) reports false when true (IE9/Opera 11.5) - rbuggyMatches = []; - - // qSa(:focus) reports false when true (Chrome 21) - // We allow this because of a bug in IE8/9 that throws an error - // whenever `document.activeElement` is accessed on an iframe - // So, we allow :focus to pass through QSA all the time to avoid the IE error - // See http://bugs.jquery.com/ticket/13378 - rbuggyQSA = []; - - if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) { - // Build QSA regex - // Regex strategy adopted from Diego Perini - assert(function( div ) { - // Select is set to empty string on purpose - // This is to test IE's treatment of not explicitly - // setting a boolean content attribute, - // since its presence should be enough - // http://bugs.jquery.com/ticket/12359 - docElem.appendChild( div ).innerHTML = "" + - ""; - - // Support: IE8, Opera 11-12.16 - // Nothing should be selected when empty strings follow ^= or $= or *= - // The test attribute must be unknown in Opera but "safe" for WinRT - // http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section - if ( div.querySelectorAll("[msallowcapture^='']").length ) { - rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" ); - } - - // Support: IE8 - // Boolean attributes and "value" are not treated correctly - if ( !div.querySelectorAll("[selected]").length ) { - rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" ); - } - - // Support: Chrome<29, Android<4.2+, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.7+ - if ( !div.querySelectorAll( "[id~=" + expando + "-]" ).length ) { - rbuggyQSA.push("~="); - } - - // Webkit/Opera - :checked should return selected option elements - // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked - // IE8 throws error here and will not see later tests - if ( !div.querySelectorAll(":checked").length ) { - rbuggyQSA.push(":checked"); - } - - // Support: Safari 8+, iOS 8+ - // https://bugs.webkit.org/show_bug.cgi?id=136851 - // In-page `selector#id sibing-combinator selector` fails - if ( !div.querySelectorAll( "a#" + expando + "+*" ).length ) { - rbuggyQSA.push(".#.+[+~]"); - } - }); - - assert(function( div ) { - // Support: Windows 8 Native Apps - // The type and name attributes are restricted during .innerHTML assignment - var input = doc.createElement("input"); - input.setAttribute( "type", "hidden" ); - div.appendChild( input ).setAttribute( "name", "D" ); - - // Support: IE8 - // Enforce case-sensitivity of name attribute - if ( div.querySelectorAll("[name=d]").length ) { - rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" ); - } - - // FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled) - // IE8 throws error here and will not see later tests - if ( !div.querySelectorAll(":enabled").length ) { - rbuggyQSA.push( ":enabled", ":disabled" ); - } - - // Opera 10-11 does not throw on post-comma invalid pseudos - div.querySelectorAll("*,:x"); - rbuggyQSA.push(",.*:"); - }); - } - - if ( (support.matchesSelector = rnative.test( (matches = docElem.matches || - docElem.webkitMatchesSelector || - docElem.mozMatchesSelector || - docElem.oMatchesSelector || - docElem.msMatchesSelector) )) ) { - - assert(function( div ) { - // Check to see if it's possible to do matchesSelector - // on a disconnected node (IE 9) - support.disconnectedMatch = matches.call( div, "div" ); - - // This should fail with an exception - // Gecko does not error, returns false instead - matches.call( div, "[s!='']:x" ); - rbuggyMatches.push( "!=", pseudos ); - }); - } - - rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") ); - rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") ); - - /* Contains - ---------------------------------------------------------------------- */ - hasCompare = rnative.test( docElem.compareDocumentPosition ); - - // Element contains another - // Purposefully does not implement inclusive descendent - // As in, an element does not contain itself - contains = hasCompare || rnative.test( docElem.contains ) ? - function( a, b ) { - var adown = a.nodeType === 9 ? a.documentElement : a, - bup = b && b.parentNode; - return a === bup || !!( bup && bup.nodeType === 1 && ( - adown.contains ? - adown.contains( bup ) : - a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16 - )); - } : - function( a, b ) { - if ( b ) { - while ( (b = b.parentNode) ) { - if ( b === a ) { - return true; - } - } - } - return false; - }; - - /* Sorting - ---------------------------------------------------------------------- */ - - // Document order sorting - sortOrder = hasCompare ? - function( a, b ) { - - // Flag for duplicate removal - if ( a === b ) { - hasDuplicate = true; - return 0; - } - - // Sort on method existence if only one input has compareDocumentPosition - var compare = !a.compareDocumentPosition - !b.compareDocumentPosition; - if ( compare ) { - return compare; - } - - // Calculate position if both inputs belong to the same document - compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ? - a.compareDocumentPosition( b ) : - - // Otherwise we know they are disconnected - 1; - - // Disconnected nodes - if ( compare & 1 || - (!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) { - - // Choose the first element that is related to our preferred document - if ( a === doc || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) { - return -1; - } - if ( b === doc || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) { - return 1; - } - - // Maintain original order - return sortInput ? - ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) : - 0; - } - - return compare & 4 ? -1 : 1; - } : - function( a, b ) { - // Exit early if the nodes are identical - if ( a === b ) { - hasDuplicate = true; - return 0; - } - - var cur, - i = 0, - aup = a.parentNode, - bup = b.parentNode, - ap = [ a ], - bp = [ b ]; - - // Parentless nodes are either documents or disconnected - if ( !aup || !bup ) { - return a === doc ? -1 : - b === doc ? 1 : - aup ? -1 : - bup ? 1 : - sortInput ? - ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) : - 0; - - // If the nodes are siblings, we can do a quick check - } else if ( aup === bup ) { - return siblingCheck( a, b ); - } - - // Otherwise we need full lists of their ancestors for comparison - cur = a; - while ( (cur = cur.parentNode) ) { - ap.unshift( cur ); - } - cur = b; - while ( (cur = cur.parentNode) ) { - bp.unshift( cur ); - } - - // Walk down the tree looking for a discrepancy - while ( ap[i] === bp[i] ) { - i++; - } - - return i ? - // Do a sibling check if the nodes have a common ancestor - siblingCheck( ap[i], bp[i] ) : - - // Otherwise nodes in our document sort first - ap[i] === preferredDoc ? -1 : - bp[i] === preferredDoc ? 1 : - 0; - }; - - return doc; -}; - -Sizzle.matches = function( expr, elements ) { - return Sizzle( expr, null, null, elements ); -}; - -Sizzle.matchesSelector = function( elem, expr ) { - // Set document vars if needed - if ( ( elem.ownerDocument || elem ) !== document ) { - setDocument( elem ); - } - - // Make sure that attribute selectors are quoted - expr = expr.replace( rattributeQuotes, "='$1']" ); - - if ( support.matchesSelector && documentIsHTML && - ( !rbuggyMatches || !rbuggyMatches.test( expr ) ) && - ( !rbuggyQSA || !rbuggyQSA.test( expr ) ) ) { - - try { - var ret = matches.call( elem, expr ); - - // IE 9's matchesSelector returns false on disconnected nodes - if ( ret || support.disconnectedMatch || - // As well, disconnected nodes are said to be in a document - // fragment in IE 9 - elem.document && elem.document.nodeType !== 11 ) { - return ret; - } - } catch (e) {} - } - - return Sizzle( expr, document, null, [ elem ] ).length > 0; -}; - -Sizzle.contains = function( context, elem ) { - // Set document vars if needed - if ( ( context.ownerDocument || context ) !== document ) { - setDocument( context ); - } - return contains( context, elem ); -}; - -Sizzle.attr = function( elem, name ) { - // Set document vars if needed - if ( ( elem.ownerDocument || elem ) !== document ) { - setDocument( elem ); - } - - var fn = Expr.attrHandle[ name.toLowerCase() ], - // Don't get fooled by Object.prototype properties (jQuery #13807) - val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ? - fn( elem, name, !documentIsHTML ) : - undefined; - - return val !== undefined ? - val : - support.attributes || !documentIsHTML ? - elem.getAttribute( name ) : - (val = elem.getAttributeNode(name)) && val.specified ? - val.value : - null; -}; - -Sizzle.error = function( msg ) { - throw new Error( "Syntax error, unrecognized expression: " + msg ); -}; - -/** - * Document sorting and removing duplicates - * @param {ArrayLike} results - */ -Sizzle.uniqueSort = function( results ) { - var elem, - duplicates = [], - j = 0, - i = 0; - - // Unless we *know* we can detect duplicates, assume their presence - hasDuplicate = !support.detectDuplicates; - sortInput = !support.sortStable && results.slice( 0 ); - results.sort( sortOrder ); - - if ( hasDuplicate ) { - while ( (elem = results[i++]) ) { - if ( elem === results[ i ] ) { - j = duplicates.push( i ); - } - } - while ( j-- ) { - results.splice( duplicates[ j ], 1 ); - } - } - - // Clear input after sorting to release objects - // See https://github.com/jquery/sizzle/pull/225 - sortInput = null; - - return results; -}; - -/** - * Utility function for retrieving the text value of an array of DOM nodes - * @param {Array|Element} elem - */ -getText = Sizzle.getText = function( elem ) { - var node, - ret = "", - i = 0, - nodeType = elem.nodeType; - - if ( !nodeType ) { - // If no nodeType, this is expected to be an array - while ( (node = elem[i++]) ) { - // Do not traverse comment nodes - ret += getText( node ); - } - } else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) { - // Use textContent for elements - // innerText usage removed for consistency of new lines (jQuery #11153) - if ( typeof elem.textContent === "string" ) { - return elem.textContent; - } else { - // Traverse its children - for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { - ret += getText( elem ); - } - } - } else if ( nodeType === 3 || nodeType === 4 ) { - return elem.nodeValue; - } - // Do not include comment or processing instruction nodes - - return ret; -}; - -Expr = Sizzle.selectors = { - - // Can be adjusted by the user - cacheLength: 50, - - createPseudo: markFunction, - - match: matchExpr, - - attrHandle: {}, - - find: {}, - - relative: { - ">": { dir: "parentNode", first: true }, - " ": { dir: "parentNode" }, - "+": { dir: "previousSibling", first: true }, - "~": { dir: "previousSibling" } - }, - - preFilter: { - "ATTR": function( match ) { - match[1] = match[1].replace( runescape, funescape ); - - // Move the given value to match[3] whether quoted or unquoted - match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape ); - - if ( match[2] === "~=" ) { - match[3] = " " + match[3] + " "; - } - - return match.slice( 0, 4 ); - }, - - "CHILD": function( match ) { - /* matches from matchExpr["CHILD"] - 1 type (only|nth|...) - 2 what (child|of-type) - 3 argument (even|odd|\d*|\d*n([+-]\d+)?|...) - 4 xn-component of xn+y argument ([+-]?\d*n|) - 5 sign of xn-component - 6 x of xn-component - 7 sign of y-component - 8 y of y-component - */ - match[1] = match[1].toLowerCase(); - - if ( match[1].slice( 0, 3 ) === "nth" ) { - // nth-* requires argument - if ( !match[3] ) { - Sizzle.error( match[0] ); - } - - // numeric x and y parameters for Expr.filter.CHILD - // remember that false/true cast respectively to 0/1 - match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) ); - match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" ); - - // other types prohibit arguments - } else if ( match[3] ) { - Sizzle.error( match[0] ); - } - - return match; - }, - - "PSEUDO": function( match ) { - var excess, - unquoted = !match[6] && match[2]; - - if ( matchExpr["CHILD"].test( match[0] ) ) { - return null; - } - - // Accept quoted arguments as-is - if ( match[3] ) { - match[2] = match[4] || match[5] || ""; - - // Strip excess characters from unquoted arguments - } else if ( unquoted && rpseudo.test( unquoted ) && - // Get excess from tokenize (recursively) - (excess = tokenize( unquoted, true )) && - // advance to the next closing parenthesis - (excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) { - - // excess is a negative index - match[0] = match[0].slice( 0, excess ); - match[2] = unquoted.slice( 0, excess ); - } - - // Return only captures needed by the pseudo filter method (type and argument) - return match.slice( 0, 3 ); - } - }, - - filter: { - - "TAG": function( nodeNameSelector ) { - var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase(); - return nodeNameSelector === "*" ? - function() { return true; } : - function( elem ) { - return elem.nodeName && elem.nodeName.toLowerCase() === nodeName; - }; - }, - - "CLASS": function( className ) { - var pattern = classCache[ className + " " ]; - - return pattern || - (pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) && - classCache( className, function( elem ) { - return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" ); - }); - }, - - "ATTR": function( name, operator, check ) { - return function( elem ) { - var result = Sizzle.attr( elem, name ); - - if ( result == null ) { - return operator === "!="; - } - if ( !operator ) { - return true; - } - - result += ""; - - return operator === "=" ? result === check : - operator === "!=" ? result !== check : - operator === "^=" ? check && result.indexOf( check ) === 0 : - operator === "*=" ? check && result.indexOf( check ) > -1 : - operator === "$=" ? check && result.slice( -check.length ) === check : - operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 : - operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" : - false; - }; - }, - - "CHILD": function( type, what, argument, first, last ) { - var simple = type.slice( 0, 3 ) !== "nth", - forward = type.slice( -4 ) !== "last", - ofType = what === "of-type"; - - return first === 1 && last === 0 ? - - // Shortcut for :nth-*(n) - function( elem ) { - return !!elem.parentNode; - } : - - function( elem, context, xml ) { - var cache, outerCache, node, diff, nodeIndex, start, - dir = simple !== forward ? "nextSibling" : "previousSibling", - parent = elem.parentNode, - name = ofType && elem.nodeName.toLowerCase(), - useCache = !xml && !ofType; - - if ( parent ) { - - // :(first|last|only)-(child|of-type) - if ( simple ) { - while ( dir ) { - node = elem; - while ( (node = node[ dir ]) ) { - if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) { - return false; - } - } - // Reverse direction for :only-* (if we haven't yet done so) - start = dir = type === "only" && !start && "nextSibling"; - } - return true; - } - - start = [ forward ? parent.firstChild : parent.lastChild ]; - - // non-xml :nth-child(...) stores cache data on `parent` - if ( forward && useCache ) { - // Seek `elem` from a previously-cached index - outerCache = parent[ expando ] || (parent[ expando ] = {}); - cache = outerCache[ type ] || []; - nodeIndex = cache[0] === dirruns && cache[1]; - diff = cache[0] === dirruns && cache[2]; - node = nodeIndex && parent.childNodes[ nodeIndex ]; - - while ( (node = ++nodeIndex && node && node[ dir ] || - - // Fallback to seeking `elem` from the start - (diff = nodeIndex = 0) || start.pop()) ) { - - // When found, cache indexes on `parent` and break - if ( node.nodeType === 1 && ++diff && node === elem ) { - outerCache[ type ] = [ dirruns, nodeIndex, diff ]; - break; - } - } - - // Use previously-cached element index if available - } else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) { - diff = cache[1]; - - // xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...) - } else { - // Use the same loop as above to seek `elem` from the start - while ( (node = ++nodeIndex && node && node[ dir ] || - (diff = nodeIndex = 0) || start.pop()) ) { - - if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) { - // Cache the index of each encountered element - if ( useCache ) { - (node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ]; - } - - if ( node === elem ) { - break; - } - } - } - } - - // Incorporate the offset, then check against cycle size - diff -= last; - return diff === first || ( diff % first === 0 && diff / first >= 0 ); - } - }; - }, - - "PSEUDO": function( pseudo, argument ) { - // pseudo-class names are case-insensitive - // http://www.w3.org/TR/selectors/#pseudo-classes - // Prioritize by case sensitivity in case custom pseudos are added with uppercase letters - // Remember that setFilters inherits from pseudos - var args, - fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] || - Sizzle.error( "unsupported pseudo: " + pseudo ); - - // The user may use createPseudo to indicate that - // arguments are needed to create the filter function - // just as Sizzle does - if ( fn[ expando ] ) { - return fn( argument ); - } - - // But maintain support for old signatures - if ( fn.length > 1 ) { - args = [ pseudo, pseudo, "", argument ]; - return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ? - markFunction(function( seed, matches ) { - var idx, - matched = fn( seed, argument ), - i = matched.length; - while ( i-- ) { - idx = indexOf( seed, matched[i] ); - seed[ idx ] = !( matches[ idx ] = matched[i] ); - } - }) : - function( elem ) { - return fn( elem, 0, args ); - }; - } - - return fn; - } - }, - - pseudos: { - // Potentially complex pseudos - "not": markFunction(function( selector ) { - // Trim the selector passed to compile - // to avoid treating leading and trailing - // spaces as combinators - var input = [], - results = [], - matcher = compile( selector.replace( rtrim, "$1" ) ); - - return matcher[ expando ] ? - markFunction(function( seed, matches, context, xml ) { - var elem, - unmatched = matcher( seed, null, xml, [] ), - i = seed.length; - - // Match elements unmatched by `matcher` - while ( i-- ) { - if ( (elem = unmatched[i]) ) { - seed[i] = !(matches[i] = elem); - } - } - }) : - function( elem, context, xml ) { - input[0] = elem; - matcher( input, null, xml, results ); - // Don't keep the element (issue #299) - input[0] = null; - return !results.pop(); - }; - }), - - "has": markFunction(function( selector ) { - return function( elem ) { - return Sizzle( selector, elem ).length > 0; - }; - }), - - "contains": markFunction(function( text ) { - text = text.replace( runescape, funescape ); - return function( elem ) { - return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1; - }; - }), - - // "Whether an element is represented by a :lang() selector - // is based solely on the element's language value - // being equal to the identifier C, - // or beginning with the identifier C immediately followed by "-". - // The matching of C against the element's language value is performed case-insensitively. - // The identifier C does not have to be a valid language name." - // http://www.w3.org/TR/selectors/#lang-pseudo - "lang": markFunction( function( lang ) { - // lang value must be a valid identifier - if ( !ridentifier.test(lang || "") ) { - Sizzle.error( "unsupported lang: " + lang ); - } - lang = lang.replace( runescape, funescape ).toLowerCase(); - return function( elem ) { - var elemLang; - do { - if ( (elemLang = documentIsHTML ? - elem.lang : - elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) { - - elemLang = elemLang.toLowerCase(); - return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0; - } - } while ( (elem = elem.parentNode) && elem.nodeType === 1 ); - return false; - }; - }), - - // Miscellaneous - "target": function( elem ) { - var hash = window.location && window.location.hash; - return hash && hash.slice( 1 ) === elem.id; - }, - - "root": function( elem ) { - return elem === docElem; - }, - - "focus": function( elem ) { - return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex); - }, - - // Boolean properties - "enabled": function( elem ) { - return elem.disabled === false; - }, - - "disabled": function( elem ) { - return elem.disabled === true; - }, - - "checked": function( elem ) { - // In CSS3, :checked should return both checked and selected elements - // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked - var nodeName = elem.nodeName.toLowerCase(); - return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected); - }, - - "selected": function( elem ) { - // Accessing this property makes selected-by-default - // options in Safari work properly - if ( elem.parentNode ) { - elem.parentNode.selectedIndex; - } - - return elem.selected === true; - }, - - // Contents - "empty": function( elem ) { - // http://www.w3.org/TR/selectors/#empty-pseudo - // :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5), - // but not by others (comment: 8; processing instruction: 7; etc.) - // nodeType < 6 works because attributes (2) do not appear as children - for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { - if ( elem.nodeType < 6 ) { - return false; - } - } - return true; - }, - - "parent": function( elem ) { - return !Expr.pseudos["empty"]( elem ); - }, - - // Element/input types - "header": function( elem ) { - return rheader.test( elem.nodeName ); - }, - - "input": function( elem ) { - return rinputs.test( elem.nodeName ); - }, - - "button": function( elem ) { - var name = elem.nodeName.toLowerCase(); - return name === "input" && elem.type === "button" || name === "button"; - }, - - "text": function( elem ) { - var attr; - return elem.nodeName.toLowerCase() === "input" && - elem.type === "text" && - - // Support: IE<8 - // New HTML5 attribute values (e.g., "search") appear with elem.type === "text" - ( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" ); - }, - - // Position-in-collection - "first": createPositionalPseudo(function() { - return [ 0 ]; - }), - - "last": createPositionalPseudo(function( matchIndexes, length ) { - return [ length - 1 ]; - }), - - "eq": createPositionalPseudo(function( matchIndexes, length, argument ) { - return [ argument < 0 ? argument + length : argument ]; - }), - - "even": createPositionalPseudo(function( matchIndexes, length ) { - var i = 0; - for ( ; i < length; i += 2 ) { - matchIndexes.push( i ); - } - return matchIndexes; - }), - - "odd": createPositionalPseudo(function( matchIndexes, length ) { - var i = 1; - for ( ; i < length; i += 2 ) { - matchIndexes.push( i ); - } - return matchIndexes; - }), - - "lt": createPositionalPseudo(function( matchIndexes, length, argument ) { - var i = argument < 0 ? argument + length : argument; - for ( ; --i >= 0; ) { - matchIndexes.push( i ); - } - return matchIndexes; - }), - - "gt": createPositionalPseudo(function( matchIndexes, length, argument ) { - var i = argument < 0 ? argument + length : argument; - for ( ; ++i < length; ) { - matchIndexes.push( i ); - } - return matchIndexes; - }) - } -}; - -Expr.pseudos["nth"] = Expr.pseudos["eq"]; - -// Add button/input type pseudos -for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) { - Expr.pseudos[ i ] = createInputPseudo( i ); -} -for ( i in { submit: true, reset: true } ) { - Expr.pseudos[ i ] = createButtonPseudo( i ); -} - -// Easy API for creating new setFilters -function setFilters() {} -setFilters.prototype = Expr.filters = Expr.pseudos; -Expr.setFilters = new setFilters(); - -tokenize = Sizzle.tokenize = function( selector, parseOnly ) { - var matched, match, tokens, type, - soFar, groups, preFilters, - cached = tokenCache[ selector + " " ]; - - if ( cached ) { - return parseOnly ? 0 : cached.slice( 0 ); - } - - soFar = selector; - groups = []; - preFilters = Expr.preFilter; - - while ( soFar ) { - - // Comma and first run - if ( !matched || (match = rcomma.exec( soFar )) ) { - if ( match ) { - // Don't consume trailing commas as valid - soFar = soFar.slice( match[0].length ) || soFar; - } - groups.push( (tokens = []) ); - } - - matched = false; - - // Combinators - if ( (match = rcombinators.exec( soFar )) ) { - matched = match.shift(); - tokens.push({ - value: matched, - // Cast descendant combinators to space - type: match[0].replace( rtrim, " " ) - }); - soFar = soFar.slice( matched.length ); - } - - // Filters - for ( type in Expr.filter ) { - if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] || - (match = preFilters[ type ]( match ))) ) { - matched = match.shift(); - tokens.push({ - value: matched, - type: type, - matches: match - }); - soFar = soFar.slice( matched.length ); - } - } - - if ( !matched ) { - break; - } - } - - // Return the length of the invalid excess - // if we're just parsing - // Otherwise, throw an error or return tokens - return parseOnly ? - soFar.length : - soFar ? - Sizzle.error( selector ) : - // Cache the tokens - tokenCache( selector, groups ).slice( 0 ); -}; - -function toSelector( tokens ) { - var i = 0, - len = tokens.length, - selector = ""; - for ( ; i < len; i++ ) { - selector += tokens[i].value; - } - return selector; -} - -function addCombinator( matcher, combinator, base ) { - var dir = combinator.dir, - checkNonElements = base && dir === "parentNode", - doneName = done++; - - return combinator.first ? - // Check against closest ancestor/preceding element - function( elem, context, xml ) { - while ( (elem = elem[ dir ]) ) { - if ( elem.nodeType === 1 || checkNonElements ) { - return matcher( elem, context, xml ); - } - } - } : - - // Check against all ancestor/preceding elements - function( elem, context, xml ) { - var oldCache, outerCache, - newCache = [ dirruns, doneName ]; - - // We can't set arbitrary data on XML nodes, so they don't benefit from dir caching - if ( xml ) { - while ( (elem = elem[ dir ]) ) { - if ( elem.nodeType === 1 || checkNonElements ) { - if ( matcher( elem, context, xml ) ) { - return true; - } - } - } - } else { - while ( (elem = elem[ dir ]) ) { - if ( elem.nodeType === 1 || checkNonElements ) { - outerCache = elem[ expando ] || (elem[ expando ] = {}); - if ( (oldCache = outerCache[ dir ]) && - oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) { - - // Assign to newCache so results back-propagate to previous elements - return (newCache[ 2 ] = oldCache[ 2 ]); - } else { - // Reuse newcache so results back-propagate to previous elements - outerCache[ dir ] = newCache; - - // A match means we're done; a fail means we have to keep checking - if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) { - return true; - } - } - } - } - } - }; -} - -function elementMatcher( matchers ) { - return matchers.length > 1 ? - function( elem, context, xml ) { - var i = matchers.length; - while ( i-- ) { - if ( !matchers[i]( elem, context, xml ) ) { - return false; - } - } - return true; - } : - matchers[0]; -} - -function multipleContexts( selector, contexts, results ) { - var i = 0, - len = contexts.length; - for ( ; i < len; i++ ) { - Sizzle( selector, contexts[i], results ); - } - return results; -} - -function condense( unmatched, map, filter, context, xml ) { - var elem, - newUnmatched = [], - i = 0, - len = unmatched.length, - mapped = map != null; - - for ( ; i < len; i++ ) { - if ( (elem = unmatched[i]) ) { - if ( !filter || filter( elem, context, xml ) ) { - newUnmatched.push( elem ); - if ( mapped ) { - map.push( i ); - } - } - } - } - - return newUnmatched; -} - -function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) { - if ( postFilter && !postFilter[ expando ] ) { - postFilter = setMatcher( postFilter ); - } - if ( postFinder && !postFinder[ expando ] ) { - postFinder = setMatcher( postFinder, postSelector ); - } - return markFunction(function( seed, results, context, xml ) { - var temp, i, elem, - preMap = [], - postMap = [], - preexisting = results.length, - - // Get initial elements from seed or context - elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ), - - // Prefilter to get matcher input, preserving a map for seed-results synchronization - matcherIn = preFilter && ( seed || !selector ) ? - condense( elems, preMap, preFilter, context, xml ) : - elems, - - matcherOut = matcher ? - // If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results, - postFinder || ( seed ? preFilter : preexisting || postFilter ) ? - - // ...intermediate processing is necessary - [] : - - // ...otherwise use results directly - results : - matcherIn; - - // Find primary matches - if ( matcher ) { - matcher( matcherIn, matcherOut, context, xml ); - } - - // Apply postFilter - if ( postFilter ) { - temp = condense( matcherOut, postMap ); - postFilter( temp, [], context, xml ); - - // Un-match failing elements by moving them back to matcherIn - i = temp.length; - while ( i-- ) { - if ( (elem = temp[i]) ) { - matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem); - } - } - } - - if ( seed ) { - if ( postFinder || preFilter ) { - if ( postFinder ) { - // Get the final matcherOut by condensing this intermediate into postFinder contexts - temp = []; - i = matcherOut.length; - while ( i-- ) { - if ( (elem = matcherOut[i]) ) { - // Restore matcherIn since elem is not yet a final match - temp.push( (matcherIn[i] = elem) ); - } - } - postFinder( null, (matcherOut = []), temp, xml ); - } - - // Move matched elements from seed to results to keep them synchronized - i = matcherOut.length; - while ( i-- ) { - if ( (elem = matcherOut[i]) && - (temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) { - - seed[temp] = !(results[temp] = elem); - } - } - } - - // Add elements to results, through postFinder if defined - } else { - matcherOut = condense( - matcherOut === results ? - matcherOut.splice( preexisting, matcherOut.length ) : - matcherOut - ); - if ( postFinder ) { - postFinder( null, results, matcherOut, xml ); - } else { - push.apply( results, matcherOut ); - } - } - }); -} - -function matcherFromTokens( tokens ) { - var checkContext, matcher, j, - len = tokens.length, - leadingRelative = Expr.relative[ tokens[0].type ], - implicitRelative = leadingRelative || Expr.relative[" "], - i = leadingRelative ? 1 : 0, - - // The foundational matcher ensures that elements are reachable from top-level context(s) - matchContext = addCombinator( function( elem ) { - return elem === checkContext; - }, implicitRelative, true ), - matchAnyContext = addCombinator( function( elem ) { - return indexOf( checkContext, elem ) > -1; - }, implicitRelative, true ), - matchers = [ function( elem, context, xml ) { - var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || ( - (checkContext = context).nodeType ? - matchContext( elem, context, xml ) : - matchAnyContext( elem, context, xml ) ); - // Avoid hanging onto element (issue #299) - checkContext = null; - return ret; - } ]; - - for ( ; i < len; i++ ) { - if ( (matcher = Expr.relative[ tokens[i].type ]) ) { - matchers = [ addCombinator(elementMatcher( matchers ), matcher) ]; - } else { - matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches ); - - // Return special upon seeing a positional matcher - if ( matcher[ expando ] ) { - // Find the next relative operator (if any) for proper handling - j = ++i; - for ( ; j < len; j++ ) { - if ( Expr.relative[ tokens[j].type ] ) { - break; - } - } - return setMatcher( - i > 1 && elementMatcher( matchers ), - i > 1 && toSelector( - // If the preceding token was a descendant combinator, insert an implicit any-element `*` - tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" }) - ).replace( rtrim, "$1" ), - matcher, - i < j && matcherFromTokens( tokens.slice( i, j ) ), - j < len && matcherFromTokens( (tokens = tokens.slice( j )) ), - j < len && toSelector( tokens ) - ); - } - matchers.push( matcher ); - } - } - - return elementMatcher( matchers ); -} - -function matcherFromGroupMatchers( elementMatchers, setMatchers ) { - var bySet = setMatchers.length > 0, - byElement = elementMatchers.length > 0, - superMatcher = function( seed, context, xml, results, outermost ) { - var elem, j, matcher, - matchedCount = 0, - i = "0", - unmatched = seed && [], - setMatched = [], - contextBackup = outermostContext, - // We must always have either seed elements or outermost context - elems = seed || byElement && Expr.find["TAG"]( "*", outermost ), - // Use integer dirruns iff this is the outermost matcher - dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1), - len = elems.length; - - if ( outermost ) { - outermostContext = context !== document && context; - } - - // Add elements passing elementMatchers directly to results - // Keep `i` a string if there are no elements so `matchedCount` will be "00" below - // Support: IE<9, Safari - // Tolerate NodeList properties (IE: "length"; Safari: ) matching elements by id - for ( ; i !== len && (elem = elems[i]) != null; i++ ) { - if ( byElement && elem ) { - j = 0; - while ( (matcher = elementMatchers[j++]) ) { - if ( matcher( elem, context, xml ) ) { - results.push( elem ); - break; - } - } - if ( outermost ) { - dirruns = dirrunsUnique; - } - } - - // Track unmatched elements for set filters - if ( bySet ) { - // They will have gone through all possible matchers - if ( (elem = !matcher && elem) ) { - matchedCount--; - } - - // Lengthen the array for every element, matched or not - if ( seed ) { - unmatched.push( elem ); - } - } - } - - // Apply set filters to unmatched elements - matchedCount += i; - if ( bySet && i !== matchedCount ) { - j = 0; - while ( (matcher = setMatchers[j++]) ) { - matcher( unmatched, setMatched, context, xml ); - } - - if ( seed ) { - // Reintegrate element matches to eliminate the need for sorting - if ( matchedCount > 0 ) { - while ( i-- ) { - if ( !(unmatched[i] || setMatched[i]) ) { - setMatched[i] = pop.call( results ); - } - } - } - - // Discard index placeholder values to get only actual matches - setMatched = condense( setMatched ); - } - - // Add matches to results - push.apply( results, setMatched ); - - // Seedless set matches succeeding multiple successful matchers stipulate sorting - if ( outermost && !seed && setMatched.length > 0 && - ( matchedCount + setMatchers.length ) > 1 ) { - - Sizzle.uniqueSort( results ); - } - } - - // Override manipulation of globals by nested matchers - if ( outermost ) { - dirruns = dirrunsUnique; - outermostContext = contextBackup; - } - - return unmatched; - }; - - return bySet ? - markFunction( superMatcher ) : - superMatcher; -} - -compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) { - var i, - setMatchers = [], - elementMatchers = [], - cached = compilerCache[ selector + " " ]; - - if ( !cached ) { - // Generate a function of recursive functions that can be used to check each element - if ( !match ) { - match = tokenize( selector ); - } - i = match.length; - while ( i-- ) { - cached = matcherFromTokens( match[i] ); - if ( cached[ expando ] ) { - setMatchers.push( cached ); - } else { - elementMatchers.push( cached ); - } - } - - // Cache the compiled function - cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) ); - - // Save selector and tokenization - cached.selector = selector; - } - return cached; -}; - -/** - * A low-level selection function that works with Sizzle's compiled - * selector functions - * @param {String|Function} selector A selector or a pre-compiled - * selector function built with Sizzle.compile - * @param {Element} context - * @param {Array} [results] - * @param {Array} [seed] A set of elements to match against - */ -select = Sizzle.select = function( selector, context, results, seed ) { - var i, tokens, token, type, find, - compiled = typeof selector === "function" && selector, - match = !seed && tokenize( (selector = compiled.selector || selector) ); - - results = results || []; - - // Try to minimize operations if there is no seed and only one group - if ( match.length === 1 ) { - - // Take a shortcut and set the context if the root selector is an ID - tokens = match[0] = match[0].slice( 0 ); - if ( tokens.length > 2 && (token = tokens[0]).type === "ID" && - support.getById && context.nodeType === 9 && documentIsHTML && - Expr.relative[ tokens[1].type ] ) { - - context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0]; - if ( !context ) { - return results; - - // Precompiled matchers will still verify ancestry, so step up a level - } else if ( compiled ) { - context = context.parentNode; - } - - selector = selector.slice( tokens.shift().value.length ); - } - - // Fetch a seed set for right-to-left matching - i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length; - while ( i-- ) { - token = tokens[i]; - - // Abort if we hit a combinator - if ( Expr.relative[ (type = token.type) ] ) { - break; - } - if ( (find = Expr.find[ type ]) ) { - // Search, expanding context for leading sibling combinators - if ( (seed = find( - token.matches[0].replace( runescape, funescape ), - rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context - )) ) { - - // If seed is empty or no tokens remain, we can return early - tokens.splice( i, 1 ); - selector = seed.length && toSelector( tokens ); - if ( !selector ) { - push.apply( results, seed ); - return results; - } - - break; - } - } - } - } - - // Compile and execute a filtering function if one is not provided - // Provide `match` to avoid retokenization if we modified the selector above - ( compiled || compile( selector, match ) )( - seed, - context, - !documentIsHTML, - results, - rsibling.test( selector ) && testContext( context.parentNode ) || context - ); - return results; -}; - -// One-time assignments - -// Sort stability -support.sortStable = expando.split("").sort( sortOrder ).join("") === expando; - -// Support: Chrome 14-35+ -// Always assume duplicates if they aren't passed to the comparison function -support.detectDuplicates = !!hasDuplicate; - -// Initialize against the default document -setDocument(); - -// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27) -// Detached nodes confoundingly follow *each other* -support.sortDetached = assert(function( div1 ) { - // Should return 1, but returns 4 (following) - return div1.compareDocumentPosition( document.createElement("div") ) & 1; -}); - -// Support: IE<8 -// Prevent attribute/property "interpolation" -// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx -if ( !assert(function( div ) { - div.innerHTML = ""; - return div.firstChild.getAttribute("href") === "#" ; -}) ) { - addHandle( "type|href|height|width", function( elem, name, isXML ) { - if ( !isXML ) { - return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 ); - } - }); -} - -// Support: IE<9 -// Use defaultValue in place of getAttribute("value") -if ( !support.attributes || !assert(function( div ) { - div.innerHTML = ""; - div.firstChild.setAttribute( "value", "" ); - return div.firstChild.getAttribute( "value" ) === ""; -}) ) { - addHandle( "value", function( elem, name, isXML ) { - if ( !isXML && elem.nodeName.toLowerCase() === "input" ) { - return elem.defaultValue; - } - }); -} - -// Support: IE<9 -// Use getAttributeNode to fetch booleans when getAttribute lies -if ( !assert(function( div ) { - return div.getAttribute("disabled") == null; -}) ) { - addHandle( booleans, function( elem, name, isXML ) { - var val; - if ( !isXML ) { - return elem[ name ] === true ? name.toLowerCase() : - (val = elem.getAttributeNode( name )) && val.specified ? - val.value : - null; - } - }); -} - -return Sizzle; - -})( window ); - - - -jQuery.find = Sizzle; -jQuery.expr = Sizzle.selectors; -jQuery.expr[":"] = jQuery.expr.pseudos; -jQuery.unique = Sizzle.uniqueSort; -jQuery.text = Sizzle.getText; -jQuery.isXMLDoc = Sizzle.isXML; -jQuery.contains = Sizzle.contains; - - - -var rneedsContext = jQuery.expr.match.needsContext; - -var rsingleTag = (/^<(\w+)\s*\/?>(?:<\/\1>|)$/); - - - -var risSimple = /^.[^:#\[\.,]*$/; - -// Implement the identical functionality for filter and not -function winnow( elements, qualifier, not ) { - if ( jQuery.isFunction( qualifier ) ) { - return jQuery.grep( elements, function( elem, i ) { - /* jshint -W018 */ - return !!qualifier.call( elem, i, elem ) !== not; - }); - - } - - if ( qualifier.nodeType ) { - return jQuery.grep( elements, function( elem ) { - return ( elem === qualifier ) !== not; - }); - - } - - if ( typeof qualifier === "string" ) { - if ( risSimple.test( qualifier ) ) { - return jQuery.filter( qualifier, elements, not ); - } - - qualifier = jQuery.filter( qualifier, elements ); - } - - return jQuery.grep( elements, function( elem ) { - return ( indexOf.call( qualifier, elem ) >= 0 ) !== not; - }); -} - -jQuery.filter = function( expr, elems, not ) { - var elem = elems[ 0 ]; - - if ( not ) { - expr = ":not(" + expr + ")"; - } - - return elems.length === 1 && elem.nodeType === 1 ? - jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] : - jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) { - return elem.nodeType === 1; - })); -}; - -jQuery.fn.extend({ - find: function( selector ) { - var i, - len = this.length, - ret = [], - self = this; - - if ( typeof selector !== "string" ) { - return this.pushStack( jQuery( selector ).filter(function() { - for ( i = 0; i < len; i++ ) { - if ( jQuery.contains( self[ i ], this ) ) { - return true; - } - } - }) ); - } - - for ( i = 0; i < len; i++ ) { - jQuery.find( selector, self[ i ], ret ); - } - - // Needed because $( selector, context ) becomes $( context ).find( selector ) - ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret ); - ret.selector = this.selector ? this.selector + " " + selector : selector; - return ret; - }, - filter: function( selector ) { - return this.pushStack( winnow(this, selector || [], false) ); - }, - not: function( selector ) { - return this.pushStack( winnow(this, selector || [], true) ); - }, - is: function( selector ) { - return !!winnow( - this, - - // If this is a positional/relative selector, check membership in the returned set - // so $("p:first").is("p:last") won't return true for a doc with two "p". - typeof selector === "string" && rneedsContext.test( selector ) ? - jQuery( selector ) : - selector || [], - false - ).length; - } -}); - - -// Initialize a jQuery object - - -// A central reference to the root jQuery(document) -var rootjQuery, - - // A simple way to check for HTML strings - // Prioritize #id over to avoid XSS via location.hash (#9521) - // Strict HTML recognition (#11290: must start with <) - rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/, - - init = jQuery.fn.init = function( selector, context ) { - var match, elem; - - // HANDLE: $(""), $(null), $(undefined), $(false) - if ( !selector ) { - return this; - } - - // Handle HTML strings - if ( typeof selector === "string" ) { - if ( selector[0] === "<" && selector[ selector.length - 1 ] === ">" && selector.length >= 3 ) { - // Assume that strings that start and end with <> are HTML and skip the regex check - match = [ null, selector, null ]; - - } else { - match = rquickExpr.exec( selector ); - } - - // Match html or make sure no context is specified for #id - if ( match && (match[1] || !context) ) { - - // HANDLE: $(html) -> $(array) - if ( match[1] ) { - context = context instanceof jQuery ? context[0] : context; - - // Option to run scripts is true for back-compat - // Intentionally let the error be thrown if parseHTML is not present - jQuery.merge( this, jQuery.parseHTML( - match[1], - context && context.nodeType ? context.ownerDocument || context : document, - true - ) ); - - // HANDLE: $(html, props) - if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) { - for ( match in context ) { - // Properties of context are called as methods if possible - if ( jQuery.isFunction( this[ match ] ) ) { - this[ match ]( context[ match ] ); - - // ...and otherwise set as attributes - } else { - this.attr( match, context[ match ] ); - } - } - } - - return this; - - // HANDLE: $(#id) - } else { - elem = document.getElementById( match[2] ); - - // Support: Blackberry 4.6 - // gEBID returns nodes no longer in the document (#6963) - if ( elem && elem.parentNode ) { - // Inject the element directly into the jQuery object - this.length = 1; - this[0] = elem; - } - - this.context = document; - this.selector = selector; - return this; - } - - // HANDLE: $(expr, $(...)) - } else if ( !context || context.jquery ) { - return ( context || rootjQuery ).find( selector ); - - // HANDLE: $(expr, context) - // (which is just equivalent to: $(context).find(expr) - } else { - return this.constructor( context ).find( selector ); - } - - // HANDLE: $(DOMElement) - } else if ( selector.nodeType ) { - this.context = this[0] = selector; - this.length = 1; - return this; - - // HANDLE: $(function) - // Shortcut for document ready - } else if ( jQuery.isFunction( selector ) ) { - return typeof rootjQuery.ready !== "undefined" ? - rootjQuery.ready( selector ) : - // Execute immediately if ready is not present - selector( jQuery ); - } - - if ( selector.selector !== undefined ) { - this.selector = selector.selector; - this.context = selector.context; - } - - return jQuery.makeArray( selector, this ); - }; - -// Give the init function the jQuery prototype for later instantiation -init.prototype = jQuery.fn; - -// Initialize central reference -rootjQuery = jQuery( document ); - - -var rparentsprev = /^(?:parents|prev(?:Until|All))/, - // Methods guaranteed to produce a unique set when starting from a unique set - guaranteedUnique = { - children: true, - contents: true, - next: true, - prev: true - }; - -jQuery.extend({ - dir: function( elem, dir, until ) { - var matched = [], - truncate = until !== undefined; - - while ( (elem = elem[ dir ]) && elem.nodeType !== 9 ) { - if ( elem.nodeType === 1 ) { - if ( truncate && jQuery( elem ).is( until ) ) { - break; - } - matched.push( elem ); - } - } - return matched; - }, - - sibling: function( n, elem ) { - var matched = []; - - for ( ; n; n = n.nextSibling ) { - if ( n.nodeType === 1 && n !== elem ) { - matched.push( n ); - } - } - - return matched; - } -}); - -jQuery.fn.extend({ - has: function( target ) { - var targets = jQuery( target, this ), - l = targets.length; - - return this.filter(function() { - var i = 0; - for ( ; i < l; i++ ) { - if ( jQuery.contains( this, targets[i] ) ) { - return true; - } - } - }); - }, - - closest: function( selectors, context ) { - var cur, - i = 0, - l = this.length, - matched = [], - pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ? - jQuery( selectors, context || this.context ) : - 0; - - for ( ; i < l; i++ ) { - for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) { - // Always skip document fragments - if ( cur.nodeType < 11 && (pos ? - pos.index(cur) > -1 : - - // Don't pass non-elements to Sizzle - cur.nodeType === 1 && - jQuery.find.matchesSelector(cur, selectors)) ) { - - matched.push( cur ); - break; - } - } - } - - return this.pushStack( matched.length > 1 ? jQuery.unique( matched ) : matched ); - }, - - // Determine the position of an element within the set - index: function( elem ) { - - // No argument, return index in parent - if ( !elem ) { - return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1; - } - - // Index in selector - if ( typeof elem === "string" ) { - return indexOf.call( jQuery( elem ), this[ 0 ] ); - } - - // Locate the position of the desired element - return indexOf.call( this, - - // If it receives a jQuery object, the first element is used - elem.jquery ? elem[ 0 ] : elem - ); - }, - - add: function( selector, context ) { - return this.pushStack( - jQuery.unique( - jQuery.merge( this.get(), jQuery( selector, context ) ) - ) - ); - }, - - addBack: function( selector ) { - return this.add( selector == null ? - this.prevObject : this.prevObject.filter(selector) - ); - } -}); - -function sibling( cur, dir ) { - while ( (cur = cur[dir]) && cur.nodeType !== 1 ) {} - return cur; -} - -jQuery.each({ - parent: function( elem ) { - var parent = elem.parentNode; - return parent && parent.nodeType !== 11 ? parent : null; - }, - parents: function( elem ) { - return jQuery.dir( elem, "parentNode" ); - }, - parentsUntil: function( elem, i, until ) { - return jQuery.dir( elem, "parentNode", until ); - }, - next: function( elem ) { - return sibling( elem, "nextSibling" ); - }, - prev: function( elem ) { - return sibling( elem, "previousSibling" ); - }, - nextAll: function( elem ) { - return jQuery.dir( elem, "nextSibling" ); - }, - prevAll: function( elem ) { - return jQuery.dir( elem, "previousSibling" ); - }, - nextUntil: function( elem, i, until ) { - return jQuery.dir( elem, "nextSibling", until ); - }, - prevUntil: function( elem, i, until ) { - return jQuery.dir( elem, "previousSibling", until ); - }, - siblings: function( elem ) { - return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem ); - }, - children: function( elem ) { - return jQuery.sibling( elem.firstChild ); - }, - contents: function( elem ) { - return elem.contentDocument || jQuery.merge( [], elem.childNodes ); - } -}, function( name, fn ) { - jQuery.fn[ name ] = function( until, selector ) { - var matched = jQuery.map( this, fn, until ); - - if ( name.slice( -5 ) !== "Until" ) { - selector = until; - } - - if ( selector && typeof selector === "string" ) { - matched = jQuery.filter( selector, matched ); - } - - if ( this.length > 1 ) { - // Remove duplicates - if ( !guaranteedUnique[ name ] ) { - jQuery.unique( matched ); - } - - // Reverse order for parents* and prev-derivatives - if ( rparentsprev.test( name ) ) { - matched.reverse(); - } - } - - return this.pushStack( matched ); - }; -}); -var rnotwhite = (/\S+/g); - - - -// String to Object options format cache -var optionsCache = {}; - -// Convert String-formatted options into Object-formatted ones and store in cache -function createOptions( options ) { - var object = optionsCache[ options ] = {}; - jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) { - object[ flag ] = true; - }); - return object; -} - -/* - * Create a callback list using the following parameters: - * - * options: an optional list of space-separated options that will change how - * the callback list behaves or a more traditional option object - * - * By default a callback list will act like an event callback list and can be - * "fired" multiple times. - * - * Possible options: - * - * once: will ensure the callback list can only be fired once (like a Deferred) - * - * memory: will keep track of previous values and will call any callback added - * after the list has been fired right away with the latest "memorized" - * values (like a Deferred) - * - * unique: will ensure a callback can only be added once (no duplicate in the list) - * - * stopOnFalse: interrupt callings when a callback returns false - * - */ -jQuery.Callbacks = function( options ) { - - // Convert options from String-formatted to Object-formatted if needed - // (we check in cache first) - options = typeof options === "string" ? - ( optionsCache[ options ] || createOptions( options ) ) : - jQuery.extend( {}, options ); - - var // Last fire value (for non-forgettable lists) - memory, - // Flag to know if list was already fired - fired, - // Flag to know if list is currently firing - firing, - // First callback to fire (used internally by add and fireWith) - firingStart, - // End of the loop when firing - firingLength, - // Index of currently firing callback (modified by remove if needed) - firingIndex, - // Actual callback list - list = [], - // Stack of fire calls for repeatable lists - stack = !options.once && [], - // Fire callbacks - fire = function( data ) { - memory = options.memory && data; - fired = true; - firingIndex = firingStart || 0; - firingStart = 0; - firingLength = list.length; - firing = true; - for ( ; list && firingIndex < firingLength; firingIndex++ ) { - if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) { - memory = false; // To prevent further calls using add - break; - } - } - firing = false; - if ( list ) { - if ( stack ) { - if ( stack.length ) { - fire( stack.shift() ); - } - } else if ( memory ) { - list = []; - } else { - self.disable(); - } - } - }, - // Actual Callbacks object - self = { - // Add a callback or a collection of callbacks to the list - add: function() { - if ( list ) { - // First, we save the current length - var start = list.length; - (function add( args ) { - jQuery.each( args, function( _, arg ) { - var type = jQuery.type( arg ); - if ( type === "function" ) { - if ( !options.unique || !self.has( arg ) ) { - list.push( arg ); - } - } else if ( arg && arg.length && type !== "string" ) { - // Inspect recursively - add( arg ); - } - }); - })( arguments ); - // Do we need to add the callbacks to the - // current firing batch? - if ( firing ) { - firingLength = list.length; - // With memory, if we're not firing then - // we should call right away - } else if ( memory ) { - firingStart = start; - fire( memory ); - } - } - return this; - }, - // Remove a callback from the list - remove: function() { - if ( list ) { - jQuery.each( arguments, function( _, arg ) { - var index; - while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) { - list.splice( index, 1 ); - // Handle firing indexes - if ( firing ) { - if ( index <= firingLength ) { - firingLength--; - } - if ( index <= firingIndex ) { - firingIndex--; - } - } - } - }); - } - return this; - }, - // Check if a given callback is in the list. - // If no argument is given, return whether or not list has callbacks attached. - has: function( fn ) { - return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length ); - }, - // Remove all callbacks from the list - empty: function() { - list = []; - firingLength = 0; - return this; - }, - // Have the list do nothing anymore - disable: function() { - list = stack = memory = undefined; - return this; - }, - // Is it disabled? - disabled: function() { - return !list; - }, - // Lock the list in its current state - lock: function() { - stack = undefined; - if ( !memory ) { - self.disable(); - } - return this; - }, - // Is it locked? - locked: function() { - return !stack; - }, - // Call all callbacks with the given context and arguments - fireWith: function( context, args ) { - if ( list && ( !fired || stack ) ) { - args = args || []; - args = [ context, args.slice ? args.slice() : args ]; - if ( firing ) { - stack.push( args ); - } else { - fire( args ); - } - } - return this; - }, - // Call all the callbacks with the given arguments - fire: function() { - self.fireWith( this, arguments ); - return this; - }, - // To know if the callbacks have already been called at least once - fired: function() { - return !!fired; - } - }; - - return self; -}; - - -jQuery.extend({ - - Deferred: function( func ) { - var tuples = [ - // action, add listener, listener list, final state - [ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ], - [ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ], - [ "notify", "progress", jQuery.Callbacks("memory") ] - ], - state = "pending", - promise = { - state: function() { - return state; - }, - always: function() { - deferred.done( arguments ).fail( arguments ); - return this; - }, - then: function( /* fnDone, fnFail, fnProgress */ ) { - var fns = arguments; - return jQuery.Deferred(function( newDefer ) { - jQuery.each( tuples, function( i, tuple ) { - var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ]; - // deferred[ done | fail | progress ] for forwarding actions to newDefer - deferred[ tuple[1] ](function() { - var returned = fn && fn.apply( this, arguments ); - if ( returned && jQuery.isFunction( returned.promise ) ) { - returned.promise() - .done( newDefer.resolve ) - .fail( newDefer.reject ) - .progress( newDefer.notify ); - } else { - newDefer[ tuple[ 0 ] + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments ); - } - }); - }); - fns = null; - }).promise(); - }, - // Get a promise for this deferred - // If obj is provided, the promise aspect is added to the object - promise: function( obj ) { - return obj != null ? jQuery.extend( obj, promise ) : promise; - } - }, - deferred = {}; - - // Keep pipe for back-compat - promise.pipe = promise.then; - - // Add list-specific methods - jQuery.each( tuples, function( i, tuple ) { - var list = tuple[ 2 ], - stateString = tuple[ 3 ]; - - // promise[ done | fail | progress ] = list.add - promise[ tuple[1] ] = list.add; - - // Handle state - if ( stateString ) { - list.add(function() { - // state = [ resolved | rejected ] - state = stateString; - - // [ reject_list | resolve_list ].disable; progress_list.lock - }, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock ); - } - - // deferred[ resolve | reject | notify ] - deferred[ tuple[0] ] = function() { - deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments ); - return this; - }; - deferred[ tuple[0] + "With" ] = list.fireWith; - }); - - // Make the deferred a promise - promise.promise( deferred ); - - // Call given func if any - if ( func ) { - func.call( deferred, deferred ); - } - - // All done! - return deferred; - }, - - // Deferred helper - when: function( subordinate /* , ..., subordinateN */ ) { - var i = 0, - resolveValues = slice.call( arguments ), - length = resolveValues.length, - - // the count of uncompleted subordinates - remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0, - - // the master Deferred. If resolveValues consist of only a single Deferred, just use that. - deferred = remaining === 1 ? subordinate : jQuery.Deferred(), - - // Update function for both resolve and progress values - updateFunc = function( i, contexts, values ) { - return function( value ) { - contexts[ i ] = this; - values[ i ] = arguments.length > 1 ? slice.call( arguments ) : value; - if ( values === progressValues ) { - deferred.notifyWith( contexts, values ); - } else if ( !( --remaining ) ) { - deferred.resolveWith( contexts, values ); - } - }; - }, - - progressValues, progressContexts, resolveContexts; - - // Add listeners to Deferred subordinates; treat others as resolved - if ( length > 1 ) { - progressValues = new Array( length ); - progressContexts = new Array( length ); - resolveContexts = new Array( length ); - for ( ; i < length; i++ ) { - if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) { - resolveValues[ i ].promise() - .done( updateFunc( i, resolveContexts, resolveValues ) ) - .fail( deferred.reject ) - .progress( updateFunc( i, progressContexts, progressValues ) ); - } else { - --remaining; - } - } - } - - // If we're not waiting on anything, resolve the master - if ( !remaining ) { - deferred.resolveWith( resolveContexts, resolveValues ); - } - - return deferred.promise(); - } -}); - - -// The deferred used on DOM ready -var readyList; - -jQuery.fn.ready = function( fn ) { - // Add the callback - jQuery.ready.promise().done( fn ); - - return this; -}; - -jQuery.extend({ - // Is the DOM ready to be used? Set to true once it occurs. - isReady: false, - - // A counter to track how many items to wait for before - // the ready event fires. See #6781 - readyWait: 1, - - // Hold (or release) the ready event - holdReady: function( hold ) { - if ( hold ) { - jQuery.readyWait++; - } else { - jQuery.ready( true ); - } - }, - - // Handle when the DOM is ready - ready: function( wait ) { - - // Abort if there are pending holds or we're already ready - if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) { - return; - } - - // Remember that the DOM is ready - jQuery.isReady = true; - - // If a normal DOM Ready event fired, decrement, and wait if need be - if ( wait !== true && --jQuery.readyWait > 0 ) { - return; - } - - // If there are functions bound, to execute - readyList.resolveWith( document, [ jQuery ] ); - - // Trigger any bound ready events - if ( jQuery.fn.triggerHandler ) { - jQuery( document ).triggerHandler( "ready" ); - jQuery( document ).off( "ready" ); - } - } -}); - -/** - * The ready event handler and self cleanup method - */ -function completed() { - document.removeEventListener( "DOMContentLoaded", completed, false ); - window.removeEventListener( "load", completed, false ); - jQuery.ready(); -} - -jQuery.ready.promise = function( obj ) { - if ( !readyList ) { - - readyList = jQuery.Deferred(); - - // Catch cases where $(document).ready() is called after the browser event has already occurred. - // We once tried to use readyState "interactive" here, but it caused issues like the one - // discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15 - if ( document.readyState === "complete" ) { - // Handle it asynchronously to allow scripts the opportunity to delay ready - setTimeout( jQuery.ready ); - - } else { - - // Use the handy event callback - document.addEventListener( "DOMContentLoaded", completed, false ); - - // A fallback to window.onload, that will always work - window.addEventListener( "load", completed, false ); - } - } - return readyList.promise( obj ); -}; - -// Kick off the DOM ready check even if the user does not -jQuery.ready.promise(); - - - - -// Multifunctional method to get and set values of a collection -// The value/s can optionally be executed if it's a function -var access = jQuery.access = function( elems, fn, key, value, chainable, emptyGet, raw ) { - var i = 0, - len = elems.length, - bulk = key == null; - - // Sets many values - if ( jQuery.type( key ) === "object" ) { - chainable = true; - for ( i in key ) { - jQuery.access( elems, fn, i, key[i], true, emptyGet, raw ); - } - - // Sets one value - } else if ( value !== undefined ) { - chainable = true; - - if ( !jQuery.isFunction( value ) ) { - raw = true; - } - - if ( bulk ) { - // Bulk operations run against the entire set - if ( raw ) { - fn.call( elems, value ); - fn = null; - - // ...except when executing function values - } else { - bulk = fn; - fn = function( elem, key, value ) { - return bulk.call( jQuery( elem ), value ); - }; - } - } - - if ( fn ) { - for ( ; i < len; i++ ) { - fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) ); - } - } - } - - return chainable ? - elems : - - // Gets - bulk ? - fn.call( elems ) : - len ? fn( elems[0], key ) : emptyGet; -}; - - -/** - * Determines whether an object can have data - */ -jQuery.acceptData = function( owner ) { - // Accepts only: - // - Node - // - Node.ELEMENT_NODE - // - Node.DOCUMENT_NODE - // - Object - // - Any - /* jshint -W018 */ - return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType ); -}; - - -function Data() { - // Support: Android<4, - // Old WebKit does not have Object.preventExtensions/freeze method, - // return new empty object instead with no [[set]] accessor - Object.defineProperty( this.cache = {}, 0, { - get: function() { - return {}; - } - }); - - this.expando = jQuery.expando + Data.uid++; -} - -Data.uid = 1; -Data.accepts = jQuery.acceptData; - -Data.prototype = { - key: function( owner ) { - // We can accept data for non-element nodes in modern browsers, - // but we should not, see #8335. - // Always return the key for a frozen object. - if ( !Data.accepts( owner ) ) { - return 0; - } - - var descriptor = {}, - // Check if the owner object already has a cache key - unlock = owner[ this.expando ]; - - // If not, create one - if ( !unlock ) { - unlock = Data.uid++; - - // Secure it in a non-enumerable, non-writable property - try { - descriptor[ this.expando ] = { value: unlock }; - Object.defineProperties( owner, descriptor ); - - // Support: Android<4 - // Fallback to a less secure definition - } catch ( e ) { - descriptor[ this.expando ] = unlock; - jQuery.extend( owner, descriptor ); - } - } - - // Ensure the cache object - if ( !this.cache[ unlock ] ) { - this.cache[ unlock ] = {}; - } - - return unlock; - }, - set: function( owner, data, value ) { - var prop, - // There may be an unlock assigned to this node, - // if there is no entry for this "owner", create one inline - // and set the unlock as though an owner entry had always existed - unlock = this.key( owner ), - cache = this.cache[ unlock ]; - - // Handle: [ owner, key, value ] args - if ( typeof data === "string" ) { - cache[ data ] = value; - - // Handle: [ owner, { properties } ] args - } else { - // Fresh assignments by object are shallow copied - if ( jQuery.isEmptyObject( cache ) ) { - jQuery.extend( this.cache[ unlock ], data ); - // Otherwise, copy the properties one-by-one to the cache object - } else { - for ( prop in data ) { - cache[ prop ] = data[ prop ]; - } - } - } - return cache; - }, - get: function( owner, key ) { - // Either a valid cache is found, or will be created. - // New caches will be created and the unlock returned, - // allowing direct access to the newly created - // empty data object. A valid owner object must be provided. - var cache = this.cache[ this.key( owner ) ]; - - return key === undefined ? - cache : cache[ key ]; - }, - access: function( owner, key, value ) { - var stored; - // In cases where either: - // - // 1. No key was specified - // 2. A string key was specified, but no value provided - // - // Take the "read" path and allow the get method to determine - // which value to return, respectively either: - // - // 1. The entire cache object - // 2. The data stored at the key - // - if ( key === undefined || - ((key && typeof key === "string") && value === undefined) ) { - - stored = this.get( owner, key ); - - return stored !== undefined ? - stored : this.get( owner, jQuery.camelCase(key) ); - } - - // [*]When the key is not a string, or both a key and value - // are specified, set or extend (existing objects) with either: - // - // 1. An object of properties - // 2. A key and value - // - this.set( owner, key, value ); - - // Since the "set" path can have two possible entry points - // return the expected data based on which path was taken[*] - return value !== undefined ? value : key; - }, - remove: function( owner, key ) { - var i, name, camel, - unlock = this.key( owner ), - cache = this.cache[ unlock ]; - - if ( key === undefined ) { - this.cache[ unlock ] = {}; - - } else { - // Support array or space separated string of keys - if ( jQuery.isArray( key ) ) { - // If "name" is an array of keys... - // When data is initially created, via ("key", "val") signature, - // keys will be converted to camelCase. - // Since there is no way to tell _how_ a key was added, remove - // both plain key and camelCase key. #12786 - // This will only penalize the array argument path. - name = key.concat( key.map( jQuery.camelCase ) ); - } else { - camel = jQuery.camelCase( key ); - // Try the string as a key before any manipulation - if ( key in cache ) { - name = [ key, camel ]; - } else { - // If a key with the spaces exists, use it. - // Otherwise, create an array by matching non-whitespace - name = camel; - name = name in cache ? - [ name ] : ( name.match( rnotwhite ) || [] ); - } - } - - i = name.length; - while ( i-- ) { - delete cache[ name[ i ] ]; - } - } - }, - hasData: function( owner ) { - return !jQuery.isEmptyObject( - this.cache[ owner[ this.expando ] ] || {} - ); - }, - discard: function( owner ) { - if ( owner[ this.expando ] ) { - delete this.cache[ owner[ this.expando ] ]; - } - } -}; -var data_priv = new Data(); - -var data_user = new Data(); - - - -// Implementation Summary -// -// 1. Enforce API surface and semantic compatibility with 1.9.x branch -// 2. Improve the module's maintainability by reducing the storage -// paths to a single mechanism. -// 3. Use the same single mechanism to support "private" and "user" data. -// 4. _Never_ expose "private" data to user code (TODO: Drop _data, _removeData) -// 5. Avoid exposing implementation details on user objects (eg. expando properties) -// 6. Provide a clear path for implementation upgrade to WeakMap in 2014 - -var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/, - rmultiDash = /([A-Z])/g; - -function dataAttr( elem, key, data ) { - var name; - - // If nothing was found internally, try to fetch any - // data from the HTML5 data-* attribute - if ( data === undefined && elem.nodeType === 1 ) { - name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase(); - data = elem.getAttribute( name ); - - if ( typeof data === "string" ) { - try { - data = data === "true" ? true : - data === "false" ? false : - data === "null" ? null : - // Only convert to a number if it doesn't change the string - +data + "" === data ? +data : - rbrace.test( data ) ? jQuery.parseJSON( data ) : - data; - } catch( e ) {} - - // Make sure we set the data so it isn't changed later - data_user.set( elem, key, data ); - } else { - data = undefined; - } - } - return data; -} - -jQuery.extend({ - hasData: function( elem ) { - return data_user.hasData( elem ) || data_priv.hasData( elem ); - }, - - data: function( elem, name, data ) { - return data_user.access( elem, name, data ); - }, - - removeData: function( elem, name ) { - data_user.remove( elem, name ); - }, - - // TODO: Now that all calls to _data and _removeData have been replaced - // with direct calls to data_priv methods, these can be deprecated. - _data: function( elem, name, data ) { - return data_priv.access( elem, name, data ); - }, - - _removeData: function( elem, name ) { - data_priv.remove( elem, name ); - } -}); - -jQuery.fn.extend({ - data: function( key, value ) { - var i, name, data, - elem = this[ 0 ], - attrs = elem && elem.attributes; - - // Gets all values - if ( key === undefined ) { - if ( this.length ) { - data = data_user.get( elem ); - - if ( elem.nodeType === 1 && !data_priv.get( elem, "hasDataAttrs" ) ) { - i = attrs.length; - while ( i-- ) { - - // Support: IE11+ - // The attrs elements can be null (#14894) - if ( attrs[ i ] ) { - name = attrs[ i ].name; - if ( name.indexOf( "data-" ) === 0 ) { - name = jQuery.camelCase( name.slice(5) ); - dataAttr( elem, name, data[ name ] ); - } - } - } - data_priv.set( elem, "hasDataAttrs", true ); - } - } - - return data; - } - - // Sets multiple values - if ( typeof key === "object" ) { - return this.each(function() { - data_user.set( this, key ); - }); - } - - return access( this, function( value ) { - var data, - camelKey = jQuery.camelCase( key ); - - // The calling jQuery object (element matches) is not empty - // (and therefore has an element appears at this[ 0 ]) and the - // `value` parameter was not undefined. An empty jQuery object - // will result in `undefined` for elem = this[ 0 ] which will - // throw an exception if an attempt to read a data cache is made. - if ( elem && value === undefined ) { - // Attempt to get data from the cache - // with the key as-is - data = data_user.get( elem, key ); - if ( data !== undefined ) { - return data; - } - - // Attempt to get data from the cache - // with the key camelized - data = data_user.get( elem, camelKey ); - if ( data !== undefined ) { - return data; - } - - // Attempt to "discover" the data in - // HTML5 custom data-* attrs - data = dataAttr( elem, camelKey, undefined ); - if ( data !== undefined ) { - return data; - } - - // We tried really hard, but the data doesn't exist. - return; - } - - // Set the data... - this.each(function() { - // First, attempt to store a copy or reference of any - // data that might've been store with a camelCased key. - var data = data_user.get( this, camelKey ); - - // For HTML5 data-* attribute interop, we have to - // store property names with dashes in a camelCase form. - // This might not apply to all properties...* - data_user.set( this, camelKey, value ); - - // *... In the case of properties that might _actually_ - // have dashes, we need to also store a copy of that - // unchanged property. - if ( key.indexOf("-") !== -1 && data !== undefined ) { - data_user.set( this, key, value ); - } - }); - }, null, value, arguments.length > 1, null, true ); - }, - - removeData: function( key ) { - return this.each(function() { - data_user.remove( this, key ); - }); - } -}); - - -jQuery.extend({ - queue: function( elem, type, data ) { - var queue; - - if ( elem ) { - type = ( type || "fx" ) + "queue"; - queue = data_priv.get( elem, type ); - - // Speed up dequeue by getting out quickly if this is just a lookup - if ( data ) { - if ( !queue || jQuery.isArray( data ) ) { - queue = data_priv.access( elem, type, jQuery.makeArray(data) ); - } else { - queue.push( data ); - } - } - return queue || []; - } - }, - - dequeue: function( elem, type ) { - type = type || "fx"; - - var queue = jQuery.queue( elem, type ), - startLength = queue.length, - fn = queue.shift(), - hooks = jQuery._queueHooks( elem, type ), - next = function() { - jQuery.dequeue( elem, type ); - }; - - // If the fx queue is dequeued, always remove the progress sentinel - if ( fn === "inprogress" ) { - fn = queue.shift(); - startLength--; - } - - if ( fn ) { - - // Add a progress sentinel to prevent the fx queue from being - // automatically dequeued - if ( type === "fx" ) { - queue.unshift( "inprogress" ); - } - - // Clear up the last queue stop function - delete hooks.stop; - fn.call( elem, next, hooks ); - } - - if ( !startLength && hooks ) { - hooks.empty.fire(); - } - }, - - // Not public - generate a queueHooks object, or return the current one - _queueHooks: function( elem, type ) { - var key = type + "queueHooks"; - return data_priv.get( elem, key ) || data_priv.access( elem, key, { - empty: jQuery.Callbacks("once memory").add(function() { - data_priv.remove( elem, [ type + "queue", key ] ); - }) - }); - } -}); - -jQuery.fn.extend({ - queue: function( type, data ) { - var setter = 2; - - if ( typeof type !== "string" ) { - data = type; - type = "fx"; - setter--; - } - - if ( arguments.length < setter ) { - return jQuery.queue( this[0], type ); - } - - return data === undefined ? - this : - this.each(function() { - var queue = jQuery.queue( this, type, data ); - - // Ensure a hooks for this queue - jQuery._queueHooks( this, type ); - - if ( type === "fx" && queue[0] !== "inprogress" ) { - jQuery.dequeue( this, type ); - } - }); - }, - dequeue: function( type ) { - return this.each(function() { - jQuery.dequeue( this, type ); - }); - }, - clearQueue: function( type ) { - return this.queue( type || "fx", [] ); - }, - // Get a promise resolved when queues of a certain type - // are emptied (fx is the type by default) - promise: function( type, obj ) { - var tmp, - count = 1, - defer = jQuery.Deferred(), - elements = this, - i = this.length, - resolve = function() { - if ( !( --count ) ) { - defer.resolveWith( elements, [ elements ] ); - } - }; - - if ( typeof type !== "string" ) { - obj = type; - type = undefined; - } - type = type || "fx"; - - while ( i-- ) { - tmp = data_priv.get( elements[ i ], type + "queueHooks" ); - if ( tmp && tmp.empty ) { - count++; - tmp.empty.add( resolve ); - } - } - resolve(); - return defer.promise( obj ); - } -}); -var pnum = (/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/).source; - -var cssExpand = [ "Top", "Right", "Bottom", "Left" ]; - -var isHidden = function( elem, el ) { - // isHidden might be called from jQuery#filter function; - // in that case, element will be second argument - elem = el || elem; - return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem ); - }; - -var rcheckableType = (/^(?:checkbox|radio)$/i); - - - -(function() { - var fragment = document.createDocumentFragment(), - div = fragment.appendChild( document.createElement( "div" ) ), - input = document.createElement( "input" ); - - // Support: Safari<=5.1 - // Check state lost if the name is set (#11217) - // Support: Windows Web Apps (WWA) - // `name` and `type` must use .setAttribute for WWA (#14901) - input.setAttribute( "type", "radio" ); - input.setAttribute( "checked", "checked" ); - input.setAttribute( "name", "t" ); - - div.appendChild( input ); - - // Support: Safari<=5.1, Android<4.2 - // Older WebKit doesn't clone checked state correctly in fragments - support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked; - - // Support: IE<=11+ - // Make sure textarea (and checkbox) defaultValue is properly cloned - div.innerHTML = ""; - support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue; -})(); -var strundefined = typeof undefined; - - - -support.focusinBubbles = "onfocusin" in window; - - -var - rkeyEvent = /^key/, - rmouseEvent = /^(?:mouse|pointer|contextmenu)|click/, - rfocusMorph = /^(?:focusinfocus|focusoutblur)$/, - rtypenamespace = /^([^.]*)(?:\.(.+)|)$/; - -function returnTrue() { - return true; -} - -function returnFalse() { - return false; -} - -function safeActiveElement() { - try { - return document.activeElement; - } catch ( err ) { } -} - -/* - * Helper functions for managing events -- not part of the public interface. - * Props to Dean Edwards' addEvent library for many of the ideas. - */ -jQuery.event = { - - global: {}, - - add: function( elem, types, handler, data, selector ) { - - var handleObjIn, eventHandle, tmp, - events, t, handleObj, - special, handlers, type, namespaces, origType, - elemData = data_priv.get( elem ); - - // Don't attach events to noData or text/comment nodes (but allow plain objects) - if ( !elemData ) { - return; - } - - // Caller can pass in an object of custom data in lieu of the handler - if ( handler.handler ) { - handleObjIn = handler; - handler = handleObjIn.handler; - selector = handleObjIn.selector; - } - - // Make sure that the handler has a unique ID, used to find/remove it later - if ( !handler.guid ) { - handler.guid = jQuery.guid++; - } - - // Init the element's event structure and main handler, if this is the first - if ( !(events = elemData.events) ) { - events = elemData.events = {}; - } - if ( !(eventHandle = elemData.handle) ) { - eventHandle = elemData.handle = function( e ) { - // Discard the second event of a jQuery.event.trigger() and - // when an event is called after a page has unloaded - return typeof jQuery !== strundefined && jQuery.event.triggered !== e.type ? - jQuery.event.dispatch.apply( elem, arguments ) : undefined; - }; - } - - // Handle multiple events separated by a space - types = ( types || "" ).match( rnotwhite ) || [ "" ]; - t = types.length; - while ( t-- ) { - tmp = rtypenamespace.exec( types[t] ) || []; - type = origType = tmp[1]; - namespaces = ( tmp[2] || "" ).split( "." ).sort(); - - // There *must* be a type, no attaching namespace-only handlers - if ( !type ) { - continue; - } - - // If event changes its type, use the special event handlers for the changed type - special = jQuery.event.special[ type ] || {}; - - // If selector defined, determine special event api type, otherwise given type - type = ( selector ? special.delegateType : special.bindType ) || type; - - // Update special based on newly reset type - special = jQuery.event.special[ type ] || {}; - - // handleObj is passed to all event handlers - handleObj = jQuery.extend({ - type: type, - origType: origType, - data: data, - handler: handler, - guid: handler.guid, - selector: selector, - needsContext: selector && jQuery.expr.match.needsContext.test( selector ), - namespace: namespaces.join(".") - }, handleObjIn ); - - // Init the event handler queue if we're the first - if ( !(handlers = events[ type ]) ) { - handlers = events[ type ] = []; - handlers.delegateCount = 0; - - // Only use addEventListener if the special events handler returns false - if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) { - if ( elem.addEventListener ) { - elem.addEventListener( type, eventHandle, false ); - } - } - } - - if ( special.add ) { - special.add.call( elem, handleObj ); - - if ( !handleObj.handler.guid ) { - handleObj.handler.guid = handler.guid; - } - } - - // Add to the element's handler list, delegates in front - if ( selector ) { - handlers.splice( handlers.delegateCount++, 0, handleObj ); - } else { - handlers.push( handleObj ); - } - - // Keep track of which events have ever been used, for event optimization - jQuery.event.global[ type ] = true; - } - - }, - - // Detach an event or set of events from an element - remove: function( elem, types, handler, selector, mappedTypes ) { - - var j, origCount, tmp, - events, t, handleObj, - special, handlers, type, namespaces, origType, - elemData = data_priv.hasData( elem ) && data_priv.get( elem ); - - if ( !elemData || !(events = elemData.events) ) { - return; - } - - // Once for each type.namespace in types; type may be omitted - types = ( types || "" ).match( rnotwhite ) || [ "" ]; - t = types.length; - while ( t-- ) { - tmp = rtypenamespace.exec( types[t] ) || []; - type = origType = tmp[1]; - namespaces = ( tmp[2] || "" ).split( "." ).sort(); - - // Unbind all events (on this namespace, if provided) for the element - if ( !type ) { - for ( type in events ) { - jQuery.event.remove( elem, type + types[ t ], handler, selector, true ); - } - continue; - } - - special = jQuery.event.special[ type ] || {}; - type = ( selector ? special.delegateType : special.bindType ) || type; - handlers = events[ type ] || []; - tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ); - - // Remove matching events - origCount = j = handlers.length; - while ( j-- ) { - handleObj = handlers[ j ]; - - if ( ( mappedTypes || origType === handleObj.origType ) && - ( !handler || handler.guid === handleObj.guid ) && - ( !tmp || tmp.test( handleObj.namespace ) ) && - ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) { - handlers.splice( j, 1 ); - - if ( handleObj.selector ) { - handlers.delegateCount--; - } - if ( special.remove ) { - special.remove.call( elem, handleObj ); - } - } - } - - // Remove generic event handler if we removed something and no more handlers exist - // (avoids potential for endless recursion during removal of special event handlers) - if ( origCount && !handlers.length ) { - if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) { - jQuery.removeEvent( elem, type, elemData.handle ); - } - - delete events[ type ]; - } - } - - // Remove the expando if it's no longer used - if ( jQuery.isEmptyObject( events ) ) { - delete elemData.handle; - data_priv.remove( elem, "events" ); - } - }, - - trigger: function( event, data, elem, onlyHandlers ) { - - var i, cur, tmp, bubbleType, ontype, handle, special, - eventPath = [ elem || document ], - type = hasOwn.call( event, "type" ) ? event.type : event, - namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : []; - - cur = tmp = elem = elem || document; - - // Don't do events on text and comment nodes - if ( elem.nodeType === 3 || elem.nodeType === 8 ) { - return; - } - - // focus/blur morphs to focusin/out; ensure we're not firing them right now - if ( rfocusMorph.test( type + jQuery.event.triggered ) ) { - return; - } - - if ( type.indexOf(".") >= 0 ) { - // Namespaced trigger; create a regexp to match event type in handle() - namespaces = type.split("."); - type = namespaces.shift(); - namespaces.sort(); - } - ontype = type.indexOf(":") < 0 && "on" + type; - - // Caller can pass in a jQuery.Event object, Object, or just an event type string - event = event[ jQuery.expando ] ? - event : - new jQuery.Event( type, typeof event === "object" && event ); - - // Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true) - event.isTrigger = onlyHandlers ? 2 : 3; - event.namespace = namespaces.join("."); - event.namespace_re = event.namespace ? - new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) : - null; - - // Clean up the event in case it is being reused - event.result = undefined; - if ( !event.target ) { - event.target = elem; - } - - // Clone any incoming data and prepend the event, creating the handler arg list - data = data == null ? - [ event ] : - jQuery.makeArray( data, [ event ] ); - - // Allow special events to draw outside the lines - special = jQuery.event.special[ type ] || {}; - if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) { - return; - } - - // Determine event propagation path in advance, per W3C events spec (#9951) - // Bubble up to document, then to window; watch for a global ownerDocument var (#9724) - if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) { - - bubbleType = special.delegateType || type; - if ( !rfocusMorph.test( bubbleType + type ) ) { - cur = cur.parentNode; - } - for ( ; cur; cur = cur.parentNode ) { - eventPath.push( cur ); - tmp = cur; - } - - // Only add window if we got to document (e.g., not plain obj or detached DOM) - if ( tmp === (elem.ownerDocument || document) ) { - eventPath.push( tmp.defaultView || tmp.parentWindow || window ); - } - } - - // Fire handlers on the event path - i = 0; - while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) { - - event.type = i > 1 ? - bubbleType : - special.bindType || type; - - // jQuery handler - handle = ( data_priv.get( cur, "events" ) || {} )[ event.type ] && data_priv.get( cur, "handle" ); - if ( handle ) { - handle.apply( cur, data ); - } - - // Native handler - handle = ontype && cur[ ontype ]; - if ( handle && handle.apply && jQuery.acceptData( cur ) ) { - event.result = handle.apply( cur, data ); - if ( event.result === false ) { - event.preventDefault(); - } - } - } - event.type = type; - - // If nobody prevented the default action, do it now - if ( !onlyHandlers && !event.isDefaultPrevented() ) { - - if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) && - jQuery.acceptData( elem ) ) { - - // Call a native DOM method on the target with the same name name as the event. - // Don't do default actions on window, that's where global variables be (#6170) - if ( ontype && jQuery.isFunction( elem[ type ] ) && !jQuery.isWindow( elem ) ) { - - // Don't re-trigger an onFOO event when we call its FOO() method - tmp = elem[ ontype ]; - - if ( tmp ) { - elem[ ontype ] = null; - } - - // Prevent re-triggering of the same event, since we already bubbled it above - jQuery.event.triggered = type; - elem[ type ](); - jQuery.event.triggered = undefined; - - if ( tmp ) { - elem[ ontype ] = tmp; - } - } - } - } - - return event.result; - }, - - dispatch: function( event ) { - - // Make a writable jQuery.Event from the native event object - event = jQuery.event.fix( event ); - - var i, j, ret, matched, handleObj, - handlerQueue = [], - args = slice.call( arguments ), - handlers = ( data_priv.get( this, "events" ) || {} )[ event.type ] || [], - special = jQuery.event.special[ event.type ] || {}; - - // Use the fix-ed jQuery.Event rather than the (read-only) native event - args[0] = event; - event.delegateTarget = this; - - // Call the preDispatch hook for the mapped type, and let it bail if desired - if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) { - return; - } - - // Determine handlers - handlerQueue = jQuery.event.handlers.call( this, event, handlers ); - - // Run delegates first; they may want to stop propagation beneath us - i = 0; - while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) { - event.currentTarget = matched.elem; - - j = 0; - while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) { - - // Triggered event must either 1) have no namespace, or 2) have namespace(s) - // a subset or equal to those in the bound event (both can have no namespace). - if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) { - - event.handleObj = handleObj; - event.data = handleObj.data; - - ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler ) - .apply( matched.elem, args ); - - if ( ret !== undefined ) { - if ( (event.result = ret) === false ) { - event.preventDefault(); - event.stopPropagation(); - } - } - } - } - } - - // Call the postDispatch hook for the mapped type - if ( special.postDispatch ) { - special.postDispatch.call( this, event ); - } - - return event.result; - }, - - handlers: function( event, handlers ) { - var i, matches, sel, handleObj, - handlerQueue = [], - delegateCount = handlers.delegateCount, - cur = event.target; - - // Find delegate handlers - // Black-hole SVG instance trees (#13180) - // Avoid non-left-click bubbling in Firefox (#3861) - if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) { - - for ( ; cur !== this; cur = cur.parentNode || this ) { - - // Don't process clicks on disabled elements (#6911, #8165, #11382, #11764) - if ( cur.disabled !== true || event.type !== "click" ) { - matches = []; - for ( i = 0; i < delegateCount; i++ ) { - handleObj = handlers[ i ]; - - // Don't conflict with Object.prototype properties (#13203) - sel = handleObj.selector + " "; - - if ( matches[ sel ] === undefined ) { - matches[ sel ] = handleObj.needsContext ? - jQuery( sel, this ).index( cur ) >= 0 : - jQuery.find( sel, this, null, [ cur ] ).length; - } - if ( matches[ sel ] ) { - matches.push( handleObj ); - } - } - if ( matches.length ) { - handlerQueue.push({ elem: cur, handlers: matches }); - } - } - } - } - - // Add the remaining (directly-bound) handlers - if ( delegateCount < handlers.length ) { - handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) }); - } - - return handlerQueue; - }, - - // Includes some event props shared by KeyEvent and MouseEvent - props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "), - - fixHooks: {}, - - keyHooks: { - props: "char charCode key keyCode".split(" "), - filter: function( event, original ) { - - // Add which for key events - if ( event.which == null ) { - event.which = original.charCode != null ? original.charCode : original.keyCode; - } - - return event; - } - }, - - mouseHooks: { - props: "button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "), - filter: function( event, original ) { - var eventDoc, doc, body, - button = original.button; - - // Calculate pageX/Y if missing and clientX/Y available - if ( event.pageX == null && original.clientX != null ) { - eventDoc = event.target.ownerDocument || document; - doc = eventDoc.documentElement; - body = eventDoc.body; - - event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 ); - event.pageY = original.clientY + ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - ( doc && doc.clientTop || body && body.clientTop || 0 ); - } - - // Add which for click: 1 === left; 2 === middle; 3 === right - // Note: button is not normalized, so don't use it - if ( !event.which && button !== undefined ) { - event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) ); - } - - return event; - } - }, - - fix: function( event ) { - if ( event[ jQuery.expando ] ) { - return event; - } - - // Create a writable copy of the event object and normalize some properties - var i, prop, copy, - type = event.type, - originalEvent = event, - fixHook = this.fixHooks[ type ]; - - if ( !fixHook ) { - this.fixHooks[ type ] = fixHook = - rmouseEvent.test( type ) ? this.mouseHooks : - rkeyEvent.test( type ) ? this.keyHooks : - {}; - } - copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props; - - event = new jQuery.Event( originalEvent ); - - i = copy.length; - while ( i-- ) { - prop = copy[ i ]; - event[ prop ] = originalEvent[ prop ]; - } - - // Support: Cordova 2.5 (WebKit) (#13255) - // All events should have a target; Cordova deviceready doesn't - if ( !event.target ) { - event.target = document; - } - - // Support: Safari 6.0+, Chrome<28 - // Target should not be a text node (#504, #13143) - if ( event.target.nodeType === 3 ) { - event.target = event.target.parentNode; - } - - return fixHook.filter ? fixHook.filter( event, originalEvent ) : event; - }, - - special: { - load: { - // Prevent triggered image.load events from bubbling to window.load - noBubble: true - }, - focus: { - // Fire native event if possible so blur/focus sequence is correct - trigger: function() { - if ( this !== safeActiveElement() && this.focus ) { - this.focus(); - return false; - } - }, - delegateType: "focusin" - }, - blur: { - trigger: function() { - if ( this === safeActiveElement() && this.blur ) { - this.blur(); - return false; - } - }, - delegateType: "focusout" - }, - click: { - // For checkbox, fire native event so checked state will be right - trigger: function() { - if ( this.type === "checkbox" && this.click && jQuery.nodeName( this, "input" ) ) { - this.click(); - return false; - } - }, - - // For cross-browser consistency, don't fire native .click() on links - _default: function( event ) { - return jQuery.nodeName( event.target, "a" ); - } - }, - - beforeunload: { - postDispatch: function( event ) { - - // Support: Firefox 20+ - // Firefox doesn't alert if the returnValue field is not set. - if ( event.result !== undefined && event.originalEvent ) { - event.originalEvent.returnValue = event.result; - } - } - } - }, - - simulate: function( type, elem, event, bubble ) { - // Piggyback on a donor event to simulate a different one. - // Fake originalEvent to avoid donor's stopPropagation, but if the - // simulated event prevents default then we do the same on the donor. - var e = jQuery.extend( - new jQuery.Event(), - event, - { - type: type, - isSimulated: true, - originalEvent: {} - } - ); - if ( bubble ) { - jQuery.event.trigger( e, null, elem ); - } else { - jQuery.event.dispatch.call( elem, e ); - } - if ( e.isDefaultPrevented() ) { - event.preventDefault(); - } - } -}; - -jQuery.removeEvent = function( elem, type, handle ) { - if ( elem.removeEventListener ) { - elem.removeEventListener( type, handle, false ); - } -}; - -jQuery.Event = function( src, props ) { - // Allow instantiation without the 'new' keyword - if ( !(this instanceof jQuery.Event) ) { - return new jQuery.Event( src, props ); - } - - // Event object - if ( src && src.type ) { - this.originalEvent = src; - this.type = src.type; - - // Events bubbling up the document may have been marked as prevented - // by a handler lower down the tree; reflect the correct value. - this.isDefaultPrevented = src.defaultPrevented || - src.defaultPrevented === undefined && - // Support: Android<4.0 - src.returnValue === false ? - returnTrue : - returnFalse; - - // Event type - } else { - this.type = src; - } - - // Put explicitly provided properties onto the event object - if ( props ) { - jQuery.extend( this, props ); - } - - // Create a timestamp if incoming event doesn't have one - this.timeStamp = src && src.timeStamp || jQuery.now(); - - // Mark it as fixed - this[ jQuery.expando ] = true; -}; - -// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding -// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html -jQuery.Event.prototype = { - isDefaultPrevented: returnFalse, - isPropagationStopped: returnFalse, - isImmediatePropagationStopped: returnFalse, - - preventDefault: function() { - var e = this.originalEvent; - - this.isDefaultPrevented = returnTrue; - - if ( e && e.preventDefault ) { - e.preventDefault(); - } - }, - stopPropagation: function() { - var e = this.originalEvent; - - this.isPropagationStopped = returnTrue; - - if ( e && e.stopPropagation ) { - e.stopPropagation(); - } - }, - stopImmediatePropagation: function() { - var e = this.originalEvent; - - this.isImmediatePropagationStopped = returnTrue; - - if ( e && e.stopImmediatePropagation ) { - e.stopImmediatePropagation(); - } - - this.stopPropagation(); - } -}; - -// Create mouseenter/leave events using mouseover/out and event-time checks -// Support: Chrome 15+ -jQuery.each({ - mouseenter: "mouseover", - mouseleave: "mouseout", - pointerenter: "pointerover", - pointerleave: "pointerout" -}, function( orig, fix ) { - jQuery.event.special[ orig ] = { - delegateType: fix, - bindType: fix, - - handle: function( event ) { - var ret, - target = this, - related = event.relatedTarget, - handleObj = event.handleObj; - - // For mousenter/leave call the handler if related is outside the target. - // NB: No relatedTarget if the mouse left/entered the browser window - if ( !related || (related !== target && !jQuery.contains( target, related )) ) { - event.type = handleObj.origType; - ret = handleObj.handler.apply( this, arguments ); - event.type = fix; - } - return ret; - } - }; -}); - -// Support: Firefox, Chrome, Safari -// Create "bubbling" focus and blur events -if ( !support.focusinBubbles ) { - jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) { - - // Attach a single capturing handler on the document while someone wants focusin/focusout - var handler = function( event ) { - jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true ); - }; - - jQuery.event.special[ fix ] = { - setup: function() { - var doc = this.ownerDocument || this, - attaches = data_priv.access( doc, fix ); - - if ( !attaches ) { - doc.addEventListener( orig, handler, true ); - } - data_priv.access( doc, fix, ( attaches || 0 ) + 1 ); - }, - teardown: function() { - var doc = this.ownerDocument || this, - attaches = data_priv.access( doc, fix ) - 1; - - if ( !attaches ) { - doc.removeEventListener( orig, handler, true ); - data_priv.remove( doc, fix ); - - } else { - data_priv.access( doc, fix, attaches ); - } - } - }; - }); -} - -jQuery.fn.extend({ - - on: function( types, selector, data, fn, /*INTERNAL*/ one ) { - var origFn, type; - - // Types can be a map of types/handlers - if ( typeof types === "object" ) { - // ( types-Object, selector, data ) - if ( typeof selector !== "string" ) { - // ( types-Object, data ) - data = data || selector; - selector = undefined; - } - for ( type in types ) { - this.on( type, selector, data, types[ type ], one ); - } - return this; - } - - if ( data == null && fn == null ) { - // ( types, fn ) - fn = selector; - data = selector = undefined; - } else if ( fn == null ) { - if ( typeof selector === "string" ) { - // ( types, selector, fn ) - fn = data; - data = undefined; - } else { - // ( types, data, fn ) - fn = data; - data = selector; - selector = undefined; - } - } - if ( fn === false ) { - fn = returnFalse; - } else if ( !fn ) { - return this; - } - - if ( one === 1 ) { - origFn = fn; - fn = function( event ) { - // Can use an empty set, since event contains the info - jQuery().off( event ); - return origFn.apply( this, arguments ); - }; - // Use same guid so caller can remove using origFn - fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ ); - } - return this.each( function() { - jQuery.event.add( this, types, fn, data, selector ); - }); - }, - one: function( types, selector, data, fn ) { - return this.on( types, selector, data, fn, 1 ); - }, - off: function( types, selector, fn ) { - var handleObj, type; - if ( types && types.preventDefault && types.handleObj ) { - // ( event ) dispatched jQuery.Event - handleObj = types.handleObj; - jQuery( types.delegateTarget ).off( - handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType, - handleObj.selector, - handleObj.handler - ); - return this; - } - if ( typeof types === "object" ) { - // ( types-object [, selector] ) - for ( type in types ) { - this.off( type, selector, types[ type ] ); - } - return this; - } - if ( selector === false || typeof selector === "function" ) { - // ( types [, fn] ) - fn = selector; - selector = undefined; - } - if ( fn === false ) { - fn = returnFalse; - } - return this.each(function() { - jQuery.event.remove( this, types, fn, selector ); - }); - }, - - trigger: function( type, data ) { - return this.each(function() { - jQuery.event.trigger( type, data, this ); - }); - }, - triggerHandler: function( type, data ) { - var elem = this[0]; - if ( elem ) { - return jQuery.event.trigger( type, data, elem, true ); - } - } -}); - - -var - rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi, - rtagName = /<([\w:]+)/, - rhtml = /<|&#?\w+;/, - rnoInnerhtml = /<(?:script|style|link)/i, - // checked="checked" or checked - rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i, - rscriptType = /^$|\/(?:java|ecma)script/i, - rscriptTypeMasked = /^true\/(.*)/, - rcleanScript = /^\s*\s*$/g, - - // We have to close these tags to support XHTML (#13200) - wrapMap = { - - // Support: IE9 - option: [ 1, "" ], - - thead: [ 1, "", "
    " ], - col: [ 2, "", "
    " ], - tr: [ 2, "", "
    " ], - td: [ 3, "", "
    " ], - - _default: [ 0, "", "" ] - }; - -// Support: IE9 -wrapMap.optgroup = wrapMap.option; - -wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; -wrapMap.th = wrapMap.td; - -// Support: 1.x compatibility -// Manipulating tables requires a tbody -function manipulationTarget( elem, content ) { - return jQuery.nodeName( elem, "table" ) && - jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ? - - elem.getElementsByTagName("tbody")[0] || - elem.appendChild( elem.ownerDocument.createElement("tbody") ) : - elem; -} - -// Replace/restore the type attribute of script elements for safe DOM manipulation -function disableScript( elem ) { - elem.type = (elem.getAttribute("type") !== null) + "/" + elem.type; - return elem; -} -function restoreScript( elem ) { - var match = rscriptTypeMasked.exec( elem.type ); - - if ( match ) { - elem.type = match[ 1 ]; - } else { - elem.removeAttribute("type"); - } - - return elem; -} - -// Mark scripts as having already been evaluated -function setGlobalEval( elems, refElements ) { - var i = 0, - l = elems.length; - - for ( ; i < l; i++ ) { - data_priv.set( - elems[ i ], "globalEval", !refElements || data_priv.get( refElements[ i ], "globalEval" ) - ); - } -} - -function cloneCopyEvent( src, dest ) { - var i, l, type, pdataOld, pdataCur, udataOld, udataCur, events; - - if ( dest.nodeType !== 1 ) { - return; - } - - // 1. Copy private data: events, handlers, etc. - if ( data_priv.hasData( src ) ) { - pdataOld = data_priv.access( src ); - pdataCur = data_priv.set( dest, pdataOld ); - events = pdataOld.events; - - if ( events ) { - delete pdataCur.handle; - pdataCur.events = {}; - - for ( type in events ) { - for ( i = 0, l = events[ type ].length; i < l; i++ ) { - jQuery.event.add( dest, type, events[ type ][ i ] ); - } - } - } - } - - // 2. Copy user data - if ( data_user.hasData( src ) ) { - udataOld = data_user.access( src ); - udataCur = jQuery.extend( {}, udataOld ); - - data_user.set( dest, udataCur ); - } -} - -function getAll( context, tag ) { - var ret = context.getElementsByTagName ? context.getElementsByTagName( tag || "*" ) : - context.querySelectorAll ? context.querySelectorAll( tag || "*" ) : - []; - - return tag === undefined || tag && jQuery.nodeName( context, tag ) ? - jQuery.merge( [ context ], ret ) : - ret; -} - -// Fix IE bugs, see support tests -function fixInput( src, dest ) { - var nodeName = dest.nodeName.toLowerCase(); - - // Fails to persist the checked state of a cloned checkbox or radio button. - if ( nodeName === "input" && rcheckableType.test( src.type ) ) { - dest.checked = src.checked; - - // Fails to return the selected option to the default selected state when cloning options - } else if ( nodeName === "input" || nodeName === "textarea" ) { - dest.defaultValue = src.defaultValue; - } -} - -jQuery.extend({ - clone: function( elem, dataAndEvents, deepDataAndEvents ) { - var i, l, srcElements, destElements, - clone = elem.cloneNode( true ), - inPage = jQuery.contains( elem.ownerDocument, elem ); - - // Fix IE cloning issues - if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) && - !jQuery.isXMLDoc( elem ) ) { - - // We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2 - destElements = getAll( clone ); - srcElements = getAll( elem ); - - for ( i = 0, l = srcElements.length; i < l; i++ ) { - fixInput( srcElements[ i ], destElements[ i ] ); - } - } - - // Copy the events from the original to the clone - if ( dataAndEvents ) { - if ( deepDataAndEvents ) { - srcElements = srcElements || getAll( elem ); - destElements = destElements || getAll( clone ); - - for ( i = 0, l = srcElements.length; i < l; i++ ) { - cloneCopyEvent( srcElements[ i ], destElements[ i ] ); - } - } else { - cloneCopyEvent( elem, clone ); - } - } - - // Preserve script evaluation history - destElements = getAll( clone, "script" ); - if ( destElements.length > 0 ) { - setGlobalEval( destElements, !inPage && getAll( elem, "script" ) ); - } - - // Return the cloned set - return clone; - }, - - buildFragment: function( elems, context, scripts, selection ) { - var elem, tmp, tag, wrap, contains, j, - fragment = context.createDocumentFragment(), - nodes = [], - i = 0, - l = elems.length; - - for ( ; i < l; i++ ) { - elem = elems[ i ]; - - if ( elem || elem === 0 ) { - - // Add nodes directly - if ( jQuery.type( elem ) === "object" ) { - // Support: QtWebKit, PhantomJS - // push.apply(_, arraylike) throws on ancient WebKit - jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem ); - - // Convert non-html into a text node - } else if ( !rhtml.test( elem ) ) { - nodes.push( context.createTextNode( elem ) ); - - // Convert html into DOM nodes - } else { - tmp = tmp || fragment.appendChild( context.createElement("div") ); - - // Deserialize a standard representation - tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase(); - wrap = wrapMap[ tag ] || wrapMap._default; - tmp.innerHTML = wrap[ 1 ] + elem.replace( rxhtmlTag, "<$1>" ) + wrap[ 2 ]; - - // Descend through wrappers to the right content - j = wrap[ 0 ]; - while ( j-- ) { - tmp = tmp.lastChild; - } - - // Support: QtWebKit, PhantomJS - // push.apply(_, arraylike) throws on ancient WebKit - jQuery.merge( nodes, tmp.childNodes ); - - // Remember the top-level container - tmp = fragment.firstChild; - - // Ensure the created nodes are orphaned (#12392) - tmp.textContent = ""; - } - } - } - - // Remove wrapper from fragment - fragment.textContent = ""; - - i = 0; - while ( (elem = nodes[ i++ ]) ) { - - // #4087 - If origin and destination elements are the same, and this is - // that element, do not do anything - if ( selection && jQuery.inArray( elem, selection ) !== -1 ) { - continue; - } - - contains = jQuery.contains( elem.ownerDocument, elem ); - - // Append to fragment - tmp = getAll( fragment.appendChild( elem ), "script" ); - - // Preserve script evaluation history - if ( contains ) { - setGlobalEval( tmp ); - } - - // Capture executables - if ( scripts ) { - j = 0; - while ( (elem = tmp[ j++ ]) ) { - if ( rscriptType.test( elem.type || "" ) ) { - scripts.push( elem ); - } - } - } - } - - return fragment; - }, - - cleanData: function( elems ) { - var data, elem, type, key, - special = jQuery.event.special, - i = 0; - - for ( ; (elem = elems[ i ]) !== undefined; i++ ) { - if ( jQuery.acceptData( elem ) ) { - key = elem[ data_priv.expando ]; - - if ( key && (data = data_priv.cache[ key ]) ) { - if ( data.events ) { - for ( type in data.events ) { - if ( special[ type ] ) { - jQuery.event.remove( elem, type ); - - // This is a shortcut to avoid jQuery.event.remove's overhead - } else { - jQuery.removeEvent( elem, type, data.handle ); - } - } - } - if ( data_priv.cache[ key ] ) { - // Discard any remaining `private` data - delete data_priv.cache[ key ]; - } - } - } - // Discard any remaining `user` data - delete data_user.cache[ elem[ data_user.expando ] ]; - } - } -}); - -jQuery.fn.extend({ - text: function( value ) { - return access( this, function( value ) { - return value === undefined ? - jQuery.text( this ) : - this.empty().each(function() { - if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { - this.textContent = value; - } - }); - }, null, value, arguments.length ); - }, - - append: function() { - return this.domManip( arguments, function( elem ) { - if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { - var target = manipulationTarget( this, elem ); - target.appendChild( elem ); - } - }); - }, - - prepend: function() { - return this.domManip( arguments, function( elem ) { - if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { - var target = manipulationTarget( this, elem ); - target.insertBefore( elem, target.firstChild ); - } - }); - }, - - before: function() { - return this.domManip( arguments, function( elem ) { - if ( this.parentNode ) { - this.parentNode.insertBefore( elem, this ); - } - }); - }, - - after: function() { - return this.domManip( arguments, function( elem ) { - if ( this.parentNode ) { - this.parentNode.insertBefore( elem, this.nextSibling ); - } - }); - }, - - remove: function( selector, keepData /* Internal Use Only */ ) { - var elem, - elems = selector ? jQuery.filter( selector, this ) : this, - i = 0; - - for ( ; (elem = elems[i]) != null; i++ ) { - if ( !keepData && elem.nodeType === 1 ) { - jQuery.cleanData( getAll( elem ) ); - } - - if ( elem.parentNode ) { - if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) { - setGlobalEval( getAll( elem, "script" ) ); - } - elem.parentNode.removeChild( elem ); - } - } - - return this; - }, - - empty: function() { - var elem, - i = 0; - - for ( ; (elem = this[i]) != null; i++ ) { - if ( elem.nodeType === 1 ) { - - // Prevent memory leaks - jQuery.cleanData( getAll( elem, false ) ); - - // Remove any remaining nodes - elem.textContent = ""; - } - } - - return this; - }, - - clone: function( dataAndEvents, deepDataAndEvents ) { - dataAndEvents = dataAndEvents == null ? false : dataAndEvents; - deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents; - - return this.map(function() { - return jQuery.clone( this, dataAndEvents, deepDataAndEvents ); - }); - }, - - html: function( value ) { - return access( this, function( value ) { - var elem = this[ 0 ] || {}, - i = 0, - l = this.length; - - if ( value === undefined && elem.nodeType === 1 ) { - return elem.innerHTML; - } - - // See if we can take a shortcut and just use innerHTML - if ( typeof value === "string" && !rnoInnerhtml.test( value ) && - !wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) { - - value = value.replace( rxhtmlTag, "<$1>" ); - - try { - for ( ; i < l; i++ ) { - elem = this[ i ] || {}; - - // Remove element nodes and prevent memory leaks - if ( elem.nodeType === 1 ) { - jQuery.cleanData( getAll( elem, false ) ); - elem.innerHTML = value; - } - } - - elem = 0; - - // If using innerHTML throws an exception, use the fallback method - } catch( e ) {} - } - - if ( elem ) { - this.empty().append( value ); - } - }, null, value, arguments.length ); - }, - - replaceWith: function() { - var arg = arguments[ 0 ]; - - // Make the changes, replacing each context element with the new content - this.domManip( arguments, function( elem ) { - arg = this.parentNode; - - jQuery.cleanData( getAll( this ) ); - - if ( arg ) { - arg.replaceChild( elem, this ); - } - }); - - // Force removal if there was no new content (e.g., from empty arguments) - return arg && (arg.length || arg.nodeType) ? this : this.remove(); - }, - - detach: function( selector ) { - return this.remove( selector, true ); - }, - - domManip: function( args, callback ) { - - // Flatten any nested arrays - args = concat.apply( [], args ); - - var fragment, first, scripts, hasScripts, node, doc, - i = 0, - l = this.length, - set = this, - iNoClone = l - 1, - value = args[ 0 ], - isFunction = jQuery.isFunction( value ); - - // We can't cloneNode fragments that contain checked, in WebKit - if ( isFunction || - ( l > 1 && typeof value === "string" && - !support.checkClone && rchecked.test( value ) ) ) { - return this.each(function( index ) { - var self = set.eq( index ); - if ( isFunction ) { - args[ 0 ] = value.call( this, index, self.html() ); - } - self.domManip( args, callback ); - }); - } - - if ( l ) { - fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, this ); - first = fragment.firstChild; - - if ( fragment.childNodes.length === 1 ) { - fragment = first; - } - - if ( first ) { - scripts = jQuery.map( getAll( fragment, "script" ), disableScript ); - hasScripts = scripts.length; - - // Use the original fragment for the last item instead of the first because it can end up - // being emptied incorrectly in certain situations (#8070). - for ( ; i < l; i++ ) { - node = fragment; - - if ( i !== iNoClone ) { - node = jQuery.clone( node, true, true ); - - // Keep references to cloned scripts for later restoration - if ( hasScripts ) { - // Support: QtWebKit - // jQuery.merge because push.apply(_, arraylike) throws - jQuery.merge( scripts, getAll( node, "script" ) ); - } - } - - callback.call( this[ i ], node, i ); - } - - if ( hasScripts ) { - doc = scripts[ scripts.length - 1 ].ownerDocument; - - // Reenable scripts - jQuery.map( scripts, restoreScript ); - - // Evaluate executable scripts on first document insertion - for ( i = 0; i < hasScripts; i++ ) { - node = scripts[ i ]; - if ( rscriptType.test( node.type || "" ) && - !data_priv.access( node, "globalEval" ) && jQuery.contains( doc, node ) ) { - - if ( node.src ) { - // Optional AJAX dependency, but won't run scripts if not present - if ( jQuery._evalUrl ) { - jQuery._evalUrl( node.src ); - } - } else { - jQuery.globalEval( node.textContent.replace( rcleanScript, "" ) ); - } - } - } - } - } - } - - return this; - } -}); - -jQuery.each({ - appendTo: "append", - prependTo: "prepend", - insertBefore: "before", - insertAfter: "after", - replaceAll: "replaceWith" -}, function( name, original ) { - jQuery.fn[ name ] = function( selector ) { - var elems, - ret = [], - insert = jQuery( selector ), - last = insert.length - 1, - i = 0; - - for ( ; i <= last; i++ ) { - elems = i === last ? this : this.clone( true ); - jQuery( insert[ i ] )[ original ]( elems ); - - // Support: QtWebKit - // .get() because push.apply(_, arraylike) throws - push.apply( ret, elems.get() ); - } - - return this.pushStack( ret ); - }; -}); - - -var iframe, - elemdisplay = {}; - -/** - * Retrieve the actual display of a element - * @param {String} name nodeName of the element - * @param {Object} doc Document object - */ -// Called only from within defaultDisplay -function actualDisplay( name, doc ) { - var style, - elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ), - - // getDefaultComputedStyle might be reliably used only on attached element - display = window.getDefaultComputedStyle && ( style = window.getDefaultComputedStyle( elem[ 0 ] ) ) ? - - // Use of this method is a temporary fix (more like optimization) until something better comes along, - // since it was removed from specification and supported only in FF - style.display : jQuery.css( elem[ 0 ], "display" ); - - // We don't have any data stored on the element, - // so use "detach" method as fast way to get rid of the element - elem.detach(); - - return display; -} - -/** - * Try to determine the default display value of an element - * @param {String} nodeName - */ -function defaultDisplay( nodeName ) { - var doc = document, - display = elemdisplay[ nodeName ]; - - if ( !display ) { - display = actualDisplay( nodeName, doc ); - - // If the simple way fails, read from inside an iframe - if ( display === "none" || !display ) { - - // Use the already-created iframe if possible - iframe = (iframe || jQuery( "