Merge branch 'master' of https://git.mcnd.ca/mcndave/lean

skeleton/meta/definitions/auth.php

@@ -4,6 +4,8 @@ use function DI\autowire, DI\create, DI\get;
 
 use %NAMESPACE%\Entity;
 
+use Psr\Http\Message\ServerRequestInterface;
+
 use Ulmus\Entity\Field\Datetime,
     Ulmus\User\Lib\Authenticate;
 
@@ -17,7 +19,7 @@ use Picea\Picea;
 
 use TheBugs\Email\{ EmailConfiguration, MailerInterface, SwiftMailer };
 
-use Taxus\Taxus;
+use Taxus\{ Taxus, PermissionGrantInterface };
 
 return [
     Entity\User::class => autowire(Entity\User::class),
@@ -25,7 +27,7 @@ return [
     Authenticate::class => create(Authenticate::class)->constructor(get(Session::class), get(Cookie::class), get('authentication.method')),
 
     SecurityHandler::class => create(SecurityHandler::class)->constructor(function() {
-        return new RedirectResponse(getenv("URL_BASE")."/connexion");
+        return new RedirectResponse(getenv("URL_BASE")."/login");
     }, get('authentication.unauthorize'), get(Taxus::class)),
 
     'authentication.error' => function($c, Picea $picea) {

skeleton/public/.htaccess

@@ -1,6 +1,10 @@
 <IfModule mod_rewrite.c>
     RewriteEngine On
 
+    # Force HTTPS (disabled by default)
+    # RewriteCond %{HTTPS} off
+    # RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
+
     # Remove trailing slashes from request URL
     RewriteCond %{REQUEST_FILENAME} !-d
     RewriteCond %{REQUEST_URI} (.+)/$

skeleton/public/index.php

@@ -1,3 +1,8 @@
 <?php
 
-require_once("../src/Kernel.php");
+try {
+    require_once("../src/Kernel.php");
+}
+catch(\Throwable $t) {
+    echo $t->getMessage();
+}