Merge branch 'release/3.2.0'

Author: adrenth

.github/workflows/php.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [ 8.0, 7.4 ]
+        php: [ 8.0 ]
         stability: [ prefer-lowest, prefer-stable ]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }}

.gitignore

@@ -1,2 +1,4 @@
-composer.lock
-.idea/
+/.idea
+/composer.lock
+/vendor
+/modules

CHANGELOG.md

@@ -4,12 +4,27 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.2.0] - 2022-09-23
+
+### Added
+
+- Basic Authentication added to October CMS backend routes.
+
+### Removed
+
+- Removed support for October CMS 1.0
+- Removed support for PHP 7.4
+
 ## [3.1.0] - 2022-04-12
 
+### Added
+
 - Add October CMS 3.x to supported versions.
 
 ## [3.0.2] - 2022-03-22
 
+### Changed
+
 - Rename migration class (duplicate class name).
 
 ## [3.0.1] - 2022-03-15

Plugin.php

@@ -5,8 +5,8 @@
 namespace Vdlp\BasicAuthentication;
 
 use Backend\Helpers\Backend as BackendHelper;
+use Illuminate\Routing\Router;
 use October\Rain\Foundation\Application;
-use October\Rain\Foundation\Http\Kernel;
 use System\Classes\PluginBase;
 use Vdlp\BasicAuthentication\Console\CreateCredentialsCommand;
 use Vdlp\BasicAuthentication\Http\Middleware\BasicAuthenticationMiddleware;
@@ -40,14 +40,13 @@ public function boot(): void
             (bool) config('basicauthentication.enabled', false) === false
             || $application->runningInConsole()
             || $application->runningUnitTests()
-            || $application->runningInBackend()
         ) {
             return;
         }
 
-        /** @var Kernel $kernel */
-        $kernel = $application['Illuminate\Contracts\Http\Kernel'];
-        $kernel->prependMiddleware(BasicAuthenticationMiddleware::class);
+        /** @var Router $router */
+        $router = $application->make(Router::class);
+        $router->pushMiddlewareToGroup('web', BasicAuthenticationMiddleware::class);
     }
 
     public function registerPermissions(): array

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "vdlp/oc-basicauthentication-plugin",
     "description": "Protect your website with Basic Authentication.",
-    "license": "GPL-2.0",
+    "license": "GPL-2.0-only",
     "type": "october-plugin",
     "authors": [
         {
@@ -13,15 +13,26 @@
         "email": "[email protected]"
     },
     "require": {
-        "php": "^7.4 || ^8.0",
-        "october/system": "^1.0 || ^2.0 || ^3.0",
-        "composer/installers": "^1.0 || ^2.0"
+        "php": "^8.0.2",
+        "composer/installers": "^1.0 || ^2.0",
+        "october/system": ">=2.0"
     },
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://gateway.octobercms.com"
+        }
+    ],
     "archive": {
         "exclude": [
             ".gitattributes",
             ".gitignore",
             ".github"
         ]
+    },
+    "config": {
+        "allow-plugins": {
+            "composer/installers": true
+        }
     }
 }

updates/version.yaml

@@ -14,3 +14,4 @@ v3.0.1:
 v3.0.2:
     - "Rename migration class (duplicate class name)."
 v3.1.0: "Add October CMS 3.x to supported versions."
+v3.2.0: "Basic Authentication added to October CMS backend routes."