Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable19] Keep direct login active when redirecting #25431

Merged
merged 1 commit into from
Feb 10, 2021

Conversation

backportbot-nextcloud[bot]
Copy link

backport of #25424

@juliushaertl
Copy link
Member

Hm, wondering why the tests that fail here are not failing on master/stable20:


There were 2 failures:

1) Tests\Core\Controller\LoginControllerTest::testLoginWithInvalidCredentials
Expectation failed for method name is "linkToRoute" when invoked 1 time(s)
Parameter 1 for invocation OCP\IURLGenerator::linkToRoute('core.login.showLoginForm', Array (...)): string does not match expected value.
Failed asserting that two arrays are equal.
--- Expected
+++ Actual
@@ @@
 Array (
     'user' => 'MyUserName'
     'redirect_url' => '/apps/files'
+    'direct' => 1
 )

/drone/src/core/Controller/LoginController.php:345
/drone/src/core/Controller/LoginController.php:316
/drone/src/tests/Core/Controller/LoginControllerTest.php:448

2) Tests\Core\Controller\LoginControllerTest::testToNotLeakLoginName
Expectation failed for method name is "linkToRoute" when invoked 1 time(s)
Parameter 1 for invocation OCP\IURLGenerator::linkToRoute('core.login.showLoginForm', Array (...)): string does not match expected value.
Failed asserting that two arrays are equal.
--- Expected
+++ Actual
@@ @@
 Array (
     'user' => 'john@doe.com'
     'redirect_url' => '/apps/files'
+    'direct' => 1
 )

/drone/src/core/Controller/LoginController.php:345
/drone/src/core/Controller/LoginController.php:316
/drone/src/tests/Core/Controller/LoginControllerTest.php:608

@rullzer
Copy link
Member

rullzer commented Feb 2, 2021

Hm, wondering why the tests that fail here are not failing on master/stable20:


There were 2 failures:

1) Tests\Core\Controller\LoginControllerTest::testLoginWithInvalidCredentials
Expectation failed for method name is "linkToRoute" when invoked 1 time(s)
Parameter 1 for invocation OCP\IURLGenerator::linkToRoute('core.login.showLoginForm', Array (...)): string does not match expected value.
Failed asserting that two arrays are equal.
--- Expected
+++ Actual
@@ @@
 Array (
     'user' => 'MyUserName'
     'redirect_url' => '/apps/files'
+    'direct' => 1
 )

/drone/src/core/Controller/LoginController.php:345
/drone/src/core/Controller/LoginController.php:316
/drone/src/tests/Core/Controller/LoginControllerTest.php:448

2) Tests\Core\Controller\LoginControllerTest::testToNotLeakLoginName
Expectation failed for method name is "linkToRoute" when invoked 1 time(s)
Parameter 1 for invocation OCP\IURLGenerator::linkToRoute('core.login.showLoginForm', Array (...)): string does not match expected value.
Failed asserting that two arrays are equal.
--- Expected
+++ Actual
@@ @@
 Array (
     'user' => 'john@doe.com'
     'redirect_url' => '/apps/files'
+    'direct' => 1
 )

/drone/src/core/Controller/LoginController.php:345
/drone/src/core/Controller/LoginController.php:316
/drone/src/tests/Core/Controller/LoginControllerTest.php:608

there was some rewriting

@rullzer rullzer added the 2. developing Work in progress label Feb 2, 2021
@rullzer rullzer mentioned this pull request Feb 5, 2021
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@rullzer rullzer merged commit a05e0c4 into stable19 Feb 10, 2021
@rullzer rullzer deleted the backport/25424/stable19 branch February 10, 2021 14:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2. developing Work in progress bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants