Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
f226265
Set no prefix flag, kernel is a root level param
JoryHogeveen Aug 17, 2026
c906a94
Instal 2fa bundle with email and totp addons
JoryHogeveen Aug 19, 2026
ba004b5
Create TwoFactor entity to store types
JoryHogeveen Aug 19, 2026
12bcee6
Setup basic email 2FA config
JoryHogeveen Aug 19, 2026
4133e28
Do not specify table, generate automatically
JoryHogeveen Aug 19, 2026
8ec876f
Specify as ORM entity
JoryHogeveen Aug 19, 2026
cf08c1c
Create 2FA templates
JoryHogeveen Aug 19, 2026
942961f
Set 2FA template path
JoryHogeveen Aug 19, 2026
1fbecce
Set base 2FA firewall config
JoryHogeveen Aug 19, 2026
040cdf3
Set 2fa routes config
JoryHogeveen Aug 19, 2026
693a85d
Add 2fa methods and columns (currently only supports email and totp)
JoryHogeveen Aug 19, 2026
b0cd48c
Install QR generator (package suggested by 2FA bundle)
JoryHogeveen Aug 19, 2026
4c4574e
Add TOTP method to bundle config
JoryHogeveen Aug 19, 2026
04b7c7e
TwoFactor setup controller with templates. Enables the user to config…
JoryHogeveen Aug 19, 2026
89d3c76
Add note about GoogleAuthenticator defaults
JoryHogeveen Aug 19, 2026
6305df9
Add 2fa setup card in account
JoryHogeveen Aug 19, 2026
bc7e83d
Improve button UI
JoryHogeveen Aug 19, 2026
4878785
Improve 2fa setup UI and add 2fa icon
JoryHogeveen Aug 19, 2026
621eae0
Set preferred 2fa method to totp if available
JoryHogeveen Aug 19, 2026
0d19d6f
Logout path should be publicly accessible (otherwise you cannot cance…
JoryHogeveen Aug 19, 2026
9426e50
Just mention TOTP, no need for name dropping
JoryHogeveen Aug 19, 2026
412167e
Improve 2FA login template UI
JoryHogeveen Aug 19, 2026
8409e35
Commit 2fa installation lock file changes
JoryHogeveen Aug 19, 2026
caa2c47
Use slashed for 2fa routes
JoryHogeveen Aug 19, 2026
e7cc7c7
Create 2FA entity settings tests
JoryHogeveen Aug 19, 2026
39c94e4
Only set roles if provided
JoryHogeveen Aug 19, 2026
c1cfd7e
Add account 2FA tests for generating tokens and validating access
JoryHogeveen Aug 19, 2026
168f2c2
Set orphanRemoval for two factor methods
JoryHogeveen Aug 19, 2026
86d76e3
Reorder params and methods
JoryHogeveen Aug 19, 2026
05b21a2
Validate if a user already has a method of that type
JoryHogeveen Aug 19, 2026
51803a4
Add login flow tests with and without 2fa
JoryHogeveen Aug 19, 2026
3c0be46
Refactor tests to remove duplicate or redundant code.
JoryHogeveen Aug 19, 2026
4bcda22
Add Node.js setup and asset build for tests
JoryHogeveen Aug 19, 2026
2bcdb2a
Validate error param and allow custom classes
JoryHogeveen Aug 19, 2026
2e5a1d6
Remove logout (redundant) and validate if response is successful on l…
JoryHogeveen Aug 19, 2026
16b18e2
Run NPM before doctrine and use ci instead of install for reproducibl…
JoryHogeveen Aug 19, 2026
5cfee91
Fix GH cache dir output
JoryHogeveen Aug 19, 2026
f2a9b8a
Merge branch 'master' into feature/2fa
JoryHogeveen Aug 19, 2026
6279264
Create WebTestCase to set system env file (used for installed detection)
JoryHogeveen Aug 19, 2026
c98968e
Load env type based on kernel environment
JoryHogeveen Aug 19, 2026
554c5af
Create unset Email auth code method to allow unsetting codes
JoryHogeveen Aug 20, 2026
1dea715
Fix 2fa email setup route name
JoryHogeveen Aug 20, 2026
a99d55c
Missed a route in 1dea715843ab5b20a96e809ddadbcbfcdf4e1cf2
JoryHogeveen Aug 20, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion .github/workflows/tests-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Get Composer Cache Directory
id: composer-dev-cache
run: |
echo "name=dir::$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
- name: Cache composer (vendor)
uses: actions/cache@v3
with:
Expand Down Expand Up @@ -80,6 +80,19 @@ jobs:
# - name: Check the Symfony console
# run: bin/console -V

# Build frontend assets, required for the tests to run properly
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '22'
cache: 'npm'
- name: Build Webpack assets
run: |
npm ci # Use ci instead of install for reproducible builds
npm run build
env:
NODE_ENV: test

# Install database
- name: Doctrine Create migration
run: php bin/console --env=test doctrine:migrations:diff
Expand Down
4 changes: 4 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,13 @@
"doctrine/doctrine-bundle": "^2.13",
"doctrine/doctrine-migrations-bundle": "^3.6",
"doctrine/orm": "^3.6",
"endroid/qr-code": "^6.0",
"phpdocumentor/reflection-docblock": "^5.3",
"phpseclib/phpseclib": "^3.0",
"phpstan/phpdoc-parser": "^1.15",
"scheb/2fa-bundle": "^7.14",
"scheb/2fa-email": "^7.14",
"scheb/2fa-totp": "^7.14",
"symfony/asset": "7.4.*",
"symfony/console": "7.4.*",
"symfony/debug-bundle": "7.4.*",
Expand Down
Loading
Loading