mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

prefill userid for login after password reset 

Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2018-06-19 17:02:20 +02:00
parent a10690c1e9
commit 8ed50d4b63
No known key found for this signature in database
GPG Key ID: 42B69D8A64526EFB
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/Controller/LostController.php
View File

@ -206,10 +206,11 @@ class LostController extends Controller {
} }
/** /**
* @param array $data
* @return array * @return array
*/ */
private function success() { private function success($data = []) {
return array('status'=>'success'); return array_merge($data, ['status'=>'success']);
} }
/** /**
@ -282,7 +283,7 @@ class LostController extends Controller {
return $this->error($e->getMessage()); return $this->error($e->getMessage());
} }
return $this->success(); return $this->success(['user' => $userId]);
} }
/** /**

10
core/js/lostpassword.js
View File

@ -162,7 +162,7 @@ OC.Lostpassword = {
resetDone : function(result){ resetDone : function(result){
var resetErrorMsg; var resetErrorMsg;
if (result && result.status === 'success'){ if (result && result.status === 'success'){
OC.Lostpassword.redirect(); OC.Lostpassword.redirect('/login?user=' + result.user);
} else { } else {
if (result && result.msg){ if (result && result.msg){
resetErrorMsg = result.msg; resetErrorMsg = result.msg;
@ -175,12 +175,8 @@ OC.Lostpassword = {
} }
}, },
redirect : function(msg){ redirect : function(url){
if(OC.webroot !== '') { window.location = OC.generateUrl(url);
window.location = OC.webroot;
} else {
window.location = '/';
}
}, },
resetError : function(msg){ resetError : function(msg){

2
tests/Core/Controller/LostControllerTest.php
View File

@ -571,7 +571,7 @@ class LostControllerTest extends \Test\TestCase {
)->willReturn('12345:TheOnlyAndOnlyOneTokenToResetThePassword'); )->willReturn('12345:TheOnlyAndOnlyOneTokenToResetThePassword');
$response = $this->lostController->setPassword('TheOnlyAndOnlyOneTokenToResetThePassword', 'ValidTokenUser', 'NewPassword', true); $response = $this->lostController->setPassword('TheOnlyAndOnlyOneTokenToResetThePassword', 'ValidTokenUser', 'NewPassword', true);
$expectedResponse = array('status' => 'success'); $expectedResponse = array('user' => 'ValidTokenUser', 'status' => 'success');
$this->assertSame($expectedResponse, $response); $this->assertSame($expectedResponse, $response);
} }