Projekte/web-base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CheckToken fixed

Browse Source
This commit is contained in:
Leon 2020-06-22 21:15:41 +02:00
parent f593e5ac89
commit 106fae305e
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/Api/UserAPI.class.php
View File

@ -63,8 +63,9 @@ namespace Api\User {
use Api\UserAPI; use Api\UserAPI;
use DateTime; use DateTime;
use Driver\SQL\Condition\Compare; use Driver\SQL\Condition\Compare;
use Views\Account\ConfirmEmail;
class Create extends UserAPI { class Create extends UserAPI {
public function __construct($user, $externalCall = false) { public function __construct($user, $externalCall = false) {
parent::__construct($user, $externalCall, array( parent::__construct($user, $externalCall, array(
@ -451,8 +452,10 @@ class CheckToken extends UserAPI{
$token = $this->getParam('token'); $token = $this->getParam('token');
$sql = $this->user->getSQL(); $sql = $this->user->getSQL();
$res = $sql->select("token_type")->from("UserToken") $res = $sql->select("UserToken.token_type, User.name, User.email")->from("UserToken")
->where(new Compare("token",$token), new Compare("valid_until", $sql->now(), ">")) ->innerJoin("user", "UserToken.user_id","User.uid")
->where(new Compare("UserToken.token",$token),
new Compare("UserToken.valid_until", $sql->now(), ">"))
->execute(); ->execute();
$this->lastError = $sql->getLastError(); $this->lastError = $sql->getLastError();
$this->success = ($res !== FALSE); $this->success = ($res !== FALSE);
@ -463,11 +466,13 @@ class CheckToken extends UserAPI{
$this->success = false; $this->success = false;
return false; return false;
} }
$this->result["token_type"] = $res[0]; $this->result["token_type"] = $res[0]["UserToken.token_type"];
$this->result["username"] = $this->user->getUsername(); $this->result["username"] = $res[0]["User.username"];
$this->result["email"] = $res[0]["User.email"];
} }
return $this->success; return $this->success;
} }
} }
} }