wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #9921 from nextcloud/resetpassword-login-prefill

Browse source 
prefill userid for login after password reset
This commit is contained in:
Roeland Jago Douma 2018-06-21 23:45:22 +02:00 committed by GitHub
commit 45018a0e83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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
*/
private function success() {
return array('status'=>'success');
private function success($data = []) {
return array_merge($data, ['status'=>'success']);
}
/**
@ -282,7 +283,7 @@ class LostController extends Controller {
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){
var resetErrorMsg;
if (result && result.status === 'success'){
OC.Lostpassword.redirect();
OC.Lostpassword.redirect('/login?user=' + result.user);
} else {
if (result && result.msg){
resetErrorMsg = result.msg;
@ -175,12 +175,8 @@ OC.Lostpassword = {
}
},
redirect : function(msg){
if(OC.webroot !== '') {
window.location = OC.webroot;
} else {
window.location = '/';
}
redirect : function(url){
window.location = OC.generateUrl(url);
},
resetError : function(msg){

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

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