Fixed Vodia Identity switching when impersonated
This commit is contained in:
@@ -417,21 +417,23 @@ class UserController extends mfBaseController
|
||||
}
|
||||
|
||||
protected function apiAction() {
|
||||
if(!$this->me->is(["Admin"])) {
|
||||
$this->redirect("Dashboard");
|
||||
}
|
||||
$do = $this->request->do;
|
||||
$data = [];
|
||||
|
||||
$me = new User();
|
||||
$me->load();
|
||||
|
||||
$return = false;
|
||||
|
||||
switch($do) {
|
||||
case "sse":
|
||||
$return = $this->startSuperexpertApi();
|
||||
$me->is(["Admin"]) && $return = $this->startSuperexpertApi();
|
||||
break;
|
||||
case "ese":
|
||||
$return = $this->extendSuperexpertApi();
|
||||
$me->is(["Admin"]) && $return = $this->extendSuperexpertApi();
|
||||
break;
|
||||
case "endse":
|
||||
$return = $this->endSuperexpertApi();
|
||||
$me->is(["Admin"]) && $return = $this->endSuperexpertApi();
|
||||
break;
|
||||
case "getVodiaIdentity":
|
||||
$return = $this->getVodiaIdentityApi();
|
||||
@@ -457,11 +459,14 @@ class UserController extends mfBaseController
|
||||
return ["enabled" => false];
|
||||
}
|
||||
|
||||
$me = new User();
|
||||
$me->loadMe();
|
||||
|
||||
$vodia = new Vodia_Api(VODIA_API_URL, VODIA_API_ADMIN_USER, VODIA_API_ADMIN_PASS);
|
||||
|
||||
$domain = $this->me->getFlag("vodia_identity_domain")->value();
|
||||
$username = $this->me->getFlag("vodia_identity_username")->value();
|
||||
$default = $this->me->getFlag("vodia_identity_default")->value();
|
||||
$domain = $me->getFlag("vodia_identity_domain")->value();
|
||||
$username = $me->getFlag("vodia_identity_username")->value();
|
||||
$default = $me->getFlag("vodia_identity_default")->value();
|
||||
|
||||
|
||||
if(!$domain || !$username || !$default) {
|
||||
@@ -503,8 +508,11 @@ class UserController extends mfBaseController
|
||||
return false;
|
||||
}
|
||||
|
||||
$domain = $this->me->getFlag("vodia_identity_domain")->value();
|
||||
$username = $this->me->getFlag("vodia_identity_username")->value();
|
||||
$me = new User();
|
||||
$me->loadMe();
|
||||
|
||||
$domain = $me->getFlag("vodia_identity_domain")->value();
|
||||
$username = $me->getFlag("vodia_identity_username")->value();
|
||||
|
||||
if(!$domain || !$username) {
|
||||
return ["enabled" => false];
|
||||
|
||||
Reference in New Issue
Block a user