Skip to content

Commit

Permalink
fix: resolve conflict add PasswordConfirmationRequired to saveGlobalC…
Browse files Browse the repository at this point in the history
…redentials

Signed-off-by: yemkareems <yemkareems@gmail.com>
  • Loading branch information
yemkareems committed Oct 30, 2024
1 parent c2d22c8 commit c481f20
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions apps/files_external/lib/Controller/AjaxController.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
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;
Expand Down Expand Up @@ -97,13 +99,13 @@ public function getSshKeys($keyLength = 1024) {
}

/**
* @NoAdminRequired
*
* @param string $uid
* @param string $user
* @param string $password
* @return bool
*/
#[NoAdminRequired]
#[PasswordConfirmationRequired]
public function saveGlobalCredentials($uid, $user, $password) {
$currentUser = $this->userSession->getUser();
if ($currentUser === null) {
Expand Down

0 comments on commit c481f20

Please sign in to comment.