Fix flow

[mario]

Fixing issues found in #6879 + solved conflicts.

Signed-off-by: Mario Danic [email protected]

[blizzz]

@LukasReschke

[LukasReschke]

Tests seem to be failing.

[codecov]

Codecov Report

Merging #7115 into master will decrease coverage by 16.05%.
The diff coverage is 0%.

@@              Coverage Diff              @@
##             master    #7115       +/-   ##
=============================================
- Coverage     50.74%   34.68%   -16.06%     
- Complexity    24417    24419        +2     
=============================================
  Files          1580     1580               
  Lines         93342    93348        +6     
  Branches       1359     1359               
=============================================
- Hits          47366    32378    -14988     
- Misses        45976    60970    +14994

Impacted Files	Coverage Δ	Complexity Δ
core/Controller/ClientFlowLoginController.php	0% <0%> (-78.88%)	22 <0> (+2)
apps/dav/lib/CalDAV/Activity/Setting/Calendar.php	0% <0%> (-100%)	8% <0%> (ø)
lib/private/Hooks/ForwardingEmitter.php	0% <0%> (-100%)	5% <0%> (ø)
lib/public/AppFramework/Http/JSONResponse.php	0% <0%> (-100%)	5% <0%> (ø)
lib/public/AppFramework/Middleware.php	0% <0%> (-100%)	4% <0%> (ø)
core/Command/TwoFactorAuth/Disable.php	0% <0%> (-100%)	4% <0%> (ø)
...pFramework/Db/MultipleObjectsReturnedException.php	0% <0%> (-100%)	1% <0%> (ø)
...eLimiting/Exception/RateLimitExceededException.php	0% <0%> (-100%)	1% <0%> (ø)
apps/dav/lib/CalDAV/Activity/Setting/Event.php	0% <0%> (-100%)	8% <0%> (ø)
...ty/Exceptions/CrossSiteRequestForgeryException.php	0% <0%> (-100%)	1% <0%> (ø)
... and 501 more

[LukasReschke]

🐘

[MorrisJobke]

Tested and works 👍