Merge branch 'release/1.1.0'

Author: adrenth

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "composer"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/php.yml

@@ -0,0 +1,51 @@
+name: PHP Composer
+
+on:
+  push:
+    branches: [ develop ]
+  pull_request:
+    branches: [ develop ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [ 8.0, 7.4, 7.3, 7.2, 7.1 ]
+        stability: [ prefer-lowest, prefer-stable ]
+
+    name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php }}
+        coverage: none
+
+    - name: Validate composer.json and composer.lock
+      run: composer validate
+
+    - name: Cache Composer packages
+      id: composer-cache
+      uses: actions/cache@v2
+      with:
+        path: vendor
+        key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-php-
+
+    - name: Install dependencies
+      if: steps.composer-cache.outputs.cache-hit != 'true'
+      run: composer install --prefer-dist --no-progress --no-suggest
+
+    # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
+    # Docs: https://getcomposer.org/doc/articles/scripts.md
+
+    # - name: Run test suite
+    #   run: composer run-script test

LICENSE

@@ -29,6 +29,12 @@ php artisan vendor:publish --provider="Vdlp\BasicAuthentication\ServiceProviders
 This will create a `config/basicauthentication.php` file in your app where you can modify the configuration if you don't
 want to use .env variables.
 
+## Enable / disable plugin
+
+By default basic authentication is disabled. 
+
+To enable basic authentication, you have to set the env variable to `BASIC_AUTHENTICATION_ENABLED` to `true` in your `.env` file or edit the published config file.
+
 ## Questions? Need help?
 
 If you have any question about how to use this plugin, please don't hesitate to contact us at octobercms@vdlp.nl. We're happy to help you. You can also visit the support forum and drop your questions/issues there.

README.md

@@ -10,6 +10,7 @@
         }
     ],
     "require": {
-        "php": ">=7.1"
+        "php": "^7.1||^8.0",
+        "composer/installers": "^1.0"
     }
 }

composer.json

@@ -8,6 +8,7 @@
 use Backend\Behaviors\ListController;
 use Backend\Classes\NavigationManager;
 use Backend\Classes\Controller;
+use Illuminate\Contracts\Config\Repository;
 use System\Classes\SettingsManager;
 
 /**
@@ -36,14 +37,19 @@ class Credentials extends Controller
     /** {@inheritdoc} */
     public $requiredPermissions = ['vdlp.basicauthentication.access_settings'];
 
+    /** @var bool */
+    public $enabled;
+
     /**
      * {@inheritdoc}
      */
-    public function __construct()
+    public function __construct(Repository $config)
     {
         parent::__construct();
 
         NavigationManager::instance()->setContext('October.System', 'system', 'settings');
         SettingsManager::setContext('Vdlp.BasicAuthentication', 'credentials');
+
+        $this->enabled = $config->get('basicauthentication.enabled');
     }
 }

controllers/Credentials.php

@@ -8,6 +8,7 @@
 use Backend\Behaviors\ListController;
 use Backend\Classes\NavigationManager;
 use Backend\Classes\Controller;
+use Illuminate\Contracts\Config\Repository;
 use System\Classes\SettingsManager;
 
 /**
@@ -36,14 +37,19 @@ class ExcludedUrls extends Controller
     /** {@inheritdoc} */
     public $requiredPermissions = ['vdlp.basicauthentication.access_settings'];
 
+    /** @var bool */
+    public $enabled;
+
     /**
      * {@inheritdoc}
      */
-    public function __construct()
+    public function __construct(Repository $config)
     {
         parent::__construct();
 
         NavigationManager::instance()->setContext('October.System', 'system', 'settings');
         SettingsManager::setContext('Vdlp.BasicAuthentication', 'excludedurls');
+
+        $this->enabled = $config->get('basicauthentication.enabled');
     }
 }

controllers/ExcludedUrls.php

@@ -1 +1,12 @@
+<?php if(!$this->enabled): ?>
+    <div class="container-fluid">
+        <div class="callout fade in callout-warning no-subheader">
+            <div class="header">
+                <i class="icon-warning"></i>
+                <h3><?= e(trans('vdlp.basicauthentication::lang.notifications.disabled')) ?></h3>
+            </div>
+        </div>
+    </div>
+<?php endif; ?>
+
 <?= $this->listRender() ?>

controllers/credentials/index.htm

@@ -1 +1,12 @@
+<?php if(!$this->enabled): ?>
+    <div class="container-fluid">
+        <div class="callout fade in callout-warning no-subheader">
+            <div class="header">
+                <i class="icon-warning"></i>
+                <h3><?= e(trans('vdlp.basicauthentication::lang.notifications.disabled')) ?></h3>
+            </div>
+        </div>
+    </div>
+<?php endif; ?>
+
 <?= $this->listRender() ?>

controllers/excludedurls/index.htm

@@ -58,4 +58,7 @@
             'create_button' => 'New excluded URL',
         ],
     ],
+    'notifications' => [
+        'disabled' => 'Basic Authentication is disabled, you can enable it in the configuration file. Read the README for more information.',
+    ],
 ];