Change routes. Update templates

diff --git a/core/js/lostpassword.js b/core/js/lostpassword.js
index cfce4564f832dc9b23bc265e902d9a050bbb54da..19e2cf5a4b6792ef49d77084556ab9adbca3bb5a 100644 (file)
--- a/core/js/lostpassword.js
+++ b/core/js/lostpassword.js
@@ -30,7 +30,7 @@ OC.Lostpassword = {
                        $('#submit').trigger('click');
                } else {
                        $.post(
-                                       OC.filePath('core', 'ajax', 'password/lost'),
+                                       OC.generateUrl('/lostpassword/email'),
                                        {
                                                user : $('#user').val(),
                                                proceed: $('#encrypted-continue').attr('checked') ? 'Yes' : 'No'

diff --git a/core/lostpassword/application.php b/core/lostpassword/application.php
index 1d22af5f610423d5adf4dc3f221e49d99a96d3f7..f39f8aee75ee4db59464b6bf6acada225f0ef242 100644 (file)
--- a/core/lostpassword/application.php
+++ b/core/lostpassword/application.php
@@ -25,9 +25,9 @@ class Application extends App {
                $container->registerService('LostController', function($c) {
                        return new LostController(
                                $c->query('AppName'),
-                               $c->query('ServerContainer')->getRequest(),
+                               $c->query('Request'),
                                $c->query('ServerContainer')->getURLGenerator(),
-                               $c->query('ServerContainer')->getUserManager(),
+                               '\OC_User',
                                new \OC_Defaults(),
                                $c->query('ServerContainer')->getL10N('core'),
                                \OCP\Util::getDefaultEmailAddress('lostpassword-noreply'),

diff --git a/core/lostpassword/controller/lostcontroller.php b/core/lostpassword/controller/lostcontroller.php
index 0f188b8e85e54e7129bb428e9aa55f588595c0b8..40a86e9813c8b74186287251424876137d14ae95 100644 (file)
--- a/core/lostpassword/controller/lostcontroller.php
+++ b/core/lostpassword/controller/lostcontroller.php
@@ -15,17 +15,17 @@ use \OCP\AppFramework\Http\TemplateResponse;
 class LostController extends Controller {
        
        protected $urlGenerator;
-       protected $userManager;
+       protected $userClass;
        protected $defaults;
        protected $l10n;
        protected $from;
        protected $isDataEncrypted;
        
-       public function __construct($appName, IRequest $request, IURLGenerator $urlGenerator, $userManager,
+       public function __construct($appName, IRequest $request, IURLGenerator $urlGenerator, $userClass,
                        $defaults, $l10n, $from, $isDataEncrypted) {
                parent::__construct($appName, $request);
                $this->urlGenerator = $urlGenerator;
-               $this->userManager = $userManager;
+               $this->userClass = $userClass;
                $this->defaults = $defaults;
                $this->l10n = $l10n;
                $this->from = $from;
@@ -39,14 +39,15 @@ class LostController extends Controller {
         * @param string $token
         * @param string $uid
         */
-       public function reset($token, $uid) {
+       public function resetform($token, $uid) {
                // Someone wants to reset their password:
                if($this->checkToken($uid, $token)) {
                        return new TemplateResponse(
                                'core/lostpassword', 
                                'resetpassword', 
                                array(
-                                       'link' => $link
+                                       'link' => $this->getLink('core.lost.setPassword', $uid, $token),
+                                       'isEncrypted' => $this->isDataEncrypted,
                                ), 
                                'guest'
                        );
@@ -56,8 +57,8 @@ class LostController extends Controller {
                                'core/lostpassword', 
                                'lostpassword', 
                                array(
-                                       'isEncrypted' => $this->isDataEncrypted, 
-                                       'link' => $this->getResetPasswordLink($uid, $token)
+                                       'isEncrypted' => $this->isDataEncrypted,
+                                       'link' => $this->getLink('core.lost.setPassword', $uid, $token)
                                ),
                                'guest'
                        );
@@ -69,7 +70,7 @@ class LostController extends Controller {
         * 
         * @param bool $proceed
         */
-       public function lost($user, $proceed){
+       public function email($user, $proceed){
                $response = new JSONResponse(array('status'=>'success'));
                try {
                        $this->sendEmail($user, $proceed);
@@ -91,17 +92,18 @@ class LostController extends Controller {
        /**
         * @PublicPage
         */
-       public function resetPassword($user, $password, $token) {
+       public function setPassword($token, $uid, $password) {
                $response = new JSONResponse(array('status'=>'success'));
                try {
-                       if (!$this->checkToken($user, $token)) {
+                       if (!$this->checkToken($uid, $token)) {
                                throw new \RuntimeException('');
                        }
-                       if (!$this->userManager->setPassword($user, $newPassword)) {
+                       $userClass = $this->userClass;
+                       if (!$userClass::setPassword($uid, $password)) {
                                throw new \RuntimeException('');
                        }
-                       \OC_Preferences::deleteKey($user, 'owncloud', 'lostpassword');
-                       $this->userManager->unsetMagicInCookie();
+                       \OC_Preferences::deleteKey($uid, 'owncloud', 'lostpassword');
+                       $userClass::unsetMagicInCookie();
                } catch (Exception $e){
                        $response->setData(array(
                                'status' => 'error',
@@ -116,7 +118,7 @@ class LostController extends Controller {
                        throw new EncryptedDataException();
                }
 
-               if (!$this->userManager->userExists($user)) {
+               if (!$this->userClass->userExists($user)) {
                        throw new \Exception($this->l10n->t('Couldn’t send reset email. Please make sure your username is correct.'));
                }
                $token = hash('sha256', \OC_Util::generateRandomBytes(30));
@@ -126,7 +128,7 @@ class LostController extends Controller {
                        throw new \Exception($this->l10n->t('Couldn’t send reset email because there is no email address for this username. Please contact your administrator.'));
                }
                
-               $link = $this->getResetPasswordLink($user, $token);
+               $link = $this->getLink('core.lost.resetform', $user, $token);
                echo $link;
                $tmpl = new \OC_Template('core/lostpassword', 'email');
                $tmpl->assign('link', $link, false);
@@ -138,12 +140,12 @@ class LostController extends Controller {
                }
        }
 
-       protected function getResetPasswordLink($user, $token){
+       protected function getLink($route, $user, $token){
                $parameters = array(
                        'token' => $token, 
                        'uid' => $user
                );
-               $link = $this->urlGenerator->linkToRoute('core.lost.reset', $parameters);
+               $link = $this->urlGenerator->linkToRoute($route, $parameters);
                return $this->urlGenerator->getAbsoluteUrl($link);
        }
 

diff --git a/core/lostpassword/templates/resetpassword.php b/core/lostpassword/templates/resetpassword.php
index 3f2cade08ced087e4b3736d5284c83c99eec64d1..0184ace8d1c89890c94721f6c84924c4a0706a62 100644 (file)
--- a/core/lostpassword/templates/resetpassword.php
+++ b/core/lostpassword/templates/resetpassword.php
@@ -1,4 +1,4 @@
-<form action="<?php print_unescaped($_['link']) ?>" method="post">
+<form action="<?php print_unescaped($_['link']) ?>" id="reset-password" method="post">
        <fieldset>
                <p>
                        <label for="password" class="infield"><?php p($l->t('New password')); ?></label>
@@ -7,3 +7,4 @@
                <input type="submit" id="submit" value="<?php p($l->t('Reset password')); ?>" />
        </fieldset>
 </form>
+<?php OCP\Util::addScript('core', 'lostpassword'); ?>

diff --git a/core/routes.php b/core/routes.php
index 0a67585e0b14cd341a2e1e11938b3774cfd2ad34..ce0103e3ee7bf55615029cdd230b04d553d10a14 100644 (file)
--- a/core/routes.php
+++ b/core/routes.php
@@ -10,9 +10,9 @@ use OC\Core\LostPassword\Application;
 
 $application = new Application();
 $application->registerRoutes($this, array('routes' => array(
-               array('name' => 'lost#lost', 'url' => '/core/ajax/password/lost', 'verb' => 'POST'),
-               array('name' => 'lost#reset', 'url' => '/lostpassword/reset/{token}/{uid}', 'verb' => 'GET'),
-               array('name' => 'lost#resetPassword', 'url' => '/core/ajax/password/reset/{token}/{user}', 'verb' => 'POST'),
+               array('name' => 'lost#email', 'url' => '/lostpassword/email', 'verb' => 'POST'),
+               array('name' => 'lost#resetform', 'url' => '/lostpassword/reset/form/{token}/{uid}', 'verb' => 'GET'),
+               array('name' => 'lost#setPassword', 'url' => '/lostpassword/set/{token}/{uid}', 'verb' => 'POST'),
        )
 ));