feat: Add TOTP double authentication

Author: thomasage

.github/workflows/ci.yaml

@@ -26,7 +26,7 @@ jobs:
                 uses: shivammathur/setup-php@v2
                 with:
                     coverage: pcov
-                    extensions: apcu, intl, opcache, pdo, pdo_mysql, pcov, redis, zip
+                    extensions: apcu, gd, intl, opcache, pdo, pdo_mysql, pcov, redis, zip
                     php-version: 8.3
             -   name: Cache Composer dependencies
                 uses: actions/cache@v3

.gitlab-ci.yml

@@ -4,7 +4,7 @@ stages:
 
 install_dependencies:
     stage: setup
-    image: thomasagedev/template-symfony:1.0.0
+    image: thomasagedev/template-symfony:1.0.1
     script:
         - composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
     artifacts:
@@ -14,15 +14,15 @@ install_dependencies:
 
 php_cs_fixer:
     stage: test
-    image: thomasagedev/template-symfony:1.0.0
+    image: thomasagedev/template-symfony:1.0.1
     script:
         - vendor/bin/php-cs-fixer fix --allow-risky=yes --dry-run --show-progress=none
     dependencies:
         - install_dependencies
 
 phpstan:
     stage: test
-    image: thomasagedev/template-symfony:1.0.0
+    image: thomasagedev/template-symfony:1.0.1
     script:
         - bin/console cache:clear --env=dev
         - vendor/bin/phpstan --memory-limit=1G --no-progress
@@ -31,7 +31,7 @@ phpstan:
 
 phpunit:
     stage: test
-    image: thomasagedev/template-symfony:1.0.0
+    image: thomasagedev/template-symfony:1.0.1
     services:
         -   name: mysql:8.4.3
             alias: mysql
@@ -50,15 +50,15 @@ phpunit:
 
 rector:
     stage: test
-    image: thomasagedev/template-symfony:1.0.0
+    image: thomasagedev/template-symfony:1.0.1
     script:
         - vendor/bin/rector --dry-run --no-progress-bar
     dependencies:
         - install_dependencies
 
 twig_cs_fixer:
     stage: test
-    image: thomasagedev/template-symfony:1.0.0
+    image: thomasagedev/template-symfony:1.0.1
     script:
         - vendor/bin/twig-cs-fixer lint templates
     dependencies:

.php-cs-fixer.dist.php

@@ -16,5 +16,8 @@
         '@Symfony' => true,
         '@Symfony:risky' => true,
         '@PER-CS2.0' => true,
+        'global_namespace_import' => [
+            'import_classes' => true,
+        ],
         'ordered_interfaces' => true,
     ]);

ROADMAP.md

@@ -1,7 +1,7 @@
 * Configure AWS
 * Switch config from YAML => PHP
 * Configure Vault
-* Add TOTP authentication
 * Add mutation testing
 * Add reset password
 * Upgrade to PHP 8.4
+* Restore 2FA by email (allow TOTP and email)

bitbucket-pipelines.yml

@@ -1,4 +1,4 @@
-image: thomasagedev/template-symfony:1.0.0
+image: thomasagedev/template-symfony:1.0.1
 
 definitions:
     services:

compose.yaml

@@ -2,54 +2,59 @@ name: acme
 
 services:
 
-  http:
-    image: caddy:latest
-    ports:
-      - "80:80"
-      - "443:443"
-    volumes:
-      - ./docker/caddy/Caddyfile:/etc/caddy/Caddyfile:ro
-      - ./docker/ssl:/etc/ssl:ro
-      - ./public:/srv:ro
-      - caddy_config:/config
-      - caddy_data:/data
-    depends_on:
-      - php
-
-  php:
-    build: docker/php
-    volumes:
-      - ./:/srv
-    depends_on:
-      - database
-
-  database:
-    image: mysql:8.4.3
-    ports:
-      - "3306:3306"
-    volumes:
-      - mysql_data:/var/lib/mysql
-      - ./docker/mysql/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
-    environment:
-      MYSQL_ROOT_PASSWORD: root
-      MYSQL_DATABASE: acme
-      MYSQL_USER: acme
-      MYSQL_PASSWORD: acme
-
-  redis:
-    image: redis
-
-  worker:
-    build: docker/php
-    volumes:
-      - ./:/srv
-    depends_on:
-      - database
-      - redis
-    command: php /srv/bin/console messenger:consume -vv
+    http:
+        image: caddy:latest
+        ports:
+            - "80:80"
+            - "443:443"
+        volumes:
+            - ./docker/caddy/Caddyfile:/etc/caddy/Caddyfile:ro
+            - ./docker/ssl:/etc/ssl:ro
+            - ./public:/srv:ro
+            - caddy_config:/config
+            - caddy_data:/data
+        depends_on:
+            - php
+
+    php:
+        build: docker/php
+        volumes:
+            - ./:/srv
+        environment:
+            TZ: America/Toronto
+        depends_on:
+            - database
+
+    database:
+        image: mysql:8.4.3
+        ports:
+            - "3306:3306"
+        volumes:
+            - mysql_data:/var/lib/mysql
+            - ./docker/mysql/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
+        environment:
+            MYSQL_ROOT_PASSWORD: root
+            MYSQL_DATABASE: acme
+            MYSQL_USER: acme
+            MYSQL_PASSWORD: acme
+            TZ: America/Toronto
+
+    redis:
+        image: redis
+
+    worker:
+        build: docker/php
+        volumes:
+            - ./:/srv
+        environment:
+            TZ: America/Toronto
+        depends_on:
+            - database
+            - redis
+        command: php /srv/bin/console messenger:consume -vv
 
 volumes:
 
-  caddy_config:
-  caddy_data:
-  mysql_data:
+    caddy_config:
+    caddy_data:
+    mysql_data:

composer.json

@@ -7,16 +7,19 @@
     "require": {
         "php": ">=8.3",
         "ext-ctype": "*",
+        "ext-gd": "*",
         "ext-iconv": "*",
         "babdev/pagerfanta-bundle": "^4.5",
         "doctrine/dbal": "^4.2.2",
         "doctrine/doctrine-bundle": "^2.13.2",
         "doctrine/doctrine-migrations-bundle": "^3.4.1",
         "doctrine/orm": "^3.3.2",
+        "endroid/qr-code": "^6.0",
         "pagerfanta/doctrine-orm-adapter": "^4.7.1",
         "pagerfanta/twig": "^4.7.1",
         "scheb/2fa-bundle": "^7.6",
         "scheb/2fa-email": "^7.6",
+        "scheb/2fa-totp": "^7.6",
         "symfony/asset": "7.2.*",
         "symfony/asset-mapper": "7.2.*",
         "symfony/console": "7.2.*",