diff --git a/.github/workflows/store.yml b/.github/workflows/store.yml deleted file mode 100644 index 5fe4450..0000000 --- a/.github/workflows/store.yml +++ /dev/null @@ -1,94 +0,0 @@ ---- - -name: Build extension -on: - workflow_dispatch: - push: - branches: - - main - -env: - EXTENSION_NAME: JeboehmAccessProtection - SHOPWARE_CLI_ACCOUNT_EMAIL: ${{ secrets.ACCOUNT_USER }} - SHOPWARE_CLI_ACCOUNT_PASSWORD: ${{ secrets.ACCOUNT_PASSWORD }} - -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - # fetch all git entries for changelog generation - fetch-depth: 0 - - - name: Install shopware-cli - uses: FriendsOfShopware/shopware-cli-action@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Build & create zip - env: - NODE_OPTIONS: --openssl-legacy-provider - run: | - shopware-cli extension zip --git-commit ${{ github.sha }} . --release - mv *-${{ github.sha }}.zip ${{ env.EXTENSION_NAME }}.zip - - - name: Upload Artifact - uses: actions/upload-artifact@v3 - with: - name: ${{ env.EXTENSION_NAME }} - path: ${{ env.EXTENSION_NAME }}.zip - - - name: Get version - run: | - echo "EXTENSION_VERSION=$(jq ".version" composer.json -r)" >> $GITHUB_ENV - - - uses: mukunku/tag-exists-action@v1.4.0 - id: checkTag - with: - tag: ${{ env.EXTENSION_VERSION }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Update store page - if: steps.checkTag.outputs.exists != 'true' || contains(github.event.head_commit.message, '[store update]') - run: shopware-cli account producer extension info push $(pwd)/ - - - name: Update zip file to store - if: steps.checkTag.outputs.exists != 'true' - run: shopware-cli account producer extension upload $(pwd)/${EXTENSION_NAME}.zip - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Extract Changelog - if: steps.checkTag.outputs.exists != 'true' - run: shopware-cli extension get-changelog $(pwd)/${EXTENSION_NAME}.zip > /tmp/changelog.txt - - - name: Unzip - run: | - unzip -o -q "${EXTENSION_NAME}.zip" -d ./toDeploy - mv "${EXTENSION_NAME}.zip" /tmp/ - find ./ -maxdepth 1 ! -name "toDeploy" ! -name ".git" ! -name "." ! -name ".." -exec rm -rf {} \; - mv ./toDeploy/${EXTENSION_NAME}/* ./ - rm -rf ./toDeploy - rm -rf ./vendor - - - name: Commit - if: steps.checkTag.outputs.exists != 'true' - run: | - git config user.name "GitHub Actions Bot" - git config user.email "<>" - git add -f . - git commit -m "chore: Build release" - git tag ${EXTENSION_VERSION} - git push origin ${EXTENSION_VERSION} - - - name: Create a GitHub release - if: steps.checkTag.outputs.exists != 'true' - uses: ncipollo/release-action@v1 - with: - artifacts: /tmp/${{ env.EXTENSION_NAME }}.zip - tag: ${{ env.EXTENSION_VERSION }} - name: ${{ env.EXTENSION_VERSION }} - bodyFile: /tmp/changelog.txt diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 2659611..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -composer.lock diff --git a/.shopware-extension.yml b/.shopware-extension.yml deleted file mode 100644 index 57d9bed..0000000 --- a/.shopware-extension.yml +++ /dev/null @@ -1,105 +0,0 @@ -build: - zip: - composer: - enabled: false - assets: - enabled: false - pack: - excludes: - paths: - - var - - .gitignore - - src/Resources/store - - .github - - .shopware-extension.yml - -store: - availabilities: - - German - - International - default_locale: en_GB - localizations: - - de_DE - - en_GB - categories: - - Administration - type: extension - icon: src/Resources/config/plugin.png - automatic_bugfix_version_compatibility: true - description: - de: file:src/Resources/store/de.md - en: file:src/Resources/store/en.md - installation_manual: - de: file:src/Resources/store/de_manual.md - en: file:src/Resources/store/en_manual.md - tags: - de: - - Tools - - Testsystem - - Passwortschutz - en: - - tools - - password protection - - test system - videos: - de: [ ] - en: [ ] - highlights: - de: - - Storefront mit Passwort schützen - - IP-Adressen freigeben - - keine separate Benutzerpflege notwendig - en: - - Protect storefront with password - - Allow IP addresses - - No separate user management necessary - features: - de: - - Passwortschutz für Storefront - - Freigabe von IP-Adressen - - Freigabe von bestimmten Benutzerrollen - - keine separate Benutzerpflege notwendig - en: - - Password protection for storefront - - Allow IP addresses - - Allow specific user roles - - no separate user management necessary - faq: - de: [ ] - en: [ ] - images: - - file: src/Resources/store/screenshot_settings_en.png - activate: - de: false - en: true - preview: - de: false - en: true - priority: 10 - - file: src/Resources/store/screenshot_settings_de.png - activate: - de: true - en: false - preview: - de: true - en: false - priority: 10 - - file: src/Resources/store/screenshot_login_en.png - activate: - de: false - en: true - preview: - de: false - en: false - priority: 0 - - file: src/Resources/store/screenshot_login_de.png - activate: - de: true - en: false - preview: - de: false - en: false - priority: 0 - -changelog: - enabled: true diff --git a/CHANGELOG_en-GB.md b/CHANGELOG_en-GB.md new file mode 100644 index 0000000..40a5f17 --- /dev/null +++ b/CHANGELOG_en-GB.md @@ -0,0 +1,6 @@ +# 1.1.0 +- [feat: add support for subnet masks and IPv6 prefixes](/4d0adeb) +- [fix: [bc] change user repository not to return user, only check credentials](/4feb7aa) +- [chore: improve documentation [store update]](/1510b72) +- [fix: set default for array config values](/4d7f452) +- [chore: add new screenshots to fulfill store requirements (#2)](/ac37682) \ No newline at end of file diff --git a/src/Resources/store/de.md b/src/Resources/store/de.md deleted file mode 100644 index 69dc9b0..0000000 --- a/src/Resources/store/de.md +++ /dev/null @@ -1,18 +0,0 @@ -Dieses Plugin ermöglicht es, die Shopware Storefront mit einem Passwortschutz zu versehen. -Dies ist besonders nützlich für Test- oder Stagingsysteme, die (noch) nicht für die Öffentlichkeit -zugänglich sein sollen. - -## Benutzer und IP-Adressen freischalten - -Es werden die Benutzer aus der Shopware Administration verwendet. Es ist möglich, den Nutzerkreis -auf bestimmte Rollen zu beschränken. Des Weiteren können IP-Adressen (v4 / v6) freigeschaltet werden, die -immer zugreifen können sollen. Hierbei werden auch Subnetzmasken bzw. IPv6-Prefixe unterstützt. - -## Konfiguration - -Die Konfiguration erfolgt in den Plugin-Einstellungen. - -## Open Source - -Dieses Plugin kann ebenfalls von https://github.com/jeboehm/platform-access-protection bezogen -werden. diff --git a/src/Resources/store/de_manual.md b/src/Resources/store/de_manual.md deleted file mode 100644 index 46b1ced..0000000 --- a/src/Resources/store/de_manual.md +++ /dev/null @@ -1,18 +0,0 @@ -Das Plugin kann über den Shopware App Manager installiert werden. -Dort wird es ebenfalls konfiguriert. Alle möglichen Optionen werden an den Feldern ausführlich -erklärt. - -## IP-Whitelisting - -Es können IP-Adressen konfiguriert werden, die immer Zugriff auf die Storefront haben, -ohne sich authentifizieren zu müssen. -Unterstützt werden IPv4 und IPv6. Es können auch Subnetzmasken oder IPv6-Prefixe angegeben werden. - -**Besonderheit bei der Verwendung eines Proxy-Servers oder eines Loadbalancers** -Damit das IP-Whitelisting bei Verwendung eines zusätzlichen Reverse-Proxy-Servers korrekt -funktioniert, ist es erforderlich, die IP-Adresse des Proxys in der .env-Konfigurationsdatei -(im Shopware-Hauptverzeichnis) als Trusted Proxy zu hinterlegen. Dies ist über den Eintrag -_TRUSTED_PROXIES=IP_des_Proxys_ möglich. - -Alternativ kann dies auch über die PHP-Einstellungen geschehen. Weitere Informationen, wie -Du dies PHP-seitig umsetzen kannst, findest Du unter https://symfony.com/doc/current/deployment/proxies.html#solution-settrustedproxies diff --git a/src/Resources/store/en.md b/src/Resources/store/en.md deleted file mode 100644 index dbbb3bc..0000000 --- a/src/Resources/store/en.md +++ /dev/null @@ -1,17 +0,0 @@ -This plugin allows you to add password protection to the Shopware storefront. -This is especially useful for test or staging systems that should not (yet) be accessible -to the public. - -## Allow users and IP addresses - -The users from the Shopware administration are used. It is possible to restrict the users -to certain roles. Furthermore, IP addresses (v4 / v6) can be configured which are always be able to access. -Subnet masks or IPv6 prefixes are also supported. - -## Configuration - -The configuration is done in the plugin settings. - -## Open Source - -This plugin can also be obtained from https://github.com/jeboehm/platform-access-protection. diff --git a/src/Resources/store/en_manual.md b/src/Resources/store/en_manual.md deleted file mode 100644 index 532ca78..0000000 --- a/src/Resources/store/en_manual.md +++ /dev/null @@ -1,18 +0,0 @@ -Simply install via the Shopware app manager in the shop administration. -Configure the plugin using the plugin settings. All the possible options are explained -there in detail. - -## IP Whitelisting - -You can configure IP addresses that are always allowed to access the storefront, -without the need to authenticate. -IPv4 and IPv6 are supported. Subnet masks or IPv6 prefixes can also be specified. - -***Be mindful when using a proxy server or load balancer*** -In order for the IP whitelisting to work correctly when using an additional reverse proxy server, -it is necessary to store the IP address of the proxy in the .env configuration file -(in the Shopware main directory) as a trusted proxy. This is possible via the entry -_TRUSTED_PROXIES=IP_of_the_proxy_. - -Alternatively this is also possible using the PHP settings. More information on how -to do this in PHP can be found at https://symfony.com/doc/current/deployment/proxies.html#solution-settrustedproxies diff --git a/src/Resources/store/screenshot_login_de.png b/src/Resources/store/screenshot_login_de.png deleted file mode 100644 index 614f71b..0000000 Binary files a/src/Resources/store/screenshot_login_de.png and /dev/null differ diff --git a/src/Resources/store/screenshot_login_en.png b/src/Resources/store/screenshot_login_en.png deleted file mode 100644 index 9b874ad..0000000 Binary files a/src/Resources/store/screenshot_login_en.png and /dev/null differ diff --git a/src/Resources/store/screenshot_settings_de.png b/src/Resources/store/screenshot_settings_de.png deleted file mode 100644 index 2771ca8..0000000 Binary files a/src/Resources/store/screenshot_settings_de.png and /dev/null differ diff --git a/src/Resources/store/screenshot_settings_en.png b/src/Resources/store/screenshot_settings_en.png deleted file mode 100644 index e18a3e5..0000000 Binary files a/src/Resources/store/screenshot_settings_en.png and /dev/null differ