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

Merge pull request #5855 from nextcloud/cleanup-legacy-user-class 

Cleanup legacy user class from unused methods
This commit is contained in:
Morris Jobke 2017-07-24 14:39:18 +02:00 committed by GitHub
parent 184f25c0d6 188b87e03b
commit c43d479372
2 changed files with 2 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/Controller/LostController.php
View File

@ -267,7 +267,7 @@ class LostController extends Controller {
\OC_Hook::emit('\OC\Core\LostPassword\Controller\LostController', 'post_passwordReset', array('uid' => $userId, 'password' => $password));
$this->config->deleteUserValue($userId, 'core', 'lostpassword');
@\OC_User::unsetMagicInCookie();
@\OC::$server->getUserSession()->unsetMagicInCookie();
} catch (\Exception $e){
return $this->error($e->getMessage());
}

68
lib/private/legacy/user.php
View File

@ -155,20 +155,6 @@ class OC_User {
}
}
/**
* Try to login a user using the magic cookie (remember login)
*
* @deprecated use \OCP\IUserSession::loginWithCookie()
* @param string $uid The username of the user to log in
* @param string $token
* @param string $oldSessionId
* @return bool
*/
public static function loginWithCookie($uid, $token, $oldSessionId) {
return self::getUserSession()->loginWithCookie($uid, $token, $oldSessionId);
}
/**
* Try to login a user, assuming authentication
* has already happened (e.g. via Single Sign On).
@ -233,7 +219,7 @@ class OC_User {
//setup extra user backends
self::setupBackends();
self::unsetMagicInCookie();
self::getUserSession()->unsetMagicInCookie();
return self::loginWithApache($backend);
}
@ -381,17 +367,6 @@ class OC_User {
}
}
/**
* Autogenerate a password
*
* @return string
*
* generates a password
*/
public static function generatePassword() {
return \OC::$server->getSecureRandom()->generate(30);
}
/**
* Set password
*
@ -495,30 +470,6 @@ class OC_User {
return \OC::$server->getUserManager()->userExists($uid);
}
/**
* disables a user
*
* @param string $uid the user to disable
*/
public static function disableUser($uid) {
$user = \OC::$server->getUserManager()->get($uid);
if ($user) {
$user->setEnabled(false);
}
}
/**
* enable a user
*
* @param string $uid
*/
public static function enableUser($uid) {
$user = \OC::$server->getUserManager()->get($uid);
if ($user) {
$user->setEnabled(true);
}
}
/**
* checks if a user is enabled
*
@ -534,23 +485,6 @@ class OC_User {
}
}
/**
* Set cookie value to use in next page load
*
* @param string $username username to be set
* @param string $token
*/
public static function setMagicInCookie($username, $token) {
self::getUserSession()->setMagicInCookie($username, $token);
}
/**
* Remove cookie for "remember username"
*/
public static function unsetMagicInCookie() {
self::getUserSession()->unsetMagicInCookie();
}
/**
* Returns the first active backend from self::$_usedBackends.
*