ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New token= query for JWT

This commit is contained in:
Pliable Pixels 2019-05-07 15:03:13 -04:00
parent 37f915ec0f
commit 0bbc582971
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/api/app/Controller/AppController.php
View File

@ -73,14 +73,21 @@ class AppController extends Controller {
$mUser = $this->request->query('user') ? $this->request->query('user') : $this->request->data('user');
$mPassword = $this->request->query('pass') ? $this->request->query('pass') : $this->request->data('pass');
$mAuth = $this->request->query('auth') ? $this->request->query('auth') : $this->request->data('auth');
$mToken = $this->request->query('token') ? $this->request->query('token') : $this->request->data('token');
if ( $mUser and $mPassword ) {
$user = userLogin($mUser, $mPassword);
$user = userLogin($mUser, $mPassword, true);
if ( !$user ) {
throw new UnauthorizedException(__('User not found or incorrect password'));
return;
}
} else if ( $mToken ) {
$ret = validateToken($mToken);
$user = $ret[0];
$retstatus = $ret[1];
if ( !$user ) {
throw new UnauthorizedException(__($retstatus));
return;
} else if ( $mAuth ) {
$user = getAuthUser($mAuth);
if ( !$user ) {
@ -88,6 +95,7 @@ class AppController extends Controller {
return;
}
}
}
// We need to reject methods that are not authenticated
// besides login and logout
if ( strcasecmp($this->params->action, 'logout') ) {