Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2017-04-26 01:11:55 +0300
committerJan-Christoph Borchardt <hey@jancborchardt.net>2017-04-26 01:50:38 +0300
commit241e397326545ee3ecad1a6a50dbe7839faa5c21 (patch)
tree6d33b4e4cc22bb1bf4753d83f44e1bb8422082e3 /core/routes.php
parent0f0b04b7d9b4fa8c3c74218c222194f0f2f9e8b7 (diff)
parent255c7df3bdbaccf00ba8e9fb00e750ffb9a50356 (diff)
Merge branch 'master' into contactsmenu
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
Diffstat (limited to 'core/routes.php')
-rw-r--r--core/routes.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/routes.php b/core/routes.php
index 02556c3a50d..37db2642c1b 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -49,6 +49,9 @@ $application->registerRoutes($this, [
['name' => 'login#confirmPassword', 'url' => '/login/confirm', 'verb' => 'POST'],
['name' => 'login#showLoginForm', 'url' => '/login', 'verb' => 'GET'],
['name' => 'login#logout', 'url' => '/logout', 'verb' => 'GET'],
+ ['name' => 'ClientFlowLogin#showAuthPickerPage', 'url' => '/login/flow', 'verb' => 'GET'],
+ ['name' => 'ClientFlowLogin#redirectPage', 'url' => '/login/flow/redirect', 'verb' => 'GET'],
+ ['name' => 'ClientFlowLogin#generateAppPassword', 'url' => '/login/flow', 'verb' => 'POST'],
['name' => 'TwoFactorChallenge#selectChallenge', 'url' => '/login/selectchallenge', 'verb' => 'GET'],
['name' => 'TwoFactorChallenge#showChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'GET'],
['name' => 'TwoFactorChallenge#solveChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'POST'],