|
|
@ -88,10 +88,11 @@ class User {
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* Check the given plaintext password against the stored hash.
|
|
|
|
* Check the given plaintext password against the stored hash.
|
|
|
|
* @param string $password
|
|
|
|
* @param string $password
|
|
|
|
|
|
|
|
* @param bool $apppass Set to true to enforce app passwords when 2fa is on.
|
|
|
|
* @return bool
|
|
|
|
* @return bool
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
function checkPassword(string $password): bool {
|
|
|
|
function checkPassword(string $password, bool $apppass = false): bool {
|
|
|
|
$resp = AccountHubApi::get("auth", ['username' => $this->username, 'password' => $password]);
|
|
|
|
$resp = AccountHubApi::get("auth", ['username' => $this->username, 'password' => $password, 'apppass' => ($apppass ? "1" : "0")]);
|
|
|
|
if ($resp['status'] == "OK") {
|
|
|
|
if ($resp['status'] == "OK") {
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
@ -99,6 +100,7 @@ class User {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
function check2fa(string $code): bool {
|
|
|
|
function check2fa(string $code): bool {
|
|
|
|
if (!$this->has2fa) {
|
|
|
|
if (!$this->has2fa) {
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|