Browse Source

Merge pull request #48992 from nextcloud/fix/add-password-confirmation-to-save-global-creds

fix: add PasswordConfirmationRequired to saveGlobalCredentials
pull/49015/head
yemkareems 1 year ago
committed by GitHub
parent
commit
399b048b15
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 27
      apps/files_external/js/settings.js
  2. 2
      apps/files_external/lib/Controller/AjaxController.php

27
apps/files_external/js/settings.js

@ -1488,30 +1488,37 @@ window.addEventListener('DOMContentLoaded', function() {
}
});
$('#global_credentials').on('submit', function() {
var $form = $(this);
function _submitCredentials(success) {
var uid = $form.find('[name=uid]').val();
var user = $form.find('[name=username]').val();
var password = $form.find('[name=password]').val();
var $submit = $form.find('[type=submit]');
$submit.val(t('files_external', 'Saving …'));
$.ajax({
type: 'POST',
contentType: 'application/json',
data: JSON.stringify({
uid: uid,
user: user,
password: password
uid,
user,
password,
}),
url: OC.generateUrl('apps/files_external/globalcredentials'),
dataType: 'json',
success: function() {
success,
});
}
$('#global_credentials').on('submit', function() {
var $form = $(this);
var $submit = $form.find('[type=submit]');
$submit.val(t('files_external', 'Saving …'));
window.OC.PasswordConfirmation
.requirePasswordConfirmation(() => _submitCredentials(function() {
$submit.val(t('files_external', 'Saved'));
setTimeout(function(){
$submit.val(t('files_external', 'Save'));
}, 2500);
}
});
}));
return false;
});

2
apps/files_external/lib/Controller/AjaxController.php

@ -10,6 +10,7 @@ use OCA\Files_External\Lib\Auth\Password\GlobalAuth;
use OCA\Files_External\Lib\Auth\PublicKey\RSA;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\Attribute\PasswordConfirmationRequired;
use OCP\AppFramework\Http\JSONResponse;
use OCP\IGroupManager;
use OCP\IRequest;
@ -71,6 +72,7 @@ class AjaxController extends Controller {
* @return bool
*/
#[NoAdminRequired]
#[PasswordConfirmationRequired]
public function saveGlobalCredentials($uid, $user, $password) {
$currentUser = $this->userSession->getUser();
if ($currentUser === null) {

Loading…
Cancel
Save